From 6e000fcc544133d7331f905964e382206d30940a Mon Sep 17 00:00:00 2001 From: fig02 Date: Wed, 28 Oct 2020 13:02:35 -0400 Subject: [PATCH] En_Elf Decompiled (#432) * init matched * everything but navi OK * progress * 4 left * remove asm * progress * progress * asm and spec * remove comment * suggestion * review1 * use type enum * name func * overridelimbdraw * review 2 * forgot one * merge master * format --- .../code/z_parameter/Item_Give.s | 4 +- .../actors/ovl_Bg_Dy_Yoseizo/func_80873868.s | 2 +- .../actors/ovl_Bg_Dy_Yoseizo/func_80874304.s | 4 +- .../actors/ovl_En_Elf/EnElf_Destroy.s | 23 - .../overlays/actors/ovl_En_Elf/EnElf_Draw.s | 478 ----- .../overlays/actors/ovl_En_Elf/EnElf_Init.s | 411 ----- .../overlays/actors/ovl_En_Elf/EnElf_Update.s | 24 - .../actors/ovl_En_Elf/func_80A01C30.s | 3 - .../actors/ovl_En_Elf/func_80A01C38.s | 246 --- .../actors/ovl_En_Elf/func_80A01F90.s | 22 - .../actors/ovl_En_Elf/func_80A01FE0.s | 61 - .../actors/ovl_En_Elf/func_80A020A4.s | 53 - .../actors/ovl_En_Elf/func_80A0214C.s | 152 -- .../actors/ovl_En_Elf/func_80A0232C.s | 33 - .../actors/ovl_En_Elf/func_80A023A4.s | 35 - .../actors/ovl_En_Elf/func_80A0299C.s | 4 - .../actors/ovl_En_Elf/func_80A029A8.s | 12 - .../actors/ovl_En_Elf/func_80A02A20.s | 37 - .../actors/ovl_En_Elf/func_80A02AA4.s | 41 - .../actors/ovl_En_Elf/func_80A02B38.s | 45 - .../actors/ovl_En_Elf/func_80A02BD8.s | 55 - .../actors/ovl_En_Elf/func_80A02C98.s | 115 -- .../actors/ovl_En_Elf/func_80A02E30.s | 37 - .../actors/ovl_En_Elf/func_80A02EC0.s | 28 - .../actors/ovl_En_Elf/func_80A02F2C.s | 72 - .../actors/ovl_En_Elf/func_80A03018.s | 92 - .../actors/ovl_En_Elf/func_80A0329C.s | 200 --- .../actors/ovl_En_Elf/func_80A0353C.s | 61 - .../actors/ovl_En_Elf/func_80A03604.s | 4 - .../actors/ovl_En_Elf/func_80A03610.s | 159 -- .../actors/ovl_En_Elf/func_80A03814.s | 115 -- .../actors/ovl_En_Elf/func_80A03990.s | 89 - .../actors/ovl_En_Elf/func_80A03AB0.s | 45 - .../actors/ovl_En_Elf/func_80A03B28.s | 125 -- .../actors/ovl_En_Elf/func_80A03CF8.s | 14 +- .../actors/ovl_En_Elf/func_80A0438C.s | 35 - .../actors/ovl_En_Elf/func_80A04414.s | 148 -- .../actors/ovl_En_Elf/func_80A049B4.s | 269 --- .../actors/ovl_En_Elf/func_80A04D90.s | 22 - .../actors/ovl_En_Elf/func_80A04DE4.s | 124 -- .../actors/ovl_En_Elf/func_80A04F94.s | 46 - .../actors/ovl_En_Elf/func_80A05040.s | 58 - .../actors/ovl_En_Elf/func_80A05114.s | 32 - .../actors/ovl_En_Elf/func_80A05188.s | 34 - .../actors/ovl_En_Elf/func_80A05208.s | 66 - .../actors/ovl_En_Elf/func_80A052F4.s | 69 - .../actors/ovl_En_Elf/func_80A053F0.s | 216 --- .../actors/ovl_En_Elf/func_80A05734.s | 90 - .../actors/ovl_En_Elf/func_80A05F10.s | 61 - .../actors/ovl_En_Zl3/func_80B59828.s | 2 +- .../actors/ovl_En_Zl3/func_80B59AD0.s | 2 +- .../actors/ovl_player_actor/Player_Init.s | 2 +- data/overlays/actors/z_en_elf.data.s | 32 - include/functions.h | 8 +- include/z64player.h | 2 +- spec | 5 +- src/code/z_actor.c | 2 +- src/code/z_en_item00.c | 7 +- src/code/z_kanfont.c | 4 +- src/code/z_parameter.c | 6 +- .../ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c | 2 +- .../ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c | 3 +- src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 3 +- .../actors/ovl_Door_Gerudo/z_door_gerudo.c | 4 +- src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c | 8 +- src/overlays/actors/ovl_En_Butte/z_en_butte.c | 3 +- src/overlays/actors/ovl_En_Elf/z_en_elf.c | 1544 ++++++++++++++++- src/overlays/actors/ovl_En_Elf/z_en_elf.h | 48 +- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 2 +- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 5 +- .../actors/ovl_En_Insect/z_en_insect.c | 2 +- src/overlays/actors/ovl_En_Md/z_en_md.c | 9 +- .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c | 13 +- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 11 +- .../actors/ovl_player_actor/z_player.c | 34 +- tools/ZAP2 | 2 +- undefined_syms.txt | 4 + 77 files changed, 1637 insertions(+), 4303 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C30.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F90.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01FE0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A020A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0214C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0232C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A023A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0299C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A029A8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02A20.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02AA4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02B38.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02BD8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02C98.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02E30.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02EC0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02F2C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03018.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0353C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03604.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03610.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03814.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03990.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03AB0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03B28.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0438C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04414.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04D90.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04DE4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04F94.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05114.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A052F4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05734.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05F10.s delete mode 100644 data/overlays/actors/z_en_elf.data.s diff --git a/asm/non_matchings/code/z_parameter/Item_Give.s b/asm/non_matchings/code/z_parameter/Item_Give.s index 5a7392b2a3..f623b249de 100644 --- a/asm/non_matchings/code/z_parameter/Item_Give.s +++ b/asm/non_matchings/code/z_parameter/Item_Give.s @@ -1403,7 +1403,7 @@ glabel Item_Give /* AFD168 80085FC8 2401000A */ li $at, 10 /* AFD16C 80085FCC 51810004 */ beql $t4, $at, .L80085FE0 /* AFD170 80085FD0 8FA40048 */ lw $a0, 0x48($sp) -/* AFD174 80085FD4 0C021DA0 */ jal func_80087680 +/* AFD174 80085FD4 0C021DA0 */ jal Magic_Fill /* AFD178 80085FD8 8FA40048 */ lw $a0, 0x48($sp) /* AFD17C 80085FDC 8FA40048 */ lw $a0, 0x48($sp) .L80085FE0: @@ -1428,7 +1428,7 @@ glabel Item_Give /* AFD1C0 80086020 2401000A */ li $at, 10 /* AFD1C4 80086024 51C10004 */ beql $t6, $at, .L80086038 /* AFD1C8 80086028 8FA40048 */ lw $a0, 0x48($sp) -/* AFD1CC 8008602C 0C021DA0 */ jal func_80087680 +/* AFD1CC 8008602C 0C021DA0 */ jal Magic_Fill /* AFD1D0 80086030 8FA40048 */ lw $a0, 0x48($sp) /* AFD1D4 80086034 8FA40048 */ lw $a0, 0x48($sp) .L80086038: 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 index 21cee26d05..2d11a59a90 100644 --- 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 @@ -150,7 +150,7 @@ glabel func_80873868 /* 01238 80873A68 14410008 */ bne $v0, $at, .L80873A8C /* 0123C 80873A6C 00000000 */ nop /* 01240 80873A70 A4781424 */ sh $t8, 0x1424($v1) ## 8015FA84 -/* 01244 80873A74 0C021DA0 */ jal func_80087680 +/* 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 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 index 90055c0a83..01a1f4a8b2 100644 --- 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 @@ -234,7 +234,7 @@ glabel func_80874304 /* 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 func_80087680 +/* 01E1C 8087464C 0C021DA0 */ jal Magic_Fill /* 01E20 80874650 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80874654: /* 01E24 80874654 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 @@ -303,7 +303,7 @@ glabel func_80874304 /* 01F10 80874740 10000006 */ beq $zero, $zero, .L8087475C /* 01F14 80874744 A04C003A */ sb $t4, 0x003A($v0) ## 8015E69A .L80874748: -/* 01F18 80874748 0C021DA0 */ jal func_80087680 +/* 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) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Destroy.s deleted file mode 100644 index b646130db8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Destroy.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel EnElf_Destroy -/* 00DA0 80A029D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00DA4 80A029D4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00DA8 80A029D8 8FAE0028 */ lw $t6, 0x0028($sp) -/* 00DAC 80A029DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00DB0 80A029E0 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00DB4 80A029E4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00DB8 80A029E8 24A507A8 */ addiu $a1, $a1, 0x07A8 ## $a1 = 000007A8 -/* 00DBC 80A029EC 8DC60274 */ lw $a2, 0x0274($t6) ## 00000274 -/* 00DC0 80A029F0 AFA7002C */ sw $a3, 0x002C($sp) -/* 00DC4 80A029F4 0C01E9F1 */ jal LightContext_RemoveLight - -/* 00DC8 80A029F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 00DCC 80A029FC 8FAF0028 */ lw $t7, 0x0028($sp) -/* 00DD0 80A02A00 8FA5001C */ lw $a1, 0x001C($sp) -/* 00DD4 80A02A04 8FA4002C */ lw $a0, 0x002C($sp) -/* 00DD8 80A02A08 0C01E9F1 */ jal LightContext_RemoveLight - -/* 00DDC 80A02A0C 8DE60288 */ lw $a2, 0x0288($t7) ## 00000288 -/* 00DE0 80A02A10 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00DE4 80A02A14 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00DE8 80A02A18 03E00008 */ jr $ra -/* 00DEC 80A02A1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s deleted file mode 100644 index c2c1bd6c88..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s +++ /dev/null @@ -1,478 +0,0 @@ -.rdata -glabel D_80A06124 - .asciz "../z_en_elf.c" - .balign 4 - -glabel D_80A06134 - .asciz "../z_en_elf.c" - .balign 4 - -.late_rodata -glabel D_80A0623C - .float 0.0011666666250675917 - -.text -glabel EnElf_Draw -/* 03C28 80A05858 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 03C2C 80A0585C AFBF002C */ sw $ra, 0x002C($sp) -/* 03C30 80A05860 AFB00028 */ sw $s0, 0x0028($sp) -/* 03C34 80A05864 848E02A8 */ lh $t6, 0x02A8($a0) ## 000002A8 -/* 03C38 80A05868 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 03C3C 80A0586C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03C40 80A05870 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 03C44 80A05874 11C101A1 */ beq $t6, $at, .L80A05EFC -/* 03C48 80A05878 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 03C4C 80A0587C 948F02C4 */ lhu $t7, 0x02C4($a0) ## 000002C4 -/* 03C50 80A05880 31F80008 */ andi $t8, $t7, 0x0008 ## $t8 = 00000000 -/* 03C54 80A05884 5700019E */ bnel $t8, $zero, .L80A05F00 -/* 03C58 80A05888 8FBF002C */ lw $ra, 0x002C($sp) -/* 03C5C 80A0588C 8C59067C */ lw $t9, 0x067C($v0) ## 0000067C -/* 03C60 80A05890 3C0B8016 */ lui $t3, %hi(gGameInfo) -/* 03C64 80A05894 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 03C68 80A05898 001952C0 */ sll $t2, $t9, 11 -/* 03C6C 80A0589C 0543000C */ bgezl $t2, .L80A058D0 -/* 03C70 80A058A0 8CC40000 */ lw $a0, 0x0000($a2) ## 00000000 -/* 03C74 80A058A4 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3) -/* 03C78 80A058A8 C48800EC */ lwc1 $f8, 0x00EC($a0) ## 000000EC -/* 03C7C 80A058AC 856C1508 */ lh $t4, 0x1508($t3) ## 80161508 -/* 03C80 80A058B0 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 03C84 80A058B4 00000000 */ nop -/* 03C88 80A058B8 468021A0 */ cvt.s.w $f6, $f4 -/* 03C8C 80A058BC 4608303C */ c.lt.s $f6, $f8 -/* 03C90 80A058C0 00000000 */ nop -/* 03C94 80A058C4 4502018E */ bc1fl .L80A05F00 -/* 03C98 80A058C8 8FBF002C */ lw $ra, 0x002C($sp) -/* 03C9C 80A058CC 8CC40000 */ lw $a0, 0x0000($a2) ## 00000000 -.L80A058D0: -/* 03CA0 80A058D0 0C031A73 */ jal Graph_Alloc - -/* 03CA4 80A058D4 AFA60084 */ sw $a2, 0x0084($sp) -/* 03CA8 80A058D8 8FAD0084 */ lw $t5, 0x0084($sp) -/* 03CAC 80A058DC 3C0680A0 */ lui $a2, %hi(D_80A06124) ## $a2 = 80A00000 -/* 03CB0 80A058E0 24C66124 */ addiu $a2, $a2, %lo(D_80A06124) ## $a2 = 80A06124 -/* 03CB4 80A058E4 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 03CB8 80A058E8 AFA20068 */ sw $v0, 0x0068($sp) -/* 03CBC 80A058EC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 -/* 03CC0 80A058F0 24070AAA */ addiu $a3, $zero, 0x0AAA ## $a3 = 00000AAA -/* 03CC4 80A058F4 0C031AB1 */ jal Graph_OpenDisps -/* 03CC8 80A058F8 AFA50060 */ sw $a1, 0x0060($sp) -/* 03CCC 80A058FC 8FAE0084 */ lw $t6, 0x0084($sp) -/* 03CD0 80A05900 0C0252D6 */ jal func_80094B58 -/* 03CD4 80A05904 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 03CD8 80A05908 960402BE */ lhu $a0, 0x02BE($s0) ## 000002BE -/* 03CDC 80A0590C 8FA80068 */ lw $t0, 0x0068($sp) -/* 03CE0 80A05910 8FA90060 */ lw $t1, 0x0060($sp) -/* 03CE4 80A05914 00800821 */ addu $at, $a0, $zero -/* 03CE8 80A05918 00042080 */ sll $a0, $a0, 2 -/* 03CEC 80A0591C 00812023 */ subu $a0, $a0, $at -/* 03CF0 80A05920 000420C0 */ sll $a0, $a0, 3 -/* 03CF4 80A05924 00812021 */ addu $a0, $a0, $at -/* 03CF8 80A05928 00042040 */ sll $a0, $a0, 1 -/* 03CFC 80A0592C 308401FF */ andi $a0, $a0, 0x01FF ## $a0 = 00000000 -/* 03D00 80A05930 28810100 */ slti $at, $a0, 0x0100 -/* 03D04 80A05934 14200003 */ bne $at, $zero, .L80A05944 -/* 03D08 80A05938 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 03D0C 80A0593C 240F01FF */ addiu $t7, $zero, 0x01FF ## $t7 = 000001FF -/* 03D10 80A05940 01E42023 */ subu $a0, $t7, $a0 -.L80A05944: -/* 03D14 80A05944 860202C2 */ lh $v0, 0x02C2($s0) ## 000002C2 -/* 03D18 80A05948 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 03D1C 80A0594C 3C0AE700 */ lui $t2, 0xE700 ## $t2 = E7000000 -/* 03D20 80A05950 0441000A */ bgez $v0, .L80A0597C -/* 03D24 80A05954 3C0BFA00 */ lui $t3, 0xFA00 ## $t3 = FA000000 -/* 03D28 80A05958 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 03D2C 80A0595C 3C0180A0 */ lui $at, %hi(D_80A0623C) ## $at = 80A00000 -/* 03D30 80A05960 C432623C */ lwc1 $f18, %lo(D_80A0623C)($at) -/* 03D34 80A05964 46805420 */ cvt.s.w $f16, $f10 -/* 03D38 80A05968 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03D3C 80A0596C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 03D40 80A05970 46128102 */ mul.s $f4, $f16, $f18 -/* 03D44 80A05974 10000004 */ beq $zero, $zero, .L80A05988 -/* 03D48 80A05978 46062000 */ add.s $f0, $f4, $f6 -.L80A0597C: -/* 03D4C 80A0597C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03D50 80A05980 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 03D54 80A05984 00000000 */ nop -.L80A05988: -/* 03D58 80A05988 8D2302D0 */ lw $v1, 0x02D0($t1) ## 000002D0 -/* 03D5C 80A0598C 01001025 */ or $v0, $t0, $zero ## $v0 = 00000000 -/* 03D60 80A05990 356B0001 */ ori $t3, $t3, 0x0001 ## $t3 = FA000001 -/* 03D64 80A05994 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 03D68 80A05998 AD3802D0 */ sw $t8, 0x02D0($t1) ## 000002D0 -/* 03D6C 80A0599C AC680004 */ sw $t0, 0x0004($v1) ## 00000004 -/* 03D70 80A059A0 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 03D74 80A059A4 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 03D78 80A059A8 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 03D7C 80A059AC 25080008 */ addiu $t0, $t0, 0x0008 ## $t0 = 00000008 -/* 03D80 80A059B0 01001025 */ or $v0, $t0, $zero ## $v0 = 00000008 -/* 03D84 80A059B4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000008 -/* 03D88 80A059B8 444CF800 */ cfc1 $t4, $31 -/* 03D8C 80A059BC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 03D90 80A059C0 44CDF800 */ ctc1 $t5, $31 -/* 03D94 80A059C4 C6080244 */ lwc1 $f8, 0x0244($s0) ## 00000244 -/* 03D98 80A059C8 3C0780A0 */ lui $a3, %hi(func_80A05734) ## $a3 = 80A00000 -/* 03D9C 80A059CC 25080008 */ addiu $t0, $t0, 0x0008 ## $t0 = 00000010 -/* 03DA0 80A059D0 460042A4 */ cvt.w.s $f10, $f8 -/* 03DA4 80A059D4 24E75734 */ addiu $a3, $a3, %lo(func_80A05734) ## $a3 = 80A05734 -/* 03DA8 80A059D8 444DF800 */ cfc1 $t5, $31 -/* 03DAC 80A059DC 00000000 */ nop -/* 03DB0 80A059E0 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 03DB4 80A059E4 11A00012 */ beq $t5, $zero, .L80A05A30 -/* 03DB8 80A059E8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03DBC 80A059EC 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 -/* 03DC0 80A059F0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 03DC4 80A059F4 460A4281 */ sub.s $f10, $f8, $f10 -/* 03DC8 80A059F8 44CDF800 */ ctc1 $t5, $31 -/* 03DCC 80A059FC 00000000 */ nop -/* 03DD0 80A05A00 460052A4 */ cvt.w.s $f10, $f10 -/* 03DD4 80A05A04 444DF800 */ cfc1 $t5, $31 -/* 03DD8 80A05A08 00000000 */ nop -/* 03DDC 80A05A0C 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 03DE0 80A05A10 15A00005 */ bne $t5, $zero, .L80A05A28 -/* 03DE4 80A05A14 00000000 */ nop -/* 03DE8 80A05A18 440D5000 */ mfc1 $t5, $f10 -/* 03DEC 80A05A1C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03DF0 80A05A20 10000007 */ beq $zero, $zero, .L80A05A40 -/* 03DF4 80A05A24 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 -.L80A05A28: -/* 03DF8 80A05A28 10000005 */ beq $zero, $zero, .L80A05A40 -/* 03DFC 80A05A2C 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -.L80A05A30: -/* 03E00 80A05A30 440D5000 */ mfc1 $t5, $f10 -/* 03E04 80A05A34 00000000 */ nop -/* 03E08 80A05A38 05A0FFFB */ bltz $t5, .L80A05A28 -/* 03E0C 80A05A3C 00000000 */ nop -.L80A05A40: -/* 03E10 80A05A40 44CCF800 */ ctc1 $t4, $31 -/* 03E14 80A05A44 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 03E18 80A05A48 C6100248 */ lwc1 $f16, 0x0248($s0) ## 00000248 -/* 03E1C 80A05A4C 000DC600 */ sll $t8, $t5, 24 -/* 03E20 80A05A50 4459F800 */ cfc1 $t9, $31 -/* 03E24 80A05A54 44CAF800 */ ctc1 $t2, $31 -/* 03E28 80A05A58 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03E2C 80A05A5C 460084A4 */ cvt.w.s $f18, $f16 -/* 03E30 80A05A60 444AF800 */ cfc1 $t2, $31 -/* 03E34 80A05A64 00000000 */ nop -/* 03E38 80A05A68 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 03E3C 80A05A6C 51400013 */ beql $t2, $zero, .L80A05ABC -/* 03E40 80A05A70 440A9000 */ mfc1 $t2, $f18 -/* 03E44 80A05A74 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 03E48 80A05A78 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 03E4C 80A05A7C 46128481 */ sub.s $f18, $f16, $f18 -/* 03E50 80A05A80 44CAF800 */ ctc1 $t2, $31 -/* 03E54 80A05A84 00000000 */ nop -/* 03E58 80A05A88 460094A4 */ cvt.w.s $f18, $f18 -/* 03E5C 80A05A8C 444AF800 */ cfc1 $t2, $31 -/* 03E60 80A05A90 00000000 */ nop -/* 03E64 80A05A94 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 03E68 80A05A98 15400005 */ bne $t2, $zero, .L80A05AB0 -/* 03E6C 80A05A9C 00000000 */ nop -/* 03E70 80A05AA0 440A9000 */ mfc1 $t2, $f18 -/* 03E74 80A05AA4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03E78 80A05AA8 10000007 */ beq $zero, $zero, .L80A05AC8 -/* 03E7C 80A05AAC 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 -.L80A05AB0: -/* 03E80 80A05AB0 10000005 */ beq $zero, $zero, .L80A05AC8 -/* 03E84 80A05AB4 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 03E88 80A05AB8 440A9000 */ mfc1 $t2, $f18 -.L80A05ABC: -/* 03E8C 80A05ABC 00000000 */ nop -/* 03E90 80A05AC0 0540FFFB */ bltz $t2, .L80A05AB0 -/* 03E94 80A05AC4 00000000 */ nop -.L80A05AC8: -/* 03E98 80A05AC8 44D9F800 */ ctc1 $t9, $31 -/* 03E9C 80A05ACC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 03EA0 80A05AD0 C604024C */ lwc1 $f4, 0x024C($s0) ## 0000024C -/* 03EA4 80A05AD4 314C00FF */ andi $t4, $t2, 0x00FF ## $t4 = 000000FF -/* 03EA8 80A05AD8 444FF800 */ cfc1 $t7, $31 -/* 03EAC 80A05ADC 44D9F800 */ ctc1 $t9, $31 -/* 03EB0 80A05AE0 000C6C00 */ sll $t5, $t4, 16 -/* 03EB4 80A05AE4 030D7025 */ or $t6, $t8, $t5 ## $t6 = FFFFFFFF -/* 03EB8 80A05AE8 460021A4 */ cvt.w.s $f6, $f4 -/* 03EBC 80A05AEC 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03EC0 80A05AF0 4459F800 */ cfc1 $t9, $31 -/* 03EC4 80A05AF4 00000000 */ nop -/* 03EC8 80A05AF8 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 03ECC 80A05AFC 53200013 */ beql $t9, $zero, .L80A05B4C -/* 03ED0 80A05B00 44193000 */ mfc1 $t9, $f6 -/* 03ED4 80A05B04 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 -/* 03ED8 80A05B08 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 03EDC 80A05B0C 46062181 */ sub.s $f6, $f4, $f6 -/* 03EE0 80A05B10 44D9F800 */ ctc1 $t9, $31 -/* 03EE4 80A05B14 00000000 */ nop -/* 03EE8 80A05B18 460031A4 */ cvt.w.s $f6, $f6 -/* 03EEC 80A05B1C 4459F800 */ cfc1 $t9, $31 -/* 03EF0 80A05B20 00000000 */ nop -/* 03EF4 80A05B24 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 03EF8 80A05B28 17200005 */ bne $t9, $zero, .L80A05B40 -/* 03EFC 80A05B2C 00000000 */ nop -/* 03F00 80A05B30 44193000 */ mfc1 $t9, $f6 -/* 03F04 80A05B34 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03F08 80A05B38 10000007 */ beq $zero, $zero, .L80A05B58 -/* 03F0C 80A05B3C 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 -.L80A05B40: -/* 03F10 80A05B40 10000005 */ beq $zero, $zero, .L80A05B58 -/* 03F14 80A05B44 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 03F18 80A05B48 44193000 */ mfc1 $t9, $f6 -.L80A05B4C: -/* 03F1C 80A05B4C 00000000 */ nop -/* 03F20 80A05B50 0720FFFB */ bltz $t9, .L80A05B40 -/* 03F24 80A05B54 00000000 */ nop -.L80A05B58: -/* 03F28 80A05B58 44CFF800 */ ctc1 $t7, $31 -/* 03F2C 80A05B5C C6080250 */ lwc1 $f8, 0x0250($s0) ## 00000250 -/* 03F30 80A05B60 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03F34 80A05B64 332B00FF */ andi $t3, $t9, 0x00FF ## $t3 = 000000FF -/* 03F38 80A05B68 46004282 */ mul.s $f10, $f8, $f0 -/* 03F3C 80A05B6C 000B6200 */ sll $t4, $t3, 8 -/* 03F40 80A05B70 3C19E200 */ lui $t9, 0xE200 ## $t9 = E2000000 -/* 03F44 80A05B74 01CCC025 */ or $t8, $t6, $t4 ## $t8 = FFFFFFFF -/* 03F48 80A05B78 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03F4C 80A05B7C 3739001C */ ori $t9, $t9, 0x001C ## $t9 = E200001C -/* 03F50 80A05B80 444DF800 */ cfc1 $t5, $31 -/* 03F54 80A05B84 44CFF800 */ ctc1 $t7, $31 -/* 03F58 80A05B88 00000000 */ nop -/* 03F5C 80A05B8C 46005424 */ cvt.w.s $f16, $f10 -/* 03F60 80A05B90 444FF800 */ cfc1 $t7, $31 -/* 03F64 80A05B94 00000000 */ nop -/* 03F68 80A05B98 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 03F6C 80A05B9C 51E00013 */ beql $t7, $zero, .L80A05BEC -/* 03F70 80A05BA0 440F8000 */ mfc1 $t7, $f16 -/* 03F74 80A05BA4 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 03F78 80A05BA8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03F7C 80A05BAC 46105401 */ sub.s $f16, $f10, $f16 -/* 03F80 80A05BB0 44CFF800 */ ctc1 $t7, $31 -/* 03F84 80A05BB4 00000000 */ nop -/* 03F88 80A05BB8 46008424 */ cvt.w.s $f16, $f16 -/* 03F8C 80A05BBC 444FF800 */ cfc1 $t7, $31 -/* 03F90 80A05BC0 00000000 */ nop -/* 03F94 80A05BC4 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 03F98 80A05BC8 15E00005 */ bne $t7, $zero, .L80A05BE0 -/* 03F9C 80A05BCC 00000000 */ nop -/* 03FA0 80A05BD0 440F8000 */ mfc1 $t7, $f16 -/* 03FA4 80A05BD4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03FA8 80A05BD8 10000007 */ beq $zero, $zero, .L80A05BF8 -/* 03FAC 80A05BDC 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 -.L80A05BE0: -/* 03FB0 80A05BE0 10000005 */ beq $zero, $zero, .L80A05BF8 -/* 03FB4 80A05BE4 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 03FB8 80A05BE8 440F8000 */ mfc1 $t7, $f16 -.L80A05BEC: -/* 03FBC 80A05BEC 00000000 */ nop -/* 03FC0 80A05BF0 05E0FFFB */ bltz $t7, .L80A05BE0 -/* 03FC4 80A05BF4 00000000 */ nop -.L80A05BF8: -/* 03FC8 80A05BF8 31EA00FF */ andi $t2, $t7, 0x00FF ## $t2 = 000000FF -/* 03FCC 80A05BFC 030A5825 */ or $t3, $t8, $t2 ## $t3 = FFFFFFFF -/* 03FD0 80A05C00 AC4B0004 */ sw $t3, 0x0004($v0) ## 0000000C -/* 03FD4 80A05C04 960E02C4 */ lhu $t6, 0x02C4($s0) ## 000002C4 -/* 03FD8 80A05C08 44CDF800 */ ctc1 $t5, $31 -/* 03FDC 80A05C0C 3C0ADF00 */ lui $t2, 0xDF00 ## $t2 = DF000000 -/* 03FE0 80A05C10 31CC0004 */ andi $t4, $t6, 0x0004 ## $t4 = 00000004 -/* 03FE4 80A05C14 1180000A */ beq $t4, $zero, .L80A05C40 -/* 03FE8 80A05C18 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 03FEC 80A05C1C 01001025 */ or $v0, $t0, $zero ## $v0 = 00000010 -/* 03FF0 80A05C20 3C0DE200 */ lui $t5, 0xE200 ## $t5 = E2000000 -/* 03FF4 80A05C24 3C0F0C18 */ lui $t7, 0x0C18 ## $t7 = 0C180000 -/* 03FF8 80A05C28 35EF4340 */ ori $t7, $t7, 0x4340 ## $t7 = 0C184340 -/* 03FFC 80A05C2C 35AD001C */ ori $t5, $t5, 0x001C ## $t5 = E200001C -/* 04000 80A05C30 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000010 -/* 04004 80A05C34 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000014 -/* 04008 80A05C38 10000007 */ beq $zero, $zero, .L80A05C58 -/* 0400C 80A05C3C 25080008 */ addiu $t0, $t0, 0x0008 ## $t0 = 00000018 -.L80A05C40: -/* 04010 80A05C40 01001025 */ or $v0, $t0, $zero ## $v0 = 00000018 -/* 04014 80A05C44 3C180C18 */ lui $t8, 0x0C18 ## $t8 = 0C180000 -/* 04018 80A05C48 37184B50 */ ori $t8, $t8, 0x4B50 ## $t8 = 0C184B50 -/* 0401C 80A05C4C AC580004 */ sw $t8, 0x0004($v0) ## 0000001C -/* 04020 80A05C50 AC590000 */ sw $t9, 0x0000($v0) ## 00000018 -/* 04024 80A05C54 25080008 */ addiu $t0, $t0, 0x0008 ## $t0 = 00000020 -.L80A05C58: -/* 04028 80A05C58 AD0A0000 */ sw $t2, 0x0000($t0) ## 00000020 -/* 0402C 80A05C5C AD000004 */ sw $zero, 0x0004($t0) ## 00000024 -/* 04030 80A05C60 8D2202D0 */ lw $v0, 0x02D0($t1) ## 000002D0 -/* 04034 80A05C64 444CF800 */ cfc1 $t4, $31 -/* 04038 80A05C68 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 0403C 80A05C6C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000020 -/* 04040 80A05C70 AD2B02D0 */ sw $t3, 0x02D0($t1) ## 000002D0 -/* 04044 80A05C74 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000018 -/* 04048 80A05C78 44CDF800 */ ctc1 $t5, $31 -/* 0404C 80A05C7C C6120254 */ lwc1 $f18, 0x0254($s0) ## 00000254 -/* 04050 80A05C80 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 04054 80A05C84 46009124 */ cvt.w.s $f4, $f18 -/* 04058 80A05C88 444DF800 */ cfc1 $t5, $31 -/* 0405C 80A05C8C 00000000 */ nop -/* 04060 80A05C90 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 04064 80A05C94 51A00013 */ beql $t5, $zero, .L80A05CE4 -/* 04068 80A05C98 440D2000 */ mfc1 $t5, $f4 -/* 0406C 80A05C9C 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 04070 80A05CA0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 04074 80A05CA4 46049101 */ sub.s $f4, $f18, $f4 -/* 04078 80A05CA8 44CDF800 */ ctc1 $t5, $31 -/* 0407C 80A05CAC 00000000 */ nop -/* 04080 80A05CB0 46002124 */ cvt.w.s $f4, $f4 -/* 04084 80A05CB4 444DF800 */ cfc1 $t5, $31 -/* 04088 80A05CB8 00000000 */ nop -/* 0408C 80A05CBC 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 04090 80A05CC0 15A00005 */ bne $t5, $zero, .L80A05CD8 -/* 04094 80A05CC4 00000000 */ nop -/* 04098 80A05CC8 440D2000 */ mfc1 $t5, $f4 -/* 0409C 80A05CCC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 040A0 80A05CD0 10000007 */ beq $zero, $zero, .L80A05CF0 -/* 040A4 80A05CD4 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 -.L80A05CD8: -/* 040A8 80A05CD8 10000005 */ beq $zero, $zero, .L80A05CF0 -/* 040AC 80A05CDC 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 040B0 80A05CE0 440D2000 */ mfc1 $t5, $f4 -.L80A05CE4: -/* 040B4 80A05CE4 00000000 */ nop -/* 040B8 80A05CE8 05A0FFFB */ bltz $t5, .L80A05CD8 -/* 040BC 80A05CEC 00000000 */ nop -.L80A05CF0: -/* 040C0 80A05CF0 44CCF800 */ ctc1 $t4, $31 -/* 040C4 80A05CF4 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 040C8 80A05CF8 C6060258 */ lwc1 $f6, 0x0258($s0) ## 00000258 -/* 040CC 80A05CFC 000DC600 */ sll $t8, $t5, 24 -/* 040D0 80A05D00 444AF800 */ cfc1 $t2, $31 -/* 040D4 80A05D04 44CBF800 */ ctc1 $t3, $31 -/* 040D8 80A05D08 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 040DC 80A05D0C 46003224 */ cvt.w.s $f8, $f6 -/* 040E0 80A05D10 444BF800 */ cfc1 $t3, $31 -/* 040E4 80A05D14 00000000 */ nop -/* 040E8 80A05D18 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 040EC 80A05D1C 51600013 */ beql $t3, $zero, .L80A05D6C -/* 040F0 80A05D20 440B4000 */ mfc1 $t3, $f8 -/* 040F4 80A05D24 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 040F8 80A05D28 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 040FC 80A05D2C 46083201 */ sub.s $f8, $f6, $f8 -/* 04100 80A05D30 44CBF800 */ ctc1 $t3, $31 -/* 04104 80A05D34 00000000 */ nop -/* 04108 80A05D38 46004224 */ cvt.w.s $f8, $f8 -/* 0410C 80A05D3C 444BF800 */ cfc1 $t3, $31 -/* 04110 80A05D40 00000000 */ nop -/* 04114 80A05D44 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 04118 80A05D48 15600005 */ bne $t3, $zero, .L80A05D60 -/* 0411C 80A05D4C 00000000 */ nop -/* 04120 80A05D50 440B4000 */ mfc1 $t3, $f8 -/* 04124 80A05D54 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 04128 80A05D58 10000007 */ beq $zero, $zero, .L80A05D78 -/* 0412C 80A05D5C 01615825 */ or $t3, $t3, $at ## $t3 = 80000000 -.L80A05D60: -/* 04130 80A05D60 10000005 */ beq $zero, $zero, .L80A05D78 -/* 04134 80A05D64 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 04138 80A05D68 440B4000 */ mfc1 $t3, $f8 -.L80A05D6C: -/* 0413C 80A05D6C 00000000 */ nop -/* 04140 80A05D70 0560FFFB */ bltz $t3, .L80A05D60 -/* 04144 80A05D74 00000000 */ nop -.L80A05D78: -/* 04148 80A05D78 44CAF800 */ ctc1 $t2, $31 -/* 0414C 80A05D7C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 04150 80A05D80 C60A025C */ lwc1 $f10, 0x025C($s0) ## 0000025C -/* 04154 80A05D84 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 000000FF -/* 04158 80A05D88 4459F800 */ cfc1 $t9, $31 -/* 0415C 80A05D8C 44CAF800 */ ctc1 $t2, $31 -/* 04160 80A05D90 000C6C00 */ sll $t5, $t4, 16 -/* 04164 80A05D94 030D7825 */ or $t7, $t8, $t5 ## $t7 = FFFFFFFF -/* 04168 80A05D98 46005424 */ cvt.w.s $f16, $f10 -/* 0416C 80A05D9C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 04170 80A05DA0 444AF800 */ cfc1 $t2, $31 -/* 04174 80A05DA4 00000000 */ nop -/* 04178 80A05DA8 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 0417C 80A05DAC 51400013 */ beql $t2, $zero, .L80A05DFC -/* 04180 80A05DB0 440A8000 */ mfc1 $t2, $f16 -/* 04184 80A05DB4 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 04188 80A05DB8 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0418C 80A05DBC 46105401 */ sub.s $f16, $f10, $f16 -/* 04190 80A05DC0 44CAF800 */ ctc1 $t2, $31 -/* 04194 80A05DC4 00000000 */ nop -/* 04198 80A05DC8 46008424 */ cvt.w.s $f16, $f16 -/* 0419C 80A05DCC 444AF800 */ cfc1 $t2, $31 -/* 041A0 80A05DD0 00000000 */ nop -/* 041A4 80A05DD4 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 041A8 80A05DD8 15400005 */ bne $t2, $zero, .L80A05DF0 -/* 041AC 80A05DDC 00000000 */ nop -/* 041B0 80A05DE0 440A8000 */ mfc1 $t2, $f16 -/* 041B4 80A05DE4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 041B8 80A05DE8 10000007 */ beq $zero, $zero, .L80A05E08 -/* 041BC 80A05DEC 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 -.L80A05DF0: -/* 041C0 80A05DF0 10000005 */ beq $zero, $zero, .L80A05E08 -/* 041C4 80A05DF4 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 041C8 80A05DF8 440A8000 */ mfc1 $t2, $f16 -.L80A05DFC: -/* 041CC 80A05DFC 00000000 */ nop -/* 041D0 80A05E00 0540FFFB */ bltz $t2, .L80A05DF0 -/* 041D4 80A05E04 00000000 */ nop -.L80A05E08: -/* 041D8 80A05E08 44D9F800 */ ctc1 $t9, $31 -/* 041DC 80A05E0C 44849000 */ mtc1 $a0, $f18 ## $f18 = 0.00 -/* 041E0 80A05E10 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 041E4 80A05E14 314E00FF */ andi $t6, $t2, 0x00FF ## $t6 = 000000FF -/* 041E8 80A05E18 46809120 */ cvt.s.w $f4, $f18 -/* 041EC 80A05E1C 000E6200 */ sll $t4, $t6, 8 -/* 041F0 80A05E20 01ECC025 */ or $t8, $t7, $t4 ## $t8 = FFFFFFFF -/* 041F4 80A05E24 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 041F8 80A05E28 46002182 */ mul.s $f6, $f4, $f0 -/* 041FC 80A05E2C 444DF800 */ cfc1 $t5, $31 -/* 04200 80A05E30 44D9F800 */ ctc1 $t9, $31 -/* 04204 80A05E34 00000000 */ nop -/* 04208 80A05E38 46003224 */ cvt.w.s $f8, $f6 -/* 0420C 80A05E3C 4459F800 */ cfc1 $t9, $31 -/* 04210 80A05E40 00000000 */ nop -/* 04214 80A05E44 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 04218 80A05E48 53200013 */ beql $t9, $zero, .L80A05E98 -/* 0421C 80A05E4C 44194000 */ mfc1 $t9, $f8 -/* 04220 80A05E50 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 04224 80A05E54 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 04228 80A05E58 46083201 */ sub.s $f8, $f6, $f8 -/* 0422C 80A05E5C 44D9F800 */ ctc1 $t9, $31 -/* 04230 80A05E60 00000000 */ nop -/* 04234 80A05E64 46004224 */ cvt.w.s $f8, $f8 -/* 04238 80A05E68 4459F800 */ cfc1 $t9, $31 -/* 0423C 80A05E6C 00000000 */ nop -/* 04240 80A05E70 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 04244 80A05E74 17200005 */ bne $t9, $zero, .L80A05E8C -/* 04248 80A05E78 00000000 */ nop -/* 0424C 80A05E7C 44194000 */ mfc1 $t9, $f8 -/* 04250 80A05E80 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 04254 80A05E84 10000007 */ beq $zero, $zero, .L80A05EA4 -/* 04258 80A05E88 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 -.L80A05E8C: -/* 0425C 80A05E8C 10000005 */ beq $zero, $zero, .L80A05EA4 -/* 04260 80A05E90 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 04264 80A05E94 44194000 */ mfc1 $t9, $f8 -.L80A05E98: -/* 04268 80A05E98 00000000 */ nop -/* 0426C 80A05E9C 0720FFFB */ bltz $t9, .L80A05E8C -/* 04270 80A05EA0 00000000 */ nop -.L80A05EA4: -/* 04274 80A05EA4 332B00FF */ andi $t3, $t9, 0x00FF ## $t3 = 000000FF -/* 04278 80A05EA8 030B7025 */ or $t6, $t8, $t3 ## $t6 = FFFFFFFF -/* 0427C 80A05EAC AC4E0004 */ sw $t6, 0x0004($v0) ## 0000001C -/* 04280 80A05EB0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 04284 80A05EB4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 04288 80A05EB8 AFB00014 */ sw $s0, 0x0014($sp) -/* 0428C 80A05EBC AFA00010 */ sw $zero, 0x0010($sp) -/* 04290 80A05EC0 8D2F02D0 */ lw $t7, 0x02D0($t1) ## 000002D0 -/* 04294 80A05EC4 44CDF800 */ ctc1 $t5, $31 -/* 04298 80A05EC8 AFA90060 */ sw $t1, 0x0060($sp) -/* 0429C 80A05ECC 8FA40084 */ lw $a0, 0x0084($sp) -/* 042A0 80A05ED0 0C0288A2 */ jal SkelAnime_Draw2 -/* 042A4 80A05ED4 AFAF0018 */ sw $t7, 0x0018($sp) -/* 042A8 80A05ED8 8FA90060 */ lw $t1, 0x0060($sp) -/* 042AC 80A05EDC 3C0680A0 */ lui $a2, %hi(D_80A06134) ## $a2 = 80A00000 -/* 042B0 80A05EE0 24C66134 */ addiu $a2, $a2, %lo(D_80A06134) ## $a2 = 80A06134 -/* 042B4 80A05EE4 AD2202D0 */ sw $v0, 0x02D0($t1) ## 000002D0 -/* 042B8 80A05EE8 8FAC0084 */ lw $t4, 0x0084($sp) -/* 042BC 80A05EEC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 -/* 042C0 80A05EF0 24070AE9 */ addiu $a3, $zero, 0x0AE9 ## $a3 = 00000AE9 -/* 042C4 80A05EF4 0C031AD5 */ jal Graph_CloseDisps -/* 042C8 80A05EF8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -.L80A05EFC: -/* 042CC 80A05EFC 8FBF002C */ lw $ra, 0x002C($sp) -.L80A05F00: -/* 042D0 80A05F00 8FB00028 */ lw $s0, 0x0028($sp) -/* 042D4 80A05F04 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 042D8 80A05F08 03E00008 */ jr $ra -/* 042DC 80A05F0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s deleted file mode 100644 index 74934e0978..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s +++ /dev/null @@ -1,411 +0,0 @@ -.rdata -glabel D_80A060B0 - .asciz "0" - .balign 4 - -glabel D_80A060B4 - .asciz "../z_en_elf.c" - .balign 4 - -.late_rodata -glabel jtbl_80A06194 - .word L80A025C0 - .word L80A02630 - .word L80A02700 - .word L80A027BC - .word L80A02804 - .word L80A02694 - .word L80A0270C - .word L80A026E8 - -glabel D_80A061B4 - .float 32767.0 - -glabel D_80A061B8 - .float 11.989999771118164 - -.text -glabel EnElf_Init -/* 007E4 80A02414 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 007E8 80A02418 AFBF0034 */ sw $ra, 0x0034($sp) -/* 007EC 80A0241C AFB10030 */ sw $s1, 0x0030($sp) -/* 007F0 80A02420 AFB0002C */ sw $s0, 0x002C($sp) -/* 007F4 80A02424 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 007F8 80A02428 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 007FC 80A0242C 3C0580A0 */ lui $a1, %hi(D_80A06020) ## $a1 = 80A00000 -/* 00800 80A02430 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00804 80A02434 24A56020 */ addiu $a1, $a1, %lo(D_80A06020) ## $a1 = 80A06020 -/* 00808 80A02438 0C01E037 */ jal Actor_ProcessInitChain - -/* 0080C 80A0243C AFAE004C */ sw $t6, 0x004C($sp) -/* 00810 80A02440 3C060401 */ lui $a2, 0x0401 ## $a2 = 04010000 -/* 00814 80A02444 3C070401 */ lui $a3, 0x0401 ## $a3 = 04010000 -/* 00818 80A02448 260F0190 */ addiu $t7, $s0, 0x0190 ## $t7 = 00000190 -/* 0081C 80A0244C 261801EA */ addiu $t8, $s0, 0x01EA ## $t8 = 000001EA -/* 00820 80A02450 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F -/* 00824 80A02454 AFB90018 */ sw $t9, 0x0018($sp) -/* 00828 80A02458 AFB80014 */ sw $t8, 0x0014($sp) -/* 0082C 80A0245C AFAF0010 */ sw $t7, 0x0010($sp) -/* 00830 80A02460 24E74BA4 */ addiu $a3, $a3, 0x4BA4 ## $a3 = 04014BA4 -/* 00834 80A02464 24C66A48 */ addiu $a2, $a2, 0x6A48 ## $a2 = 04016A48 -/* 00838 80A02468 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0083C 80A0246C 0C02915F */ jal SkelAnime_Init - -/* 00840 80A02470 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00844 80A02474 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00848 80A02478 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0084C 80A0247C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00850 80A02480 0C00AC78 */ jal ActorShape_Init - -/* 00854 80A02484 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 -/* 00858 80A02488 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 0085C 80A0248C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00860 80A02490 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 00864 80A02494 4600218D */ trunc.w.s $f6, $f4 -/* 00868 80A02498 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 0086C 80A0249C A20800C8 */ sb $t0, 0x00C8($s0) ## 000000C8 -/* 00870 80A024A0 4600428D */ trunc.w.s $f10, $f8 -/* 00874 80A024A4 44053000 */ mfc1 $a1, $f6 -/* 00878 80A024A8 26040264 */ addiu $a0, $s0, 0x0264 ## $a0 = 00000264 -/* 0087C 80A024AC 4600848D */ trunc.w.s $f18, $f16 -/* 00880 80A024B0 44065000 */ mfc1 $a2, $f10 -/* 00884 80A024B4 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00888 80A024B8 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 0088C 80A024BC 44079000 */ mfc1 $a3, $f18 -/* 00890 80A024C0 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00894 80A024C4 00052C00 */ sll $a1, $a1, 16 -/* 00898 80A024C8 00063400 */ sll $a2, $a2, 16 -/* 0089C 80A024CC 00073C00 */ sll $a3, $a3, 16 -/* 008A0 80A024D0 00073C03 */ sra $a3, $a3, 16 -/* 008A4 80A024D4 00063403 */ sra $a2, $a2, 16 -/* 008A8 80A024D8 00052C03 */ sra $a1, $a1, 16 -/* 008AC 80A024DC AFAE0018 */ sw $t6, 0x0018($sp) -/* 008B0 80A024E0 AFAD0014 */ sw $t5, 0x0014($sp) -/* 008B4 80A024E4 AFAC0010 */ sw $t4, 0x0010($sp) -/* 008B8 80A024E8 AFA4003C */ sw $a0, 0x003C($sp) -/* 008BC 80A024EC 0C01E77C */ jal Lights_PointGlowSetInfo - -/* 008C0 80A024F0 AFA0001C */ sw $zero, 0x001C($sp) -/* 008C4 80A024F4 262507A8 */ addiu $a1, $s1, 0x07A8 ## $a1 = 000007A8 -/* 008C8 80A024F8 AFA50040 */ sw $a1, 0x0040($sp) -/* 008CC 80A024FC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 008D0 80A02500 0C01E9D9 */ jal LightContext_InsertLight - -/* 008D4 80A02504 8FA6003C */ lw $a2, 0x003C($sp) -/* 008D8 80A02508 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 008DC 80A0250C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 008E0 80A02510 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 008E4 80A02514 4600218D */ trunc.w.s $f6, $f4 -/* 008E8 80A02518 AE020274 */ sw $v0, 0x0274($s0) ## 00000274 -/* 008EC 80A0251C 26040278 */ addiu $a0, $s0, 0x0278 ## $a0 = 00000278 -/* 008F0 80A02520 4600428D */ trunc.w.s $f10, $f8 -/* 008F4 80A02524 44053000 */ mfc1 $a1, $f6 -/* 008F8 80A02528 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 008FC 80A0252C 4600848D */ trunc.w.s $f18, $f16 -/* 00900 80A02530 44065000 */ mfc1 $a2, $f10 -/* 00904 80A02534 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 00908 80A02538 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 0090C 80A0253C 44079000 */ mfc1 $a3, $f18 -/* 00910 80A02540 00052C00 */ sll $a1, $a1, 16 -/* 00914 80A02544 00063400 */ sll $a2, $a2, 16 -/* 00918 80A02548 00073C00 */ sll $a3, $a3, 16 -/* 0091C 80A0254C 00073C03 */ sra $a3, $a3, 16 -/* 00920 80A02550 00063403 */ sra $a2, $a2, 16 -/* 00924 80A02554 00052C03 */ sra $a1, $a1, 16 -/* 00928 80A02558 AFAA0018 */ sw $t2, 0x0018($sp) -/* 0092C 80A0255C AFA90014 */ sw $t1, 0x0014($sp) -/* 00930 80A02560 AFA80010 */ sw $t0, 0x0010($sp) -/* 00934 80A02564 AFA4003C */ sw $a0, 0x003C($sp) -/* 00938 80A02568 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 0093C 80A0256C AFA0001C */ sw $zero, 0x001C($sp) -/* 00940 80A02570 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00944 80A02574 8FA50040 */ lw $a1, 0x0040($sp) -/* 00948 80A02578 0C01E9D9 */ jal LightContext_InsertLight - -/* 0094C 80A0257C 8FA6003C */ lw $a2, 0x003C($sp) -/* 00950 80A02580 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00954 80A02584 240B0258 */ addiu $t3, $zero, 0x0258 ## $t3 = 00000258 -/* 00958 80A02588 AE020288 */ sw $v0, 0x0288($s0) ## 00000288 -/* 0095C 80A0258C A60002C4 */ sh $zero, 0x02C4($s0) ## 000002C4 -/* 00960 80A02590 A60B02C2 */ sh $t3, 0x02C2($s0) ## 000002C2 -/* 00964 80A02594 E60402A4 */ swc1 $f4, 0x02A4($s0) ## 000002A4 -/* 00968 80A02598 AFA00048 */ sw $zero, 0x0048($sp) -/* 0096C 80A0259C 960C001C */ lhu $t4, 0x001C($s0) ## 0000001C -/* 00970 80A025A0 2D810008 */ sltiu $at, $t4, 0x0008 -/* 00974 80A025A4 102000BA */ beq $at, $zero, .L80A02890 -/* 00978 80A025A8 000C6080 */ sll $t4, $t4, 2 -/* 0097C 80A025AC 3C0180A0 */ lui $at, %hi(jtbl_80A06194) ## $at = 80A00000 -/* 00980 80A025B0 002C0821 */ addu $at, $at, $t4 -/* 00984 80A025B4 8C2C6194 */ lw $t4, %lo(jtbl_80A06194)($at) -/* 00988 80A025B8 01800008 */ jr $t4 -/* 0098C 80A025BC 00000000 */ nop -glabel L80A025C0 -/* 00990 80A025C0 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 00994 80A025C4 3C0580A0 */ lui $a1, %hi(func_80A03CF8) ## $a1 = 80A00000 -/* 00998 80A025C8 A20D0003 */ sb $t5, 0x0003($s0) ## 00000003 -/* 0099C 80A025CC 24A53CF8 */ addiu $a1, $a1, %lo(func_80A03CF8) ## $a1 = 80A03CF8 -/* 009A0 80A025D0 0C28070C */ jal func_80A01C30 -/* 009A4 80A025D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009A8 80A025D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009AC 80A025DC 0C28070E */ jal func_80A01C38 -/* 009B0 80A025E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 009B4 80A025E4 960E02C4 */ lhu $t6, 0x02C4($s0) ## 000002C4 -/* 009B8 80A025E8 3C1880A0 */ lui $t8, %hi(func_80A053F0) ## $t8 = 80A00000 -/* 009BC 80A025EC 3C038016 */ lui $v1, %hi(gSaveContext) -/* 009C0 80A025F0 271853F0 */ addiu $t8, $t8, %lo(func_80A053F0) ## $t8 = 80A053F0 -/* 009C4 80A025F4 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 009C8 80A025F8 35CF0004 */ ori $t7, $t6, 0x0004 ## $t7 = 00000004 -/* 009CC 80A025FC 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 009D0 80A02600 A60F02C4 */ sh $t7, 0x02C4($s0) ## 000002C4 -/* 009D4 80A02604 AE180130 */ sw $t8, 0x0130($s0) ## 00000130 -/* 009D8 80A02608 AE000298 */ sw $zero, 0x0298($s0) ## 00000298 -/* 009DC 80A0260C A21902C7 */ sb $t9, 0x02C7($s0) ## 000002C7 -/* 009E0 80A02610 94620038 */ lhu $v0, 0x0038($v1) ## 8015E698 -/* 009E4 80A02614 284164C8 */ slti $at, $v0, 0x64C8 -/* 009E8 80A02618 10200003 */ beq $at, $zero, .L80A02628 -/* 009EC 80A0261C 28410BB8 */ slti $at, $v0, 0x0BB8 -/* 009F0 80A02620 502000A2 */ beql $at, $zero, .L80A028AC -/* 009F4 80A02624 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -.L80A02628: -/* 009F8 80A02628 1000009F */ beq $zero, $zero, .L80A028A8 -/* 009FC 80A0262C A4600038 */ sh $zero, 0x0038($v1) ## 8015E698 -glabel L80A02630 -/* 00A00 80A02630 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 00A04 80A02634 3C0580A0 */ lui $a1, %hi(func_80A03610) ## $a1 = 80A00000 -/* 00A08 80A02638 AFA80048 */ sw $t0, 0x0048($sp) -/* 00A0C 80A0263C 24A53610 */ addiu $a1, $a1, %lo(func_80A03610) ## $a1 = 80A03610 -/* 00A10 80A02640 0C28070C */ jal func_80A01C30 -/* 00A14 80A02644 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A18 80A02648 8FA5004C */ lw $a1, 0x004C($sp) -/* 00A1C 80A0264C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00A20 80A02650 0C01E00A */ jal Math_Vec3f_DistXZ - -/* 00A24 80A02654 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 00A28 80A02658 E60002B8 */ swc1 $f0, 0x02B8($s0) ## 000002B8 -/* 00A2C 80A0265C 8FA9004C */ lw $t1, 0x004C($sp) -/* 00A30 80A02660 240BF000 */ addiu $t3, $zero, 0xF000 ## $t3 = FFFFF000 -/* 00A34 80A02664 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 00A38 80A02668 852A00B6 */ lh $t2, 0x00B6($t1) ## 000000B6 -/* 00A3C 80A0266C A60B02B0 */ sh $t3, 0x02B0($s0) ## 000002B0 -/* 00A40 80A02670 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00A44 80A02674 A60A02AC */ sh $t2, 0x02AC($s0) ## 000002AC -/* 00A48 80A02678 8FAC004C */ lw $t4, 0x004C($sp) -/* 00A4C 80A0267C C5880028 */ lwc1 $f8, 0x0028($t4) ## 00000028 -/* 00A50 80A02680 A60002AA */ sh $zero, 0x02AA($s0) ## 000002AA -/* 00A54 80A02684 E61002B4 */ swc1 $f16, 0x02B4($s0) ## 000002B4 -/* 00A58 80A02688 46083281 */ sub.s $f10, $f6, $f8 -/* 00A5C 80A0268C 10000086 */ beq $zero, $zero, .L80A028A8 -/* 00A60 80A02690 E60A0290 */ swc1 $f10, 0x0290($s0) ## 00000290 -glabel L80A02694 -/* 00A64 80A02694 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 00A68 80A02698 3C0580A0 */ lui $a1, %hi(func_80A03990) ## $a1 = 80A00000 -/* 00A6C 80A0269C AFAD0048 */ sw $t5, 0x0048($sp) -/* 00A70 80A026A0 24A53990 */ addiu $a1, $a1, %lo(func_80A03990) ## $a1 = 80A03990 -/* 00A74 80A026A4 0C28070C */ jal func_80A01C30 -/* 00A78 80A026A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A7C 80A026AC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00A80 80A026B0 8FA2004C */ lw $v0, 0x004C($sp) -/* 00A84 80A026B4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00A88 80A026B8 E61202B8 */ swc1 $f18, 0x02B8($s0) ## 000002B8 -/* 00A8C 80A026BC 844E00B6 */ lh $t6, 0x00B6($v0) ## 000000B6 -/* 00A90 80A026C0 A60002B0 */ sh $zero, 0x02B0($s0) ## 000002B0 -/* 00A94 80A026C4 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 00A98 80A026C8 A60E02AC */ sh $t6, 0x02AC($s0) ## 000002AC -/* 00A9C 80A026CC C4460028 */ lwc1 $f6, 0x0028($v0) ## 00000028 -/* 00AA0 80A026D0 44815000 */ mtc1 $at, $f10 ## $f10 = 7.00 -/* 00AA4 80A026D4 A60002AA */ sh $zero, 0x02AA($s0) ## 000002AA -/* 00AA8 80A026D8 46062201 */ sub.s $f8, $f4, $f6 -/* 00AAC 80A026DC E60A02B4 */ swc1 $f10, 0x02B4($s0) ## 000002B4 -/* 00AB0 80A026E0 10000071 */ beq $zero, $zero, .L80A028A8 -/* 00AB4 80A026E4 E6080290 */ swc1 $f8, 0x0290($s0) ## 00000290 -glabel L80A026E8 -/* 00AB8 80A026E8 960F02C4 */ lhu $t7, 0x02C4($s0) ## 000002C4 -/* 00ABC 80A026EC 3C198003 */ lui $t9, %hi(ActorShadow_DrawFunc_WhiteCircle) -/* 00AC0 80A026F0 2739B614 */ addiu $t9, %lo(ActorShadow_DrawFunc_WhiteCircle) -/* 00AC4 80A026F4 35F80200 */ ori $t8, $t7, 0x0200 ## $t8 = 00000200 -/* 00AC8 80A026F8 A61802C4 */ sh $t8, 0x02C4($s0) ## 000002C4 -/* 00ACC 80A026FC AE1900C0 */ sw $t9, 0x00C0($s0) ## 000000C0 -glabel L80A02700 -/* 00AD0 80A02700 960802C4 */ lhu $t0, 0x02C4($s0) ## 000002C4 -/* 00AD4 80A02704 35090100 */ ori $t1, $t0, 0x0100 ## $t1 = 00000100 -/* 00AD8 80A02708 A60902C4 */ sh $t1, 0x02C4($s0) ## 000002C4 -glabel L80A0270C -/* 00ADC 80A0270C 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 00AE0 80A02710 3C0580A0 */ lui $a1, %hi(func_80A0329C) ## $a1 = 80A00000 -/* 00AE4 80A02714 AFAA0048 */ sw $t2, 0x0048($sp) -/* 00AE8 80A02718 24A5329C */ addiu $a1, $a1, %lo(func_80A0329C) ## $a1 = 80A0329C -/* 00AEC 80A0271C 0C28070C */ jal func_80A01C30 -/* 00AF0 80A02720 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AF4 80A02724 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00AF8 80A02728 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 00AFC 80A0272C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00B00 80A02730 00000000 */ nop -/* 00B04 80A02734 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00B08 80A02738 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 00B0C 80A0273C 3C014483 */ lui $at, 0x4483 ## $at = 44830000 -/* 00B10 80A02740 44816000 */ mtc1 $at, $f12 ## $f12 = 1048.00 -/* 00B14 80A02744 46100480 */ add.s $f18, $f0, $f16 -/* 00B18 80A02748 A60002AA */ sh $zero, 0x02AA($s0) ## 000002AA -/* 00B1C 80A0274C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00B20 80A02750 E61202B4 */ swc1 $f18, 0x02B4($s0) ## 000002B4 -/* 00B24 80A02754 4600010D */ trunc.w.s $f4, $f0 -/* 00B28 80A02758 8E190024 */ lw $t9, 0x0024($s0) ## 00000024 -/* 00B2C 80A0275C 8E180028 */ lw $t8, 0x0028($s0) ## 00000028 -/* 00B30 80A02760 3C0180A0 */ lui $at, %hi(D_80A061B4) ## $at = 80A00000 -/* 00B34 80A02764 440E2000 */ mfc1 $t6, $f4 -/* 00B38 80A02768 AE19028C */ sw $t9, 0x028C($s0) ## 0000028C -/* 00B3C 80A0276C 8E19002C */ lw $t9, 0x002C($s0) ## 0000002C -/* 00B40 80A02770 25CF0200 */ addiu $t7, $t6, 0x0200 ## $t7 = 00000200 -/* 00B44 80A02774 A60F02AE */ sh $t7, 0x02AE($s0) ## 000002AE -/* 00B48 80A02778 AE180290 */ sw $t8, 0x0290($s0) ## 00000290 -/* 00B4C 80A0277C AE190294 */ sw $t9, 0x0294($s0) ## 00000294 -/* 00B50 80A02780 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00B54 80A02784 C42C61B4 */ lwc1 $f12, %lo(D_80A061B4)($at) -/* 00B58 80A02788 4600018D */ trunc.w.s $f6, $f0 -/* 00B5C 80A0278C 3C0A80A0 */ lui $t2, %hi(func_80A0214C) ## $t2 = 80A00000 -/* 00B60 80A02790 254A214C */ addiu $t2, $t2, %lo(func_80A0214C) ## $t2 = 80A0214C -/* 00B64 80A02794 AE0A02C8 */ sw $t2, 0x02C8($s0) ## 000002C8 -/* 00B68 80A02798 44093000 */ mfc1 $t1, $f6 -/* 00B6C 80A0279C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B70 80A027A0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00B74 80A027A4 0C2808CB */ jal func_80A0232C -/* 00B78 80A027A8 A60902BC */ sh $t1, 0x02BC($s0) ## 000002BC -/* 00B7C 80A027AC 240B00F0 */ addiu $t3, $zero, 0x00F0 ## $t3 = 000000F0 -/* 00B80 80A027B0 A60002C0 */ sh $zero, 0x02C0($s0) ## 000002C0 -/* 00B84 80A027B4 1000003C */ beq $zero, $zero, .L80A028A8 -/* 00B88 80A027B8 A60B02C2 */ sh $t3, 0x02C2($s0) ## 000002C2 -glabel L80A027BC -/* 00B8C 80A027BC 3C0180A0 */ lui $at, %hi(D_80A061B8) ## $at = 80A00000 -/* 00B90 80A027C0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00B94 80A027C4 C42C61B8 */ lwc1 $f12, %lo(D_80A061B8)($at) -/* 00B98 80A027C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00B9C 80A027CC 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 00BA0 80A027D0 3C0580A0 */ lui $a1, %hi(func_80A0353C) ## $a1 = 80A00000 -/* 00BA4 80A027D4 24A5353C */ addiu $a1, $a1, %lo(func_80A0353C) ## $a1 = 80A0353C -/* 00BA8 80A027D8 46080280 */ add.s $f10, $f0, $f8 -/* 00BAC 80A027DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BB0 80A027E0 4600540D */ trunc.w.s $f16, $f10 -/* 00BB4 80A027E4 440D8000 */ mfc1 $t5, $f16 -/* 00BB8 80A027E8 0C28070C */ jal func_80A01C30 -/* 00BBC 80A027EC AFAD0048 */ sw $t5, 0x0048($sp) -/* 00BC0 80A027F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BC4 80A027F4 0C28070E */ jal func_80A01C38 -/* 00BC8 80A027F8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00BCC 80A027FC 1000002B */ beq $zero, $zero, .L80A028AC -/* 00BD0 80A02800 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -glabel L80A02804 -/* 00BD4 80A02804 3C0580A0 */ lui $a1, %hi(func_80A03604) ## $a1 = 80A00000 -/* 00BD8 80A02808 24A53604 */ addiu $a1, $a1, %lo(func_80A03604) ## $a1 = 80A03604 -/* 00BDC 80A0280C 0C28070C */ jal func_80A01C30 -/* 00BE0 80A02810 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BE4 80A02814 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BE8 80A02818 0C28070E */ jal func_80A01C38 -/* 00BEC 80A0281C 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 00BF0 80A02820 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 00BF4 80A02824 AFA40040 */ sw $a0, 0x0040($sp) -/* 00BF8 80A02828 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 00BFC 80A0282C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -.L80A02830: -/* 00C00 80A02830 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 00C04 80A02834 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 00C08 80A02838 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 00C0C 80A0283C 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 00C10 80A02840 46049181 */ sub.s $f6, $f18, $f4 -/* 00C14 80A02844 8FA40040 */ lw $a0, 0x0040($sp) -/* 00C18 80A02848 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00C1C 80A0284C 24060018 */ addiu $a2, $zero, 0x0018 ## $a2 = 00000018 -/* 00C20 80A02850 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00C24 80A02854 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00C28 80A02858 AFA30044 */ sw $v1, 0x0044($sp) -/* 00C2C 80A0285C AFAE0024 */ sw $t6, 0x0024($sp) -/* 00C30 80A02860 AFA00020 */ sw $zero, 0x0020($sp) -/* 00C34 80A02864 AFA0001C */ sw $zero, 0x001C($sp) -/* 00C38 80A02868 AFA00018 */ sw $zero, 0x0018($sp) -/* 00C3C 80A0286C 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00C40 80A02870 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00C44 80A02874 8FA30044 */ lw $v1, 0x0044($sp) -/* 00C48 80A02878 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00C4C 80A0287C 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 00C50 80A02880 5461FFEB */ bnel $v1, $at, .L80A02830 -/* 00C54 80A02884 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00C58 80A02888 10000008 */ beq $zero, $zero, .L80A028AC -/* 00C5C 80A0288C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -.L80A02890: -/* 00C60 80A02890 3C0480A0 */ lui $a0, %hi(D_80A060B0) ## $a0 = 80A00000 -/* 00C64 80A02894 3C0580A0 */ lui $a1, %hi(D_80A060B4) ## $a1 = 80A00000 -/* 00C68 80A02898 24A560B4 */ addiu $a1, $a1, %lo(D_80A060B4) ## $a1 = 80A060B4 -/* 00C6C 80A0289C 248460B0 */ addiu $a0, $a0, %lo(D_80A060B0) ## $a0 = 80A060B0 -/* 00C70 80A028A0 0C0007FC */ jal __assert - -/* 00C74 80A028A4 2406044F */ addiu $a2, $zero, 0x044F ## $a2 = 0000044F -.L80A028A8: -/* 00C78 80A028A8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -.L80A028AC: -/* 00C7C 80A028AC 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 -/* 00C80 80A028B0 3C0480A0 */ lui $a0, %hi(D_80A06024) ## $a0 = 80A00000 -/* 00C84 80A028B4 24846024 */ addiu $a0, $a0, %lo(D_80A06024) ## $a0 = 80A06024 -/* 00C88 80A028B8 E60A02A0 */ swc1 $f10, 0x02A0($s0) ## 000002A0 -/* 00C8C 80A028BC 8C980000 */ lw $t8, 0x0000($a0) ## 80A06024 -/* 00C90 80A028C0 26030244 */ addiu $v1, $s0, 0x0244 ## $v1 = 00000244 -/* 00C94 80A028C4 3C0980A0 */ lui $t1, %hi(D_80A06064) ## $t1 = 80A00000 -/* 00C98 80A028C8 AC780000 */ sw $t8, 0x0000($v1) ## 00000244 -/* 00C9C 80A028CC 8C8F0004 */ lw $t7, 0x0004($a0) ## 80A06028 -/* 00CA0 80A028D0 25296064 */ addiu $t1, $t1, %lo(D_80A06064) ## $t1 = 80A06064 -/* 00CA4 80A028D4 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000248 -/* 00CA8 80A028D8 8C980008 */ lw $t8, 0x0008($a0) ## 80A0602C -/* 00CAC 80A028DC AC780008 */ sw $t8, 0x0008($v1) ## 0000024C -/* 00CB0 80A028E0 8C8F000C */ lw $t7, 0x000C($a0) ## 80A06030 -/* 00CB4 80A028E4 AC6F000C */ sw $t7, 0x000C($v1) ## 00000250 -/* 00CB8 80A028E8 8FB90048 */ lw $t9, 0x0048($sp) -/* 00CBC 80A028EC 8FA20048 */ lw $v0, 0x0048($sp) -/* 00CC0 80A028F0 1B200010 */ blez $t9, .L80A02934 -/* 00CC4 80A028F4 00021023 */ subu $v0, $zero, $v0 -/* 00CC8 80A028F8 00194080 */ sll $t0, $t9, 2 -/* 00CCC 80A028FC 01194023 */ subu $t0, $t0, $t9 -/* 00CD0 80A02900 01098821 */ addu $s1, $t0, $t1 -/* 00CD4 80A02904 0C2808E9 */ jal func_80A023A4 -/* 00CD8 80A02908 92240000 */ lbu $a0, 0x0000($s1) ## 00000000 -/* 00CDC 80A0290C E6000254 */ swc1 $f0, 0x0254($s0) ## 00000254 -/* 00CE0 80A02910 0C2808E9 */ jal func_80A023A4 -/* 00CE4 80A02914 92240001 */ lbu $a0, 0x0001($s1) ## 00000001 -/* 00CE8 80A02918 E6000258 */ swc1 $f0, 0x0258($s0) ## 00000258 -/* 00CEC 80A0291C 0C2808E9 */ jal func_80A023A4 -/* 00CF0 80A02920 92240002 */ lbu $a0, 0x0002($s1) ## 00000002 -/* 00CF4 80A02924 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00CF8 80A02928 E600025C */ swc1 $f0, 0x025C($s0) ## 0000025C -/* 00CFC 80A0292C 10000016 */ beq $zero, $zero, .L80A02988 -/* 00D00 80A02930 E6100260 */ swc1 $f16, 0x0260($s0) ## 00000260 -.L80A02934: -/* 00D04 80A02934 00021100 */ sll $v0, $v0, 4 -/* 00D08 80A02938 00825021 */ addu $t2, $a0, $v0 -/* 00D0C 80A0293C 8D4C0000 */ lw $t4, 0x0000($t2) ## 00000000 -/* 00D10 80A02940 3C0D80A0 */ lui $t5, %hi(D_80A06044) ## $t5 = 80A00000 -/* 00D14 80A02944 25AD6044 */ addiu $t5, $t5, %lo(D_80A06044) ## $t5 = 80A06044 -/* 00D18 80A02948 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 -/* 00D1C 80A0294C 8D4B0004 */ lw $t3, 0x0004($t2) ## 00000004 -/* 00D20 80A02950 004D7021 */ addu $t6, $v0, $t5 -/* 00D24 80A02954 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 00D28 80A02958 8D4C0008 */ lw $t4, 0x0008($t2) ## 00000008 -/* 00D2C 80A0295C AC6C0008 */ sw $t4, 0x0008($v1) ## 00000008 -/* 00D30 80A02960 8D4B000C */ lw $t3, 0x000C($t2) ## 0000000C -/* 00D34 80A02964 AC6B000C */ sw $t3, 0x000C($v1) ## 0000000C -/* 00D38 80A02968 8DD80000 */ lw $t8, 0x0000($t6) ## 00000000 -/* 00D3C 80A0296C AE180254 */ sw $t8, 0x0254($s0) ## 00000254 -/* 00D40 80A02970 8DCF0004 */ lw $t7, 0x0004($t6) ## 00000004 -/* 00D44 80A02974 AE0F0258 */ sw $t7, 0x0258($s0) ## 00000258 -/* 00D48 80A02978 8DD80008 */ lw $t8, 0x0008($t6) ## 00000008 -/* 00D4C 80A0297C AE18025C */ sw $t8, 0x025C($s0) ## 0000025C -/* 00D50 80A02980 8DCF000C */ lw $t7, 0x000C($t6) ## 0000000C -/* 00D54 80A02984 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 -.L80A02988: -/* 00D58 80A02988 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00D5C 80A0298C 8FB0002C */ lw $s0, 0x002C($sp) -/* 00D60 80A02990 8FB10030 */ lw $s1, 0x0030($sp) -/* 00D64 80A02994 03E00008 */ jr $ra -/* 00D68 80A02998 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Update.s deleted file mode 100644 index 00d74b2af6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Update.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel EnElf_Update -/* 03AAC 80A056DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03AB0 80A056E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03AB4 80A056E4 AFA5001C */ sw $a1, 0x001C($sp) -/* 03AB8 80A056E8 AFA40018 */ sw $a0, 0x0018($sp) -/* 03ABC 80A056EC 8C9902CC */ lw $t9, 0x02CC($a0) ## 000002CC -/* 03AC0 80A056F0 0320F809 */ jalr $ra, $t9 -/* 03AC4 80A056F4 00000000 */ nop -/* 03AC8 80A056F8 8FA40018 */ lw $a0, 0x0018($sp) -/* 03ACC 80A056FC 948F02BE */ lhu $t7, 0x02BE($a0) ## 000002BE -/* 03AD0 80A05700 948802C4 */ lhu $t0, 0x02C4($a0) ## 000002C4 -/* 03AD4 80A05704 848E02BC */ lh $t6, 0x02BC($a0) ## 000002BC -/* 03AD8 80A05708 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 03ADC 80A0570C 31090200 */ andi $t1, $t0, 0x0200 ## $t1 = 00000000 -/* 03AE0 80A05710 A49802BE */ sh $t8, 0x02BE($a0) ## 000002BE -/* 03AE4 80A05714 11200003 */ beq $t1, $zero, .L80A05724 -/* 03AE8 80A05718 A48E00B6 */ sh $t6, 0x00B6($a0) ## 000000B6 -/* 03AEC 80A0571C 0C281364 */ jal func_80A04D90 -/* 03AF0 80A05720 8FA5001C */ lw $a1, 0x001C($sp) -.L80A05724: -/* 03AF4 80A05724 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03AF8 80A05728 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03AFC 80A0572C 03E00008 */ jr $ra -/* 03B00 80A05730 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C30.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C30.s deleted file mode 100644 index e02dc557e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C30.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80A01C30 -/* 00000 80A01C30 03E00008 */ jr $ra -/* 00004 80A01C34 AC8502CC */ sw $a1, 0x02CC($a0) ## 000002CC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s deleted file mode 100644 index 48d0109d99..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s +++ /dev/null @@ -1,246 +0,0 @@ -.late_rodata -glabel jtbl_80A06144 - .word L80A01C60 - .word L80A01DE0 - .word L80A01E24 - .word L80A01E68 - .word L80A01E94 - .word L80A01ED0 - .word L80A01F04 - .word L80A01D70 - .word L80A01DA8 - .word L80A01D2C - .word L80A01CF0 - .word L80A01F48 - .word L80A01CAC - -.text -glabel func_80A01C38 -/* 00008 80A01C38 30AEFFFF */ andi $t6, $a1, 0xFFFF ## $t6 = 00000000 -/* 0000C 80A01C3C 2DC1000D */ sltiu $at, $t6, 0x000D -/* 00010 80A01C40 102000D1 */ beq $at, $zero, .L80A01F88 -/* 00014 80A01C44 A48502A8 */ sh $a1, 0x02A8($a0) ## 000002A8 -/* 00018 80A01C48 000E7080 */ sll $t6, $t6, 2 -/* 0001C 80A01C4C 3C0180A0 */ lui $at, %hi(jtbl_80A06144) ## $at = 80A00000 -/* 00020 80A01C50 002E0821 */ addu $at, $at, $t6 -/* 00024 80A01C54 8C2E6144 */ lw $t6, %lo(jtbl_80A06144)($at) -/* 00028 80A01C58 01C00008 */ jr $t6 -/* 0002C 80A01C5C 00000000 */ nop -glabel L80A01C60 -/* 00030 80A01C60 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00034 80A01C64 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00038 80A01C68 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0003C 80A01C6C 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 00040 80A01C70 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00044 80A01C74 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 00048 80A01C78 3C1980A0 */ lui $t9, %hi(func_80A02A20) ## $t9 = 80A00000 -/* 0004C 80A01C7C 240F0400 */ addiu $t7, $zero, 0x0400 ## $t7 = 00000400 -/* 00050 80A01C80 24180200 */ addiu $t8, $zero, 0x0200 ## $t8 = 00000200 -/* 00054 80A01C84 27392A20 */ addiu $t9, $t9, %lo(func_80A02A20) ## $t9 = 80A02A20 -/* 00058 80A01C88 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 -/* 0005C 80A01C8C A48F02AE */ sh $t7, 0x02AE($a0) ## 000002AE -/* 00060 80A01C90 A49802B0 */ sh $t8, 0x02B0($a0) ## 000002B0 -/* 00064 80A01C94 AC9902C8 */ sw $t9, 0x02C8($a0) ## 000002C8 -/* 00068 80A01C98 A48802C0 */ sh $t0, 0x02C0($a0) ## 000002C0 -/* 0006C 80A01C9C E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 00070 80A01CA0 E48402B4 */ swc1 $f4, 0x02B4($a0) ## 000002B4 -/* 00074 80A01CA4 03E00008 */ jr $ra -/* 00078 80A01CA8 E48602B8 */ swc1 $f6, 0x02B8($a0) ## 000002B8 -glabel L80A01CAC -/* 0007C 80A01CAC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00080 80A01CB0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00084 80A01CB4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00088 80A01CB8 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 0008C 80A01CBC 3C0B80A0 */ lui $t3, %hi(func_80A02A20) ## $t3 = 80A00000 -/* 00090 80A01CC0 24090400 */ addiu $t1, $zero, 0x0400 ## $t1 = 00000400 -/* 00094 80A01CC4 240A0200 */ addiu $t2, $zero, 0x0200 ## $t2 = 00000200 -/* 00098 80A01CC8 256B2A20 */ addiu $t3, $t3, %lo(func_80A02A20) ## $t3 = 80A02A20 -/* 0009C 80A01CCC 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 -/* 000A0 80A01CD0 A48902AE */ sh $t1, 0x02AE($a0) ## 000002AE -/* 000A4 80A01CD4 A48A02B0 */ sh $t2, 0x02B0($a0) ## 000002B0 -/* 000A8 80A01CD8 AC8B02C8 */ sw $t3, 0x02C8($a0) ## 000002C8 -/* 000AC 80A01CDC A48C02C0 */ sh $t4, 0x02C0($a0) ## 000002C0 -/* 000B0 80A01CE0 E48002B4 */ swc1 $f0, 0x02B4($a0) ## 000002B4 -/* 000B4 80A01CE4 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 000B8 80A01CE8 03E00008 */ jr $ra -/* 000BC 80A01CEC E48802B8 */ swc1 $f8, 0x02B8($a0) ## 000002B8 -glabel L80A01CF0 -/* 000C0 80A01CF0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 000C4 80A01CF4 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 000C8 80A01CF8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 000CC 80A01CFC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 000D0 80A01D00 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 000D4 80A01D04 3C0E80A0 */ lui $t6, %hi(func_80A02A20) ## $t6 = 80A00000 -/* 000D8 80A01D08 240D0400 */ addiu $t5, $zero, 0x0400 ## $t5 = 00000400 -/* 000DC 80A01D0C 25CE2A20 */ addiu $t6, $t6, %lo(func_80A02A20) ## $t6 = 80A02A20 -/* 000E0 80A01D10 A48D02AE */ sh $t5, 0x02AE($a0) ## 000002AE -/* 000E4 80A01D14 A48002B0 */ sh $zero, 0x02B0($a0) ## 000002B0 -/* 000E8 80A01D18 AC8E02C8 */ sw $t6, 0x02C8($a0) ## 000002C8 -/* 000EC 80A01D1C E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 000F0 80A01D20 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 -/* 000F4 80A01D24 03E00008 */ jr $ra -/* 000F8 80A01D28 E48A02B4 */ swc1 $f10, 0x02B4($a0) ## 000002B4 -glabel L80A01D2C -/* 000FC 80A01D2C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00100 80A01D30 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00104 80A01D34 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00108 80A01D38 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 0010C 80A01D3C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00110 80A01D40 44818000 */ mtc1 $at, $f16 ## $f16 = 3.00 -/* 00114 80A01D44 3C1980A0 */ lui $t9, %hi(func_80A02A20) ## $t9 = 80A00000 -/* 00118 80A01D48 240F1000 */ addiu $t7, $zero, 0x1000 ## $t7 = 00001000 -/* 0011C 80A01D4C 24180200 */ addiu $t8, $zero, 0x0200 ## $t8 = 00000200 -/* 00120 80A01D50 27392A20 */ addiu $t9, $t9, %lo(func_80A02A20) ## $t9 = 80A02A20 -/* 00124 80A01D54 A48F02AE */ sh $t7, 0x02AE($a0) ## 000002AE -/* 00128 80A01D58 A49802B0 */ sh $t8, 0x02B0($a0) ## 000002B0 -/* 0012C 80A01D5C AC9902C8 */ sw $t9, 0x02C8($a0) ## 000002C8 -/* 00130 80A01D60 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 00134 80A01D64 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 -/* 00138 80A01D68 03E00008 */ jr $ra -/* 0013C 80A01D6C E49002B4 */ swc1 $f16, 0x02B4($a0) ## 000002B4 -glabel L80A01D70 -/* 00140 80A01D70 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00144 80A01D74 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00148 80A01D78 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 0014C 80A01D7C 3C0880A0 */ lui $t0, %hi(func_80A02A20) ## $t0 = 80A00000 -/* 00150 80A01D80 25082A20 */ addiu $t0, $t0, %lo(func_80A02A20) ## $t0 = 80A02A20 -/* 00154 80A01D84 2409001E */ addiu $t1, $zero, 0x001E ## $t1 = 0000001E -/* 00158 80A01D88 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0015C 80A01D8C AC8802C8 */ sw $t0, 0x02C8($a0) ## 000002C8 -/* 00160 80A01D90 A48902AE */ sh $t1, 0x02AE($a0) ## 000002AE -/* 00164 80A01D94 A48A02C0 */ sh $t2, 0x02C0($a0) ## 000002C0 -/* 00168 80A01D98 E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 -/* 0016C 80A01D9C E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 -/* 00170 80A01DA0 03E00008 */ jr $ra -/* 00174 80A01DA4 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -glabel L80A01DA8 -/* 00178 80A01DA8 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0017C 80A01DAC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00180 80A01DB0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00184 80A01DB4 3C0D80A0 */ lui $t5, %hi(func_80A02A20) ## $t5 = 80A00000 -/* 00188 80A01DB8 240B1000 */ addiu $t3, $zero, 0x1000 ## $t3 = 00001000 -/* 0018C 80A01DBC 240C0200 */ addiu $t4, $zero, 0x0200 ## $t4 = 00000200 -/* 00190 80A01DC0 25AD2A20 */ addiu $t5, $t5, %lo(func_80A02A20) ## $t5 = 80A02A20 -/* 00194 80A01DC4 A48B02AE */ sh $t3, 0x02AE($a0) ## 000002AE -/* 00198 80A01DC8 A48C02B0 */ sh $t4, 0x02B0($a0) ## 000002B0 -/* 0019C 80A01DCC AC8D02C8 */ sw $t5, 0x02C8($a0) ## 000002C8 -/* 001A0 80A01DD0 E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 -/* 001A4 80A01DD4 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 -/* 001A8 80A01DD8 03E00008 */ jr $ra -/* 001AC 80A01DDC E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -glabel L80A01DE0 -/* 001B0 80A01DE0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 001B4 80A01DE4 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 -/* 001B8 80A01DE8 3C0140F0 */ lui $at, 0x40F0 ## $at = 40F00000 -/* 001BC 80A01DEC 44812000 */ mtc1 $at, $f4 ## $f4 = 7.50 -/* 001C0 80A01DF0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 001C4 80A01DF4 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 001C8 80A01DF8 3C1880A0 */ lui $t8, %hi(func_80A02A20) ## $t8 = 80A00000 -/* 001CC 80A01DFC 240E1000 */ addiu $t6, $zero, 0x1000 ## $t6 = 00001000 -/* 001D0 80A01E00 240F0800 */ addiu $t7, $zero, 0x0800 ## $t7 = 00000800 -/* 001D4 80A01E04 27182A20 */ addiu $t8, $t8, %lo(func_80A02A20) ## $t8 = 80A02A20 -/* 001D8 80A01E08 A48E02AE */ sh $t6, 0x02AE($a0) ## 000002AE -/* 001DC 80A01E0C A48F02B0 */ sh $t7, 0x02B0($a0) ## 000002B0 -/* 001E0 80A01E10 AC9802C8 */ sw $t8, 0x02C8($a0) ## 000002C8 -/* 001E4 80A01E14 E49202B4 */ swc1 $f18, 0x02B4($a0) ## 000002B4 -/* 001E8 80A01E18 E48402B8 */ swc1 $f4, 0x02B8($a0) ## 000002B8 -/* 001EC 80A01E1C 03E00008 */ jr $ra -/* 001F0 80A01E20 E4860168 */ swc1 $f6, 0x0168($a0) ## 00000168 -glabel L80A01E24 -/* 001F4 80A01E24 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 001F8 80A01E28 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 001FC 80A01E2C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00200 80A01E30 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00204 80A01E34 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00208 80A01E38 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 0020C 80A01E3C 3C0980A0 */ lui $t1, %hi(func_80A02AA4) ## $t1 = 80A00000 -/* 00210 80A01E40 24190400 */ addiu $t9, $zero, 0x0400 ## $t9 = 00000400 -/* 00214 80A01E44 24081000 */ addiu $t0, $zero, 0x1000 ## $t0 = 00001000 -/* 00218 80A01E48 25292AA4 */ addiu $t1, $t1, %lo(func_80A02AA4) ## $t1 = 80A02AA4 -/* 0021C 80A01E4C A49902AE */ sh $t9, 0x02AE($a0) ## 000002AE -/* 00220 80A01E50 A48802B0 */ sh $t0, 0x02B0($a0) ## 000002B0 -/* 00224 80A01E54 AC8902C8 */ sw $t1, 0x02C8($a0) ## 000002C8 -/* 00228 80A01E58 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 0022C 80A01E5C E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 -/* 00230 80A01E60 03E00008 */ jr $ra -/* 00234 80A01E64 E48802B8 */ swc1 $f8, 0x02B8($a0) ## 000002B8 -glabel L80A01E68 -/* 00238 80A01E68 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0023C 80A01E6C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00240 80A01E70 3C0B80A0 */ lui $t3, %hi(func_80A02B38) ## $t3 = 80A00000 -/* 00244 80A01E74 240A0600 */ addiu $t2, $zero, 0x0600 ## $t2 = 00000600 -/* 00248 80A01E78 256B2B38 */ addiu $t3, $t3, %lo(func_80A02B38) ## $t3 = 80A02B38 -/* 0024C 80A01E7C A48A02B0 */ sh $t2, 0x02B0($a0) ## 000002B0 -/* 00250 80A01E80 AC8B02C8 */ sw $t3, 0x02C8($a0) ## 000002C8 -/* 00254 80A01E84 E48002B8 */ swc1 $f0, 0x02B8($a0) ## 000002B8 -/* 00258 80A01E88 E48002B4 */ swc1 $f0, 0x02B4($a0) ## 000002B4 -/* 0025C 80A01E8C 03E00008 */ jr $ra -/* 00260 80A01E90 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -glabel L80A01E94 -/* 00264 80A01E94 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00268 80A01E98 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 0026C 80A01E9C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00270 80A01EA0 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 00274 80A01EA4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00278 80A01EA8 44819000 */ mtc1 $at, $f18 ## $f18 = 2.00 -/* 0027C 80A01EAC 3C0D80A0 */ lui $t5, %hi(func_80A02B38) ## $t5 = 80A00000 -/* 00280 80A01EB0 240C0800 */ addiu $t4, $zero, 0x0800 ## $t4 = 00000800 -/* 00284 80A01EB4 25AD2B38 */ addiu $t5, $t5, %lo(func_80A02B38) ## $t5 = 80A02B38 -/* 00288 80A01EB8 A48C02B0 */ sh $t4, 0x02B0($a0) ## 000002B0 -/* 0028C 80A01EBC AC8D02C8 */ sw $t5, 0x02C8($a0) ## 000002C8 -/* 00290 80A01EC0 E48A02B4 */ swc1 $f10, 0x02B4($a0) ## 000002B4 -/* 00294 80A01EC4 E49002B8 */ swc1 $f16, 0x02B8($a0) ## 000002B8 -/* 00298 80A01EC8 03E00008 */ jr $ra -/* 0029C 80A01ECC E4920168 */ swc1 $f18, 0x0168($a0) ## 00000168 -glabel L80A01ED0 -/* 002A0 80A01ED0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 002A4 80A01ED4 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 002A8 80A01ED8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 002AC 80A01EDC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 002B0 80A01EE0 3C0F80A0 */ lui $t7, %hi(func_80A02B38) ## $t7 = 80A00000 -/* 002B4 80A01EE4 240E0200 */ addiu $t6, $zero, 0x0200 ## $t6 = 00000200 -/* 002B8 80A01EE8 25EF2B38 */ addiu $t7, $t7, %lo(func_80A02B38) ## $t7 = 80A02B38 -/* 002BC 80A01EEC A48E02B0 */ sh $t6, 0x02B0($a0) ## 000002B0 -/* 002C0 80A01EF0 AC8F02C8 */ sw $t7, 0x02C8($a0) ## 000002C8 -/* 002C4 80A01EF4 E48202B4 */ swc1 $f2, 0x02B4($a0) ## 000002B4 -/* 002C8 80A01EF8 E48202B8 */ swc1 $f2, 0x02B8($a0) ## 000002B8 -/* 002CC 80A01EFC 03E00008 */ jr $ra -/* 002D0 80A01F00 E4840168 */ swc1 $f4, 0x0168($a0) ## 00000168 -glabel L80A01F04 -/* 002D4 80A01F04 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 002D8 80A01F08 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 -/* 002DC 80A01F0C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 002E0 80A01F10 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 002E4 80A01F14 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 002E8 80A01F18 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 -/* 002EC 80A01F1C 3C0880A0 */ lui $t0, %hi(func_80A02A20) ## $t0 = 80A00000 -/* 002F0 80A01F20 24181000 */ addiu $t8, $zero, 0x1000 ## $t8 = 00001000 -/* 002F4 80A01F24 24190800 */ addiu $t9, $zero, 0x0800 ## $t9 = 00000800 -/* 002F8 80A01F28 25082A20 */ addiu $t0, $t0, %lo(func_80A02A20) ## $t0 = 80A02A20 -/* 002FC 80A01F2C A49802AE */ sh $t8, 0x02AE($a0) ## 000002AE -/* 00300 80A01F30 A49902B0 */ sh $t9, 0x02B0($a0) ## 000002B0 -/* 00304 80A01F34 AC8802C8 */ sw $t0, 0x02C8($a0) ## 000002C8 -/* 00308 80A01F38 E48602B4 */ swc1 $f6, 0x02B4($a0) ## 000002B4 -/* 0030C 80A01F3C E48802B8 */ swc1 $f8, 0x02B8($a0) ## 000002B8 -/* 00310 80A01F40 03E00008 */ jr $ra -/* 00314 80A01F44 E48A0168 */ swc1 $f10, 0x0168($a0) ## 00000168 -glabel L80A01F48 -/* 00318 80A01F48 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0031C 80A01F4C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00320 80A01F50 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00324 80A01F54 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 00328 80A01F58 3C0B80A0 */ lui $t3, %hi(func_80A02A20) ## $t3 = 80A00000 -/* 0032C 80A01F5C 24090400 */ addiu $t1, $zero, 0x0400 ## $t1 = 00000400 -/* 00330 80A01F60 240A2000 */ addiu $t2, $zero, 0x2000 ## $t2 = 00002000 -/* 00334 80A01F64 256B2A20 */ addiu $t3, $t3, %lo(func_80A02A20) ## $t3 = 80A02A20 -/* 00338 80A01F68 240C002A */ addiu $t4, $zero, 0x002A ## $t4 = 0000002A -/* 0033C 80A01F6C A48902AE */ sh $t1, 0x02AE($a0) ## 000002AE -/* 00340 80A01F70 A48A02B0 */ sh $t2, 0x02B0($a0) ## 000002B0 -/* 00344 80A01F74 AC8B02C8 */ sw $t3, 0x02C8($a0) ## 000002C8 -/* 00348 80A01F78 A48C02C0 */ sh $t4, 0x02C0($a0) ## 000002C0 -/* 0034C 80A01F7C E48002B8 */ swc1 $f0, 0x02B8($a0) ## 000002B8 -/* 00350 80A01F80 E4800168 */ swc1 $f0, 0x0168($a0) ## 00000168 -/* 00354 80A01F84 E49002B4 */ swc1 $f16, 0x02B4($a0) ## 000002B4 -.L80A01F88: -/* 00358 80A01F88 03E00008 */ jr $ra -/* 0035C 80A01F8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F90.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F90.s deleted file mode 100644 index f4ae6c5a77..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F90.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80A01F90 -/* 00360 80A01F90 C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000000 -/* 00364 80A01F94 C4860000 */ lwc1 $f6, 0x0000($a0) ## 00000000 -/* 00368 80A01F98 C4A80008 */ lwc1 $f8, 0x0008($a1) ## 00000008 -/* 0036C 80A01F9C C48A0008 */ lwc1 $f10, 0x0008($a0) ## 00000008 -/* 00370 80A01FA0 46062001 */ sub.s $f0, $f4, $f6 -/* 00374 80A01FA4 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 00378 80A01FA8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0037C 80A01FAC 460A4081 */ sub.s $f2, $f8, $f10 -/* 00380 80A01FB0 46000402 */ mul.s $f16, $f0, $f0 -/* 00384 80A01FB4 00000000 */ nop -/* 00388 80A01FB8 46021482 */ mul.s $f18, $f2, $f2 -/* 0038C 80A01FBC 46128100 */ add.s $f4, $f16, $f18 -/* 00390 80A01FC0 460C6182 */ mul.s $f6, $f12, $f12 -/* 00394 80A01FC4 4604303C */ c.lt.s $f6, $f4 -/* 00398 80A01FC8 00000000 */ nop -/* 0039C 80A01FCC 45000002 */ bc1f .L80A01FD8 -/* 003A0 80A01FD0 00000000 */ nop -/* 003A4 80A01FD4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A01FD8: -/* 003A8 80A01FD8 03E00008 */ jr $ra -/* 003AC 80A01FDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01FE0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01FE0.s deleted file mode 100644 index 807cc0fbb3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01FE0.s +++ /dev/null @@ -1,61 +0,0 @@ -.late_rodata -glabel D_80A06178 - .float 32767.0 - -.text -glabel func_80A01FE0 -/* 003B0 80A01FE0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 003B4 80A01FE4 AFBF001C */ sw $ra, 0x001C($sp) -/* 003B8 80A01FE8 AFB00018 */ sw $s0, 0x0018($sp) -/* 003BC 80A01FEC 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 003C0 80A01FF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003C4 80A01FF4 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 003C8 80A01FF8 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 -/* 003CC 80A01FFC 0C2807E4 */ jal func_80A01F90 -/* 003D0 80A02000 24450024 */ addiu $a1, $v0, 0x0024 ## $a1 = 00000024 -/* 003D4 80A02004 14400005 */ bne $v0, $zero, .L80A0201C -/* 003D8 80A02008 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 003DC 80A0200C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 003E0 80A02010 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 003E4 80A02014 10000004 */ beq $zero, $zero, .L80A02028 -/* 003E8 80A02018 E60402B8 */ swc1 $f4, 0x02B8($s0) ## 000002B8 -.L80A0201C: -/* 003EC 80A0201C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 003F0 80A02020 00000000 */ nop -/* 003F4 80A02024 E60602B8 */ swc1 $f6, 0x02B8($s0) ## 000002B8 -.L80A02028: -/* 003F8 80A02028 860202C0 */ lh $v0, 0x02C0($s0) ## 000002C0 -/* 003FC 80A0202C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00400 80A02030 24180080 */ addiu $t8, $zero, 0x0080 ## $t8 = 00000080 -/* 00404 80A02034 18400004 */ blez $v0, .L80A02048 -/* 00408 80A02038 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0040C 80A0203C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00410 80A02040 10000013 */ beq $zero, $zero, .L80A02090 -/* 00414 80A02044 A60E02C0 */ sh $t6, 0x02C0($s0) ## 000002C0 -.L80A02048: -/* 00418 80A02048 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 0041C 80A0204C A60F02A8 */ sh $t7, 0x02A8($s0) ## 000002A8 -/* 00420 80A02050 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00424 80A02054 A61802AC */ sh $t8, 0x02AC($s0) ## 000002AC -/* 00428 80A02058 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0042C 80A0205C 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 00430 80A02060 3C0180A0 */ lui $at, %hi(D_80A06178) ## $at = 80A00000 -/* 00434 80A02064 46080280 */ add.s $f10, $f0, $f8 -/* 00438 80A02068 E60A02B8 */ swc1 $f10, 0x02B8($s0) ## 000002B8 -/* 0043C 80A0206C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00440 80A02070 C42C6178 */ lwc1 $f12, %lo(D_80A06178)($at) -/* 00444 80A02074 4600040D */ trunc.w.s $f16, $f0 -/* 00448 80A02078 3C0980A0 */ lui $t1, %hi(func_80A0214C) ## $t1 = 80A00000 -/* 0044C 80A0207C 2529214C */ addiu $t1, $t1, %lo(func_80A0214C) ## $t1 = 80A0214C -/* 00450 80A02080 AE0902C8 */ sw $t1, 0x02C8($s0) ## 000002C8 -/* 00454 80A02084 44088000 */ mfc1 $t0, $f16 -/* 00458 80A02088 00000000 */ nop -/* 0045C 80A0208C A60802B0 */ sh $t0, 0x02B0($s0) ## 000002B0 -.L80A02090: -/* 00460 80A02090 8FBF001C */ lw $ra, 0x001C($sp) -/* 00464 80A02094 8FB00018 */ lw $s0, 0x0018($sp) -/* 00468 80A02098 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0046C 80A0209C 03E00008 */ jr $ra -/* 00470 80A020A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A020A4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A020A4.s deleted file mode 100644 index 4c89c80125..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A020A4.s +++ /dev/null @@ -1,53 +0,0 @@ -.late_rodata -glabel D_80A0617C - .float 32767.0 - -.text -glabel func_80A020A4 -/* 00474 80A020A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00478 80A020A8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0047C 80A020AC AFB00018 */ sw $s0, 0x0018($sp) -/* 00480 80A020B0 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00484 80A020B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00488 80A020B8 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 0048C 80A020BC 3C064248 */ lui $a2, 0x4248 ## $a2 = 42480000 -/* 00490 80A020C0 0C2807E4 */ jal func_80A01F90 -/* 00494 80A020C4 24450024 */ addiu $a1, $v0, 0x0024 ## $a1 = 00000024 -/* 00498 80A020C8 5040001C */ beql $v0, $zero, .L80A0213C -/* 0049C 80A020CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 004A0 80A020D0 860202C0 */ lh $v0, 0x02C0($s0) ## 000002C0 -/* 004A4 80A020D4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 004A8 80A020D8 24180080 */ addiu $t8, $zero, 0x0080 ## $t8 = 00000080 -/* 004AC 80A020DC 18400004 */ blez $v0, .L80A020F0 -/* 004B0 80A020E0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 004B4 80A020E4 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 004B8 80A020E8 10000013 */ beq $zero, $zero, .L80A02138 -/* 004BC 80A020EC A60E02C0 */ sh $t6, 0x02C0($s0) ## 000002C0 -.L80A020F0: -/* 004C0 80A020F0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 004C4 80A020F4 A60F02A8 */ sh $t7, 0x02A8($s0) ## 000002A8 -/* 004C8 80A020F8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 004CC 80A020FC A61802AC */ sh $t8, 0x02AC($s0) ## 000002AC -/* 004D0 80A02100 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 004D4 80A02104 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 004D8 80A02108 3C0180A0 */ lui $at, %hi(D_80A0617C) ## $at = 80A00000 -/* 004DC 80A0210C 46040180 */ add.s $f6, $f0, $f4 -/* 004E0 80A02110 E60602B8 */ swc1 $f6, 0x02B8($s0) ## 000002B8 -/* 004E4 80A02114 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 004E8 80A02118 C42C617C */ lwc1 $f12, %lo(D_80A0617C)($at) -/* 004EC 80A0211C 4600020D */ trunc.w.s $f8, $f0 -/* 004F0 80A02120 3C0980A0 */ lui $t1, %hi(func_80A0214C) ## $t1 = 80A00000 -/* 004F4 80A02124 2529214C */ addiu $t1, $t1, %lo(func_80A0214C) ## $t1 = 80A0214C -/* 004F8 80A02128 AE0902C8 */ sw $t1, 0x02C8($s0) ## 000002C8 -/* 004FC 80A0212C 44084000 */ mfc1 $t0, $f8 -/* 00500 80A02130 00000000 */ nop -/* 00504 80A02134 A60802B0 */ sh $t0, 0x02B0($s0) ## 000002B0 -.L80A02138: -/* 00508 80A02138 8FBF001C */ lw $ra, 0x001C($sp) -.L80A0213C: -/* 0050C 80A0213C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00510 80A02140 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00514 80A02144 03E00008 */ jr $ra -/* 00518 80A02148 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0214C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0214C.s deleted file mode 100644 index 66b009a45e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0214C.s +++ /dev/null @@ -1,152 +0,0 @@ -.late_rodata -glabel D_80A06180 - .float 0.2 - -glabel D_80A06184 - .float 0.949999988079071 - -glabel D_80A06188 - .float 0.05 - -glabel D_80A0618C - .float 0.1 - -glabel D_80A06190 - .float 32767.0 - -.text -glabel func_80A0214C -/* 0051C 80A0214C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00520 80A02150 AFBF001C */ sw $ra, 0x001C($sp) -/* 00524 80A02154 AFB00018 */ sw $s0, 0x0018($sp) -/* 00528 80A02158 AFA5002C */ sw $a1, 0x002C($sp) -/* 0052C 80A0215C 848202C0 */ lh $v0, 0x02C0($a0) ## 000002C0 -/* 00530 80A02160 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00534 80A02164 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00538 80A02168 18400003 */ blez $v0, .L80A02178 -/* 0053C 80A0216C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00540 80A02170 10000050 */ beq $zero, $zero, .L80A022B4 -/* 00544 80A02174 A48E02C0 */ sh $t6, 0x02C0($a0) ## 000002C0 -.L80A02178: -/* 00548 80A02178 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 -/* 0054C 80A0217C C6020090 */ lwc1 $f2, 0x0090($s0) ## 00000090 -/* 00550 80A02180 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00554 80A02184 4600103C */ c.lt.s $f2, $f0 -/* 00558 80A02188 00000000 */ nop -/* 0055C 80A0218C 45020021 */ bc1fl .L80A02214 -/* 00560 80A02190 44816000 */ mtc1 $at, $f12 ## $f12 = 150.00 -/* 00564 80A02194 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00568 80A02198 00000000 */ nop -/* 0056C 80A0219C 3C0180A0 */ lui $at, %hi(D_80A06180) ## $at = 80A00000 -/* 00570 80A021A0 C4246180 */ lwc1 $f4, %lo(D_80A06180)($at) -/* 00574 80A021A4 3C1980A0 */ lui $t9, %hi(func_80A020A4) ## $t9 = 80A00000 -/* 00578 80A021A8 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 0057C 80A021AC 4604003C */ c.lt.s $f0, $f4 -/* 00580 80A021B0 24180400 */ addiu $t8, $zero, 0x0400 ## $t8 = 00000400 -/* 00584 80A021B4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00588 80A021B8 273920A4 */ addiu $t9, $t9, %lo(func_80A020A4) ## $t9 = 80A020A4 -/* 0058C 80A021BC 45000012 */ bc1f .L80A02208 -/* 00590 80A021C0 240D000A */ addiu $t5, $zero, 0x000A ## $t5 = 0000000A -/* 00594 80A021C4 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 00598 80A021C8 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 0059C 80A021CC 44814000 */ mtc1 $at, $f8 ## $f8 = 1.50 -/* 005A0 80A021D0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 005A4 80A021D4 44816000 */ mtc1 $at, $f12 ## $f12 = 8.00 -/* 005A8 80A021D8 A60F02A8 */ sh $t7, 0x02A8($s0) ## 000002A8 -/* 005AC 80A021DC A61802AC */ sh $t8, 0x02AC($s0) ## 000002AC -/* 005B0 80A021E0 AE1902C8 */ sw $t9, 0x02C8($s0) ## 000002C8 -/* 005B4 80A021E4 E60602B8 */ swc1 $f6, 0x02B8($s0) ## 000002B8 -/* 005B8 80A021E8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 005BC 80A021EC E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 005C0 80A021F0 4600028D */ trunc.w.s $f10, $f0 -/* 005C4 80A021F4 440B5000 */ mfc1 $t3, $f10 -/* 005C8 80A021F8 00000000 */ nop -/* 005CC 80A021FC 256C0004 */ addiu $t4, $t3, 0x0004 ## $t4 = 00000004 -/* 005D0 80A02200 1000002C */ beq $zero, $zero, .L80A022B4 -/* 005D4 80A02204 A60C02C0 */ sh $t4, 0x02C0($s0) ## 000002C0 -.L80A02208: -/* 005D8 80A02208 1000002A */ beq $zero, $zero, .L80A022B4 -/* 005DC 80A0220C A60D02C0 */ sh $t5, 0x02C0($s0) ## 000002C0 -/* 005E0 80A02210 44816000 */ mtc1 $at, $f12 ## $f12 = 0.00 -.L80A02214: -/* 005E4 80A02214 3C0180A0 */ lui $at, %hi(D_80A06184) ## $at = 80A00000 -/* 005E8 80A02218 4602603C */ c.lt.s $f12, $f2 -/* 005EC 80A0221C 00000000 */ nop -/* 005F0 80A02220 45020003 */ bc1fl .L80A02230 -/* 005F4 80A02224 46001401 */ sub.s $f16, $f2, $f0 -/* 005F8 80A02228 46006086 */ mov.s $f2, $f12 -/* 005FC 80A0222C 46001401 */ sub.s $f16, $f2, $f0 -.L80A02230: -/* 00600 80A02230 C4326184 */ lwc1 $f18, %lo(D_80A06184)($at) -/* 00604 80A02234 3C0180A0 */ lui $at, %hi(D_80A06188) ## $at = 80A00000 -/* 00608 80A02238 C4266188 */ lwc1 $f6, %lo(D_80A06188)($at) -/* 0060C 80A0223C 46128102 */ mul.s $f4, $f16, $f18 -/* 00610 80A02240 46062080 */ add.s $f2, $f4, $f6 -/* 00614 80A02244 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00618 80A02248 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 0061C 80A0224C C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 00620 80A02250 3C1880A0 */ lui $t8, %hi(func_80A01FE0) ## $t8 = 80A00000 -/* 00624 80A02254 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00628 80A02258 4602003C */ c.lt.s $f0, $f2 -/* 0062C 80A0225C 240F0200 */ addiu $t7, $zero, 0x0200 ## $t7 = 00000200 -/* 00630 80A02260 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00634 80A02264 27181FE0 */ addiu $t8, $t8, %lo(func_80A01FE0) ## $t8 = 80A01FE0 -/* 00638 80A02268 45000011 */ bc1f .L80A022B0 -/* 0063C 80A0226C 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 00640 80A02270 46021200 */ add.s $f8, $f2, $f2 -/* 00644 80A02274 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 00648 80A02278 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 0064C 80A0227C 44816000 */ mtc1 $at, $f12 ## $f12 = 16.00 -/* 00650 80A02280 460A4400 */ add.s $f16, $f8, $f10 -/* 00654 80A02284 A60E02A8 */ sh $t6, 0x02A8($s0) ## 000002A8 -/* 00658 80A02288 A60F02AC */ sh $t7, 0x02AC($s0) ## 000002AC -/* 0065C 80A0228C AE1802C8 */ sw $t8, 0x02C8($s0) ## 000002C8 -/* 00660 80A02290 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00664 80A02294 E61002B8 */ swc1 $f16, 0x02B8($s0) ## 000002B8 -/* 00668 80A02298 4600048D */ trunc.w.s $f18, $f0 -/* 0066C 80A0229C 440A9000 */ mfc1 $t2, $f18 -/* 00670 80A022A0 00000000 */ nop -/* 00674 80A022A4 254B0010 */ addiu $t3, $t2, 0x0010 ## $t3 = 00000010 -/* 00678 80A022A8 10000002 */ beq $zero, $zero, .L80A022B4 -/* 0067C 80A022AC A60B02C0 */ sh $t3, 0x02C0($s0) ## 000002C0 -.L80A022B0: -/* 00680 80A022B0 A60C02C0 */ sh $t4, 0x02C0($s0) ## 000002C0 -.L80A022B4: -/* 00684 80A022B4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00688 80A022B8 00000000 */ nop -/* 0068C 80A022BC 3C0180A0 */ lui $at, %hi(D_80A0618C) ## $at = 80A00000 -/* 00690 80A022C0 C424618C */ lwc1 $f4, %lo(D_80A0618C)($at) -/* 00694 80A022C4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00698 80A022C8 240E0080 */ addiu $t6, $zero, 0x0080 ## $t6 = 00000080 -/* 0069C 80A022CC 4604003C */ c.lt.s $f0, $f4 -/* 006A0 80A022D0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 006A4 80A022D4 45020011 */ bc1fl .L80A0231C -/* 006A8 80A022D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 006AC 80A022DC 44816000 */ mtc1 $at, $f12 ## $f12 = 0.50 -/* 006B0 80A022E0 A60D02A8 */ sh $t5, 0x02A8($s0) ## 000002A8 -/* 006B4 80A022E4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 006B8 80A022E8 A60E02AC */ sh $t6, 0x02AC($s0) ## 000002AC -/* 006BC 80A022EC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 006C0 80A022F0 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 006C4 80A022F4 3C0180A0 */ lui $at, %hi(D_80A06190) ## $at = 80A00000 -/* 006C8 80A022F8 46060200 */ add.s $f8, $f0, $f6 -/* 006CC 80A022FC E60802B8 */ swc1 $f8, 0x02B8($s0) ## 000002B8 -/* 006D0 80A02300 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 006D4 80A02304 C42C6190 */ lwc1 $f12, %lo(D_80A06190)($at) -/* 006D8 80A02308 4600028D */ trunc.w.s $f10, $f0 -/* 006DC 80A0230C 44185000 */ mfc1 $t8, $f10 -/* 006E0 80A02310 00000000 */ nop -/* 006E4 80A02314 A61802B0 */ sh $t8, 0x02B0($s0) ## 000002B0 -/* 006E8 80A02318 8FBF001C */ lw $ra, 0x001C($sp) -.L80A0231C: -/* 006EC 80A0231C 8FB00018 */ lw $s0, 0x0018($sp) -/* 006F0 80A02320 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006F4 80A02324 03E00008 */ jr $ra -/* 006F8 80A02328 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0232C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0232C.s deleted file mode 100644 index 884209a795..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0232C.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80A0232C -/* 006FC 80A0232C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00700 80A02330 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00704 80A02334 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00708 80A02338 AFA5001C */ sw $a1, 0x001C($sp) -/* 0070C 80A0233C 24E50024 */ addiu $a1, $a3, 0x0024 ## $a1 = 00000024 -/* 00710 80A02340 AFA70018 */ sw $a3, 0x0018($sp) -/* 00714 80A02344 2484028C */ addiu $a0, $a0, 0x028C ## $a0 = 0000028C -/* 00718 80A02348 0C2807E4 */ jal func_80A01F90 -/* 0071C 80A0234C 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 00720 80A02350 1040000B */ beq $v0, $zero, .L80A02380 -/* 00724 80A02354 8FA70018 */ lw $a3, 0x0018($sp) -/* 00728 80A02358 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 0072C 80A0235C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 00730 80A02360 3C0F80A0 */ lui $t7, %hi(func_80A0214C) ## $t7 = 80A00000 -/* 00734 80A02364 240E0200 */ addiu $t6, $zero, 0x0200 ## $t6 = 00000200 -/* 00738 80A02368 25EF214C */ addiu $t7, $t7, %lo(func_80A0214C) ## $t7 = 80A0214C -/* 0073C 80A0236C A4E002A8 */ sh $zero, 0x02A8($a3) ## 000002A8 -/* 00740 80A02370 A4EE02AC */ sh $t6, 0x02AC($a3) ## 000002AC -/* 00744 80A02374 ACEF02C8 */ sw $t7, 0x02C8($a3) ## 000002C8 -/* 00748 80A02378 10000006 */ beq $zero, $zero, .L80A02394 -/* 0074C 80A0237C E4E402B8 */ swc1 $f4, 0x02B8($a3) ## 000002B8 -.L80A02380: -/* 00750 80A02380 8CF902C8 */ lw $t9, 0x02C8($a3) ## 000002C8 -/* 00754 80A02384 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00758 80A02388 8FA5001C */ lw $a1, 0x001C($sp) -/* 0075C 80A0238C 0320F809 */ jalr $ra, $t9 -/* 00760 80A02390 00000000 */ nop -.L80A02394: -/* 00764 80A02394 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00768 80A02398 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0076C 80A0239C 03E00008 */ jr $ra -/* 00770 80A023A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A023A4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A023A4.s deleted file mode 100644 index bf071d5e12..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A023A4.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80A023A4 -/* 00774 80A023A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00778 80A023A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0077C 80A023AC 10810007 */ beq $a0, $at, .L80A023CC -/* 00780 80A023B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00784 80A023B4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00788 80A023B8 5081000D */ beql $a0, $at, .L80A023F0 -/* 0078C 80A023BC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00790 80A023C0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00794 80A023C4 1000000F */ beq $zero, $zero, .L80A02404 -/* 00798 80A023C8 00000000 */ nop -.L80A023CC: -/* 0079C 80A023CC 3C01425C */ lui $at, 0x425C ## $at = 425C0000 -/* 007A0 80A023D0 44816000 */ mtc1 $at, $f12 ## $f12 = 55.00 -/* 007A4 80A023D4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 007A8 80A023D8 00000000 */ nop -/* 007AC 80A023DC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 007B0 80A023E0 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 007B4 80A023E4 10000007 */ beq $zero, $zero, .L80A02404 -/* 007B8 80A023E8 46040000 */ add.s $f0, $f0, $f4 -/* 007BC 80A023EC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -.L80A023F0: -/* 007C0 80A023F0 44816000 */ mtc1 $at, $f12 ## $f12 = 255.00 -/* 007C4 80A023F4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 007C8 80A023F8 00000000 */ nop -/* 007CC 80A023FC 10000002 */ beq $zero, $zero, .L80A02408 -/* 007D0 80A02400 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A02404: -/* 007D4 80A02404 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A02408: -/* 007D8 80A02408 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007DC 80A0240C 03E00008 */ jr $ra -/* 007E0 80A02410 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0299C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0299C.s deleted file mode 100644 index 5cb201abdd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0299C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80A0299C -/* 00D6C 80A0299C AFA40000 */ sw $a0, 0x0000($sp) -/* 00D70 80A029A0 03E00008 */ jr $ra -/* 00D74 80A029A4 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A029A8.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A029A8.s deleted file mode 100644 index 0bc0b997b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A029A8.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80A029A8 -/* 00D78 80A029A8 AFA50004 */ sw $a1, 0x0004($sp) -/* 00D7C 80A029AC 848202C2 */ lh $v0, 0x02C2($a0) ## 000002C2 -/* 00D80 80A029B0 00052C00 */ sll $a1, $a1, 16 -/* 00D84 80A029B4 00052C03 */ sra $a1, $a1, 16 -/* 00D88 80A029B8 28410258 */ slti $at, $v0, 0x0258 -/* 00D8C 80A029BC 10200002 */ beq $at, $zero, .L80A029C8 -/* 00D90 80A029C0 00457021 */ addu $t6, $v0, $a1 -/* 00D94 80A029C4 A48E02C2 */ sh $t6, 0x02C2($a0) ## 000002C2 -.L80A029C8: -/* 00D98 80A029C8 03E00008 */ jr $ra -/* 00D9C 80A029CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02A20.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02A20.s deleted file mode 100644 index f26a2c3d2d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02A20.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80A02A20 -/* 00DF0 80A02A20 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00DF4 80A02A24 AFB00018 */ sw $s0, 0x0018($sp) -/* 00DF8 80A02A28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DFC 80A02A2C AFBF001C */ sw $ra, 0x001C($sp) -/* 00E00 80A02A30 AFA50024 */ sw $a1, 0x0024($sp) -/* 00E04 80A02A34 0C01DE1C */ jal Math_Sins - ## sins? -/* 00E08 80A02A38 848402AC */ lh $a0, 0x02AC($a0) ## 000002AC -/* 00E0C 80A02A3C C60402B8 */ lwc1 $f4, 0x02B8($s0) ## 000002B8 -/* 00E10 80A02A40 860402AA */ lh $a0, 0x02AA($s0) ## 000002AA -/* 00E14 80A02A44 46040182 */ mul.s $f6, $f0, $f4 -/* 00E18 80A02A48 0C01DE1C */ jal Math_Sins - ## sins? -/* 00E1C 80A02A4C E606028C */ swc1 $f6, 0x028C($s0) ## 0000028C -/* 00E20 80A02A50 C60802B4 */ lwc1 $f8, 0x02B4($s0) ## 000002B4 -/* 00E24 80A02A54 860402AC */ lh $a0, 0x02AC($s0) ## 000002AC -/* 00E28 80A02A58 46080282 */ mul.s $f10, $f0, $f8 -/* 00E2C 80A02A5C 0C01DE0D */ jal Math_Coss - ## coss? -/* 00E30 80A02A60 E60A0290 */ swc1 $f10, 0x0290($s0) ## 00000290 -/* 00E34 80A02A64 C61002B8 */ lwc1 $f16, 0x02B8($s0) ## 000002B8 -/* 00E38 80A02A68 860E02AC */ lh $t6, 0x02AC($s0) ## 000002AC -/* 00E3C 80A02A6C 860F02B0 */ lh $t7, 0x02B0($s0) ## 000002B0 -/* 00E40 80A02A70 46100482 */ mul.s $f18, $f0, $f16 -/* 00E44 80A02A74 861902AA */ lh $t9, 0x02AA($s0) ## 000002AA -/* 00E48 80A02A78 860802AE */ lh $t0, 0x02AE($s0) ## 000002AE -/* 00E4C 80A02A7C 01CFC021 */ addu $t8, $t6, $t7 -/* 00E50 80A02A80 A61802AC */ sh $t8, 0x02AC($s0) ## 000002AC -/* 00E54 80A02A84 03284821 */ addu $t1, $t9, $t0 -/* 00E58 80A02A88 A60902AA */ sh $t1, 0x02AA($s0) ## 000002AA -/* 00E5C 80A02A8C E6120294 */ swc1 $f18, 0x0294($s0) ## 00000294 -/* 00E60 80A02A90 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E64 80A02A94 8FB00018 */ lw $s0, 0x0018($sp) -/* 00E68 80A02A98 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E6C 80A02A9C 03E00008 */ jr $ra -/* 00E70 80A02AA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02AA4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02AA4.s deleted file mode 100644 index 859d2a9e33..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02AA4.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80A02AA4 -/* 00E74 80A02AA4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00E78 80A02AA8 AFB00018 */ sw $s0, 0x0018($sp) -/* 00E7C 80A02AAC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E80 80A02AB0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00E84 80A02AB4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00E88 80A02AB8 0C01DE0D */ jal Math_Coss - ## coss? -/* 00E8C 80A02ABC 848402AA */ lh $a0, 0x02AA($a0) ## 000002AA -/* 00E90 80A02AC0 C60402B4 */ lwc1 $f4, 0x02B4($s0) ## 000002B4 -/* 00E94 80A02AC4 C60802B8 */ lwc1 $f8, 0x02B8($s0) ## 000002B8 -/* 00E98 80A02AC8 46040182 */ mul.s $f6, $f0, $f4 -/* 00E9C 80A02ACC 46083280 */ add.s $f10, $f6, $f8 -/* 00EA0 80A02AD0 E7AA0024 */ swc1 $f10, 0x0024($sp) -/* 00EA4 80A02AD4 0C01DE1C */ jal Math_Sins - ## sins? -/* 00EA8 80A02AD8 860402AC */ lh $a0, 0x02AC($s0) ## 000002AC -/* 00EAC 80A02ADC C7B00024 */ lwc1 $f16, 0x0024($sp) -/* 00EB0 80A02AE0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00EB4 80A02AE4 860402AC */ lh $a0, 0x02AC($s0) ## 000002AC -/* 00EB8 80A02AE8 46100482 */ mul.s $f18, $f0, $f16 -/* 00EBC 80A02AEC E6040290 */ swc1 $f4, 0x0290($s0) ## 00000290 -/* 00EC0 80A02AF0 0C01DE0D */ jal Math_Coss - ## coss? -/* 00EC4 80A02AF4 E612028C */ swc1 $f18, 0x028C($s0) ## 0000028C -/* 00EC8 80A02AF8 C7A60024 */ lwc1 $f6, 0x0024($sp) -/* 00ECC 80A02AFC 860E02AC */ lh $t6, 0x02AC($s0) ## 000002AC -/* 00ED0 80A02B00 860F02B0 */ lh $t7, 0x02B0($s0) ## 000002B0 -/* 00ED4 80A02B04 46060202 */ mul.s $f8, $f0, $f6 -/* 00ED8 80A02B08 861902AA */ lh $t9, 0x02AA($s0) ## 000002AA -/* 00EDC 80A02B0C 860802AE */ lh $t0, 0x02AE($s0) ## 000002AE -/* 00EE0 80A02B10 01CFC021 */ addu $t8, $t6, $t7 -/* 00EE4 80A02B14 A61802AC */ sh $t8, 0x02AC($s0) ## 000002AC -/* 00EE8 80A02B18 03284821 */ addu $t1, $t9, $t0 -/* 00EEC 80A02B1C A60902AA */ sh $t1, 0x02AA($s0) ## 000002AA -/* 00EF0 80A02B20 E6080294 */ swc1 $f8, 0x0294($s0) ## 00000294 -/* 00EF4 80A02B24 8FBF001C */ lw $ra, 0x001C($sp) -/* 00EF8 80A02B28 8FB00018 */ lw $s0, 0x0018($sp) -/* 00EFC 80A02B2C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00F00 80A02B30 03E00008 */ jr $ra -/* 00F04 80A02B34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02B38.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02B38.s deleted file mode 100644 index 50484070e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02B38.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80A02B38 -/* 00F08 80A02B38 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F0C 80A02B3C AFBF001C */ sw $ra, 0x001C($sp) -/* 00F10 80A02B40 AFB00018 */ sw $s0, 0x0018($sp) -/* 00F14 80A02B44 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 00F18 80A02B48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F1C 80A02B4C AFAE0024 */ sw $t6, 0x0024($sp) -/* 00F20 80A02B50 848402AC */ lh $a0, 0x02AC($a0) ## 000002AC -/* 00F24 80A02B54 0004C040 */ sll $t8, $a0, 1 -/* 00F28 80A02B58 0C01DE1C */ jal Math_Sins - ## sins? -/* 00F2C 80A02B5C A61802AA */ sh $t8, 0x02AA($s0) ## 000002AA -/* 00F30 80A02B60 C60402B8 */ lwc1 $f4, 0x02B8($s0) ## 000002B8 -/* 00F34 80A02B64 860402AA */ lh $a0, 0x02AA($s0) ## 000002AA -/* 00F38 80A02B68 46040182 */ mul.s $f6, $f0, $f4 -/* 00F3C 80A02B6C 0C01DE1C */ jal Math_Sins - ## sins? -/* 00F40 80A02B70 E606028C */ swc1 $f6, 0x028C($s0) ## 0000028C -/* 00F44 80A02B74 C60802B4 */ lwc1 $f8, 0x02B4($s0) ## 000002B4 -/* 00F48 80A02B78 46080282 */ mul.s $f10, $f0, $f8 -/* 00F4C 80A02B7C E60A0290 */ swc1 $f10, 0x0290($s0) ## 00000290 -/* 00F50 80A02B80 8FB90024 */ lw $t9, 0x0024($sp) -/* 00F54 80A02B84 0C01DE1C */ jal Math_Sins - ## sins? -/* 00F58 80A02B88 872400B6 */ lh $a0, 0x00B6($t9) ## 000000B6 -/* 00F5C 80A02B8C C612028C */ lwc1 $f18, 0x028C($s0) ## 0000028C -/* 00F60 80A02B90 46000407 */ neg.s $f16, $f0 -/* 00F64 80A02B94 46128102 */ mul.s $f4, $f16, $f18 -/* 00F68 80A02B98 E6040294 */ swc1 $f4, 0x0294($s0) ## 00000294 -/* 00F6C 80A02B9C 8FA80024 */ lw $t0, 0x0024($sp) -/* 00F70 80A02BA0 0C01DE0D */ jal Math_Coss - ## coss? -/* 00F74 80A02BA4 850400B6 */ lh $a0, 0x00B6($t0) ## 000000B6 -/* 00F78 80A02BA8 C606028C */ lwc1 $f6, 0x028C($s0) ## 0000028C -/* 00F7C 80A02BAC 860902AC */ lh $t1, 0x02AC($s0) ## 000002AC -/* 00F80 80A02BB0 860A02B0 */ lh $t2, 0x02B0($s0) ## 000002B0 -/* 00F84 80A02BB4 46060202 */ mul.s $f8, $f0, $f6 -/* 00F88 80A02BB8 012A5821 */ addu $t3, $t1, $t2 -/* 00F8C 80A02BBC A60B02AC */ sh $t3, 0x02AC($s0) ## 000002AC -/* 00F90 80A02BC0 E608028C */ swc1 $f8, 0x028C($s0) ## 0000028C -/* 00F94 80A02BC4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00F98 80A02BC8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00F9C 80A02BCC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00FA0 80A02BD0 03E00008 */ jr $ra -/* 00FA4 80A02BD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02BD8.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02BD8.s deleted file mode 100644 index f391bba2cf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02BD8.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80A02BD8 -/* 00FA8 80A02BD8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00FAC 80A02BDC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00FB0 80A02BE0 C4860290 */ lwc1 $f6, 0x0290($a0) ## 00000290 -/* 00FB4 80A02BE4 C4A40004 */ lwc1 $f4, 0x0004($a1) ## 00000004 -/* 00FB8 80A02BE8 C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 -/* 00FBC 80A02BEC 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 00FC0 80A02BF0 46062200 */ add.s $f8, $f4, $f6 -/* 00FC4 80A02BF4 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 00FC8 80A02BF8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00FCC 80A02BFC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00FD0 80A02C00 460A4401 */ sub.s $f16, $f8, $f10 -/* 00FD4 80A02C04 460C8082 */ mul.s $f2, $f16, $f12 -/* 00FD8 80A02C08 4602703E */ c.le.s $f14, $f2 -/* 00FDC 80A02C0C 46001005 */ abs.s $f0, $f2 -/* 00FE0 80A02C10 45020006 */ bc1fl .L80A02C2C -/* 00FE4 80A02C14 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 00FE8 80A02C18 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00FEC 80A02C1C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 00FF0 80A02C20 10000004 */ beq $zero, $zero, .L80A02C34 -/* 00FF4 80A02C24 460E003C */ c.lt.s $f0, $f14 -/* 00FF8 80A02C28 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -.L80A02C2C: -/* 00FFC 80A02C2C 00000000 */ nop -/* 01000 80A02C30 460E003C */ c.lt.s $f0, $f14 -.L80A02C34: -/* 01004 80A02C34 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01008 80A02C38 45020004 */ bc1fl .L80A02C4C -/* 0100C 80A02C3C 44817000 */ mtc1 $at, $f14 ## $f14 = 20.00 -/* 01010 80A02C40 1000000B */ beq $zero, $zero, .L80A02C70 -/* 01014 80A02C44 46007006 */ mov.s $f0, $f14 -/* 01018 80A02C48 44817000 */ mtc1 $at, $f14 ## $f14 = 20.00 -.L80A02C4C: -/* 0101C 80A02C4C 00000000 */ nop -/* 01020 80A02C50 4600703C */ c.lt.s $f14, $f0 -/* 01024 80A02C54 00000000 */ nop -/* 01028 80A02C58 45020004 */ bc1fl .L80A02C6C -/* 0102C 80A02C5C 46000086 */ mov.s $f2, $f0 -/* 01030 80A02C60 10000002 */ beq $zero, $zero, .L80A02C6C -/* 01034 80A02C64 46007086 */ mov.s $f2, $f14 -/* 01038 80A02C68 46000086 */ mov.s $f2, $f0 -.L80A02C6C: -/* 0103C 80A02C6C 46001006 */ mov.s $f0, $f2 -.L80A02C70: -/* 01040 80A02C70 460C0482 */ mul.s $f18, $f0, $f12 -/* 01044 80A02C74 24E40060 */ addiu $a0, $a3, 0x0060 ## $a0 = 00000060 -/* 01048 80A02C78 3C064200 */ lui $a2, 0x4200 ## $a2 = 42000000 -/* 0104C 80A02C7C 44059000 */ mfc1 $a1, $f18 -/* 01050 80A02C80 0C01DE80 */ jal Math_ApproxF - -/* 01054 80A02C84 00000000 */ nop -/* 01058 80A02C88 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0105C 80A02C8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01060 80A02C90 03E00008 */ jr $ra -/* 01064 80A02C94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02C98.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02C98.s deleted file mode 100644 index bf7fb0a524..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02C98.s +++ /dev/null @@ -1,115 +0,0 @@ -glabel func_80A02C98 -/* 01068 80A02C98 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0106C 80A02C9C AFBF001C */ sw $ra, 0x001C($sp) -/* 01070 80A02CA0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01074 80A02CA4 AFA60040 */ sw $a2, 0x0040($sp) -/* 01078 80A02CA8 C486028C */ lwc1 $f6, 0x028C($a0) ## 0000028C -/* 0107C 80A02CAC C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000000 -/* 01080 80A02CB0 C48A0024 */ lwc1 $f10, 0x0024($a0) ## 00000024 -/* 01084 80A02CB4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01088 80A02CB8 46062200 */ add.s $f8, $f4, $f6 -/* 0108C 80A02CBC C7A60040 */ lwc1 $f6, 0x0040($sp) -/* 01090 80A02CC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01094 80A02CC4 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01098 80A02CC8 460A4101 */ sub.s $f4, $f8, $f10 -/* 0109C 80A02CCC C48A0294 */ lwc1 $f10, 0x0294($a0) ## 00000294 -/* 010A0 80A02CD0 C4A80008 */ lwc1 $f8, 0x0008($a1) ## 00000008 -/* 010A4 80A02CD4 46062382 */ mul.s $f14, $f4, $f6 -/* 010A8 80A02CD8 460A4100 */ add.s $f4, $f8, $f10 -/* 010AC 80A02CDC C488002C */ lwc1 $f8, 0x002C($a0) ## 0000002C -/* 010B0 80A02CE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010B4 80A02CE4 46082281 */ sub.s $f10, $f4, $f8 -/* 010B8 80A02CE8 460E803E */ c.le.s $f16, $f14 -/* 010BC 80A02CEC 46065082 */ mul.s $f2, $f10, $f6 -/* 010C0 80A02CF0 46007005 */ abs.s $f0, $f14 -/* 010C4 80A02CF4 45000005 */ bc1f .L80A02D0C -/* 010C8 80A02CF8 46000386 */ mov.s $f14, $f0 -/* 010CC 80A02CFC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 010D0 80A02D00 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 010D4 80A02D04 10000004 */ beq $zero, $zero, .L80A02D18 -/* 010D8 80A02D08 4602803E */ c.le.s $f16, $f2 -.L80A02D0C: -/* 010DC 80A02D0C 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 010E0 80A02D10 00000000 */ nop -/* 010E4 80A02D14 4602803E */ c.le.s $f16, $f2 -.L80A02D18: -/* 010E8 80A02D18 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 010EC 80A02D1C 45020006 */ bc1fl .L80A02D38 -/* 010F0 80A02D20 44814000 */ mtc1 $at, $f8 ## $f8 = -1.00 -/* 010F4 80A02D24 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 010F8 80A02D28 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 010FC 80A02D2C 10000004 */ beq $zero, $zero, .L80A02D40 -/* 01100 80A02D30 E7A40028 */ swc1 $f4, 0x0028($sp) -/* 01104 80A02D34 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -.L80A02D38: -/* 01108 80A02D38 00000000 */ nop -/* 0110C 80A02D3C E7A80028 */ swc1 $f8, 0x0028($sp) -.L80A02D40: -/* 01110 80A02D40 4610703C */ c.lt.s $f14, $f16 -/* 01114 80A02D44 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01118 80A02D48 46001005 */ abs.s $f0, $f2 -/* 0111C 80A02D4C 8FA60040 */ lw $a2, 0x0040($sp) -/* 01120 80A02D50 45020004 */ bc1fl .L80A02D64 -/* 01124 80A02D54 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 01128 80A02D58 1000000C */ beq $zero, $zero, .L80A02D8C -/* 0112C 80A02D5C 46008086 */ mov.s $f2, $f16 -/* 01130 80A02D60 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -.L80A02D64: -/* 01134 80A02D64 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01138 80A02D68 460E503C */ c.lt.s $f10, $f14 -/* 0113C 80A02D6C 00000000 */ nop -/* 01140 80A02D70 45020005 */ bc1fl .L80A02D88 -/* 01144 80A02D74 46007306 */ mov.s $f12, $f14 -/* 01148 80A02D78 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 0114C 80A02D7C 10000003 */ beq $zero, $zero, .L80A02D8C -/* 01150 80A02D80 46006086 */ mov.s $f2, $f12 -/* 01154 80A02D84 46007306 */ mov.s $f12, $f14 -.L80A02D88: -/* 01158 80A02D88 46006086 */ mov.s $f2, $f12 -.L80A02D8C: -/* 0115C 80A02D8C 4610003C */ c.lt.s $f0, $f16 -/* 01160 80A02D90 46121382 */ mul.s $f14, $f2, $f18 -/* 01164 80A02D94 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01168 80A02D98 45020004 */ bc1fl .L80A02DAC -/* 0116C 80A02D9C 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -/* 01170 80A02DA0 1000000B */ beq $zero, $zero, .L80A02DD0 -/* 01174 80A02DA4 46008086 */ mov.s $f2, $f16 -/* 01178 80A02DA8 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -.L80A02DAC: -/* 0117C 80A02DAC 00000000 */ nop -/* 01180 80A02DB0 4600103C */ c.lt.s $f2, $f0 -/* 01184 80A02DB4 00000000 */ nop -/* 01188 80A02DB8 45020004 */ bc1fl .L80A02DCC -/* 0118C 80A02DBC 46000306 */ mov.s $f12, $f0 -/* 01190 80A02DC0 10000002 */ beq $zero, $zero, .L80A02DCC -/* 01194 80A02DC4 46001306 */ mov.s $f12, $f2 -/* 01198 80A02DC8 46000306 */ mov.s $f12, $f0 -.L80A02DCC: -/* 0119C 80A02DCC 46006086 */ mov.s $f2, $f12 -.L80A02DD0: -/* 011A0 80A02DD0 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 011A4 80A02DD4 0C280AF6 */ jal func_80A02BD8 -/* 011A8 80A02DD8 E7AE0034 */ swc1 $f14, 0x0034($sp) -/* 011AC 80A02DDC C7AE0034 */ lwc1 $f14, 0x0034($sp) -/* 011B0 80A02DE0 2604005C */ addiu $a0, $s0, 0x005C ## $a0 = 0000005C -/* 011B4 80A02DE4 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 011B8 80A02DE8 44057000 */ mfc1 $a1, $f14 -/* 011BC 80A02DEC 0C01DE80 */ jal Math_ApproxF - -/* 011C0 80A02DF0 00000000 */ nop -/* 011C4 80A02DF4 C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 011C8 80A02DF8 C7A60028 */ lwc1 $f6, 0x0028($sp) -/* 011CC 80A02DFC 26040064 */ addiu $a0, $s0, 0x0064 ## $a0 = 00000064 -/* 011D0 80A02E00 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 011D4 80A02E04 46061102 */ mul.s $f4, $f2, $f6 -/* 011D8 80A02E08 44052000 */ mfc1 $a1, $f4 -/* 011DC 80A02E0C 0C01DE80 */ jal Math_ApproxF - -/* 011E0 80A02E10 00000000 */ nop -/* 011E4 80A02E14 0C00B5FB */ jal func_8002D7EC -/* 011E8 80A02E18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011EC 80A02E1C 8FBF001C */ lw $ra, 0x001C($sp) -/* 011F0 80A02E20 8FB00018 */ lw $s0, 0x0018($sp) -/* 011F4 80A02E24 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 011F8 80A02E28 03E00008 */ jr $ra -/* 011FC 80A02E2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02E30.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02E30.s deleted file mode 100644 index ad2eb4e17a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02E30.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80A02E30 -/* 01200 80A02E30 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01204 80A02E34 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01208 80A02E38 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 0120C 80A02E3C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01210 80A02E40 AFA40018 */ sw $a0, 0x0018($sp) -/* 01214 80A02E44 0C280AF6 */ jal func_80A02BD8 -/* 01218 80A02E48 AFA5001C */ sw $a1, 0x001C($sp) -/* 0121C 80A02E4C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01220 80A02E50 8FA5001C */ lw $a1, 0x001C($sp) -/* 01224 80A02E54 C486028C */ lwc1 $f6, 0x028C($a0) ## 0000028C -/* 01228 80A02E58 C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000000 -/* 0122C 80A02E5C C48A0024 */ lwc1 $f10, 0x0024($a0) ## 00000024 -/* 01230 80A02E60 46062200 */ add.s $f8, $f4, $f6 -/* 01234 80A02E64 C4840294 */ lwc1 $f4, 0x0294($a0) ## 00000294 -/* 01238 80A02E68 460A4401 */ sub.s $f16, $f8, $f10 -/* 0123C 80A02E6C C488002C */ lwc1 $f8, 0x002C($a0) ## 0000002C -/* 01240 80A02E70 E490005C */ swc1 $f16, 0x005C($a0) ## 0000005C -/* 01244 80A02E74 C4B20008 */ lwc1 $f18, 0x0008($a1) ## 00000008 -/* 01248 80A02E78 46049180 */ add.s $f6, $f18, $f4 -/* 0124C 80A02E7C 46083281 */ sub.s $f10, $f6, $f8 -/* 01250 80A02E80 0C00B5FB */ jal func_8002D7EC -/* 01254 80A02E84 E48A0064 */ swc1 $f10, 0x0064($a0) ## 00000064 -/* 01258 80A02E88 8FA40018 */ lw $a0, 0x0018($sp) -/* 0125C 80A02E8C 8FA5001C */ lw $a1, 0x001C($sp) -/* 01260 80A02E90 C492028C */ lwc1 $f18, 0x028C($a0) ## 0000028C -/* 01264 80A02E94 C4B00000 */ lwc1 $f16, 0x0000($a1) ## 00000000 -/* 01268 80A02E98 C4880294 */ lwc1 $f8, 0x0294($a0) ## 00000294 -/* 0126C 80A02E9C 46128100 */ add.s $f4, $f16, $f18 -/* 01270 80A02EA0 E4840024 */ swc1 $f4, 0x0024($a0) ## 00000024 -/* 01274 80A02EA4 C4A60008 */ lwc1 $f6, 0x0008($a1) ## 00000008 -/* 01278 80A02EA8 46083280 */ add.s $f10, $f6, $f8 -/* 0127C 80A02EAC E48A002C */ swc1 $f10, 0x002C($a0) ## 0000002C -/* 01280 80A02EB0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01284 80A02EB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01288 80A02EB8 03E00008 */ jr $ra -/* 0128C 80A02EBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02EC0.s deleted file mode 100644 index e38ddaf1e6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02EC0.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80A02EC0 -/* 01290 80A02EC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01294 80A02EC4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01298 80A02EC8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 0129C 80A02ECC AFA5001C */ sw $a1, 0x001C($sp) -/* 012A0 80A02ED0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 012A4 80A02ED4 0C280AF6 */ jal func_80A02BD8 -/* 012A8 80A02ED8 AFA40018 */ sw $a0, 0x0018($sp) -/* 012AC 80A02EDC 8FA40018 */ lw $a0, 0x0018($sp) -/* 012B0 80A02EE0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 012B4 80A02EE4 00000000 */ nop -/* 012B8 80A02EE8 E4800064 */ swc1 $f0, 0x0064($a0) ## 00000064 -/* 012BC 80A02EEC 0C00B5FB */ jal func_8002D7EC -/* 012C0 80A02EF0 E480005C */ swc1 $f0, 0x005C($a0) ## 0000005C -/* 012C4 80A02EF4 8FA2001C */ lw $v0, 0x001C($sp) -/* 012C8 80A02EF8 8FA40018 */ lw $a0, 0x0018($sp) -/* 012CC 80A02EFC C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000000 -/* 012D0 80A02F00 C486028C */ lwc1 $f6, 0x028C($a0) ## 0000028C -/* 012D4 80A02F04 C4900294 */ lwc1 $f16, 0x0294($a0) ## 00000294 -/* 012D8 80A02F08 46062200 */ add.s $f8, $f4, $f6 -/* 012DC 80A02F0C E4880024 */ swc1 $f8, 0x0024($a0) ## 00000024 -/* 012E0 80A02F10 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 00000008 -/* 012E4 80A02F14 46105480 */ add.s $f18, $f10, $f16 -/* 012E8 80A02F18 E492002C */ swc1 $f18, 0x002C($a0) ## 0000002C -/* 012EC 80A02F1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012F0 80A02F20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012F4 80A02F24 03E00008 */ jr $ra -/* 012F8 80A02F28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02F2C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02F2C.s deleted file mode 100644 index f891a5ff4c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02F2C.s +++ /dev/null @@ -1,72 +0,0 @@ -.late_rodata -glabel D_80A061BC - .float 0.2 - -.text -glabel func_80A02F2C -/* 012FC 80A02F2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01300 80A02F30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01304 80A02F34 AFA5001C */ sw $a1, 0x001C($sp) -/* 01308 80A02F38 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0130C 80A02F3C 848402AA */ lh $a0, 0x02AA($a0) ## 000002AA -/* 01310 80A02F40 0C01DE1C */ jal Math_Sins - ## sins? -/* 01314 80A02F44 AFA70018 */ sw $a3, 0x0018($sp) -/* 01318 80A02F48 8FA70018 */ lw $a3, 0x0018($sp) -/* 0131C 80A02F4C 8FAE001C */ lw $t6, 0x001C($sp) -/* 01320 80A02F50 3C0180A0 */ lui $at, %hi(D_80A061BC) ## $at = 80A00000 -/* 01324 80A02F54 C4E402B4 */ lwc1 $f4, 0x02B4($a3) ## 000002B4 -/* 01328 80A02F58 C5C80004 */ lwc1 $f8, 0x0004($t6) ## 00000004 -/* 0132C 80A02F5C C4F00028 */ lwc1 $f16, 0x0028($a3) ## 00000028 -/* 01330 80A02F60 46040182 */ mul.s $f6, $f0, $f4 -/* 01334 80A02F64 C42461BC */ lwc1 $f4, %lo(D_80A061BC)($at) -/* 01338 80A02F68 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 0133C 80A02F6C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01340 80A02F70 46083280 */ add.s $f10, $f6, $f8 -/* 01344 80A02F74 46105481 */ sub.s $f18, $f10, $f16 -/* 01348 80A02F78 46049082 */ mul.s $f2, $f18, $f4 -/* 0134C 80A02F7C 4602703E */ c.le.s $f14, $f2 -/* 01350 80A02F80 46001005 */ abs.s $f0, $f2 -/* 01354 80A02F84 45020006 */ bc1fl .L80A02FA0 -/* 01358 80A02F88 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 0135C 80A02F8C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01360 80A02F90 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 01364 80A02F94 10000004 */ beq $zero, $zero, .L80A02FA8 -/* 01368 80A02F98 460E003C */ c.lt.s $f0, $f14 -/* 0136C 80A02F9C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -.L80A02FA0: -/* 01370 80A02FA0 00000000 */ nop -/* 01374 80A02FA4 460E003C */ c.lt.s $f0, $f14 -.L80A02FA8: -/* 01378 80A02FA8 84EF02AA */ lh $t7, 0x02AA($a3) ## 000002AA -/* 0137C 80A02FAC 84F802AE */ lh $t8, 0x02AE($a3) ## 000002AE -/* 01380 80A02FB0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01384 80A02FB4 01F8C821 */ addu $t9, $t7, $t8 -/* 01388 80A02FB8 45000003 */ bc1f .L80A02FC8 -/* 0138C 80A02FBC A4F902AA */ sh $t9, 0x02AA($a3) ## 000002AA -/* 01390 80A02FC0 1000000B */ beq $zero, $zero, .L80A02FF0 -/* 01394 80A02FC4 46007006 */ mov.s $f0, $f14 -.L80A02FC8: -/* 01398 80A02FC8 44817000 */ mtc1 $at, $f14 ## $f14 = 20.00 -/* 0139C 80A02FCC 00000000 */ nop -/* 013A0 80A02FD0 4600703C */ c.lt.s $f14, $f0 -/* 013A4 80A02FD4 00000000 */ nop -/* 013A8 80A02FD8 45020004 */ bc1fl .L80A02FEC -/* 013AC 80A02FDC 46000086 */ mov.s $f2, $f0 -/* 013B0 80A02FE0 10000002 */ beq $zero, $zero, .L80A02FEC -/* 013B4 80A02FE4 46007086 */ mov.s $f2, $f14 -/* 013B8 80A02FE8 46000086 */ mov.s $f2, $f0 -.L80A02FEC: -/* 013BC 80A02FEC 46001006 */ mov.s $f0, $f2 -.L80A02FF0: -/* 013C0 80A02FF0 460C0182 */ mul.s $f6, $f0, $f12 -/* 013C4 80A02FF4 24E40060 */ addiu $a0, $a3, 0x0060 ## $a0 = 00000060 -/* 013C8 80A02FF8 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 013CC 80A02FFC 44053000 */ mfc1 $a1, $f6 -/* 013D0 80A03000 0C01DE80 */ jal Math_ApproxF - -/* 013D4 80A03004 00000000 */ nop -/* 013D8 80A03008 8FBF0014 */ lw $ra, 0x0014($sp) -/* 013DC 80A0300C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 013E0 80A03010 03E00008 */ jr $ra -/* 013E4 80A03014 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03018.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03018.s deleted file mode 100644 index d10c2c933d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03018.s +++ /dev/null @@ -1,92 +0,0 @@ -.late_rodata -glabel D_80A061C0 - .float 0.01 - -.text -glabel func_80A03018 -/* 013E8 80A03018 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 013EC 80A0301C AFBF0024 */ sw $ra, 0x0024($sp) -/* 013F0 80A03020 AFB00020 */ sw $s0, 0x0020($sp) -/* 013F4 80A03024 AFA5003C */ sw $a1, 0x003C($sp) -/* 013F8 80A03028 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 013FC 80A0302C 3C0180A0 */ lui $at, %hi(D_80A061C0) ## $at = 80A00000 -/* 01400 80A03030 C42461C0 */ lwc1 $f4, %lo(D_80A061C0)($at) -/* 01404 80A03034 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01408 80A03038 8E0502B8 */ lw $a1, 0x02B8($s0) ## 000002B8 -/* 0140C 80A0303C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 01410 80A03040 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01414 80A03044 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 01418 80A03048 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 0141C 80A0304C AFA3002C */ sw $v1, 0x002C($sp) -/* 01420 80A03050 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01424 80A03054 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01428 80A03058 860202A8 */ lh $v0, 0x02A8($s0) ## 000002A8 -/* 0142C 80A0305C 8FA3002C */ lw $v1, 0x002C($sp) -/* 01430 80A03060 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01434 80A03064 50400008 */ beql $v0, $zero, .L80A03088 -/* 01438 80A03068 2602028C */ addiu $v0, $s0, 0x028C ## $v0 = 0000028C -/* 0143C 80A0306C 1041001E */ beq $v0, $at, .L80A030E8 -/* 01440 80A03070 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01444 80A03074 50410011 */ beql $v0, $at, .L80A030BC -/* 01448 80A03078 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 0144C 80A0307C 10000023 */ beq $zero, $zero, .L80A0310C -/* 01450 80A03080 860502B0 */ lh $a1, 0x02B0($s0) ## 000002B0 -/* 01454 80A03084 2602028C */ addiu $v0, $s0, 0x028C ## $v0 = 0000028C -.L80A03088: -/* 01458 80A03088 C4480008 */ lwc1 $f8, 0x0008($v0) ## 00000294 -/* 0145C 80A0308C C4500000 */ lwc1 $f16, 0x0000($v0) ## 0000028C -/* 01460 80A03090 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 01464 80A03094 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 01468 80A03098 46083301 */ sub.s $f12, $f6, $f8 -/* 0146C 80A0309C 46105381 */ sub.s $f14, $f10, $f16 -/* 01470 80A030A0 46006307 */ neg.s $f12, $f12 -/* 01474 80A030A4 0C034199 */ jal atan2s - -/* 01478 80A030A8 46007387 */ neg.s $f14, $f14 -/* 0147C 80A030AC 00022C00 */ sll $a1, $v0, 16 -/* 01480 80A030B0 10000016 */ beq $zero, $zero, .L80A0310C -/* 01484 80A030B4 00052C03 */ sra $a1, $a1, 16 -/* 01488 80A030B8 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -.L80A030BC: -/* 0148C 80A030BC C464002C */ lwc1 $f4, 0x002C($v1) ## 0000002C -/* 01490 80A030C0 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 01494 80A030C4 C4680024 */ lwc1 $f8, 0x0024($v1) ## 00000024 -/* 01498 80A030C8 46049301 */ sub.s $f12, $f18, $f4 -/* 0149C 80A030CC 46083381 */ sub.s $f14, $f6, $f8 -/* 014A0 80A030D0 46006307 */ neg.s $f12, $f12 -/* 014A4 80A030D4 0C034199 */ jal atan2s - -/* 014A8 80A030D8 46007387 */ neg.s $f14, $f14 -/* 014AC 80A030DC 00022C00 */ sll $a1, $v0, 16 -/* 014B0 80A030E0 1000000A */ beq $zero, $zero, .L80A0310C -/* 014B4 80A030E4 00052C03 */ sra $a1, $a1, 16 -.L80A030E8: -/* 014B8 80A030E8 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 014BC 80A030EC C470002C */ lwc1 $f16, 0x002C($v1) ## 0000002C -/* 014C0 80A030F0 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 014C4 80A030F4 C4640024 */ lwc1 $f4, 0x0024($v1) ## 00000024 -/* 014C8 80A030F8 46105301 */ sub.s $f12, $f10, $f16 -/* 014CC 80A030FC 0C034199 */ jal atan2s - -/* 014D0 80A03100 46049381 */ sub.s $f14, $f18, $f4 -/* 014D4 80A03104 00022C00 */ sll $a1, $v0, 16 -/* 014D8 80A03108 00052C03 */ sra $a1, $a1, 16 -.L80A0310C: -/* 014DC 80A0310C 860702AC */ lh $a3, 0x02AC($s0) ## 000002AC -/* 014E0 80A03110 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 014E4 80A03114 AFAF0010 */ sw $t7, 0x0010($sp) -/* 014E8 80A03118 260402BC */ addiu $a0, $s0, 0x02BC ## $a0 = 000002BC -/* 014EC 80A0311C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 014F0 80A03120 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 014F4 80A03124 861802BC */ lh $t8, 0x02BC($s0) ## 000002BC -/* 014F8 80A03128 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014FC 80A0312C 0C00B638 */ jal Actor_MoveForward - -/* 01500 80A03130 A6180032 */ sh $t8, 0x0032($s0) ## 00000032 -/* 01504 80A03134 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01508 80A03138 8FB00020 */ lw $s0, 0x0020($sp) -/* 0150C 80A0313C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01510 80A03140 03E00008 */ jr $ra -/* 01514 80A03144 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s deleted file mode 100644 index 76f38d3726..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s +++ /dev/null @@ -1,200 +0,0 @@ -.late_rodata -glabel D_80A061C8 - .float 0.05 - -glabel D_80A061CC - .float 0.008 - -glabel D_80A061D0 - .float 0.1 - -.text -glabel func_80A0329C -/* 0166C 80A0329C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01670 80A032A0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01674 80A032A4 AFB00020 */ sw $s0, 0x0020($sp) -/* 01678 80A032A8 AFA5003C */ sw $a1, 0x003C($sp) -/* 0167C 80A032AC 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 01680 80A032B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01684 80A032B4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01688 80A032B8 AFA20034 */ sw $v0, 0x0034($sp) -/* 0168C 80A032BC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01690 80A032C0 AFA2002C */ sw $v0, 0x002C($sp) -/* 01694 80A032C4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 01698 80A032C8 00000000 */ nop -/* 0169C 80A032CC 3C0180A0 */ lui $at, %hi(D_80A061C8) ## $at = 80A00000 -/* 016A0 80A032D0 C42461C8 */ lwc1 $f4, %lo(D_80A061C8)($at) -/* 016A4 80A032D4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 016A8 80A032D8 4604003C */ c.lt.s $f0, $f4 -/* 016AC 80A032DC 00000000 */ nop -/* 016B0 80A032E0 45020011 */ bc1fl .L80A03328 -/* 016B4 80A032E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016B8 80A032E8 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 016BC 80A032EC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 016C0 80A032F0 00000000 */ nop -/* 016C4 80A032F4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 016C8 80A032F8 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 016CC 80A032FC 3C014480 */ lui $at, 0x4480 ## $at = 44800000 -/* 016D0 80A03300 44816000 */ mtc1 $at, $f12 ## $f12 = 1024.00 -/* 016D4 80A03304 46060200 */ add.s $f8, $f0, $f6 -/* 016D8 80A03308 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 016DC 80A0330C E60802B4 */ swc1 $f8, 0x02B4($s0) ## 000002B4 -/* 016E0 80A03310 4600028D */ trunc.w.s $f10, $f0 -/* 016E4 80A03314 44085000 */ mfc1 $t0, $f10 -/* 016E8 80A03318 00000000 */ nop -/* 016EC 80A0331C 25090200 */ addiu $t1, $t0, 0x0200 ## $t1 = 00000200 -/* 016F0 80A03320 A60902AE */ sh $t1, 0x02AE($s0) ## 000002AE -/* 016F4 80A03324 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A03328: -/* 016F8 80A03328 0C2808CB */ jal func_80A0232C -/* 016FC 80A0332C 8FA5003C */ lw $a1, 0x003C($sp) -/* 01700 80A03330 8FAA002C */ lw $t2, 0x002C($sp) -/* 01704 80A03334 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01708 80A03338 2605028C */ addiu $a1, $s0, 0x028C ## $a1 = 0000028C -/* 0170C 80A0333C C550090C */ lwc1 $f16, 0x090C($t2) ## 0000090C -/* 01710 80A03340 0C280BCB */ jal func_80A02F2C -/* 01714 80A03344 E6100290 */ swc1 $f16, 0x0290($s0) ## 00000290 -/* 01718 80A03348 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0171C 80A0334C 0C280C06 */ jal func_80A03018 -/* 01720 80A03350 8FA5003C */ lw $a1, 0x003C($sp) -/* 01724 80A03354 860202A8 */ lh $v0, 0x02A8($s0) ## 000002A8 -/* 01728 80A03358 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0172C 80A0335C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01730 80A03360 10410004 */ beq $v0, $at, .L80A03374 -/* 01734 80A03364 8FA5003C */ lw $a1, 0x003C($sp) -/* 01738 80A03368 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0173C 80A0336C 54410004 */ bnel $v0, $at, .L80A03380 -/* 01740 80A03370 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A03374: -/* 01744 80A03374 0C28126D */ jal func_80A049B4 -/* 01748 80A03378 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 0174C 80A0337C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A03380: -/* 01750 80A03380 0C00BD04 */ jal Actor_HasParent -/* 01754 80A03384 8FA5003C */ lw $a1, 0x003C($sp) -/* 01758 80A03388 10400005 */ beq $v0, $zero, .L80A033A0 -/* 0175C 80A0338C 00000000 */ nop -/* 01760 80A03390 0C00B55C */ jal Actor_Kill - -/* 01764 80A03394 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01768 80A03398 10000064 */ beq $zero, $zero, .L80A0352C -/* 0176C 80A0339C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A033A0: -/* 01770 80A033A0 0C023A62 */ jal Player_InCsMode -/* 01774 80A033A4 8FA4003C */ lw $a0, 0x003C($sp) -/* 01778 80A033A8 54400060 */ bnel $v0, $zero, .L80A0352C -/* 0177C 80A033AC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01780 80A033B0 8FA20034 */ lw $v0, 0x0034($sp) -/* 01784 80A033B4 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 01788 80A033B8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0178C 80A033BC C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 01790 80A033C0 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01794 80A033C4 46049001 */ sub.s $f0, $f18, $f4 -/* 01798 80A033C8 4600303C */ c.lt.s $f6, $f0 -/* 0179C 80A033CC 00000000 */ nop -/* 017A0 80A033D0 45020029 */ bc1fl .L80A03478 -/* 017A4 80A033D4 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -/* 017A8 80A033D8 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 -/* 017AC 80A033DC 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 017B0 80A033E0 24450024 */ addiu $a1, $v0, 0x0024 ## $a1 = 00000024 -/* 017B4 80A033E4 4608003C */ c.lt.s $f0, $f8 -/* 017B8 80A033E8 00000000 */ nop -/* 017BC 80A033EC 45020022 */ bc1fl .L80A03478 -/* 017C0 80A033F0 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -/* 017C4 80A033F4 0C2807E4 */ jal func_80A01F90 -/* 017C8 80A033F8 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 017CC 80A033FC 1440001D */ bne $v0, $zero, .L80A03474 -/* 017D0 80A03400 8FA4003C */ lw $a0, 0x003C($sp) -/* 017D4 80A03404 0C021C5D */ jal Health_ChangeBy -/* 017D8 80A03408 24050080 */ addiu $a1, $zero, 0x0080 ## $a1 = 00000080 -/* 017DC 80A0340C 960B02C4 */ lhu $t3, 0x02C4($s0) ## 000002C4 -/* 017E0 80A03410 316C0200 */ andi $t4, $t3, 0x0200 ## $t4 = 00000000 -/* 017E4 80A03414 51800004 */ beql $t4, $zero, .L80A03428 -/* 017E8 80A03418 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 017EC 80A0341C 0C021DA0 */ jal func_80087680 -/* 017F0 80A03420 8FA4003C */ lw $a0, 0x003C($sp) -/* 017F4 80A03424 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -.L80A03428: -/* 017F8 80A03428 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 017FC 80A0342C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01800 80A03430 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 -/* 01804 80A03434 E60A02B8 */ swc1 $f10, 0x02B8($s0) ## 000002B8 -/* 01808 80A03438 8FAD0034 */ lw $t5, 0x0034($sp) -/* 0180C 80A0343C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 01810 80A03440 240FF000 */ addiu $t7, $zero, 0xF000 ## $t7 = FFFFF000 -/* 01814 80A03444 85AE00B6 */ lh $t6, 0x00B6($t5) ## 000000B6 -/* 01818 80A03448 3C0580A0 */ lui $a1, %hi(func_80A03610) ## $a1 = 80A00000 -/* 0181C 80A0344C A60F02B0 */ sh $t7, 0x02B0($s0) ## 000002B0 -/* 01820 80A03450 A60002AA */ sh $zero, 0x02AA($s0) ## 000002AA -/* 01824 80A03454 24A53610 */ addiu $a1, $a1, %lo(func_80A03610) ## $a1 = 80A03610 -/* 01828 80A03458 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0182C 80A0345C E6100290 */ swc1 $f16, 0x0290($s0) ## 00000290 -/* 01830 80A03460 E61202B4 */ swc1 $f18, 0x02B4($s0) ## 000002B4 -/* 01834 80A03464 0C28070C */ jal func_80A01C30 -/* 01838 80A03468 A60E02AC */ sh $t6, 0x02AC($s0) ## 000002AC -/* 0183C 80A0346C 1000002F */ beq $zero, $zero, .L80A0352C -/* 01840 80A03470 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A03474: -/* 01844 80A03474 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -.L80A03478: -/* 01848 80A03478 30780100 */ andi $t8, $v1, 0x0100 ## $t8 = 00000000 -/* 0184C 80A0347C 53000021 */ beql $t8, $zero, .L80A03504 -/* 01850 80A03480 306A0200 */ andi $t2, $v1, 0x0200 ## $t2 = 00000000 -/* 01854 80A03484 860202C2 */ lh $v0, 0x02C2($s0) ## 000002C2 -/* 01858 80A03488 18400005 */ blez $v0, .L80A034A0 -/* 0185C 80A0348C 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 01860 80A03490 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 01864 80A03494 A61902C2 */ sh $t9, 0x02C2($s0) ## 000002C2 -/* 01868 80A03498 10000019 */ beq $zero, $zero, .L80A03500 -/* 0186C 80A0349C 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -.L80A034A0: -/* 01870 80A034A0 A60802C2 */ sh $t0, 0x02C2($s0) ## 000002C2 -/* 01874 80A034A4 860202C2 */ lh $v0, 0x02C2($s0) ## 000002C2 -/* 01878 80A034A8 2841FFF7 */ slti $at, $v0, 0xFFF7 -/* 0187C 80A034AC 14200010 */ bne $at, $zero, .L80A034F0 -/* 01880 80A034B0 2449000A */ addiu $t1, $v0, 0x000A ## $t1 = 0000000A -/* 01884 80A034B4 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 01888 80A034B8 3C0180A0 */ lui $at, %hi(D_80A061CC) ## $at = 80A00000 -/* 0188C 80A034BC C42861CC */ lwc1 $f8, %lo(D_80A061CC)($at) -/* 01890 80A034C0 468021A0 */ cvt.s.w $f6, $f4 -/* 01894 80A034C4 3C0180A0 */ lui $at, %hi(D_80A061D0) ## $at = 80A00000 -/* 01898 80A034C8 C43061D0 */ lwc1 $f16, %lo(D_80A061D0)($at) -/* 0189C 80A034CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018A0 80A034D0 46083282 */ mul.s $f10, $f6, $f8 -/* 018A4 80A034D4 00000000 */ nop -/* 018A8 80A034D8 46105482 */ mul.s $f18, $f10, $f16 -/* 018AC 80A034DC 44059000 */ mfc1 $a1, $f18 -/* 018B0 80A034E0 0C00B58B */ jal Actor_SetScale - -/* 018B4 80A034E4 00000000 */ nop -/* 018B8 80A034E8 10000005 */ beq $zero, $zero, .L80A03500 -/* 018BC 80A034EC 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -.L80A034F0: -/* 018C0 80A034F0 0C00B55C */ jal Actor_Kill - -/* 018C4 80A034F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018C8 80A034F8 1000000C */ beq $zero, $zero, .L80A0352C -/* 018CC 80A034FC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A03500: -/* 018D0 80A03500 306A0200 */ andi $t2, $v1, 0x0200 ## $t2 = 00000000 -.L80A03504: -/* 018D4 80A03504 15400008 */ bne $t2, $zero, .L80A03528 -/* 018D8 80A03508 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018DC 80A0350C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 018E0 80A03510 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 -/* 018E4 80A03514 8FA5003C */ lw $a1, 0x003C($sp) -/* 018E8 80A03518 2406007E */ addiu $a2, $zero, 0x007E ## $a2 = 0000007E -/* 018EC 80A0351C 3C0742A0 */ lui $a3, 0x42A0 ## $a3 = 42A00000 -/* 018F0 80A03520 0C00BD0D */ jal func_8002F434 -/* 018F4 80A03524 E7A40010 */ swc1 $f4, 0x0010($sp) -.L80A03528: -/* 018F8 80A03528 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A0352C: -/* 018FC 80A0352C 8FB00020 */ lw $s0, 0x0020($sp) -/* 01900 80A03530 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01904 80A03534 03E00008 */ jr $ra -/* 01908 80A03538 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0353C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0353C.s deleted file mode 100644 index f4c7ac60af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0353C.s +++ /dev/null @@ -1,61 +0,0 @@ -.late_rodata -glabel D_80A061D4 - .float 1500.0 - -.text -glabel func_80A0353C -/* 0190C 80A0353C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01910 80A03540 AFB00018 */ sw $s0, 0x0018($sp) -/* 01914 80A03544 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01918 80A03548 AFBF001C */ sw $ra, 0x001C($sp) -/* 0191C 80A0354C AFA5003C */ sw $a1, 0x003C($sp) -/* 01920 80A03550 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01924 80A03554 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01928 80A03558 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0192C 80A0355C 0C280A88 */ jal func_80A02A20 -/* 01930 80A03560 8FA5003C */ lw $a1, 0x003C($sp) -/* 01934 80A03564 8E030118 */ lw $v1, 0x0118($s0) ## 00000118 -/* 01938 80A03568 1060001B */ beq $v1, $zero, .L80A035D8 -/* 0193C 80A0356C 00000000 */ nop -/* 01940 80A03570 8C6E0130 */ lw $t6, 0x0130($v1) ## 00000130 -/* 01944 80A03574 11C00018 */ beq $t6, $zero, .L80A035D8 -/* 01948 80A03578 00000000 */ nop -/* 0194C 80A0357C 8C780024 */ lw $t8, 0x0024($v1) ## 00000024 -/* 01950 80A03580 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 01954 80A03584 3C0180A0 */ lui $at, %hi(D_80A061D4) ## $at = 80A00000 -/* 01958 80A03588 ACB80000 */ sw $t8, 0x0000($a1) ## FFFFFFF4 -/* 0195C 80A0358C 8C6F0028 */ lw $t7, 0x0028($v1) ## 00000028 -/* 01960 80A03590 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 01964 80A03594 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01968 80A03598 ACAF0004 */ sw $t7, 0x0004($a1) ## FFFFFFF8 -/* 0196C 80A0359C 8C78002C */ lw $t8, 0x002C($v1) ## 0000002C -/* 01970 80A035A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01974 80A035A4 ACB80008 */ sw $t8, 0x0008($a1) ## FFFFFFFC -/* 01978 80A035A8 C6060054 */ lwc1 $f6, 0x0054($s0) ## 00000054 -/* 0197C 80A035AC C42461D4 */ lwc1 $f4, %lo(D_80A061D4)($at) -/* 01980 80A035B0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 01984 80A035B4 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 01988 80A035B8 46062202 */ mul.s $f8, $f4, $f6 -/* 0198C 80A035BC C7B20030 */ lwc1 $f18, 0x0030($sp) -/* 01990 80A035C0 460A4400 */ add.s $f16, $f8, $f10 -/* 01994 80A035C4 46109100 */ add.s $f4, $f18, $f16 -/* 01998 80A035C8 0C280B26 */ jal func_80A02C98 -/* 0199C 80A035CC E7A40030 */ swc1 $f4, 0x0030($sp) -/* 019A0 80A035D0 10000004 */ beq $zero, $zero, .L80A035E4 -/* 019A4 80A035D4 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -.L80A035D8: -/* 019A8 80A035D8 0C00B55C */ jal Actor_Kill - -/* 019AC 80A035DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019B0 80A035E0 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -.L80A035E4: -/* 019B4 80A035E4 0C034199 */ jal atan2s - -/* 019B8 80A035E8 C60E005C */ lwc1 $f14, 0x005C($s0) ## 0000005C -/* 019BC 80A035EC A60202BC */ sh $v0, 0x02BC($s0) ## 000002BC -/* 019C0 80A035F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 019C4 80A035F4 8FB00018 */ lw $s0, 0x0018($sp) -/* 019C8 80A035F8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 019CC 80A035FC 03E00008 */ jr $ra -/* 019D0 80A03600 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03604.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03604.s deleted file mode 100644 index ea33693541..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03604.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80A03604 -/* 019D4 80A03604 AFA40000 */ sw $a0, 0x0000($sp) -/* 019D8 80A03608 03E00008 */ jr $ra -/* 019DC 80A0360C AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03610.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03610.s deleted file mode 100644 index 4a37438deb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03610.s +++ /dev/null @@ -1,159 +0,0 @@ -.late_rodata -glabel D_80A061D8 - .float 0.1 - -glabel D_80A061DC - .float 0.2 - -glabel D_80A061E0 - .float 0.008 - -glabel D_80A061E4 - .float 0.05 - -.text -glabel func_80A03610 -/* 019E0 80A03610 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 019E4 80A03614 AFBF0024 */ sw $ra, 0x0024($sp) -/* 019E8 80A03618 AFB00020 */ sw $s0, 0x0020($sp) -/* 019EC 80A0361C AFA50034 */ sw $a1, 0x0034($sp) -/* 019F0 80A03620 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 019F4 80A03624 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 019F8 80A03628 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 019FC 80A0362C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01A00 80A03630 AFAF002C */ sw $t7, 0x002C($sp) -/* 01A04 80A03634 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01A08 80A03638 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 01A0C 80A0363C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01A10 80A03640 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01A14 80A03644 260402B8 */ addiu $a0, $s0, 0x02B8 ## $a0 = 000002B8 -/* 01A18 80A03648 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 -/* 01A1C 80A0364C 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 01A20 80A03650 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01A24 80A03654 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01A28 80A03658 0C01DE0D */ jal Math_Coss - ## coss? -/* 01A2C 80A0365C 860402AC */ lh $a0, 0x02AC($s0) ## 000002AC -/* 01A30 80A03660 C60602B8 */ lwc1 $f6, 0x02B8($s0) ## 000002B8 -/* 01A34 80A03664 C60202B4 */ lwc1 $f2, 0x02B4($s0) ## 000002B4 -/* 01A38 80A03668 C60A0290 */ lwc1 $f10, 0x0290($s0) ## 00000290 -/* 01A3C 80A0366C 46060202 */ mul.s $f8, $f0, $f6 -/* 01A40 80A03670 860302AA */ lh $v1, 0x02AA($s0) ## 000002AA -/* 01A44 80A03674 46025400 */ add.s $f16, $f10, $f2 -/* 01A48 80A03678 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01A4C 80A0367C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 01A50 80A03680 E6100290 */ swc1 $f16, 0x0290($s0) ## 00000290 -/* 01A54 80A03684 10600006 */ beq $v1, $zero, .L80A036A0 -/* 01A58 80A03688 E608028C */ swc1 $f8, 0x028C($s0) ## 0000028C -/* 01A5C 80A0368C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01A60 80A03690 50410011 */ beql $v0, $at, .L80A036D8 -/* 01A64 80A03694 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01A68 80A03698 10000018 */ beq $zero, $zero, .L80A036FC -/* 01A6C 80A0369C 00000000 */ nop -.L80A036A0: -/* 01A70 80A036A0 44819000 */ mtc1 $at, $f18 ## $f18 = -1.00 -/* 01A74 80A036A4 3C0180A0 */ lui $at, %hi(D_80A061D8) ## $at = 80A00000 -/* 01A78 80A036A8 24780001 */ addiu $t8, $v1, 0x0001 ## $t8 = 00000001 -/* 01A7C 80A036AC 4612103C */ c.lt.s $f2, $f18 -/* 01A80 80A036B0 00000000 */ nop -/* 01A84 80A036B4 45000005 */ bc1f .L80A036CC -/* 01A88 80A036B8 00000000 */ nop -/* 01A8C 80A036BC C42461D8 */ lwc1 $f4, %lo(D_80A061D8)($at) -/* 01A90 80A036C0 46041180 */ add.s $f6, $f2, $f4 -/* 01A94 80A036C4 1000000D */ beq $zero, $zero, .L80A036FC -/* 01A98 80A036C8 E60602B4 */ swc1 $f6, 0x02B4($s0) ## 000002B4 -.L80A036CC: -/* 01A9C 80A036CC 1000000B */ beq $zero, $zero, .L80A036FC -/* 01AA0 80A036D0 A61802AA */ sh $t8, 0x02AA($s0) ## 000002AA -/* 01AA4 80A036D4 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -.L80A036D8: -/* 01AA8 80A036D8 44814000 */ mtc1 $at, $f8 ## $f8 = -1.00 -/* 01AAC 80A036DC 3C0180A0 */ lui $at, %hi(D_80A061DC) ## $at = 80A00000 -/* 01AB0 80A036E0 4602403C */ c.lt.s $f8, $f2 -/* 01AB4 80A036E4 00000000 */ nop -/* 01AB8 80A036E8 45000004 */ bc1f .L80A036FC -/* 01ABC 80A036EC 00000000 */ nop -/* 01AC0 80A036F0 C42A61DC */ lwc1 $f10, %lo(D_80A061DC)($at) -/* 01AC4 80A036F4 460A1401 */ sub.s $f16, $f2, $f10 -/* 01AC8 80A036F8 E61002B4 */ swc1 $f16, 0x02B4($s0) ## 000002B4 -.L80A036FC: -/* 01ACC 80A036FC 0C01DE1C */ jal Math_Sins - ## sins? -/* 01AD0 80A03700 860402AC */ lh $a0, 0x02AC($s0) ## 000002AC -/* 01AD4 80A03704 C61202B8 */ lwc1 $f18, 0x02B8($s0) ## 000002B8 -/* 01AD8 80A03708 861902AC */ lh $t9, 0x02AC($s0) ## 000002AC -/* 01ADC 80A0370C 860802B0 */ lh $t0, 0x02B0($s0) ## 000002B0 -/* 01AE0 80A03710 46009107 */ neg.s $f4, $f18 -/* 01AE4 80A03714 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 01AE8 80A03718 46040182 */ mul.s $f6, $f0, $f4 -/* 01AEC 80A0371C 03284821 */ addu $t1, $t9, $t0 -/* 01AF0 80A03720 A60902AC */ sh $t1, 0x02AC($s0) ## 000002AC -/* 01AF4 80A03724 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01AF8 80A03728 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AFC 80A0372C E6060294 */ swc1 $f6, 0x0294($s0) ## 00000294 -/* 01B00 80A03730 8FA5002C */ lw $a1, 0x002C($sp) -/* 01B04 80A03734 0C280B26 */ jal func_80A02C98 -/* 01B08 80A03738 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 01B0C 80A0373C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 01B10 80A03740 C60802B4 */ lwc1 $f8, 0x02B4($s0) ## 000002B4 -/* 01B14 80A03744 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01B18 80A03748 4602403C */ c.lt.s $f8, $f2 -/* 01B1C 80A0374C 00000000 */ nop -/* 01B20 80A03750 45020016 */ bc1fl .L80A037AC -/* 01B24 80A03754 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01B28 80A03758 C6000290 */ lwc1 $f0, 0x0290($s0) ## 00000290 -/* 01B2C 80A0375C 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 01B30 80A03760 00000000 */ nop -/* 01B34 80A03764 460A003C */ c.lt.s $f0, $f10 -/* 01B38 80A03768 00000000 */ nop -/* 01B3C 80A0376C 4502000F */ bc1fl .L80A037AC -/* 01B40 80A03770 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01B44 80A03774 4600103C */ c.lt.s $f2, $f0 -/* 01B48 80A03778 3C0180A0 */ lui $at, %hi(D_80A061E0) ## $at = 80A00000 -/* 01B4C 80A0377C 4502000B */ bc1fl .L80A037AC -/* 01B50 80A03780 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01B54 80A03784 C43061E0 */ lwc1 $f16, %lo(D_80A061E0)($at) -/* 01B58 80A03788 3C0180A0 */ lui $at, %hi(D_80A061E4) ## $at = 80A00000 -/* 01B5C 80A0378C C42461E4 */ lwc1 $f4, %lo(D_80A061E4)($at) -/* 01B60 80A03790 46100482 */ mul.s $f18, $f0, $f16 -/* 01B64 80A03794 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B68 80A03798 46049182 */ mul.s $f6, $f18, $f4 -/* 01B6C 80A0379C 44053000 */ mfc1 $a1, $f6 -/* 01B70 80A037A0 0C00B58B */ jal Actor_SetScale - -/* 01B74 80A037A4 00000000 */ nop -/* 01B78 80A037A8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -.L80A037AC: -/* 01B7C 80A037AC 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 01B80 80A037B0 C6080290 */ lwc1 $f8, 0x0290($s0) ## 00000290 -/* 01B84 80A037B4 460A403C */ c.lt.s $f8, $f10 -/* 01B88 80A037B8 00000000 */ nop -/* 01B8C 80A037BC 45020006 */ bc1fl .L80A037D8 -/* 01B90 80A037C0 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -/* 01B94 80A037C4 0C00B55C */ jal Actor_Kill - -/* 01B98 80A037C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B9C 80A037CC 1000000D */ beq $zero, $zero, .L80A03804 -/* 01BA0 80A037D0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01BA4 80A037D4 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -.L80A037D8: -/* 01BA8 80A037D8 0C034199 */ jal atan2s - -/* 01BAC 80A037DC C60E005C */ lwc1 $f14, 0x005C($s0) ## 0000005C -/* 01BB0 80A037E0 A60202BC */ sh $v0, 0x02BC($s0) ## 000002BC -/* 01BB4 80A037E4 8FA50034 */ lw $a1, 0x0034($sp) -/* 01BB8 80A037E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BBC 80A037EC 0C28126D */ jal func_80A049B4 -/* 01BC0 80A037F0 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 -/* 01BC4 80A037F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BC8 80A037F8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01BCC 80A037FC 240520A8 */ addiu $a1, $zero, 0x20A8 ## $a1 = 000020A8 -/* 01BD0 80A03800 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A03804: -/* 01BD4 80A03804 8FB00020 */ lw $s0, 0x0020($sp) -/* 01BD8 80A03808 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01BDC 80A0380C 03E00008 */ jr $ra -/* 01BE0 80A03810 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03814.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03814.s deleted file mode 100644 index 5a8f734e3a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03814.s +++ /dev/null @@ -1,115 +0,0 @@ -.late_rodata -glabel D_80A061E8 - .float 0.1 - -glabel D_80A061EC - .float 0.7 - -.text -glabel func_80A03814 -/* 01BE4 80A03814 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01BE8 80A03818 AFBF001C */ sw $ra, 0x001C($sp) -/* 01BEC 80A0381C AFB00018 */ sw $s0, 0x0018($sp) -/* 01BF0 80A03820 AFA5002C */ sw $a1, 0x002C($sp) -/* 01BF4 80A03824 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 01BF8 80A03828 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01BFC 80A0382C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01C00 80A03830 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01C04 80A03834 AFAF0024 */ sw $t7, 0x0024($sp) -/* 01C08 80A03838 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 01C0C 80A0383C 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 01C10 80A03840 C6000290 */ lwc1 $f0, 0x0290($s0) ## 00000290 -/* 01C14 80A03844 4600203C */ c.lt.s $f4, $f0 -/* 01C18 80A03848 00000000 */ nop -/* 01C1C 80A0384C 45020006 */ bc1fl .L80A03868 -/* 01C20 80A03850 860202AE */ lh $v0, 0x02AE($s0) ## 000002AE -/* 01C24 80A03854 0C00B55C */ jal Actor_Kill - -/* 01C28 80A03858 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C2C 80A0385C 10000048 */ beq $zero, $zero, .L80A03980 -/* 01C30 80A03860 8FBF001C */ lw $ra, 0x001C($sp) -/* 01C34 80A03864 860202AE */ lh $v0, 0x02AE($s0) ## 000002AE -.L80A03868: -/* 01C38 80A03868 2841007E */ slti $at, $v0, 0x007E -/* 01C3C 80A0386C 1420000E */ bne $at, $zero, .L80A038A8 -/* 01C40 80A03870 3C0180A0 */ lui $at, %hi(D_80A061E8) ## $at = 80A00000 -/* 01C44 80A03874 C42861E8 */ lwc1 $f8, %lo(D_80A061E8)($at) -/* 01C48 80A03878 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01C4C 80A0387C 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 01C50 80A03880 C61002B4 */ lwc1 $f16, 0x02B4($s0) ## 000002B4 -/* 01C54 80A03884 C60602B8 */ lwc1 $f6, 0x02B8($s0) ## 000002B8 -/* 01C58 80A03888 46128100 */ add.s $f4, $f16, $f18 -/* 01C5C 80A0388C 46083280 */ add.s $f10, $f6, $f8 -/* 01C60 80A03890 E60402B4 */ swc1 $f4, 0x02B4($s0) ## 000002B4 -/* 01C64 80A03894 C60602B4 */ lwc1 $f6, 0x02B4($s0) ## 000002B4 -/* 01C68 80A03898 E60A02B8 */ swc1 $f10, 0x02B8($s0) ## 000002B8 -/* 01C6C 80A0389C 46060200 */ add.s $f8, $f0, $f6 -/* 01C70 80A038A0 10000018 */ beq $zero, $zero, .L80A03904 -/* 01C74 80A038A4 E6080290 */ swc1 $f8, 0x0290($s0) ## 00000290 -.L80A038A8: -/* 01C78 80A038A8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01C7C 80A038AC 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 -/* 01C80 80A038B0 C60002B8 */ lwc1 $f0, 0x02B8($s0) ## 000002B8 -/* 01C84 80A038B4 24580001 */ addiu $t8, $v0, 0x0001 ## $t8 = 00000001 -/* 01C88 80A038B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01C8C 80A038BC 460A003C */ c.lt.s $f0, $f10 -/* 01C90 80A038C0 A61802AE */ sh $t8, 0x02AE($s0) ## 000002AE -/* 01C94 80A038C4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01C98 80A038C8 45020006 */ bc1fl .L80A038E4 -/* 01C9C 80A038CC C6000290 */ lwc1 $f0, 0x0290($s0) ## 00000290 -/* 01CA0 80A038D0 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 01CA4 80A038D4 00000000 */ nop -/* 01CA8 80A038D8 46100480 */ add.s $f18, $f0, $f16 -/* 01CAC 80A038DC E61202B8 */ swc1 $f18, 0x02B8($s0) ## 000002B8 -/* 01CB0 80A038E0 C6000290 */ lwc1 $f0, 0x0290($s0) ## 00000290 -.L80A038E4: -/* 01CB4 80A038E4 3C0180A0 */ lui $at, %hi(D_80A061EC) ## $at = 80A00000 -/* 01CB8 80A038E8 4600203C */ c.lt.s $f4, $f0 -/* 01CBC 80A038EC 00000000 */ nop -/* 01CC0 80A038F0 45000004 */ bc1f .L80A03904 -/* 01CC4 80A038F4 00000000 */ nop -/* 01CC8 80A038F8 C42661EC */ lwc1 $f6, %lo(D_80A061EC)($at) -/* 01CCC 80A038FC 46060201 */ sub.s $f8, $f0, $f6 -/* 01CD0 80A03900 E6080290 */ swc1 $f8, 0x0290($s0) ## 00000290 -.L80A03904: -/* 01CD4 80A03904 0C01DE0D */ jal Math_Coss - ## coss? -/* 01CD8 80A03908 860402AC */ lh $a0, 0x02AC($s0) ## 000002AC -/* 01CDC 80A0390C C60A02B8 */ lwc1 $f10, 0x02B8($s0) ## 000002B8 -/* 01CE0 80A03910 860402AC */ lh $a0, 0x02AC($s0) ## 000002AC -/* 01CE4 80A03914 460A0402 */ mul.s $f16, $f0, $f10 -/* 01CE8 80A03918 0C01DE1C */ jal Math_Sins - ## sins? -/* 01CEC 80A0391C E610028C */ swc1 $f16, 0x028C($s0) ## 0000028C -/* 01CF0 80A03920 C61202B8 */ lwc1 $f18, 0x02B8($s0) ## 000002B8 -/* 01CF4 80A03924 861902AC */ lh $t9, 0x02AC($s0) ## 000002AC -/* 01CF8 80A03928 860802B0 */ lh $t0, 0x02B0($s0) ## 000002B0 -/* 01CFC 80A0392C 46009107 */ neg.s $f4, $f18 -/* 01D00 80A03930 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D04 80A03934 46040182 */ mul.s $f6, $f0, $f4 -/* 01D08 80A03938 03284821 */ addu $t1, $t9, $t0 -/* 01D0C 80A0393C A60902AC */ sh $t1, 0x02AC($s0) ## 000002AC -/* 01D10 80A03940 E6060294 */ swc1 $f6, 0x0294($s0) ## 00000294 -/* 01D14 80A03944 8FA50024 */ lw $a1, 0x0024($sp) -/* 01D18 80A03948 0C280B8C */ jal func_80A02E30 -/* 01D1C 80A0394C 24A50908 */ addiu $a1, $a1, 0x0908 ## $a1 = 00000908 -/* 01D20 80A03950 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -/* 01D24 80A03954 0C034199 */ jal atan2s - -/* 01D28 80A03958 C60E005C */ lwc1 $f14, 0x005C($s0) ## 0000005C -/* 01D2C 80A0395C A60202BC */ sh $v0, 0x02BC($s0) ## 000002BC -/* 01D30 80A03960 8FA5002C */ lw $a1, 0x002C($sp) -/* 01D34 80A03964 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D38 80A03968 0C28126D */ jal func_80A049B4 -/* 01D3C 80A0396C 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 -/* 01D40 80A03970 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D44 80A03974 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01D48 80A03978 240520A8 */ addiu $a1, $zero, 0x20A8 ## $a1 = 000020A8 -/* 01D4C 80A0397C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A03980: -/* 01D50 80A03980 8FB00018 */ lw $s0, 0x0018($sp) -/* 01D54 80A03984 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01D58 80A03988 03E00008 */ jr $ra -/* 01D5C 80A0398C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03990.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03990.s deleted file mode 100644 index b6411cb9cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03990.s +++ /dev/null @@ -1,89 +0,0 @@ -.late_rodata -glabel D_80A061F0 - .float 0.3499999940395355 - -glabel D_80A061F4 - .float 0.012345679104328156 - -glabel D_80A061F8 - .float 0.008 - -.text -glabel func_80A03990 -/* 01D60 80A03990 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01D64 80A03994 AFBF001C */ sw $ra, 0x001C($sp) -/* 01D68 80A03998 AFB00018 */ sw $s0, 0x0018($sp) -/* 01D6C 80A0399C AFA5002C */ sw $a1, 0x002C($sp) -/* 01D70 80A039A0 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 01D74 80A039A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D78 80A039A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01D7C 80A039AC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01D80 80A039B0 AFAF0024 */ sw $t7, 0x0024($sp) -/* 01D84 80A039B4 C60002B4 */ lwc1 $f0, 0x02B4($s0) ## 000002B4 -/* 01D88 80A039B8 C6040290 */ lwc1 $f4, 0x0290($s0) ## 00000290 -/* 01D8C 80A039BC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 01D90 80A039C0 3C0180A0 */ lui $at, %hi(D_80A061F0) ## $at = 80A00000 -/* 01D94 80A039C4 46002180 */ add.s $f6, $f4, $f0 -/* 01D98 80A039C8 E6020294 */ swc1 $f2, 0x0294($s0) ## 00000294 -/* 01D9C 80A039CC E602028C */ swc1 $f2, 0x028C($s0) ## 0000028C -/* 01DA0 80A039D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DA4 80A039D4 E6060290 */ swc1 $f6, 0x0290($s0) ## 00000290 -/* 01DA8 80A039D8 C42861F0 */ lwc1 $f8, %lo(D_80A061F0)($at) -/* 01DAC 80A039DC 3C0580A0 */ lui $a1, %hi(func_80A03814) ## $a1 = 80A00000 -/* 01DB0 80A039E0 46080281 */ sub.s $f10, $f0, $f8 -/* 01DB4 80A039E4 E60A02B4 */ swc1 $f10, 0x02B4($s0) ## 000002B4 -/* 01DB8 80A039E8 C61002B4 */ lwc1 $f16, 0x02B4($s0) ## 000002B4 -/* 01DBC 80A039EC 4602803E */ c.le.s $f16, $f2 -/* 01DC0 80A039F0 00000000 */ nop -/* 01DC4 80A039F4 4502000C */ bc1fl .L80A03A28 -/* 01DC8 80A039F8 8FA50024 */ lw $a1, 0x0024($sp) -/* 01DCC 80A039FC 0C28070C */ jal func_80A01C30 -/* 01DD0 80A03A00 24A53814 */ addiu $a1, $a1, %lo(func_80A03814) ## $a1 = 80A03814 -/* 01DD4 80A03A04 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01DD8 80A03A08 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 01DDC 80A03A0C 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 01DE0 80A03A10 24180800 */ addiu $t8, $zero, 0x0800 ## $t8 = 00000800 -/* 01DE4 80A03A14 A61802B0 */ sh $t8, 0x02B0($s0) ## 000002B0 -/* 01DE8 80A03A18 A60002AE */ sh $zero, 0x02AE($s0) ## 000002AE -/* 01DEC 80A03A1C E60202B4 */ swc1 $f2, 0x02B4($s0) ## 000002B4 -/* 01DF0 80A03A20 E61202B8 */ swc1 $f18, 0x02B8($s0) ## 000002B8 -/* 01DF4 80A03A24 8FA50024 */ lw $a1, 0x0024($sp) -.L80A03A28: -/* 01DF8 80A03A28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DFC 80A03A2C 0C280B8C */ jal func_80A02E30 -/* 01E00 80A03A30 24A50908 */ addiu $a1, $a1, 0x0908 ## $a1 = 00000908 -/* 01E04 80A03A34 C60002B4 */ lwc1 $f0, 0x02B4($s0) ## 000002B4 -/* 01E08 80A03A38 3C0180A0 */ lui $at, %hi(D_80A061F4) ## $at = 80A00000 -/* 01E0C 80A03A3C C42661F4 */ lwc1 $f6, %lo(D_80A061F4)($at) -/* 01E10 80A03A40 46000102 */ mul.s $f4, $f0, $f0 -/* 01E14 80A03A44 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01E18 80A03A48 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 01E1C 80A03A4C 3C0180A0 */ lui $at, %hi(D_80A061F8) ## $at = 80A00000 -/* 01E20 80A03A50 C43261F8 */ lwc1 $f18, %lo(D_80A061F8)($at) -/* 01E24 80A03A54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E28 80A03A58 46062202 */ mul.s $f8, $f4, $f6 -/* 01E2C 80A03A5C 46085401 */ sub.s $f16, $f10, $f8 -/* 01E30 80A03A60 46128102 */ mul.s $f4, $f16, $f18 -/* 01E34 80A03A64 44052000 */ mfc1 $a1, $f4 -/* 01E38 80A03A68 0C00B58B */ jal Actor_SetScale - -/* 01E3C 80A03A6C 00000000 */ nop -/* 01E40 80A03A70 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -/* 01E44 80A03A74 0C034199 */ jal atan2s - -/* 01E48 80A03A78 C60E005C */ lwc1 $f14, 0x005C($s0) ## 0000005C -/* 01E4C 80A03A7C A60202BC */ sh $v0, 0x02BC($s0) ## 000002BC -/* 01E50 80A03A80 8FA5002C */ lw $a1, 0x002C($sp) -/* 01E54 80A03A84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E58 80A03A88 0C28126D */ jal func_80A049B4 -/* 01E5C 80A03A8C 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 -/* 01E60 80A03A90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E64 80A03A94 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01E68 80A03A98 240520A8 */ addiu $a1, $zero, 0x20A8 ## $a1 = 000020A8 -/* 01E6C 80A03A9C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E70 80A03AA0 8FB00018 */ lw $s0, 0x0018($sp) -/* 01E74 80A03AA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01E78 80A03AA8 03E00008 */ jr $ra -/* 01E7C 80A03AAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03AB0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03AB0.s deleted file mode 100644 index e649e32cab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03AB0.s +++ /dev/null @@ -1,45 +0,0 @@ -.rdata -glabel D_80A060C4 - .asciz "0" - .balign 4 - -glabel D_80A060C8 - .asciz "../z_en_elf.c" - .balign 4 - -.text -glabel func_80A03AB0 -/* 01E80 80A03AB0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01E84 80A03AB4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01E88 80A03AB8 AFB00018 */ sw $s0, 0x0018($sp) -/* 01E8C 80A03ABC AFA50024 */ sw $a1, 0x0024($sp) -/* 01E90 80A03AC0 948E02C4 */ lhu $t6, 0x02C4($a0) ## 000002C4 -/* 01E94 80A03AC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01E98 80A03AC8 31CF0004 */ andi $t7, $t6, 0x0004 ## $t7 = 00000000 -/* 01E9C 80A03ACC 11E00003 */ beq $t7, $zero, .L80A03ADC -/* 01EA0 80A03AD0 00000000 */ nop -/* 01EA4 80A03AD4 0C281105 */ jal func_80A04414 -/* 01EA8 80A03AD8 00000000 */ nop -.L80A03ADC: -/* 01EAC 80A03ADC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01EB0 80A03AE0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01EB4 80A03AE4 8E0202C8 */ lw $v0, 0x02C8($s0) ## 000002C8 -/* 01EB8 80A03AE8 3C0480A0 */ lui $a0, %hi(D_80A060C4) ## $a0 = 80A00000 -/* 01EBC 80A03AEC 248460C4 */ addiu $a0, $a0, %lo(D_80A060C4) ## $a0 = 80A060C4 -/* 01EC0 80A03AF0 14400005 */ bne $v0, $zero, .L80A03B08 -/* 01EC4 80A03AF4 3C0580A0 */ lui $a1, %hi(D_80A060C8) ## $a1 = 80A00000 -/* 01EC8 80A03AF8 24A560C8 */ addiu $a1, $a1, %lo(D_80A060C8) ## $a1 = 80A060C8 -/* 01ECC 80A03AFC 0C0007FC */ jal __assert - -/* 01ED0 80A03B00 240606BD */ addiu $a2, $zero, 0x06BD ## $a2 = 000006BD -/* 01ED4 80A03B04 8E0202C8 */ lw $v0, 0x02C8($s0) ## 000002C8 -.L80A03B08: -/* 01ED8 80A03B08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EDC 80A03B0C 0040F809 */ jalr $ra, $v0 -/* 01EE0 80A03B10 8FA50024 */ lw $a1, 0x0024($sp) -/* 01EE4 80A03B14 8FBF001C */ lw $ra, 0x001C($sp) -/* 01EE8 80A03B18 8FB00018 */ lw $s0, 0x0018($sp) -/* 01EEC 80A03B1C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01EF0 80A03B20 03E00008 */ jr $ra -/* 01EF4 80A03B24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03B28.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03B28.s deleted file mode 100644 index 20f995ada4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03B28.s +++ /dev/null @@ -1,125 +0,0 @@ -glabel func_80A03B28 -/* 01EF8 80A03B28 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01EFC 80A03B2C AFBF002C */ sw $ra, 0x002C($sp) -/* 01F00 80A03B30 AFB00028 */ sw $s0, 0x0028($sp) -/* 01F04 80A03B34 AFA5003C */ sw $a1, 0x003C($sp) -/* 01F08 80A03B38 848E02A8 */ lh $t6, 0x02A8($a0) ## 000002A8 -/* 01F0C 80A03B3C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01F10 80A03B40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01F14 80A03B44 15C10002 */ bne $t6, $at, .L80A03B50 -/* 01F18 80A03B48 24030064 */ addiu $v1, $zero, 0x0064 ## $v1 = 00000064 -/* 01F1C 80A03B4C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80A03B50: -/* 01F20 80A03B50 960F02C4 */ lhu $t7, 0x02C4($s0) ## 000002C4 -/* 01F24 80A03B54 26040278 */ addiu $a0, $s0, 0x0278 ## $a0 = 00000278 -/* 01F28 80A03B58 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 01F2C 80A03B5C 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 -/* 01F30 80A03B60 13000029 */ beq $t8, $zero, .L80A03C08 -/* 01F34 80A03B64 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 01F38 80A03B68 8FB9003C */ lw $t9, 0x003C($sp) -/* 01F3C 80A03B6C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01F40 80A03B70 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 01F44 80A03B74 8F221C44 */ lw $v0, 0x1C44($t9) ## 00001C44 -/* 01F48 80A03B78 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01F4C 80A03B7C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01F50 80A03B80 C4480028 */ lwc1 $f8, 0x0028($v0) ## 00000028 -/* 01F54 80A03B84 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 01F58 80A03B88 240800C8 */ addiu $t0, $zero, 0x00C8 ## $t0 = 000000C8 -/* 01F5C 80A03B8C 4600428D */ trunc.w.s $f10, $f8 -/* 01F60 80A03B90 26040278 */ addiu $a0, $s0, 0x0278 ## $a0 = 00000278 -/* 01F64 80A03B94 4600218D */ trunc.w.s $f6, $f4 -/* 01F68 80A03B98 440A5000 */ mfc1 $t2, $f10 -/* 01F6C 80A03B9C 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 -/* 01F70 80A03BA0 C44A002C */ lwc1 $f10, 0x002C($v0) ## 0000002C -/* 01F74 80A03BA4 000A5C00 */ sll $t3, $t2, 16 -/* 01F78 80A03BA8 000B6403 */ sra $t4, $t3, 16 -/* 01F7C 80A03BAC 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00 -/* 01F80 80A03BB0 44053000 */ mfc1 $a1, $f6 -/* 01F84 80A03BB4 A7A30036 */ sh $v1, 0x0036($sp) -/* 01F88 80A03BB8 468084A0 */ cvt.s.w $f18, $f16 -/* 01F8C 80A03BBC 00052C00 */ sll $a1, $a1, 16 -/* 01F90 80A03BC0 00052C03 */ sra $a1, $a1, 16 -/* 01F94 80A03BC4 AFA8001C */ sw $t0, 0x001C($sp) -/* 01F98 80A03BC8 AFB90018 */ sw $t9, 0x0018($sp) -/* 01F9C 80A03BCC 4600540D */ trunc.w.s $f16, $f10 -/* 01FA0 80A03BD0 AFB80014 */ sw $t8, 0x0014($sp) -/* 01FA4 80A03BD4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 01FA8 80A03BD8 46049180 */ add.s $f6, $f18, $f4 -/* 01FAC 80A03BDC 44078000 */ mfc1 $a3, $f16 -/* 01FB0 80A03BE0 4600320D */ trunc.w.s $f8, $f6 -/* 01FB4 80A03BE4 00073C00 */ sll $a3, $a3, 16 -/* 01FB8 80A03BE8 00073C03 */ sra $a3, $a3, 16 -/* 01FBC 80A03BEC 44064000 */ mfc1 $a2, $f8 -/* 01FC0 80A03BF0 00000000 */ nop -/* 01FC4 80A03BF4 00063400 */ sll $a2, $a2, 16 -/* 01FC8 80A03BF8 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 01FCC 80A03BFC 00063403 */ sra $a2, $a2, 16 -/* 01FD0 80A03C00 10000019 */ beq $zero, $zero, .L80A03C68 -/* 01FD4 80A03C04 87A30036 */ lh $v1, 0x0036($sp) -.L80A03C08: -/* 01FD8 80A03C08 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 01FDC 80A03C0C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 01FE0 80A03C10 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 01FE4 80A03C14 4600910D */ trunc.w.s $f4, $f18 -/* 01FE8 80A03C18 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 01FEC 80A03C1C 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 01FF0 80A03C20 4600320D */ trunc.w.s $f8, $f6 -/* 01FF4 80A03C24 44052000 */ mfc1 $a1, $f4 -/* 01FF8 80A03C28 AFAF001C */ sw $t7, 0x001C($sp) -/* 01FFC 80A03C2C 4600540D */ trunc.w.s $f16, $f10 -/* 02000 80A03C30 44064000 */ mfc1 $a2, $f8 -/* 02004 80A03C34 00052C00 */ sll $a1, $a1, 16 -/* 02008 80A03C38 00052C03 */ sra $a1, $a1, 16 -/* 0200C 80A03C3C 44078000 */ mfc1 $a3, $f16 -/* 02010 80A03C40 00063400 */ sll $a2, $a2, 16 -/* 02014 80A03C44 00063403 */ sra $a2, $a2, 16 -/* 02018 80A03C48 00073C00 */ sll $a3, $a3, 16 -/* 0201C 80A03C4C 00073C03 */ sra $a3, $a3, 16 -/* 02020 80A03C50 AFAE0018 */ sw $t6, 0x0018($sp) -/* 02024 80A03C54 A7A30036 */ sh $v1, 0x0036($sp) -/* 02028 80A03C58 AFAD0014 */ sw $t5, 0x0014($sp) -/* 0202C 80A03C5C 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 02030 80A03C60 AFAC0010 */ sw $t4, 0x0010($sp) -/* 02034 80A03C64 87A30036 */ lh $v1, 0x0036($sp) -.L80A03C68: -/* 02038 80A03C68 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 0203C 80A03C6C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 02040 80A03C70 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 02044 80A03C74 4600910D */ trunc.w.s $f4, $f18 -/* 02048 80A03C78 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 0204C 80A03C7C 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 02050 80A03C80 4600320D */ trunc.w.s $f8, $f6 -/* 02054 80A03C84 44052000 */ mfc1 $a1, $f4 -/* 02058 80A03C88 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 0205C 80A03C8C 4600540D */ trunc.w.s $f16, $f10 -/* 02060 80A03C90 44064000 */ mfc1 $a2, $f8 -/* 02064 80A03C94 00052C00 */ sll $a1, $a1, 16 -/* 02068 80A03C98 00052C03 */ sra $a1, $a1, 16 -/* 0206C 80A03C9C 44078000 */ mfc1 $a3, $f16 -/* 02070 80A03CA0 00063400 */ sll $a2, $a2, 16 -/* 02074 80A03CA4 00063403 */ sra $a2, $a2, 16 -/* 02078 80A03CA8 00073C00 */ sll $a3, $a3, 16 -/* 0207C 80A03CAC 00073C03 */ sra $a3, $a3, 16 -/* 02080 80A03CB0 AFAB0018 */ sw $t3, 0x0018($sp) -/* 02084 80A03CB4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 02088 80A03CB8 AFA90010 */ sw $t1, 0x0010($sp) -/* 0208C 80A03CBC AFA3001C */ sw $v1, 0x001C($sp) -/* 02090 80A03CC0 0C01E77C */ jal Lights_PointGlowSetInfo - -/* 02094 80A03CC4 26040264 */ addiu $a0, $s0, 0x0264 ## $a0 = 00000264 -/* 02098 80A03CC8 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -/* 0209C 80A03CCC 0C034199 */ jal atan2s - -/* 020A0 80A03CD0 C60E005C */ lwc1 $f14, 0x005C($s0) ## 0000005C -/* 020A4 80A03CD4 A60202BC */ sh $v0, 0x02BC($s0) ## 000002BC -/* 020A8 80A03CD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020AC 80A03CDC 0C00B58B */ jal Actor_SetScale - -/* 020B0 80A03CE0 8E050050 */ lw $a1, 0x0050($s0) ## 00000050 -/* 020B4 80A03CE4 8FBF002C */ lw $ra, 0x002C($sp) -/* 020B8 80A03CE8 8FB00028 */ lw $s0, 0x0028($sp) -/* 020BC 80A03CEC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 020C0 80A03CF0 03E00008 */ jr $ra -/* 020C4 80A03CF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s index 06c183be41..0a2d6bd3ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s @@ -59,7 +59,7 @@ glabel func_80A03CF8 /* 02120 80A03D50 53200053 */ beql $t9, $zero, .L80A03EA0 /* 02124 80A03D54 AFA50030 */ sw $a1, 0x0030($sp) /* 02128 80A03D58 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFF4 -/* 0212C 80A03D5C 0C2817C4 */ jal func_80A05F10 +/* 0212C 80A03D5C 0C2817C4 */ jal EnElf_GetCutsceneNextPos /* 02130 80A03D60 01E02825 */ or $a1, $t7, $zero ## $a1 = 00000000 /* 02134 80A03D64 8FA80064 */ lw $t0, 0x0064($sp) /* 02138 80A03D68 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 @@ -69,7 +69,7 @@ glabel func_80A03CF8 /* 02148 80A03D78 952A0000 */ lhu $t2, 0x0000($t1) ## 00000000 /* 0214C 80A03D7C 55410004 */ bnel $t2, $at, .L80A03D90 /* 02150 80A03D80 8E0D0024 */ lw $t5, 0x0024($s0) ## 00000024 -/* 02154 80A03D84 0C28126D */ jal func_80A049B4 +/* 02154 80A03D84 0C28126D */ jal EnElf_SpawnSparkles /* 02158 80A03D88 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 /* 0215C 80A03D8C 8E0D0024 */ lw $t5, 0x0024($s0) ## 00000024 .L80A03D90: @@ -229,7 +229,7 @@ glabel func_80A03CF8 /* 0238C 80A03FBC C42A6208 */ lwc1 $f10, %lo(D_80A06208)($at) /* 02390 80A03FC0 E7AA003C */ swc1 $f10, 0x003C($sp) .L80A03FC4: -/* 02394 80A03FC4 0C28126D */ jal func_80A049B4 +/* 02394 80A03FC4 0C28126D */ jal EnElf_SpawnSparkles /* 02398 80A03FC8 8FA50064 */ lw $a1, 0x0064($sp) /* 0239C 80A03FCC 100000D2 */ beq $zero, $zero, .L80A04318 /* 023A0 80A03FD0 860202A8 */ lh $v0, 0x02A8($s0) ## 000002A8 @@ -272,7 +272,7 @@ glabel func_80A03CF8 /* 0242C 80A0405C E7A60058 */ swc1 $f6, 0x0058($sp) /* 02430 80A04060 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02434 80A04064 8FA50064 */ lw $a1, 0x0064($sp) -/* 02438 80A04068 0C28126D */ jal func_80A049B4 +/* 02438 80A04068 0C28126D */ jal EnElf_SpawnSparkles /* 0243C 80A0406C 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 /* 02440 80A04070 3C014198 */ lui $at, 0x4198 ## $at = 41980000 /* 02444 80A04074 44815000 */ mtc1 $at, $f10 ## $f10 = 19.00 @@ -383,7 +383,7 @@ glabel func_80A03CF8 /* 025D4 80A04204 00000000 */ nop /* 025D8 80A04208 45020043 */ bc1fl .L80A04318 /* 025DC 80A0420C 860202A8 */ lh $v0, 0x02A8($s0) ## 000002A8 -/* 025E0 80A04210 0C28126D */ jal func_80A049B4 +/* 025E0 80A04210 0C28126D */ jal EnElf_SpawnSparkles /* 025E4 80A04214 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 /* 025E8 80A04218 1000003F */ beq $zero, $zero, .L80A04318 /* 025EC 80A0421C 860202A8 */ lh $v0, 0x02A8($s0) ## 000002A8 @@ -425,7 +425,7 @@ glabel func_80A03CF8 /* 0266C 80A0429C E7A60010 */ swc1 $f6, 0x0010($sp) /* 02670 80A042A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02674 80A042A4 8FA50064 */ lw $a1, 0x0064($sp) -/* 02678 80A042A8 0C28126D */ jal func_80A049B4 +/* 02678 80A042A8 0C28126D */ jal EnElf_SpawnSparkles /* 0267C 80A042AC 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 /* 02680 80A042B0 10000019 */ beq $zero, $zero, .L80A04318 /* 02684 80A042B4 860202A8 */ lh $v0, 0x02A8($s0) ## 000002A8 @@ -484,7 +484,7 @@ glabel func_80A03CF8 /* 02738 80A04368 E7B20010 */ swc1 $f18, 0x0010($sp) .L80A0436C: /* 0273C 80A0436C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02740 80A04370 0C280ECA */ jal func_80A03B28 +/* 02740 80A04370 0C280ECA */ jal EnElf_UpdateLights /* 02744 80A04374 8FA50064 */ lw $a1, 0x0064($sp) /* 02748 80A04378 8FBF0024 */ lw $ra, 0x0024($sp) /* 0274C 80A0437C 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0438C.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0438C.s deleted file mode 100644 index f6f51d0571..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0438C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80A0438C -/* 0275C 80A0438C AFA7000C */ sw $a3, 0x000C($sp) -/* 02760 80A04390 C4C60000 */ lwc1 $f6, 0x0000($a2) ## 00000000 -/* 02764 80A04394 C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000000 -/* 02768 80A04398 C4CA0004 */ lwc1 $f10, 0x0004($a2) ## 00000004 -/* 0276C 80A0439C C4A80004 */ lwc1 $f8, 0x0004($a1) ## 00000004 -/* 02770 80A043A0 46062001 */ sub.s $f0, $f4, $f6 -/* 02774 80A043A4 C4D20008 */ lwc1 $f18, 0x0008($a2) ## 00000008 -/* 02778 80A043A8 C4B00008 */ lwc1 $f16, 0x0008($a1) ## 00000008 -/* 0277C 80A043AC 460A4081 */ sub.s $f2, $f8, $f10 -/* 02780 80A043B0 C7AA000C */ lwc1 $f10, 0x000C($sp) -/* 02784 80A043B4 C4880000 */ lwc1 $f8, 0x0000($a0) ## 00000000 -/* 02788 80A043B8 46128301 */ sub.s $f12, $f16, $f18 -/* 0278C 80A043BC 460A0402 */ mul.s $f16, $f0, $f10 -/* 02790 80A043C0 C4C6000C */ lwc1 $f6, 0x000C($a2) ## 0000000C -/* 02794 80A043C4 C4A4000C */ lwc1 $f4, 0x000C($a1) ## 0000000C -/* 02798 80A043C8 46062381 */ sub.s $f14, $f4, $f6 -/* 0279C 80A043CC C4840004 */ lwc1 $f4, 0x0004($a0) ## 00000004 -/* 027A0 80A043D0 46104480 */ add.s $f18, $f8, $f16 -/* 027A4 80A043D4 C4900008 */ lwc1 $f16, 0x0008($a0) ## 00000008 -/* 027A8 80A043D8 E4920000 */ swc1 $f18, 0x0000($a0) ## 00000000 -/* 027AC 80A043DC C7A6000C */ lwc1 $f6, 0x000C($sp) -/* 027B0 80A043E0 46061282 */ mul.s $f10, $f2, $f6 -/* 027B4 80A043E4 460A2200 */ add.s $f8, $f4, $f10 -/* 027B8 80A043E8 C48A000C */ lwc1 $f10, 0x000C($a0) ## 0000000C -/* 027BC 80A043EC E4880004 */ swc1 $f8, 0x0004($a0) ## 00000004 -/* 027C0 80A043F0 C7B2000C */ lwc1 $f18, 0x000C($sp) -/* 027C4 80A043F4 46126182 */ mul.s $f6, $f12, $f18 -/* 027C8 80A043F8 46068100 */ add.s $f4, $f16, $f6 -/* 027CC 80A043FC E4840008 */ swc1 $f4, 0x0008($a0) ## 00000008 -/* 027D0 80A04400 C7A8000C */ lwc1 $f8, 0x000C($sp) -/* 027D4 80A04404 46087482 */ mul.s $f18, $f14, $f8 -/* 027D8 80A04408 46125400 */ add.s $f16, $f10, $f18 -/* 027DC 80A0440C 03E00008 */ jr $ra -/* 027E0 80A04410 E490000C */ swc1 $f16, 0x000C($a0) ## 0000000C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04414.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04414.s deleted file mode 100644 index 87e1827a39..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04414.s +++ /dev/null @@ -1,148 +0,0 @@ -glabel func_80A04414 -/* 027E4 80A04414 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 027E8 80A04418 AFBF001C */ sw $ra, 0x001C($sp) -/* 027EC 80A0441C AFB00018 */ sw $s0, 0x0018($sp) -/* 027F0 80A04420 8CAE1CC8 */ lw $t6, 0x1CC8($a1) ## 00001CC8 -/* 027F4 80A04424 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 027F8 80A04428 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 027FC 80A0442C AFAE002C */ sw $t6, 0x002C($sp) -/* 02800 80A04430 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 02804 80A04434 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 02808 80A04438 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0280C 80A0443C AFAF0028 */ sw $t7, 0x0028($sp) -/* 02810 80A04440 C4A41CD0 */ lwc1 $f4, 0x1CD0($a1) ## 00001CD0 -/* 02814 80A04444 46040032 */ c.eq.s $f0, $f4 -/* 02818 80A04448 00000000 */ nop -/* 0281C 80A0444C 4503000B */ bc1tl .L80A0447C -/* 02820 80A04450 921902C6 */ lbu $t9, 0x02C6($s0) ## 000002C6 -/* 02824 80A04454 909802C7 */ lbu $t8, 0x02C7($a0) ## 000002C7 -/* 02828 80A04458 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0282C 80A0445C A08002C6 */ sb $zero, 0x02C6($a0) ## 000002C6 -/* 02830 80A04460 17000044 */ bne $t8, $zero, .L80A04574 -/* 02834 80A04464 E486029C */ swc1 $f6, 0x029C($a0) ## 0000029C -/* 02838 80A04468 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0283C 80A0446C 2405281B */ addiu $a1, $zero, 0x281B ## $a1 = 0000281B -/* 02840 80A04470 10000041 */ beq $zero, $zero, .L80A04578 -/* 02844 80A04474 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -/* 02848 80A04478 921902C6 */ lbu $t9, 0x02C6($s0) ## 000002C6 -.L80A0447C: -/* 0284C 80A0447C 8FA8002C */ lw $t0, 0x002C($sp) -/* 02850 80A04480 5720000F */ bnel $t9, $zero, .L80A044C0 -/* 02854 80A04484 C60A029C */ lwc1 $f10, 0x029C($s0) ## 0000029C -/* 02858 80A04488 11000009 */ beq $t0, $zero, .L80A044B0 -/* 0285C 80A0448C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 02860 80A04490 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 02864 80A04494 24E51C90 */ addiu $a1, $a3, 0x1C90 ## $a1 = 00001C90 -/* 02868 80A04498 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0286C 80A0449C 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 02870 80A044A0 00000000 */ nop -/* 02874 80A044A4 4608003C */ c.lt.s $f0, $f8 -/* 02878 80A044A8 00000000 */ nop -/* 0287C 80A044AC 45000031 */ bc1f .L80A04574 -.L80A044B0: -/* 02880 80A044B0 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 02884 80A044B4 1000002F */ beq $zero, $zero, .L80A04574 -/* 02888 80A044B8 A20902C6 */ sb $t1, 0x02C6($s0) ## 000002C6 -/* 0288C 80A044BC C60A029C */ lwc1 $f10, 0x029C($s0) ## 0000029C -.L80A044C0: -/* 02890 80A044C0 2604029C */ addiu $a0, $s0, 0x029C ## $a0 = 0000029C -/* 02894 80A044C4 3C063E80 */ lui $a2, 0x3E80 ## $a2 = 3E800000 -/* 02898 80A044C8 460A0032 */ c.eq.s $f0, $f10 -/* 0289C 80A044CC 00000000 */ nop -/* 028A0 80A044D0 45030029 */ bc1tl .L80A04578 -/* 028A4 80A044D4 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -/* 028A8 80A044D8 44050000 */ mfc1 $a1, $f0 -/* 028AC 80A044DC 0C01DE80 */ jal Math_ApproxF - -/* 028B0 80A044E0 AFA70034 */ sw $a3, 0x0034($sp) -/* 028B4 80A044E4 10400012 */ beq $v0, $zero, .L80A04530 -/* 028B8 80A044E8 8FA30034 */ lw $v1, 0x0034($sp) -/* 028BC 80A044EC 8C6B1CA8 */ lw $t3, 0x1CA8($v1) ## 00001CA8 -/* 028C0 80A044F0 AE0B0244 */ sw $t3, 0x0244($s0) ## 00000244 -/* 028C4 80A044F4 8C6A1CAC */ lw $t2, 0x1CAC($v1) ## 00001CAC -/* 028C8 80A044F8 AE0A0248 */ sw $t2, 0x0248($s0) ## 00000248 -/* 028CC 80A044FC 8C6B1CB0 */ lw $t3, 0x1CB0($v1) ## 00001CB0 -/* 028D0 80A04500 AE0B024C */ sw $t3, 0x024C($s0) ## 0000024C -/* 028D4 80A04504 8C6A1CB4 */ lw $t2, 0x1CB4($v1) ## 00001CB4 -/* 028D8 80A04508 AE0A0250 */ sw $t2, 0x0250($s0) ## 00000250 -/* 028DC 80A0450C 8C6D1CB8 */ lw $t5, 0x1CB8($v1) ## 00001CB8 -/* 028E0 80A04510 AE0D0254 */ sw $t5, 0x0254($s0) ## 00000254 -/* 028E4 80A04514 8C6C1CBC */ lw $t4, 0x1CBC($v1) ## 00001CBC -/* 028E8 80A04518 AE0C0258 */ sw $t4, 0x0258($s0) ## 00000258 -/* 028EC 80A0451C 8C6D1CC0 */ lw $t5, 0x1CC0($v1) ## 00001CC0 -/* 028F0 80A04520 AE0D025C */ sw $t5, 0x025C($s0) ## 0000025C -/* 028F4 80A04524 8C6C1CC4 */ lw $t4, 0x1CC4($v1) ## 00001CC4 -/* 028F8 80A04528 10000012 */ beq $zero, $zero, .L80A04574 -/* 028FC 80A0452C AE0C0260 */ sw $t4, 0x0260($s0) ## 00000260 -.L80A04530: -/* 02900 80A04530 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 02904 80A04534 44818000 */ mtc1 $at, $f16 ## $f16 = 0.25 -/* 02908 80A04538 C612029C */ lwc1 $f18, 0x029C($s0) ## 0000029C -/* 0290C 80A0453C 26040244 */ addiu $a0, $s0, 0x0244 ## $a0 = 00000244 -/* 02910 80A04540 00803025 */ or $a2, $a0, $zero ## $a2 = 00000244 -/* 02914 80A04544 46128003 */ div.s $f0, $f16, $f18 -/* 02918 80A04548 24651CA8 */ addiu $a1, $v1, 0x1CA8 ## $a1 = 00001CA8 -/* 0291C 80A0454C 44070000 */ mfc1 $a3, $f0 -/* 02920 80A04550 0C2810E3 */ jal func_80A0438C -/* 02924 80A04554 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 02928 80A04558 C7A00024 */ lwc1 $f0, 0x0024($sp) -/* 0292C 80A0455C 8FA30034 */ lw $v1, 0x0034($sp) -/* 02930 80A04560 26040254 */ addiu $a0, $s0, 0x0254 ## $a0 = 00000254 -/* 02934 80A04564 44070000 */ mfc1 $a3, $f0 -/* 02938 80A04568 00803025 */ or $a2, $a0, $zero ## $a2 = 00000254 -/* 0293C 80A0456C 0C2810E3 */ jal func_80A0438C -/* 02940 80A04570 24651CB8 */ addiu $a1, $v1, 0x1CB8 ## $a1 = 00001CB8 -.L80A04574: -/* 02944 80A04574 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -.L80A04578: -/* 02948 80A04578 8FAF002C */ lw $t7, 0x002C($sp) -/* 0294C 80A0457C 8FA9002C */ lw $t1, 0x002C($sp) -/* 02950 80A04580 306E0001 */ andi $t6, $v1, 0x0001 ## $t6 = 00000000 -/* 02954 80A04584 11C00008 */ beq $t6, $zero, .L80A045A8 -/* 02958 80A04588 00000000 */ nop -/* 0295C 80A0458C 11E00003 */ beq $t7, $zero, .L80A0459C -/* 02960 80A04590 8FB80028 */ lw $t8, 0x0028($sp) -/* 02964 80A04594 8F190664 */ lw $t9, 0x0664($t8) ## 00000664 -/* 02968 80A04598 1720001B */ bne $t9, $zero, .L80A04608 -.L80A0459C: -/* 0296C 80A0459C 38680001 */ xori $t0, $v1, 0x0001 ## $t0 = 00000001 -/* 02970 80A045A0 10000019 */ beq $zero, $zero, .L80A04608 -/* 02974 80A045A4 A60802C4 */ sh $t0, 0x02C4($s0) ## 000002C4 -.L80A045A8: -/* 02978 80A045A8 11200017 */ beq $t1, $zero, .L80A04608 -/* 0297C 80A045AC 8FAA0028 */ lw $t2, 0x0028($sp) -/* 02980 80A045B0 8D4B0664 */ lw $t3, 0x0664($t2) ## 00000664 -/* 02984 80A045B4 51600015 */ beql $t3, $zero, .L80A0460C -/* 02988 80A045B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0298C 80A045BC 91220002 */ lbu $v0, 0x0002($t1) ## 00000002 -/* 02990 80A045C0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02994 80A045C4 920402C7 */ lbu $a0, 0x02C7($s0) ## 000002C7 -/* 02998 80A045C8 54410004 */ bnel $v0, $at, .L80A045DC -/* 0299C 80A045CC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 029A0 80A045D0 10000006 */ beq $zero, $zero, .L80A045EC -/* 029A4 80A045D4 24056841 */ addiu $a1, $zero, 0x6841 ## $a1 = 00006841 -/* 029A8 80A045D8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L80A045DC: -/* 029AC 80A045DC 14410003 */ bne $v0, $at, .L80A045EC -/* 029B0 80A045E0 24056842 */ addiu $a1, $zero, 0x6842 ## $a1 = 00006842 -/* 029B4 80A045E4 10000001 */ beq $zero, $zero, .L80A045EC -/* 029B8 80A045E8 24056840 */ addiu $a1, $zero, 0x6840 ## $a1 = 00006840 -.L80A045EC: -/* 029BC 80A045EC 54800005 */ bnel $a0, $zero, .L80A04604 -/* 029C0 80A045F0 346C0001 */ ori $t4, $v1, 0x0001 ## $t4 = 00000001 -/* 029C4 80A045F4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 029C8 80A045F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029CC 80A045FC 960302C4 */ lhu $v1, 0x02C4($s0) ## 000002C4 -/* 029D0 80A04600 346C0001 */ ori $t4, $v1, 0x0001 ## $t4 = 00000001 -.L80A04604: -/* 029D4 80A04604 A60C02C4 */ sh $t4, 0x02C4($s0) ## 000002C4 -.L80A04608: -/* 029D8 80A04608 8FBF001C */ lw $ra, 0x001C($sp) -.L80A0460C: -/* 029DC 80A0460C 8FB00018 */ lw $s0, 0x0018($sp) -/* 029E0 80A04610 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 029E4 80A04614 03E00008 */ jr $ra -/* 029E8 80A04618 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s deleted file mode 100644 index 8137af68e2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s +++ /dev/null @@ -1,269 +0,0 @@ -glabel func_80A049B4 -/* 02D84 80A049B4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 02D88 80A049B8 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 02D8C 80A049BC AFBF002C */ sw $ra, 0x002C($sp) -/* 02D90 80A049C0 AFB00028 */ sw $s0, 0x0028($sp) -/* 02D94 80A049C4 44816000 */ mtc1 $at, $f12 ## $f12 = 6.00 -/* 02D98 80A049C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02D9C 80A049CC AFA5004C */ sw $a1, 0x004C($sp) -/* 02DA0 80A049D0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 02DA4 80A049D4 AFA60050 */ sw $a2, 0x0050($sp) -/* 02DA8 80A049D8 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 02DAC 80A049DC 46040180 */ add.s $f6, $f0, $f4 -/* 02DB0 80A049E0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 02DB4 80A049E4 E7A60038 */ swc1 $f6, 0x0038($sp) -/* 02DB8 80A049E8 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 02DBC 80A049EC 44816000 */ mtc1 $at, $f12 ## $f12 = 6.00 -/* 02DC0 80A049F0 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 02DC4 80A049F4 460C0202 */ mul.s $f8, $f0, $f12 -/* 02DC8 80A049F8 460A4400 */ add.s $f16, $f8, $f10 -/* 02DCC 80A049FC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 02DD0 80A04A00 E7B0003C */ swc1 $f16, 0x003C($sp) -/* 02DD4 80A04A04 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 02DD8 80A04A08 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02DDC 80A04A0C 3C0680A0 */ lui $a2, %hi(D_80A0608C) ## $a2 = 80A00000 -/* 02DE0 80A04A10 46120100 */ add.s $f4, $f0, $f18 -/* 02DE4 80A04A14 3C0780A0 */ lui $a3, %hi(D_80A06098) ## $a3 = 80A00000 -/* 02DE8 80A04A18 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02DEC 80A04A1C 24E76098 */ addiu $a3, $a3, %lo(D_80A06098) ## $a3 = 80A06098 -/* 02DF0 80A04A20 E7A40040 */ swc1 $f4, 0x0040($sp) -/* 02DF4 80A04A24 444EF800 */ cfc1 $t6, $31 -/* 02DF8 80A04A28 44CFF800 */ ctc1 $t7, $31 -/* 02DFC 80A04A2C C6060244 */ lwc1 $f6, 0x0244($s0) ## 00000244 -/* 02E00 80A04A30 24C6608C */ addiu $a2, $a2, %lo(D_80A0608C) ## $a2 = 80A0608C -/* 02E04 80A04A34 27A50038 */ addiu $a1, $sp, 0x0038 ## $a1 = FFFFFFF0 -/* 02E08 80A04A38 46003224 */ cvt.w.s $f8, $f6 -/* 02E0C 80A04A3C 444FF800 */ cfc1 $t7, $31 -/* 02E10 80A04A40 00000000 */ nop -/* 02E14 80A04A44 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 02E18 80A04A48 51E00013 */ beql $t7, $zero, .L80A04A98 -/* 02E1C 80A04A4C 440F4000 */ mfc1 $t7, $f8 -/* 02E20 80A04A50 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 02E24 80A04A54 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02E28 80A04A58 46083201 */ sub.s $f8, $f6, $f8 -/* 02E2C 80A04A5C 44CFF800 */ ctc1 $t7, $31 -/* 02E30 80A04A60 00000000 */ nop -/* 02E34 80A04A64 46004224 */ cvt.w.s $f8, $f8 -/* 02E38 80A04A68 444FF800 */ cfc1 $t7, $31 -/* 02E3C 80A04A6C 00000000 */ nop -/* 02E40 80A04A70 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 02E44 80A04A74 15E00005 */ bne $t7, $zero, .L80A04A8C -/* 02E48 80A04A78 00000000 */ nop -/* 02E4C 80A04A7C 440F4000 */ mfc1 $t7, $f8 -/* 02E50 80A04A80 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02E54 80A04A84 10000007 */ beq $zero, $zero, .L80A04AA4 -/* 02E58 80A04A88 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 -.L80A04A8C: -/* 02E5C 80A04A8C 10000005 */ beq $zero, $zero, .L80A04AA4 -/* 02E60 80A04A90 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 02E64 80A04A94 440F4000 */ mfc1 $t7, $f8 -.L80A04A98: -/* 02E68 80A04A98 00000000 */ nop -/* 02E6C 80A04A9C 05E0FFFB */ bltz $t7, .L80A04A8C -/* 02E70 80A04AA0 00000000 */ nop -.L80A04AA4: -/* 02E74 80A04AA4 44CEF800 */ ctc1 $t6, $31 -/* 02E78 80A04AA8 A3AF0034 */ sb $t7, 0x0034($sp) -/* 02E7C 80A04AAC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02E80 80A04AB0 C60A0248 */ lwc1 $f10, 0x0248($s0) ## 00000248 -/* 02E84 80A04AB4 4458F800 */ cfc1 $t8, $31 -/* 02E88 80A04AB8 44D9F800 */ ctc1 $t9, $31 -/* 02E8C 80A04ABC 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02E90 80A04AC0 46005424 */ cvt.w.s $f16, $f10 -/* 02E94 80A04AC4 4459F800 */ cfc1 $t9, $31 -/* 02E98 80A04AC8 00000000 */ nop -/* 02E9C 80A04ACC 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 02EA0 80A04AD0 53200013 */ beql $t9, $zero, .L80A04B20 -/* 02EA4 80A04AD4 44198000 */ mfc1 $t9, $f16 -/* 02EA8 80A04AD8 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 02EAC 80A04ADC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02EB0 80A04AE0 46105401 */ sub.s $f16, $f10, $f16 -/* 02EB4 80A04AE4 44D9F800 */ ctc1 $t9, $31 -/* 02EB8 80A04AE8 00000000 */ nop -/* 02EBC 80A04AEC 46008424 */ cvt.w.s $f16, $f16 -/* 02EC0 80A04AF0 4459F800 */ cfc1 $t9, $31 -/* 02EC4 80A04AF4 00000000 */ nop -/* 02EC8 80A04AF8 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 02ECC 80A04AFC 17200005 */ bne $t9, $zero, .L80A04B14 -/* 02ED0 80A04B00 00000000 */ nop -/* 02ED4 80A04B04 44198000 */ mfc1 $t9, $f16 -/* 02ED8 80A04B08 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02EDC 80A04B0C 10000007 */ beq $zero, $zero, .L80A04B2C -/* 02EE0 80A04B10 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 -.L80A04B14: -/* 02EE4 80A04B14 10000005 */ beq $zero, $zero, .L80A04B2C -/* 02EE8 80A04B18 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 02EEC 80A04B1C 44198000 */ mfc1 $t9, $f16 -.L80A04B20: -/* 02EF0 80A04B20 00000000 */ nop -/* 02EF4 80A04B24 0720FFFB */ bltz $t9, .L80A04B14 -/* 02EF8 80A04B28 00000000 */ nop -.L80A04B2C: -/* 02EFC 80A04B2C 44D8F800 */ ctc1 $t8, $31 -/* 02F00 80A04B30 A3B90035 */ sb $t9, 0x0035($sp) -/* 02F04 80A04B34 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 02F08 80A04B38 C612024C */ lwc1 $f18, 0x024C($s0) ## 0000024C -/* 02F0C 80A04B3C 4448F800 */ cfc1 $t0, $31 -/* 02F10 80A04B40 44C9F800 */ ctc1 $t1, $31 -/* 02F14 80A04B44 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02F18 80A04B48 27B90030 */ addiu $t9, $sp, 0x0030 ## $t9 = FFFFFFE8 -/* 02F1C 80A04B4C 46009124 */ cvt.w.s $f4, $f18 -/* 02F20 80A04B50 27B80034 */ addiu $t8, $sp, 0x0034 ## $t8 = FFFFFFEC -/* 02F24 80A04B54 4449F800 */ cfc1 $t1, $31 -/* 02F28 80A04B58 00000000 */ nop -/* 02F2C 80A04B5C 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 02F30 80A04B60 51200013 */ beql $t1, $zero, .L80A04BB0 -/* 02F34 80A04B64 44092000 */ mfc1 $t1, $f4 -/* 02F38 80A04B68 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 02F3C 80A04B6C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 02F40 80A04B70 46049101 */ sub.s $f4, $f18, $f4 -/* 02F44 80A04B74 44C9F800 */ ctc1 $t1, $31 -/* 02F48 80A04B78 00000000 */ nop -/* 02F4C 80A04B7C 46002124 */ cvt.w.s $f4, $f4 -/* 02F50 80A04B80 4449F800 */ cfc1 $t1, $31 -/* 02F54 80A04B84 00000000 */ nop -/* 02F58 80A04B88 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 02F5C 80A04B8C 15200005 */ bne $t1, $zero, .L80A04BA4 -/* 02F60 80A04B90 00000000 */ nop -/* 02F64 80A04B94 44092000 */ mfc1 $t1, $f4 -/* 02F68 80A04B98 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02F6C 80A04B9C 10000007 */ beq $zero, $zero, .L80A04BBC -/* 02F70 80A04BA0 01214825 */ or $t1, $t1, $at ## $t1 = 80000000 -.L80A04BA4: -/* 02F74 80A04BA4 10000005 */ beq $zero, $zero, .L80A04BBC -/* 02F78 80A04BA8 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 02F7C 80A04BAC 44092000 */ mfc1 $t1, $f4 -.L80A04BB0: -/* 02F80 80A04BB0 00000000 */ nop -/* 02F84 80A04BB4 0520FFFB */ bltz $t1, .L80A04BA4 -/* 02F88 80A04BB8 00000000 */ nop -.L80A04BBC: -/* 02F8C 80A04BBC 44C8F800 */ ctc1 $t0, $31 -/* 02F90 80A04BC0 A3A90036 */ sb $t1, 0x0036($sp) -/* 02F94 80A04BC4 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02F98 80A04BC8 C6060254 */ lwc1 $f6, 0x0254($s0) ## 00000254 -/* 02F9C 80A04BCC 444AF800 */ cfc1 $t2, $31 -/* 02FA0 80A04BD0 44CBF800 */ ctc1 $t3, $31 -/* 02FA4 80A04BD4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02FA8 80A04BD8 240803E8 */ addiu $t0, $zero, 0x03E8 ## $t0 = 000003E8 -/* 02FAC 80A04BDC 46003224 */ cvt.w.s $f8, $f6 -/* 02FB0 80A04BE0 444BF800 */ cfc1 $t3, $31 -/* 02FB4 80A04BE4 00000000 */ nop -/* 02FB8 80A04BE8 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 02FBC 80A04BEC 51600013 */ beql $t3, $zero, .L80A04C3C -/* 02FC0 80A04BF0 440B4000 */ mfc1 $t3, $f8 -/* 02FC4 80A04BF4 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 02FC8 80A04BF8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02FCC 80A04BFC 46083201 */ sub.s $f8, $f6, $f8 -/* 02FD0 80A04C00 44CBF800 */ ctc1 $t3, $31 -/* 02FD4 80A04C04 00000000 */ nop -/* 02FD8 80A04C08 46004224 */ cvt.w.s $f8, $f8 -/* 02FDC 80A04C0C 444BF800 */ cfc1 $t3, $31 -/* 02FE0 80A04C10 00000000 */ nop -/* 02FE4 80A04C14 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 02FE8 80A04C18 15600005 */ bne $t3, $zero, .L80A04C30 -/* 02FEC 80A04C1C 00000000 */ nop -/* 02FF0 80A04C20 440B4000 */ mfc1 $t3, $f8 -/* 02FF4 80A04C24 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02FF8 80A04C28 10000007 */ beq $zero, $zero, .L80A04C48 -/* 02FFC 80A04C2C 01615825 */ or $t3, $t3, $at ## $t3 = 80000000 -.L80A04C30: -/* 03000 80A04C30 10000005 */ beq $zero, $zero, .L80A04C48 -/* 03004 80A04C34 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 03008 80A04C38 440B4000 */ mfc1 $t3, $f8 -.L80A04C3C: -/* 0300C 80A04C3C 00000000 */ nop -/* 03010 80A04C40 0560FFFB */ bltz $t3, .L80A04C30 -/* 03014 80A04C44 00000000 */ nop -.L80A04C48: -/* 03018 80A04C48 44CAF800 */ ctc1 $t2, $31 -/* 0301C 80A04C4C A3AB0030 */ sb $t3, 0x0030($sp) -/* 03020 80A04C50 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 03024 80A04C54 C60A0258 */ lwc1 $f10, 0x0258($s0) ## 00000258 -/* 03028 80A04C58 444CF800 */ cfc1 $t4, $31 -/* 0302C 80A04C5C 44CDF800 */ ctc1 $t5, $31 -/* 03030 80A04C60 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03034 80A04C64 46005424 */ cvt.w.s $f16, $f10 -/* 03038 80A04C68 444DF800 */ cfc1 $t5, $31 -/* 0303C 80A04C6C 00000000 */ nop -/* 03040 80A04C70 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 03044 80A04C74 51A00013 */ beql $t5, $zero, .L80A04CC4 -/* 03048 80A04C78 440D8000 */ mfc1 $t5, $f16 -/* 0304C 80A04C7C 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 03050 80A04C80 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 03054 80A04C84 46105401 */ sub.s $f16, $f10, $f16 -/* 03058 80A04C88 44CDF800 */ ctc1 $t5, $31 -/* 0305C 80A04C8C 00000000 */ nop -/* 03060 80A04C90 46008424 */ cvt.w.s $f16, $f16 -/* 03064 80A04C94 444DF800 */ cfc1 $t5, $31 -/* 03068 80A04C98 00000000 */ nop -/* 0306C 80A04C9C 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 03070 80A04CA0 15A00005 */ bne $t5, $zero, .L80A04CB8 -/* 03074 80A04CA4 00000000 */ nop -/* 03078 80A04CA8 440D8000 */ mfc1 $t5, $f16 -/* 0307C 80A04CAC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03080 80A04CB0 10000007 */ beq $zero, $zero, .L80A04CD0 -/* 03084 80A04CB4 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 -.L80A04CB8: -/* 03088 80A04CB8 10000005 */ beq $zero, $zero, .L80A04CD0 -/* 0308C 80A04CBC 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 03090 80A04CC0 440D8000 */ mfc1 $t5, $f16 -.L80A04CC4: -/* 03094 80A04CC4 00000000 */ nop -/* 03098 80A04CC8 05A0FFFB */ bltz $t5, .L80A04CB8 -/* 0309C 80A04CCC 00000000 */ nop -.L80A04CD0: -/* 030A0 80A04CD0 44CCF800 */ ctc1 $t4, $31 -/* 030A4 80A04CD4 A3AD0031 */ sb $t5, 0x0031($sp) -/* 030A8 80A04CD8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 030AC 80A04CDC C612025C */ lwc1 $f18, 0x025C($s0) ## 0000025C -/* 030B0 80A04CE0 444EF800 */ cfc1 $t6, $31 -/* 030B4 80A04CE4 44CFF800 */ ctc1 $t7, $31 -/* 030B8 80A04CE8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 030BC 80A04CEC 46009124 */ cvt.w.s $f4, $f18 -/* 030C0 80A04CF0 444FF800 */ cfc1 $t7, $31 -/* 030C4 80A04CF4 00000000 */ nop -/* 030C8 80A04CF8 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 030CC 80A04CFC 51E00013 */ beql $t7, $zero, .L80A04D4C -/* 030D0 80A04D00 440F2000 */ mfc1 $t7, $f4 -/* 030D4 80A04D04 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 030D8 80A04D08 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 030DC 80A04D0C 46049101 */ sub.s $f4, $f18, $f4 -/* 030E0 80A04D10 44CFF800 */ ctc1 $t7, $31 -/* 030E4 80A04D14 00000000 */ nop -/* 030E8 80A04D18 46002124 */ cvt.w.s $f4, $f4 -/* 030EC 80A04D1C 444FF800 */ cfc1 $t7, $31 -/* 030F0 80A04D20 00000000 */ nop -/* 030F4 80A04D24 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 030F8 80A04D28 15E00005 */ bne $t7, $zero, .L80A04D40 -/* 030FC 80A04D2C 00000000 */ nop -/* 03100 80A04D30 440F2000 */ mfc1 $t7, $f4 -/* 03104 80A04D34 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03108 80A04D38 10000007 */ beq $zero, $zero, .L80A04D58 -/* 0310C 80A04D3C 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 -.L80A04D40: -/* 03110 80A04D40 10000005 */ beq $zero, $zero, .L80A04D58 -/* 03114 80A04D44 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 03118 80A04D48 440F2000 */ mfc1 $t7, $f4 -.L80A04D4C: -/* 0311C 80A04D4C 00000000 */ nop -/* 03120 80A04D50 05E0FFFB */ bltz $t7, .L80A04D40 -/* 03124 80A04D54 00000000 */ nop -.L80A04D58: -/* 03128 80A04D58 8FA90050 */ lw $t1, 0x0050($sp) -/* 0312C 80A04D5C 44CEF800 */ ctc1 $t6, $31 -/* 03130 80A04D60 A3AF0032 */ sb $t7, 0x0032($sp) -/* 03134 80A04D64 8FA4004C */ lw $a0, 0x004C($sp) -/* 03138 80A04D68 AFB80010 */ sw $t8, 0x0010($sp) -/* 0313C 80A04D6C AFB90014 */ sw $t9, 0x0014($sp) -/* 03140 80A04D70 AFA80018 */ sw $t0, 0x0018($sp) -/* 03144 80A04D74 0C00A2EC */ jal EffectSsKiraKira_SpawnDispersed -/* 03148 80A04D78 AFA9001C */ sw $t1, 0x001C($sp) -/* 0314C 80A04D7C 8FBF002C */ lw $ra, 0x002C($sp) -/* 03150 80A04D80 8FB00028 */ lw $s0, 0x0028($sp) -/* 03154 80A04D84 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 03158 80A04D88 03E00008 */ jr $ra -/* 0315C 80A04D8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04D90.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04D90.s deleted file mode 100644 index 9c7c4d09d7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04D90.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80A04D90 -/* 03160 80A04D90 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03164 80A04D94 AFB00020 */ sw $s0, 0x0020($sp) -/* 03168 80A04D98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0316C 80A04D9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 03170 80A04DA0 AFA50034 */ sw $a1, 0x0034($sp) -/* 03174 80A04DA4 260F0024 */ addiu $t7, $s0, 0x0024 ## $t7 = 00000024 -/* 03178 80A04DA8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0317C 80A04DAC 24A507C0 */ addiu $a1, $a1, 0x07C0 ## $a1 = 000007C0 -/* 03180 80A04DB0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 03184 80A04DB4 26060078 */ addiu $a2, $s0, 0x0078 ## $a2 = 00000078 -/* 03188 80A04DB8 AFB00010 */ sw $s0, 0x0010($sp) -/* 0318C 80A04DBC 0C00F283 */ jal func_8003CA0C -/* 03190 80A04DC0 27A70028 */ addiu $a3, $sp, 0x0028 ## $a3 = FFFFFFF8 -/* 03194 80A04DC4 24180032 */ addiu $t8, $zero, 0x0032 ## $t8 = 00000032 -/* 03198 80A04DC8 E6000080 */ swc1 $f0, 0x0080($s0) ## 00000080 -/* 0319C 80A04DCC A21800C8 */ sb $t8, 0x00C8($s0) ## 000000C8 -/* 031A0 80A04DD0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 031A4 80A04DD4 8FB00020 */ lw $s0, 0x0020($sp) -/* 031A8 80A04DD8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 031AC 80A04DDC 03E00008 */ jr $ra -/* 031B0 80A04DE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04DE4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04DE4.s deleted file mode 100644 index 4431d1de51..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04DE4.s +++ /dev/null @@ -1,124 +0,0 @@ -.late_rodata -glabel D_80A06228 - .float 0.2 - -glabel D_80A0622C - .float 8.000000525498763e-05 - -.text -glabel func_80A04DE4 -/* 031B4 80A04DE4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 031B8 80A04DE8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 031BC 80A04DEC AFB10020 */ sw $s1, 0x0020($sp) -/* 031C0 80A04DF0 AFB0001C */ sw $s0, 0x001C($sp) -/* 031C4 80A04DF4 948E02C4 */ lhu $t6, 0x02C4($a0) ## 000002C4 -/* 031C8 80A04DF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 031CC 80A04DFC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 031D0 80A04E00 31CF0010 */ andi $t7, $t6, 0x0010 ## $t7 = 00000000 -/* 031D4 80A04E04 11E00031 */ beq $t7, $zero, .L80A04ECC -/* 031D8 80A04E08 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 031DC 80A04E0C 8CA81C90 */ lw $t0, 0x1C90($a1) ## 00001C90 -/* 031E0 80A04E10 27B8002C */ addiu $t8, $sp, 0x002C ## $t8 = FFFFFFE4 -/* 031E4 80A04E14 AF080000 */ sw $t0, 0x0000($t8) ## FFFFFFE4 -/* 031E8 80A04E18 8CB91C94 */ lw $t9, 0x1C94($a1) ## 00001C94 -/* 031EC 80A04E1C AF190004 */ sw $t9, 0x0004($t8) ## FFFFFFE8 -/* 031F0 80A04E20 8CA81C98 */ lw $t0, 0x1C98($a1) ## 00001C98 -/* 031F4 80A04E24 AF080008 */ sw $t0, 0x0008($t8) ## FFFFFFEC -/* 031F8 80A04E28 8C430664 */ lw $v1, 0x0664($v0) ## 00000664 -/* 031FC 80A04E2C 50600006 */ beql $v1, $zero, .L80A04E48 -/* 03200 80A04E30 844400B6 */ lh $a0, 0x00B6($v0) ## 000000B6 -/* 03204 80A04E34 50430004 */ beql $v0, $v1, .L80A04E48 -/* 03208 80A04E38 844400B6 */ lh $a0, 0x00B6($v0) ## 000000B6 -/* 0320C 80A04E3C 5483001A */ bnel $a0, $v1, .L80A04EA8 -/* 03210 80A04E40 27A9002C */ addiu $t1, $sp, 0x002C ## $t1 = FFFFFFE4 -/* 03214 80A04E44 844400B6 */ lh $a0, 0x00B6($v0) ## 000000B6 -.L80A04E48: -/* 03218 80A04E48 0C01DE1C */ jal Math_Sins - ## sins? -/* 0321C 80A04E4C AFA20038 */ sw $v0, 0x0038($sp) -/* 03220 80A04E50 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 03224 80A04E54 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 03228 80A04E58 8FA20038 */ lw $v0, 0x0038($sp) -/* 0322C 80A04E5C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 03230 80A04E60 46040182 */ mul.s $f6, $f0, $f4 -/* 03234 80A04E64 C448095C */ lwc1 $f8, 0x095C($v0) ## 0000095C -/* 03238 80A04E68 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 -/* 0323C 80A04E6C 46083280 */ add.s $f10, $f6, $f8 -/* 03240 80A04E70 E7AA002C */ swc1 $f10, 0x002C($sp) -/* 03244 80A04E74 C4500960 */ lwc1 $f16, 0x0960($v0) ## 00000960 -/* 03248 80A04E78 46128100 */ add.s $f4, $f16, $f18 -/* 0324C 80A04E7C E7A40030 */ swc1 $f4, 0x0030($sp) -/* 03250 80A04E80 0C01DE0D */ jal Math_Coss - ## coss? -/* 03254 80A04E84 844400B6 */ lh $a0, 0x00B6($v0) ## 000000B6 -/* 03258 80A04E88 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0325C 80A04E8C 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 03260 80A04E90 8FA20038 */ lw $v0, 0x0038($sp) -/* 03264 80A04E94 46060202 */ mul.s $f8, $f0, $f6 -/* 03268 80A04E98 C44A0964 */ lwc1 $f10, 0x0964($v0) ## 00000964 -/* 0326C 80A04E9C 460A4400 */ add.s $f16, $f8, $f10 -/* 03270 80A04EA0 E7B00034 */ swc1 $f16, 0x0034($sp) -/* 03274 80A04EA4 27A9002C */ addiu $t1, $sp, 0x002C ## $t1 = FFFFFFE4 -.L80A04EA8: -/* 03278 80A04EA8 8D2B0000 */ lw $t3, 0x0000($t1) ## FFFFFFE4 -/* 0327C 80A04EAC 960C02C4 */ lhu $t4, 0x02C4($s0) ## 000002C4 -/* 03280 80A04EB0 AE0B0038 */ sw $t3, 0x0038($s0) ## 00000038 -/* 03284 80A04EB4 8D2A0004 */ lw $t2, 0x0004($t1) ## FFFFFFE8 -/* 03288 80A04EB8 318DFFEF */ andi $t5, $t4, 0xFFEF ## $t5 = 00000000 -/* 0328C 80A04EBC AE0A003C */ sw $t2, 0x003C($s0) ## 0000003C -/* 03290 80A04EC0 8D2B0008 */ lw $t3, 0x0008($t1) ## FFFFFFEC -/* 03294 80A04EC4 A60D02C4 */ sh $t5, 0x02C4($s0) ## 000002C4 -/* 03298 80A04EC8 AE0B0040 */ sw $t3, 0x0040($s0) ## 00000040 -.L80A04ECC: -/* 0329C 80A04ECC 260E0038 */ addiu $t6, $s0, 0x0038 ## $t6 = 00000038 -/* 032A0 80A04ED0 AFAE0028 */ sw $t6, 0x0028($sp) -/* 032A4 80A04ED4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032A8 80A04ED8 0C280EAC */ jal func_80A03AB0 -/* 032AC 80A04EDC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 032B0 80A04EE0 8FAF0028 */ lw $t7, 0x0028($sp) -/* 032B4 80A04EE4 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFF4 -/* 032B8 80A04EE8 3C0180A0 */ lui $at, %hi(D_80A06228) ## $at = 80A00000 -/* 032BC 80A04EEC 8DF90000 */ lw $t9, 0x0000($t7) ## 00000000 -/* 032C0 80A04EF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032C4 80A04EF4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 032C8 80A04EF8 ACB90000 */ sw $t9, 0x0000($a1) ## FFFFFFF4 -/* 032CC 80A04EFC 8DF80004 */ lw $t8, 0x0004($t7) ## 00000004 -/* 032D0 80A04F00 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 032D4 80A04F04 ACB80004 */ sw $t8, 0x0004($a1) ## FFFFFFF8 -/* 032D8 80A04F08 8DF90008 */ lw $t9, 0x0008($t7) ## 00000008 -/* 032DC 80A04F0C ACB90008 */ sw $t9, 0x0008($a1) ## FFFFFFFC -/* 032E0 80A04F10 C4326228 */ lwc1 $f18, %lo(D_80A06228)($at) -/* 032E4 80A04F14 0C280C52 */ jal func_80A03148 -/* 032E8 80A04F18 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 032EC 80A04F1C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 032F0 80A04F20 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 032F4 80A04F24 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 032F8 80A04F28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032FC 80A04F2C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03300 80A04F30 4604303E */ c.le.s $f6, $f4 -/* 03304 80A04F34 00000000 */ nop -/* 03308 80A04F38 45000003 */ bc1f .L80A04F48 -/* 0330C 80A04F3C 00000000 */ nop -/* 03310 80A04F40 0C28126D */ jal func_80A049B4 -/* 03314 80A04F44 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -.L80A04F48: -/* 03318 80A04F48 3C0180A0 */ lui $at, %hi(D_80A0622C) ## $at = 80A00000 -/* 0331C 80A04F4C C428622C */ lwc1 $f8, %lo(D_80A0622C)($at) -/* 03320 80A04F50 3C053C03 */ lui $a1, 0x3C03 ## $a1 = 3C030000 -/* 03324 80A04F54 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 03328 80A04F58 3C073A51 */ lui $a3, 0x3A51 ## $a3 = 3A510000 -/* 0332C 80A04F5C 34E7B718 */ ori $a3, $a3, 0xB718 ## $a3 = 3A51B718 -/* 03330 80A04F60 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 03334 80A04F64 34A5126F */ ori $a1, $a1, 0x126F ## $a1 = 3C03126F -/* 03338 80A04F68 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 -/* 0333C 80A04F6C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 03340 80A04F70 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 03344 80A04F74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03348 80A04F78 0C280ECA */ jal func_80A03B28 -/* 0334C 80A04F7C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03350 80A04F80 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03354 80A04F84 8FB0001C */ lw $s0, 0x001C($sp) -/* 03358 80A04F88 8FB10020 */ lw $s1, 0x0020($sp) -/* 0335C 80A04F8C 03E00008 */ jr $ra -/* 03360 80A04F90 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04F94.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04F94.s deleted file mode 100644 index a6e082382d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04F94.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80A04F94 -/* 03364 80A04F94 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03368 80A04F98 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0336C 80A04F9C AFB00020 */ sw $s0, 0x0020($sp) -/* 03370 80A04FA0 AFA50034 */ sw $a1, 0x0034($sp) -/* 03374 80A04FA4 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 03378 80A04FA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0337C 80A04FAC 24180400 */ addiu $t8, $zero, 0x0400 ## $t8 = 00000400 -/* 03380 80A04FB0 AFAF002C */ sw $t7, 0x002C($sp) -/* 03384 80A04FB4 860502BC */ lh $a1, 0x02BC($s0) ## 000002BC -/* 03388 80A04FB8 AFB80010 */ sw $t8, 0x0010($sp) -/* 0338C 80A04FBC 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 03390 80A04FC0 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 03394 80A04FC4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 03398 80A04FC8 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 -/* 0339C 80A04FCC 961902BE */ lhu $t9, 0x02BE($s0) ## 000002BE -/* 033A0 80A04FD0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 033A4 80A04FD4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 033A8 80A04FD8 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 033AC 80A04FDC A60802BE */ sh $t0, 0x02BE($s0) ## 000002BE -/* 033B0 80A04FE0 260402A4 */ addiu $a0, $s0, 0x02A4 ## $a0 = 000002A4 -/* 033B4 80A04FE4 0C01DE80 */ jal Math_ApproxF - -/* 033B8 80A04FE8 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 033BC 80A04FEC C60002A4 */ lwc1 $f0, 0x02A4($s0) ## 000002A4 -/* 033C0 80A04FF0 8FA9002C */ lw $t1, 0x002C($sp) -/* 033C4 80A04FF4 3C014443 */ lui $at, 0x4443 ## $at = 44430000 -/* 033C8 80A04FF8 46000102 */ mul.s $f4, $f0, $f0 -/* 033CC 80A04FFC 44814000 */ mtc1 $at, $f8 ## $f8 = 780.00 -/* 033D0 80A05000 C52600EC */ lwc1 $f6, 0x00EC($t1) ## 000000EC -/* 033D4 80A05004 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 033D8 80A05008 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 033DC 80A0500C 46083280 */ add.s $f10, $f6, $f8 -/* 033E0 80A05010 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 -/* 033E4 80A05014 44052000 */ mfc1 $a1, $f4 -/* 033E8 80A05018 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 033EC 80A0501C 44065000 */ mfc1 $a2, $f10 -/* 033F0 80A05020 8FA40034 */ lw $a0, 0x0034($sp) -/* 033F4 80A05024 0C01DCEA */ jal func_800773A8 -/* 033F8 80A05028 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 033FC 80A0502C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03400 80A05030 8FB00020 */ lw $s0, 0x0020($sp) -/* 03404 80A05034 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 03408 80A05038 03E00008 */ jr $ra -/* 0340C 80A0503C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s deleted file mode 100644 index 59b9b12eef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80A05040 -/* 03410 80A05040 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03414 80A05044 AFBF001C */ sw $ra, 0x001C($sp) -/* 03418 80A05048 AFB10018 */ sw $s1, 0x0018($sp) -/* 0341C 80A0504C AFB00014 */ sw $s0, 0x0014($sp) -/* 03420 80A05050 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03424 80A05054 0C281379 */ jal func_80A04DE4 -/* 03428 80A05058 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0342C 80A0505C 0C042F6F */ jal func_8010BDBC -/* 03430 80A05060 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 03434 80A05064 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 03438 80A05068 54410023 */ bnel $v0, $at, .L80A050F8 -/* 0343C 80A0506C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03440 80A05070 0C041AF2 */ jal func_80106BC8 -/* 03444 80A05074 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03448 80A05078 1040001E */ beq $v0, $zero, .L80A050F4 -/* 0344C 80A0507C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 03450 80A05080 00501021 */ addu $v0, $v0, $s0 -/* 03454 80A05084 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 03458 80A05088 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0345C 80A0508C 10400005 */ beq $v0, $zero, .L80A050A4 -/* 03460 80A05090 00000000 */ nop -/* 03464 80A05094 1041000C */ beq $v0, $at, .L80A050C8 -/* 03468 80A05098 00000000 */ nop -/* 0346C 80A0509C 10000016 */ beq $zero, $zero, .L80A050F8 -/* 03470 80A050A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A050A4: -/* 03474 80A050A4 0C01B0AC */ jal ElfMessage_GetSariaText -/* 03478 80A050A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0347C 80A050AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03480 80A050B0 0C042DC8 */ jal func_8010B720 -/* 03484 80A050B4 3045FFFF */ andi $a1, $v0, 0xFFFF ## $a1 = 00000000 -/* 03488 80A050B8 3C0E80A0 */ lui $t6, %hi(func_80A05114) ## $t6 = 80A00000 -/* 0348C 80A050BC 25CE5114 */ addiu $t6, $t6, %lo(func_80A05114) ## $t6 = 80A05114 -/* 03490 80A050C0 1000000C */ beq $zero, $zero, .L80A050F4 -/* 03494 80A050C4 AE2E0130 */ sw $t6, 0x0130($s1) ## 00000130 -.L80A050C8: -/* 03498 80A050C8 0C041B33 */ jal func_80106CCC -/* 0349C 80A050CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 034A0 80A050D0 3C0F80A0 */ lui $t7, %hi(func_80A053F0) ## $t7 = 80A00000 -/* 034A4 80A050D4 25EF53F0 */ addiu $t7, $t7, %lo(func_80A053F0) ## $t7 = 80A053F0 -/* 034A8 80A050D8 AE2F0130 */ sw $t7, 0x0130($s1) ## 00000130 -/* 034AC 80A050DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 034B0 80A050E0 0C28070E */ jal func_80A01C38 -/* 034B4 80A050E4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 034B8 80A050E8 963802C4 */ lhu $t8, 0x02C4($s1) ## 000002C4 -/* 034BC 80A050EC 3319FFDF */ andi $t9, $t8, 0xFFDF ## $t9 = 00000000 -/* 034C0 80A050F0 A63902C4 */ sh $t9, 0x02C4($s1) ## 000002C4 -.L80A050F4: -/* 034C4 80A050F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A050F8: -/* 034C8 80A050F8 0C2813E5 */ jal func_80A04F94 -/* 034CC 80A050FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 034D0 80A05100 8FBF001C */ lw $ra, 0x001C($sp) -/* 034D4 80A05104 8FB00014 */ lw $s0, 0x0014($sp) -/* 034D8 80A05108 8FB10018 */ lw $s1, 0x0018($sp) -/* 034DC 80A0510C 03E00008 */ jr $ra -/* 034E0 80A05110 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05114.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05114.s deleted file mode 100644 index ae59db0543..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05114.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80A05114 -/* 034E4 80A05114 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 034E8 80A05118 AFBF001C */ sw $ra, 0x001C($sp) -/* 034EC 80A0511C AFB00018 */ sw $s0, 0x0018($sp) -/* 034F0 80A05120 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 034F4 80A05124 0C281379 */ jal func_80A04DE4 -/* 034F8 80A05128 AFA40020 */ sw $a0, 0x0020($sp) -/* 034FC 80A0512C 0C042F6F */ jal func_8010BDBC -/* 03500 80A05130 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 03504 80A05134 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 03508 80A05138 5441000C */ bnel $v0, $at, .L80A0516C -/* 0350C 80A0513C 8FA40020 */ lw $a0, 0x0020($sp) -/* 03510 80A05140 0C041AF2 */ jal func_80106BC8 -/* 03514 80A05144 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03518 80A05148 10400007 */ beq $v0, $zero, .L80A05168 -/* 0351C 80A0514C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03520 80A05150 0C042DC8 */ jal func_8010B720 -/* 03524 80A05154 240500E3 */ addiu $a1, $zero, 0x00E3 ## $a1 = 000000E3 -/* 03528 80A05158 8FAF0020 */ lw $t7, 0x0020($sp) -/* 0352C 80A0515C 3C0E80A0 */ lui $t6, %hi(func_80A05040) ## $t6 = 80A00000 -/* 03530 80A05160 25CE5040 */ addiu $t6, $t6, %lo(func_80A05040) ## $t6 = 80A05040 -/* 03534 80A05164 ADEE0130 */ sw $t6, 0x0130($t7) ## 00000130 -.L80A05168: -/* 03538 80A05168 8FA40020 */ lw $a0, 0x0020($sp) -.L80A0516C: -/* 0353C 80A0516C 0C2813E5 */ jal func_80A04F94 -/* 03540 80A05170 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03544 80A05174 8FBF001C */ lw $ra, 0x001C($sp) -/* 03548 80A05178 8FB00018 */ lw $s0, 0x0018($sp) -/* 0354C 80A0517C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03550 80A05180 03E00008 */ jr $ra -/* 03554 80A05184 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s deleted file mode 100644 index 0ede140826..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80A05188 -/* 03558 80A05188 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0355C 80A0518C AFBF001C */ sw $ra, 0x001C($sp) -/* 03560 80A05190 AFB00018 */ sw $s0, 0x0018($sp) -/* 03564 80A05194 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03568 80A05198 0C281379 */ jal func_80A04DE4 -/* 0356C 80A0519C AFA40020 */ sw $a0, 0x0020($sp) -/* 03570 80A051A0 0C042F6F */ jal func_8010BDBC -/* 03574 80A051A4 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 03578 80A051A8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0357C 80A051AC 5441000F */ bnel $v0, $at, .L80A051EC -/* 03580 80A051B0 8FA40020 */ lw $a0, 0x0020($sp) -/* 03584 80A051B4 0C041AF2 */ jal func_80106BC8 -/* 03588 80A051B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0358C 80A051BC 5040000B */ beql $v0, $zero, .L80A051EC -/* 03590 80A051C0 8FA40020 */ lw $a0, 0x0020($sp) -/* 03594 80A051C4 0C01B0AC */ jal ElfMessage_GetSariaText -/* 03598 80A051C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0359C 80A051CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 035A0 80A051D0 0C042DC8 */ jal func_8010B720 -/* 035A4 80A051D4 3045FFFF */ andi $a1, $v0, 0xFFFF ## $a1 = 00000000 -/* 035A8 80A051D8 8FAF0020 */ lw $t7, 0x0020($sp) -/* 035AC 80A051DC 3C0E80A0 */ lui $t6, %hi(func_80A05114) ## $t6 = 80A00000 -/* 035B0 80A051E0 25CE5114 */ addiu $t6, $t6, %lo(func_80A05114) ## $t6 = 80A05114 -/* 035B4 80A051E4 ADEE0130 */ sw $t6, 0x0130($t7) ## 00000130 -/* 035B8 80A051E8 8FA40020 */ lw $a0, 0x0020($sp) -.L80A051EC: -/* 035BC 80A051EC 0C2813E5 */ jal func_80A04F94 -/* 035C0 80A051F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 035C4 80A051F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 035C8 80A051F8 8FB00018 */ lw $s0, 0x0018($sp) -/* 035CC 80A051FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 035D0 80A05200 03E00008 */ jr $ra -/* 035D4 80A05204 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s deleted file mode 100644 index 97c2c8ca17..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_80A05208 -/* 035D8 80A05208 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 035DC 80A0520C AFBF001C */ sw $ra, 0x001C($sp) -/* 035E0 80A05210 AFB10018 */ sw $s1, 0x0018($sp) -/* 035E4 80A05214 AFB00014 */ sw $s0, 0x0014($sp) -/* 035E8 80A05218 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 035EC 80A0521C 0C281379 */ jal func_80A04DE4 -/* 035F0 80A05220 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 035F4 80A05224 0C042F6F */ jal func_8010BDBC -/* 035F8 80A05228 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 035FC 80A0522C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 03600 80A05230 54410029 */ bnel $v0, $at, .L80A052D8 -/* 03604 80A05234 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03608 80A05238 0C041AF2 */ jal func_80106BC8 -/* 0360C 80A0523C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03610 80A05240 10400024 */ beq $v0, $zero, .L80A052D4 -/* 03614 80A05244 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 03618 80A05248 00501021 */ addu $v0, $v0, $s0 -/* 0361C 80A0524C 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 03620 80A05250 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03624 80A05254 10400005 */ beq $v0, $zero, .L80A0526C -/* 03628 80A05258 00000000 */ nop -/* 0362C 80A0525C 10410012 */ beq $v0, $at, .L80A052A8 -/* 03630 80A05260 00000000 */ nop -/* 03634 80A05264 1000001C */ beq $zero, $zero, .L80A052D8 -/* 03638 80A05268 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A0526C: -/* 0363C 80A0526C 0C01B0C6 */ jal ElfMessage_GetCUpText -/* 03640 80A05270 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03644 80A05274 10400006 */ beq $v0, $zero, .L80A05290 -/* 03648 80A05278 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0364C 80A0527C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03650 80A05280 0C042DC8 */ jal func_8010B720 -/* 03654 80A05284 3045FFFF */ andi $a1, $v0, 0xFFFF ## $a1 = 00000000 -/* 03658 80A05288 10000003 */ beq $zero, $zero, .L80A05298 -/* 0365C 80A0528C 00000000 */ nop -.L80A05290: -/* 03660 80A05290 0C042DC8 */ jal func_8010B720 -/* 03664 80A05294 2405015F */ addiu $a1, $zero, 0x015F ## $a1 = 0000015F -.L80A05298: -/* 03668 80A05298 3C0E80A0 */ lui $t6, %hi(func_80A052F4) ## $t6 = 80A00000 -/* 0366C 80A0529C 25CE52F4 */ addiu $t6, $t6, %lo(func_80A052F4) ## $t6 = 80A052F4 -/* 03670 80A052A0 1000000C */ beq $zero, $zero, .L80A052D4 -/* 03674 80A052A4 AE2E0130 */ sw $t6, 0x0130($s1) ## 00000130 -.L80A052A8: -/* 03678 80A052A8 0C041B33 */ jal func_80106CCC -/* 0367C 80A052AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03680 80A052B0 3C0F80A0 */ lui $t7, %hi(func_80A053F0) ## $t7 = 80A00000 -/* 03684 80A052B4 25EF53F0 */ addiu $t7, $t7, %lo(func_80A053F0) ## $t7 = 80A053F0 -/* 03688 80A052B8 AE2F0130 */ sw $t7, 0x0130($s1) ## 00000130 -/* 0368C 80A052BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03690 80A052C0 0C28070E */ jal func_80A01C38 -/* 03694 80A052C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03698 80A052C8 963802C4 */ lhu $t8, 0x02C4($s1) ## 000002C4 -/* 0369C 80A052CC 3319FFDF */ andi $t9, $t8, 0xFFDF ## $t9 = 00000000 -/* 036A0 80A052D0 A63902C4 */ sh $t9, 0x02C4($s1) ## 000002C4 -.L80A052D4: -/* 036A4 80A052D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A052D8: -/* 036A8 80A052D8 0C2813E5 */ jal func_80A04F94 -/* 036AC 80A052DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 036B0 80A052E0 8FBF001C */ lw $ra, 0x001C($sp) -/* 036B4 80A052E4 8FB00014 */ lw $s0, 0x0014($sp) -/* 036B8 80A052E8 8FB10018 */ lw $s1, 0x0018($sp) -/* 036BC 80A052EC 03E00008 */ jr $ra -/* 036C0 80A052F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A052F4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A052F4.s deleted file mode 100644 index f4cf6cba59..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A052F4.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_80A052F4 -/* 036C4 80A052F4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 036C8 80A052F8 AFBF001C */ sw $ra, 0x001C($sp) -/* 036CC 80A052FC AFB10018 */ sw $s1, 0x0018($sp) -/* 036D0 80A05300 AFB00014 */ sw $s0, 0x0014($sp) -/* 036D4 80A05304 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 036D8 80A05308 0C281379 */ jal func_80A04DE4 -/* 036DC 80A0530C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 036E0 80A05310 0C042F6F */ jal func_8010BDBC -/* 036E4 80A05314 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 036E8 80A05318 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 036EC 80A0531C 14410020 */ bne $v0, $at, .L80A053A0 -/* 036F0 80A05320 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036F4 80A05324 0C041AF2 */ jal func_80106BC8 -/* 036F8 80A05328 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 036FC 80A0532C 10400028 */ beq $v0, $zero, .L80A053D0 -/* 03700 80A05330 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 03704 80A05334 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03708 80A05338 00310821 */ addu $at, $at, $s1 -/* 0370C 80A0533C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 03710 80A05340 A42E04CA */ sh $t6, 0x04CA($at) ## 000104CA -/* 03714 80A05344 00511021 */ addu $v0, $v0, $s1 -/* 03718 80A05348 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 0371C 80A0534C 3C0F80A0 */ lui $t7, %hi(func_80A05188) ## $t7 = 80A00000 -/* 03720 80A05350 25EF5188 */ addiu $t7, $t7, %lo(func_80A05188) ## $t7 = 80A05188 -/* 03724 80A05354 10400006 */ beq $v0, $zero, .L80A05370 -/* 03728 80A05358 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0372C 80A0535C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03730 80A05360 10410008 */ beq $v0, $at, .L80A05384 -/* 03734 80A05364 3C1880A0 */ lui $t8, %hi(func_80A05208) ## $t8 = 80A00000 -/* 03738 80A05368 1000001A */ beq $zero, $zero, .L80A053D4 -/* 0373C 80A0536C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A05370: -/* 03740 80A05370 AE0F0130 */ sw $t7, 0x0130($s0) ## 00000130 -/* 03744 80A05374 0C042DC8 */ jal func_8010B720 -/* 03748 80A05378 240500E2 */ addiu $a1, $zero, 0x00E2 ## $a1 = 000000E2 -/* 0374C 80A0537C 10000015 */ beq $zero, $zero, .L80A053D4 -/* 03750 80A05380 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A05384: -/* 03754 80A05384 27185208 */ addiu $t8, $t8, %lo(func_80A05208) ## $t8 = 00005208 -/* 03758 80A05388 AE180130 */ sw $t8, 0x0130($s0) ## 00000130 -/* 0375C 80A0538C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03760 80A05390 0C042DC8 */ jal func_8010B720 -/* 03764 80A05394 240500E1 */ addiu $a1, $zero, 0x00E1 ## $a1 = 000000E1 -/* 03768 80A05398 1000000E */ beq $zero, $zero, .L80A053D4 -/* 0376C 80A0539C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A053A0: -/* 03770 80A053A0 0C00BCCD */ jal func_8002F334 -/* 03774 80A053A4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03778 80A053A8 10400009 */ beq $v0, $zero, .L80A053D0 -/* 0377C 80A053AC 3C1980A0 */ lui $t9, %hi(func_80A053F0) ## $t9 = 80A00000 -/* 03780 80A053B0 273953F0 */ addiu $t9, $t9, %lo(func_80A053F0) ## $t9 = 80A053F0 -/* 03784 80A053B4 AE190130 */ sw $t9, 0x0130($s0) ## 00000130 -/* 03788 80A053B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0378C 80A053BC 0C28070E */ jal func_80A01C38 -/* 03790 80A053C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03794 80A053C4 960802C4 */ lhu $t0, 0x02C4($s0) ## 000002C4 -/* 03798 80A053C8 3109FFDF */ andi $t1, $t0, 0xFFDF ## $t1 = 00000000 -/* 0379C 80A053CC A60902C4 */ sh $t1, 0x02C4($s0) ## 000002C4 -.L80A053D0: -/* 037A0 80A053D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A053D4: -/* 037A4 80A053D4 0C2813E5 */ jal func_80A04F94 -/* 037A8 80A053D8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 037AC 80A053DC 8FBF001C */ lw $ra, 0x001C($sp) -/* 037B0 80A053E0 8FB00014 */ lw $s0, 0x0014($sp) -/* 037B4 80A053E4 8FB10018 */ lw $s1, 0x0018($sp) -/* 037B8 80A053E8 03E00008 */ jr $ra -/* 037BC 80A053EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s deleted file mode 100644 index 2c27e4698e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s +++ /dev/null @@ -1,216 +0,0 @@ -.rdata -glabel D_80A060D8 - .asciz "../z_en_elf.c" - .balign 4 - -glabel D_80A060E8 - .asciz "z_common_data.memory.information.room_inf[127][ 0 ] = %d\n" - .balign 4 - -.text -glabel func_80A053F0 -/* 037C0 80A053F0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 037C4 80A053F4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 037C8 80A053F8 AFB00020 */ sw $s0, 0x0020($sp) -/* 037CC 80A053FC AFA5003C */ sw $a1, 0x003C($sp) -/* 037D0 80A05400 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 037D4 80A05404 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 037D8 80A05408 AFAF002C */ sw $t7, 0x002C($sp) -/* 037DC 80A0540C 85E20690 */ lh $v0, 0x0690($t7) ## 00000690 -/* 037E0 80A05410 1440001A */ bne $v0, $zero, .L80A0547C -/* 037E4 80A05414 00000000 */ nop -/* 037E8 80A05418 8DF80664 */ lw $t8, 0x0664($t7) ## 00000664 -/* 037EC 80A0541C 3C028016 */ lui $v0, %hi(gSaveContext+0x38) -/* 037F0 80A05420 5700001D */ bnel $t8, $zero, .L80A05498 -/* 037F4 80A05424 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 037F8 80A05428 9442E698 */ lhu $v0, %lo(gSaveContext+0x38)($v0) -/* 037FC 80A0542C 3C198016 */ lui $t9, %hi(gGameInfo) -/* 03800 80A05430 28410258 */ slti $at, $v0, 0x0258 -/* 03804 80A05434 14200003 */ bne $at, $zero, .L80A05444 -/* 03808 80A05438 28410BB9 */ slti $at, $v0, 0x0BB9 -/* 0380C 80A0543C 14200005 */ bne $at, $zero, .L80A05454 -/* 03810 80A05440 00000000 */ nop -.L80A05444: -/* 03814 80A05444 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) -/* 03818 80A05448 872812C6 */ lh $t0, 0x12C6($t9) ## 801612C6 -/* 0381C 80A0544C 51000012 */ beql $t0, $zero, .L80A05498 -/* 03820 80A05450 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A05454: -/* 03824 80A05454 0C01B0C6 */ jal ElfMessage_GetCUpText -/* 03828 80A05458 8FA4003C */ lw $a0, 0x003C($sp) -/* 0382C 80A0545C 8FA3002C */ lw $v1, 0x002C($sp) -/* 03830 80A05460 2401015F */ addiu $at, $zero, 0x015F ## $at = 0000015F -/* 03834 80A05464 A4620690 */ sh $v0, 0x0690($v1) ## 00000690 -/* 03838 80A05468 84690690 */ lh $t1, 0x0690($v1) ## 00000690 -/* 0383C 80A0546C 5521000A */ bnel $t1, $at, .L80A05498 -/* 03840 80A05470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03844 80A05474 10000007 */ beq $zero, $zero, .L80A05494 -/* 03848 80A05478 A4600690 */ sh $zero, 0x0690($v1) ## 00000690 -.L80A0547C: -/* 0384C 80A0547C 04430006 */ bgezl $v0, .L80A05498 -/* 03850 80A05480 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03854 80A05484 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -/* 03858 80A05488 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0385C 80A0548C 01415825 */ or $t3, $t2, $at ## $t3 = 00010000 -/* 03860 80A05490 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -.L80A05494: -/* 03864 80A05494 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A05498: -/* 03868 80A05498 0C00BC65 */ jal func_8002F194 -/* 0386C 80A0549C 8FA5003C */ lw $a1, 0x003C($sp) -/* 03870 80A054A0 1040002C */ beq $v0, $zero, .L80A05554 -/* 03874 80A054A4 3C048013 */ lui $a0, %hi(D_801333D4) -/* 03878 80A054A8 248433D4 */ addiu $a0, %lo(D_801333D4) -/* 0387C 80A054AC 24056873 */ addiu $a1, $zero, 0x6873 ## $a1 = 00006873 -/* 03880 80A054B0 0C03D149 */ jal func_800F4524 -/* 03884 80A054B4 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 -/* 03888 80A054B8 8E0D0024 */ lw $t5, 0x0024($s0) ## 00000024 -/* 0388C 80A054BC 8E0C0028 */ lw $t4, 0x0028($s0) ## 00000028 -/* 03890 80A054C0 AE0D0038 */ sw $t5, 0x0038($s0) ## 00000038 -/* 03894 80A054C4 8E0D002C */ lw $t5, 0x002C($s0) ## 0000002C -/* 03898 80A054C8 AE0C003C */ sw $t4, 0x003C($s0) ## 0000003C -/* 0389C 80A054CC AE0D0040 */ sw $t5, 0x0040($s0) ## 00000040 -/* 038A0 80A054D0 0C01B0C6 */ jal ElfMessage_GetCUpText -/* 038A4 80A054D4 8FA4003C */ lw $a0, 0x003C($sp) -/* 038A8 80A054D8 960E010E */ lhu $t6, 0x010E($s0) ## 0000010E -/* 038AC 80A054DC 3C0C80A0 */ lui $t4, %hi(func_80A052F4) ## $t4 = 80A00000 -/* 038B0 80A054E0 258C52F4 */ addiu $t4, $t4, %lo(func_80A052F4) ## $t4 = 80A052F4 -/* 038B4 80A054E4 15C20007 */ bne $t6, $v0, .L80A05504 -/* 038B8 80A054E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 038BC 80A054EC 960F02C4 */ lhu $t7, 0x02C4($s0) ## 000002C4 -/* 038C0 80A054F0 24190BB9 */ addiu $t9, $zero, 0x0BB9 ## $t9 = 00000BB9 -/* 038C4 80A054F4 3C018016 */ lui $at, %hi(gSaveContext+0x38) -/* 038C8 80A054F8 35F80080 */ ori $t8, $t7, 0x0080 ## $t8 = 00000080 -/* 038CC 80A054FC A61802C4 */ sh $t8, 0x02C4($s0) ## 000002C4 -/* 038D0 80A05500 A439E698 */ sh $t9, %lo(gSaveContext+0x38)($at) -.L80A05504: -/* 038D4 80A05504 960802C4 */ lhu $t0, 0x02C4($s0) ## 000002C4 -/* 038D8 80A05508 AE0C0130 */ sw $t4, 0x0130($s0) ## 00000130 -/* 038DC 80A0550C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 038E0 80A05510 350A0010 */ ori $t2, $t0, 0x0010 ## $t2 = 00000010 -/* 038E4 80A05514 A60A02C4 */ sh $t2, 0x02C4($s0) ## 000002C4 -/* 038E8 80A05518 354B0020 */ ori $t3, $t2, 0x0020 ## $t3 = 00000030 -/* 038EC 80A0551C 0C28070E */ jal func_80A01C38 -/* 038F0 80A05520 A60B02C4 */ sh $t3, 0x02C4($s0) ## 000002C4 -/* 038F4 80A05524 8E020298 */ lw $v0, 0x0298($s0) ## 00000298 -/* 038F8 80A05528 50400005 */ beql $v0, $zero, .L80A05540 -/* 038FC 80A0552C 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 03900 80A05530 8C4D0004 */ lw $t5, 0x0004($v0) ## 00000004 -/* 03904 80A05534 35AE0100 */ ori $t6, $t5, 0x0100 ## $t6 = 00000100 -/* 03908 80A05538 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 0390C 80A0553C 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -.L80A05540: -/* 03910 80A05540 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 03914 80A05544 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 03918 80A05548 01E1C024 */ and $t8, $t7, $at -/* 0391C 80A0554C 10000030 */ beq $zero, $zero, .L80A05610 -/* 03920 80A05550 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -.L80A05554: -/* 03924 80A05554 8E1902CC */ lw $t9, 0x02CC($s0) ## 000002CC -/* 03928 80A05558 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0392C 80A0555C 8FA5003C */ lw $a1, 0x003C($sp) -/* 03930 80A05560 0320F809 */ jalr $ra, $t9 -/* 03934 80A05564 00000000 */ nop -/* 03938 80A05568 860802BC */ lh $t0, 0x02BC($s0) ## 000002BC -/* 0393C 80A0556C 3C098016 */ lui $t1, %hi(gSaveContext+0xeb8) -/* 03940 80A05570 3C0A8016 */ lui $t2, %hi(gGameInfo) -/* 03944 80A05574 A60800B6 */ sh $t0, 0x00B6($s0) ## 000000B6 -/* 03948 80A05578 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) -/* 0394C 80A0557C 8D29F518 */ lw $t1, %lo(gSaveContext+0xeb8)($t1) -/* 03950 80A05580 3C0B8016 */ lui $t3, %hi(gGameInfo) -/* 03954 80A05584 3C0D8016 */ lui $t5, %hi(gSaveContext+0xeb8) -/* 03958 80A05588 A54912B4 */ sh $t1, 0x12B4($t2) ## 801612B4 -/* 0395C 80A0558C 8D6BFA90 */ lw $t3, %lo(gGameInfo)($t3) -/* 03960 80A05590 856C12B6 */ lh $t4, 0x12B6($t3) ## 801612B6 -/* 03964 80A05594 1180000D */ beq $t4, $zero, .L80A055CC -/* 03968 80A05598 00000000 */ nop -/* 0396C 80A0559C 8DADF518 */ lw $t5, %lo(gSaveContext+0xeb8)($t5) -/* 03970 80A055A0 3C0480A0 */ lui $a0, %hi(D_80A060D8) ## $a0 = 80A00000 -/* 03974 80A055A4 248460D8 */ addiu $a0, $a0, %lo(D_80A060D8) ## $a0 = 80A060D8 -/* 03978 80A055A8 11A00008 */ beq $t5, $zero, .L80A055CC -/* 0397C 80A055AC 00000000 */ nop -/* 03980 80A055B0 0C000B84 */ jal LogUtils_LogThreadId - -/* 03984 80A055B4 24050A23 */ addiu $a1, $zero, 0x0A23 ## $a1 = 00000A23 -/* 03988 80A055B8 3C0480A0 */ lui $a0, %hi(D_80A060E8) ## $a0 = 80A00000 -/* 0398C 80A055BC 3C058016 */ lui $a1, %hi(gSaveContext+0xeb8) -/* 03990 80A055C0 8CA5F518 */ lw $a1, %lo(gSaveContext+0xeb8)($a1) -/* 03994 80A055C4 0C00084C */ jal osSyncPrintf - -/* 03998 80A055C8 248460E8 */ addiu $a0, $a0, %lo(D_80A060E8) ## $a0 = 80A060E8 -.L80A055CC: -/* 0399C 80A055CC 0C02FF21 */ jal Gameplay_InCsMode -/* 039A0 80A055D0 8FA4003C */ lw $a0, 0x003C($sp) -/* 039A4 80A055D4 1440000E */ bne $v0, $zero, .L80A05610 -/* 039A8 80A055D8 3C028016 */ lui $v0, %hi(gSaveContext+0x38) -/* 039AC 80A055DC 9442E698 */ lhu $v0, %lo(gSaveContext+0x38)($v0) -/* 039B0 80A055E0 284164C8 */ slti $at, $v0, 0x64C8 -/* 039B4 80A055E4 10200004 */ beq $at, $zero, .L80A055F8 -/* 039B8 80A055E8 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 80160001 -/* 039BC 80A055EC 3C018016 */ lui $at, %hi(gSaveContext+0x38) -/* 039C0 80A055F0 10000007 */ beq $zero, $zero, .L80A05610 -/* 039C4 80A055F4 A42EE698 */ sh $t6, %lo(gSaveContext+0x38)($at) -.L80A055F8: -/* 039C8 80A055F8 960F02C4 */ lhu $t7, 0x02C4($s0) ## 000002C4 -/* 039CC 80A055FC 3C018016 */ lui $at, %hi(gSaveContext+0x38) -/* 039D0 80A05600 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 -/* 039D4 80A05604 57000003 */ bnel $t8, $zero, .L80A05614 -/* 039D8 80A05608 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 039DC 80A0560C A420E698 */ sh $zero, %lo(gSaveContext+0x38)($at) -.L80A05610: -/* 039E0 80A05610 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L80A05614: -/* 039E4 80A05614 C60402A4 */ lwc1 $f4, 0x02A4($s0) ## 000002A4 -/* 039E8 80A05618 961902BE */ lhu $t9, 0x02BE($s0) ## 000002BE -/* 039EC 80A0561C AE000298 */ sw $zero, 0x0298($s0) ## 00000298 -/* 039F0 80A05620 4604003C */ c.lt.s $f0, $f4 -/* 039F4 80A05624 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 039F8 80A05628 A60802BE */ sh $t0, 0x02BE($s0) ## 000002BE -/* 039FC 80A0562C 260402A4 */ addiu $a0, $s0, 0x02A4 ## $a0 = 000002A4 -/* 03A00 80A05630 45000016 */ bc1f .L80A0568C -/* 03A04 80A05634 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 03A08 80A05638 44050000 */ mfc1 $a1, $f0 -/* 03A0C 80A0563C 0C01DE80 */ jal Math_ApproxF - -/* 03A10 80A05640 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 03A14 80A05644 C60002A4 */ lwc1 $f0, 0x02A4($s0) ## 000002A4 -/* 03A18 80A05648 8FA9002C */ lw $t1, 0x002C($sp) -/* 03A1C 80A0564C 3C014443 */ lui $at, 0x4443 ## $at = 44430000 -/* 03A20 80A05650 46000182 */ mul.s $f6, $f0, $f0 -/* 03A24 80A05654 44818000 */ mtc1 $at, $f16 ## $f16 = 780.00 -/* 03A28 80A05658 C52A00EC */ lwc1 $f10, 0x00EC($t1) ## 000000EC -/* 03A2C 80A0565C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 03A30 80A05660 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 03A34 80A05664 46105480 */ add.s $f18, $f10, $f16 -/* 03A38 80A05668 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 -/* 03A3C 80A0566C 46003202 */ mul.s $f8, $f6, $f0 -/* 03A40 80A05670 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 03A44 80A05674 44069000 */ mfc1 $a2, $f18 -/* 03A48 80A05678 8FA4003C */ lw $a0, 0x003C($sp) -/* 03A4C 80A0567C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 03A50 80A05680 44054000 */ mfc1 $a1, $f8 -/* 03A54 80A05684 0C01DCEA */ jal func_800773A8 -/* 03A58 80A05688 00000000 */ nop -.L80A0568C: -/* 03A5C 80A0568C 920202C7 */ lbu $v0, 0x02C7($s0) ## 000002C7 -/* 03A60 80A05690 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03A64 80A05694 18400003 */ blez $v0, .L80A056A4 -/* 03A68 80A05698 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = FFFFFFFF -/* 03A6C 80A0569C A20A02C7 */ sb $t2, 0x02C7($s0) ## 000002C7 -/* 03A70 80A056A0 314200FF */ andi $v0, $t2, 0x00FF ## $v0 = 000000FF -.L80A056A4: -/* 03A74 80A056A4 14400006 */ bne $v0, $zero, .L80A056C0 -/* 03A78 80A056A8 8FAB003C */ lw $t3, 0x003C($sp) -/* 03A7C 80A056AC 916C1D6C */ lbu $t4, 0x1D6C($t3) ## 00001D6C -/* 03A80 80A056B0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 03A84 80A056B4 11800002 */ beq $t4, $zero, .L80A056C0 -/* 03A88 80A056B8 00000000 */ nop -/* 03A8C 80A056BC A20D02C7 */ sb $t5, 0x02C7($s0) ## 000002C7 -.L80A056C0: -/* 03A90 80A056C0 0C281364 */ jal func_80A04D90 -/* 03A94 80A056C4 8FA5003C */ lw $a1, 0x003C($sp) -/* 03A98 80A056C8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03A9C 80A056CC 8FB00020 */ lw $s0, 0x0020($sp) -/* 03AA0 80A056D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03AA4 80A056D4 03E00008 */ jr $ra -/* 03AA8 80A056D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05734.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05734.s deleted file mode 100644 index 4079ba9763..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05734.s +++ /dev/null @@ -1,90 +0,0 @@ -.late_rodata -glabel D_80A06230 - .float 0.1 - -glabel D_80A06234 - .float 0.012000000104308128 - -glabel D_80A06238 - .float 124.99999237060547 - -.text -glabel func_80A05734 -/* 03B04 80A05734 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 03B08 80A05738 AFB00020 */ sw $s0, 0x0020($sp) -/* 03B0C 80A0573C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 03B10 80A05740 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03B14 80A05744 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03B18 80A05748 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 03B1C 80A0574C AFA40048 */ sw $a0, 0x0048($sp) -/* 03B20 80A05750 AFA60050 */ sw $a2, 0x0050($sp) -/* 03B24 80A05754 14A1002A */ bne $a1, $at, .L80A05800 -/* 03B28 80A05758 AFA70054 */ sw $a3, 0x0054($sp) -/* 03B2C 80A0575C 8FAE005C */ lw $t6, 0x005C($sp) -/* 03B30 80A05760 95C402BE */ lhu $a0, 0x02BE($t6) ## 000002BE -/* 03B34 80A05764 00042300 */ sll $a0, $a0, 12 -/* 03B38 80A05768 00042400 */ sll $a0, $a0, 16 -/* 03B3C 80A0576C 0C01DE1C */ jal Math_Sins - ## sins? -/* 03B40 80A05770 00042403 */ sra $a0, $a0, 16 -/* 03B44 80A05774 3C0180A0 */ lui $at, %hi(D_80A06230) ## $at = 80A00000 -/* 03B48 80A05778 C4246230 */ lwc1 $f4, %lo(D_80A06230)($at) -/* 03B4C 80A0577C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03B50 80A05780 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 03B54 80A05784 46040182 */ mul.s $f6, $f0, $f4 -/* 03B58 80A05788 3C0180A0 */ lui $at, %hi(D_80A06234) ## $at = 80A00000 -/* 03B5C 80A0578C C4306234 */ lwc1 $f16, %lo(D_80A06234)($at) -/* 03B60 80A05790 8FA2005C */ lw $v0, 0x005C($sp) -/* 03B64 80A05794 3C0180A0 */ lui $at, %hi(D_80A06238) ## $at = 80A00000 -/* 03B68 80A05798 944F02C4 */ lhu $t7, 0x02C4($v0) ## 000002C4 -/* 03B6C 80A0579C 46083280 */ add.s $f10, $f6, $f8 -/* 03B70 80A057A0 31F80200 */ andi $t8, $t7, 0x0200 ## $t8 = 00000000 -/* 03B74 80A057A4 46105082 */ mul.s $f2, $f10, $f16 -/* 03B78 80A057A8 13000002 */ beq $t8, $zero, .L80A057B4 -/* 03B7C 80A057AC 46001506 */ mov.s $f20, $f2 -/* 03B80 80A057B0 46021500 */ add.s $f20, $f2, $f2 -.L80A057B4: -/* 03B84 80A057B4 C4520050 */ lwc1 $f18, 0x0050($v0) ## 00000050 -/* 03B88 80A057B8 C4246238 */ lwc1 $f4, %lo(D_80A06238)($at) -/* 03B8C 80A057BC 3C0480A0 */ lui $a0, %hi(D_80A060A4) ## $a0 = 80A00000 -/* 03B90 80A057C0 248460A4 */ addiu $a0, $a0, %lo(D_80A060A4) ## $a0 = 80A060A4 -/* 03B94 80A057C4 46049182 */ mul.s $f6, $f18, $f4 -/* 03B98 80A057C8 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFEC -/* 03B9C 80A057CC 4606A502 */ mul.s $f20, $f20, $f6 -/* 03BA0 80A057D0 0C0346BD */ jal Matrix_MultVec3f -/* 03BA4 80A057D4 00000000 */ nop -/* 03BA8 80A057D8 C7AC0034 */ lwc1 $f12, 0x0034($sp) -/* 03BAC 80A057DC C7AE0038 */ lwc1 $f14, 0x0038($sp) -/* 03BB0 80A057E0 8FA6003C */ lw $a2, 0x003C($sp) -/* 03BB4 80A057E4 0C034261 */ jal Matrix_Translate -/* 03BB8 80A057E8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03BBC 80A057EC 4406A000 */ mfc1 $a2, $f20 -/* 03BC0 80A057F0 4600A306 */ mov.s $f12, $f20 -/* 03BC4 80A057F4 4600A386 */ mov.s $f14, $f20 -/* 03BC8 80A057F8 0C0342A3 */ jal Matrix_Scale -/* 03BCC 80A057FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L80A05800: -/* 03BD0 80A05800 8FB9005C */ lw $t9, 0x005C($sp) -/* 03BD4 80A05804 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 03BD8 80A05808 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03BDC 80A0580C 972802C4 */ lhu $t0, 0x02C4($t9) ## 000002C4 -/* 03BE0 80A05810 31090200 */ andi $t1, $t0, 0x0200 ## $t1 = 00000000 -/* 03BE4 80A05814 5120000C */ beql $t1, $zero, .L80A05848 -/* 03BE8 80A05818 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03BEC 80A0581C 12010008 */ beq $s0, $at, .L80A05840 -/* 03BF0 80A05820 8FAA0050 */ lw $t2, 0x0050($sp) -/* 03BF4 80A05824 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 03BF8 80A05828 12010005 */ beq $s0, $at, .L80A05840 -/* 03BFC 80A0582C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 03C00 80A05830 12010003 */ beq $s0, $at, .L80A05840 -/* 03C04 80A05834 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 03C08 80A05838 56010003 */ bnel $s0, $at, .L80A05848 -/* 03C0C 80A0583C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A05840: -/* 03C10 80A05840 AD400000 */ sw $zero, 0x0000($t2) ## 00000000 -/* 03C14 80A05844 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A05848: -/* 03C18 80A05848 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 03C1C 80A0584C 8FB00020 */ lw $s0, 0x0020($sp) -/* 03C20 80A05850 03E00008 */ jr $ra -/* 03C24 80A05854 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05F10.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05F10.s deleted file mode 100644 index 7baeb26ecf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05F10.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_80A05F10 -/* 042E0 80A05F10 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 042E4 80A05F14 00067880 */ sll $t7, $a2, 2 -/* 042E8 80A05F18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 042EC 80A05F1C AFA40030 */ sw $a0, 0x0030($sp) -/* 042F0 80A05F20 AFA60038 */ sw $a2, 0x0038($sp) -/* 042F4 80A05F24 00AFC021 */ addu $t8, $a1, $t7 -/* 042F8 80A05F28 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -/* 042FC 80A05F2C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 04300 80A05F30 8C4A0018 */ lw $t2, 0x0018($v0) ## 00000018 -/* 04304 80A05F34 8C59000C */ lw $t9, 0x000C($v0) ## 0000000C -/* 04308 80A05F38 8C480010 */ lw $t0, 0x0010($v0) ## 00000010 -/* 0430C 80A05F3C 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 04310 80A05F40 8C490014 */ lw $t1, 0x0014($v0) ## 00000014 -/* 04314 80A05F44 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 04318 80A05F48 46805420 */ cvt.s.w $f16, $f10 -/* 0431C 80A05F4C 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 -/* 04320 80A05F50 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 04324 80A05F54 468020A0 */ cvt.s.w $f2, $f4 -/* 04328 80A05F58 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 0432C 80A05F5C 8C4B001C */ lw $t3, 0x001C($v0) ## 0000001C -/* 04330 80A05F60 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 04334 80A05F64 46803320 */ cvt.s.w $f12, $f6 -/* 04338 80A05F68 46809120 */ cvt.s.w $f4, $f18 -/* 0433C 80A05F6C 468043A0 */ cvt.s.w $f14, $f8 -/* 04340 80A05F70 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 04344 80A05F74 8C4C0020 */ lw $t4, 0x0020($v0) ## 00000020 -/* 04348 80A05F78 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 0434C 80A05F7C 00000000 */ nop -/* 04350 80A05F80 46803220 */ cvt.s.w $f8, $f6 -/* 04354 80A05F84 E7A80020 */ swc1 $f8, 0x0020($sp) -/* 04358 80A05F88 94E61D74 */ lhu $a2, 0x1D74($a3) ## 00001D74 -/* 0435C 80A05F8C 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 04360 80A05F90 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 04364 80A05F94 E7AE002C */ swc1 $f14, 0x002C($sp) -/* 04368 80A05F98 E7AC0028 */ swc1 $f12, 0x0028($sp) -/* 0436C 80A05F9C 0C01BE4F */ jal func_8006F93C -/* 04370 80A05FA0 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 04374 80A05FA4 C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 04378 80A05FA8 C7AA0018 */ lwc1 $f10, 0x0018($sp) -/* 0437C 80A05FAC 8FA20030 */ lw $v0, 0x0030($sp) -/* 04380 80A05FB0 C7AC0028 */ lwc1 $f12, 0x0028($sp) -/* 04384 80A05FB4 46025401 */ sub.s $f16, $f10, $f2 -/* 04388 80A05FB8 C7AE002C */ lwc1 $f14, 0x002C($sp) -/* 0438C 80A05FBC 46008482 */ mul.s $f18, $f16, $f0 -/* 04390 80A05FC0 46029100 */ add.s $f4, $f18, $f2 -/* 04394 80A05FC4 E4440000 */ swc1 $f4, 0x0000($v0) ## 00000000 -/* 04398 80A05FC8 C7A6001C */ lwc1 $f6, 0x001C($sp) -/* 0439C 80A05FCC 460C3201 */ sub.s $f8, $f6, $f12 -/* 043A0 80A05FD0 46004282 */ mul.s $f10, $f8, $f0 -/* 043A4 80A05FD4 460C5400 */ add.s $f16, $f10, $f12 -/* 043A8 80A05FD8 E4500004 */ swc1 $f16, 0x0004($v0) ## 00000004 -/* 043AC 80A05FDC C7B20020 */ lwc1 $f18, 0x0020($sp) -/* 043B0 80A05FE0 460E9101 */ sub.s $f4, $f18, $f14 -/* 043B4 80A05FE4 46002182 */ mul.s $f6, $f4, $f0 -/* 043B8 80A05FE8 460E3200 */ add.s $f8, $f6, $f14 -/* 043BC 80A05FEC E4480008 */ swc1 $f8, 0x0008($v0) ## 00000008 -/* 043C0 80A05FF0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 043C4 80A05FF4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 043C8 80A05FF8 03E00008 */ jr $ra -/* 043CC 80A05FFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s index 361145987d..ce0f327178 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s @@ -65,7 +65,7 @@ glabel func_80B59828 /* 06550 80B59900 240A0140 */ addiu $t2, $zero, 0x0140 ## $t2 = 00000140 /* 06554 80B59904 3C018016 */ lui $at, %hi(gSaveContext+0x1424) /* 06558 80B59908 A42AFA84 */ sh $t2, %lo(gSaveContext+0x1424)($at) -/* 0655C 80B5990C 0C021DA0 */ jal func_80087680 +/* 0655C 80B5990C 0C021DA0 */ jal Magic_Fill /* 06560 80B59910 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06564 80B59914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06568 80B59918 0C00B2D0 */ jal Flags_GetSwitch diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s index d8dcd01fe2..44b9b8071a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s @@ -28,7 +28,7 @@ glabel func_80B59AD0 /* 06784 80B59B34 24180140 */ addiu $t8, $zero, 0x0140 ## $t8 = 00000140 /* 06788 80B59B38 3C018016 */ lui $at, %hi(gSaveContext+0x1424) /* 0678C 80B59B3C A438FA84 */ sh $t8, %lo(gSaveContext+0x1424)($at) -/* 06790 80B59B40 0C021DA0 */ jal func_80087680 +/* 06790 80B59B40 0C021DA0 */ jal Magic_Fill /* 06794 80B59B44 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 06798 80B59B48 2419001B */ addiu $t9, $zero, 0x001B ## $t9 = 0000001B /* 0679C 80B59B4C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/Player_Init.s b/asm/non_matchings/overlays/actors/ovl_player_actor/Player_Init.s index 4a28e2aa2a..ac99398c46 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/Player_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/Player_Init.s @@ -320,7 +320,7 @@ glabel Player_Init /* 14F4C 8084715C 3C078085 */ lui $a3, %hi(D_80854778) ## $a3 = 80850000 /* 14F50 80847160 24E74778 */ addiu $a3, $a3, %lo(D_80854778) ## $a3 = 80854778 /* 14F54 80847164 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 14F58 80847168 0C20E5A0 */ jal func_80839680 +/* 14F58 80847168 0C20E5A0 */ jal Player_SpawnFairy /* 14F5C 8084716C AFA00010 */ sw $zero, 0x0010($sp) /* 14F60 80847170 AE02068C */ sw $v0, 0x068C($s0) ## 0000068C /* 14F64 80847174 864313C4 */ lh $v1, 0x13C4($s2) ## 8015FA24 diff --git a/data/overlays/actors/z_en_elf.data.s b/data/overlays/actors/z_en_elf.data.s deleted file mode 100644 index 12a7c7cc5e..0000000000 --- a/data/overlays/actors/z_en_elf.data.s +++ /dev/null @@ -1,32 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Elf_InitVars - .word 0x00180700, 0x02000030, 0x00010000, 0x000002D0 -.word EnElf_Init -.word EnElf_Destroy -.word EnElf_Update -.word EnElf_Draw -glabel D_80A06020 - .word 0x48500008 -glabel D_80A06024 - .word 0x437F0000, 0x437F0000, 0x437F0000, 0x437F0000, 0x437F0000, 0x435C0000, 0x435C0000, 0x437F0000 -glabel D_80A06044 - .word 0x437F0000, 0x437F0000, 0x437F0000, 0x437F0000, 0x437F0000, 0x42480000, 0x42C80000, 0x437F0000 -glabel D_80A06064 - .word 0x00000001, 0x00000102, 0x00010002, 0x00010002, 0x01000001, 0x02000001, 0x02000100, 0x02010101, 0x00010001, 0x00010100 -glabel D_80A0608C - .word 0x00000000, 0xBD4CCCCD, 0x00000000 -glabel D_80A06098 - .word 0x00000000, 0xBCCCCCCD, 0x00000000 -glabel D_80A060A4 - .word 0x00000000, 0x00000000, 0x00000000 - diff --git a/include/functions.h b/include/functions.h index 067d5912d1..71941f6242 100644 --- a/include/functions.h +++ b/include/functions.h @@ -581,7 +581,8 @@ f32 func_8003C890(CollisionContext*, CollisionPoly**, Vec3f*); f32 func_8003C8EC(GlobalContext*, CollisionContext*, CollisionPoly**, Vec3f*); f32 func_8003C940(CollisionContext*, CollisionPoly**, s32*, Vec3f*); f32 func_8003C9A4(CollisionContext*, CollisionPoly**, UNK_PTR, Actor*, Vec3f*); -f32 func_8003CA0C(GlobalContext*, CollisionContext*, CollisionPoly**, u32*, Actor*, Vec3f*); +f32 func_8003CA0C(GlobalContext* globalCtx, CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, Actor* actor, + Vec3f* pos); f32 func_8003CA64(CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, Actor* actor, Vec3f* pos, f32 chkDist); f32 func_8003CB30(CollisionContext*, CollisionPoly*, Vec3f*, MtxF*); f32 func_8003CCA4(CollisionContext*, CollisionPoly**, s32*, Vec3f*); @@ -1149,7 +1150,7 @@ void Interface_LoadActionLabelB(GlobalContext* globalCtx, u16 action); s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange); void Rupees_ChangeBy(s16 rupeeChange); void Inventory_ChangeAmmo(s16 item, s16 ammoChange); -void func_80087680(GlobalContext* globalCtx); +void Magic_Fill(GlobalContext* globalCtx); void func_800876C8(GlobalContext* globalCtx); s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2); void func_80088AA0(s16 seconds); @@ -1262,6 +1263,7 @@ void func_80094678(GraphicsContext* gfxCtx); Gfx* func_800946E4(Gfx* gfx); Gfx* func_800947AC(Gfx* gfx); void func_80094A14(GraphicsContext* gfxCtx); +void func_80094B58(GraphicsContext* gfxCtx); void func_80094BC4(GraphicsContext* gfxCtx); void func_80094C50(GraphicsContext* gfxCtx); void func_80094D28(Gfx** gfxp); @@ -2265,7 +2267,7 @@ void func_800F4138(Vec3f*, u16, f32); void func_800F4190(Vec3f*, u16); void func_800F436C(UNK_TYPE arg0, s16 arg1, f32 arg2); // ? func_800F4414(?); -// ? func_800F4524(?); +void func_800F4524(Vec3f*, u16, u8); void func_800F46E0(Vec3f* pos, f32 arg0); // ? func_800F4784(?); void func_800F47BC(void); diff --git a/include/z64player.h b/include/z64player.h index 7843f60886..c988905230 100644 --- a/include/z64player.h +++ b/include/z64player.h @@ -273,7 +273,7 @@ typedef struct Player { /* 0x0684 */ Actor* unk_684; /* 0x0688 */ Actor* boomerangActor; /* 0x068C */ Actor* naviActor; - /* 0x0690 */ s16 naviMessageId; + /* 0x0690 */ s16 naviTextId; /* 0x0692 */ u8 stateFlags3; /* 0x0693 */ s8 exchangeItemId; /* 0x0694 */ Actor* targetActor; diff --git a/spec b/spec index 630dd17763..dc3e1d4f52 100644 --- a/spec +++ b/spec @@ -2234,8 +2234,11 @@ endseg beginseg name "ovl_En_Elf" include "build/src/overlays/actors/ovl_En_Elf/z_en_elf.o" - include "build/data/overlays/actors/z_en_elf.data.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_En_Elf/ovl_En_Elf_reloc.o" +#else include "build/data/overlays/actors/z_en_elf.reloc.o" +#endif endseg beginseg diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 000b012d8f..24176a48f3 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1147,7 +1147,7 @@ u32 D_8015BBA4; s32 func_8002E2AC(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, s32 arg3) { f32 sp34; - u32 sp30; + s32 sp30; arg2->y += 50.0f; diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index df18eb7f79..f94a453d3c 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -1,4 +1,5 @@ #include "global.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" #define FLAGS 0x00000000 @@ -876,7 +877,7 @@ EnItem00* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, s16 pa if (((params & 0x00FF) == ITEM00_FLEXIBLE) && !param4000) { // TODO: Prevent the cast to EnItem00 here since this is a different actor (En_Elf) spawnedActor = (EnItem00*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, - spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, 0x0002); + spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, FAIRY_HEAL_TIMED); EffectSsDeadSound_SpawnStationary(globalCtx, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, true, DEADSOUND_REPEAT_MODE_OFF, 40); } else { @@ -920,7 +921,7 @@ EnItem00* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, s16 p if (((params & 0x00FF) == ITEM00_FLEXIBLE) && !param4000) { // TODO: Prevent the cast to EnItem00 here since this is a different actor (En_Elf) spawnedActor = (EnItem00*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, - spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, 0x0002); + spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, FAIRY_HEAL_TIMED); EffectSsDeadSound_SpawnStationary(globalCtx, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, true, DEADSOUND_REPEAT_MODE_OFF, 40); } else { @@ -990,7 +991,7 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 if (dropId == ITEM00_FLEXIBLE) { if (gSaveContext.health <= 0x10) { // 1 heart or less Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f, spawnPos->z, 0, - 0, 0, 0x0002); + 0, 0, FAIRY_HEAL_TIMED); EffectSsDeadSound_SpawnStationary(globalCtx, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, true, DEADSOUND_REPEAT_MODE_OFF, 40); return; diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c index 104d6be425..c38eb11aa4 100644 --- a/src/code/z_kanfont.c +++ b/src/code/z_kanfont.c @@ -33,8 +33,8 @@ void Font_LoadOrderedFont(Font* font) { font->msgOffset = D_070380D4 - D_07000000; len = font->msgLength = D_0703811C - D_070380D4; - DmaMgr_SendRequest1(font->msgBuf, &_nes_message_data_staticSegmentRomStart[font->msgOffset], len, - "../z_kanfont.c", 122); + DmaMgr_SendRequest1(font->msgBuf, &_nes_message_data_staticSegmentRomStart[font->msgOffset], len, "../z_kanfont.c", + 122); osSyncPrintf("msg_data=%x, msg_data0=%x jj=%x\n", font->msgOffset, font->msgLength, jj = len); len = jj; for (fontBufIndex = 0, codePointIndex = 0; font->msgBuf[codePointIndex] != MESSAGE_END; codePointIndex++) { diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 9f72fb8876..ea5ce52a96 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1685,7 +1685,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { return item; } else if (item == ITEM_MAGIC_SMALL) { if (gSaveContext.unk_13F0 != 10) { - func_80087680(globalCtx); + Magic_Fill(globalCtx); } func_80087708(globalCtx, 12, 5); @@ -1698,7 +1698,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { return item; } else if (item == ITEM_MAGIC_LARGE) { if (gSaveContext.unk_13F0 != 10) { - func_80087680(globalCtx); + Magic_Fill(globalCtx); } func_80087708(globalCtx, 24, 5); @@ -2256,7 +2256,7 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) { osSyncPrintf("合計 = (%d)\n", AMMO(item)); } -void func_80087680(GlobalContext* globalCtx) { +void Magic_Fill(GlobalContext* globalCtx) { if (gSaveContext.magicAcquired) { gSaveContext.unk_13F2 = gSaveContext.unk_13F0; gSaveContext.unk_13F6 = (gSaveContext.doubleMagic * 0x30) + 0x30; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index 6c714c5721..7eeecd4234 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -148,7 +148,7 @@ void BgHidanFwbig_Lower(BgHidanFwbig* this, GlobalContext* globalCtx) { } void BgHidanFwbig_WaitForTimer(BgHidanFwbig* this, GlobalContext* globalCtx) { - if(this->timer != 0) { + if (this->timer != 0) { this->timer--; } if (this->timer == 0) { diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index 60928ffbe8..06d8ff9943 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -1,4 +1,5 @@ #include "z_bg_spot11_oasis.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #define FLAGS 0x00000010 @@ -105,7 +106,7 @@ void func_808B29F0(BgSpot11Oasis* this, GlobalContext* globalCtx) { if (Math_ApproxF(&this->actor.posRot.pos.y, 0.0f, 0.7f)) { func_808B2AA8(this); Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, this->actor.posRot.pos.x, - this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, 4); + this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, FAIRY_SPAWNER); func_80078884(NA_SE_SY_CORRECT_CHIME); } func_808B27F0(globalCtx, this->actor.posRot.pos.y); diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index ca22a7c17c..b34887708f 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -5,6 +5,7 @@ */ #include "z_demo_sa.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "vt.h" @@ -605,7 +606,7 @@ void func_8098F83C(DemoSa* this, GlobalContext* globalCtx) { SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600B1A0, &D_0601113C, NULL, NULL, 0); Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ELF, thisPos->x, thisPos->y, thisPos->z, - 0, 0, 0, 3); + 0, 0, 0, FAIRY_KOKIRI); this->action = 16; this->drawConfig = 0; this->actor.shape.unk_14 = 0; diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c index ec4d23211e..0ca77b24ce 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c @@ -114,9 +114,9 @@ void func_8099485C(DoorGerudo* this, GlobalContext* globalCtx) { Player* player = PLAYER; if (gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex] <= 0) { - player->naviMessageId = -0x203; + player->naviTextId = -0x203; } else if (!Flags_GetCollectible(globalCtx, (this->dyna.actor.params >> 8) & 0x1F)) { - player->naviMessageId = -0x225; + player->naviTextId = -0x225; } else { player->doorType = 2; player->doorDirection = direction; diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index a804a2b54b..da18da52ab 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -179,8 +179,8 @@ void ElfMsg_CallNaviCuboid(ElfMsg* this, GlobalContext* globalCtx) { (this->actor.posRot.pos.y <= player->actor.posRot.pos.y) && ((player->actor.posRot.pos.y - this->actor.posRot.pos.y) < (100.0f * this->actor.scale.y)) && (fabsf(player->actor.posRot.pos.z - this->actor.posRot.pos.z) < (100.0f * this->actor.scale.z))) { - player->naviMessageId = ElfMsg_GetMessageId(this); - navi->unk_298 = &this->actor; + player->naviTextId = ElfMsg_GetMessageId(this); + navi->elfMsg = this; } } @@ -195,8 +195,8 @@ void ElfMsg_CallNaviCylinder(ElfMsg* this, GlobalContext* globalCtx) { if (ElfMsg_WithinXZDistance(&player->actor.posRot.pos, &this->actor.posRot.pos, this->actor.scale.x * 100.0f) && (this->actor.posRot.pos.y <= player->actor.posRot.pos.y) && ((player->actor.posRot.pos.y - this->actor.posRot.pos.y) < (100.0f * this->actor.scale.y))) { - player->naviMessageId = ElfMsg_GetMessageId(this); - navi->unk_298 = &this->actor; + player->naviTextId = ElfMsg_GetMessageId(this); + navi->elfMsg = this; } } diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index 000dffddf2..2fc65c009a 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -5,6 +5,7 @@ */ #include "z_en_butte.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #define FLAGS 0x00000000 @@ -347,7 +348,7 @@ void EnButte_TransformIntoFairy(EnButte* this, GlobalContext* globalCtx) { Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 60, NA_SE_EV_BUTTERFRY_TO_FAIRY); } else if (this->timer == 4) { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, this->actor.posRot2.pos.x, this->actor.posRot2.pos.y, - this->actor.posRot2.pos.z, 0, this->actor.shape.rot.y, 0, 2); + this->actor.posRot2.pos.z, 0, this->actor.shape.rot.y, 0, FAIRY_HEAL_TIMED); this->drawSkelAnime = false; } else if (this->timer <= 0) { EnButte_SetupWaitToDie(this); diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index 17299f29ca..5e031706c7 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -1,15 +1,60 @@ +/* + * File: z_en_elf.c + * Overlay: ovl_En_Elf + * Description: Fairy + */ + #include "z_en_elf.h" #define FLAGS 0x02000030 #define THIS ((EnElf*)thisx) +#define FAIRY_FLAG_TIMED (1 << 8) +#define FAIRY_FLAG_BIG (1 << 9) + void EnElf_Init(Actor* thisx, GlobalContext* globalCtx); void EnElf_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnElf_Update(Actor* thisx, GlobalContext* globalCtx); void EnElf_Draw(Actor* thisx, GlobalContext* globalCtx); +void func_80A053F0(Actor* thisx, GlobalContext* globalCtx); +void func_80A052F4(Actor* thisx, GlobalContext* globalCtx); +void func_80A05208(Actor* thisx, GlobalContext* globalCtx); +void func_80A05188(Actor* thisx, GlobalContext* globalCtx); +void func_80A05114(Actor* thisx, GlobalContext* globalCtx); +void func_80A05040(Actor* thisx, GlobalContext* globalCtx); + +// Navi +void func_80A03CF8(EnElf* this, GlobalContext* globalCtx); + +// Healing Fairies +void func_80A0329C(EnElf* this, GlobalContext* globalCtx); +void func_80A03610(EnElf* this, GlobalContext* globalCtx); + +// Healing Fairies Revive From Death +void func_80A03990(EnElf* this, GlobalContext* globalCtx); +void func_80A03814(EnElf* this, GlobalContext* globalCtx); + +// Kokiri Fairies +void func_80A0353C(EnElf* this, GlobalContext* globalCtx); + +// Fairy Spawner +void func_80A03604(EnElf* this, GlobalContext* globalCtx); + +// Move(?) functions +void func_80A0214C(EnElf* this, GlobalContext* globalCtx); +void func_80A02AA4(EnElf* this, GlobalContext* globalCtx); +void func_80A02A20(EnElf* this, GlobalContext* globalCtx); +void func_80A02B38(EnElf* this, GlobalContext* globalCtx); +void func_80A020A4(EnElf* this, GlobalContext* globalCtx); +void func_80A01FE0(EnElf* this, GlobalContext* globalCtx); + +// misc +void func_80A04414(EnElf* this, GlobalContext* globalCtx); +void func_80A0461C(EnElf* this, GlobalContext* globalCtx); +void EnElf_SpawnSparkles(EnElf* this, GlobalContext* globalCtx, s32 sparkleLife); +void EnElf_GetCutsceneNextPos(Vec3f* vec, GlobalContext* globalCtx, s32 action); -/* const ActorInit En_Elf_InitVars = { ACTOR_EN_ELF, ACTORTYPE_ITEMACTION, @@ -21,99 +66,1504 @@ const ActorInit En_Elf_InitVars = { (ActorFunc)EnElf_Update, (ActorFunc)EnElf_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C30.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01C38.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 8, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01F90.s") +static Color_RGBAf sInnerColors[] = { + { 255.0f, 255.0f, 255.0f, 255.0f }, + { 255.0f, 220.0f, 220.0f, 255.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A01FE0.s") +static Color_RGBAf sOuterColors[] = { + { 255.0f, 255.0f, 255.0f, 255.0f }, + { 255.0f, 50.0f, 100.0f, 255.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A020A4.s") +typedef struct { + u8 r, g, b; +} FairyColorFlags; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0214C.s") +static FairyColorFlags sColorFlags[] = { + { 0, 0, 0 }, { 1, 0, 0 }, { 1, 2, 0 }, { 1, 0, 2 }, { 0, 1, 0 }, { 2, 1, 0 }, { 0, 1, 2 }, + { 0, 0, 1 }, { 2, 0, 1 }, { 0, 2, 1 }, { 1, 1, 0 }, { 1, 0, 1 }, { 0, 1, 1 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0232C.s") +extern SkeletonHeader D_04016A48; +extern AnimationHeader D_04014BA4; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A023A4.s") +void EnElf_SetupAction(EnElf* this, EnElfActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Init.s") +void func_80A01C38(EnElf* this, s32 arg1) { + this->unk_2A8 = arg1; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0299C.s") + switch (this->unk_2A8) { + case 0: + this->unk_2AE = 0x400; + this->unk_2B0 = 0x200; + this->func_2C8 = func_80A02A20; + this->unk_2C0 = 100; + this->unk_2B4 = 5.0f; + this->unk_2B8 = 20.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 12: + this->unk_2AE = 0x400; + this->unk_2B0 = 0x200; + this->func_2C8 = func_80A02A20; + this->unk_2C0 = 100; + this->unk_2B4 = 1.0f; + this->unk_2B8 = 5.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 10: + this->unk_2AE = 0x400; + this->unk_2B0 = 0; + this->func_2C8 = func_80A02A20; + this->unk_2B8 = 0.0f; + this->unk_2B4 = 5.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 9: + this->unk_2AE = 0x1000; + this->unk_2B0 = 0x200; + this->func_2C8 = func_80A02A20; + this->unk_2B4 = 3.0f; + this->unk_2B8 = 10.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 7: + this->func_2C8 = func_80A02A20; + this->unk_2AE = 0x1E; + this->unk_2C0 = 1; + this->unk_2B4 = 0.0f; + this->unk_2B8 = 0.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 8: + this->unk_2AE = 0x1000; + this->unk_2B0 = 0x200; + this->func_2C8 = func_80A02A20; + this->unk_2B4 = 0.0f; + this->unk_2B8 = 0.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 1: + this->unk_2AE = 0x1000; + this->unk_2B0 = 0x800; + this->func_2C8 = func_80A02A20; + this->unk_2B4 = 5.0f; + this->unk_2B8 = 7.5f; + this->skelAnime.animPlaybackSpeed = 2.0f; + break; + case 2: + this->unk_2AE = 0x400; + this->unk_2B0 = 0x1000; + this->func_2C8 = func_80A02AA4; + this->unk_2B4 = 10.0f; + this->unk_2B8 = 20.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 3: + this->unk_2B0 = 0x600; + this->func_2C8 = func_80A02B38; + this->unk_2B8 = 1.0f; + this->unk_2B4 = 1.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + case 4: + this->unk_2B0 = 0x800; + this->func_2C8 = func_80A02B38; + this->unk_2B4 = 20.0f; + this->unk_2B8 = 10.0; + this->skelAnime.animPlaybackSpeed = 2.0f; + break; + case 5: + this->unk_2B0 = 0x200; + this->func_2C8 = func_80A02B38; + this->unk_2B4 = 10.0f; + this->unk_2B8 = 10.0f; + this->skelAnime.animPlaybackSpeed = 0.5f; + break; + case 6: + this->unk_2AE = 0x1000; + this->unk_2B0 = 0x800; + this->func_2C8 = func_80A02A20; + this->unk_2B4 = 60.0f; + this->unk_2B8 = 20.0f; + this->skelAnime.animPlaybackSpeed = 2.0f; + break; + case 11: + this->unk_2AE = 0x400; + this->unk_2B0 = 0x2000; + this->func_2C8 = func_80A02A20; + this->unk_2C0 = 42; + this->unk_2B4 = 5.0f; + this->unk_2B8 = 1.0f; + this->skelAnime.animPlaybackSpeed = 1.0f; + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A029A8.s") +s32 func_80A01F90(Vec3f* this, Vec3f* arg1, f32 arg2) { + return SQ(arg2) < (SQ(arg1->x - this->x) + SQ(arg1->z - this->z)); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Destroy.s") +void func_80A01FE0(EnElf* this, GlobalContext* globalCtx) { + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02A20.s") + if (!func_80A01F90(&this->actor.posRot.pos, &player->actor.posRot.pos, 30.0f)) { + this->unk_2B8 = 0.5f; + } else { + this->unk_2B8 = 2.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02AA4.s") + if (this->unk_2C0 > 0) { + this->unk_2C0--; + } else { + this->unk_2A8 = 1; + this->unk_2AC = 0x80; + this->unk_2B8 = Math_Rand_ZeroFloat(1.0f) + 0.5f; + this->unk_2B0 = Math_Rand_CenteredFloat(32767.0f); + this->func_2C8 = func_80A0214C; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02B38.s") +void func_80A020A4(EnElf* this, GlobalContext* globalCtx) { + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02BD8.s") + if (func_80A01F90(&this->actor.posRot.pos, &player->actor.posRot.pos, 50.0f)) { + if (this->unk_2C0 > 0) { + this->unk_2C0--; + } else { + this->unk_2A8 = 1; + this->unk_2AC = 0x80; + this->unk_2B8 = Math_Rand_ZeroFloat(1.0f) + 0.5f; + this->unk_2B0 = Math_Rand_CenteredFloat(32767.0f); + this->func_2C8 = func_80A0214C; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02C98.s") +void func_80A0214C(EnElf* this, GlobalContext* globalCtx) { + f32 xzDistFromLink; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02E30.s") + if (this->unk_2C0 > 0) { + this->unk_2C0--; + } else { + xzDistFromLink = this->actor.xzDistFromLink; + if (xzDistFromLink < 50.0f) { + if (Math_Rand_ZeroOne() < 0.2f) { + this->unk_2A8 = 2; + this->unk_2AC = 0x400; + this->unk_2B8 = 2.0f; + this->func_2C8 = func_80A020A4; + this->actor.speedXZ = 1.5f; + this->unk_2C0 = (s16)Math_Rand_ZeroFloat(8.0f) + 4; + } else { + this->unk_2C0 = 10; + } + } else { + if (xzDistFromLink > 150.0f) { + xzDistFromLink = 150.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02EC0.s") + xzDistFromLink = ((xzDistFromLink - 50.0f) * 0.95f) + 0.05f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A02F2C.s") + if (Math_Rand_ZeroOne() < xzDistFromLink) { + this->unk_2A8 = 3; + this->unk_2AC = 0x200; + this->unk_2B8 = (xzDistFromLink * 2.0f) + 1.0f; + this->func_2C8 = func_80A01FE0; + this->unk_2C0 = (s16)Math_Rand_ZeroFloat(16.0f) + 0x10; + } else { + this->unk_2C0 = 10; + } + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03018.s") + if (Math_Rand_ZeroOne() < 0.1f) { + this->unk_2A8 = 1; + this->unk_2AC = 0x80; + this->unk_2B8 = Math_Rand_ZeroFloat(0.5f) + 0.5f; + this->unk_2B0 = Math_Rand_CenteredFloat(32767.0f); + } +} +void func_80A0232C(EnElf* this, GlobalContext* globalCtx) { + if (func_80A01F90(&this->unk_28C, &this->actor.posRot.pos, 100.0f)) { + this->unk_2A8 = 0; + this->unk_2AC = 0x200; + this->func_2C8 = func_80A0214C; + this->unk_2B8 = 1.5f; + } else { + this->func_2C8(this, globalCtx); + } +} + +f32 EnElf_GetColorValue(s32 colorFlag) { + switch (colorFlag) { + case 1: + return Math_Rand_ZeroFloat(55.0f) + 200.0f; + case 2: + return Math_Rand_ZeroFloat(255.0f); + default: + return 0.0f; + } +} + +void EnElf_Init(Actor* thisx, GlobalContext* globalCtx) { + EnElf* this = THIS; + s32 pad; + Player* player = PLAYER; + s32 colorConfig; + s32 i; + + Actor_ProcessInitChain(thisx, sInitChain); + SkelAnime_Init(globalCtx, &this->skelAnime, &D_04016A48, &D_04014BA4, this->limbDrawTable, + this->transitionDrawTable, 15); + ActorShape_Init(&thisx->shape, 0.0f, NULL, 15.0f); + thisx->shape.unk_14 = 0xFF; + + Lights_PointGlowSetInfo(&this->lightInfoGlow, thisx->posRot.pos.x, thisx->posRot.pos.y, thisx->posRot.pos.z, 255, + 255, 255, 0); + this->lightNodeGlow = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfoGlow); + + Lights_PointNoGlowSetInfo(&this->lightInfoNoGlow, thisx->posRot.pos.x, thisx->posRot.pos.y, thisx->posRot.pos.z, + 255, 255, 255, 0); + this->lightNodeNoGlow = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfoNoGlow); + + this->fairyFlags = 0; + this->disappearTimer = 600; + this->unk_2A4 = 0.0f; + colorConfig = 0; + + switch (thisx->params) { + case FAIRY_NAVI: + thisx->room = -1; + EnElf_SetupAction(this, func_80A03CF8); + func_80A01C38(this, 0); + this->fairyFlags |= 4; + thisx->update = func_80A053F0; + this->elfMsg = NULL; + this->unk_2C7 = 0x14; + + if ((gSaveContext.naviTimer >= 25800) || (gSaveContext.naviTimer < 3000)) { + gSaveContext.naviTimer = 0; + } + break; + case FAIRY_REVIVE_BOTTLE: + colorConfig = -1; + EnElf_SetupAction(this, func_80A03610); + this->unk_2B8 = Math_Vec3f_DistXZ(&thisx->posRot.pos, &player->actor.posRot.pos); + this->unk_2AC = player->actor.shape.rot.y; + this->unk_2B0 = -0x1000; + this->unk_28C.y = thisx->posRot.pos.y - player->actor.posRot.pos.y; + this->unk_2AA = 0; + this->unk_2B4 = 0.0f; + break; + case FAIRY_REVIVE_DEATH: + colorConfig = -1; + EnElf_SetupAction(this, func_80A03990); + this->unk_2B8 = 0.0f; + this->unk_2AC = player->actor.shape.rot.y; + this->unk_2B0 = 0; + this->unk_28C.y = thisx->posRot.pos.y - player->actor.posRot.pos.y; + this->unk_2AA = 0; + this->unk_2B4 = 7.0f; + break; + case FAIRY_HEAL_BIG: + this->fairyFlags |= FAIRY_FLAG_BIG; + thisx->shape.shadowDrawFunc = ActorShadow_DrawFunc_WhiteCircle; + case FAIRY_HEAL_TIMED: + this->fairyFlags |= FAIRY_FLAG_TIMED; + case FAIRY_HEAL: + colorConfig = -1; + EnElf_SetupAction(this, func_80A0329C); + this->unk_2B4 = Math_Rand_ZeroFloat(10.0f) + 10.0f; + this->unk_2AA = 0; + this->unk_2AE = (s16)(Math_Rand_ZeroFloat(1048.0f)) + 0x200; + this->unk_28C = thisx->posRot.pos; + this->unk_2BC = Math_Rand_CenteredFloat(32767.0f); + this->func_2C8 = func_80A0214C; + func_80A0232C(this, globalCtx); + this->unk_2C0 = 0; + this->disappearTimer = 240; + break; + case FAIRY_KOKIRI: + colorConfig = Math_Rand_ZeroFloat(11.99f) + 1.0f; + EnElf_SetupAction(this, func_80A0353C); + func_80A01C38(this, 0); + break; + case FAIRY_SPAWNER: + EnElf_SetupAction(this, func_80A03604); + func_80A01C38(this, 8); + + for (i = 0; i < 8; i++) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, thisx->posRot.pos.x, + thisx->posRot.pos.y - 30.0f, thisx->posRot.pos.z, 0, 0, 0, FAIRY_HEAL); + } + break; + default: + __assert("0", "../z_en_elf.c", 1103); + break; + } + + this->unk_2A0 = 3.0f; + this->innerColor = sInnerColors[0]; + + if (colorConfig > 0) { + this->outerColor.r = EnElf_GetColorValue(sColorFlags[colorConfig].r); + this->outerColor.g = EnElf_GetColorValue(sColorFlags[colorConfig].g); + this->outerColor.b = EnElf_GetColorValue(sColorFlags[colorConfig].b); + this->outerColor.a = 0.0f; + } else { + this->innerColor = sInnerColors[-colorConfig]; + this->outerColor = sOuterColors[-colorConfig]; + } +} + +void func_80A0299C(EnElf* this, s32 arg1) { +} + +void func_80A029A8(EnElf* this, s16 increment) { + if (this->disappearTimer < 600) { + this->disappearTimer += increment; + } +} + +void EnElf_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnElf* this = THIS; + + LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNodeGlow); + LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNodeNoGlow); +} + +void func_80A02A20(EnElf* this, GlobalContext* globalCtx) { + this->unk_28C.x = Math_Sins(this->unk_2AC) * this->unk_2B8; + this->unk_28C.y = Math_Sins(this->unk_2AA) * this->unk_2B4; + this->unk_28C.z = Math_Coss(this->unk_2AC) * this->unk_2B8; + this->unk_2AC += this->unk_2B0; + this->unk_2AA += this->unk_2AE; +} + +void func_80A02AA4(EnElf* this, GlobalContext* globalCtx) { + f32 xzScale; + + xzScale = (Math_Coss(this->unk_2AA) * this->unk_2B4) + this->unk_2B8; + + this->unk_28C.x = Math_Sins(this->unk_2AC) * xzScale; + this->unk_28C.y = 0.0f; + this->unk_28C.z = Math_Coss(this->unk_2AC) * xzScale; + + this->unk_2AC += this->unk_2B0; + this->unk_2AA += this->unk_2AE; +} + +void func_80A02B38(EnElf* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + this->unk_2AA = (this->unk_2AC * 2) & 0xFFFF; + this->unk_28C.x = Math_Sins(this->unk_2AC) * this->unk_2B8; + this->unk_28C.y = Math_Sins(this->unk_2AA) * this->unk_2B4; + this->unk_28C.z = -Math_Sins(player->actor.shape.rot.y) * this->unk_28C.x; + this->unk_28C.x = Math_Coss(player->actor.shape.rot.y) * this->unk_28C.x; + this->unk_2AC += this->unk_2B0; +} + +void func_80A02BD8(EnElf* this, Vec3f* targetPos, f32 arg2) { + f32 yVelTarget; + f32 yVelDirection; + + yVelTarget = ((targetPos->y + this->unk_28C.y) - this->actor.posRot.pos.y) * arg2; + yVelDirection = (yVelTarget >= 0.0f) ? 1.0f : -1.0f; + yVelTarget = fabsf(yVelTarget); + yVelTarget = CLAMP(yVelTarget, 0.0f, 20.0f) * yVelDirection; + Math_ApproxF(&this->actor.velocity.y, yVelTarget, 32.0f); +} + +void func_80A02C98(EnElf* this, Vec3f* targetPos, f32 arg2) { + f32 xVelTarget; + f32 zVelTarget; + f32 xVelDirection; + f32 zVelDirection; + + xVelTarget = ((targetPos->x + this->unk_28C.x) - this->actor.posRot.pos.x) * arg2; + zVelTarget = ((targetPos->z + this->unk_28C.z) - this->actor.posRot.pos.z) * arg2; + + xVelDirection = (xVelTarget >= 0.0f) ? 1.0f : -1.0f; + zVelDirection = (zVelTarget >= 0.0f) ? 1.0f : -1.0f; + + xVelTarget = fabsf(xVelTarget); + zVelTarget = fabsf(zVelTarget); + + xVelTarget = CLAMP(xVelTarget, 0.0f, 20.0f) * xVelDirection; + zVelTarget = CLAMP(zVelTarget, 0.0f, 20.0f) * zVelDirection; + + func_80A02BD8(this, targetPos, arg2); + Math_ApproxF(&this->actor.velocity.x, xVelTarget, 1.5f); + Math_ApproxF(&this->actor.velocity.z, zVelTarget, 1.5f); + func_8002D7EC(&this->actor); +} + +void func_80A02E30(EnElf* this, Vec3f* targetPos) { + func_80A02BD8(this, targetPos, 0.2f); + this->actor.velocity.x = (targetPos->x + this->unk_28C.x) - this->actor.posRot.pos.x; + this->actor.velocity.z = (targetPos->z + this->unk_28C.z) - this->actor.posRot.pos.z; + func_8002D7EC(&this->actor); + this->actor.posRot.pos.x = targetPos->x + this->unk_28C.x; + this->actor.posRot.pos.z = targetPos->z + this->unk_28C.z; +} + +void func_80A02EC0(EnElf* this, Vec3f* targetPos) { + func_80A02BD8(this, targetPos, 0.2f); + this->actor.velocity.x = this->actor.velocity.z = 0.0f; + func_8002D7EC(&this->actor); + this->actor.posRot.pos.x = targetPos->x + this->unk_28C.x; + this->actor.posRot.pos.z = targetPos->z + this->unk_28C.z; +} + +void func_80A02F2C(EnElf* this, Vec3f* targetPos) { + f32 yVelTarget; + f32 yVelDirection; + + yVelTarget = (((Math_Sins(this->unk_2AA) * this->unk_2B4) + targetPos->y) - this->actor.posRot.pos.y) * 0.2f; + yVelDirection = (yVelTarget >= 0.0f) ? 1.0f : -1.0f; + this->unk_2AA += this->unk_2AE; + yVelTarget = fabsf(yVelTarget); + yVelTarget = CLAMP(yVelTarget, 0.0f, 20.0f) * yVelDirection; + Math_ApproxF(&this->actor.velocity.y, yVelTarget, 1.5f); +} + +void func_80A03018(EnElf* this, GlobalContext* globalCtx) { + s32 pad[2]; + Player* player = PLAYER; + s16 targetYaw; + Vec3f* unk_28C = &this->unk_28C; + + Math_SmoothScaleMaxMinF(&this->actor.speedXZ, this->unk_2B8, 0.2f, 0.5f, 0.01f); + + switch (this->unk_2A8) { + case 0: + targetYaw = atan2s(-(this->actor.posRot.pos.z - unk_28C->z), -(this->actor.posRot.pos.x - unk_28C->x)); + break; + + case 3: + targetYaw = atan2s(-(this->actor.posRot.pos.z - player->actor.posRot.pos.z), + -(this->actor.posRot.pos.x - player->actor.posRot.pos.x)); + break; + + case 2: + targetYaw = atan2s(this->actor.posRot.pos.z - player->actor.posRot.pos.z, + this->actor.posRot.pos.x - player->actor.posRot.pos.x); + break; + + default: + targetYaw = this->unk_2B0; + break; + } + + Math_SmoothScaleMaxMinS(&this->unk_2BC, targetYaw, 10, this->unk_2AC, 0x20); + this->actor.posRot.rot.y = this->unk_2BC; + Actor_MoveForward(&this->actor); +} + +#ifdef NON_MATCHING +// slight ordering and regalloc +void func_80A03148(EnElf* this, Vec3f* arg1, f32 arg2, f32 arg3, f32 arg4) { + f32 xVelTarget; + f32 zVelTarget; + f32 xzVelocity; + f32 clampedXZ; + + xVelTarget = ((arg1->x + this->unk_28C.x) - this->actor.posRot.pos.x) * arg4; + zVelTarget = ((arg1->z + this->unk_28C.z) - this->actor.posRot.pos.z) * arg4; + arg3 += 30.0f; + + func_80A02BD8(this, arg1, arg4 + 0.3f); + + xzVelocity = sqrtf(SQ(xVelTarget) + SQ(zVelTarget)); + clampedXZ = CLAMP(xzVelocity, arg2, arg3); + this->actor.speedXZ = clampedXZ; + + if ((xzVelocity != clampedXZ) && (xzVelocity != 0.0f)) { + zVelTarget *= (clampedXZ / xzVelocity); + xVelTarget *= (clampedXZ / xzVelocity); + } + + Math_ApproxF(&this->actor.velocity.x, xVelTarget, 5.0f); + Math_ApproxF(&this->actor.velocity.z, zVelTarget, 5.0f); + func_8002D7EC(this); +} +#else +void func_80A03148(EnElf* this, Vec3f* arg1, f32 arg2, f32 arg3, f32 arg4); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03148.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s") +void func_80A0329C(EnElf* this, GlobalContext* globalCtx) { + Player* refActor = PLAYER; + s32 pad; + Player* player = PLAYER; + f32 heightDiff; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0353C.s") + SkelAnime_FrameUpdateMatrix(&this->skelAnime); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03604.s") + if (Math_Rand_ZeroOne() < 0.05f) { + this->unk_2B4 = Math_Rand_ZeroFloat(10.0f) + 10.0f; + this->unk_2AE = (s16)(Math_Rand_ZeroFloat(1024.0f)) + 0x200; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03610.s") + func_80A0232C(this, globalCtx); + this->unk_28C.y = player->bodyPartsPos[0].y; + func_80A02F2C(this, &this->unk_28C); + func_80A03018(this, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03814.s") + if ((this->unk_2A8 == 2) || (this->unk_2A8 == 3)) { + EnElf_SpawnSparkles(this, globalCtx, 16); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03990.s") + if (Actor_HasParent(&this->actor, globalCtx)) { + Actor_Kill(&this->actor); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03AB0.s") + if (!Player_InCsMode(globalCtx)) { + heightDiff = this->actor.posRot.pos.y - refActor->actor.posRot.pos.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03B28.s") + if ((heightDiff > 0.0f) && (heightDiff < 60.0f)) { + if (!func_80A01F90(&this->actor.posRot.pos, &refActor->actor.posRot.pos, 10.0f)) { + Health_ChangeBy(globalCtx, 128); + if (this->fairyFlags & FAIRY_FLAG_BIG) { + Magic_Fill(globalCtx); + } + this->unk_2B8 = 50.0f; + this->unk_2AC = refActor->actor.shape.rot.y; + this->unk_2B0 = -0x1000; + this->unk_28C.y = 30.0f; + this->unk_2B4 = 0.0f; + this->unk_2AA = 0; + EnElf_SetupAction(this, func_80A03610); + return; + } + } + if (this->fairyFlags & FAIRY_FLAG_TIMED) { + if (this->disappearTimer > 0) { + this->disappearTimer--; + } else { + this->disappearTimer--; + + if (this->disappearTimer > -10) { + Actor_SetScale(&this->actor, ((this->disappearTimer + 10) * 0.008f) * 0.1f); + } else { + Actor_Kill(&this->actor); + return; + } + } + } + + if (!(this->fairyFlags & FAIRY_FLAG_BIG)) { + func_8002F434(&this->actor, globalCtx, GI_MAX, 80.0f, 60.0f); + } + } +} + +void func_80A0353C(EnElf* this, GlobalContext* globalCtx) { + Vec3f parentPos; + Actor* parent; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + func_80A02A20(this, globalCtx); + parent = this->actor.parent; + + if ((parent != NULL) && (parent->update != NULL)) { + parentPos = this->actor.parent->posRot.pos; + parentPos.y += ((1500.0f * this->actor.scale.y) + 40.0f); + func_80A02C98(this, &parentPos, 0.2f); + } else { + Actor_Kill(&this->actor); + } + + this->unk_2BC = atan2s(this->actor.velocity.z, this->actor.velocity.x); +} + +void func_80A03604(EnElf* this, GlobalContext* globalCtx) { +} + +void func_80A03610(EnElf* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + Math_SmoothScaleMaxMinF(&this->unk_2B8, 30.0f, 0.1f, 4.0f, 1.0f); + + this->unk_28C.x = Math_Coss(this->unk_2AC) * this->unk_2B8; + this->unk_28C.y = this->unk_28C.y + this->unk_2B4; + + switch (this->unk_2AA) { + case 0: + if (this->unk_2B4 < 2.0f) { + this->unk_2B4 += 0.1f; + } else { + this->unk_2AA++; + } + break; + case 1: + if (this->unk_2B4 > -1.0f) { + this->unk_2B4 -= 0.2f; + } + } + + this->unk_28C.z = Math_Sins(this->unk_2AC) * -this->unk_2B8; + this->unk_2AC += this->unk_2B0; + func_80A02C98(this, &player->actor.posRot.pos, 0.2f); + + if (this->unk_2B4 < 0.0f) { + if ((this->unk_28C.y < 20.0f) && (this->unk_28C.y > 0.0f)) { + Actor_SetScale(&this->actor, (this->unk_28C.y * 0.008f) * 0.05f); + } + } + + if (this->unk_28C.y < -10.0f) { + Actor_Kill(&this->actor); + return; + } + + this->unk_2BC = atan2s(this->actor.velocity.z, this->actor.velocity.x); + EnElf_SpawnSparkles(this, globalCtx, 32); + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); +} + +void func_80A03814(EnElf* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + + if (this->unk_28C.y > 200.0f) { + Actor_Kill(&this->actor); + return; + } + + if (this->unk_2AE >= 0x7E) { + this->unk_2B8 += 0.1f; + this->unk_2B4 += 0.5f; + this->unk_28C.y += this->unk_2B4; + } else { + this->unk_2AE++; + + if (this->unk_2B8 < 30.0f) { + this->unk_2B8 += 0.5f; + } + + if (this->unk_28C.y > 0.0f) { + this->unk_28C.y -= 0.7f; + } + } + + this->unk_28C.x = Math_Coss(this->unk_2AC) * this->unk_2B8; + this->unk_28C.z = Math_Sins(this->unk_2AC) * -this->unk_2B8; + this->unk_2AC += this->unk_2B0; + func_80A02E30(this, &player->bodyPartsPos[0]); + this->unk_2BC = atan2s(this->actor.velocity.z, this->actor.velocity.x); + EnElf_SpawnSparkles(this, globalCtx, 32); + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); +} + +void func_80A03990(EnElf* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + + this->unk_28C.z = 0.0f; + this->unk_28C.x = 0.0f; + this->unk_28C.y += this->unk_2B4; + this->unk_2B4 -= 0.35f; + + if (this->unk_2B4 <= 0.0f) { + EnElf_SetupAction(this, func_80A03814); + this->unk_2B0 = 0x800; + this->unk_2AE = 0; + this->unk_2B4 = 0.0f; + this->unk_2B8 = 1.0f; + } + + func_80A02E30(this, &player->bodyPartsPos[0]); + Actor_SetScale(&this->actor, (1.0f - (SQ(this->unk_2B4) * 0.012345679f)) * 0.008f); + this->unk_2BC = atan2s(this->actor.velocity.z, this->actor.velocity.x); + EnElf_SpawnSparkles(this, globalCtx, 32); + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); +} + +void func_80A03AB0(EnElf* this, GlobalContext* globalCtx) { + if (this->fairyFlags & 4) { + func_80A04414(this, globalCtx); + } + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + + if (this->func_2C8 == NULL) { + __assert("0", "../z_en_elf.c", 1725); + } + + this->func_2C8(this, globalCtx); +} + +void EnElf_UpdateLights(EnElf* this, GlobalContext* globalCtx) { + s16 glowLightRadius; + Player* player; + + glowLightRadius = 100; + + if (this->unk_2A8 == 8) { + glowLightRadius = 0; + } + + if (this->fairyFlags & 0x20) { + player = PLAYER; + Lights_PointNoGlowSetInfo(&this->lightInfoNoGlow, player->actor.posRot.pos.x, + (s16)(player->actor.posRot.pos.y) + 60.0f, player->actor.posRot.pos.z, 255, 255, 255, + 200); + } else { + Lights_PointNoGlowSetInfo(&this->lightInfoNoGlow, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, 255, 255, 255, -1); + } + + Lights_PointGlowSetInfo(&this->lightInfoGlow, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, 255, 255, 255, glowLightRadius); + + this->unk_2BC = atan2s(this->actor.velocity.z, this->actor.velocity.x); + + Actor_SetScale(&this->actor, this->actor.scale.x); +} + +#ifdef NON_MATCHING +// float regalloc +void func_80A03CF8(EnElf* this, GlobalContext* globalCtx) { + Vec3f nextPos; + Vec3f prevPos; + Player* player = PLAYER; + Actor* arrowPointedActor; + f32 xScale; + f32 distFromLinksHead; + + func_80A0461C(this, globalCtx); + func_80A03AB0(this, globalCtx); + + xScale = 0.0f; + + if ((globalCtx->csCtx.state != 0) && (globalCtx->csCtx.npcActions[8] != NULL)) { + EnElf_GetCutsceneNextPos(&nextPos, globalCtx, 8); + + if (globalCtx->csCtx.npcActions[8]->action == 5) { + if (1) {} + EnElf_SpawnSparkles(this, globalCtx, 16); + } + + prevPos = this->actor.posRot.pos; + + if (this->unk_2A8 == 0xA) { + func_80A02EC0(this, &nextPos); + } else { + func_80A02C98(this, &nextPos, 0.2f); + } + + if ((globalCtx->sceneNum == SCENE_LINK_HOME) && (gSaveContext.sceneSetupIndex == 4)) { + // play dash sound as Navi enters Links house in the intro + if (1) {} + if (globalCtx->csCtx.frames == 55) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FAIRY_DASH); + } + + // play dash sound in intervals as Navi is waking up Link in the intro + if (this->unk_2A8 == 6) { + if (this->fairyFlags & 0x40) { + if (prevPos.y < this->actor.posRot.pos.y) { + this->fairyFlags &= ~0x40; + } + } else { + if (this->actor.posRot.pos.y < prevPos.y) { + this->fairyFlags |= 0x40; + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FAIRY_DASH); + } + } + } + } + } else { + distFromLinksHead = Math_Vec3f_DistXYZ(&player->bodyPartsPos[8], &this->actor.posRot.pos); + + switch (this->unk_2A8) { + case 7: + func_80A02C98(this, &player->bodyPartsPos[8], 1.0f - this->unk_2AE * 0.033333335f); + xScale = + 1.0f - ((Math_Vec3f_DistXYZ(&player->bodyPartsPos[8], &this->actor.posRot.pos) - 5.0f) * 0.05f); + + if (distFromLinksHead < 7.0f) { + this->unk_2C0 = 0; + xScale = 0.0f; + } else if (distFromLinksHead < 25.0f) { + xScale = (1.0f - SQ(xScale)) * 0.008f; + } else { + xScale = 0.008f; + } + EnElf_SpawnSparkles(this, globalCtx, 16); + break; + case 8: + func_80A02C98(this, &player->bodyPartsPos[8], 0.2f); + this->actor.posRot.pos = player->bodyPartsPos[8]; + func_80A029A8(this, 1); + break; + case 11: + nextPos = player->bodyPartsPos[8]; + nextPos.y += this->actor.scale.y * 1500.0f; + func_80A02E30(this, &nextPos); + EnElf_SpawnSparkles(this, globalCtx, 16); + + if (this->unk_2B8 <= 19.0f) { + this->unk_2B8 += 1.0f; + } + + if (this->unk_2B8 >= 21.0f) { + this->unk_2B8 -= 1.0f; + } + + if (this->unk_2C0 < 0x20) { + this->unk_2B0 = (this->unk_2C0 * 0xF0) + 0x200; + func_80A0299C(this, 1); + } + break; + case 12: + nextPos = ACTIVE_CAM->eye; + nextPos.y += (-2000.0f * this->actor.scale.y); + func_80A03148(this, &nextPos, 0.0f, 20.0f, 0.2f); + break; + default: + func_80A029A8(this, 1); + nextPos = globalCtx->actorCtx.targetCtx.naviRefPos; + nextPos.y += (1500.0f * this->actor.scale.y); + arrowPointedActor = globalCtx->actorCtx.targetCtx.arrowPointedActor; + + if (arrowPointedActor != NULL) { + func_80A03148(this, &nextPos, 0.0f, 20.0f, 0.2f); + + if (this->actor.speedXZ >= 5.0f) { + EnElf_SpawnSparkles(this, globalCtx, 16); + } + } else { + if ((this->timer % 32) == 0) { + this->unk_2A0 = Math_Rand_ZeroFloat(7.0f) + 3.0f; + } + + if (this->fairyFlags & 2) { + if (distFromLinksHead < 30.0f) { + this->fairyFlags ^= 2; + } + + func_80A03148(this, &nextPos, 0.0f, 20.0f, 0.2f); + EnElf_SpawnSparkles(this, globalCtx, 16); + } else { + if (distFromLinksHead > 100.0f) { + this->fairyFlags |= 2; + + if (this->unk_2C7 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FAIRY_DASH); + } + + this->unk_2C0 = 0x64; + } + func_80A03148(this, &nextPos, 0.0f, this->unk_2A0, 0.2f); + } + } + break; + } + } + + if (this->unk_2A8 == 7) { + this->actor.scale.x = xScale; + } else if (this->unk_2A8 == 8) { + this->actor.scale.x = 0.0f; + } else { + Math_SmoothScaleMaxMinF(&this->actor.scale.x, 0.008f, 0.3f, 0.00080000004f, 0.000080000005f); + } + + EnElf_UpdateLights(this, globalCtx); +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A03CF8.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0438C.s") +void EnElf_ChangeColor(Color_RGBAf* dest, Color_RGBAf* newColor, Color_RGBAf* curColor, f32 rate) { + Color_RGBAf rgbaDiff; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04414.s") + rgbaDiff.r = (newColor->r - curColor->r); + rgbaDiff.g = (newColor->g - curColor->g); + rgbaDiff.b = (newColor->b - curColor->b); + rgbaDiff.a = (newColor->a - curColor->a); + dest->r += (rgbaDiff.r * rate); + dest->g += (rgbaDiff.g * rate); + dest->b += (rgbaDiff.b * rate); + dest->a += (rgbaDiff.a * rate); +} + +void func_80A04414(EnElf* this, GlobalContext* globalCtx) { + Actor* arrowPointedActor = globalCtx->actorCtx.targetCtx.arrowPointedActor; + Player* player = PLAYER; + f32 transitionRate; + u16 targetSound; + + if (globalCtx->actorCtx.targetCtx.unk_40 != 0.0f) { + this->unk_2C6 = 0; + this->unk_29C = 1.0f; + + if (this->unk_2C7 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FAIRY_DASH); + } + + } else { + if (this->unk_2C6 == 0) { + if ((arrowPointedActor == NULL) || + (Math_Vec3f_DistXYZ(&this->actor.posRot.pos, &globalCtx->actorCtx.targetCtx.naviRefPos) < 50.0f)) { + this->unk_2C6 = 1; + } + } else if (this->unk_29C != 0.0f) { + if (Math_ApproxF(&this->unk_29C, 0.0f, 0.25f) != 0) { + this->innerColor = globalCtx->actorCtx.targetCtx.naviInner; + this->outerColor = globalCtx->actorCtx.targetCtx.naviOuter; + } else { + transitionRate = 0.25f / this->unk_29C; + EnElf_ChangeColor(&this->innerColor, &globalCtx->actorCtx.targetCtx.naviInner, &this->innerColor, + transitionRate); + EnElf_ChangeColor(&this->outerColor, &globalCtx->actorCtx.targetCtx.naviOuter, &this->outerColor, + transitionRate); + } + } + } + + if (this->fairyFlags & 1) { + if ((arrowPointedActor == NULL) || (player->unk_664 == NULL)) { + this->fairyFlags ^= 1; + } + } else { + if ((arrowPointedActor != NULL) && (player->unk_664 != NULL)) { + if (arrowPointedActor->type == ACTORTYPE_NPC) { + targetSound = NA_SE_VO_NAVY_HELLO; + } else { + targetSound = (arrowPointedActor->type == ACTORTYPE_ENEMY) ? NA_SE_VO_NAVY_ENEMY : NA_SE_VO_NAVY_HEAR; + } + + if (this->unk_2C7 == 0) { + Audio_PlayActorSound2(&this->actor, targetSound); + } + + this->fairyFlags |= 1; + } + } +} + +#ifdef NON_MATCHING +// useless branch near case 11/default in the switch for this->unk_2A8 +void func_80A0461C(EnElf* this, GlobalContext* globalCtx) { + s32 temp; + Actor* arrowPointedActor; + Player* player = PLAYER; + + if (globalCtx->csCtx.state != 0) { + if (globalCtx->csCtx.npcActions[8] != NULL) { + switch (globalCtx->csCtx.npcActions[8]->action) { + case 4: + temp = 9; + break; + case 3: + temp = 6; + break; + case 1: + temp = 10; + break; + default: + temp = 0; + break; + } + } else { + temp = 0; + this->unk_2C0 = 100; + } + + } else { + arrowPointedActor = globalCtx->actorCtx.targetCtx.arrowPointedActor; + + if ((player->stateFlags1 & 0x400) || ((YREG(15) & 0x10) && func_800BC56C(globalCtx, 2))) { + temp = 12; + this->unk_2C0 = 100; + } else { + if ((arrowPointedActor == NULL) || (temp = 1, (arrowPointedActor->type == ACTORTYPE_NPC))) { + if (arrowPointedActor != NULL) { + this->unk_2C0 = 100; + player->stateFlags2 |= 0x100000; + temp = 0; + } else { + switch (this->unk_2A8) { + case 0: + if (this->unk_2C0 != 0) { + this->unk_2C0--; + temp = 0; + } else { + if (this->unk_2C7 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_NAVY_VANISH); + } + temp = 7; + } + break; + case 7: + if (this->unk_2C0 != 0) { + if (this->unk_2AE > 0) { + this->unk_2AE--; + temp = 7; + } else { + player->stateFlags2 |= 0x100000; + temp = 0; + } + } else { + temp = 8; + func_80A029A8(this, 10); + } + break; + case 8: + temp = 8; + break; + case 11: + temp = this->unk_2A8; + if (this->unk_2C0 > 0) { + this->unk_2C0--; + } else { + temp = 0; + } + break; + default: + temp = 0; + break; + } + } + } + } + + switch (temp) { + case 0: + if (!(player->stateFlags2 & 0x100000)) { + temp = 7; + if (this->unk_2C7 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_NAVY_VANISH); + } + } + break; + case 8: + if (player->stateFlags2 & 0x100000) { + func_80A0299C(this, 0x32); + this->unk_2C0 = 42; + temp = 11; + if (this->unk_2C7 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FAIRY_DASH); + } + } + break; + case 7: + player->stateFlags2 &= ~0x100000; + break; + default: + player->stateFlags2 |= 0x100000; + break; + } + } + + if (temp != this->unk_2A8) { + func_80A01C38(this, temp); + + if (temp == 11) { + this->unk_2B8 = Math_Vec3f_DistXZ(&player->bodyPartsPos[8], &this->actor.posRot.pos); + this->unk_2AC = Math_Vec3f_Yaw(&this->actor.posRot.pos, &player->bodyPartsPos[8]); + } + } +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0461C.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s") +void EnElf_SpawnSparkles(EnElf* this, GlobalContext* globalCtx, s32 sparkleLife) { + static Vec3f sparkleVelocity = { 0.0f, -0.05f, 0.0f }; + static Vec3f sparkleAccel = { 0.0f, -0.025f, 0.0f }; + s32 pad; + Vec3f sparklePos; + Color_RGBA8 primColor; + Color_RGBA8 envColor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04D90.s") + sparklePos.x = Math_Rand_CenteredFloat(6.0f) + this->actor.posRot.pos.x; + sparklePos.y = (Math_Rand_ZeroOne() * 6.0f) + this->actor.posRot.pos.y; + sparklePos.z = Math_Rand_CenteredFloat(6.0f) + this->actor.posRot.pos.z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04DE4.s") + primColor.r = this->innerColor.r; + primColor.g = this->innerColor.g; + primColor.b = this->innerColor.b; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A04F94.s") + envColor.r = this->outerColor.r; + envColor.g = this->outerColor.g; + envColor.b = this->outerColor.b; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s") + EffectSsKiraKira_SpawnDispersed(globalCtx, &sparklePos, &sparkleVelocity, &sparkleAccel, &primColor, &envColor, + 1000, sparkleLife); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05114.s") +void func_80A04D90(EnElf* this, GlobalContext* globalCtx) { + s32 pad; + s32 bgId; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s") + this->actor.groundY = func_8003CA0C(globalCtx, &globalCtx->colCtx, &this->actor.floorPoly, &bgId, &this->actor, + &this->actor.posRot.pos); + this->actor.shape.unk_14 = 0x32; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s") +// move to talk to player +void func_80A04DE4(EnElf* this, GlobalContext* globalCtx) { + Vec3f posRot2Copy; + Player* player = PLAYER; + Vec3f naviRefPos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A052F4.s") + if (this->fairyFlags & 0x10) { + naviRefPos = globalCtx->actorCtx.targetCtx.naviRefPos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s") + if ((player->unk_664 == NULL) || (&player->actor == player->unk_664) || (&this->actor == player->unk_664)) { + naviRefPos.x = player->bodyPartsPos[7].x + (Math_Sins(player->actor.shape.rot.y) * 20.0f); + naviRefPos.y = player->bodyPartsPos[7].y + 5.0f; + naviRefPos.z = player->bodyPartsPos[7].z + (Math_Coss(player->actor.shape.rot.y) * 20.0f); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Update.s") + this->actor.posRot2.pos = naviRefPos; + this->fairyFlags &= ~0x10; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05734.s") + func_80A03AB0(this, globalCtx); + posRot2Copy = this->actor.posRot2.pos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s") + func_80A03148(this, &posRot2Copy, 0, 20.0f, 0.2f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05F10.s") + if (this->actor.speedXZ >= 5.0f) { + EnElf_SpawnSparkles(this, globalCtx, 16); + } + + Math_SmoothScaleMaxMinF(&this->actor.scale.x, 0.008f, 0.3f, 0.00080000004f, 0.000080000005f); + EnElf_UpdateLights(this, globalCtx); +} + +// move after talking to player +void func_80A04F94(EnElf* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->unk_2BC, 5, 0x1000, 0x400); + this->timer++; + Math_ApproxF(&this->unk_2A4, 1.0f, 0.05f); + func_800773A8(globalCtx, SQ(this->unk_2A4), player->actor.projectedPos.z + 780.0f, 0.2f, 0.5f); +} + +// ask to talk to saria again +void func_80A05040(Actor* thisx, GlobalContext* globalCtx) { + EnElf* this = THIS; + + func_80A04DE4(this, globalCtx); + + if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && func_80106BC8(globalCtx)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: // yes + func_8010B720(globalCtx, ElfMessage_GetSariaText(globalCtx)); + this->actor.update = func_80A05114; + break; + case 1: // no + func_80106CCC(globalCtx); + this->actor.update = func_80A053F0; + func_80A01C38(this, 0); + this->fairyFlags &= ~0x20; + break; + } + } + + func_80A04F94(this, globalCtx); +} + +void func_80A05114(Actor* thisx, GlobalContext* globalCtx) { + EnElf* this = THIS; + + func_80A04DE4(this, globalCtx); + + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && func_80106BC8(globalCtx)) { + func_8010B720(globalCtx, 0xE3); + this->actor.update = func_80A05040; + } + + func_80A04F94(this, globalCtx); +} + +void func_80A05188(Actor* thisx, GlobalContext* globalCtx) { + EnElf* this = THIS; + + func_80A04DE4(this, globalCtx); + + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && func_80106BC8(globalCtx)) { + func_8010B720(globalCtx, ElfMessage_GetSariaText(globalCtx)); + this->actor.update = func_80A05114; + } + + func_80A04F94(this, globalCtx); +} + +// ask to talk to navi +void func_80A05208(Actor* thisx, GlobalContext* globalCtx) { + s32 naviCUpText; + EnElf* this = THIS; + + func_80A04DE4(this, globalCtx); + + if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && func_80106BC8(globalCtx)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: // yes + naviCUpText = ElfMessage_GetCUpText(globalCtx); + + if (naviCUpText != 0) { + func_8010B720(globalCtx, naviCUpText); + } else { + func_8010B720(globalCtx, 0x15F); + } + + this->actor.update = func_80A052F4; + break; + case 1: // no + func_80106CCC(globalCtx); + this->actor.update = func_80A053F0; + func_80A01C38(this, 0); + this->fairyFlags &= ~0x20; + break; + } + } + + func_80A04F94(this, globalCtx); +} + +// ask to talk to saria +void func_80A052F4(Actor* thisx, GlobalContext* globalCtx) { + EnElf* this = THIS; + + func_80A04DE4(this, globalCtx); + + if (func_8010BDBC(&globalCtx->msgCtx) == 4) { + if (func_80106BC8(globalCtx)) { + globalCtx->msgCtx.unk_E3F2 = 0xFF; + + switch (globalCtx->msgCtx.choiceIndex) { + case 0: // yes + this->actor.update = func_80A05188; + func_8010B720(globalCtx, 0xE2); + break; + case 1: // no + this->actor.update = func_80A05208; + func_8010B720(globalCtx, 0xE1); + break; + } + } + } else if (func_8002F334(thisx, globalCtx)) { + this->actor.update = func_80A053F0; + func_80A01C38(this, 0); + this->fairyFlags &= ~0x20; + } + + func_80A04F94(this, globalCtx); +} + +void func_80A053F0(Actor* thisx, GlobalContext* globalCtx) { + u8 unk2C7; + s32 pad; + Player* player = PLAYER; + EnElf* this = THIS; + + if (player->naviTextId == 0) { + if (player->unk_664 == NULL) { + if (((gSaveContext.naviTimer >= 600) && (gSaveContext.naviTimer <= 3000)) || (nREG(89) != 0)) { + player->naviTextId = ElfMessage_GetCUpText(globalCtx); + + if (player->naviTextId == 0x15F) { + player->naviTextId = 0; + } + } + } + } else if (player->naviTextId < 0) { + // trigger dialog instantly for negative message IDs + thisx->flags |= 0x10000; + } + + if (func_8002F194(thisx, globalCtx)) { + func_800F4524(&D_801333D4, NA_SE_VO_SK_LAUGH, 0x20); + thisx->posRot2.pos = thisx->posRot.pos; + + if (thisx->textId == ElfMessage_GetCUpText(globalCtx)) { + this->fairyFlags |= 0x80; + gSaveContext.naviTimer = 3001; + } + + this->fairyFlags |= 0x10; + this->fairyFlags |= 0x20; + thisx->update = func_80A052F4; + func_80A01C38(this, 3); + + if (this->elfMsg != NULL) { + this->elfMsg->actor.flags |= 0x100; + } + + thisx->flags &= ~0x10000; + } else { + this->actionFunc(this, globalCtx); + thisx->shape.rot.y = this->unk_2BC; + nREG(80) = gSaveContext.sceneFlags[127].chest; + + if (nREG(81) != 0) { + if (gSaveContext.sceneFlags[127].chest) { + LOG_NUM("z_common_data.memory.information.room_inf[127][ 0 ]", gSaveContext.sceneFlags[127].chest, + "../z_en_elf.c", 2595); + } + } + + if (!Gameplay_InCsMode(globalCtx)) { + if (gSaveContext.naviTimer < 25800) { + gSaveContext.naviTimer++; + } else if (!(this->fairyFlags & 0x80)) { + gSaveContext.naviTimer = 0; + } + } + } + + this->elfMsg = NULL; + this->timer++; + + if (this->unk_2A4 > 0.0f) { + Math_ApproxF(&this->unk_2A4, 0.0f, 0.05f); + func_800773A8(globalCtx, SQ(this->unk_2A4) * this->unk_2A4, player->actor.projectedPos.z + 780.0f, 0.2f, 0.5f); + } + + // temp probably fake match + unk2C7 = this->unk_2C7; + if (unk2C7 > 0) { + this->unk_2C7--; + } + + if ((this->unk_2C7 == 0) && (globalCtx->csCtx.state != 0)) { + this->unk_2C7 = 1; + } + + func_80A04D90(this, globalCtx); +} + +void EnElf_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnElf* this = THIS; + + this->actionFunc(this, globalCtx); + this->actor.shape.rot.y = this->unk_2BC; + this->timer++; + + if (this->fairyFlags & FAIRY_FLAG_BIG) { + func_80A04D90(this, globalCtx); + } +} + +s32 EnElf_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + struct Actor* thisx, Gfx** gfx) { + static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + s32 pad; + f32 scale; + Vec3f mtxMult; + EnElf* this = THIS; + + if (limbIndex == 8) { + scale = ((Math_Sins(this->timer * 4096) * 0.1f) + 1.0f) * 0.012f; + + if (this->fairyFlags & FAIRY_FLAG_BIG) { + scale *= 2.0f; + } + + scale *= (this->actor.scale.x * 124.99999f); + Matrix_MultVec3f(&zeroVec, &mtxMult); + Matrix_Translate(mtxMult.x, mtxMult.y, mtxMult.z, MTXMODE_NEW); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + } + + // do not draw wings for big fairies + if (this->fairyFlags & FAIRY_FLAG_BIG) { + if (limbIndex == 4 || limbIndex == 7 || limbIndex == 11 || limbIndex == 14) { + *dList = NULL; + } + } + + return 0; +} + +void EnElf_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + f32 alphaScale; + s32 envAlpha; + EnElf* this = THIS; + s32 pad1; + Gfx* dListHead; + Player* player = PLAYER; + + if ((this->unk_2A8 != 8) && !(this->fairyFlags & 8)) { + if (!(player->stateFlags1 & 0x100000) || (kREG(90) < this->actor.projectedPos.z)) { + dListHead = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Gfx) * 4); + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_elf.c", 2730); + + func_80094B58(globalCtx->state.gfxCtx); + + envAlpha = (this->timer * 50) & 0x1FF; + envAlpha = (envAlpha > 255) ? 511 - envAlpha : envAlpha; + + alphaScale = this->disappearTimer < 0 ? (this->disappearTimer * (7.0f / 6000.0f)) + 1.0f : 1.0f; + + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, dListHead); + gDPPipeSync(dListHead++); + gDPSetPrimColor(dListHead++, 0, 0x01, (u8)this->innerColor.r, (u8)this->innerColor.g, + (u8)this->innerColor.b, (u8)(this->innerColor.a * alphaScale)); + + if (this->fairyFlags & 4) { + gDPSetRenderMode(dListHead++, G_RM_PASS, G_RM_CLD_SURF2); + } else { + gDPSetRenderMode(dListHead++, G_RM_PASS, G_RM_ZB_CLD_SURF2); + } + + gSPEndDisplayList(dListHead++); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, (u8)this->outerColor.r, (u8)this->outerColor.g, (u8)this->outerColor.b, + (u8)(envAlpha * alphaScale)); + oGfxCtx->polyXlu.p = SkelAnime_Draw2(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, + EnElf_OverrideLimbDraw, NULL, &this->actor, oGfxCtx->polyXlu.p); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_elf.c", 2793); + } + } +} + +void EnElf_GetCutsceneNextPos(Vec3f* vec, GlobalContext* globalCtx, s32 action) { + Vec3f startPos; + Vec3f endPos; + CsCmdActorAction* npcAction = globalCtx->csCtx.npcActions[action]; + f32 lerp; + + startPos.x = npcAction->startPos.x; + startPos.y = npcAction->startPos.y; + startPos.z = npcAction->startPos.z; + + endPos.x = npcAction->endPos.x; + endPos.y = npcAction->endPos.y; + endPos.z = npcAction->endPos.z; + + lerp = func_8006F93C(npcAction->endFrame, npcAction->startFrame, globalCtx->csCtx.frames); + + vec->x = ((endPos.x - startPos.x) * lerp) + startPos.x; + vec->y = ((endPos.y - startPos.y) * lerp) + startPos.y; + vec->z = ((endPos.z - startPos.z) * lerp) + startPos.z; +} diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.h b/src/overlays/actors/ovl_En_Elf/z_en_elf.h index bbb73f8b31..3cca53ff25 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h @@ -3,16 +3,58 @@ #include "ultra64.h" #include "global.h" +#include "overlays/actors/ovl_Elf_Msg/z_elf_msg.h" struct EnElf; +typedef void (*EnElfActionFunc)(struct EnElf*, GlobalContext*); +typedef void (*EnElfUnkFunc)(struct EnElf*, GlobalContext*); + typedef struct EnElf { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x14C]; - /* 0x0298 */ Actor* unk_298; - /* 0x029C */ char unk_29C[0x34]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s limbDrawTable[15]; + /* 0x01EA */ Vec3s transitionDrawTable[15]; + /* 0x0244 */ Color_RGBAf innerColor; + /* 0x0254 */ Color_RGBAf outerColor; + /* 0x0264 */ LightInfo lightInfoGlow; + /* 0x0274 */ LightNode* lightNodeGlow; + /* 0x0278 */ LightInfo lightInfoNoGlow; + /* 0x0288 */ LightNode* lightNodeNoGlow; + /* 0x028C */ Vec3f unk_28C; + /* 0x0298 */ ElfMsg* elfMsg; + /* 0x029C */ f32 unk_29C; + /* 0x02A0 */ f32 unk_2A0; + /* 0x02A4 */ f32 unk_2A4; + /* 0x02A8 */ s16 unk_2A8; + /* 0x02AA */ s16 unk_2AA; + /* 0x02AC */ s16 unk_2AC; + /* 0x02AE */ s16 unk_2AE; + /* 0x02B0 */ s16 unk_2B0; + /* 0x02B4 */ f32 unk_2B4; + /* 0x02B8 */ f32 unk_2B8; + /* 0x02BC */ s16 unk_2BC; + /* 0x02BE */ u16 timer; + /* 0x02C0 */ s16 unk_2C0; + /* 0x02C2 */ s16 disappearTimer; + /* 0x02C4 */ u16 fairyFlags; + /* 0x02C6 */ u8 unk_2C6; + /* 0x02C7 */ u8 unk_2C7; + /* 0x02C8 */ EnElfUnkFunc func_2C8; + /* 0x02CC */ EnElfActionFunc actionFunc; } EnElf; // size = 0x02D0 +typedef enum { + /* 0x00 */ FAIRY_NAVI, + /* 0x01 */ FAIRY_REVIVE_BOTTLE, + /* 0x02 */ FAIRY_HEAL_TIMED, + /* 0x03 */ FAIRY_KOKIRI, + /* 0x04 */ FAIRY_SPAWNER, + /* 0x05 */ FAIRY_REVIVE_DEATH, + /* 0x06 */ FAIRY_HEAL, + /* 0x07 */ FAIRY_HEAL_BIG +} FairyType; + extern const ActorInit En_Elf_InitVars; #endif diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index 35aae79be3..0b1cce714c 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -341,7 +341,7 @@ s32 func_80A4CB78(EnGoroiwa* this, GlobalContext* globalCtx) { Vec3f sp5C; f32 temp_f0_2; s32 pad2; - u32 sp50; + s32 sp50; Vec3f sp44; WaterBox* waterBox; f32 ySurface; diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index 8f9ba39f15..267b0525bf 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -5,6 +5,7 @@ */ #include "z_en_gs.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #define FLAGS 0x02000009 @@ -114,11 +115,11 @@ void func_80A4E470(EnGs* this, GlobalContext* globalCtx) { (globalCtx->msgCtx.unk_E3F2 == 8) || (globalCtx->msgCtx.unk_E3F2 == 9) || (globalCtx->msgCtx.unk_E3F2 == 10)) { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, this->actor.posRot.pos.x, - this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, 2); + this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, FAIRY_HEAL_TIMED); Audio_PlayActorSound2(&this->actor, NA_SE_EV_BUTTERFRY_TO_FAIRY); } else if (globalCtx->msgCtx.unk_E3F2 == 11) { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, this->actor.posRot.pos.x, - this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, 7); + this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, FAIRY_HEAL_BIG); Audio_PlayActorSound2(&this->actor, NA_SE_EV_BUTTERFRY_TO_FAIRY); } this->unk_19D = 0; diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 973c46a365..8bd8cf801d 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -774,7 +774,7 @@ void EnInsect_Update(Actor* thisx, GlobalContext* globalCtx) { } if (!(this->unk_314 & 8) && D_80A7DEB4 < 4 && func_80A7BE6C(this, globalCtx) != 0 && - func_8002F434(&this->actor, globalCtx, 0x7E, 60.0f, 30.0f) != 0) { + func_8002F434(&this->actor, globalCtx, GI_MAX, 60.0f, 30.0f) != 0) { D_80A7DEB4++; } } diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index 7c87510274..1d863dcd15 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -1,4 +1,11 @@ +/* + * File: z_en_md.c + * Overlay: ovl_En_Md + * Description: Mido + */ + #include "z_en_md.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #define FLAGS 0x02000019 @@ -602,7 +609,7 @@ void EnMd_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.unk_1F = 6; this->alpha = 255; Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ELF, this->actor.posRot.pos.x, - this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 3); + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, FAIRY_KOKIRI); if (((globalCtx->sceneNum == SCENE_SPOT04) && !(gSaveContext.eventChkInf[0] & 0x10)) || ((globalCtx->sceneNum == SCENE_SPOT04) && (gSaveContext.eventChkInf[0] & 0x10) && diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index ec982af166..01eb272e5c 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -221,9 +221,9 @@ void ObjOshihiki_CheckType(ObjOshihiki* this, GlobalContext* globalCtx) { break; default: // Error : type cannot be determined - osSyncPrintf("Error : タイプが判別できない(%s %d)(arg_data 0x%04x)\n", - "../z_obj_oshihiki.c", 444, this->dyna.actor.params); - break; + osSyncPrintf("Error : タイプが判別できない(%s %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 444, + this->dyna.actor.params); + break; } } @@ -279,11 +279,10 @@ void ObjOshihiki_SetColor(ObjOshihiki* this, GlobalContext* globalCtx) { void ObjOshihiki_Init(Actor* thisx, GlobalContext* globalCtx2) { GlobalContext* globalCtx = globalCtx2; ObjOshihiki* this = THIS; - + ObjOshihiki_CheckType(this, globalCtx); - - if ((((this->dyna.actor.params >> 8) & 0xFF) >= 0) - && (((this->dyna.actor.params >> 8) & 0xFF) <= 0x3F)) { + + if ((((this->dyna.actor.params >> 8) & 0xFF) >= 0) && (((this->dyna.actor.params >> 8) & 0xFF) <= 0x3F)) { if (Flags_GetSwitch(globalCtx, (this->dyna.actor.params >> 8) & 0x3F)) { switch (this->dyna.actor.params & 0xF) { case PUSHBLOCK_SMALL_START_ON: diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index 7dd9c5a98d..274c72de2a 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -5,6 +5,7 @@ */ #include "z_shot_sun.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "vt.h" #define FLAGS 0x00000009 @@ -72,7 +73,7 @@ void ShotSun_Destroy(Actor* thisx, GlobalContext* globalCtx) { void ShotSun_SpawnFairy(ShotSun* this, GlobalContext* globalCtx) { s32 params = this->actor.params & 0xFF; - s32 fairyParams; + s32 fairyType; if (this->timer > 0) { this->timer--; @@ -81,16 +82,16 @@ void ShotSun_SpawnFairy(ShotSun* this, GlobalContext* globalCtx) { switch (params) { case 0x40: - fairyParams = 7; + fairyType = FAIRY_HEAL_BIG; break; case 0x41: - fairyParams = 7; + fairyType = FAIRY_HEAL_BIG; break; } - // UB: fairyParams may be uninitialized + //! @bug fairyType may be uninitialized Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, this->actor.initPosRot.pos.x, - this->actor.initPosRot.pos.y, this->actor.initPosRot.pos.z, 0, 0, 0, fairyParams); + this->actor.initPosRot.pos.y, this->actor.initPosRot.pos.z, 0, 0, 0, fairyType); Actor_Kill(&this->actor); } diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 86c0b9b9e6..8e3551d890 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -12,6 +12,7 @@ #include "overlays/actors/ovl_En_Boom/z_en_boom.h" #include "overlays/actors/ovl_En_Box/z_en_box.h" #include "overlays/actors/ovl_En_Door/z_en_door.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" @@ -4110,7 +4111,7 @@ void func_808395DC(Player* this, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3) { arg3->z = arg1->z + ((arg2->z * cos) - (arg2->x * sin)); } -Actor* func_80839680(GlobalContext* globalCtx, Player* this, Vec3f* arg2, Vec3f* arg3, s32 type) { +Actor* Player_SpawnFairy(GlobalContext* globalCtx, Player* this, Vec3f* arg2, Vec3f* arg3, s32 type) { Vec3f pos; func_808395DC(this, arg2, arg3, &pos); @@ -4891,8 +4892,8 @@ s32 func_8083B644(Player* this, GlobalContext* globalCtx) { sp24 = (sp30 != NULL) && (((sp30->flags & 0x40001) == 0x40001) || (sp30->naviEnemyId != 0xFF)); - if (sp24 || (this->naviMessageId != 0)) { - sp28 = (this->naviMessageId < 0) && ((ABS(this->naviMessageId) & 0xFF00) != 0x200); + if (sp24 || (this->naviTextId != 0)) { + sp28 = (this->naviTextId < 0) && ((ABS(this->naviTextId) & 0xFF00) != 0x200); if (sp28 || !sp24) { sp2C = this->naviActor; if (sp28) { @@ -4934,10 +4935,10 @@ s32 func_8083B644(Player* this, GlobalContext* globalCtx) { this->targetActor = NULL; if (sp28 || !sp24) { - if (this->naviMessageId >= 0) { - sp2C->textId = this->naviMessageId; + if (this->naviTextId >= 0) { + sp2C->textId = this->naviTextId; } else { - sp2C->textId = -this->naviMessageId; + sp2C->textId = -this->naviTextId; } } else { if (sp2C->naviEnemyId != 0xFF) { @@ -4978,9 +4979,8 @@ s32 func_8083B998(Player* this, GlobalContext* globalCtx) { if ((this->unk_664 != NULL) && (((this->unk_664->flags & 0x40001) == 0x40001) || (this->unk_664->naviEnemyId != 0xFF))) { this->stateFlags2 |= 0x200000; - } else if ((this->naviMessageId == 0) && !func_8008E9C4(this) && - CHECK_BTN_ALL(sControlInput->press.button, BTN_CUP) && (YREG(15) != 0x10) && (YREG(15) != 0x20) && - !func_8083B8F4(this, globalCtx)) { + } else if ((this->naviTextId == 0) && !func_8008E9C4(this) && CHECK_BTN_ALL(sControlInput->press.button, BTN_CUP) && + (YREG(15) != 0x10) && (YREG(15) != 0x20) && !func_8083B8F4(this, globalCtx)) { func_80078884(NA_SE_SY_ERROR); } @@ -7896,7 +7896,7 @@ void func_80843AE8(GlobalContext* globalCtx, Player* this) { } } else if (this->unk_84F != 0) { this->unk_850 = 60; - func_80839680(globalCtx, this, &this->actor.posRot.pos, &D_808545E4, 5); + Player_SpawnFairy(globalCtx, this, &this->actor.posRot.pos, &D_808545E4, FAIRY_REVIVE_DEATH); func_8002F7DC(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); func_800800F8(globalCtx, 0x26B4, 125, &this->actor, 0); } else if (globalCtx->unk_10A20 == 2) { @@ -9164,7 +9164,7 @@ void Player_Init(Actor* thisx, GlobalContext* globalCtx) { if (initMode != 0) { if ((gSaveContext.gameMode == 0) || (gSaveContext.gameMode == 3)) { - this->naviActor = func_80839680(globalCtx, this, &this->actor.posRot.pos, &D_80854778, 0); + this->naviActor = Player_SpawnFairy(globalCtx, this, &this->actor.posRot.pos, &D_80854778, FAIRY_NAVI); if (gSaveContext.dogParams != 0) { gSaveContext.dogParams |= 0x8000; } @@ -10158,7 +10158,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { func_8083D6EC(globalCtx, this); - if ((this->unk_664 == NULL) && (this->naviMessageId == 0)) { + if ((this->unk_664 == NULL) && (this->naviTextId == 0)) { this->stateFlags2 &= ~0x200002; } @@ -10209,7 +10209,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { this->rideActor = NULL; } - this->naviMessageId = 0; + this->naviTextId = 0; if (!(this->stateFlags2 & 0x2000000)) { this->unk_6A8 = NULL; @@ -11909,9 +11909,9 @@ void func_8084E3C4(Player* this, GlobalContext* globalCtx) { if ((this->targetActor != NULL) && (this->targetActor == this->unk_6A8)) { func_80853148(globalCtx, this->targetActor); - } else if (this->naviMessageId < 0) { + } else if (this->naviTextId < 0) { this->targetActor = this->naviActor; - this->naviActor->textId = -this->naviMessageId; + this->naviActor->textId = -this->naviTextId; func_80853148(globalCtx, this->targetActor); } else if (!func_8083B040(this, globalCtx)) { func_8083A098(this, &D_04003098, globalCtx); @@ -12099,7 +12099,7 @@ void func_8084EAC0(Player* this, GlobalContext* globalCtx) { } if (sp28 & 2) { - func_80087680(globalCtx); + Magic_Fill(globalCtx); } if (sp28 & 4) { @@ -12205,7 +12205,7 @@ void func_8084EED8(Player* this, GlobalContext* globalCtx) { } if (func_800A4530(&this->skelAnime, 37.0f)) { - func_80839680(globalCtx, this, &this->leftHandPos, &D_80854A1C, 1); + Player_SpawnFairy(globalCtx, this, &this->leftHandPos, &D_80854A1C, FAIRY_REVIVE_BOTTLE); Player_UpdateBottleHeld(globalCtx, this, ITEM_BOTTLE, PLAYER_AP_BOTTLE); func_8002F7DC(&this->actor, NA_SE_EV_BOTTLE_CAP_OPEN); func_8002F7DC(&this->actor, NA_SE_EV_FIATY_HEAL - SFX_FLAG); diff --git a/tools/ZAP2 b/tools/ZAP2 index a781b7b098..15fcb21d2c 160000 --- a/tools/ZAP2 +++ b/tools/ZAP2 @@ -1 +1 @@ -Subproject commit a781b7b098472076f99f52e4ad214823ea91be2d +Subproject commit 15fcb21d2c4e2ef2f720d28a0f7dec259ddd06f5 diff --git a/undefined_syms.txt b/undefined_syms.txt index 8365cd742a..6881c72319 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1221,6 +1221,10 @@ D_0600FE40 = 0x0600FE40; D_0400CD80 = 0x0400CD80; D_040184B0 = 0x040184B0; +// z_en_elf +D_04016A48 = 0x04016A48; +D_04014BA4 = 0x04014BA4; + // z_bg_po_syokudai D_060003A0 = 0x060003A0; D_0404D4E0 = 0x0404D4E0;