diff --git a/Makefile b/Makefile index 592f7f862f..b2fd593094 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,8 @@ OBJCOPY := $(MIPS_BINUTILS_PREFIX)objcopy OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump # Check code syntax with host compiler -CC_CHECK := gcc -fno-builtin -fsyntax-only -fsigned-char -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -Wno-unused-parameter -Wno-unused-variable -Wno-missing-braces -D _LANGUAGE_C -D NON_MATCHING -Iinclude -Isrc -include stdarg.h +CHECK_WARNINGS := -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -Wno-unused-parameter -Wno-unused-variable -Wno-missing-braces -Wno-int-conversion +CC_CHECK := gcc -fno-builtin -fsyntax-only -fsigned-char -std=gnu90 -D _LANGUAGE_C -D NON_MATCHING -Iinclude -Isrc -include stdarg.h $(CHECK_WARNINGS) CPP := cpp MKLDSCRIPT := tools/mkldscript @@ -56,7 +57,7 @@ ASFLAGS := -march=vr4300 -32 -Iinclude MIPS_VERSION := -mips2 # we support Microsoft extensions such as anonymous structs, which the compiler does support but warns for their usage. Surpress the warnings with -woff. -CFLAGS += -G 0 -non_shared -Xfullwarn -Xcpluscomm -Iinclude -Isrc -Wab,-r4300_mul -woff 649,838 +CFLAGS += -G 0 -non_shared -Xfullwarn -Xcpluscomm -Iinclude -Isrc -Wab,-r4300_mul -woff 649,838,712 ifeq ($(shell getconf LONG_BIT), 32) # Work around memory allocation bug in QEMU diff --git a/asm/non_matchings/code/z_kankyo/func_80075B44.s b/asm/non_matchings/code/z_kankyo/func_80075B44.s index b866fd6cbb..34ded79086 100644 --- a/asm/non_matchings/code/z_kankyo/func_80075B44.s +++ b/asm/non_matchings/code/z_kankyo/func_80075B44.s @@ -184,7 +184,7 @@ glabel L80075D30 /* AECF44 80075DA4 922A1D6C */ lbu $t2, 0x1d6c($s1) /* AECF48 80075DA8 55400009 */ bnezl $t2, .L80075DD0 /* AECF4C 80075DAC 920B0B04 */ lbu $t3, 0xb04($s0) -/* AECF50 80075DB0 0C023A62 */ jal func_8008E988 +/* AECF50 80075DB0 0C023A62 */ jal Player_InCsMode /* AECF54 80075DB4 02202025 */ move $a0, $s1 /* AECF58 80075DB8 14400004 */ bnez $v0, .L80075DCC /* AECF5C 80075DBC 02202025 */ move $a0, $s1 diff --git a/asm/non_matchings/code/z_play/Gameplay_Update.s b/asm/non_matchings/code/z_play/Gameplay_Update.s index 89457fb481..41fd7a6107 100644 --- a/asm/non_matchings/code/z_play/Gameplay_Update.s +++ b/asm/non_matchings/code/z_play/Gameplay_Update.s @@ -1823,7 +1823,7 @@ glabel L800BE148 /* B35994 800BE7F4 10000021 */ b .L800BE87C /* B35998 800BE7F8 00000000 */ nop .L800BE7FC: -/* B3599C 800BE7FC 0C023A62 */ jal func_8008E988 +/* B3599C 800BE7FC 0C023A62 */ jal Player_InCsMode /* B359A0 800BE800 02002025 */ move $a0, $s0 /* B359A4 800BE804 10400006 */ beqz $v0, .L800BE820 /* B359A8 800BE808 3C0A8016 */ lui $t2, %hi(gGameInfo) # $t2, 0x8016 diff --git a/asm/non_matchings/code/z_player_lib/func_8008EA40.s b/asm/non_matchings/code/z_player_lib/func_8008EA40.s deleted file mode 100644 index 021dfdf573..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8008EA40.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_8008EA40 -/* B05BE0 8008EA40 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B05BE4 8008EA44 AFBF0014 */ sw $ra, 0x14($sp) -/* B05BE8 8008EA48 8C8E067C */ lw $t6, 0x67c($a0) -/* B05BEC 8008EA4C 000E7A40 */ sll $t7, $t6, 9 -/* B05BF0 8008EA50 05E30033 */ bgezl $t7, .L8008EB20 -/* B05BF4 8008EA54 8FBF0014 */ lw $ra, 0x14($sp) -/* B05BF8 8008EA58 80820154 */ lb $v0, 0x154($a0) -/* B05BFC 8008EA5C 04400004 */ bltz $v0, .L8008EA70 -/* B05C00 8008EA60 00000000 */ nop -/* B05C04 8008EA64 80980151 */ lb $t8, 0x151($a0) -/* B05C08 8008EA68 5702002D */ bnel $t8, $v0, .L8008EB20 -/* B05C0C 8008EA6C 8FBF0014 */ lw $ra, 0x14($sp) -.L8008EA70: -/* B05C10 8008EA70 0C023C68 */ jal func_8008F1A0 -/* B05C14 8008EA74 AFA40018 */ sw $a0, 0x18($sp) -/* B05C18 8008EA78 14400028 */ bnez $v0, .L8008EB1C -/* B05C1C 8008EA7C 8FA40018 */ lw $a0, 0x18($sp) -/* B05C20 8008EA80 0C023A74 */ jal func_8008E9D0 -/* B05C24 8008EA84 AFA40018 */ sw $a0, 0x18($sp) -/* B05C28 8008EA88 14400024 */ bnez $v0, .L8008EB1C -/* B05C2C 8008EA8C 8FA40018 */ lw $a0, 0x18($sp) -/* B05C30 8008EA90 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 -/* B05C34 8008EA94 2419000A */ li $t9, 10 -/* B05C38 8008EA98 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 -/* B05C3C 8008EA9C 3C068012 */ lui $a2, %hi(D_80125F40) # $a2, 0x8012 -/* B05C40 8008EAA0 A099015D */ sb $t9, 0x15d($a0) -/* B05C44 8008EAA4 8CA80004 */ lw $t0, 4($a1) -/* B05C48 8008EAA8 24C65F40 */ addiu $a2, %lo(D_80125F40) # addiu $a2, $a2, 0x5f40 -/* B05C4C 8008EAAC 8CCA0028 */ lw $t2, 0x28($a2) -/* B05C50 8008EAB0 9082015E */ lbu $v0, 0x15e($a0) -/* B05C54 8008EAB4 00084880 */ sll $t1, $t0, 2 -/* B05C58 8008EAB8 24010012 */ li $at, 18 -/* B05C5C 8008EABC 012A5821 */ addu $t3, $t1, $t2 -/* B05C60 8008EAC0 AC8B0160 */ sw $t3, 0x160($a0) -/* B05C64 8008EAC4 14410005 */ bne $v0, $at, .L8008EADC -/* B05C68 8008EAC8 00401825 */ move $v1, $v0 -/* B05C6C 8008EACC 240C0010 */ li $t4, 16 -/* B05C70 8008EAD0 A08C015E */ sb $t4, 0x15e($a0) -/* B05C74 8008EAD4 10000006 */ b .L8008EAF0 -/* B05C78 8008EAD8 318200FF */ andi $v0, $t4, 0xff -.L8008EADC: -/* B05C7C 8008EADC 24010013 */ li $at, 19 -/* B05C80 8008EAE0 14610003 */ bne $v1, $at, .L8008EAF0 -/* B05C84 8008EAE4 240D0011 */ li $t5, 17 -/* B05C88 8008EAE8 A08D015E */ sb $t5, 0x15e($a0) -/* B05C8C 8008EAEC 31A200FF */ andi $v0, $t5, 0xff -.L8008EAF0: -/* B05C90 8008EAF0 0002C080 */ sll $t8, $v0, 2 -/* B05C94 8008EAF4 8CAE0004 */ lw $t6, 4($a1) -/* B05C98 8008EAF8 00D8C821 */ addu $t9, $a2, $t8 -/* B05C9C 8008EAFC 8F280000 */ lw $t0, ($t9) -/* B05CA0 8008EB00 000E7880 */ sll $t7, $t6, 2 -/* B05CA4 8008EB04 240A0002 */ li $t2, 2 -/* B05CA8 8008EB08 240BFFFF */ li $t3, -1 -/* B05CAC 8008EB0C 01E84821 */ addu $t1, $t7, $t0 -/* B05CB0 8008EB10 AC890168 */ sw $t1, 0x168($a0) -/* B05CB4 8008EB14 A08A015B */ sb $t2, 0x15b($a0) -/* B05CB8 8008EB18 A08B0154 */ sb $t3, 0x154($a0) -.L8008EB1C: -/* B05CBC 8008EB1C 8FBF0014 */ lw $ra, 0x14($sp) -.L8008EB20: -/* B05CC0 8008EB20 27BD0018 */ addiu $sp, $sp, 0x18 -/* B05CC4 8008EB24 03E00008 */ jr $ra -/* B05CC8 8008EB28 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_8008EB2C.s b/asm/non_matchings/code/z_player_lib/func_8008EB2C.s deleted file mode 100644 index fac1fedd4b..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8008EB2C.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_8008EB2C -/* B05CCC 8008EB2C 00057080 */ sll $t6, $a1, 2 -/* B05CD0 8008EB30 3C0F8012 */ lui $t7, %hi(D_80125C98) # $t7, 0x8012 -/* B05CD4 8008EB34 25EF5C98 */ addiu $t7, %lo(D_80125C98) # addiu $t7, $t7, 0x5c98 -/* B05CD8 8008EB38 01C57021 */ addu $t6, $t6, $a1 -/* B05CDC 8008EB3C 01CF1021 */ addu $v0, $t6, $t7 -/* B05CE0 8008EB40 90580001 */ lbu $t8, 1($v0) -/* B05CE4 8008EB44 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B05CE8 8008EB48 AFBF0014 */ sw $ra, 0x14($sp) -/* B05CEC 8008EB4C A098015C */ sb $t8, 0x15c($a0) -/* B05CF0 8008EB50 90590002 */ lbu $t9, 2($v0) -/* B05CF4 8008EB54 3C038016 */ lui $v1, %hi(gSaveContext) # $v1, 0x8016 -/* B05CF8 8008EB58 3C068012 */ lui $a2, %hi(D_80125F40) # $a2, 0x8012 -/* B05CFC 8008EB5C A099015D */ sb $t9, 0x15d($a0) -/* B05D00 8008EB60 90480003 */ lbu $t0, 3($v0) -/* B05D04 8008EB64 24C65F40 */ addiu $a2, %lo(D_80125F40) # addiu $a2, $a2, 0x5f40 -/* B05D08 8008EB68 2463E660 */ addiu $v1, %lo(gSaveContext) # addiu $v1, $v1, -0x19a0 -/* B05D0C 8008EB6C A088015E */ sb $t0, 0x15e($a0) -/* B05D10 8008EB70 904B0001 */ lbu $t3, 1($v0) -/* B05D14 8008EB74 8C690004 */ lw $t1, 4($v1) -/* B05D18 8008EB78 000B6080 */ sll $t4, $t3, 2 -/* B05D1C 8008EB7C 00CC6821 */ addu $t5, $a2, $t4 -/* B05D20 8008EB80 8DAE0000 */ lw $t6, ($t5) -/* B05D24 8008EB84 00095080 */ sll $t2, $t1, 2 -/* B05D28 8008EB88 014E7821 */ addu $t7, $t2, $t6 -/* B05D2C 8008EB8C AC8F0164 */ sw $t7, 0x164($a0) -/* B05D30 8008EB90 90480002 */ lbu $t0, 2($v0) -/* B05D34 8008EB94 8C780004 */ lw $t8, 4($v1) -/* B05D38 8008EB98 00084880 */ sll $t1, $t0, 2 -/* B05D3C 8008EB9C 00C95821 */ addu $t3, $a2, $t1 -/* B05D40 8008EBA0 8D6C0000 */ lw $t4, ($t3) -/* B05D44 8008EBA4 0018C880 */ sll $t9, $t8, 2 -/* B05D48 8008EBA8 032C6821 */ addu $t5, $t9, $t4 -/* B05D4C 8008EBAC AC8D0160 */ sw $t5, 0x160($a0) -/* B05D50 8008EBB0 904F0003 */ lbu $t7, 3($v0) -/* B05D54 8008EBB4 8C6A0004 */ lw $t2, 4($v1) -/* B05D58 8008EBB8 000FC080 */ sll $t8, $t7, 2 -/* B05D5C 8008EBBC 00D84021 */ addu $t0, $a2, $t8 -/* B05D60 8008EBC0 8D090000 */ lw $t1, ($t0) -/* B05D64 8008EBC4 000A7080 */ sll $t6, $t2, 2 -/* B05D68 8008EBC8 01C95821 */ addu $t3, $t6, $t1 -/* B05D6C 8008EBCC AC8B0168 */ sw $t3, 0x168($a0) -/* B05D70 8008EBD0 904D0004 */ lbu $t5, 4($v0) -/* B05D74 8008EBD4 8C790004 */ lw $t9, 4($v1) -/* B05D78 8008EBD8 000D5080 */ sll $t2, $t5, 2 -/* B05D7C 8008EBDC 00CA7821 */ addu $t7, $a2, $t2 -/* B05D80 8008EBE0 8DF80000 */ lw $t8, ($t7) -/* B05D84 8008EBE4 00196080 */ sll $t4, $t9, 2 -/* B05D88 8008EBE8 01984021 */ addu $t0, $t4, $t8 -/* B05D8C 8008EBEC 0C023A90 */ jal func_8008EA40 -/* B05D90 8008EBF0 AC88016C */ sw $t0, 0x16c($a0) -/* B05D94 8008EBF4 8FBF0014 */ lw $ra, 0x14($sp) -/* B05D98 8008EBF8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B05D9C 8008EBFC 03E00008 */ jr $ra -/* B05DA0 8008EC00 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_8008F2BC.s b/asm/non_matchings/code/z_player_lib/func_8008F2BC.s deleted file mode 100644 index 3f2c9df381..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8008F2BC.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8008F2BC -/* B0645C 8008F2BC 24010001 */ li $at, 1 -/* B06460 8008F2C0 AFA40000 */ sw $a0, ($sp) -/* B06464 8008F2C4 10A10007 */ beq $a1, $at, .L8008F2E4 -/* B06468 8008F2C8 00001825 */ move $v1, $zero -/* B0646C 8008F2CC 24A2FFFD */ addiu $v0, $a1, -3 -/* B06470 8008F2D0 04400006 */ bltz $v0, .L8008F2EC -/* B06474 8008F2D4 00401825 */ move $v1, $v0 -/* B06478 8008F2D8 28410003 */ slti $at, $v0, 3 -/* B0647C 8008F2DC 50200004 */ beql $at, $zero, .L8008F2F0 -/* B06480 8008F2E0 2402FFFF */ li $v0, -1 -.L8008F2E4: -/* B06484 8008F2E4 03E00008 */ jr $ra -/* B06488 8008F2E8 00601025 */ move $v0, $v1 - -.L8008F2EC: -/* B0648C 8008F2EC 2402FFFF */ li $v0, -1 -.L8008F2F0: -/* B06490 8008F2F0 03E00008 */ jr $ra -/* B06494 8008F2F4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_8008F470.s b/asm/non_matchings/code/z_player_lib/func_8008F470.s deleted file mode 100644 index 0dde717fd0..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8008F470.s +++ /dev/null @@ -1,281 +0,0 @@ -.rdata -glabel D_8013E770 - .asciz "../z_player_lib.c" - .balign 4 - -glabel D_8013E784 - .asciz "../z_player_lib.c" - .balign 4 - -.text -glabel func_8008F470 -/* B06610 8008F470 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B06614 8008F474 AFBF0024 */ sw $ra, 0x24($sp) -/* B06618 8008F478 AFA40088 */ sw $a0, 0x88($sp) -/* B0661C 8008F47C AFA5008C */ sw $a1, 0x8c($sp) -/* B06620 8008F480 AFA60090 */ sw $a2, 0x90($sp) -/* B06624 8008F484 AFA70094 */ sw $a3, 0x94($sp) -/* B06628 8008F488 84C20084 */ lh $v0, 0x84($a2) -/* B0662C 8008F48C 8C850000 */ lw $a1, ($a0) -/* B06630 8008F490 3C068014 */ lui $a2, %hi(D_8013E770) # $a2, 0x8014 -/* B06634 8008F494 3049000F */ andi $t1, $v0, 0xf -/* B06638 8008F498 00025103 */ sra $t2, $v0, 4 -/* B0663C 8008F49C 2529FFFF */ addiu $t1, $t1, -1 -/* B06640 8008F4A0 254AFFFF */ addiu $t2, $t2, -1 -/* B06644 8008F4A4 AFAA007C */ sw $t2, 0x7c($sp) -/* B06648 8008F4A8 AFA90080 */ sw $t1, 0x80($sp) -/* B0664C 8008F4AC 24C6E770 */ addiu $a2, %lo(D_8013E770) # addiu $a2, $a2, -0x1890 -/* B06650 8008F4B0 27A40068 */ addiu $a0, $sp, 0x68 -/* B06654 8008F4B4 240706B9 */ li $a3, 1721 -/* B06658 8008F4B8 0C031AB1 */ jal Graph_OpenDisps -/* B0665C 8008F4BC AFA50078 */ sw $a1, 0x78($sp) -/* B06660 8008F4C0 8FA90080 */ lw $t1, 0x80($sp) -/* B06664 8008F4C4 8FA80078 */ lw $t0, 0x78($sp) -/* B06668 8008F4C8 8FAA007C */ lw $t2, 0x7c($sp) -/* B0666C 8008F4CC 05210006 */ bgez $t1, .L8008F4E8 -/* B06670 8008F4D0 3C0500FF */ lui $a1, (0x00FFFFFF >> 16) # lui $a1, 0xff -/* B06674 8008F4D4 8FB800A4 */ lw $t8, 0xa4($sp) -/* B06678 8008F4D8 3C098012 */ lui $t1, %hi(D_80125FB8) -/* B0667C 8008F4DC 0018C840 */ sll $t9, $t8, 1 -/* B06680 8008F4E0 01394821 */ addu $t1, $t1, $t9 -/* B06684 8008F4E4 91295FB8 */ lbu $t1, %lo(D_80125FB8)($t1) -.L8008F4E8: -/* B06688 8008F4E8 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B0668C 8008F4EC 3C0CDB06 */ lui $t4, (0xDB060020 >> 16) # lui $t4, 0xdb06 -/* B06690 8008F4F0 358C0020 */ ori $t4, (0xDB060020 & 0xFFFF) # ori $t4, $t4, 0x20 -/* B06694 8008F4F4 244B0008 */ addiu $t3, $v0, 8 -/* B06698 8008F4F8 AD0B02C0 */ sw $t3, 0x2c0($t0) -/* B0669C 8008F4FC 00096880 */ sll $t5, $t1, 2 -/* B066A0 8008F500 3C048012 */ lui $a0, %hi(D_80125FD8) -/* B066A4 8008F504 008D2021 */ addu $a0, $a0, $t5 -/* B066A8 8008F508 AC4C0000 */ sw $t4, ($v0) -/* B066AC 8008F50C 8C845FD8 */ lw $a0, %lo(D_80125FD8)($a0) -/* B066B0 8008F510 3C068016 */ lui $a2, %hi(gSegments) # $a2, 0x8016 -/* B066B4 8008F514 24C66FA8 */ addiu $a2, %lo(gSegments) # addiu $a2, $a2, 0x6fa8 -/* B066B8 8008F518 00047900 */ sll $t7, $a0, 4 -/* B066BC 8008F51C 000FC702 */ srl $t8, $t7, 0x1c -/* B066C0 8008F520 0018C880 */ sll $t9, $t8, 2 -/* B066C4 8008F524 00D95821 */ addu $t3, $a2, $t9 -/* B066C8 8008F528 8D6C0000 */ lw $t4, ($t3) -/* B066CC 8008F52C 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff -/* B066D0 8008F530 00857024 */ and $t6, $a0, $a1 -/* B066D4 8008F534 3C078000 */ lui $a3, 0x8000 -/* B066D8 8008F538 01CC6821 */ addu $t5, $t6, $t4 -/* B066DC 8008F53C 01A77821 */ addu $t7, $t5, $a3 -/* B066E0 8008F540 05410006 */ bgez $t2, .L8008F55C -/* B066E4 8008F544 AC4F0004 */ sw $t7, 4($v0) -/* B066E8 8008F548 8FB800A4 */ lw $t8, 0xa4($sp) -/* B066EC 8008F54C 3C0A8012 */ lui $t2, %hi(D_80125FB9) -/* B066F0 8008F550 0018C840 */ sll $t9, $t8, 1 -/* B066F4 8008F554 01595021 */ addu $t2, $t2, $t9 -/* B066F8 8008F558 914A5FB9 */ lbu $t2, %lo(D_80125FB9)($t2) -.L8008F55C: -/* B066FC 8008F55C 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B06700 8008F560 3C0EDB06 */ lui $t6, (0xDB060024 >> 16) # lui $t6, 0xdb06 -/* B06704 8008F564 35CE0024 */ ori $t6, (0xDB060024 & 0xFFFF) # ori $t6, $t6, 0x24 -/* B06708 8008F568 244B0008 */ addiu $t3, $v0, 8 -/* B0670C 8008F56C AD0B02C0 */ sw $t3, 0x2c0($t0) -/* B06710 8008F570 000A6080 */ sll $t4, $t2, 2 -/* B06714 8008F574 3C048012 */ lui $a0, %hi(D_80125FF8) -/* B06718 8008F578 008C2021 */ addu $a0, $a0, $t4 -/* B0671C 8008F57C AC4E0000 */ sw $t6, ($v0) -/* B06720 8008F580 8C845FF8 */ lw $a0, %lo(D_80125FF8)($a0) -/* B06724 8008F584 24090003 */ li $t1, 3 -/* B06728 8008F588 3C018016 */ lui $at, %hi(D_80160004) # $at, 0x8016 -/* B0672C 8008F58C 00047900 */ sll $t7, $a0, 4 -/* B06730 8008F590 000FC702 */ srl $t8, $t7, 0x1c -/* B06734 8008F594 0018C880 */ sll $t9, $t8, 2 -/* B06738 8008F598 00D95821 */ addu $t3, $a2, $t9 -/* B0673C 8008F59C 8D6E0000 */ lw $t6, ($t3) -/* B06740 8008F5A0 00856824 */ and $t5, $a0, $a1 -/* B06744 8008F5A4 3C19FB00 */ lui $t9, 0xfb00 -/* B06748 8008F5A8 01AE6021 */ addu $t4, $t5, $t6 -/* B0674C 8008F5AC 01877821 */ addu $t7, $t4, $a3 -/* B06750 8008F5B0 AC4F0004 */ sw $t7, 4($v0) -/* B06754 8008F5B4 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B06758 8008F5B8 3C0E8012 */ lui $t6, %hi(D_80126008) # $t6, 0x8012 -/* B0675C 8008F5BC 25CE6008 */ addiu $t6, %lo(D_80126008) # addiu $t6, $t6, 0x6008 -/* B06760 8008F5C0 24580008 */ addiu $t8, $v0, 8 -/* B06764 8008F5C4 AD1802C0 */ sw $t8, 0x2c0($t0) -/* B06768 8008F5C8 AC590000 */ sw $t9, ($v0) -/* B0676C 8008F5CC 8FAB009C */ lw $t3, 0x9c($sp) -/* B06770 8008F5D0 01690019 */ multu $t3, $t1 -/* B06774 8008F5D4 00006812 */ mflo $t5 -/* B06778 8008F5D8 01AE1821 */ addu $v1, $t5, $t6 -/* B0677C 8008F5DC 906F0000 */ lbu $t7, ($v1) -/* B06780 8008F5E0 906B0001 */ lbu $t3, 1($v1) -/* B06784 8008F5E4 000FC600 */ sll $t8, $t7, 0x18 -/* B06788 8008F5E8 906F0002 */ lbu $t7, 2($v1) -/* B0678C 8008F5EC 000B6C00 */ sll $t5, $t3, 0x10 -/* B06790 8008F5F0 030D7025 */ or $t6, $t8, $t5 -/* B06794 8008F5F4 000FCA00 */ sll $t9, $t7, 8 -/* B06798 8008F5F8 01D95825 */ or $t3, $t6, $t9 -/* B0679C 8008F5FC AC4B0004 */ sw $t3, 4($v0) -/* B067A0 8008F600 8FA20098 */ lw $v0, 0x98($sp) -/* B067A4 8008F604 8FAF00B0 */ lw $t7, 0xb0($sp) -/* B067A8 8008F608 8FAC00AC */ lw $t4, 0xac($sp) -/* B067AC 8008F60C 8FAD00A8 */ lw $t5, 0xa8($sp) -/* B067B0 8008F610 0002C040 */ sll $t8, $v0, 1 -/* B067B4 8008F614 AC380004 */ sw $t8, %lo(D_80160004)($at) -/* B067B8 8008F618 AFA80078 */ sw $t0, 0x78($sp) -/* B067BC 8008F61C 8FA70094 */ lw $a3, 0x94($sp) -/* B067C0 8008F620 8FA60090 */ lw $a2, 0x90($sp) -/* B067C4 8008F624 8FA5008C */ lw $a1, 0x8c($sp) -/* B067C8 8008F628 8FA40088 */ lw $a0, 0x88($sp) -/* B067CC 8008F62C AFA2001C */ sw $v0, 0x1c($sp) -/* B067D0 8008F630 AFAF0018 */ sw $t7, 0x18($sp) -/* B067D4 8008F634 AFAC0014 */ sw $t4, 0x14($sp) -/* B067D8 8008F638 0C02841B */ jal SkelAnime_LodDrawSV -/* B067DC 8008F63C AFAD0010 */ sw $t5, 0x10($sp) -/* B067E0 8008F640 8FA200A8 */ lw $v0, 0xa8($sp) -/* B067E4 8008F644 3C0E8009 */ lui $t6, %hi(func_800902F0) # $t6, 0x8009 -/* B067E8 8008F648 25CE02F0 */ addiu $t6, %lo(func_800902F0) # addiu $t6, $t6, 0x2f0 -/* B067EC 8008F64C 8FA80078 */ lw $t0, 0x78($sp) -/* B067F0 8008F650 104E007F */ beq $v0, $t6, .L8008F850 -/* B067F4 8008F654 24090003 */ li $t1, 3 -/* B067F8 8008F658 3C198009 */ lui $t9, %hi(func_80090440) # $t9, 0x8009 -/* B067FC 8008F65C 27390440 */ addiu $t9, %lo(func_80090440) # addiu $t9, $t9, 0x440 -/* B06800 8008F660 1059007B */ beq $v0, $t9, .L8008F850 -/* B06804 8008F664 3C028016 */ lui $v0, %hi(gSaveContext) # $v0, 0x8016 -/* B06808 8008F668 2442E660 */ addiu $v0, %lo(gSaveContext) # addiu $v0, $v0, -0x19a0 -/* B0680C 8008F66C 8C4B135C */ lw $t3, 0x135c($v0) -/* B06810 8008F670 512B0078 */ beql $t1, $t3, .L8008F854 -/* B06814 8008F674 8FB80088 */ lw $t8, 0x88($sp) -/* B06818 8008F678 8C580004 */ lw $t8, 4($v0) -/* B0681C 8008F67C 3C0C8012 */ lui $t4, %hi(gUpgradeMasks+8) # $t4, 0x8012 -/* B06820 8008F680 3C0E8012 */ lui $t6, %hi(gUpgradeShifts+2) # $t6, 0x8012 -/* B06824 8008F684 17000066 */ bnez $t8, .L8008F820 -/* B06828 8008F688 00000000 */ nop -/* B0682C 8008F68C 8C4D00A0 */ lw $t5, 0xa0($v0) -/* B06830 8008F690 8D8C71B8 */ lw $t4, %lo(gUpgradeMasks+8)($t4) -/* B06834 8008F694 91CE71F6 */ lbu $t6, %lo(gUpgradeShifts+2)($t6) -/* B06838 8008F698 3C0BE700 */ lui $t3, 0xe700 -/* B0683C 8008F69C 01AC7824 */ and $t7, $t5, $t4 -/* B06840 8008F6A0 01CF2807 */ srav $a1, $t7, $t6 -/* B06844 8008F6A4 28A10002 */ slti $at, $a1, 2 -/* B06848 8008F6A8 54200049 */ bnezl $at, .L8008F7D0 -/* B0684C 8008F6AC 8FA600A0 */ lw $a2, 0xa0($sp) -/* B06850 8008F6B0 00A90019 */ multu $a1, $t1 -/* B06854 8008F6B4 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B06858 8008F6B8 3C0E8012 */ lui $t6, %hi(D_80126014) # $t6, 0x8012 -/* B0685C 8008F6BC 25CE6014 */ addiu $t6, %lo(D_80126014) # addiu $t6, $t6, 0x6014 -/* B06860 8008F6C0 24590008 */ addiu $t9, $v0, 8 -/* B06864 8008F6C4 AD1902C0 */ sw $t9, 0x2c0($t0) -/* B06868 8008F6C8 AC4B0000 */ sw $t3, ($v0) -/* B0686C 8008F6CC AC400004 */ sw $zero, 4($v0) -/* B06870 8008F6D0 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B06874 8008F6D4 3C0DFB00 */ lui $t5, 0xfb00 -/* B06878 8008F6D8 00006012 */ mflo $t4 -/* B0687C 8008F6DC 24580008 */ addiu $t8, $v0, 8 -/* B06880 8008F6E0 AD1802C0 */ sw $t8, 0x2c0($t0) -/* B06884 8008F6E4 258FFFFA */ addiu $t7, $t4, -6 -/* B06888 8008F6E8 01EE1821 */ addu $v1, $t7, $t6 -/* B0688C 8008F6EC AC4D0000 */ sw $t5, ($v0) -/* B06890 8008F6F0 906B0000 */ lbu $t3, ($v1) -/* B06894 8008F6F4 906C0001 */ lbu $t4, 1($v1) -/* B06898 8008F6F8 3C05DE00 */ lui $a1, 0xde00 -/* B0689C 8008F6FC 000BC600 */ sll $t8, $t3, 0x18 -/* B068A0 8008F700 906B0002 */ lbu $t3, 2($v1) -/* B068A4 8008F704 000C7C00 */ sll $t7, $t4, 0x10 -/* B068A8 8008F708 030F7025 */ or $t6, $t8, $t7 -/* B068AC 8008F70C 000B6A00 */ sll $t5, $t3, 8 -/* B068B0 8008F710 01CD6025 */ or $t4, $t6, $t5 -/* B068B4 8008F714 AC4C0004 */ sw $t4, 4($v0) -/* B068B8 8008F718 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B068BC 8008F71C 3C0F0602 */ lui $t7, %hi(D_06025218) # $t7, 0x602 -/* B068C0 8008F720 25EF5218 */ addiu $t7, %lo(D_06025218) # addiu $t7, $t7, 0x5218 -/* B068C4 8008F724 24580008 */ addiu $t8, $v0, 8 -/* B068C8 8008F728 AD1802C0 */ sw $t8, 0x2c0($t0) -/* B068CC 8008F72C AC450000 */ sw $a1, ($v0) -/* B068D0 8008F730 AC4F0004 */ sw $t7, 4($v0) -/* B068D4 8008F734 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B068D8 8008F738 3C0B0602 */ lui $t3, %hi(D_06025598) # $t3, 0x602 -/* B068DC 8008F73C 256B5598 */ addiu $t3, %lo(D_06025598) # addiu $t3, $t3, 0x5598 -/* B068E0 8008F740 24590008 */ addiu $t9, $v0, 8 -/* B068E4 8008F744 AD1902C0 */ sw $t9, 0x2c0($t0) -/* B068E8 8008F748 AC450000 */ sw $a1, ($v0) -/* B068EC 8008F74C AC4B0004 */ sw $t3, 4($v0) -/* B068F0 8008F750 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B068F4 8008F754 3C0D8016 */ lui $t5, %hi(D_80160014) # $t5, 0x8016 -/* B068F8 8008F758 3C180602 */ lui $t8, %hi(D_06025438) # $t8, 0x602 -/* B068FC 8008F75C 244E0008 */ addiu $t6, $v0, 8 -/* B06900 8008F760 AD0E02C0 */ sw $t6, 0x2c0($t0) -/* B06904 8008F764 AC450000 */ sw $a1, ($v0) -/* B06908 8008F768 8DAD0014 */ lw $t5, %lo(D_80160014)($t5) -/* B0690C 8008F76C 27185438 */ addiu $t8, %lo(D_06025438) # addiu $t8, $t8, 0x5438 -/* B06910 8008F770 3C0C0602 */ lui $t4, %hi(D_060252D8) # $t4, 0x602 -/* B06914 8008F774 15A00004 */ bnez $t5, .L8008F788 -/* B06918 8008F778 00401825 */ move $v1, $v0 -/* B0691C 8008F77C 258C52D8 */ addiu $t4, %lo(D_060252D8) # addiu $t4, $t4, 0x52d8 -/* B06920 8008F780 10000002 */ b .L8008F78C -/* B06924 8008F784 AC4C0004 */ sw $t4, 4($v0) -.L8008F788: -/* B06928 8008F788 AC780004 */ sw $t8, 4($v1) -.L8008F78C: -/* B0692C 8008F78C 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B06930 8008F790 3C198016 */ lui $t9, %hi(D_80160018) # $t9, 0x8016 -/* B06934 8008F794 24010008 */ li $at, 8 -/* B06938 8008F798 244F0008 */ addiu $t7, $v0, 8 -/* B0693C 8008F79C AD0F02C0 */ sw $t7, 0x2c0($t0) -/* B06940 8008F7A0 AC450000 */ sw $a1, ($v0) -/* B06944 8008F7A4 8F390018 */ lw $t9, %lo(D_80160018)($t9) -/* B06948 8008F7A8 3C0E0602 */ lui $t6, %hi(D_060257B8) # $t6, 0x602 -/* B0694C 8008F7AC 25CE57B8 */ addiu $t6, %lo(D_060257B8) # addiu $t6, $t6, 0x57b8 -/* B06950 8008F7B0 17210005 */ bne $t9, $at, .L8008F7C8 -/* B06954 8008F7B4 00401825 */ move $v1, $v0 -/* B06958 8008F7B8 3C0B0602 */ lui $t3, %hi(D_06025658) # $t3, 0x602 -/* B0695C 8008F7BC 256B5658 */ addiu $t3, %lo(D_06025658) # addiu $t3, $t3, 0x5658 -/* B06960 8008F7C0 10000002 */ b .L8008F7CC -/* B06964 8008F7C4 AC4B0004 */ sw $t3, 4($v0) -.L8008F7C8: -/* B06968 8008F7C8 AC6E0004 */ sw $t6, 4($v1) -.L8008F7CC: -/* B0696C 8008F7CC 8FA600A0 */ lw $a2, 0xa0($sp) -.L8008F7D0: -/* B06970 8008F7D0 3C05DE00 */ lui $a1, 0xde00 -/* B06974 8008F7D4 3C0F8012 */ lui $t7, %hi(D_8012601C) # $t7, 0x8012 -/* B06978 8008F7D8 10C0001D */ beqz $a2, .L8008F850 -/* B0697C 8008F7DC 000660C0 */ sll $t4, $a2, 3 -/* B06980 8008F7E0 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B06984 8008F7E4 2598FFF8 */ addiu $t8, $t4, -8 -/* B06988 8008F7E8 25EF601C */ addiu $t7, %lo(D_8012601C) # addiu $t7, $t7, 0x601c -/* B0698C 8008F7EC 244D0008 */ addiu $t5, $v0, 8 -/* B06990 8008F7F0 AD0D02C0 */ sw $t5, 0x2c0($t0) -/* B06994 8008F7F4 030F2021 */ addu $a0, $t8, $t7 -/* B06998 8008F7F8 AC450000 */ sw $a1, ($v0) -/* B0699C 8008F7FC 8C990000 */ lw $t9, ($a0) -/* B069A0 8008F800 AC590004 */ sw $t9, 4($v0) -/* B069A4 8008F804 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B069A8 8008F808 244B0008 */ addiu $t3, $v0, 8 -/* B069AC 8008F80C AD0B02C0 */ sw $t3, 0x2c0($t0) -/* B069B0 8008F810 AC450000 */ sw $a1, ($v0) -/* B069B4 8008F814 8C8E0004 */ lw $t6, 4($a0) -/* B069B8 8008F818 1000000D */ b .L8008F850 -/* B069BC 8008F81C AC4E0004 */ sw $t6, 4($v0) -.L8008F820: -/* B069C0 8008F820 0C023C0D */ jal func_8008F034 -/* B069C4 8008F824 AFA80078 */ sw $t0, 0x78($sp) -/* B069C8 8008F828 18400009 */ blez $v0, .L8008F850 -/* B069CC 8008F82C 8FA80078 */ lw $t0, 0x78($sp) -/* B069D0 8008F830 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B069D4 8008F834 3C0C0601 */ lui $t4, %hi(D_06016118) # $t4, 0x601 -/* B069D8 8008F838 258C6118 */ addiu $t4, %lo(D_06016118) # addiu $t4, $t4, 0x6118 -/* B069DC 8008F83C 244D0008 */ addiu $t5, $v0, 8 -/* B069E0 8008F840 AD0D02C0 */ sw $t5, 0x2c0($t0) -/* B069E4 8008F844 3C05DE00 */ lui $a1, 0xde00 -/* B069E8 8008F848 AC450000 */ sw $a1, ($v0) -/* B069EC 8008F84C AC4C0004 */ sw $t4, 4($v0) -.L8008F850: -/* B069F0 8008F850 8FB80088 */ lw $t8, 0x88($sp) -.L8008F854: -/* B069F4 8008F854 3C068014 */ lui $a2, %hi(D_8013E784) # $a2, 0x8014 -/* B069F8 8008F858 24C6E784 */ addiu $a2, %lo(D_8013E784) # addiu $a2, $a2, -0x187c -/* B069FC 8008F85C 27A40068 */ addiu $a0, $sp, 0x68 -/* B06A00 8008F860 2407070B */ li $a3, 1803 -/* B06A04 8008F864 0C031AD5 */ jal Graph_CloseDisps -/* B06A08 8008F868 8F050000 */ lw $a1, ($t8) -/* B06A0C 8008F86C 8FBF0024 */ lw $ra, 0x24($sp) -/* B06A10 8008F870 27BD0088 */ addiu $sp, $sp, 0x88 -/* B06A14 8008F874 03E00008 */ jr $ra -/* B06A18 8008F878 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_8008F87C.s b/asm/non_matchings/code/z_player_lib/func_8008F87C.s deleted file mode 100644 index 5e5370290f..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8008F87C.s +++ /dev/null @@ -1,297 +0,0 @@ -.late_rodata -glabel D_8013E900 - .float 10430.378 - -glabel D_8013E904 - .float 3.1415927 # M_PI - -glabel D_8013E908 - .float 1.5707964 # M_PI / 2 - -.text -glabel func_8008F87C -/* B06A1C 8008F87C 27BDFF50 */ addiu $sp, $sp, -0xb0 -/* B06A20 8008F880 AFBF0024 */ sw $ra, 0x24($sp) -/* B06A24 8008F884 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B06A28 8008F888 AFA400B0 */ sw $a0, 0xb0($sp) -/* B06A2C 8008F88C AFA500B4 */ sw $a1, 0xb4($sp) -/* B06A30 8008F890 AFA600B8 */ sw $a2, 0xb8($sp) -/* B06A34 8008F894 AFA700BC */ sw $a3, 0xbc($sp) -/* B06A38 8008F898 C4A40054 */ lwc1 $f4, 0x54($a1) -/* B06A3C 8008F89C 44803000 */ mtc1 $zero, $f6 -/* B06A40 8008F8A0 00000000 */ nop -/* B06A44 8008F8A4 4604303E */ c.le.s $f6, $f4 -/* B06A48 8008F8A8 00000000 */ nop -/* B06A4C 8008F8AC 45020102 */ bc1fl .L8008FCB8 -/* B06A50 8008F8B0 8FBF0024 */ lw $ra, 0x24($sp) -/* B06A54 8008F8B4 8CAF067C */ lw $t7, 0x67c($a1) -/* B06A58 8008F8B8 00A02025 */ move $a0, $a1 -/* B06A5C 8008F8BC 31F80080 */ andi $t8, $t7, 0x80 -/* B06A60 8008F8C0 570000FD */ bnezl $t8, .L8008FCB8 -/* B06A64 8008F8C4 8FBF0024 */ lw $ra, 0x24($sp) -/* B06A68 8008F8C8 0C023C36 */ jal func_8008F0D8 -/* B06A6C 8008F8CC 80A50154 */ lb $a1, 0x154($a1) -/* B06A70 8008F8D0 044100F8 */ bgez $v0, .L8008FCB4 -/* B06A74 8008F8D4 3C038016 */ lui $v1, %hi(gSaveContext+4) # $v1, 0x8016 -/* B06A78 8008F8D8 8C63E664 */ lw $v1, %lo(gSaveContext+4)($v1) -/* B06A7C 8008F8DC 3C018012 */ lui $at, %hi(D_80126058) -/* B06A80 8008F8E0 8FB900B4 */ lw $t9, 0xb4($sp) -/* B06A84 8008F8E4 00031080 */ sll $v0, $v1, 2 -/* B06A88 8008F8E8 00220821 */ addu $at, $at, $v0 -/* B06A8C 8008F8EC C4286058 */ lwc1 $f8, %lo(D_80126058)($at) -/* B06A90 8008F8F0 3C018012 */ lui $at, %hi(D_80126060) -/* B06A94 8008F8F4 00220821 */ addu $at, $at, $v0 -/* B06A98 8008F8F8 C42A6060 */ lwc1 $f10, %lo(D_80126060)($at) -/* B06A9C 8008F8FC 3C018012 */ lui $at, %hi(D_80126068) -/* B06AA0 8008F900 00220821 */ addu $at, $at, $v0 -/* B06AA4 8008F904 E7A8007C */ swc1 $f8, 0x7c($sp) -/* B06AA8 8008F908 E7AA0078 */ swc1 $f10, 0x78($sp) -/* B06AAC 8008F90C C4246068 */ lwc1 $f4, %lo(D_80126068)($at) -/* B06AB0 8008F910 C72606C4 */ lwc1 $f6, 0x6c4($t9) -/* B06AB4 8008F914 0C034213 */ jal Matrix_Push -/* B06AB8 8008F918 46062501 */ sub.s $f20, $f4, $f6 -/* B06ABC 8008F91C 8FA400BC */ lw $a0, 0xbc($sp) -/* B06AC0 8008F920 0C0344D0 */ jal Matrix_JointPosition -/* B06AC4 8008F924 8FA500C0 */ lw $a1, 0xc0($sp) -/* B06AC8 8008F928 3C048012 */ lui $a0, %hi(D_8012602C) # $a0, 0x8012 -/* B06ACC 8008F92C 2484602C */ addiu $a0, %lo(D_8012602C) # addiu $a0, $a0, 0x602c -/* B06AD0 8008F930 0C0346BD */ jal Matrix_MultVec3f -/* B06AD4 8008F934 27A500A4 */ addiu $a1, $sp, 0xa4 -/* B06AD8 8008F938 8FA200C8 */ lw $v0, 0xc8($sp) -/* B06ADC 8008F93C 3C038016 */ lui $v1, %hi(gSaveContext+4) # $v1, 0x8016 -/* B06AE0 8008F940 8C63E664 */ lw $v1, %lo(gSaveContext+4)($v1) -/* B06AE4 8008F944 8FAE00B8 */ lw $t6, 0xb8($sp) -/* B06AE8 8008F948 00400821 */ addu $at, $v0, $zero -/* B06AEC 8008F94C 00021080 */ sll $v0, $v0, 2 -/* B06AF0 8008F950 00037880 */ sll $t7, $v1, 2 -/* B06AF4 8008F954 8DD90020 */ lw $t9, 0x20($t6) -/* B06AF8 8008F958 00411023 */ subu $v0, $v0, $at -/* B06AFC 8008F95C 3C188012 */ lui $t8, %hi(D_80126038) # $t8, 0x8012 -/* B06B00 8008F960 01E37823 */ subu $t7, $t7, $v1 -/* B06B04 8008F964 000F7880 */ sll $t7, $t7, 2 -/* B06B08 8008F968 27186038 */ addiu $t8, %lo(D_80126038) # addiu $t8, $t8, 0x6038 -/* B06B0C 8008F96C 00021040 */ sll $v0, $v0, 1 -/* B06B10 8008F970 AFA20038 */ sw $v0, 0x38($sp) -/* B06B14 8008F974 01F82021 */ addu $a0, $t7, $t8 -/* B06B18 8008F978 0C0344D0 */ jal Matrix_JointPosition -/* B06B1C 8008F97C 03222821 */ addu $a1, $t9, $v0 -/* B06B20 8008F980 3C038016 */ lui $v1, %hi(gSaveContext+4) -/* B06B24 8008F984 8C63E664 */ lw $v1, %lo(gSaveContext+4)($v1) -/* B06B28 8008F988 44807000 */ mtc1 $zero, $f14 -/* B06B2C 8008F98C 3C018012 */ lui $at, %hi(D_80126050) -/* B06B30 8008F990 00037880 */ sll $t7, $v1, 2 -/* B06B34 8008F994 002F0821 */ addu $at, $at, $t7 -/* B06B38 8008F998 44067000 */ mfc1 $a2, $f14 -/* B06B3C 8008F99C C42C6050 */ lwc1 $f12, %lo(D_80126050)($at) -/* B06B40 8008F9A0 0C034261 */ jal Matrix_Translate -/* B06B44 8008F9A4 24070001 */ li $a3, 1 -/* B06B48 8008F9A8 3C048012 */ lui $a0, %hi(D_8012602C) -/* B06B4C 8008F9AC 2484602C */ addiu $a0, %lo(D_8012602C) # addiu $a0, $a0, 0x602c -/* B06B50 8008F9B0 0C0346BD */ jal Matrix_MultVec3f -/* B06B54 8008F9B4 27A50098 */ addiu $a1, $sp, 0x98 -/* B06B58 8008F9B8 3C048012 */ lui $a0, %hi(D_80126070) -/* B06B5C 8008F9BC 24846070 */ addiu $a0, %lo(D_80126070) # addiu $a0, $a0, 0x6070 -/* B06B60 8008F9C0 0C0346BD */ jal Matrix_MultVec3f -/* B06B64 8008F9C4 27A5008C */ addiu $a1, $sp, 0x8c -/* B06B68 8008F9C8 0C034221 */ jal Matrix_Pull -/* B06B6C 8008F9CC 00000000 */ nop -/* B06B70 8008F9D0 3C014170 */ li $at, 0x41700000 # 0.000000 -/* B06B74 8008F9D4 44815000 */ mtc1 $at, $f10 -/* B06B78 8008F9D8 C7A80090 */ lwc1 $f8, 0x90($sp) -/* B06B7C 8008F9DC 8FA400B0 */ lw $a0, 0xb0($sp) -/* B06B80 8008F9E0 27B8008C */ addiu $t8, $sp, 0x8c -/* B06B84 8008F9E4 460A4100 */ add.s $f4, $f8, $f10 -/* B06B88 8008F9E8 248407C0 */ addiu $a0, $a0, 0x7c0 -/* B06B8C 8008F9EC AFA40034 */ sw $a0, 0x34($sp) -/* B06B90 8008F9F0 AFB80010 */ sw $t8, 0x10($sp) -/* B06B94 8008F9F4 E7A40090 */ swc1 $f4, 0x90($sp) -/* B06B98 8008F9F8 27A50088 */ addiu $a1, $sp, 0x88 -/* B06B9C 8008F9FC 27A60084 */ addiu $a2, $sp, 0x84 -/* B06BA0 8008FA00 0C00F269 */ jal func_8003C9A4 -/* B06BA4 8008FA04 8FA700B4 */ lw $a3, 0xb4($sp) -/* B06BA8 8008FA08 46140080 */ add.s $f2, $f0, $f20 -/* B06BAC 8008FA0C C7A6009C */ lwc1 $f6, 0x9c($sp) -/* B06BB0 8008FA10 C7A80098 */ lwc1 $f8, 0x98($sp) -/* B06BB4 8008FA14 C7AA00A4 */ lwc1 $f10, 0xa4($sp) -/* B06BB8 8008FA18 4602303C */ c.lt.s $f6, $f2 -/* B06BBC 8008FA1C E7A20080 */ swc1 $f2, 0x80($sp) -/* B06BC0 8008FA20 450200A5 */ bc1fl .L8008FCB8 -/* B06BC4 8008FA24 8FBF0024 */ lw $ra, 0x24($sp) -/* B06BC8 8008FA28 460A4301 */ sub.s $f12, $f8, $f10 -/* B06BCC 8008FA2C C7A800AC */ lwc1 $f8, 0xac($sp) -/* B06BD0 8008FA30 C7A400A0 */ lwc1 $f4, 0xa0($sp) -/* B06BD4 8008FA34 C7AA00A8 */ lwc1 $f10, 0xa8($sp) -/* B06BD8 8008FA38 E7AC0070 */ swc1 $f12, 0x70($sp) -/* B06BDC 8008FA3C 46082381 */ sub.s $f14, $f4, $f8 -/* B06BE0 8008FA40 460C6102 */ mul.s $f4, $f12, $f12 -/* B06BE4 8008FA44 460A3401 */ sub.s $f16, $f6, $f10 -/* B06BE8 8008FA48 E7AE0068 */ swc1 $f14, 0x68($sp) -/* B06BEC 8008FA4C 46108202 */ mul.s $f8, $f16, $f16 -/* B06BF0 8008FA50 46082180 */ add.s $f6, $f4, $f8 -/* B06BF4 8008FA54 460E7282 */ mul.s $f10, $f14, $f14 -/* B06BF8 8008FA58 C7A80078 */ lwc1 $f8, 0x78($sp) -/* B06BFC 8008FA5C 460A3000 */ add.s $f0, $f6, $f10 -/* B06C00 8008FA60 46000004 */ sqrt.s $f0, $f0 -/* B06C04 8008FA64 46000102 */ mul.s $f4, $f0, $f0 -/* B06C08 8008FA68 46000280 */ add.s $f10, $f0, $f0 -/* B06C0C 8008FA6C 46082180 */ add.s $f6, $f4, $f8 -/* B06C10 8008FA70 C7A4007C */ lwc1 $f4, 0x7c($sp) -/* B06C14 8008FA74 460A3083 */ div.s $f2, $f6, $f10 -/* B06C18 8008FA78 46021482 */ mul.s $f18, $f2, $f2 -/* B06C1C 8008FA7C E7A20060 */ swc1 $f2, 0x60($sp) -/* B06C20 8008FA80 C7AE0060 */ lwc1 $f14, 0x60($sp) -/* B06C24 8008FA84 4612203C */ c.lt.s $f4, $f18 -/* B06C28 8008FA88 46122501 */ sub.s $f20, $f4, $f18 -/* B06C2C 8008FA8C 45020005 */ bc1fl .L8008FAA4 -/* B06C30 8008FA90 4600A004 */ sqrt.s $f0, $f20 -/* B06C34 8008FA94 4480A000 */ mtc1 $zero, $f20 -/* B06C38 8008FA98 10000003 */ b .L8008FAA8 -/* B06C3C 8008FA9C 00000000 */ nop -/* B06C40 8008FAA0 4600A004 */ sqrt.s $f0, $f20 -.L8008FAA4: -/* B06C44 8008FAA4 46000506 */ mov.s $f20, $f0 -.L8008FAA8: -/* B06C48 8008FAA8 0C03F494 */ jal Math_atan2f -/* B06C4C 8008FAAC 4600A306 */ mov.s $f12, $f20 -/* B06C50 8008FAB0 C7A80080 */ lwc1 $f8, 0x80($sp) -/* B06C54 8008FAB4 C7A600A8 */ lwc1 $f6, 0xa8($sp) -/* B06C58 8008FAB8 C7AA0070 */ lwc1 $f10, 0x70($sp) -/* B06C5C 8008FABC E7A00054 */ swc1 $f0, 0x54($sp) -/* B06C60 8008FAC0 46064301 */ sub.s $f12, $f8, $f6 -/* B06C64 8008FAC4 460A5102 */ mul.s $f4, $f10, $f10 -/* B06C68 8008FAC8 C7AA0068 */ lwc1 $f10, 0x68($sp) -/* B06C6C 8008FACC 460C6202 */ mul.s $f8, $f12, $f12 -/* B06C70 8008FAD0 46082180 */ add.s $f6, $f4, $f8 -/* B06C74 8008FAD4 460A5102 */ mul.s $f4, $f10, $f10 -/* B06C78 8008FAD8 C7AA0078 */ lwc1 $f10, 0x78($sp) -/* B06C7C 8008FADC 46043000 */ add.s $f0, $f6, $f4 -/* B06C80 8008FAE0 46000004 */ sqrt.s $f0, $f0 -/* B06C84 8008FAE4 46000202 */ mul.s $f8, $f0, $f0 -/* B06C88 8008FAE8 46000100 */ add.s $f4, $f0, $f0 -/* B06C8C 8008FAEC 460A4180 */ add.s $f6, $f8, $f10 -/* B06C90 8008FAF0 C7AA007C */ lwc1 $f10, 0x7c($sp) -/* B06C94 8008FAF4 46043383 */ div.s $f14, $f6, $f4 -/* B06C98 8008FAF8 460E7482 */ mul.s $f18, $f14, $f14 -/* B06C9C 8008FAFC 460E0201 */ sub.s $f8, $f0, $f14 -/* B06CA0 8008FB00 E7A8005C */ swc1 $f8, 0x5c($sp) -/* B06CA4 8008FB04 4612503C */ c.lt.s $f10, $f18 -/* B06CA8 8008FB08 46125501 */ sub.s $f20, $f10, $f18 -/* B06CAC 8008FB0C 45020005 */ bc1fl .L8008FB24 -/* B06CB0 8008FB10 4600A004 */ sqrt.s $f0, $f20 -/* B06CB4 8008FB14 4480A000 */ mtc1 $zero, $f20 -/* B06CB8 8008FB18 10000003 */ b .L8008FB28 -/* B06CBC 8008FB1C 00000000 */ nop -/* B06CC0 8008FB20 4600A004 */ sqrt.s $f0, $f20 -.L8008FB24: -/* B06CC4 8008FB24 46000506 */ mov.s $f20, $f0 -.L8008FB28: -/* B06CC8 8008FB28 0C03F494 */ jal Math_atan2f -/* B06CCC 8008FB2C 4600A306 */ mov.s $f12, $f20 -/* B06CD0 8008FB30 C7AC005C */ lwc1 $f12, 0x5c($sp) -/* B06CD4 8008FB34 4600A386 */ mov.s $f14, $f20 -/* B06CD8 8008FB38 0C03F494 */ jal Math_atan2f -/* B06CDC 8008FB3C E7A00050 */ swc1 $f0, 0x50($sp) -/* B06CE0 8008FB40 3C018014 */ lui $at, %hi(D_8013E900) -/* B06CE4 8008FB44 C42CE900 */ lwc1 $f12, %lo(D_8013E900)($at) -/* B06CE8 8008FB48 3C018014 */ lui $at, %hi(D_8013E904) -/* B06CEC 8008FB4C C426E904 */ lwc1 $f6, %lo(D_8013E904)($at) -/* B06CF0 8008FB50 3C018014 */ lui $at, %hi(D_8013E908) -/* B06CF4 8008FB54 C7A20050 */ lwc1 $f2, 0x50($sp) -/* B06CF8 8008FB58 C424E908 */ lwc1 $f4, %lo(D_8013E908)($at) -/* B06CFC 8008FB5C 8FAA00B8 */ lw $t2, 0xb8($sp) -/* B06D00 8008FB60 8FAB0038 */ lw $t3, 0x38($sp) -/* B06D04 8008FB64 46022201 */ sub.s $f8, $f4, $f2 -/* B06D08 8008FB68 8D4E0020 */ lw $t6, 0x20($t2) -/* B06D0C 8008FB6C 34018000 */ li $at, 32768 -/* B06D10 8008FB70 46080280 */ add.s $f10, $f0, $f8 -/* B06D14 8008FB74 01CB1821 */ addu $v1, $t6, $t3 -/* B06D18 8008FB78 84790004 */ lh $t9, 4($v1) -/* B06D1C 8008FB7C 84620000 */ lh $v0, ($v1) -/* B06D20 8008FB80 460A3101 */ sub.s $f4, $f6, $f10 -/* B06D24 8008FB84 C7AA0054 */ lwc1 $f10, 0x54($sp) -/* B06D28 8008FB88 00022023 */ negu $a0, $v0 -/* B06D2C 8008FB8C 460C2202 */ mul.s $f8, $f4, $f12 -/* B06D30 8008FB90 460A1101 */ sub.s $f4, $f2, $f10 -/* B06D34 8008FB94 4600418D */ trunc.w.s $f6, $f8 -/* B06D38 8008FB98 460C2202 */ mul.s $f8, $f4, $f12 -/* B06D3C 8008FB9C 440E3000 */ mfc1 $t6, $f6 -/* B06D40 8008FBA0 00000000 */ nop -/* B06D44 8008FBA4 01D94823 */ subu $t1, $t6, $t9 -/* B06D48 8008FBA8 00094C00 */ sll $t1, $t1, 0x10 -/* B06D4C 8008FBAC 00094C03 */ sra $t1, $t1, 0x10 -/* B06D50 8008FBB0 04400003 */ bltz $v0, .L8008FBC0 -/* B06D54 8008FBB4 4600418D */ trunc.w.s $f6, $f8 -/* B06D58 8008FBB8 10000001 */ b .L8008FBC0 -/* B06D5C 8008FBBC 00402025 */ move $a0, $v0 -.L8008FBC0: -/* B06D60 8008FBC0 84620002 */ lh $v0, 2($v1) -/* B06D64 8008FBC4 8FAD00C0 */ lw $t5, 0xc0($sp) -/* B06D68 8008FBC8 04400003 */ bltz $v0, .L8008FBD8 -/* B06D6C 8008FBCC 00021823 */ negu $v1, $v0 -/* B06D70 8008FBD0 10000001 */ b .L8008FBD8 -/* B06D74 8008FBD4 00401825 */ move $v1, $v0 -.L8008FBD8: -/* B06D78 8008FBD8 00647821 */ addu $t7, $v1, $a0 -/* B06D7C 8008FBDC 000FC400 */ sll $t8, $t7, 0x10 -/* B06D80 8008FBE0 00187403 */ sra $t6, $t8, 0x10 -/* B06D84 8008FBE4 44023000 */ mfc1 $v0, $f6 -/* B06D88 8008FBE8 05C30005 */ bgezl $t6, .L8008FC00 -/* B06D8C 8008FBEC 85AF0004 */ lh $t7, 4($t5) -/* B06D90 8008FBF0 01214821 */ addu $t1, $t1, $at -/* B06D94 8008FBF4 00094C00 */ sll $t1, $t1, 0x10 -/* B06D98 8008FBF8 00094C03 */ sra $t1, $t1, 0x10 -/* B06D9C 8008FBFC 85AF0004 */ lh $t7, 4($t5) -.L8008FC00: -/* B06DA0 8008FC00 00021400 */ sll $v0, $v0, 0x10 -/* B06DA4 8008FC04 00021403 */ sra $v0, $v0, 0x10 -/* B06DA8 8008FC08 01E2C023 */ subu $t8, $t7, $v0 -/* B06DAC 8008FC0C A5B80004 */ sh $t8, 4($t5) -/* B06DB0 8008FC10 8FB900C4 */ lw $t9, 0xc4($sp) -/* B06DB4 8008FC14 240C0006 */ li $t4, 6 -/* B06DB8 8008FC18 8D4E0020 */ lw $t6, 0x20($t2) -/* B06DBC 8008FC1C 032C0019 */ multu $t9, $t4 -/* B06DC0 8008FC20 00007812 */ mflo $t7 -/* B06DC4 8008FC24 01CF3821 */ addu $a3, $t6, $t7 -/* B06DC8 8008FC28 84F80004 */ lh $t8, 4($a3) -/* B06DCC 8008FC2C 0302C823 */ subu $t9, $t8, $v0 -/* B06DD0 8008FC30 A4F90004 */ sh $t9, 4($a3) -/* B06DD4 8008FC34 8D4E0020 */ lw $t6, 0x20($t2) -/* B06DD8 8008FC38 01CB1821 */ addu $v1, $t6, $t3 -/* B06DDC 8008FC3C 846F0004 */ lh $t7, 4($v1) -/* B06DE0 8008FC40 01E9C021 */ addu $t8, $t7, $t1 -/* B06DE4 8008FC44 A4780004 */ sh $t8, 4($v1) -/* B06DE8 8008FC48 8FAE00CC */ lw $t6, 0xcc($sp) -/* B06DEC 8008FC4C 8D590020 */ lw $t9, 0x20($t2) -/* B06DF0 8008FC50 01CC0019 */ multu $t6, $t4 -/* B06DF4 8008FC54 00007812 */ mflo $t7 -/* B06DF8 8008FC58 032F4021 */ addu $t0, $t9, $t7 -/* B06DFC 8008FC5C 85180004 */ lh $t8, 4($t0) -/* B06E00 8008FC60 03027021 */ addu $t6, $t8, $v0 -/* B06E04 8008FC64 01C9C823 */ subu $t9, $t6, $t1 -/* B06E08 8008FC68 A5190004 */ sh $t9, 4($t0) -/* B06E0C 8008FC6C 8FA60084 */ lw $a2, 0x84($sp) -/* B06E10 8008FC70 8FA50088 */ lw $a1, 0x88($sp) -/* B06E14 8008FC74 0C010753 */ jal func_80041D4C -/* B06E18 8008FC78 8FA40034 */ lw $a0, 0x34($sp) -/* B06E1C 8008FC7C 28410002 */ slti $at, $v0, 2 -/* B06E20 8008FC80 1420000C */ bnez $at, .L8008FCB4 -/* B06E24 8008FC84 28410004 */ slti $at, $v0, 4 -/* B06E28 8008FC88 1020000A */ beqz $at, .L8008FCB4 -/* B06E2C 8008FC8C 8FA40034 */ lw $a0, 0x34($sp) -/* B06E30 8008FC90 8FA50088 */ lw $a1, 0x88($sp) -/* B06E34 8008FC94 0C010842 */ jal func_80042108 -/* B06E38 8008FC98 8FA60084 */ lw $a2, 0x84($sp) -/* B06E3C 8008FC9C 14400005 */ bnez $v0, .L8008FCB4 -/* B06E40 8008FCA0 C7AA0080 */ lwc1 $f10, 0x80($sp) -/* B06E44 8008FCA4 E7AA0090 */ swc1 $f10, 0x90($sp) -/* B06E48 8008FCA8 8FA400B0 */ lw $a0, 0xb0($sp) -/* B06E4C 8008FCAC 0C00A55A */ jal func_80029568 -/* B06E50 8008FCB0 27A5008C */ addiu $a1, $sp, 0x8c -.L8008FCB4: -/* B06E54 8008FCB4 8FBF0024 */ lw $ra, 0x24($sp) -.L8008FCB8: -/* B06E58 8008FCB8 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B06E5C 8008FCBC 27BD00B0 */ addiu $sp, $sp, 0xb0 -/* B06E60 8008FCC0 03E00008 */ jr $ra -/* B06E64 8008FCC4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_8008FCC8.s b/asm/non_matchings/code/z_player_lib/func_8008FCC8.s deleted file mode 100644 index 51e044ab93..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8008FCC8.s +++ /dev/null @@ -1,255 +0,0 @@ -.late_rodata -glabel D_8013E90C - .float 0.64 - -glabel D_8013E910 - .float 0.64 - -glabel D_8013E914 - .float 9.58738E-5 - -glabel D_8013E918 - .float 0.10546118 - -glabel D_8013E91C - .float 9.58738E-5 - -glabel D_8013E920 - .float 9.58738E-5 - -glabel D_8013E924 - .float 9.58738E-5 - -glabel D_8013E928 - .float 9.58738E-5 - -.text -glabel func_8008FCC8 -/* B06E68 8008FCC8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B06E6C 8008FCCC AFB10028 */ sw $s1, 0x28($sp) -/* B06E70 8008FCD0 24010001 */ li $at, 1 -/* B06E74 8008FCD4 00E08825 */ move $s1, $a3 -/* B06E78 8008FCD8 AFBF002C */ sw $ra, 0x2c($sp) -/* B06E7C 8008FCDC 14A10057 */ bne $a1, $at, .L8008FE3C -/* B06E80 8008FCE0 AFB00024 */ sw $s0, 0x24($sp) -/* B06E84 8008FCE4 8FB00044 */ lw $s0, 0x44($sp) -/* B06E88 8008FCE8 3C018016 */ lui $at, %hi(D_80160014) # $at, 0x8016 -/* B06E8C 8008FCEC 3C198016 */ lui $t9, %hi(gSaveContext+4) # $t9, 0x8016 -/* B06E90 8008FCF0 920E015C */ lbu $t6, 0x15c($s0) -/* B06E94 8008FCF4 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) -/* B06E98 8008FCF8 261808FC */ addiu $t8, $s0, 0x8fc -/* B06E9C 8008FCFC AC2E0014 */ sw $t6, %lo(D_80160014)($at) -/* B06EA0 8008FD00 920F015D */ lbu $t7, 0x15d($s0) -/* B06EA4 8008FD04 3C018016 */ lui $at, %hi(D_80160018) # $at, 0x8016 -/* B06EA8 8008FD08 AC2F0018 */ sw $t7, %lo(D_80160018)($at) -/* B06EAC 8008FD0C 3C018016 */ lui $at, %hi(D_80160000) -/* B06EB0 8008FD10 1320001B */ beqz $t9, .L8008FD80 -/* B06EB4 8008FD14 AC380000 */ sw $t8, %lo(D_80160000)($at) -/* B06EB8 8008FD18 920201E9 */ lbu $v0, 0x1e9($s0) -/* B06EBC 8008FD1C 3C018014 */ lui $at, %hi(D_8013E90C) -/* B06EC0 8008FD20 30430004 */ andi $v1, $v0, 4 -/* B06EC4 8008FD24 10600003 */ beqz $v1, .L8008FD34 -/* B06EC8 8008FD28 30480001 */ andi $t0, $v0, 1 -/* B06ECC 8008FD2C 1100000B */ beqz $t0, .L8008FD5C -/* B06ED0 8008FD30 00000000 */ nop -.L8008FD34: -/* B06ED4 8008FD34 C420E90C */ lwc1 $f0, %lo(D_8013E90C)($at) -/* B06ED8 8008FD38 C6240000 */ lwc1 $f4, ($s1) -/* B06EDC 8008FD3C C6280008 */ lwc1 $f8, 8($s1) -/* B06EE0 8008FD40 46002182 */ mul.s $f6, $f4, $f0 -/* B06EE4 8008FD44 00000000 */ nop -/* B06EE8 8008FD48 46004282 */ mul.s $f10, $f8, $f0 -/* B06EEC 8008FD4C E6260000 */ swc1 $f6, ($s1) -/* B06EF0 8008FD50 E62A0008 */ swc1 $f10, 8($s1) -/* B06EF4 8008FD54 920201E9 */ lbu $v0, 0x1e9($s0) -/* B06EF8 8008FD58 30430004 */ andi $v1, $v0, 4 -.L8008FD5C: -/* B06EFC 8008FD5C 3C018014 */ lui $at, %hi(D_8013E910) -/* B06F00 8008FD60 10600004 */ beqz $v1, .L8008FD74 -/* B06F04 8008FD64 C420E910 */ lwc1 $f0, %lo(D_8013E910)($at) -/* B06F08 8008FD68 30490002 */ andi $t1, $v0, 2 -/* B06F0C 8008FD6C 51200005 */ beql $t1, $zero, .L8008FD84 -/* B06F10 8008FD70 C6240004 */ lwc1 $f4, 4($s1) -.L8008FD74: -/* B06F14 8008FD74 C6300004 */ lwc1 $f16, 4($s1) -/* B06F18 8008FD78 46008482 */ mul.s $f18, $f16, $f0 -/* B06F1C 8008FD7C E6320004 */ swc1 $f18, 4($s1) -.L8008FD80: -/* B06F20 8008FD80 C6240004 */ lwc1 $f4, 4($s1) -.L8008FD84: -/* B06F24 8008FD84 C60606C4 */ lwc1 $f6, 0x6c4($s0) -/* B06F28 8008FD88 46062201 */ sub.s $f8, $f4, $f6 -/* B06F2C 8008FD8C E6280004 */ swc1 $f8, 4($s1) -/* B06F30 8008FD90 860406C2 */ lh $a0, 0x6c2($s0) -/* B06F34 8008FD94 5080009A */ beql $a0, $zero, .L80090000 -/* B06F38 8008FD98 00001025 */ move $v0, $zero -/* B06F3C 8008FD9C 0C01DE0D */ jal Math_Coss -/* B06F40 8008FDA0 00000000 */ nop -/* B06F44 8008FDA4 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B06F48 8008FDA8 44815000 */ mtc1 $at, $f10 -/* B06F4C 8008FDAC 3C014348 */ li $at, 0x43480000 # 0.000000 -/* B06F50 8008FDB0 44819000 */ mtc1 $at, $f18 -/* B06F54 8008FDB4 460A0401 */ sub.s $f16, $f0, $f10 -/* B06F58 8008FDB8 C6260004 */ lwc1 $f6, 4($s1) -/* B06F5C 8008FDBC C62C0000 */ lwc1 $f12, ($s1) -/* B06F60 8008FDC0 8E260008 */ lw $a2, 8($s1) -/* B06F64 8008FDC4 46128102 */ mul.s $f4, $f16, $f18 -/* B06F68 8008FDC8 24070001 */ li $a3, 1 -/* B06F6C 8008FDCC 0C034261 */ jal Matrix_Translate -/* B06F70 8008FDD0 46062380 */ add.s $f14, $f4, $f6 -/* B06F74 8008FDD4 860A06C2 */ lh $t2, 0x6c2($s0) -/* B06F78 8008FDD8 3C018014 */ lui $at, %hi(D_8013E914) -/* B06F7C 8008FDDC C430E914 */ lwc1 $f16, %lo(D_8013E914)($at) -/* B06F80 8008FDE0 448A4000 */ mtc1 $t2, $f8 -/* B06F84 8008FDE4 24050001 */ li $a1, 1 -/* B06F88 8008FDE8 468042A0 */ cvt.s.w $f10, $f8 -/* B06F8C 8008FDEC 46105302 */ mul.s $f12, $f10, $f16 -/* B06F90 8008FDF0 0C0342DC */ jal Matrix_RotateX -/* B06F94 8008FDF4 00000000 */ nop -/* B06F98 8008FDF8 8FA20040 */ lw $v0, 0x40($sp) -/* B06F9C 8008FDFC 24070001 */ li $a3, 1 -/* B06FA0 8008FE00 84440000 */ lh $a0, ($v0) -/* B06FA4 8008FE04 84450002 */ lh $a1, 2($v0) -/* B06FA8 8008FE08 0C034421 */ jal Matrix_RotateRPY -/* B06FAC 8008FE0C 84460004 */ lh $a2, 4($v0) -/* B06FB0 8008FE10 8FA20040 */ lw $v0, 0x40($sp) -/* B06FB4 8008FE14 44800000 */ mtc1 $zero, $f0 -/* B06FB8 8008FE18 00000000 */ nop -/* B06FBC 8008FE1C E6200008 */ swc1 $f0, 8($s1) -/* B06FC0 8008FE20 E6200004 */ swc1 $f0, 4($s1) -/* B06FC4 8008FE24 E6200000 */ swc1 $f0, ($s1) -/* B06FC8 8008FE28 A4400004 */ sh $zero, 4($v0) -/* B06FCC 8008FE2C 84430004 */ lh $v1, 4($v0) -/* B06FD0 8008FE30 A4430002 */ sh $v1, 2($v0) -/* B06FD4 8008FE34 10000071 */ b .L8008FFFC -/* B06FD8 8008FE38 A4430000 */ sh $v1, ($v0) -.L8008FE3C: -/* B06FDC 8008FE3C 8CCB0000 */ lw $t3, ($a2) -/* B06FE0 8008FE40 3C028016 */ lui $v0, %hi(D_80160000) -/* B06FE4 8008FE44 24420000 */ addiu $v0, %lo(D_80160000) -/* B06FE8 8008FE48 11600004 */ beqz $t3, .L8008FE5C -/* B06FEC 8008FE4C 2401000B */ li $at, 11 -/* B06FF0 8008FE50 8C4C0000 */ lw $t4, ($v0) -/* B06FF4 8008FE54 258D000C */ addiu $t5, $t4, 0xc -/* B06FF8 8008FE58 AC4D0000 */ sw $t5, ($v0) -.L8008FE5C: -/* B06FFC 8008FE5C 14A1000F */ bne $a1, $at, .L8008FE9C -/* B07000 8008FE60 8FA20040 */ lw $v0, 0x40($sp) -/* B07004 8008FE64 8FB00044 */ lw $s0, 0x44($sp) -/* B07008 8008FE68 844E0000 */ lh $t6, ($v0) -/* B0700C 8008FE6C 84590002 */ lh $t9, 2($v0) -/* B07010 8008FE70 860F06BA */ lh $t7, 0x6ba($s0) -/* B07014 8008FE74 844A0004 */ lh $t2, 4($v0) -/* B07018 8008FE78 01CFC021 */ addu $t8, $t6, $t7 -/* B0701C 8008FE7C A4580000 */ sh $t8, ($v0) -/* B07020 8008FE80 860806B8 */ lh $t0, 0x6b8($s0) -/* B07024 8008FE84 03284823 */ subu $t1, $t9, $t0 -/* B07028 8008FE88 A4490002 */ sh $t1, 2($v0) -/* B0702C 8008FE8C 860B06B6 */ lh $t3, 0x6b6($s0) -/* B07030 8008FE90 014B6021 */ addu $t4, $t2, $t3 -/* B07034 8008FE94 10000059 */ b .L8008FFFC -/* B07038 8008FE98 A44C0004 */ sh $t4, 4($v0) -.L8008FE9C: -/* B0703C 8008FE9C 2401000A */ li $at, 10 -/* B07040 8008FEA0 14A10034 */ bne $a1, $at, .L8008FF74 -/* B07044 8008FEA4 8FB00044 */ lw $s0, 0x44($sp) -/* B07048 8008FEA8 860D06B0 */ lh $t5, 0x6b0($s0) -/* B0704C 8008FEAC 3C018014 */ lui $at, %hi(D_8013E918) -/* B07050 8008FEB0 24050001 */ li $a1, 1 -/* B07054 8008FEB4 51A0000D */ beql $t5, $zero, .L8008FEEC -/* B07058 8008FEB8 860206BE */ lh $v0, 0x6be($s0) -/* B0705C 8008FEBC 0C0343B5 */ jal Matrix_RotateZ -/* B07060 8008FEC0 C42CE918 */ lwc1 $f12, %lo(D_8013E918)($at) -/* B07064 8008FEC4 860E06B0 */ lh $t6, 0x6b0($s0) -/* B07068 8008FEC8 3C018014 */ lui $at, %hi(D_8013E91C) -/* B0706C 8008FECC C426E91C */ lwc1 $f6, %lo(D_8013E91C)($at) -/* B07070 8008FED0 448E9000 */ mtc1 $t6, $f18 -/* B07074 8008FED4 24050001 */ li $a1, 1 -/* B07078 8008FED8 46809120 */ cvt.s.w $f4, $f18 -/* B0707C 8008FEDC 46062302 */ mul.s $f12, $f4, $f6 -/* B07080 8008FEE0 0C034348 */ jal Matrix_RotateY -/* B07084 8008FEE4 00000000 */ nop -/* B07088 8008FEE8 860206BE */ lh $v0, 0x6be($s0) -.L8008FEEC: -/* B0708C 8008FEEC 5040000A */ beql $v0, $zero, .L8008FF18 -/* B07090 8008FEF0 860206BC */ lh $v0, 0x6bc($s0) -/* B07094 8008FEF4 44824000 */ mtc1 $v0, $f8 -/* B07098 8008FEF8 3C018014 */ lui $at, %hi(D_8013E920) -/* B0709C 8008FEFC C430E920 */ lwc1 $f16, %lo(D_8013E920)($at) -/* B070A0 8008FF00 468042A0 */ cvt.s.w $f10, $f8 -/* B070A4 8008FF04 24050001 */ li $a1, 1 -/* B070A8 8008FF08 46105302 */ mul.s $f12, $f10, $f16 -/* B070AC 8008FF0C 0C034348 */ jal Matrix_RotateY -/* B070B0 8008FF10 00000000 */ nop -/* B070B4 8008FF14 860206BC */ lh $v0, 0x6bc($s0) -.L8008FF18: -/* B070B8 8008FF18 5040000A */ beql $v0, $zero, .L8008FF44 -/* B070BC 8008FF1C 860206C0 */ lh $v0, 0x6c0($s0) -/* B070C0 8008FF20 44829000 */ mtc1 $v0, $f18 -/* B070C4 8008FF24 3C018014 */ lui $at, %hi(D_8013E924) -/* B070C8 8008FF28 C426E924 */ lwc1 $f6, %lo(D_8013E924)($at) -/* B070CC 8008FF2C 46809120 */ cvt.s.w $f4, $f18 -/* B070D0 8008FF30 24050001 */ li $a1, 1 -/* B070D4 8008FF34 46062302 */ mul.s $f12, $f4, $f6 -/* B070D8 8008FF38 0C0342DC */ jal Matrix_RotateX -/* B070DC 8008FF3C 00000000 */ nop -/* B070E0 8008FF40 860206C0 */ lh $v0, 0x6c0($s0) -.L8008FF44: -/* B070E4 8008FF44 5040002E */ beql $v0, $zero, .L80090000 -/* B070E8 8008FF48 00001025 */ move $v0, $zero -/* B070EC 8008FF4C 44824000 */ mtc1 $v0, $f8 -/* B070F0 8008FF50 3C018014 */ lui $at, %hi(D_8013E928) -/* B070F4 8008FF54 C430E928 */ lwc1 $f16, %lo(D_8013E928)($at) -/* B070F8 8008FF58 468042A0 */ cvt.s.w $f10, $f8 -/* B070FC 8008FF5C 24050001 */ li $a1, 1 -/* B07100 8008FF60 46105302 */ mul.s $f12, $f10, $f16 -/* B07104 8008FF64 0C0343B5 */ jal Matrix_RotateZ -/* B07108 8008FF68 00000000 */ nop -/* B0710C 8008FF6C 10000024 */ b .L80090000 -/* B07110 8008FF70 00001025 */ move $v0, $zero -.L8008FF74: -/* B07114 8008FF74 24010007 */ li $at, 7 -/* B07118 8008FF78 14A1000E */ bne $a1, $at, .L8008FFB4 -/* B0711C 8008FF7C 8FA20040 */ lw $v0, 0x40($sp) -/* B07120 8008FF80 8FA50044 */ lw $a1, 0x44($sp) -/* B07124 8008FF84 240F0007 */ li $t7, 7 -/* B07128 8008FF88 24180008 */ li $t8, 8 -/* B0712C 8008FF8C 24190009 */ li $t9, 9 -/* B07130 8008FF90 AFB9001C */ sw $t9, 0x1c($sp) -/* B07134 8008FF94 AFB80018 */ sw $t8, 0x18($sp) -/* B07138 8008FF98 AFAF0014 */ sw $t7, 0x14($sp) -/* B0713C 8008FF9C 02203825 */ move $a3, $s1 -/* B07140 8008FFA0 AFA20010 */ sw $v0, 0x10($sp) -/* B07144 8008FFA4 0C023E1F */ jal func_8008F87C -/* B07148 8008FFA8 24A601B4 */ addiu $a2, $a1, 0x1b4 -/* B0714C 8008FFAC 10000014 */ b .L80090000 -/* B07150 8008FFB0 00001025 */ move $v0, $zero -.L8008FFB4: -/* B07154 8008FFB4 24010004 */ li $at, 4 -/* B07158 8008FFB8 14A1000E */ bne $a1, $at, .L8008FFF4 -/* B0715C 8008FFBC 8FA20040 */ lw $v0, 0x40($sp) -/* B07160 8008FFC0 8FA50044 */ lw $a1, 0x44($sp) -/* B07164 8008FFC4 24080004 */ li $t0, 4 -/* B07168 8008FFC8 24090005 */ li $t1, 5 -/* B0716C 8008FFCC 240A0006 */ li $t2, 6 -/* B07170 8008FFD0 AFAA001C */ sw $t2, 0x1c($sp) -/* B07174 8008FFD4 AFA90018 */ sw $t1, 0x18($sp) -/* B07178 8008FFD8 AFA80014 */ sw $t0, 0x14($sp) -/* B0717C 8008FFDC 02203825 */ move $a3, $s1 -/* B07180 8008FFE0 AFA20010 */ sw $v0, 0x10($sp) -/* B07184 8008FFE4 0C023E1F */ jal func_8008F87C -/* B07188 8008FFE8 24A601B4 */ addiu $a2, $a1, 0x1b4 -/* B0718C 8008FFEC 10000004 */ b .L80090000 -/* B07190 8008FFF0 00001025 */ move $v0, $zero -.L8008FFF4: -/* B07194 8008FFF4 10000002 */ b .L80090000 -/* B07198 8008FFF8 00001025 */ move $v0, $zero -.L8008FFFC: -/* B0719C 8008FFFC 00001025 */ move $v0, $zero -.L80090000: -/* B071A0 80090000 8FBF002C */ lw $ra, 0x2c($sp) -/* B071A4 80090004 8FB00024 */ lw $s0, 0x24($sp) -/* B071A8 80090008 8FB10028 */ lw $s1, 0x28($sp) -/* B071AC 8009000C 03E00008 */ jr $ra -/* B071B0 80090010 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/code/z_player_lib/func_80090014.s b/asm/non_matchings/code/z_player_lib/func_80090014.s deleted file mode 100644 index 5a8a008d9d..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_80090014.s +++ /dev/null @@ -1,200 +0,0 @@ -glabel func_80090014 -/* B071B4 80090014 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B071B8 80090018 AFB00020 */ sw $s0, 0x20($sp) -/* B071BC 8009001C 8FB0003C */ lw $s0, 0x3c($sp) -/* B071C0 80090020 8FAE0038 */ lw $t6, 0x38($sp) -/* B071C4 80090024 AFBF0024 */ sw $ra, 0x24($sp) -/* B071C8 80090028 AFA5002C */ sw $a1, 0x2c($sp) -/* B071CC 8009002C AFA60030 */ sw $a2, 0x30($sp) -/* B071D0 80090030 AFB00014 */ sw $s0, 0x14($sp) -/* B071D4 80090034 0C023F32 */ jal func_8008FCC8 -/* B071D8 80090038 AFAE0010 */ sw $t6, 0x10($sp) -/* B071DC 8009003C 8FA5002C */ lw $a1, 0x2c($sp) -/* B071E0 80090040 144000A6 */ bnez $v0, .L800902DC -/* B071E4 80090044 8FA60030 */ lw $a2, 0x30($sp) -/* B071E8 80090048 24070010 */ li $a3, 16 -/* B071EC 8009004C 14A70043 */ bne $a1, $a3, .L8009015C -/* B071F0 80090050 24040013 */ li $a0, 19 -/* B071F4 80090054 3C048016 */ lui $a0, %hi(D_80160014) -/* B071F8 80090058 24840014 */ addiu $a0, %lo(D_80160014) # addiu $a0, $a0, 0x14 -/* B071FC 8009005C 8C830000 */ lw $v1, ($a0) -/* B07200 80090060 24010004 */ li $at, 4 -/* B07204 80090064 8E020164 */ lw $v0, 0x164($s0) -/* B07208 80090068 14610011 */ bne $v1, $at, .L800900B0 -/* B0720C 8009006C 3C058016 */ lui $a1, %hi(gSaveContext) -/* B07210 80090070 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* B07214 80090074 94AF0036 */ lhu $t7, 0x36($a1) -/* B07218 80090078 44802000 */ mtc1 $zero, $f4 -/* B0721C 8009007C 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B07220 80090080 448F3000 */ mtc1 $t7, $f6 -/* B07224 80090084 05E10004 */ bgez $t7, .L80090098 -/* B07228 80090088 46803220 */ cvt.s.w $f8, $f6 -/* B0722C 8009008C 44815000 */ mtc1 $at, $f10 -/* B07230 80090090 00000000 */ nop -/* B07234 80090094 460A4200 */ add.s $f8, $f8, $f10 -.L80090098: -/* B07238 80090098 4604403E */ c.le.s $f8, $f4 -/* B0723C 8009009C 00000000 */ nop -/* B07240 800900A0 45000003 */ bc1f .L800900B0 -/* B07244 800900A4 00000000 */ nop -/* B07248 800900A8 10000025 */ b .L80090140 -/* B0724C 800900AC 24420010 */ addiu $v0, $v0, 0x10 -.L800900B0: -/* B07250 800900B0 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 -/* B07254 800900B4 24010006 */ li $at, 6 -/* B07258 800900B8 1461000C */ bne $v1, $at, .L800900EC -/* B0725C 800900BC 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 -/* B07260 800900C0 8E18067C */ lw $t8, 0x67c($s0) -/* B07264 800900C4 3C0A8012 */ lui $t2, %hi(D_80125E08) # $t2, 0x8012 -/* B07268 800900C8 0018C980 */ sll $t9, $t8, 6 -/* B0726C 800900CC 07230008 */ bgezl $t9, .L800900F0 -/* B07270 800900D0 920B015C */ lbu $t3, 0x15c($s0) -/* B07274 800900D4 8CA80004 */ lw $t0, 4($a1) -/* B07278 800900D8 254A5E08 */ addiu $t2, %lo(D_80125E08) # addiu $t2, $t2, 0x5e08 -/* B0727C 800900DC AC800000 */ sw $zero, ($a0) -/* B07280 800900E0 00084880 */ sll $t1, $t0, 2 -/* B07284 800900E4 10000016 */ b .L80090140 -/* B07288 800900E8 012A1021 */ addu $v0, $t1, $t2 -.L800900EC: -/* B0728C 800900EC 920B015C */ lbu $t3, 0x15c($s0) -.L800900F0: -/* B07290 800900F0 3C014000 */ li $at, 0x40000000 # 0.000000 -/* B07294 800900F4 15600012 */ bnez $t3, .L80090140 -/* B07298 800900F8 00000000 */ nop -/* B0729C 800900FC 44818000 */ mtc1 $at, $f16 -/* B072A0 80090100 C6120068 */ lwc1 $f18, 0x68($s0) -/* B072A4 80090104 4612803C */ c.lt.s $f16, $f18 -/* B072A8 80090108 00000000 */ nop -/* B072AC 8009010C 4500000C */ bc1f .L80090140 -/* B072B0 80090110 00000000 */ nop -/* B072B4 80090114 8E0C067C */ lw $t4, 0x67c($s0) -/* B072B8 80090118 3C188012 */ lui $t8, %hi(D_80125E18) # $t8, 0x8012 -/* B072BC 8009011C 27185E18 */ addiu $t8, %lo(D_80125E18) # addiu $t8, $t8, 0x5e18 -/* B072C0 80090120 000C6900 */ sll $t5, $t4, 4 -/* B072C4 80090124 05A00006 */ bltz $t5, .L80090140 -/* B072C8 80090128 00000000 */ nop -/* B072CC 8009012C 8CAE0004 */ lw $t6, 4($a1) -/* B072D0 80090130 24190001 */ li $t9, 1 -/* B072D4 80090134 AC990000 */ sw $t9, ($a0) -/* B072D8 80090138 000E7880 */ sll $t7, $t6, 2 -/* B072DC 8009013C 01F81021 */ addu $v0, $t7, $t8 -.L80090140: -/* B072E0 80090140 3C088016 */ lui $t0, %hi(D_80160004) # $t0, 0x8016 -/* B072E4 80090144 8D080004 */ lw $t0, %lo(D_80160004)($t0) -/* B072E8 80090148 00084880 */ sll $t1, $t0, 2 -/* B072EC 8009014C 00495021 */ addu $t2, $v0, $t1 -/* B072F0 80090150 8D4B0000 */ lw $t3, ($t2) -/* B072F4 80090154 10000061 */ b .L800902DC -/* B072F8 80090158 ACCB0000 */ sw $t3, ($a2) -.L8009015C: -/* B072FC 8009015C 14A40029 */ bne $a1, $a0, .L80090204 -/* B07300 80090160 24010014 */ li $at, 20 -/* B07304 80090164 3C038016 */ lui $v1, %hi(D_80160018) # $v1, 0x8016 -/* B07308 80090168 24630018 */ addiu $v1, %lo(D_80160018) # addiu $v1, $v1, 0x18 -/* B0730C 8009016C 8C6C0000 */ lw $t4, ($v1) -/* B07310 80090170 2401000A */ li $at, 10 -/* B07314 80090174 8E020160 */ lw $v0, 0x160($s0) -/* B07318 80090178 55810006 */ bnel $t4, $at, .L80090194 -/* B0731C 8009017C 920F015D */ lbu $t7, 0x15d($s0) -/* B07320 80090180 820D014E */ lb $t5, 0x14e($s0) -/* B07324 80090184 000D7100 */ sll $t6, $t5, 4 -/* B07328 80090188 10000017 */ b .L800901E8 -/* B0732C 8009018C 004E1021 */ addu $v0, $v0, $t6 -/* B07330 80090190 920F015D */ lbu $t7, 0x15d($s0) -.L80090194: -/* B07334 80090194 24010008 */ li $at, 8 -/* B07338 80090198 15E10013 */ bne $t7, $at, .L800901E8 -/* B0733C 8009019C 3C014000 */ li $at, 0x40000000 # 0.000000 -/* B07340 800901A0 44813000 */ mtc1 $at, $f6 -/* B07344 800901A4 C60A0068 */ lwc1 $f10, 0x68($s0) -/* B07348 800901A8 460A303C */ c.lt.s $f6, $f10 -/* B0734C 800901AC 00000000 */ nop -/* B07350 800901B0 4500000D */ bc1f .L800901E8 -/* B07354 800901B4 00000000 */ nop -/* B07358 800901B8 8E18067C */ lw $t8, 0x67c($s0) -/* B0735C 800901BC 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 -/* B07360 800901C0 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 -/* B07364 800901C4 0018C900 */ sll $t9, $t8, 4 -/* B07368 800901C8 07200007 */ bltz $t9, .L800901E8 -/* B0736C 800901CC 3C0A8012 */ lui $t2, %hi(D_80125E58) # $t2, 0x8012 -/* B07370 800901D0 8CA80004 */ lw $t0, 4($a1) -/* B07374 800901D4 254A5E58 */ addiu $t2, %lo(D_80125E58) # addiu $t2, $t2, 0x5e58 -/* B07378 800901D8 240B0009 */ li $t3, 9 -/* B0737C 800901DC 00084880 */ sll $t1, $t0, 2 -/* B07380 800901E0 012A1021 */ addu $v0, $t1, $t2 -/* B07384 800901E4 AC6B0000 */ sw $t3, ($v1) -.L800901E8: -/* B07388 800901E8 3C0C8016 */ lui $t4, %hi(D_80160004) # $t4, 0x8016 -/* B0738C 800901EC 8D8C0004 */ lw $t4, %lo(D_80160004)($t4) -/* B07390 800901F0 000C6880 */ sll $t5, $t4, 2 -/* B07394 800901F4 004D7021 */ addu $t6, $v0, $t5 -/* B07398 800901F8 8DCF0000 */ lw $t7, ($t6) -/* B0739C 800901FC 10000037 */ b .L800902DC -/* B073A0 80090200 ACCF0000 */ sw $t7, ($a2) -.L80090204: -/* B073A4 80090204 14A1002C */ bne $a1, $at, .L800902B8 -/* B073A8 80090208 3C0B8016 */ lui $t3, %hi(D_80160004) # $t3, 0x8016 -/* B073AC 8009020C 9202015E */ lbu $v0, 0x15e($s0) -/* B073B0 80090210 24010012 */ li $at, 18 -/* B073B4 80090214 8E030168 */ lw $v1, 0x168($s0) -/* B073B8 80090218 10410003 */ beq $v0, $at, .L80090228 -/* B073BC 8009021C 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 -/* B073C0 80090220 14820010 */ bne $a0, $v0, .L80090264 -/* B073C4 80090224 00000000 */ nop -.L80090228: -/* B073C8 80090228 8202014E */ lb $v0, 0x14e($s0) -/* B073CC 8009022C 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 -/* B073D0 80090230 8CB90004 */ lw $t9, 4($a1) -/* B073D4 80090234 0002C100 */ sll $t8, $v0, 4 -/* B073D8 80090238 00781821 */ addu $v1, $v1, $t8 -/* B073DC 8009023C 13200018 */ beqz $t9, .L800902A0 -/* B073E0 80090240 28410002 */ slti $at, $v0, 2 -/* B073E4 80090244 10200016 */ beqz $at, .L800902A0 -/* B073E8 80090248 00000000 */ nop -/* B073EC 8009024C 90A80068 */ lbu $t0, 0x68($a1) -/* B073F0 80090250 2401003B */ li $at, 59 -/* B073F4 80090254 11010012 */ beq $t0, $at, .L800902A0 -/* B073F8 80090258 00000000 */ nop -/* B073FC 8009025C 10000010 */ b .L800902A0 -/* B07400 80090260 24630040 */ addiu $v1, $v1, 0x40 -.L80090264: -/* B07404 80090264 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 -/* B07408 80090268 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 -/* B0740C 8009026C 8CA90004 */ lw $t1, 4($a1) -/* B07410 80090270 1120000B */ beqz $t1, .L800902A0 -/* B07414 80090274 00000000 */ nop -/* B07418 80090278 10E20003 */ beq $a3, $v0, .L80090288 -/* B0741C 8009027C 24010011 */ li $at, 17 -/* B07420 80090280 14410007 */ bne $v0, $at, .L800902A0 -/* B07424 80090284 00000000 */ nop -.L80090288: -/* B07428 80090288 90AA0068 */ lbu $t2, 0x68($a1) -/* B0742C 8009028C 2401003B */ li $at, 59 -/* B07430 80090290 11410003 */ beq $t2, $at, .L800902A0 -/* B07434 80090294 00000000 */ nop -/* B07438 80090298 3C038012 */ lui $v1, %hi(D_80125D68) # $v1, 0x8012 -/* B0743C 8009029C 24635D68 */ addiu $v1, %lo(D_80125D68) # addiu $v1, $v1, 0x5d68 -.L800902A0: -/* B07440 800902A0 8D6B0004 */ lw $t3, %lo(D_80160004)($t3) -/* B07444 800902A4 000B6080 */ sll $t4, $t3, 2 -/* B07448 800902A8 006C6821 */ addu $t5, $v1, $t4 -/* B0744C 800902AC 8DAE0000 */ lw $t6, ($t5) -/* B07450 800902B0 1000000A */ b .L800902DC -/* B07454 800902B4 ACCE0000 */ sw $t6, ($a2) -.L800902B8: -/* B07458 800902B8 24010002 */ li $at, 2 -/* B0745C 800902BC 14A10007 */ bne $a1, $at, .L800902DC -/* B07460 800902C0 3C188016 */ lui $t8, %hi(D_80160004) # $t8, 0x8016 -/* B07464 800902C4 8F180004 */ lw $t8, %lo(D_80160004)($t8) -/* B07468 800902C8 8E0F016C */ lw $t7, 0x16c($s0) -/* B0746C 800902CC 0018C880 */ sll $t9, $t8, 2 -/* B07470 800902D0 01F94021 */ addu $t0, $t7, $t9 -/* B07474 800902D4 8D090000 */ lw $t1, ($t0) -/* B07478 800902D8 ACC90000 */ sw $t1, ($a2) -.L800902DC: -/* B0747C 800902DC 8FBF0024 */ lw $ra, 0x24($sp) -/* B07480 800902E0 8FB00020 */ lw $s0, 0x20($sp) -/* B07484 800902E4 27BD0028 */ addiu $sp, $sp, 0x28 -/* B07488 800902E8 03E00008 */ jr $ra -/* B0748C 800902EC 00001025 */ move $v0, $zero - diff --git a/asm/non_matchings/code/z_player_lib/func_800902F0.s b/asm/non_matchings/code/z_player_lib/func_800902F0.s deleted file mode 100644 index 3ae74b4e45..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_800902F0.s +++ /dev/null @@ -1,93 +0,0 @@ -glabel func_800902F0 -/* B07490 800902F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B07494 800902F4 8FAE0030 */ lw $t6, 0x30($sp) -/* B07498 800902F8 8FAF0034 */ lw $t7, 0x34($sp) -/* B0749C 800902FC AFBF001C */ sw $ra, 0x1c($sp) -/* B074A0 80090300 AFA50024 */ sw $a1, 0x24($sp) -/* B074A4 80090304 AFA60028 */ sw $a2, 0x28($sp) -/* B074A8 80090308 AFAE0010 */ sw $t6, 0x10($sp) -/* B074AC 8009030C 0C023F32 */ jal func_8008FCC8 -/* B074B0 80090310 AFAF0014 */ sw $t7, 0x14($sp) -/* B074B4 80090314 8FA40034 */ lw $a0, 0x34($sp) -/* B074B8 80090318 8FA50024 */ lw $a1, 0x24($sp) -/* B074BC 8009031C 14400043 */ bnez $v0, .L8009042C -/* B074C0 80090320 8FA60028 */ lw $a2, 0x28($sp) -/* B074C4 80090324 909806AD */ lbu $t8, 0x6ad($a0) -/* B074C8 80090328 24010002 */ li $at, 2 -/* B074CC 8009032C 53010004 */ beql $t8, $at, .L80090340 -/* B074D0 80090330 2401000F */ li $at, 15 -/* B074D4 80090334 1000003D */ b .L8009042C -/* B074D8 80090338 ACC00000 */ sw $zero, ($a2) -/* B074DC 8009033C 2401000F */ li $at, 15 -.L80090340: -/* B074E0 80090340 14A10008 */ bne $a1, $at, .L80090364 -/* B074E4 80090344 3C028016 */ lui $v0, %hi(gSaveContext+4) # $v0, 0x8016 -/* B074E8 80090348 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) -/* B074EC 8009034C 3C088012 */ lui $t0, %hi(D_80125F18) -/* B074F0 80090350 0002C880 */ sll $t9, $v0, 2 -/* B074F4 80090354 01194021 */ addu $t0, $t0, $t9 -/* B074F8 80090358 8D085F18 */ lw $t0, %lo(D_80125F18)($t0) -/* B074FC 8009035C 10000033 */ b .L8009042C -/* B07500 80090360 ACC80000 */ sw $t0, ($a2) -.L80090364: -/* B07504 80090364 24010010 */ li $at, 16 -/* B07508 80090368 14A10008 */ bne $a1, $at, .L8009038C -/* B0750C 8009036C 3C028016 */ lui $v0, %hi(gSaveContext+4) # $v0, 0x8016 -/* B07510 80090370 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) -/* B07514 80090374 3C0A8012 */ lui $t2, %hi(D_80125F20) -/* B07518 80090378 00024880 */ sll $t1, $v0, 2 -/* B0751C 8009037C 01495021 */ addu $t2, $t2, $t1 -/* B07520 80090380 8D4A5F20 */ lw $t2, %lo(D_80125F20)($t2) -/* B07524 80090384 10000029 */ b .L8009042C -/* B07528 80090388 ACCA0000 */ sw $t2, ($a2) -.L8009038C: -/* B0752C 8009038C 24010011 */ li $at, 17 -/* B07530 80090390 14A10008 */ bne $a1, $at, .L800903B4 -/* B07534 80090394 3C028016 */ lui $v0, %hi(gSaveContext+4) # $v0, 0x8016 -/* B07538 80090398 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) -/* B0753C 8009039C 3C0C8012 */ lui $t4, %hi(D_80125F28) -/* B07540 800903A0 00025880 */ sll $t3, $v0, 2 -/* B07544 800903A4 018B6021 */ addu $t4, $t4, $t3 -/* B07548 800903A8 8D8C5F28 */ lw $t4, %lo(D_80125F28)($t4) -/* B0754C 800903AC 1000001F */ b .L8009042C -/* B07550 800903B0 ACCC0000 */ sw $t4, ($a2) -.L800903B4: -/* B07554 800903B4 24010012 */ li $at, 18 -/* B07558 800903B8 14A10008 */ bne $a1, $at, .L800903DC -/* B0755C 800903BC 3C028016 */ lui $v0, %hi(gSaveContext+4) # $v0, 0x8016 -/* B07560 800903C0 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) -/* B07564 800903C4 3C0E8012 */ lui $t6, %hi(D_80125F30) -/* B07568 800903C8 00026880 */ sll $t5, $v0, 2 -/* B0756C 800903CC 01CD7021 */ addu $t6, $t6, $t5 -/* B07570 800903D0 8DCE5F30 */ lw $t6, %lo(D_80125F30)($t6) -/* B07574 800903D4 10000015 */ b .L8009042C -/* B07578 800903D8 ACCE0000 */ sw $t6, ($a2) -.L800903DC: -/* B0757C 800903DC 24010013 */ li $at, 19 -/* B07580 800903E0 54A10012 */ bnel $a1, $at, .L8009042C -/* B07584 800903E4 ACC00000 */ sw $zero, ($a2) -/* B07588 800903E8 0C023C41 */ jal func_8008F104 -/* B0758C 800903EC AFA60028 */ sw $a2, 0x28($sp) -/* B07590 800903F0 10400005 */ beqz $v0, .L80090408 -/* B07594 800903F4 8FA60028 */ lw $a2, 0x28($sp) -/* B07598 800903F8 3C0F0603 */ lui $t7, %hi(D_0602A738) # $t7, 0x603 -/* B0759C 800903FC 25EFA738 */ addiu $t7, %lo(D_0602A738) # addiu $t7, $t7, -0x58c8 -/* B075A0 80090400 1000000A */ b .L8009042C -/* B075A4 80090404 ACCF0000 */ sw $t7, ($a2) -.L80090408: -/* B075A8 80090408 3C028016 */ lui $v0, %hi(gSaveContext+4) # $v0, 0x8016 -/* B075AC 8009040C 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) -/* B075B0 80090410 3C198012 */ lui $t9, %hi(D_80125F38) -/* B075B4 80090414 0002C080 */ sll $t8, $v0, 2 -/* B075B8 80090418 0338C821 */ addu $t9, $t9, $t8 -/* B075BC 8009041C 8F395F38 */ lw $t9, %lo(D_80125F38)($t9) -/* B075C0 80090420 10000002 */ b .L8009042C -/* B075C4 80090424 ACD90000 */ sw $t9, ($a2) -/* B075C8 80090428 ACC00000 */ sw $zero, ($a2) -.L8009042C: -/* B075CC 8009042C 8FBF001C */ lw $ra, 0x1c($sp) -/* B075D0 80090430 27BD0020 */ addiu $sp, $sp, 0x20 -/* B075D4 80090434 00001025 */ move $v0, $zero -/* B075D8 80090438 03E00008 */ jr $ra -/* B075DC 8009043C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_80090AFC.s b/asm/non_matchings/code/z_player_lib/func_80090AFC.s deleted file mode 100644 index 85a0be9cc9..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_80090AFC.s +++ /dev/null @@ -1,163 +0,0 @@ -.rdata -glabel D_8013E7C0 - .asciz "../z_player_lib.c" - .balign 4 - -glabel D_8013E7D4 - .asciz "../z_player_lib.c" - .balign 4 - -glabel D_8013E7E8 - .asciz "../z_player_lib.c" - .balign 4 - -.late_rodata -glabel D_8013E938 - .float 0.08 - -glabel D_8013E93C - .float 0.08 - -.text -glabel func_80090AFC -/* B07C9C 80090AFC 27BDFF60 */ addiu $sp, $sp, -0xa0 -/* B07CA0 80090B00 AFB00030 */ sw $s0, 0x30($sp) -/* B07CA4 80090B04 44802000 */ mtc1 $zero, $f4 -/* B07CA8 80090B08 3C108012 */ lui $s0, %hi(D_801260C8) # $s0, 0x8012 -/* B07CAC 80090B0C 261060C8 */ addiu $s0, %lo(D_801260C8) # addiu $s0, $s0, 0x60c8 -/* B07CB0 80090B10 AFBF0034 */ sw $ra, 0x34($sp) -/* B07CB4 80090B14 AFA400A0 */ sw $a0, 0xa0($sp) -/* B07CB8 80090B18 AFA500A4 */ sw $a1, 0xa4($sp) -/* B07CBC 80090B1C 3C018012 */ lui $at, %hi(D_801260D0) -/* B07CC0 80090B20 AFA600A8 */ sw $a2, 0xa8($sp) -/* B07CC4 80090B24 27A5008C */ addiu $a1, $sp, 0x8c -/* B07CC8 80090B28 02002025 */ move $a0, $s0 -/* B07CCC 80090B2C 0C0346BD */ jal Matrix_MultVec3f -/* B07CD0 80090B30 E42460D0 */ swc1 $f4, %lo(D_801260D0)($at) -/* B07CD4 80090B34 C7A600A8 */ lwc1 $f6, 0xa8($sp) -/* B07CD8 80090B38 3C018012 */ lui $at, %hi(D_801260D0) -/* B07CDC 80090B3C 02002025 */ move $a0, $s0 -/* B07CE0 80090B40 27A50080 */ addiu $a1, $sp, 0x80 -/* B07CE4 80090B44 0C0346BD */ jal Matrix_MultVec3f -/* B07CE8 80090B48 E42660D0 */ swc1 $f6, %lo(D_801260D0)($at) -/* B07CEC 80090B4C 8FA400A0 */ lw $a0, 0xa0($sp) -/* B07CF0 80090B50 27AE009C */ addiu $t6, $sp, 0x9c -/* B07CF4 80090B54 240F0001 */ li $t7, 1 -/* B07CF8 80090B58 24180001 */ li $t8, 1 -/* B07CFC 80090B5C 24190001 */ li $t9, 1 -/* B07D00 80090B60 24080001 */ li $t0, 1 -/* B07D04 80090B64 27A90098 */ addiu $t1, $sp, 0x98 -/* B07D08 80090B68 AFA90024 */ sw $t1, 0x24($sp) -/* B07D0C 80090B6C AFA80020 */ sw $t0, 0x20($sp) -/* B07D10 80090B70 AFB9001C */ sw $t9, 0x1c($sp) -/* B07D14 80090B74 AFB80018 */ sw $t8, 0x18($sp) -/* B07D18 80090B78 AFAF0014 */ sw $t7, 0x14($sp) -/* B07D1C 80090B7C AFAE0010 */ sw $t6, 0x10($sp) -/* B07D20 80090B80 27A5008C */ addiu $a1, $sp, 0x8c -/* B07D24 80090B84 27A60080 */ addiu $a2, $sp, 0x80 -/* B07D28 80090B88 27A70074 */ addiu $a3, $sp, 0x74 -/* B07D2C 80090B8C 0C00F862 */ jal func_8003E188 -/* B07D30 80090B90 248407C0 */ addiu $a0, $a0, 0x7c0 -/* B07D34 80090B94 1040005D */ beqz $v0, .L80090D0C -/* B07D38 80090B98 8FAA00A0 */ lw $t2, 0xa0($sp) -/* B07D3C 80090B9C 8D450000 */ lw $a1, ($t2) -/* B07D40 80090BA0 3C068014 */ lui $a2, %hi(D_8013E7C0) # $a2, 0x8014 -/* B07D44 80090BA4 24C6E7C0 */ addiu $a2, %lo(D_8013E7C0) # addiu $a2, $a2, -0x1840 -/* B07D48 80090BA8 27A4004C */ addiu $a0, $sp, 0x4c -/* B07D4C 80090BAC 24070A0C */ li $a3, 2572 -/* B07D50 80090BB0 0C031AB1 */ jal Graph_OpenDisps -/* B07D54 80090BB4 00A08025 */ move $s0, $a1 -/* B07D58 80090BB8 8E0402B0 */ lw $a0, 0x2b0($s0) -/* B07D5C 80090BBC 0C024DDD */ jal Gfx_CallSetupDL -/* B07D60 80090BC0 24050007 */ li $a1, 7 -/* B07D64 80090BC4 AE0202B0 */ sw $v0, 0x2b0($s0) -/* B07D68 80090BC8 8FA400A0 */ lw $a0, 0xa0($sp) -/* B07D6C 80090BCC 3C010001 */ lui $at, (0x00011D60 >> 16) # lui $at, 1 -/* B07D70 80090BD0 34211D60 */ ori $at, (0x00011D60 & 0xFFFF) # ori $at, $at, 0x1d60 -/* B07D74 80090BD4 27A50074 */ addiu $a1, $sp, 0x74 -/* B07D78 80090BD8 27A60068 */ addiu $a2, $sp, 0x68 -/* B07D7C 80090BDC 27A70064 */ addiu $a3, $sp, 0x64 -/* B07D80 80090BE0 0C029B84 */ jal SkinMatrix_Vec3fMtxFMultXYZW -/* B07D84 80090BE4 00812021 */ addu $a0, $a0, $at -/* B07D88 80090BE8 3C014348 */ li $at, 0x43480000 # 0.000000 -/* B07D8C 80090BEC 44811000 */ mtc1 $at, $f2 -/* B07D90 80090BF0 C7A00064 */ lwc1 $f0, 0x64($sp) -/* B07D94 80090BF4 3C018014 */ lui $at, %hi(D_8013E938) -/* B07D98 80090BF8 00003825 */ move $a3, $zero -/* B07D9C 80090BFC 4602003C */ c.lt.s $f0, $f2 -/* B07DA0 80090C00 00000000 */ nop -/* B07DA4 80090C04 45020005 */ bc1fl .L80090C1C -/* B07DA8 80090C08 46020283 */ div.s $f10, $f0, $f2 -/* B07DAC 80090C0C C428E938 */ lwc1 $f8, %lo(D_8013E938)($at) -/* B07DB0 80090C10 10000006 */ b .L80090C2C -/* B07DB4 80090C14 E7A80060 */ swc1 $f8, 0x60($sp) -/* B07DB8 80090C18 46020283 */ div.s $f10, $f0, $f2 -.L80090C1C: -/* B07DBC 80090C1C 3C018014 */ lui $at, %hi(D_8013E93C) -/* B07DC0 80090C20 C430E93C */ lwc1 $f16, %lo(D_8013E93C)($at) -/* B07DC4 80090C24 46105302 */ mul.s $f12, $f10, $f16 -/* B07DC8 80090C28 E7AC0060 */ swc1 $f12, 0x60($sp) -.L80090C2C: -/* B07DCC 80090C2C C7AC0074 */ lwc1 $f12, 0x74($sp) -/* B07DD0 80090C30 C7AE0078 */ lwc1 $f14, 0x78($sp) -/* B07DD4 80090C34 0C034261 */ jal Matrix_Translate -/* B07DD8 80090C38 8FA6007C */ lw $a2, 0x7c($sp) -/* B07DDC 80090C3C C7AC0060 */ lwc1 $f12, 0x60($sp) -/* B07DE0 80090C40 24070001 */ li $a3, 1 -/* B07DE4 80090C44 44066000 */ mfc1 $a2, $f12 -/* B07DE8 80090C48 0C0342A3 */ jal Matrix_Scale -/* B07DEC 80090C4C 46006386 */ mov.s $f14, $f12 -/* B07DF0 80090C50 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B07DF4 80090C54 3C0CDA38 */ lui $t4, (0xDA380003 >> 16) # lui $t4, 0xda38 -/* B07DF8 80090C58 358C0003 */ ori $t4, (0xDA380003 & 0xFFFF) # ori $t4, $t4, 3 -/* B07DFC 80090C5C 244B0008 */ addiu $t3, $v0, 8 -/* B07E00 80090C60 AE0B02B0 */ sw $t3, 0x2b0($s0) -/* B07E04 80090C64 AC4C0000 */ sw $t4, ($v0) -/* B07E08 80090C68 8FAD00A0 */ lw $t5, 0xa0($sp) -/* B07E0C 80090C6C 3C058014 */ lui $a1, %hi(D_8013E7D4) # $a1, 0x8014 -/* B07E10 80090C70 24A5E7D4 */ addiu $a1, %lo(D_8013E7D4) # addiu $a1, $a1, -0x182c -/* B07E14 80090C74 8DA40000 */ lw $a0, ($t5) -/* B07E18 80090C78 24060A1B */ li $a2, 2587 -/* B07E1C 80090C7C 0C0346A2 */ jal Matrix_NewMtx -/* B07E20 80090C80 AFA20048 */ sw $v0, 0x48($sp) -/* B07E24 80090C84 8FA30048 */ lw $v1, 0x48($sp) -/* B07E28 80090C88 3C0FDB06 */ lui $t7, (0xDB060018 >> 16) # lui $t7, 0xdb06 -/* B07E2C 80090C8C 35EF0018 */ ori $t7, (0xDB060018 & 0xFFFF) # ori $t7, $t7, 0x18 -/* B07E30 80090C90 AC620004 */ sw $v0, 4($v1) -/* B07E34 80090C94 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B07E38 80090C98 3C0B0001 */ lui $t3, 1 -/* B07E3C 80090C9C 3C0DDE00 */ lui $t5, 0xde00 -/* B07E40 80090CA0 244E0008 */ addiu $t6, $v0, 8 -/* B07E44 80090CA4 AE0E02B0 */ sw $t6, 0x2b0($s0) -/* B07E48 80090CA8 AC4F0000 */ sw $t7, ($v0) -/* B07E4C 80090CAC 8FB900A4 */ lw $t9, 0xa4($sp) -/* B07E50 80090CB0 8FB800A0 */ lw $t8, 0xa0($sp) -/* B07E54 80090CB4 3C0E0603 */ lui $t6, %hi(D_0602CB48) # $t6, 0x603 -/* B07E58 80090CB8 8328001E */ lb $t0, 0x1e($t9) -/* B07E5C 80090CBC 25CECB48 */ addiu $t6, %lo(D_0602CB48) # addiu $t6, $t6, -0x34b8 -/* B07E60 80090CC0 3C068014 */ lui $a2, %hi(D_8013E7E8) # $a2, 0x8014 -/* B07E64 80090CC4 00084900 */ sll $t1, $t0, 4 -/* B07E68 80090CC8 01284821 */ addu $t1, $t1, $t0 -/* B07E6C 80090CCC 00094880 */ sll $t1, $t1, 2 -/* B07E70 80090CD0 03095021 */ addu $t2, $t8, $t1 -/* B07E74 80090CD4 016A5821 */ addu $t3, $t3, $t2 -/* B07E78 80090CD8 8D6B17B4 */ lw $t3, 0x17b4($t3) -/* B07E7C 80090CDC 24C6E7E8 */ addiu $a2, %lo(D_8013E7E8) # addiu $a2, $a2, -0x1818 -/* B07E80 80090CE0 27A4004C */ addiu $a0, $sp, 0x4c -/* B07E84 80090CE4 AC4B0004 */ sw $t3, 4($v0) -/* B07E88 80090CE8 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B07E8C 80090CEC 24070A20 */ li $a3, 2592 -/* B07E90 80090CF0 244C0008 */ addiu $t4, $v0, 8 -/* B07E94 80090CF4 AE0C02B0 */ sw $t4, 0x2b0($s0) -/* B07E98 80090CF8 AC4E0004 */ sw $t6, 4($v0) -/* B07E9C 80090CFC AC4D0000 */ sw $t5, ($v0) -/* B07EA0 80090D00 8FAF00A0 */ lw $t7, 0xa0($sp) -/* B07EA4 80090D04 0C031AD5 */ jal Graph_CloseDisps -/* B07EA8 80090D08 8DE50000 */ lw $a1, ($t7) -.L80090D0C: -/* B07EAC 80090D0C 8FBF0034 */ lw $ra, 0x34($sp) -/* B07EB0 80090D10 8FB00030 */ lw $s0, 0x30($sp) -/* B07EB4 80090D14 27BD00A0 */ addiu $sp, $sp, 0xa0 -/* B07EB8 80090D18 03E00008 */ jr $ra -/* B07EBC 80090D1C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_80090D20.s b/asm/non_matchings/code/z_player_lib/func_80090D20.s index e94ec3f663..ab2631daf7 100644 --- a/asm/non_matchings/code/z_player_lib/func_80090D20.s +++ b/asm/non_matchings/code/z_player_lib/func_80090D20.s @@ -190,7 +190,7 @@ glabel func_80090D20 /* B080A4 80090F04 820B0843 */ lb $t3, 0x843($s0) /* B080A8 80090F08 5160001B */ beql $t3, $zero, .L80090F78 /* B080AC 80090F0C 8DAF0000 */ lw $t7, ($t5) -/* B080B0 80090F10 0C023C73 */ jal func_8008F1CC +/* B080B0 80090F10 0C023C73 */ jal Player_HoldsBrokenKnife /* B080B4 80090F14 02002025 */ move $a0, $s0 /* B080B8 80090F18 10400005 */ beqz $v0, .L80090F30 /* B080BC 80090F1C 3C018014 */ lui $at, %hi(D_8013E94C) @@ -199,12 +199,12 @@ glabel func_80090D20 /* B080C8 80090F28 10000009 */ b .L80090F50 /* B080CC 80090F2C E4246080 */ swc1 $f4, %lo(D_80126080)($at) .L80090F30: -/* B080D0 80090F30 0C023C60 */ jal func_8008F180 +/* B080D0 80090F30 0C023C60 */ jal Player_GetSwordHeld /* B080D4 80090F34 02002025 */ move $a0, $s0 /* B080D8 80090F38 00026080 */ sll $t4, $v0, 2 -/* B080DC 80090F3C 3C018012 */ lui $at, %hi(D_801260E0) +/* B080DC 80090F3C 3C018012 */ lui $at, %hi(sSwordLengths) /* B080E0 80090F40 002C0821 */ addu $at, $at, $t4 -/* B080E4 80090F44 C42660E0 */ lwc1 $f6, %lo(D_801260E0)($at) +/* B080E4 80090F44 C42660E0 */ lwc1 $f6, %lo(sSwordLengths)($at) /* B080E8 80090F48 3C018012 */ lui $at, %hi(D_80126080) /* B080EC 80090F4C E4266080 */ swc1 $f6, %lo(D_80126080)($at) .L80090F50: @@ -225,13 +225,13 @@ glabel func_80090D20 /* B08124 80090F84 24010007 */ li $at, 7 /* B08128 80090F88 55C10049 */ bnel $t6, $at, .L800910B0 /* B0812C 80090F8C 44804000 */ mtc1 $zero, $f8 -/* B08130 80090F90 0C023C89 */ jal func_8008F224 +/* B08130 80090F90 0C023C89 */ jal Player_ActionToBottle /* B08134 80090F94 02002025 */ move $a0, $s0 /* B08138 80090F98 8FAA0190 */ lw $t2, 0x190($sp) /* B0813C 80090F9C 0002C080 */ sll $t8, $v0, 2 -/* B08140 80090FA0 3C198012 */ lui $t9, %hi(D_80126100) # $t9, 0x8012 +/* B08140 80090FA0 3C198012 */ lui $t9, %hi(sBottleColors) # $t9, 0x8012 /* B08144 80090FA4 8D450000 */ lw $a1, ($t2) -/* B08148 80090FA8 27396100 */ addiu $t9, %lo(D_80126100) # addiu $t9, $t9, 0x6100 +/* B08148 80090FA8 27396100 */ addiu $t9, %lo(sBottleColors) # addiu $t9, $t9, 0x6100 /* B0814C 80090FAC 0302C023 */ subu $t8, $t8, $v0 /* B08150 80090FB0 03194821 */ addu $t1, $t8, $t9 /* B08154 80090FB4 3C068014 */ lui $a2, %hi(D_8013E838) # $a2, 0x8014 @@ -284,11 +284,11 @@ glabel func_80090D20 /* B08210 80091070 AD0C02D0 */ sw $t4, 0x2d0($t0) /* B08214 80091074 AC4A0000 */ sw $t2, ($v0) /* B08218 80091078 8D29E664 */ lw $t1, %lo(gSaveContext+4)($t1) -/* B0821C 8009107C 3C0E8012 */ lui $t6, %hi(D_801260F8) +/* B0821C 8009107C 3C0E8012 */ lui $t6, %hi(sBottleDLists) /* B08220 80091080 24C6E860 */ addiu $a2, %lo(D_8013E860) # addiu $a2, $a2, -0x17a0 /* B08224 80091084 00096880 */ sll $t5, $t1, 2 /* B08228 80091088 01CD7021 */ addu $t6, $t6, $t5 -/* B0822C 8009108C 8DCE60F8 */ lw $t6, %lo(D_801260F8)($t6) +/* B0822C 8009108C 8DCE60F8 */ lw $t6, %lo(sBottleDLists)($t6) /* B08230 80091090 27A400CC */ addiu $a0, $sp, 0xcc /* B08234 80091094 24070A9D */ li $a3, 2717 /* B08238 80091098 AC4E0004 */ sw $t6, 4($v0) @@ -304,7 +304,7 @@ glabel func_80090D20 /* B08258 800910B8 00000000 */ nop /* B0825C 800910BC 4502019A */ bc1fl .L80091728 /* B08260 800910C0 8FBF0024 */ lw $ra, 0x24($sp) -/* B08264 800910C4 0C023C41 */ jal func_8008F104 +/* B08264 800910C4 0C023C41 */ jal Player_HoldsHookshot /* B08268 800910C8 02002025 */ move $a0, $s0 /* B0826C 800910CC 1440003F */ bnez $v0, .L800911CC /* B08270 800910D0 260409E0 */ addiu $a0, $s0, 0x9e0 @@ -405,9 +405,9 @@ glabel func_80090D20 /* B083D8 80091238 C6000054 */ lwc1 $f0, 0x54($s0) .L8009123C: /* B083DC 8009123C 8D4AE664 */ lw $t2, %lo(gSaveContext+4)($t2) -/* B083E0 80091240 3C0E8012 */ lui $t6, %hi(D_80126134) # $t6, 0x8012 +/* B083E0 80091240 3C0E8012 */ lui $t6, %hi(sBowStringData) # $t6, 0x8012 /* B083E4 80091244 8FAF0190 */ lw $t7, 0x190($sp) -/* B083E8 80091248 25CE6134 */ addiu $t6, %lo(D_80126134) # addiu $t6, $t6, 0x6134 +/* B083E8 80091248 25CE6134 */ addiu $t6, %lo(sBowStringData) # addiu $t6, $t6, 0x6134 /* B083EC 8009124C 000A6900 */ sll $t5, $t2, 4 /* B083F0 80091250 01AEC021 */ addu $t8, $t5, $t6 /* B083F4 80091254 AFB800B0 */ sw $t8, 0xb0($sp) @@ -639,8 +639,8 @@ glabel func_80090D20 /* B08744 800915A4 51E0000B */ beql $t7, $zero, .L800915D4 /* B08748 800915A8 C60809BC */ lwc1 $f8, 0x9bc($s0) /* B0874C 800915AC 820B0693 */ lb $t3, 0x693($s0) -/* B08750 800915B0 3C048016 */ lui $a0, %hi(D_80160008) # $a0, 0x8016 -/* B08754 800915B4 24840008 */ addiu $a0, %lo(D_80160008) # addiu $a0, $a0, 8 +/* B08750 800915B0 3C048016 */ lui $a0, %hi(sGetItemRefPos) # $a0, 0x8016 +/* B08754 800915B4 24840008 */ addiu $a0, %lo(sGetItemRefPos) # addiu $a0, $a0, 8 /* B08758 800915B8 51600006 */ beql $t3, $zero, .L800915D4 /* B0875C 800915BC C60809BC */ lwc1 $f8, 0x9bc($s0) /* B08760 800915C0 0C01DF90 */ jal Math_Vec3f_Copy @@ -653,28 +653,28 @@ glabel func_80090D20 /* B08778 800915D8 3C013F00 */ li $at, 0x3F000000 # 0.000000 /* B0877C 800915DC 44810000 */ mtc1 $at, $f0 /* B08780 800915E0 460A4400 */ add.s $f16, $f8, $f10 -/* B08784 800915E4 3C018016 */ lui $at, %hi(D_80160008) +/* B08784 800915E4 3C018016 */ lui $at, %hi(sGetItemRefPos) /* B08788 800915E8 46008482 */ mul.s $f18, $f16, $f0 -/* B0878C 800915EC E4320008 */ swc1 $f18, %lo(D_80160008)($at) +/* B0878C 800915EC E4320008 */ swc1 $f18, %lo(sGetItemRefPos)($at) /* B08790 800915F0 C60603B4 */ lwc1 $f6, 0x3b4($s0) /* B08794 800915F4 C60409C0 */ lwc1 $f4, 0x9c0($s0) /* B08798 800915F8 46062200 */ add.s $f8, $f4, $f6 /* B0879C 800915FC 46004282 */ mul.s $f10, $f8, $f0 -/* B087A0 80091600 E42A000C */ swc1 $f10, %lo(D_80160008+4)($at) +/* B087A0 80091600 E42A000C */ swc1 $f10, %lo(sGetItemRefPos+4)($at) /* B087A4 80091604 C61203B8 */ lwc1 $f18, 0x3b8($s0) /* B087A8 80091608 C61009C4 */ lwc1 $f16, 0x9c4($s0) -/* B087AC 8009160C 3C018016 */ lui $at, %hi(D_80160010) +/* B087AC 8009160C 3C018016 */ lui $at, %hi(sGetItemRefPos+8) /* B087B0 80091610 46128100 */ add.s $f4, $f16, $f18 /* B087B4 80091614 46002182 */ mul.s $f6, $f4, $f0 -/* B087B8 80091618 E4260010 */ swc1 $f6, %lo(D_80160010)($at) +/* B087B8 80091618 E4260010 */ swc1 $f6, %lo(sGetItemRefPos+8)($at) /* B087BC 8009161C 82190862 */ lb $t9, 0x862($s0) .L80091620: /* B087C0 80091620 8FA400B4 */ lw $a0, 0xb4($sp) -/* B087C4 80091624 3C058016 */ lui $a1, %hi(D_80160008) +/* B087C4 80091624 3C058016 */ lui $a1, %hi(sGetItemRefPos) /* B087C8 80091628 1720003E */ bnez $t9, .L80091724 /* B087CC 8009162C 24840024 */ addiu $a0, $a0, 0x24 /* B087D0 80091630 0C01DF90 */ jal Math_Vec3f_Copy -/* B087D4 80091634 24A50008 */ addiu $a1, %lo(D_80160008) # addiu $a1, $a1, 8 +/* B087D4 80091634 24A50008 */ addiu $a1, %lo(sGetItemRefPos) # addiu $a1, $a1, 8 /* B087D8 80091638 1000003B */ b .L80091728 /* B087DC 8009163C 8FBF0024 */ lw $ra, 0x24($sp) .L80091640: @@ -694,7 +694,7 @@ glabel func_80090D20 /* B08814 80091674 240100FF */ li $at, 255 /* B08818 80091678 5041002B */ beql $v0, $at, .L80091728 /* B0881C 8009167C 8FBF0024 */ lw $ra, 0x24($sp) -/* B08820 80091680 0C023A74 */ jal func_8008E9D0 +/* B08820 80091680 0C023A74 */ jal Player_IsChildWithHylianShield /* B08824 80091684 02002025 */ move $a0, $s0 /* B08828 80091688 10400006 */ beqz $v0, .L800916A4 /* B0882C 8009168C 8FA40190 */ lw $a0, 0x190($sp) diff --git a/asm/non_matchings/code/z_player_lib/func_80091738.s b/asm/non_matchings/code/z_player_lib/func_80091738.s deleted file mode 100644 index 68482d397f..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_80091738.s +++ /dev/null @@ -1,94 +0,0 @@ -.rdata -glabel D_8013E8B0 - .asciz "../z_player_lib.c" - .balign 4 - -glabel D_8013E8C4 - .asciz "../z_player_lib.c" - .balign 4 - -.text -glabel func_80091738 -/* B088D8 80091738 3C028016 */ lui $v0, %hi(gSaveContext+4) # $v0, 0x8016 -/* B088DC 8009173C 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) -/* B088E0 80091740 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B088E4 80091744 3C038012 */ lui $v1, %hi(gObjectTable) # $v1, 0x8012 -/* B088E8 80091748 24637528 */ addiu $v1, %lo(gObjectTable) # addiu $v1, $v1, 0x7528 -/* B088EC 8009174C AFA5004C */ sw $a1, 0x4c($sp) -/* B088F0 80091750 3C0F8012 */ lui $t7, %hi(gLinkObjectIds) -/* B088F4 80091754 00027040 */ sll $t6, $v0, 1 -/* B088F8 80091758 AFA40048 */ sw $a0, 0x48($sp) -/* B088FC 8009175C 01EE7821 */ addu $t7, $t7, $t6 -/* B08900 80091760 85EF7520 */ lh $t7, %lo(gLinkObjectIds)($t7) -/* B08904 80091764 8C650008 */ lw $a1, 8($v1) -/* B08908 80091768 8C78000C */ lw $t8, 0xc($v1) -/* B0890C 8009176C 8FA4004C */ lw $a0, 0x4c($sp) -/* B08910 80091770 AFBF002C */ sw $ra, 0x2c($sp) -/* B08914 80091774 AFA60050 */ sw $a2, 0x50($sp) -/* B08918 80091778 3C078014 */ lui $a3, %hi(D_8013E8B0) # $a3, 0x8014 -/* B0891C 8009177C 24190BA6 */ li $t9, 2982 -/* B08920 80091780 AFB00028 */ sw $s0, 0x28($sp) -/* B08924 80091784 AFB90010 */ sw $t9, 0x10($sp) -/* B08928 80091788 24E7E8B0 */ addiu $a3, %lo(D_8013E8B0) # addiu $a3, $a3, -0x1750 -/* B0892C 8009178C A7AF0046 */ sh $t7, 0x46($sp) -/* B08930 80091790 03053023 */ subu $a2, $t8, $a1 -/* B08934 80091794 0C0006A8 */ jal DmaMgr_SendRequest1 -/* B08938 80091798 24843800 */ addiu $a0, $a0, 0x3800 -/* B0893C 8009179C 87AA0046 */ lh $t2, 0x46($sp) -/* B08940 800917A0 3C0C8012 */ lui $t4, %hi(gObjectTable) # $t4, 0x8012 -/* B08944 800917A4 258C7528 */ addiu $t4, %lo(gObjectTable) # addiu $t4, $t4, 0x7528 -/* B08948 800917A8 000A58C0 */ sll $t3, $t2, 3 -/* B0894C 800917AC 016C1021 */ addu $v0, $t3, $t4 -/* B08950 800917B0 8C450000 */ lw $a1, ($v0) -/* B08954 800917B4 8C4D0004 */ lw $t5, 4($v0) -/* B08958 800917B8 8FA4004C */ lw $a0, 0x4c($sp) -/* B0895C 800917BC 34018800 */ li $at, 34816 -/* B08960 800917C0 3C078014 */ lui $a3, %hi(D_8013E8C4) # $a3, 0x8014 -/* B08964 800917C4 240E0BAC */ li $t6, 2988 -/* B08968 800917C8 01A58023 */ subu $s0, $t5, $a1 -/* B0896C 800917CC 00812021 */ addu $a0, $a0, $at -/* B08970 800917D0 AFA40034 */ sw $a0, 0x34($sp) -/* B08974 800917D4 02003025 */ move $a2, $s0 -/* B08978 800917D8 AFAE0010 */ sw $t6, 0x10($sp) -/* B0897C 800917DC 0C0006A8 */ jal DmaMgr_SendRequest1 -/* B08980 800917E0 24E7E8C4 */ addiu $a3, %lo(D_8013E8C4) # addiu $a3, $a3, -0x173c -/* B08984 800917E4 8FAF0034 */ lw $t7, 0x34($sp) -/* B08988 800917E8 2401FFF0 */ li $at, -16 -/* B0898C 800917EC 8FA9004C */ lw $t1, 0x4c($sp) -/* B08990 800917F0 01F01821 */ addu $v1, $t7, $s0 -/* B08994 800917F4 2463000F */ addiu $v1, $v1, 0xf -/* B08998 800917F8 00611824 */ and $v1, $v1, $at -/* B0899C 800917FC 3C018000 */ lui $at, (0x80003800 >> 16) # lui $at, 0x8000 -/* B089A0 80091800 34213800 */ ori $at, (0x80003800 & 0xFFFF) # ori $at, $at, 0x3800 -/* B089A4 80091804 0121C021 */ addu $t8, $t1, $at -/* B089A8 80091808 3C088016 */ lui $t0, %hi(gSegments) # $t0, 0x8016 -/* B089AC 8009180C 3C018000 */ lui $at, (0x80008800 >> 16) # lui $at, 0x8000 -/* B089B0 80091810 25086FA8 */ addiu $t0, %lo(gSegments) # addiu $t0, $t0, 0x6fa8 -/* B089B4 80091814 34218800 */ ori $at, (0x80008800 & 0xFFFF) # ori $at, $at, 0x8800 -/* B089B8 80091818 0121C821 */ addu $t9, $t1, $at -/* B089BC 8009181C AD180010 */ sw $t8, 0x10($t0) -/* B089C0 80091820 AD190018 */ sw $t9, 0x18($t0) -/* B089C4 80091824 3C028016 */ lui $v0, %hi(gSaveContext+4) # $v0, 0x8016 -/* B089C8 80091828 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) -/* B089CC 8009182C 3C068012 */ lui $a2, %hi(D_80125B70) -/* B089D0 80091830 3C070400 */ lui $a3, %hi(D_04003238) # $a3, 0x400 -/* B089D4 80091834 00025080 */ sll $t2, $v0, 2 -/* B089D8 80091838 00CA3021 */ addu $a2, $a2, $t2 -/* B089DC 8009183C 240B0009 */ li $t3, 9 -/* B089E0 80091840 240C0016 */ li $t4, 22 -/* B089E4 80091844 AFAC001C */ sw $t4, 0x1c($sp) -/* B089E8 80091848 AFAB0010 */ sw $t3, 0x10($sp) -/* B089EC 8009184C 8CC65B70 */ lw $a2, %lo(D_80125B70)($a2) -/* B089F0 80091850 24E73238 */ addiu $a3, %lo(D_04003238) # addiu $a3, $a3, 0x3238 -/* B089F4 80091854 AFA30014 */ sw $v1, 0x14($sp) -/* B089F8 80091858 AFA30018 */ sw $v1, 0x18($sp) -/* B089FC 8009185C 8FA40048 */ lw $a0, 0x48($sp) -/* B08A00 80091860 0C028E6B */ jal SkelAnime_InitLinkAnimetion -/* B08A04 80091864 8FA50050 */ lw $a1, 0x50($sp) -/* B08A08 80091868 8FBF002C */ lw $ra, 0x2c($sp) -/* B08A0C 8009186C 34018890 */ li $at, 34960 -/* B08A10 80091870 02011021 */ addu $v0, $s0, $at -/* B08A14 80091874 8FB00028 */ lw $s0, 0x28($sp) -/* B08A18 80091878 03E00008 */ jr $ra -/* B08A1C 8009187C 27BD0048 */ addiu $sp, $sp, 0x48 - diff --git a/asm/non_matchings/code/z_player_lib/func_80091880.s b/asm/non_matchings/code/z_player_lib/func_80091880.s deleted file mode 100644 index 2460bd5971..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_80091880.s +++ /dev/null @@ -1,117 +0,0 @@ -glabel func_80091880 -/* B08A20 80091880 AFA40000 */ sw $a0, ($sp) -/* B08A24 80091884 8FA40014 */ lw $a0, 0x14($sp) -/* B08A28 80091888 AFA60008 */ sw $a2, 8($sp) -/* B08A2C 8009188C AFA7000C */ sw $a3, 0xc($sp) -/* B08A30 80091890 908E0000 */ lbu $t6, ($a0) -/* B08A34 80091894 3C028012 */ lui $v0, %hi(D_801261F7) -/* B08A38 80091898 24080002 */ li $t0, 2 -/* B08A3C 8009189C 004E1021 */ addu $v0, $v0, $t6 -/* B08A40 800918A0 904261F7 */ lbu $v0, %lo(D_801261F7)($v0) -/* B08A44 800918A4 00C03825 */ move $a3, $a2 -/* B08A48 800918A8 00001825 */ move $v1, $zero -/* B08A4C 800918AC 15020009 */ bne $t0, $v0, .L800918D4 -/* B08A50 800918B0 24010010 */ li $at, 16 -/* B08A54 800918B4 3C0F8016 */ lui $t7, %hi(gSaveContext+4) # $t7, 0x8016 -/* B08A58 800918B8 8DEFE664 */ lw $t7, %lo(gSaveContext+4)($t7) -/* B08A5C 800918BC 11E00005 */ beqz $t7, .L800918D4 -/* B08A60 800918C0 00000000 */ nop -/* B08A64 800918C4 90980001 */ lbu $t8, 1($a0) -/* B08A68 800918C8 15180002 */ bne $t0, $t8, .L800918D4 -/* B08A6C 800918CC 00000000 */ nop -/* B08A70 800918D0 24020001 */ li $v0, 1 -.L800918D4: -/* B08A74 800918D4 14A1001C */ bne $a1, $at, .L80091948 -/* B08A78 800918D8 3C188012 */ lui $t8, %hi(D_80125F40) -/* B08A7C 800918DC 0002C880 */ sll $t9, $v0, 2 -/* B08A80 800918E0 0322C821 */ addu $t9, $t9, $v0 -/* B08A84 800918E4 3C068012 */ lui $a2, %hi(D_80125C99) -/* B08A88 800918E8 00D93021 */ addu $a2, $a2, $t9 -/* B08A8C 800918EC 90C65C99 */ lbu $a2, %lo(D_80125C99)($a2) -/* B08A90 800918F0 3C018016 */ lui $at, %hi(D_80160014) # $at, 0x8016 -/* B08A94 800918F4 3C058016 */ lui $a1, %hi(gSaveContext+4) -/* B08A98 800918F8 AC260014 */ sw $a2, %lo(D_80160014)($at) -/* B08A9C 800918FC 24010004 */ li $at, 4 -/* B08AA0 80091900 14C1003C */ bne $a2, $at, .L800919F4 -/* B08AA4 80091904 8CA5E664 */ lw $a1, %lo(gSaveContext+4)($a1) -/* B08AA8 80091908 3C0A8016 */ lui $t2, %hi(gSaveContext+0x36) -/* B08AAC 8009190C 954AE696 */ lhu $t2, %lo(gSaveContext+0x36)($t2) -/* B08AB0 80091910 44802000 */ mtc1 $zero, $f4 -/* B08AB4 80091914 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B08AB8 80091918 448A3000 */ mtc1 $t2, $f6 -/* B08ABC 8009191C 05410004 */ bgez $t2, .L80091930 -/* B08AC0 80091920 46803220 */ cvt.s.w $f8, $f6 -/* B08AC4 80091924 44815000 */ mtc1 $at, $f10 -/* B08AC8 80091928 00000000 */ nop -/* B08ACC 8009192C 460A4200 */ add.s $f8, $f8, $f10 -.L80091930: -/* B08AD0 80091930 4604403E */ c.le.s $f8, $f4 -/* B08AD4 80091934 00000000 */ nop -/* B08AD8 80091938 4502002F */ bc1fl .L800919F8 -/* B08ADC 8009193C 00067880 */ sll $t7, $a2, 2 -/* B08AE0 80091940 1000002C */ b .L800919F4 -/* B08AE4 80091944 24030004 */ li $v1, 4 -.L80091948: -/* B08AE8 80091948 24090013 */ li $t1, 19 -/* B08AEC 8009194C 14A9000F */ bne $a1, $t1, .L8009198C -/* B08AF0 80091950 24010014 */ li $at, 20 -/* B08AF4 80091954 00025880 */ sll $t3, $v0, 2 -/* B08AF8 80091958 01625821 */ addu $t3, $t3, $v0 -/* B08AFC 8009195C 3C068012 */ lui $a2, %hi(D_80125C9A) -/* B08B00 80091960 00CB3021 */ addu $a2, $a2, $t3 -/* B08B04 80091964 90C65C9A */ lbu $a2, %lo(D_80125C9A)($a2) -/* B08B08 80091968 3C018016 */ lui $at, %hi(D_80160018) # $at, 0x8016 -/* B08B0C 8009196C 3C058016 */ lui $a1, %hi(gSaveContext+4) # $a1, 0x8016 -/* B08B10 80091970 AC260018 */ sw $a2, %lo(D_80160018)($at) -/* B08B14 80091974 2401000A */ li $at, 10 -/* B08B18 80091978 14C1001E */ bne $a2, $at, .L800919F4 -/* B08B1C 8009197C 8CA5E664 */ lw $a1, %lo(gSaveContext+4)($a1) -/* B08B20 80091980 90830001 */ lbu $v1, 1($a0) -/* B08B24 80091984 1000001B */ b .L800919F4 -/* B08B28 80091988 00031880 */ sll $v1, $v1, 2 -.L8009198C: -/* B08B2C 8009198C 14A1000E */ bne $a1, $at, .L800919C8 -/* B08B30 80091990 00026080 */ sll $t4, $v0, 2 -/* B08B34 80091994 01826021 */ addu $t4, $t4, $v0 -/* B08B38 80091998 3C068012 */ lui $a2, %hi(D_80125C9B) -/* B08B3C 8009199C 00CC3021 */ addu $a2, $a2, $t4 -/* B08B40 800919A0 90C65C9B */ lbu $a2, %lo(D_80125C9B)($a2) -/* B08B44 800919A4 3C058016 */ lui $a1, %hi(gSaveContext+4) # $a1, 0x8016 -/* B08B48 800919A8 24010012 */ li $at, 18 -/* B08B4C 800919AC 10C10003 */ beq $a2, $at, .L800919BC -/* B08B50 800919B0 8CA5E664 */ lw $a1, %lo(gSaveContext+4)($a1) -/* B08B54 800919B4 54C90010 */ bnel $a2, $t1, .L800919F8 -/* B08B58 800919B8 00067880 */ sll $t7, $a2, 2 -.L800919BC: -/* B08B5C 800919BC 90830001 */ lbu $v1, 1($a0) -/* B08B60 800919C0 1000000C */ b .L800919F4 -/* B08B64 800919C4 00031880 */ sll $v1, $v1, 2 -.L800919C8: -/* B08B68 800919C8 14A80008 */ bne $a1, $t0, .L800919EC -/* B08B6C 800919CC 00026880 */ sll $t5, $v0, 2 -/* B08B70 800919D0 01A26821 */ addu $t5, $t5, $v0 -/* B08B74 800919D4 3C068012 */ lui $a2, %hi(D_80125C9C) -/* B08B78 800919D8 00CD3021 */ addu $a2, $a2, $t5 -/* B08B7C 800919DC 3C058016 */ lui $a1, %hi(gSaveContext+4) # $a1, 0x8016 -/* B08B80 800919E0 8CA5E664 */ lw $a1, %lo(gSaveContext+4)($a1) -/* B08B84 800919E4 10000003 */ b .L800919F4 -/* B08B88 800919E8 90C65C9C */ lbu $a2, %lo(D_80125C9C)($a2) -.L800919EC: -/* B08B8C 800919EC 03E00008 */ jr $ra -/* B08B90 800919F0 00001025 */ move $v0, $zero - -.L800919F4: -/* B08B94 800919F4 00067880 */ sll $t7, $a2, 2 -.L800919F8: -/* B08B98 800919F8 030FC021 */ addu $t8, $t8, $t7 -/* B08B9C 800919FC 8F185F40 */ lw $t8, %lo(D_80125F40)($t8) -/* B08BA0 80091A00 00057080 */ sll $t6, $a1, 2 -/* B08BA4 80091A04 0003C880 */ sll $t9, $v1, 2 -/* B08BA8 80091A08 01D82021 */ addu $a0, $t6, $t8 -/* B08BAC 80091A0C 00995021 */ addu $t2, $a0, $t9 -/* B08BB0 80091A10 8D4B0000 */ lw $t3, ($t2) -/* B08BB4 80091A14 00001025 */ move $v0, $zero -/* B08BB8 80091A18 ACEB0000 */ sw $t3, ($a3) -/* B08BBC 80091A1C 03E00008 */ jr $ra -/* B08BC0 80091A20 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_80091A24.s b/asm/non_matchings/code/z_player_lib/func_80091A24.s deleted file mode 100644 index 78dcf58cb0..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_80091A24.s +++ /dev/null @@ -1,470 +0,0 @@ -.rdata -glabel D_8013E8D8 - .asciz "../z_player_lib.c" - .balign 4 - -glabel D_8013E8EC - .asciz "../z_player_lib.c" - .balign 4 - -.text -glabel func_80091A24 -/* B08BC4 80091A24 27BDFED0 */ addiu $sp, $sp, -0x130 -/* B08BC8 80091A28 AFBF0034 */ sw $ra, 0x34($sp) -/* B08BCC 80091A2C AFA40130 */ sw $a0, 0x130($sp) -/* B08BD0 80091A30 AFA50134 */ sw $a1, 0x134($sp) -/* B08BD4 80091A34 AFA60138 */ sw $a2, 0x138($sp) -/* B08BD8 80091A38 AFA7013C */ sw $a3, 0x13c($sp) -/* B08BDC 80091A3C 8C840000 */ lw $a0, ($a0) -/* B08BE0 80091A40 0C031A73 */ jal Graph_Alloc -/* B08BE4 80091A44 24050040 */ li $a1, 64 -/* B08BE8 80091A48 8FAF0130 */ lw $t7, 0x130($sp) -/* B08BEC 80091A4C AFA2011C */ sw $v0, 0x11c($sp) -/* B08BF0 80091A50 24050040 */ li $a1, 64 -/* B08BF4 80091A54 0C031A73 */ jal Graph_Alloc -/* B08BF8 80091A58 8DE40000 */ lw $a0, ($t7) -/* B08BFC 80091A5C 8FB80130 */ lw $t8, 0x130($sp) -/* B08C00 80091A60 AFA20118 */ sw $v0, 0x118($sp) -/* B08C04 80091A64 3C068014 */ lui $a2, %hi(D_8013E8D8) # $a2, 0x8014 -/* B08C08 80091A68 8F050000 */ lw $a1, ($t8) -/* B08C0C 80091A6C 24C6E8D8 */ addiu $a2, %lo(D_8013E8D8) # addiu $a2, $a2, -0x1728 -/* B08C10 80091A70 27A40104 */ addiu $a0, $sp, 0x104 -/* B08C14 80091A74 24070C39 */ li $a3, 3129 -/* B08C18 80091A78 0C031AB1 */ jal Graph_OpenDisps -/* B08C1C 80091A7C AFA50114 */ sw $a1, 0x114($sp) -/* B08C20 80091A80 8FA30114 */ lw $v1, 0x114($sp) -/* B08C24 80091A84 3C05DE00 */ lui $a1, 0xde00 -/* B08C28 80091A88 3C1FE700 */ lui $ra, 0xe700 -/* B08C2C 80091A8C 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08C30 80091A90 3C014080 */ li $at, 0x40800000 # 0.000000 -/* B08C34 80091A94 44810000 */ mtc1 $at, $f0 -/* B08C38 80091A98 AFA40128 */ sw $a0, 0x128($sp) -/* B08C3C 80091A9C 8C6202D0 */ lw $v0, 0x2d0($v1) -/* B08C40 80091AA0 24990008 */ addiu $t9, $a0, 8 -/* B08C44 80091AA4 AC7902C0 */ sw $t9, 0x2c0($v1) -/* B08C48 80091AA8 AFA20124 */ sw $v0, 0x124($sp) -/* B08C4C 80091AAC 8C6401BC */ lw $a0, 0x1bc($v1) -/* B08C50 80091AB0 244E0008 */ addiu $t6, $v0, 8 -/* B08C54 80091AB4 AC6E02D0 */ sw $t6, 0x2d0($v1) -/* B08C58 80091AB8 248F0008 */ addiu $t7, $a0, 8 -/* B08C5C 80091ABC AC6F01BC */ sw $t7, 0x1bc($v1) -/* B08C60 80091AC0 AC850000 */ sw $a1, ($a0) -/* B08C64 80091AC4 8C7802C0 */ lw $t8, 0x2c0($v1) -/* B08C68 80091AC8 3C01FF10 */ lui $at, 0xff10 -/* B08C6C 80091ACC 3C08E300 */ lui $t0, (0xE3000A01 >> 16) # lui $t0, 0xe300 -/* B08C70 80091AD0 AC980004 */ sw $t8, 4($a0) -/* B08C74 80091AD4 8C6401BC */ lw $a0, 0x1bc($v1) -/* B08C78 80091AD8 3C18DB06 */ lui $t8, 0xdb06 -/* B08C7C 80091ADC 35080A01 */ ori $t0, (0xE3000A01 & 0xFFFF) # ori $t0, $t0, 0xa01 -/* B08C80 80091AE0 24990008 */ addiu $t9, $a0, 8 -/* B08C84 80091AE4 AC7901BC */ sw $t9, 0x1bc($v1) -/* B08C88 80091AE8 AC850000 */ sw $a1, ($a0) -/* B08C8C 80091AEC 8C6E02D0 */ lw $t6, 0x2d0($v1) -/* B08C90 80091AF0 3C05D900 */ lui $a1, 0xd900 -/* B08C94 80091AF4 3C090030 */ lui $t1, 0x30 -/* B08C98 80091AF8 AC8E0004 */ sw $t6, 4($a0) -/* B08C9C 80091AFC 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08CA0 80091B00 3C0AE200 */ lui $t2, (0xE200001C >> 16) # lui $t2, 0xe200 -/* B08CA4 80091B04 354A001C */ ori $t2, (0xE200001C & 0xFFFF) # ori $t2, $t2, 0x1c -/* B08CA8 80091B08 248F0008 */ addiu $t7, $a0, 8 -/* B08CAC 80091B0C AC6F02C0 */ sw $t7, 0x2c0($v1) -/* B08CB0 80091B10 AC800004 */ sw $zero, 4($a0) -/* B08CB4 80091B14 AC980000 */ sw $t8, ($a0) -/* B08CB8 80091B18 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08CBC 80091B1C 3C18D700 */ lui $t8, 0xd700 -/* B08CC0 80091B20 3C0BF700 */ lui $t3, 0xf700 -/* B08CC4 80091B24 24990008 */ addiu $t9, $a0, 8 -/* B08CC8 80091B28 AC7902C0 */ sw $t9, 0x2c0($v1) -/* B08CCC 80091B2C AC800004 */ sw $zero, 4($a0) -/* B08CD0 80091B30 AC9F0000 */ sw $ra, ($a0) -/* B08CD4 80091B34 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08CD8 80091B38 2419FFFF */ li $t9, -1 -/* B08CDC 80091B3C 248E0008 */ addiu $t6, $a0, 8 -/* B08CE0 80091B40 AC6E02C0 */ sw $t6, 0x2c0($v1) -/* B08CE4 80091B44 AC800004 */ sw $zero, 4($a0) -/* B08CE8 80091B48 AC850000 */ sw $a1, ($a0) -/* B08CEC 80091B4C 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08CF0 80091B50 248F0008 */ addiu $t7, $a0, 8 -/* B08CF4 80091B54 AC6F02C0 */ sw $t7, 0x2c0($v1) -/* B08CF8 80091B58 AC990004 */ sw $t9, 4($a0) -/* B08CFC 80091B5C AC980000 */ sw $t8, ($a0) -/* B08D00 80091B60 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08D04 80091B64 3C18FFFE */ lui $t8, (0xFFFE793C >> 16) # lui $t8, 0xfffe -/* B08D08 80091B68 3C0FFCFF */ lui $t7, (0xFCFFFFFF >> 16) # lui $t7, 0xfcff -/* B08D0C 80091B6C 248E0008 */ addiu $t6, $a0, 8 -/* B08D10 80091B70 AC6E02C0 */ sw $t6, 0x2c0($v1) -/* B08D14 80091B74 35EFFFFF */ ori $t7, (0xFCFFFFFF & 0xFFFF) # ori $t7, $t7, 0xffff -/* B08D18 80091B78 3718793C */ ori $t8, (0xFFFE793C & 0xFFFF) # ori $t8, $t8, 0x793c -/* B08D1C 80091B7C AC980004 */ sw $t8, 4($a0) -/* B08D20 80091B80 AC8F0000 */ sw $t7, ($a0) -/* B08D24 80091B84 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08D28 80091B88 3C0EEF38 */ lui $t6, (0xEF382C30 >> 16) # lui $t6, 0xef38 -/* B08D2C 80091B8C 35CE2C30 */ ori $t6, (0xEF382C30 & 0xFFFF) # ori $t6, $t6, 0x2c30 -/* B08D30 80091B90 24990008 */ addiu $t9, $a0, 8 -/* B08D34 80091B94 AC7902C0 */ sw $t9, 0x2c0($v1) -/* B08D38 80091B98 AC800004 */ sw $zero, 4($a0) -/* B08D3C 80091B9C AC8E0000 */ sw $t6, ($a0) -/* B08D40 80091BA0 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08D44 80091BA4 3C180022 */ lui $t8, (0x00220405 >> 16) # lui $t8, 0x22 -/* B08D48 80091BA8 37180405 */ ori $t8, (0x00220405 & 0xFFFF) # ori $t8, $t8, 0x405 -/* B08D4C 80091BAC 248F0008 */ addiu $t7, $a0, 8 -/* B08D50 80091BB0 AC6F02C0 */ sw $t7, 0x2c0($v1) -/* B08D54 80091BB4 AC980004 */ sw $t8, 4($a0) -/* B08D58 80091BB8 AC850000 */ sw $a1, ($a0) -/* B08D5C 80091BBC 8FAC015C */ lw $t4, 0x15c($sp) -/* B08D60 80091BC0 8FAD0160 */ lw $t5, 0x160($sp) -/* B08D64 80091BC4 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08D68 80091BC8 448C2000 */ mtc1 $t4, $f4 -/* B08D6C 80091BCC 448D3000 */ mtc1 $t5, $f6 -/* B08D70 80091BD0 24990008 */ addiu $t9, $a0, 8 -/* B08D74 80091BD4 468020A0 */ cvt.s.w $f2, $f4 -/* B08D78 80091BD8 AC7902C0 */ sw $t9, 0x2c0($v1) -/* B08D7C 80091BDC 3C0EED00 */ lui $t6, 0xed00 -/* B08D80 80091BE0 AC8E0000 */ sw $t6, ($a0) -/* B08D84 80091BE4 24050001 */ li $a1, 1 -/* B08D88 80091BE8 46803320 */ cvt.s.w $f12, $f6 -/* B08D8C 80091BEC 46001202 */ mul.s $f8, $f2, $f0 -/* B08D90 80091BF0 000C1040 */ sll $v0, $t4, 1 -/* B08D94 80091BF4 46006402 */ mul.s $f16, $f12, $f0 -/* B08D98 80091BF8 4600428D */ trunc.w.s $f10, $f8 -/* B08D9C 80091BFC 4600848D */ trunc.w.s $f18, $f16 -/* B08DA0 80091C00 44185000 */ mfc1 $t8, $f10 -/* B08DA4 80091C04 460C1103 */ div.s $f4, $f2, $f12 -/* B08DA8 80091C08 33190FFF */ andi $t9, $t8, 0xfff -/* B08DAC 80091C0C 44189000 */ mfc1 $t8, $f18 -/* B08DB0 80091C10 00197300 */ sll $t6, $t9, 0xc -/* B08DB4 80091C14 33190FFF */ andi $t9, $t8, 0xfff -/* B08DB8 80091C18 01D97825 */ or $t7, $t6, $t9 -/* B08DBC 80091C1C AC8F0004 */ sw $t7, 4($a0) -/* B08DC0 80091C20 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08DC4 80091C24 3C0EDB04 */ lui $t6, (0xDB040004 >> 16) # lui $t6, 0xdb04 -/* B08DC8 80091C28 35CE0004 */ ori $t6, (0xDB040004 & 0xFFFF) # ori $t6, $t6, 4 -/* B08DCC 80091C2C 24980008 */ addiu $t8, $a0, 8 -/* B08DD0 80091C30 AC7802C0 */ sw $t8, 0x2c0($v1) -/* B08DD4 80091C34 AC850004 */ sw $a1, 4($a0) -/* B08DD8 80091C38 AC8E0000 */ sw $t6, ($a0) -/* B08DDC 80091C3C 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08DE0 80091C40 3C0FDB04 */ lui $t7, (0xDB04000C >> 16) # lui $t7, 0xdb04 -/* B08DE4 80091C44 35EF000C */ ori $t7, (0xDB04000C & 0xFFFF) # ori $t7, $t7, 0xc -/* B08DE8 80091C48 24990008 */ addiu $t9, $a0, 8 -/* B08DEC 80091C4C AC7902C0 */ sw $t9, 0x2c0($v1) -/* B08DF0 80091C50 AC850004 */ sw $a1, 4($a0) -/* B08DF4 80091C54 AC8F0000 */ sw $t7, ($a0) -/* B08DF8 80091C58 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08DFC 80091C5C 3C0EDB04 */ lui $t6, (0xDB040014 >> 16) # lui $t6, 0xdb04 -/* B08E00 80091C60 35CE0014 */ ori $t6, (0xDB040014 & 0xFFFF) # ori $t6, $t6, 0x14 -/* B08E04 80091C64 24980008 */ addiu $t8, $a0, 8 -/* B08E08 80091C68 AC7802C0 */ sw $t8, 0x2c0($v1) -/* B08E0C 80091C6C 3405FFFF */ li $a1, 65535 -/* B08E10 80091C70 AC850004 */ sw $a1, 4($a0) -/* B08E14 80091C74 AC8E0000 */ sw $t6, ($a0) -/* B08E18 80091C78 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08E1C 80091C7C 3C0FDB04 */ lui $t7, (0xDB04001C >> 16) # lui $t7, 0xdb04 -/* B08E20 80091C80 35EF001C */ ori $t7, (0xDB04001C & 0xFFFF) # ori $t7, $t7, 0x1c -/* B08E24 80091C84 24990008 */ addiu $t9, $a0, 8 -/* B08E28 80091C88 AC7902C0 */ sw $t9, 0x2c0($v1) -/* B08E2C 80091C8C AC850004 */ sw $a1, 4($a0) -/* B08E30 80091C90 AC8F0000 */ sw $t7, ($a0) -/* B08E34 80091C94 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08E38 80091C98 2585FFFF */ addiu $a1, $t4, -1 -/* B08E3C 80091C9C 30A60FFF */ andi $a2, $a1, 0xfff -/* B08E40 80091CA0 24980008 */ addiu $t8, $a0, 8 -/* B08E44 80091CA4 00C13025 */ or $a2, $a2, $at -/* B08E48 80091CA8 AC7802C0 */ sw $t8, 0x2c0($v1) -/* B08E4C 80091CAC AC860000 */ sw $a2, ($a0) -/* B08E50 80091CB0 8FAE0174 */ lw $t6, 0x174($sp) -/* B08E54 80091CB4 3C01F600 */ lui $at, 0xf600 -/* B08E58 80091CB8 AC8E0004 */ sw $t6, 4($a0) -/* B08E5C 80091CBC 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08E60 80091CC0 3C0EFFFC */ lui $t6, (0xFFFCFFFC >> 16) # lui $t6, 0xfffc -/* B08E64 80091CC4 35CEFFFC */ ori $t6, (0xFFFCFFFC & 0xFFFF) # ori $t6, $t6, 0xfffc -/* B08E68 80091CC8 24990008 */ addiu $t9, $a0, 8 -/* B08E6C 80091CCC AC7902C0 */ sw $t9, 0x2c0($v1) -/* B08E70 80091CD0 AC890004 */ sw $t1, 4($a0) -/* B08E74 80091CD4 AC880000 */ sw $t0, ($a0) -/* B08E78 80091CD8 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08E7C 80091CDC 248F0008 */ addiu $t7, $a0, 8 -/* B08E80 80091CE0 AC6F02C0 */ sw $t7, 0x2c0($v1) -/* B08E84 80091CE4 AC800004 */ sw $zero, 4($a0) -/* B08E88 80091CE8 AC8A0000 */ sw $t2, ($a0) -/* B08E8C 80091CEC 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08E90 80091CF0 30AF03FF */ andi $t7, $a1, 0x3ff -/* B08E94 80091CF4 3C058012 */ lui $a1, %hi(D_80126200) # $a1, 0x8012 -/* B08E98 80091CF8 24980008 */ addiu $t8, $a0, 8 -/* B08E9C 80091CFC AC7802C0 */ sw $t8, 0x2c0($v1) -/* B08EA0 80091D00 AC8E0004 */ sw $t6, 4($a0) -/* B08EA4 80091D04 AC8B0000 */ sw $t3, ($a0) -/* B08EA8 80091D08 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08EAC 80091D0C 000FC380 */ sll $t8, $t7, 0xe -/* B08EB0 80091D10 03017025 */ or $t6, $t8, $at -/* B08EB4 80091D14 24990008 */ addiu $t9, $a0, 8 -/* B08EB8 80091D18 AC7902C0 */ sw $t9, 0x2c0($v1) -/* B08EBC 80091D1C 25B9FFFF */ addiu $t9, $t5, -1 -/* B08EC0 80091D20 332F03FF */ andi $t7, $t9, 0x3ff -/* B08EC4 80091D24 000FC080 */ sll $t8, $t7, 2 -/* B08EC8 80091D28 01D83825 */ or $a3, $t6, $t8 -/* B08ECC 80091D2C AC870000 */ sw $a3, ($a0) -/* B08ED0 80091D30 AC800004 */ sw $zero, 4($a0) -/* B08ED4 80091D34 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08ED8 80091D38 24A56200 */ addiu $a1, %lo(D_80126200) # addiu $a1, $a1, 0x6200 -/* B08EDC 80091D3C 3C014120 */ li $at, 0x41200000 # 0.000000 -/* B08EE0 80091D40 24990008 */ addiu $t9, $a0, 8 -/* B08EE4 80091D44 AC7902C0 */ sw $t9, 0x2c0($v1) -/* B08EE8 80091D48 AC800004 */ sw $zero, 4($a0) -/* B08EEC 80091D4C AC9F0000 */ sw $ra, ($a0) -/* B08EF0 80091D50 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08EF4 80091D54 44813000 */ mtc1 $at, $f6 -/* B08EF8 80091D58 3C01457A */ li $at, 0x457A0000 # 0.000000 -/* B08EFC 80091D5C 248F0008 */ addiu $t7, $a0, 8 -/* B08F00 80091D60 AC6F02C0 */ sw $t7, 0x2c0($v1) -/* B08F04 80091D64 AC860000 */ sw $a2, ($a0) -/* B08F08 80091D68 8FAE0170 */ lw $t6, 0x170($sp) -/* B08F0C 80091D6C 44814000 */ mtc1 $at, $f8 -/* B08F10 80091D70 3C013F80 */ lui $at, 0x3f80 -/* B08F14 80091D74 AC8E0004 */ sw $t6, 4($a0) -/* B08F18 80091D78 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08F1C 80091D7C 3C0E0001 */ li $t6, 0x00010000 # 0.000000 -/* B08F20 80091D80 35CE0001 */ ori $t6, (0x00010001 & 0xFFFF) # ori $t6, $t6, 1 -/* B08F24 80091D84 24980008 */ addiu $t8, $a0, 8 -/* B08F28 80091D88 AC7802C0 */ sw $t8, 0x2c0($v1) -/* B08F2C 80091D8C AC890004 */ sw $t1, 4($a0) -/* B08F30 80091D90 AC880000 */ sw $t0, ($a0) -/* B08F34 80091D94 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08F38 80091D98 44815000 */ mtc1 $at, $f10 -/* B08F3C 80091D9C 24990008 */ addiu $t9, $a0, 8 -/* B08F40 80091DA0 AC7902C0 */ sw $t9, 0x2c0($v1) -/* B08F44 80091DA4 AC800004 */ sw $zero, 4($a0) -/* B08F48 80091DA8 AC8A0000 */ sw $t2, ($a0) -/* B08F4C 80091DAC 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08F50 80091DB0 248F0008 */ addiu $t7, $a0, 8 -/* B08F54 80091DB4 AC6F02C0 */ sw $t7, 0x2c0($v1) -/* B08F58 80091DB8 AC8E0004 */ sw $t6, 4($a0) -/* B08F5C 80091DBC AC8B0000 */ sw $t3, ($a0) -/* B08F60 80091DC0 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08F64 80091DC4 3C0EFE00 */ lui $t6, 0xfe00 -/* B08F68 80091DC8 24980008 */ addiu $t8, $a0, 8 -/* B08F6C 80091DCC AC7802C0 */ sw $t8, 0x2c0($v1) -/* B08F70 80091DD0 AC800004 */ sw $zero, 4($a0) -/* B08F74 80091DD4 AC870000 */ sw $a3, ($a0) -/* B08F78 80091DD8 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08F7C 80091DDC 44072000 */ mfc1 $a3, $f4 -/* B08F80 80091DE0 24990008 */ addiu $t9, $a0, 8 -/* B08F84 80091DE4 AC7902C0 */ sw $t9, 0x2c0($v1) -/* B08F88 80091DE8 AC800004 */ sw $zero, 4($a0) -/* B08F8C 80091DEC AC9F0000 */ sw $ra, ($a0) -/* B08F90 80091DF0 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08F94 80091DF4 248F0008 */ addiu $t7, $a0, 8 -/* B08F98 80091DF8 AC6F02C0 */ sw $t7, 0x2c0($v1) -/* B08F9C 80091DFC AC8E0000 */ sw $t6, ($a0) -/* B08FA0 80091E00 8FB80174 */ lw $t8, 0x174($sp) -/* B08FA4 80091E04 3C0FDC08 */ lui $t7, (0xDC080008 >> 16) # lui $t7, 0xdc08 -/* B08FA8 80091E08 35EF0008 */ ori $t7, (0xDC080008 & 0xFFFF) # ori $t7, $t7, 8 -/* B08FAC 80091E0C AC980004 */ sw $t8, 4($a0) -/* B08FB0 80091E10 000D2040 */ sll $a0, $t5, 1 -/* B08FB4 80091E14 A4A20000 */ sh $v0, ($a1) -/* B08FB8 80091E18 A4A20008 */ sh $v0, 8($a1) -/* B08FBC 80091E1C A4A4000A */ sh $a0, 0xa($a1) -/* B08FC0 80091E20 A4A40002 */ sh $a0, 2($a1) -/* B08FC4 80091E24 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B08FC8 80091E28 24990008 */ addiu $t9, $a0, 8 -/* B08FCC 80091E2C AC7902C0 */ sw $t9, 0x2c0($v1) -/* B08FD0 80091E30 AC850004 */ sw $a1, 4($a0) -/* B08FD4 80091E34 AC8F0000 */ sw $t7, ($a0) -/* B08FD8 80091E38 8FA6016C */ lw $a2, 0x16c($sp) -/* B08FDC 80091E3C 8FA4011C */ lw $a0, 0x11c($sp) -/* B08FE0 80091E40 27A50122 */ addiu $a1, $sp, 0x122 -/* B08FE4 80091E44 AFA30114 */ sw $v1, 0x114($sp) -/* B08FE8 80091E48 E7A60010 */ swc1 $f6, 0x10($sp) -/* B08FEC 80091E4C E7A80014 */ swc1 $f8, 0x14($sp) -/* B08FF0 80091E50 0C0404C0 */ jal guPerspective -/* B08FF4 80091E54 E7AA0018 */ swc1 $f10, 0x18($sp) -/* B08FF8 80091E58 8FA30114 */ lw $v1, 0x114($sp) -/* B08FFC 80091E5C 3C18DB0E */ li $t8, 0xDB0E0000 # 0.000000 -/* B09000 80091E60 44800000 */ mtc1 $zero, $f0 -/* B09004 80091E64 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B09008 80091E68 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B0900C 80091E6C 44813000 */ mtc1 $at, $f6 -/* B09010 80091E70 248E0008 */ addiu $t6, $a0, 8 -/* B09014 80091E74 AC6E02C0 */ sw $t6, 0x2c0($v1) -/* B09018 80091E78 AC980000 */ sw $t8, ($a0) -/* B0901C 80091E7C 97B90122 */ lhu $t9, 0x122($sp) -/* B09020 80091E80 3C0EDA38 */ lui $t6, (0xDA380007 >> 16) # lui $t6, 0xda38 -/* B09024 80091E84 35CE0007 */ ori $t6, (0xDA380007 & 0xFFFF) # ori $t6, $t6, 7 -/* B09028 80091E88 AC990004 */ sw $t9, 4($a0) -/* B0902C 80091E8C 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B09030 80091E90 248F0008 */ addiu $t7, $a0, 8 -/* B09034 80091E94 AC6F02C0 */ sw $t7, 0x2c0($v1) -/* B09038 80091E98 AC8E0000 */ sw $t6, ($a0) -/* B0903C 80091E9C 8FB8011C */ lw $t8, 0x11c($sp) -/* B09040 80091EA0 AC980004 */ sw $t8, 4($a0) -/* B09044 80091EA4 8FA80168 */ lw $t0, 0x168($sp) -/* B09048 80091EA8 8FA20164 */ lw $v0, 0x164($sp) -/* B0904C 80091EAC 8FA40118 */ lw $a0, 0x118($sp) -/* B09050 80091EB0 C5100000 */ lwc1 $f16, ($t0) -/* B09054 80091EB4 8C450000 */ lw $a1, ($v0) -/* B09058 80091EB8 8C460004 */ lw $a2, 4($v0) -/* B0905C 80091EBC 8C470008 */ lw $a3, 8($v0) -/* B09060 80091EC0 E7B00010 */ swc1 $f16, 0x10($sp) -/* B09064 80091EC4 C5120004 */ lwc1 $f18, 4($t0) -/* B09068 80091EC8 E7B20014 */ swc1 $f18, 0x14($sp) -/* B0906C 80091ECC C5040008 */ lwc1 $f4, 8($t0) -/* B09070 80091ED0 AFA30114 */ sw $v1, 0x114($sp) -/* B09074 80091ED4 E7A00024 */ swc1 $f0, 0x24($sp) -/* B09078 80091ED8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B0907C 80091EDC E7A60020 */ swc1 $f6, 0x20($sp) -/* B09080 80091EE0 0C04078D */ jal guLookAt -/* B09084 80091EE4 E7A40018 */ swc1 $f4, 0x18($sp) -/* B09088 80091EE8 8FA30114 */ lw $v1, 0x114($sp) -/* B0908C 80091EEC 3C0FDA38 */ lui $t7, (0xDA380005 >> 16) # lui $t7, 0xda38 -/* B09090 80091EF0 35EF0005 */ ori $t7, (0xDA380005 & 0xFFFF) # ori $t7, $t7, 5 -/* B09094 80091EF4 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B09098 80091EF8 24990008 */ addiu $t9, $a0, 8 -/* B0909C 80091EFC AC7902C0 */ sw $t9, 0x2c0($v1) -/* B090A0 80091F00 AC8F0000 */ sw $t7, ($a0) -/* B090A4 80091F04 8FAE0118 */ lw $t6, 0x118($sp) -/* B090A8 80091F08 AC8E0004 */ sw $t6, 4($a0) -/* B090AC 80091F0C 8FB8014C */ lw $t8, 0x14c($sp) -/* B090B0 80091F10 8FB90154 */ lw $t9, 0x154($sp) -/* B090B4 80091F14 8FA20140 */ lw $v0, 0x140($sp) -/* B090B8 80091F18 A3B8012C */ sb $t8, 0x12c($sp) -/* B090BC 80091F1C A3B9012D */ sb $t9, 0x12d($sp) -/* B090C0 80091F20 8C460008 */ lw $a2, 8($v0) -/* B090C4 80091F24 C44E0004 */ lwc1 $f14, 4($v0) -/* B090C8 80091F28 C44C0000 */ lwc1 $f12, ($v0) -/* B090CC 80091F2C 8FA70144 */ lw $a3, 0x144($sp) -/* B090D0 80091F30 0C0345A5 */ jal func_800D1694 -/* B090D4 80091F34 AFA30114 */ sw $v1, 0x114($sp) -/* B090D8 80091F38 C7AC0148 */ lwc1 $f12, 0x148($sp) -/* B090DC 80091F3C 24070001 */ li $a3, 1 -/* B090E0 80091F40 44066000 */ mfc1 $a2, $f12 -/* B090E4 80091F44 0C0342A3 */ jal Matrix_Scale -/* B090E8 80091F48 46006386 */ mov.s $f14, $f12 -/* B090EC 80091F4C 8FA30114 */ lw $v1, 0x114($sp) -/* B090F0 80091F50 3C0EDB06 */ lui $t6, (0xDB060010 >> 16) # lui $t6, 0xdb06 -/* B090F4 80091F54 35CE0010 */ ori $t6, (0xDB060010 & 0xFFFF) # ori $t6, $t6, 0x10 -/* B090F8 80091F58 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B090FC 80091F5C 248F0008 */ addiu $t7, $a0, 8 -/* B09100 80091F60 AC6F02C0 */ sw $t7, 0x2c0($v1) -/* B09104 80091F64 AC8E0000 */ sw $t6, ($a0) -/* B09108 80091F68 8FB80134 */ lw $t8, 0x134($sp) -/* B0910C 80091F6C 3C0FDB06 */ lui $t7, (0xDB060018 >> 16) # lui $t7, 0xdb06 -/* B09110 80091F70 35EF0018 */ ori $t7, (0xDB060018 & 0xFFFF) # ori $t7, $t7, 0x18 -/* B09114 80091F74 AC980004 */ sw $t8, 4($a0) -/* B09118 80091F78 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B0911C 80091F7C 24990008 */ addiu $t9, $a0, 8 -/* B09120 80091F80 AC7902C0 */ sw $t9, 0x2c0($v1) -/* B09124 80091F84 AC8F0000 */ sw $t7, ($a0) -/* B09128 80091F88 8FAE0138 */ lw $t6, 0x138($sp) -/* B0912C 80091F8C 240F0018 */ li $t7, 24 -/* B09130 80091F90 3C19DB02 */ lui $t9, 0xdb02 -/* B09134 80091F94 AC8E0004 */ sw $t6, 4($a0) -/* B09138 80091F98 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B0913C 80091F9C 24980008 */ addiu $t8, $a0, 8 -/* B09140 80091FA0 AC7802C0 */ sw $t8, 0x2c0($v1) -/* B09144 80091FA4 AC8F0004 */ sw $t7, 4($a0) -/* B09148 80091FA8 AC990000 */ sw $t9, ($a0) -/* B0914C 80091FAC 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B09150 80091FB0 3C198012 */ lui $t9, %hi(D_80126218) # $t9, 0x8012 -/* B09154 80091FB4 3C18DC08 */ lui $t8, (0xDC08060A >> 16) # lui $t8, 0xdc08 -/* B09158 80091FB8 248E0008 */ addiu $t6, $a0, 8 -/* B0915C 80091FBC AC6E02C0 */ sw $t6, 0x2c0($v1) -/* B09160 80091FC0 3718060A */ ori $t8, (0xDC08060A & 0xFFFF) # ori $t8, $t8, 0x60a -/* B09164 80091FC4 27396218 */ addiu $t9, %lo(D_80126218) # addiu $t9, $t9, 0x6218 -/* B09168 80091FC8 AC990004 */ sw $t9, 4($a0) -/* B0916C 80091FCC AC980000 */ sw $t8, ($a0) -/* B09170 80091FD0 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B09174 80091FD4 3C188012 */ lui $t8, %hi(D_80126210) # $t8, 0x8012 -/* B09178 80091FD8 3C0EDC08 */ lui $t6, (0xDC08090A >> 16) # lui $t6, 0xdc08 -/* B0917C 80091FDC 248F0008 */ addiu $t7, $a0, 8 -/* B09180 80091FE0 AC6F02C0 */ sw $t7, 0x2c0($v1) -/* B09184 80091FE4 35CE090A */ ori $t6, (0xDC08090A & 0xFFFF) # ori $t6, $t6, 0x90a -/* B09188 80091FE8 27186210 */ addiu $t8, %lo(D_80126210) # addiu $t8, $t8, 0x6210 -/* B0918C 80091FEC AC980004 */ sw $t8, 4($a0) -/* B09190 80091FF0 AC8E0000 */ sw $t6, ($a0) -/* B09194 80091FF4 8FA40130 */ lw $a0, 0x130($sp) -/* B09198 80091FF8 0C024F20 */ jal func_80093C80 -/* B0919C 80091FFC AFA30114 */ sw $v1, 0x114($sp) -/* B091A0 80092000 8FA30114 */ lw $v1, 0x114($sp) -/* B091A4 80092004 241903E5 */ li $t9, 997 -/* B091A8 80092008 240F03E8 */ li $t7, 1000 -/* B091AC 8009200C 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B091B0 80092010 AFAF0018 */ sw $t7, 0x18($sp) -/* B091B4 80092014 AFB90014 */ sw $t9, 0x14($sp) -/* B091B8 80092018 AFA00010 */ sw $zero, 0x10($sp) -/* B091BC 8009201C 248E0008 */ addiu $t6, $a0, 8 -/* B091C0 80092020 00002825 */ move $a1, $zero -/* B091C4 80092024 00003025 */ move $a2, $zero -/* B091C8 80092028 00003825 */ move $a3, $zero -/* B091CC 8009202C 0C024DC2 */ jal Gfx_SetFog2 -/* B091D0 80092030 AC6E02C0 */ sw $t6, 0x2c0($v1) -/* B091D4 80092034 8FA30114 */ lw $v1, 0x114($sp) -/* B091D8 80092038 8FA80130 */ lw $t0, 0x130($sp) -/* B091DC 8009203C 3C068012 */ lui $a2, %hi(D_80126228) # $a2, 0x8012 -/* B091E0 80092040 AC6202C0 */ sw $v0, 0x2c0($v1) -/* B091E4 80092044 8FA40140 */ lw $a0, 0x140($sp) -/* B091E8 80092048 24C66228 */ addiu $a2, %lo(D_80126228) # addiu $a2, $a2, 0x6228 -/* B091EC 8009204C 8D070000 */ lw $a3, ($t0) -/* B091F0 80092050 0C00BAAF */ jal func_8002EABC -/* B091F4 80092054 250500E0 */ addiu $a1, $t0, 0xe0 -/* B091F8 80092058 8FA30114 */ lw $v1, 0x114($sp) -/* B091FC 8009205C 3C19DB06 */ lui $t9, (0xDB060030 >> 16) # lui $t9, 0xdb06 -/* B09200 80092060 3C0F8012 */ lui $t7, %hi(D_80125F98) # $t7, 0x8012 -/* B09204 80092064 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B09208 80092068 25EF5F98 */ addiu $t7, %lo(D_80125F98) # addiu $t7, $t7, 0x5f98 -/* B0920C 8009206C 37390030 */ ori $t9, (0xDB060030 & 0xFFFF) # ori $t9, $t9, 0x30 -/* B09210 80092070 24980008 */ addiu $t8, $a0, 8 -/* B09214 80092074 AC7802C0 */ sw $t8, 0x2c0($v1) -/* B09218 80092078 AC8F0004 */ sw $t7, 4($a0) -/* B0921C 8009207C AC990000 */ sw $t9, ($a0) -/* B09220 80092080 8FA2013C */ lw $v0, 0x13c($sp) -/* B09224 80092084 8FB80158 */ lw $t8, 0x158($sp) -/* B09228 80092088 8FAE0150 */ lw $t6, 0x150($sp) -/* B0922C 8009208C 8C450004 */ lw $a1, 4($v0) -/* B09230 80092090 8C460020 */ lw $a2, 0x20($v0) -/* B09234 80092094 90470002 */ lbu $a3, 2($v0) -/* B09238 80092098 3C198009 */ lui $t9, %hi(func_80091880) # $t9, 0x8009 -/* B0923C 8009209C 27391880 */ addiu $t9, %lo(func_80091880) # addiu $t9, $t9, 0x1880 -/* B09240 800920A0 27AF012C */ addiu $t7, $sp, 0x12c -/* B09244 800920A4 AFAF0028 */ sw $t7, 0x28($sp) -/* B09248 800920A8 AFB90020 */ sw $t9, 0x20($sp) -/* B0924C 800920AC AFA00024 */ sw $zero, 0x24($sp) -/* B09250 800920B0 AFA0001C */ sw $zero, 0x1c($sp) -/* B09254 800920B4 AFA00010 */ sw $zero, 0x10($sp) -/* B09258 800920B8 8FA40130 */ lw $a0, 0x130($sp) -/* B0925C 800920BC AFA30114 */ sw $v1, 0x114($sp) -/* B09260 800920C0 AFB80018 */ sw $t8, 0x18($sp) -/* B09264 800920C4 0C023D1C */ jal func_8008F470 -/* B09268 800920C8 AFAE0014 */ sw $t6, 0x14($sp) -/* B0926C 800920CC 8FA30114 */ lw $v1, 0x114($sp) -/* B09270 800920D0 3C05DF00 */ lui $a1, 0xdf00 -/* B09274 800920D4 3C068014 */ lui $a2, %hi(D_8013E8EC) # $a2, 0x8014 -/* B09278 800920D8 8C6402C0 */ lw $a0, 0x2c0($v1) -/* B0927C 800920DC 24C6E8EC */ addiu $a2, %lo(D_8013E8EC) # addiu $a2, $a2, -0x1714 -/* B09280 800920E0 24070CD8 */ li $a3, 3288 -/* B09284 800920E4 248E0008 */ addiu $t6, $a0, 8 -/* B09288 800920E8 AC6E02C0 */ sw $t6, 0x2c0($v1) -/* B0928C 800920EC AC800004 */ sw $zero, 4($a0) -/* B09290 800920F0 AC850000 */ sw $a1, ($a0) -/* B09294 800920F4 8C6202D0 */ lw $v0, 0x2d0($v1) -/* B09298 800920F8 24580008 */ addiu $t8, $v0, 8 -/* B0929C 800920FC AC7802D0 */ sw $t8, 0x2d0($v1) -/* B092A0 80092100 AC400004 */ sw $zero, 4($v0) -/* B092A4 80092104 AC450000 */ sw $a1, ($v0) -/* B092A8 80092108 8FA40128 */ lw $a0, 0x128($sp) -/* B092AC 8009210C 3C02DE01 */ lui $v0, 0xde01 -/* B092B0 80092110 AC820000 */ sw $v0, ($a0) -/* B092B4 80092114 8C7902C0 */ lw $t9, 0x2c0($v1) -/* B092B8 80092118 AC990004 */ sw $t9, 4($a0) -/* B092BC 8009211C 8FA40124 */ lw $a0, 0x124($sp) -/* B092C0 80092120 AC820000 */ sw $v0, ($a0) -/* B092C4 80092124 8C6F02D0 */ lw $t7, 0x2d0($v1) -/* B092C8 80092128 AC8F0004 */ sw $t7, 4($a0) -/* B092CC 8009212C 8FAE0130 */ lw $t6, 0x130($sp) -/* B092D0 80092130 27A40104 */ addiu $a0, $sp, 0x104 -/* B092D4 80092134 0C031AD5 */ jal Graph_CloseDisps -/* B092D8 80092138 8DC50000 */ lw $a1, ($t6) -/* B092DC 8009213C 8FBF0034 */ lw $ra, 0x34($sp) -/* B092E0 80092140 27BD0130 */ addiu $sp, $sp, 0x130 -/* B092E4 80092144 03E00008 */ jr $ra -/* B092E8 80092148 00000000 */ nop - diff --git a/asm/non_matchings/code/z_player_lib/func_8009214C.s b/asm/non_matchings/code/z_player_lib/func_8009214C.s deleted file mode 100644 index f2279a4291..0000000000 --- a/asm/non_matchings/code/z_player_lib/func_8009214C.s +++ /dev/null @@ -1,123 +0,0 @@ -glabel func_8009214C -/* B092EC 8009214C 3C018000 */ lui $at, (0x80003800 >> 16) # lui $at, 0x8000 -/* B092F0 80092150 34213800 */ ori $at, (0x80003800 & 0xFFFF) # ori $at, $at, 0x3800 -/* B092F4 80092154 00A17821 */ addu $t7, $a1, $at -/* B092F8 80092158 3C088016 */ lui $t0, %hi(gSegments) # $t0, 0x8016 -/* B092FC 8009215C 3C018000 */ lui $at, (0x80008800 >> 16) # lui $at, 0x8000 -/* B09300 80092160 25086FA8 */ addiu $t0, %lo(gSegments) # addiu $t0, $t0, 0x6fa8 -/* B09304 80092164 34218800 */ ori $at, (0x80008800 & 0xFFFF) # ori $at, $at, 0x8800 -/* B09308 80092168 00A1C821 */ addu $t9, $a1, $at -/* B0930C 8009216C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B09310 80092170 AD0F0010 */ sw $t7, 0x10($t0) -/* B09314 80092174 AD190018 */ sw $t9, 0x18($t0) -/* B09318 80092178 3C098016 */ lui $t1, %hi(gSaveContext+4) # $t1, 0x8016 -/* B0931C 8009217C 8D29E664 */ lw $t1, %lo(gSaveContext+4)($t1) -/* B09320 80092180 AFB00050 */ sw $s0, 0x50($sp) -/* B09324 80092184 00C08025 */ move $s0, $a2 -/* B09328 80092188 AFBF0054 */ sw $ra, 0x54($sp) -/* B0932C 8009218C AFA40058 */ sw $a0, 0x58($sp) -/* B09330 80092190 AFA5005C */ sw $a1, 0x5c($sp) -/* B09334 80092194 1120000B */ beqz $t1, .L800921C4 -/* B09338 80092198 AFA70064 */ sw $a3, 0x64($sp) -/* B0933C 8009219C 8FAA0078 */ lw $t2, 0x78($sp) -/* B09340 800921A0 24010001 */ li $at, 1 -/* B09344 800921A4 3C040400 */ lui $a0, 0x400 -/* B09348 800921A8 15410004 */ bne $t2, $at, .L800921BC -/* B0934C 800921AC 00000000 */ nop -/* B09350 800921B0 3C040400 */ lui $a0, %hi(D_040020D0) # $a0, 0x400 -/* B09354 800921B4 10000010 */ b .L800921F8 -/* B09358 800921B8 248420D0 */ addiu $a0, %lo(D_040020D0) # addiu $a0, $a0, 0x20d0 -.L800921BC: -/* B0935C 800921BC 1000000E */ b .L800921F8 -/* B09360 800921C0 24842040 */ addiu $a0, $a0, 0x2040 -.L800921C4: -/* B09364 800921C4 8FAB0070 */ lw $t3, 0x70($sp) -/* B09368 800921C8 24010003 */ li $at, 3 -/* B0936C 800921CC 3C040400 */ lui $a0, %hi(D_04002160) # $a0, 0x400 -/* B09370 800921D0 15610003 */ bne $t3, $at, .L800921E0 -/* B09374 800921D4 8FAC0078 */ lw $t4, 0x78($sp) -/* B09378 800921D8 10000007 */ b .L800921F8 -/* B0937C 800921DC 24842160 */ addiu $a0, %lo(D_04002160) # addiu $a0, $a0, 0x2160 -.L800921E0: -/* B09380 800921E0 11800004 */ beqz $t4, .L800921F4 -/* B09384 800921E4 3C040400 */ lui $a0, 0x400 -/* B09388 800921E8 3C040400 */ lui $a0, %hi(D_04002280) # $a0, 0x400 -/* B0938C 800921EC 10000002 */ b .L800921F8 -/* B09390 800921F0 24842280 */ addiu $a0, %lo(D_04002280) # addiu $a0, $a0, 0x2280 -.L800921F4: -/* B09394 800921F4 248421F0 */ addiu $a0, $a0, 0x21f0 -.L800921F8: -/* B09398 800921F8 00046900 */ sll $t5, $a0, 4 -/* B0939C 800921FC 000D7702 */ srl $t6, $t5, 0x1c -/* B093A0 80092200 000E7880 */ sll $t7, $t6, 2 -/* B093A4 80092204 010FC021 */ addu $t8, $t0, $t7 -/* B093A8 80092208 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B093AC 8009220C 8F190000 */ lw $t9, ($t8) -/* B093B0 80092210 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B093B4 80092214 920A0000 */ lbu $t2, ($s0) -/* B093B8 80092218 00814824 */ and $t1, $a0, $at -/* B093BC 8009221C 3C018000 */ lui $at, 0x8000 -/* B093C0 80092220 03292021 */ addu $a0, $t9, $t1 -/* B093C4 80092224 00812021 */ addu $a0, $a0, $at -/* B093C8 80092228 8E020020 */ lw $v0, 0x20($s0) -/* B093CC 8009222C 1940000E */ blez $t2, .L80092268 -/* B093D0 80092230 00001825 */ move $v1, $zero -/* B093D4 80092234 888C0000 */ lwl $t4, ($a0) -.L80092238: -/* B093D8 80092238 988C0003 */ lwr $t4, 3($a0) -/* B093DC 8009223C 24630001 */ addiu $v1, $v1, 1 -/* B093E0 80092240 24420006 */ addiu $v0, $v0, 6 -/* B093E4 80092244 A84CFFFA */ swl $t4, -6($v0) -/* B093E8 80092248 B84CFFFD */ swr $t4, -3($v0) -/* B093EC 8009224C 948C0004 */ lhu $t4, 4($a0) -/* B093F0 80092250 24840006 */ addiu $a0, $a0, 6 -/* B093F4 80092254 A44CFFFE */ sh $t4, -2($v0) -/* B093F8 80092258 920D0000 */ lbu $t5, ($s0) -/* B093FC 8009225C 006D082A */ slt $at, $v1, $t5 -/* B09400 80092260 5420FFF5 */ bnezl $at, .L80092238 -/* B09404 80092264 888C0000 */ lwl $t4, ($a0) -.L80092268: -/* B09408 80092268 8FAF005C */ lw $t7, 0x5c($sp) -/* B0940C 8009226C 8FB80064 */ lw $t8, 0x64($sp) -/* B09410 80092270 8FB90068 */ lw $t9, 0x68($sp) -/* B09414 80092274 34018800 */ li $at, 34816 -/* B09418 80092278 01E13021 */ addu $a2, $t7, $at -/* B0941C 8009227C 3C014270 */ li $at, 0x42700000 # 0.000000 -/* B09420 80092280 44813000 */ mtc1 $at, $f6 -/* B09424 80092284 C7A4006C */ lwc1 $f4, 0x6c($sp) -/* B09428 80092288 8FA90070 */ lw $t1, 0x70($sp) -/* B0942C 8009228C 8FAA0074 */ lw $t2, 0x74($sp) -/* B09430 80092290 8FAB0078 */ lw $t3, 0x78($sp) -/* B09434 80092294 8FAC007C */ lw $t4, 0x7c($sp) -/* B09438 80092298 AFB80010 */ sw $t8, 0x10($sp) -/* B0943C 8009229C AFB90014 */ sw $t9, 0x14($sp) -/* B09440 800922A0 8FA40058 */ lw $a0, 0x58($sp) -/* B09444 800922A4 3C198012 */ lui $t9, %hi(D_80126240) # $t9, 0x8012 -/* B09448 800922A8 3C188012 */ lui $t8, %hi(D_80126234) # $t8, 0x8012 -/* B0944C 800922AC 25E53800 */ addiu $a1, $t7, 0x3800 -/* B09450 800922B0 240F0070 */ li $t7, 112 -/* B09454 800922B4 27186234 */ addiu $t8, %lo(D_80126234) # addiu $t8, $t8, 0x6234 -/* B09458 800922B8 27396240 */ addiu $t9, %lo(D_80126240) # addiu $t9, $t9, 0x6240 -/* B0945C 800922BC 240D0040 */ li $t5, 64 -/* B09460 800922C0 AFAD002C */ sw $t5, 0x2c($sp) -/* B09464 800922C4 AFB90038 */ sw $t9, 0x38($sp) -/* B09468 800922C8 AFB80034 */ sw $t8, 0x34($sp) -/* B0946C 800922CC AFAF0030 */ sw $t7, 0x30($sp) -/* B09470 800922D0 E7A40018 */ swc1 $f4, 0x18($sp) -/* B09474 800922D4 E7A6003C */ swc1 $f6, 0x3c($sp) -/* B09478 800922D8 AFA9001C */ sw $t1, 0x1c($sp) -/* B0947C 800922DC AFAA0020 */ sw $t2, 0x20($sp) -/* B09480 800922E0 AFAB0024 */ sw $t3, 0x24($sp) -/* B09484 800922E4 AFAC0028 */ sw $t4, 0x28($sp) -/* B09488 800922E8 8C890000 */ lw $t1, ($a0) -/* B0948C 800922EC 02003825 */ move $a3, $s0 -/* B09490 800922F0 8D2202DC */ lw $v0, 0x2dc($t1) -/* B09494 800922F4 244A3800 */ addiu $t2, $v0, 0x3800 -/* B09498 800922F8 AFAA0044 */ sw $t2, 0x44($sp) -/* B0949C 800922FC 0C024689 */ jal func_80091A24 -/* B094A0 80092300 AFA20040 */ sw $v0, 0x40($sp) -/* B094A4 80092304 8FBF0054 */ lw $ra, 0x54($sp) -/* B094A8 80092308 8FB00050 */ lw $s0, 0x50($sp) -/* B094AC 8009230C 27BD0058 */ addiu $sp, $sp, 0x58 -/* B094B0 80092310 03E00008 */ jr $ra -/* B094B4 80092314 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A248.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A248.s index a414241326..1d3155d935 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A248.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A248.s @@ -31,7 +31,7 @@ glabel func_8087A248 /* 00818 8087A2B8 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 /* 0081C 8087A2BC E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 /* 00820 8087A2C0 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 00824 8087A2C4 0C023A62 */ jal func_8008E988 +/* 00824 8087A2C4 0C023A62 */ jal Player_InCsMode /* 00828 8087A2C8 8FA40024 */ lw $a0, 0x0024($sp) /* 0082C 8087A2CC 10400004 */ beq $v0, $zero, .L8087A2E0 /* 00830 8087A2D0 8FA40024 */ lw $a0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A300.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A300.s index fa6c5d83be..30e295de32 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A300.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/func_8087A300.s @@ -24,7 +24,7 @@ glabel func_8087A300 /* 008B4 8087A354 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 008B8 8087A358 00000000 */ nop /* 008BC 8087A35C E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 008C0 8087A360 0C023A62 */ jal func_8008E988 +/* 008C0 8087A360 0C023A62 */ jal Player_InCsMode /* 008C4 8087A364 8FA40024 */ lw $a0, 0x0024($sp) /* 008C8 8087A368 10400004 */ beq $v0, $zero, .L8087A37C /* 008CC 8087A36C 8FA40024 */ lw $a0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D2F0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D2F0.s index b72376cc9b..688f95a515 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D2F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D2F0.s @@ -11,7 +11,7 @@ glabel func_8087D2F0 /* 00350 8087D310 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 00354 8087D314 504000A4 */ beql $v0, $zero, .L8087D5A8 /* 00358 8087D318 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0035C 8087D31C 0C023A62 */ jal func_8008E988 +/* 0035C 8087D31C 0C023A62 */ jal Player_InCsMode /* 00360 8087D320 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00364 8087D324 1440009F */ bne $v0, $zero, .L8087D5A4 /* 00368 8087D328 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808877C4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808877C4.s index 47ef807505..4a58840297 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808877C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/func_808877C4.s @@ -3,7 +3,7 @@ glabel func_808877C4 /* 004D8 808877C8 AFBF0014 */ sw $ra, 0x0014($sp) /* 004DC 808877CC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 004E0 808877D0 AFA70018 */ sw $a3, 0x0018($sp) -/* 004E4 808877D4 0C023A62 */ jal func_8008E988 +/* 004E4 808877D4 0C023A62 */ jal Player_InCsMode /* 004E8 808877D8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 004EC 808877DC 1440001D */ bne $v0, $zero, .L80887854 /* 004F0 808877E0 8FA70018 */ lw $a3, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FED0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FED0.s index 993442ef9e..951c0dcee1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FED0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/func_8088FED0.s @@ -20,7 +20,7 @@ glabel func_8088FED0 /* 00708 8088FF18 00000000 */ nop /* 0070C 8088FF1C 4502001D */ bc1fl .L8088FF94 /* 00710 8088FF20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00714 8088FF24 0C023A62 */ jal func_8008E988 +/* 00714 8088FF24 0C023A62 */ jal Player_InCsMode /* 00718 8088FF28 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0071C 8088FF2C 14400018 */ bne $v0, $zero, .L8088FF90 /* 00720 8088FF30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A12C4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A12C4.s index 1d918be273..c2efdefd6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A12C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A12C4.s @@ -6,7 +6,7 @@ glabel func_808A12C4 /* 00714 808A12D4 848F0018 */ lh $t7, 0x0018($a0) ## 00000018 /* 00718 808A12D8 55E0000E */ bnel $t7, $zero, .L808A1314 /* 0071C 808A12DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00720 808A12E0 0C023A62 */ jal func_8008E988 +/* 00720 808A12E0 0C023A62 */ jal Player_InCsMode /* 00724 808A12E4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00728 808A12E8 14400009 */ bne $v0, $zero, .L808A1310 /* 0072C 808A12EC 8FB80018 */ lw $t8, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4FA4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4FA4.s index 292439b205..3b5ad1af97 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4FA4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4FA4.s @@ -26,7 +26,7 @@ glabel func_808A4FA4 /* 00224 808A4FE4 14200034 */ bne $at, $zero, .L808A50B8 /* 00228 808A4FE8 AC8F0168 */ sw $t7, 0x0168($a0) ## 00000168 /* 0022C 808A4FEC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00230 808A4FF0 0C023A62 */ jal func_8008E988 +/* 00230 808A4FF0 0C023A62 */ jal Player_InCsMode /* 00234 808A4FF4 AFA5004C */ sw $a1, 0x004C($sp) /* 00238 808A4FF8 54400030 */ bnel $v0, $zero, .L808A50BC /* 0023C 808A4FFC C6000150 */ lwc1 $f0, 0x0150($s0) ## 00000150 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s index b8903bfcec..1a081d16a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s @@ -82,7 +82,7 @@ glabel func_808A6CCC /* 00BEC 808A6DFC 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 /* 00BF0 808A6E00 5441001A */ bnel $v0, $at, .L808A6E6C /* 00BF4 808A6E04 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00BF8 808A6E08 0C023A62 */ jal func_8008E988 +/* 00BF8 808A6E08 0C023A62 */ jal Player_InCsMode /* 00BFC 808A6E0C 8FA40044 */ lw $a0, 0x0044($sp) /* 00C00 808A6E10 3C03808B */ lui $v1, %hi(D_808A80A0) ## $v1 = 808B0000 /* 00C04 808A6E14 14400014 */ bne $v0, $zero, .L808A6E68 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A932C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A932C.s index 49b05a5e4a..44527b2ba7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A932C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/func_808A932C.s @@ -11,7 +11,7 @@ glabel func_808A932C .L808A9350: /* 00500 808A9350 1440000E */ bne $v0, $zero, .L808A938C /* 00504 808A9354 8FA4001C */ lw $a0, 0x001C($sp) -/* 00508 808A9358 0C023A62 */ jal func_8008E988 +/* 00508 808A9358 0C023A62 */ jal Player_InCsMode /* 0050C 808A935C AFA60018 */ sw $a2, 0x0018($sp) /* 00510 808A9360 1440000A */ bne $v0, $zero, .L808A938C /* 00514 808A9364 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s index 72498795e3..128a97badf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BFE50.s @@ -28,7 +28,7 @@ glabel func_808BFE50 /* 00A80 808BFE90 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00A84 808BFE94 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF0 /* 00A88 808BFE98 AFA3003C */ sw $v1, 0x003C($sp) -/* 00A8C 808BFE9C 0C023BD7 */ jal func_8008EF5C +/* 00A8C 808BFE9C 0C023BD7 */ jal Player_IsBurningStickInRange /* 00A90 808BFEA0 E7AA0038 */ swc1 $f10, 0x0038($sp) /* 00A94 808BFEA4 1040000A */ beq $v0, $zero, .L808BFED0 /* 00A98 808BFEA8 8FA3003C */ lw $v1, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s index 41c93fa5e0..2dfaf8ee40 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s @@ -517,7 +517,7 @@ glabel L808E29A8 /* 0C3BC 808E2C2C 0018CAC0 */ sll $t9, $t8, 11 /* 0C3C0 808E2C30 07230006 */ bgezl $t9, .L808E2C4C /* 0C3C4 808E2C34 C62C008C */ lwc1 $f12, 0x008C($s1) ## 0000008C -/* 0C3C8 808E2C38 0C023C26 */ jal func_8008F098 +/* 0C3C8 808E2C38 0C023C26 */ jal Player_HasMirrorShieldEquipped /* 0C3CC 808E2C3C 8FA400A4 */ lw $a0, 0x00A4($sp) /* 0C3D0 808E2C40 5040003B */ beql $v0, $zero, .L808E2D30 /* 0C3D4 808E2C44 26300610 */ addiu $s0, $s1, 0x0610 ## $s0 = 00000610 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093AB30.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093AB30.s index f99f6ad2ec..a94d681294 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093AB30.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093AB30.s @@ -105,7 +105,7 @@ glabel func_8093AB30 /* 01FE8 8093ACB8 00000000 */ nop /* 01FEC 8093ACBC 45020038 */ bc1fl .L8093ADA0 /* 01FF0 8093ACC0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01FF4 8093ACC4 0C023C26 */ jal func_8008F098 +/* 01FF4 8093ACC4 0C023C26 */ jal Player_HasMirrorShieldEquipped /* 01FF8 8093ACC8 8FA4004C */ lw $a0, 0x004C($sp) /* 01FFC 8093ACCC 1040000D */ beq $v0, $zero, .L8093AD04 /* 02000 8093ACD0 3C038095 */ lui $v1, %hi(D_8094C86E) ## $v1 = 80950000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s index 79f1d448e0..d763c8dff1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s @@ -123,7 +123,7 @@ glabel func_80943F08 .L80944060: /* 0B390 80944060 8FA400BC */ lw $a0, 0x00BC($sp) .L80944064: -/* 0B394 80944064 0C023C26 */ jal func_8008F098 +/* 0B394 80944064 0C023C26 */ jal Player_HasMirrorShieldEquipped /* 0B398 80944068 A7A800AE */ sh $t0, 0x00AE($sp) /* 0B39C 8094406C 10400105 */ beq $v0, $zero, .L80944484 /* 0B3A0 80944070 87A800AE */ lh $t0, 0x00AE($sp) @@ -439,7 +439,7 @@ glabel func_80943F08 /* 0B854 80944524 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 .L80944528: -/* 0B858 80944528 0C023C26 */ jal func_8008F098 +/* 0B858 80944528 0C023C26 */ jal Player_HasMirrorShieldEquipped /* 0B85C 8094452C 8FA400BC */ lw $a0, 0x00BC($sp) /* 0B860 80944530 10400094 */ beq $v0, $zero, .L80944784 /* 0B864 80944534 3C018095 */ lui $at, %hi(D_8094C858) ## $at = 80950000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094687C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094687C.s index 2bee2aaff6..85923c209a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094687C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094687C.s @@ -36,7 +36,7 @@ glabel func_8094687C /* 0DC34 80946904 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 /* 0DC38 80946908 0C02A800 */ jal func_800AA000 /* 0DC3C 8094690C E4240AFC */ swc1 $f4, 0x0AFC($at) ## 00010AFC -/* 0DC40 80946910 0C023C26 */ jal func_8008F098 +/* 0DC40 80946910 0C023C26 */ jal Player_HasMirrorShieldEquipped /* 0DC44 80946914 8FA4002C */ lw $a0, 0x002C($sp) /* 0DC48 80946918 10400062 */ beq $v0, $zero, .L80946AA4 /* 0DC4C 8094691C 8FA4002C */ lw $a0, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A84.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A84.s index c6d6ee87a5..d2545a8c6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A84.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995A84.s @@ -78,7 +78,7 @@ glabel func_80995A84 /* 00F50 80995BA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80995BA4: /* 00F54 80995BA4 8FA40044 */ lw $a0, 0x0044($sp) -/* 00F58 80995BA8 0C023A62 */ jal func_8008E988 +/* 00F58 80995BA8 0C023A62 */ jal Player_InCsMode /* 00F5C 80995BAC AFA7003C */ sw $a3, 0x003C($sp) /* 00F60 80995BB0 14400042 */ bne $v0, $zero, .L80995CBC /* 00F64 80995BB4 8FA7003C */ lw $a3, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809968D4.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809968D4.s index f6a6557ae7..19480352bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809968D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809968D4.s @@ -5,7 +5,7 @@ glabel func_809968D4 /* 00640 809968E0 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 00644 809968E4 AFA5002C */ sw $a1, 0x002C($sp) /* 00648 809968E8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0064C 809968EC 0C023A62 */ jal func_8008E988 +/* 0064C 809968EC 0C023A62 */ jal Player_InCsMode /* 00650 809968F0 AFAE0024 */ sw $t6, 0x0024($sp) /* 00654 809968F4 14400052 */ bne $v0, $zero, .L80996A40 /* 00658 809968F8 8FA50028 */ lw $a1, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997A34.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997A34.s index 234ee13dbb..4e47e6fa82 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997A34.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_80997A34.s @@ -3,7 +3,7 @@ glabel func_80997A34 /* 01798 80997A38 AFBF0014 */ sw $ra, 0x0014($sp) /* 0179C 80997A3C AFA40018 */ sw $a0, 0x0018($sp) /* 017A0 80997A40 AFA5001C */ sw $a1, 0x001C($sp) -/* 017A4 80997A44 0C023A62 */ jal func_8008E988 +/* 017A4 80997A44 0C023A62 */ jal Player_InCsMode /* 017A8 80997A48 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 017AC 80997A4C 10400003 */ beq $v0, $zero, .L80997A5C /* 017B0 80997A50 8FA5001C */ lw $a1, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s index cc09980101..79b001af40 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s @@ -107,7 +107,7 @@ glabel func_809B27D8 /* 003B0 809B2950 31F80004 */ andi $t8, $t7, 0x0004 ## $t8 = 00000000 /* 003B4 809B2954 53000035 */ beql $t8, $zero, .L809B2A2C /* 003B8 809B2958 C62A0150 */ lwc1 $f10, 0x0150($s1) ## 00000150 -/* 003BC 809B295C 0C023C26 */ jal func_8008F098 +/* 003BC 809B295C 0C023C26 */ jal Player_HasMirrorShieldEquipped /* 003C0 809B2960 8FA400C4 */ lw $a0, 0x00C4($sp) /* 003C4 809B2964 1040001D */ beq $v0, $zero, .L809B29DC /* 003C8 809B2968 26250024 */ addiu $a1, $s1, 0x0024 ## $a1 = 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Update.s index fa7b1b788a..801366551f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Update.s @@ -16,7 +16,7 @@ glabel EnArrow_Update /* 00DC0 809B46E0 57000006 */ bnel $t8, $zero, .L809B46FC /* 00DC4 809B46E4 8E19025C */ lw $t9, 0x025C($s0) ## 0000025C .L809B46E8: -/* 00DC8 809B46E8 0C023A37 */ jal func_8008E8DC +/* 00DC8 809B46E8 0C023A37 */ jal Player_InBlockingCsMode /* 00DCC 809B46EC 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 /* 00DD0 809B46F0 54400007 */ bnel $v0, $zero, .L809B4710 /* 00DD4 809B46F4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C990C.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C990C.s index 78ccba2dfa..450c29c394 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C990C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C990C.s @@ -22,7 +22,7 @@ glabel func_809C990C /* 00B90 809C9950 82050003 */ lb $a1, 0x0003($s0) ## 00000003 /* 00B94 809C9954 50400017 */ beql $v0, $zero, .L809C99B4 /* 00B98 809C9958 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B9C 809C995C 0C023A62 */ jal func_8008E988 +/* 00B9C 809C995C 0C023A62 */ jal Player_InCsMode /* 00BA0 809C9960 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00BA4 809C9964 14400012 */ bne $v0, $zero, .L809C99B0 /* 00BA8 809C9968 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0864.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0864.s index c52c4f9419..fa26080ef7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0864.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0864.s @@ -294,7 +294,7 @@ glabel func_809E0864 /* 00A10 809E0C50 00000000 */ nop /* 00A14 809E0C54 45020009 */ bc1fl .L809E0C7C /* 00A18 809E0C58 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A1C 809E0C5C 0C023C20 */ jal func_8008F080 +/* 00A1C 809E0C5C 0C023C20 */ jal Player_GetMask /* 00A20 809E0C60 8FA40044 */ lw $a0, 0x0044($sp) /* 00A24 809E0C64 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00A28 809E0C68 50410004 */ beql $v0, $at, .L809E0C7C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0C8C.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0C8C.s index 9b627b0bb2..6222507844 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0C8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0C8C.s @@ -73,7 +73,7 @@ glabel func_809E0C8C .L809E0D84: /* 00B44 809E0D84 5100001B */ beql $t0, $zero, .L809E0DF4 /* 00B48 809E0D88 92020248 */ lbu $v0, 0x0248($s0) ## 00000248 -/* 00B4C 809E0D8C 0C023C20 */ jal func_8008F080 +/* 00B4C 809E0D8C 0C023C20 */ jal Player_GetMask /* 00B50 809E0D90 8FA40044 */ lw $a0, 0x0044($sp) /* 00B54 809E0D94 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00B58 809E0D98 50410016 */ beql $v0, $at, .L809E0DF4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s index 00bf5efc95..ca042454fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1B8C.s @@ -67,7 +67,7 @@ glabel L809E1C3C /* 003A8 809E1C58 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 003AC 809E1C5C 15210011 */ bne $t1, $at, .L809E1CA4 /* 003B0 809E1C60 00000000 */ nop -/* 003B4 809E1C64 0C023C23 */ jal func_8008F08C +/* 003B4 809E1C64 0C023C23 */ jal Player_UnsetMask /* 003B8 809E1C68 8FA40034 */ lw $a0, 0x0034($sp) /* 003BC 809E1C6C 8FA40034 */ lw $a0, 0x0034($sp) /* 003C0 809E1C70 0C021344 */ jal Item_Give diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s index 0a2fa64a1d..20fb80f49e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s @@ -148,7 +148,7 @@ glabel func_809F0AA4 /* 002DC 809F0BBC 00000000 */ nop /* 002E0 809F0BC0 45030006 */ bc1tl .L809F0BDC /* 002E4 809F0BC4 86190156 */ lh $t9, 0x0156($s0) ## 00000156 -/* 002E8 809F0BC8 0C023C20 */ jal func_8008F080 +/* 002E8 809F0BC8 0C023C20 */ jal Player_GetMask /* 002EC 809F0BCC 8FA40044 */ lw $a0, 0x0044($sp) /* 002F0 809F0BD0 1440001D */ bne $v0, $zero, .L809F0C48 /* 002F4 809F0BD4 00000000 */ nop @@ -184,7 +184,7 @@ glabel func_809F0AA4 /* 00360 809F0C40 10000129 */ beq $zero, $zero, .L809F10E8 /* 00364 809F0C44 A6000150 */ sh $zero, 0x0150($s0) ## 00000150 .L809F0C48: -/* 00368 809F0C48 0C023C20 */ jal func_8008F080 +/* 00368 809F0C48 0C023C20 */ jal Player_GetMask /* 0036C 809F0C4C 8FA40044 */ lw $a0, 0x0044($sp) /* 00370 809F0C50 5040000B */ beql $v0, $zero, .L809F0C80 /* 00374 809F0C54 86020150 */ lh $v0, 0x0150($s0) ## 00000150 @@ -246,7 +246,7 @@ glabel func_809F0AA4 /* 00438 809F0D18 A3A00035 */ sb $zero, 0x0035($sp) /* 0043C 809F0D1C A7A0003C */ sh $zero, 0x003C($sp) /* 00440 809F0D20 A7A0003E */ sh $zero, 0x003E($sp) -/* 00444 809F0D24 0C023C20 */ jal func_8008F080 +/* 00444 809F0D24 0C023C20 */ jal Player_GetMask /* 00448 809F0D28 8FA40044 */ lw $a0, 0x0044($sp) /* 0044C 809F0D2C 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF /* 00450 809F0D30 2F210008 */ sltiu $at, $t9, 0x0008 @@ -278,7 +278,7 @@ glabel L809F0D80 /* 004A8 809F0D88 31CF8000 */ andi $t7, $t6, 0x8000 ## $t7 = 00000000 /* 004AC 809F0D8C 15E00023 */ bne $t7, $zero, .L809F0E1C /* 004B0 809F0D90 00000000 */ nop -/* 004B4 809F0D94 0C023C20 */ jal func_8008F080 +/* 004B4 809F0D94 0C023C20 */ jal Player_GetMask /* 004B8 809F0D98 8FA40044 */ lw $a0, 0x0044($sp) /* 004BC 809F0D9C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 004C0 809F0DA0 1041001E */ beq $v0, $at, .L809F0E1C @@ -323,7 +323,7 @@ glabel L809F0E1C /* 00548 809F0E28 4600020D */ trunc.w.s $f8, $f0 /* 0054C 809F0E2C 8FA40044 */ lw $a0, 0x0044($sp) /* 00550 809F0E30 440C4000 */ mfc1 $t4, $f8 -/* 00554 809F0E34 0C023C20 */ jal func_8008F080 +/* 00554 809F0E34 0C023C20 */ jal Player_GetMask /* 00558 809F0E38 A7AC003A */ sh $t4, 0x003A($sp) /* 0055C 809F0E3C 87AD003A */ lh $t5, 0x003A($sp) /* 00560 809F0E40 00021C00 */ sll $v1, $v0, 16 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s index 78928e9db5..f195da7e40 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s @@ -67,7 +67,7 @@ glabel func_809FC5D0 /* 004F4 809FC6C4 8FBF0014 */ lw $ra, 0x0014($sp) .L809FC6C8: /* 004F8 809FC6C8 AFA70040 */ sw $a3, 0x0040($sp) -/* 004FC 809FC6CC 0C023A62 */ jal func_8008E988 +/* 004FC 809FC6CC 0C023A62 */ jal Player_InCsMode /* 00500 809FC6D0 AFA8003C */ sw $t0, 0x003C($sp) /* 00504 809FC6D4 8FA70040 */ lw $a3, 0x0040($sp) /* 00508 809FC6D8 14400063 */ bne $v0, $zero, .L809FC868 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 index cdf226477e..76f38d3726 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A0329C.s @@ -84,7 +84,7 @@ glabel func_80A0329C /* 01768 80A03398 10000064 */ beq $zero, $zero, .L80A0352C /* 0176C 80A0339C 8FBF0024 */ lw $ra, 0x0024($sp) .L80A033A0: -/* 01770 80A033A0 0C023A62 */ jal func_8008E988 +/* 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) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s index 8f37d7b519..9ce3c19c2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount1/func_80A06E88.s @@ -58,7 +58,7 @@ glabel func_80A06E88 /* 00808 80A06F28 8F39E670 */ lw $t9, %lo(gSaveContext+0x10)($t9) /* 0080C 80A06F2C 13200006 */ beq $t9, $zero, .L80A06F48 /* 00810 80A06F30 00000000 */ nop -/* 00814 80A06F34 0C023C20 */ jal func_8008F080 +/* 00814 80A06F34 0C023C20 */ jal Player_GetMask /* 00818 80A06F38 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 0081C 80A06F3C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 00820 80A06F40 54410004 */ bnel $v0, $at, .L80A06F54 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13A08.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13A08.s index 53df3e91b2..b18b51b3df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13A08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13A08.s @@ -183,7 +183,7 @@ glabel func_80A13A08 /* 00BEC 80A13C5C 00000000 */ nop /* 00BF0 80A13C60 45020009 */ bc1fl .L80A13C88 /* 00BF4 80A13C64 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00BF8 80A13C68 0C023C20 */ jal func_8008F080 +/* 00BF8 80A13C68 0C023C20 */ jal Player_GetMask /* 00BFC 80A13C6C 8FA40044 */ lw $a0, 0x0044($sp) /* 00C00 80A13C70 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00C04 80A13C74 50410004 */ beql $v0, $at, .L80A13C88 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13DE4.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13DE4.s index 34377ebdc6..f69c8faf9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13DE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A13DE4.s @@ -136,7 +136,7 @@ glabel func_80A13DE4 .L80A13FBC: /* 00F4C 80A13FBC 11000006 */ beq $t0, $zero, .L80A13FD8 /* 00F50 80A13FC0 00000000 */ nop -/* 00F54 80A13FC4 0C023C20 */ jal func_8008F080 +/* 00F54 80A13FC4 0C023C20 */ jal Player_GetMask /* 00F58 80A13FC8 8FA4004C */ lw $a0, 0x004C($sp) /* 00F5C 80A13FCC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00F60 80A13FD0 54410004 */ bnel $v0, $at, .L80A13FE4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F9C0.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F9C0.s index 3867eeb846..2428f2ccf7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F9C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F9C0.s @@ -24,7 +24,7 @@ glabel func_80A2F9C0 /* 00894 80A2FA14 8FA4001C */ lw $a0, 0x001C($sp) /* 00898 80A2FA18 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 0089C 80A2FA1C 2407001E */ addiu $a3, $zero, 0x001E ## $a3 = 0000001E -/* 008A0 80A2FA20 0C023B67 */ jal func_8008ED9C +/* 008A0 80A2FA20 0C023B67 */ jal Player_UpdateBottleHeld /* 008A4 80A2FA24 8C851C44 */ lw $a1, 0x1C44($a0) ## 00001C44 /* 008A8 80A2FA28 0C021CC3 */ jal Rupees_ChangeBy /* 008AC 80A2FA2C 2404000A */ addiu $a0, $zero, 0x000A ## $a0 = 0000000A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FA50.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FA50.s index 3be53dc20b..688cc7f924 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FA50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FA50.s @@ -26,7 +26,7 @@ glabel func_80A2FA50 /* 0092C 80A2FAAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00930 80A2FAB0 8E051C44 */ lw $a1, 0x1C44($s0) ## 00001C44 /* 00934 80A2FAB4 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00938 80A2FAB8 0C023B67 */ jal func_8008ED9C +/* 00938 80A2FAB8 0C023B67 */ jal Player_UpdateBottleHeld /* 0093C 80A2FABC 2407001E */ addiu $a3, $zero, 0x001E ## $a3 = 0000001E /* 00940 80A2FAC0 0C021CC3 */ jal Rupees_ChangeBy /* 00944 80A2FAC4 24040032 */ addiu $a0, $zero, 0x0032 ## $a0 = 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70058.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70058.s index 03d15ff6f2..0ef3539c61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70058.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70058.s @@ -242,7 +242,7 @@ glabel L80A702CC /* 00D4C 80A702FC 8FA40048 */ lw $a0, 0x0048($sp) /* 00D50 80A70300 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 00D54 80A70304 2407001E */ addiu $a3, $zero, 0x001E ## $a3 = 0000001E -/* 00D58 80A70308 0C023B67 */ jal func_8008ED9C +/* 00D58 80A70308 0C023B67 */ jal Player_UpdateBottleHeld /* 00D5C 80A7030C 8C851C44 */ lw $a1, 0x1C44($a0) ## 00001C44 /* 00D60 80A70310 1000009F */ beq $zero, $zero, .L80A70590 /* 00D64 80A70314 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70834.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70834.s index baf1a70e2e..0bf332f8df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70834.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70834.s @@ -41,7 +41,7 @@ glabel func_80A70834 /* 0131C 80A708CC 10000023 */ beq $zero, $zero, .L80A7095C /* 01320 80A708D0 A4C8010E */ sh $t0, 0x010E($a2) ## 0000010E .L80A708D4: -/* 01324 80A708D4 0C023C20 */ jal func_8008F080 +/* 01324 80A708D4 0C023C20 */ jal Player_GetMask /* 01328 80A708D8 AFA60020 */ sw $a2, 0x0020($sp) /* 0132C 80A708DC 1440001F */ bne $v0, $zero, .L80A7095C /* 01330 80A708E0 8FA60020 */ lw $a2, 0x0020($sp) @@ -74,7 +74,7 @@ glabel func_80A70834 /* 0138C 80A7093C 10000007 */ beq $zero, $zero, .L80A7095C /* 01390 80A70940 A4CC010E */ sh $t4, 0x010E($a2) ## 0000010E .L80A70944: -/* 01394 80A70944 0C023C20 */ jal func_8008F080 +/* 01394 80A70944 0C023C20 */ jal Player_GetMask /* 01398 80A70948 AFA60020 */ sw $a2, 0x0020($sp) /* 0139C 80A7094C 14400003 */ bne $v0, $zero, .L80A7095C /* 013A0 80A70950 8FA60020 */ lw $a2, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADAA0.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADAA0.s index 3599c6194c..413cf82dd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADAA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADAA0.s @@ -72,7 +72,7 @@ glabel L80AADB78 /* 0040C 80AADB7C 8FA4002C */ lw $a0, 0x002C($sp) /* 00410 80AADB80 50400028 */ beql $v0, $zero, .L80AADC24 /* 00414 80AADB84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00418 80AADB88 0C023C23 */ jal func_8008F08C +/* 00418 80AADB88 0C023C23 */ jal Player_UnsetMask /* 0041C 80AADB8C 8FA4002C */ lw $a0, 0x002C($sp) /* 00420 80AADB90 8FA4002C */ lw $a0, 0x002C($sp) /* 00424 80AADB94 0C021344 */ jal Item_Give diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE294.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE294.s index 52ac9df558..e1f950cee0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE294.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAE294.s @@ -13,7 +13,7 @@ glabel func_80AAE294 /* 00B2C 80AAE29C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00B30 80AAE2A0 AFBF002C */ sw $ra, 0x002C($sp) /* 00B34 80AAE2A4 AFA5004C */ sw $a1, 0x004C($sp) -/* 00B38 80AAE2A8 0C023A62 */ jal func_8008E988 +/* 00B38 80AAE2A8 0C023A62 */ jal Player_InCsMode /* 00B3C 80AAE2AC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00B40 80AAE2B0 54400092 */ bnel $v0, $zero, .L80AAE4FC /* 00B44 80AAE2B4 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBC88.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBC88.s index 022d84cc9c..1f477a29be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBC88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBC88.s @@ -7,7 +7,7 @@ glabel func_80ADBC88 /* 02D0C 80ADBC9C AFBF0024 */ sw $ra, 0x0024($sp) /* 02D10 80ADBCA0 15C00005 */ bne $t6, $zero, .L80ADBCB8 /* 02D14 80ADBCA4 AFA5002C */ sw $a1, 0x002C($sp) -/* 02D18 80ADBCA8 0C023A62 */ jal func_8008E988 +/* 02D18 80ADBCA8 0C023A62 */ jal Player_InCsMode /* 02D1C 80ADBCAC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 02D20 80ADBCB0 5440001A */ bnel $v0, $zero, .L80ADBD1C /* 02D24 80ADBCB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s index 4fa4849ae7..48b1cecce2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s @@ -52,7 +52,7 @@ glabel func_80AFF7D8 /* 015EC 80AFF89C 8C4E0004 */ lw $t6, 0x0004($v0) ## 80B01644 /* 015F0 80AFF8A0 C5D2002C */ lwc1 $f18, 0x002C($t6) ## 0000002C /* 015F4 80AFF8A4 E4D2002C */ swc1 $f18, 0x002C($a2) ## 0000002C -/* 015F8 80AFF8A8 0C023C20 */ jal func_8008F080 +/* 015F8 80AFF8A8 0C023C20 */ jal Player_GetMask /* 015FC 80AFF8AC 8FA4002C */ lw $a0, 0x002C($sp) /* 01600 80AFF8B0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 01604 80AFF8B4 1441000C */ bne $v0, $at, .L80AFF8E8 @@ -108,14 +108,14 @@ glabel func_80AFF7D8 /* 016C0 80AFF970 10000012 */ beq $zero, $zero, .L80AFF9BC /* 016C4 80AFF974 A60E02C4 */ sh $t6, 0x02C4($s0) ## 000002C4 .L80AFF978: -/* 016C8 80AFF978 0C023C20 */ jal func_8008F080 +/* 016C8 80AFF978 0C023C20 */ jal Player_GetMask /* 016CC 80AFF97C 8FA4002C */ lw $a0, 0x002C($sp) /* 016D0 80AFF980 14400003 */ bne $v0, $zero, .L80AFF990 /* 016D4 80AFF984 240F10BC */ addiu $t7, $zero, 0x10BC ## $t7 = 000010BC /* 016D8 80AFF988 1000000C */ beq $zero, $zero, .L80AFF9BC /* 016DC 80AFF98C A60F02C4 */ sh $t7, 0x02C4($s0) ## 000002C4 .L80AFF990: -/* 016E0 80AFF990 0C023C20 */ jal func_8008F080 +/* 016E0 80AFF990 0C023C20 */ jal Player_GetMask /* 016E4 80AFF994 8FA4002C */ lw $a0, 0x002C($sp) /* 016E8 80AFF998 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 016EC 80AFF99C 14410004 */ bne $v0, $at, .L80AFF9B0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002D8.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002D8.s index f81c55250d..a053d84c84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B002D8.s @@ -22,7 +22,7 @@ glabel func_80B002D8 /* 02078 80B00328 35CF0200 */ ori $t7, $t6, 0x0200 ## $t7 = 00000200 /* 0207C 80B0032C 0C2BF90A */ jal func_80AFE428 /* 02080 80B00330 A44F0EF6 */ sh $t7, 0x0EF6($v0) ## 8015F556 -/* 02084 80B00334 0C023C23 */ jal func_8008F08C +/* 02084 80B00334 0C023C23 */ jal Player_UnsetMask /* 02088 80B00338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0208C 80B0033C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02090 80B00340 0C021344 */ jal Item_Give diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Init.s index 96b78c54f4..420807c928 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Init.s @@ -17,7 +17,7 @@ glabel EnTorch2_Init /* 0003C 80B1D9BC A099014E */ sb $t9, 0x014E($a0) ## 0000014E /* 00040 80B1D9C0 A0890152 */ sb $t1, 0x0152($a0) ## 00000152 /* 00044 80B1D9C4 A0890151 */ sb $t1, 0x0151($a0) ## 00000151 -/* 00048 80B1D9C8 0C023B01 */ jal func_8008EC04 +/* 00048 80B1D9C8 0C023B01 */ jal Player_SetModelGroup /* 0004C 80B1D9CC 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 00050 80B1D9D0 8FA50034 */ lw $a1, 0x0034($sp) /* 00054 80B1D9D4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s index 36db138c00..58da11b6ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s @@ -41,7 +41,7 @@ glabel MirRay_Draw /* 010D8 80B8E128 908F02AE */ lbu $t7, 0x02AE($a0) ## 000002AE /* 010DC 80B8E12C 55E000AD */ bnel $t7, $zero, .L80B8E3E4 /* 010E0 80B8E130 8FBF0034 */ lw $ra, 0x0034($sp) -/* 010E4 80B8E134 0C023C2B */ jal func_8008F0AC +/* 010E4 80B8E134 0C023C2B */ jal Player_HasMirrorShieldSetToDraw /* 010E8 80B8E138 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 010EC 80B8E13C 104000A8 */ beq $v0, $zero, .L80B8E3E0 /* 010F0 80B8E140 26040A20 */ addiu $a0, $s0, 0x0A20 ## $a0 = 00000A20 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B254.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B254.s index 3c2599757d..a7dc4af9ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B254.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/func_80B9B254.s @@ -19,7 +19,7 @@ glabel func_80B9B254 /* 000E8 80B9B268 10000017 */ beq $zero, $zero, .L80B9B2C8 /* 000EC 80B9B26C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80B9B270: -/* 000F0 80B9B270 0C023C0D */ jal func_8008F034 +/* 000F0 80B9B270 0C023C0D */ jal Player_GetStrength /* 000F4 80B9B274 AFA40018 */ sw $a0, 0x0018($sp) /* 000F8 80B9B278 8FA40018 */ lw $a0, 0x0018($sp) /* 000FC 80B9B27C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Update.s index 5d718fafcc..97d89916e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/ObjSwitch_Update.s @@ -61,7 +61,7 @@ glabel L80B9E690 /* 014AC 80B9E6BC 8FBF001C */ lw $ra, 0x001C($sp) glabel L80B9E6C0 /* 014B0 80B9E6C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014B4 80B9E6C4 0C023A62 */ jal func_8008E988 +/* 014B4 80B9E6C4 0C023A62 */ jal Player_InCsMode /* 014B8 80B9E6C8 AFA70020 */ sw $a3, 0x0020($sp) /* 014BC 80B9E6CC 14400005 */ bne $v0, $zero, .L80B9E6E4 /* 014C0 80B9E6D0 8FA70020 */ lw $a3, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DCD4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DCD4.s index 8d14f1c0e8..84efd48846 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DCD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9DCD4.s @@ -53,7 +53,7 @@ glabel func_80B9DCD4 /* 00B80 80B9DD90 1440001D */ bne $v0, $zero, .L80B9DE08 /* 00B84 80B9DD94 8FA60018 */ lw $a2, 0x0018($sp) /* 00B88 80B9DD98 8FA4001C */ lw $a0, 0x001C($sp) -/* 00B8C 80B9DD9C 0C023A62 */ jal func_8008E988 +/* 00B8C 80B9DD9C 0C023A62 */ jal Player_InCsMode /* 00B90 80B9DDA0 AFA60018 */ sw $a2, 0x0018($sp) /* 00B94 80B9DDA4 14400018 */ bne $v0, $zero, .L80B9DE08 /* 00B98 80B9DDA8 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Update.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Update.s index fa05f9d9de..a5a054ea58 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Update.s @@ -3489,7 +3489,7 @@ glabel L80829894 /* 16100 80829920 8FAF0078 */ lw $t7, 0x0078($sp) /* 16104 80829924 02202025 */ or $a0, $s1, $zero ## $a0 = 8082AB98 /* 16108 80829928 ADE00694 */ sw $zero, 0x0694($t7) ## 00000694 -/* 1610C 8082992C 0C023B2B */ jal func_8008ECAC +/* 1610C 8082992C 0C023B2B */ jal Player_SetEquipmentData /* 16110 80829930 8FA50078 */ lw $a1, 0x0078($sp) /* 16114 80829934 3C048083 */ lui $a0, %hi(D_80830238) ## $a0 = 80830000 /* 16118 80829938 0C00084C */ jal osSyncPrintf diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846CD8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/Player_Init.s similarity index 94% rename from asm/non_matchings/overlays/actors/ovl_player_actor/func_80846CD8.s rename to asm/non_matchings/overlays/actors/ovl_player_actor/Player_Init.s index 9c73beebe8..4a28e2aa2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846CD8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/Player_Init.s @@ -4,7 +4,7 @@ glabel D_80855290 .balign 4 .text -glabel func_80846CD8 +glabel Player_Init /* 14AC8 80846CD8 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 /* 14ACC 80846CDC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 14AD0 80846CE0 AFBF0034 */ sw $ra, 0x0034($sp) @@ -14,7 +14,7 @@ glabel func_80846CD8 /* 14AE0 80846CF0 00A11021 */ addu $v0, $a1, $at /* 14AE4 80846CF4 8C4E242C */ lw $t6, 0x242C($v0) ## 0000242C /* 14AE8 80846CF8 00250821 */ addu $at, $at, $a1 -/* 14AEC 80846CFC 3C188084 */ lui $t8, %hi(func_80846AAC) ## $t8 = 80840000 +/* 14AEC 80846CFC 3C188084 */ lui $t8, %hi(Player_InitCommon) ## $t8 = 80840000 /* 14AF0 80846D00 AFAE005C */ sw $t6, 0x005C($sp) /* 14AF4 80846D04 A0201E5D */ sb $zero, 0x1E5D($at) ## 00011E5D /* 14AF8 80846D08 804F1E5D */ lb $t7, 0x1E5D($v0) ## 00001E5D @@ -23,21 +23,21 @@ glabel func_80846CD8 /* 14B04 80846D14 A02F1E5C */ sb $t7, 0x1E5C($at) ## 00011E5C /* 14B08 80846D18 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 14B0C 80846D1C 00250821 */ addu $at, $at, $a1 -/* 14B10 80846D20 27186AAC */ addiu $t8, $t8, %lo(func_80846AAC) ## $t8 = 80846AAC +/* 14B10 80846D20 27186AAC */ addiu $t8, $t8, %lo(Player_InitCommon) ## $t8 = 80846AAC /* 14B14 80846D24 AC381D3C */ sw $t8, 0x1D3C($at) ## 00011D3C /* 14B18 80846D28 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 14B1C 80846D2C 3C198085 */ lui $t9, %hi(func_80848F9C) ## $t9 = 80850000 -/* 14B20 80846D30 27398F9C */ addiu $t9, $t9, %lo(func_80848F9C) ## $t9 = 80848F9C +/* 14B1C 80846D2C 3C198085 */ lui $t9, %hi(Player_UpdateCommon) ## $t9 = 80850000 +/* 14B20 80846D30 27398F9C */ addiu $t9, $t9, %lo(Player_UpdateCommon) ## $t9 = 80848F9C /* 14B24 80846D34 00250821 */ addu $at, $at, $a1 /* 14B28 80846D38 AC391D40 */ sw $t9, 0x1D40($at) ## 00011D40 /* 14B2C 80846D3C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 14B30 80846D40 3C098085 */ lui $t1, %hi(func_80852EC8) ## $t1 = 80850000 -/* 14B34 80846D44 25292EC8 */ addiu $t1, $t1, %lo(func_80852EC8) ## $t1 = 80852EC8 +/* 14B30 80846D40 3C098085 */ lui $t1, %hi(Player_IsDroppingFish) ## $t1 = 80850000 +/* 14B34 80846D44 25292EC8 */ addiu $t1, $t1, %lo(Player_IsDroppingFish) ## $t1 = 80852EC8 /* 14B38 80846D48 00250821 */ addu $at, $at, $a1 /* 14B3C 80846D4C AC291D44 */ sw $t1, 0x1D44($at) ## 00011D44 /* 14B40 80846D50 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 14B44 80846D54 3C0A8085 */ lui $t2, %hi(func_80852EFC) ## $t2 = 80850000 -/* 14B48 80846D58 254A2EFC */ addiu $t2, $t2, %lo(func_80852EFC) ## $t2 = 80852EFC +/* 14B44 80846D54 3C0A8085 */ lui $t2, %hi(Player_StartFishing) ## $t2 = 80850000 +/* 14B48 80846D58 254A2EFC */ addiu $t2, $t2, %lo(Player_StartFishing) ## $t2 = 80852EFC /* 14B4C 80846D5C 00250821 */ addu $at, $at, $a1 /* 14B50 80846D60 AC2A1D48 */ sw $t2, 0x1D48($at) ## 00011D48 /* 14B54 80846D64 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -56,8 +56,8 @@ glabel func_80846CD8 /* 14B88 80846D98 00250821 */ addu $at, $at, $a1 /* 14B8C 80846D9C AC2D1D54 */ sw $t5, 0x1D54($at) ## 00011D54 /* 14B90 80846DA0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 14B94 80846DA4 3C0E8085 */ lui $t6, %hi(func_808530E0) ## $t6 = 80850000 -/* 14B98 80846DA8 25CE30E0 */ addiu $t6, $t6, %lo(func_808530E0) ## $t6 = 808530E0 +/* 14B94 80846DA4 3C0E8085 */ lui $t6, %hi(Player_InflictDamage) ## $t6 = 80850000 +/* 14B98 80846DA8 25CE30E0 */ addiu $t6, $t6, %lo(Player_InflictDamage) ## $t6 = 808530E0 /* 14B9C 80846DAC 00250821 */ addu $at, $at, $a1 /* 14BA0 80846DB0 AC2E1D58 */ sw $t6, 0x1D58($at) ## 00011D58 /* 14BA4 80846DB4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -77,10 +77,10 @@ glabel func_80846CD8 /* 14BDC 80846DEC 0019C880 */ sll $t9, $t9, 2 /* 14BE0 80846DF0 0338C821 */ addu $t9, $t9, $t8 /* 14BE4 80846DF4 0019C880 */ sll $t9, $t9, 2 -/* 14BE8 80846DF8 3C098085 */ lui $t1, %hi(D_80853428) ## $t1 = 80850000 +/* 14BE8 80846DF8 3C098085 */ lui $t1, %hi(sAgeProperties) ## $t1 = 80850000 /* 14BEC 80846DFC 0338C821 */ addu $t9, $t9, $t8 /* 14BF0 80846E00 0019C880 */ sll $t9, $t9, 2 -/* 14BF4 80846E04 25293428 */ addiu $t1, $t1, %lo(D_80853428) ## $t1 = 80853428 +/* 14BF4 80846E04 25293428 */ addiu $t1, $t1, %lo(sAgeProperties) ## $t1 = 80853428 /* 14BF8 80846E08 03295021 */ addu $t2, $t9, $t1 /* 14BFC 80846E0C 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF /* 14C00 80846E10 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 @@ -93,18 +93,18 @@ glabel func_80846CD8 /* 14C1C 80846E2C 0C20D7D1 */ jal func_80835F44 /* 14C20 80846E30 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 14C24 80846E34 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14C28 80846E38 0C023B2B */ jal func_8008ECAC +/* 14C28 80846E38 0C023B2B */ jal Player_SetEquipmentData /* 14C2C 80846E3C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 14C30 80846E40 820D014F */ lb $t5, 0x014F($s0) ## 0000014F -/* 14C34 80846E44 3C068012 */ lui $a2, %hi(D_80125B70) +/* 14C34 80846E44 3C068012 */ lui $a2, %hi(gPlayerSkelHeaders) /* 14C38 80846E48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 14C3C 80846E4C A20D0153 */ sb $t5, 0x0153($s0) ## 00000153 /* 14C40 80846E50 8E470004 */ lw $a3, 0x0004($s2) ## 8015E664 /* 14C44 80846E54 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 14C48 80846E58 00077080 */ sll $t6, $a3, 2 /* 14C4C 80846E5C 00CE3021 */ addu $a2, $a2, $t6 -/* 14C50 80846E60 0C211AAB */ jal func_80846AAC -/* 14C54 80846E64 8CC65B70 */ lw $a2, %lo(D_80125B70)($a2) +/* 14C50 80846E60 0C211AAB */ jal Player_InitCommon +/* 14C54 80846E64 8CC65B70 */ lw $a2, %lo(gPlayerSkelHeaders)($a2) /* 14C58 80846E68 3C058085 */ lui $a1, %hi(D_80855290) ## $a1 = 80850000 /* 14C5C 80846E6C 24A55290 */ addiu $a1, $a1, %lo(D_80855290) ## $a1 = 80855290 /* 14C60 80846E70 24043008 */ addiu $a0, $zero, 0x3008 ## $a0 = 00003008 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/Player_UpdateCommon.s similarity index 99% rename from asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s rename to asm/non_matchings/overlays/actors/ovl_player_actor/Player_UpdateCommon.s index 2c5a5affbd..6a52060f8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/Player_UpdateCommon.s @@ -3,20 +3,22 @@ glabel D_808554CC .float 0.1 glabel D_808554D0 - .word 0x7F7FFFFF + .float 340282346638528859811704183484516925440 # FLT_MAX + glabel D_808554D4 - .word 0x7F7FFFFF + .float 340282346638528859811704183484516925440 # FLT_MAX + glabel D_808554D8 .float 0.8 .text -glabel func_80848F9C +glabel Player_UpdateCommon /* 16D8C 80848F9C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 16D90 80848FA0 3C018086 */ lui $at, %hi(D_80858AB4) ## $at = 80860000 +/* 16D90 80848FA0 3C018086 */ lui $at, %hi(sControlInput) ## $at = 80860000 /* 16D94 80848FA4 AFBF0024 */ sw $ra, 0x0024($sp) /* 16D98 80848FA8 AFB00020 */ sw $s0, 0x0020($sp) /* 16D9C 80848FAC AFA50084 */ sw $a1, 0x0084($sp) -/* 16DA0 80848FB0 AC268AB4 */ sw $a2, %lo(D_80858AB4)($at) +/* 16DA0 80848FB0 AC268AB4 */ sw $a2, %lo(sControlInput)($at) /* 16DA4 80848FB4 80820A86 */ lb $v0, 0x0A86($a0) ## 00000A86 /* 16DA8 80848FB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 16DAC 80848FBC 04410009 */ bgez $v0, .L80848FE4 @@ -429,7 +431,7 @@ glabel func_80848F9C /* 1734C 8084955C 00000000 */ nop /* 17350 80849560 45010021 */ bc1t .L808495E8 /* 17354 80849564 00000000 */ nop -/* 17358 80849568 0C023A62 */ jal func_8008E988 +/* 17358 80849568 0C023A62 */ jal Player_InCsMode /* 1735C 8084956C 8FA40084 */ lw $a0, 0x0084($sp) /* 17360 80849570 1440001D */ bne $v0, $zero, .L808495E8 /* 17364 80849574 00000000 */ nop @@ -626,7 +628,7 @@ glabel func_80848F9C /* 17610 80849820 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 17614 80849824 8FA40084 */ lw $a0, 0x0084($sp) .L80849828: -/* 17618 80849828 0C023A37 */ jal func_8008E8DC +/* 17618 80849828 0C023A37 */ jal Player_InBlockingCsMode /* 1761C 8084982C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 17620 80849830 54400054 */ bnel $v0, $zero, .L80849984 /* 17624 80849834 8FA70084 */ lw $a3, 0x0084($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832210.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832210.s deleted file mode 100644 index b8432ba8a6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832210.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80832210 -/* 00000 80832210 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00004 80832214 00000000 */ nop -/* 00008 80832218 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -/* 0000C 8083221C 03E00008 */ jr $ra -/* 00010 80832220 E4800838 */ swc1 $f0, 0x0838($a0) ## 00000838 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832224.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832224.s deleted file mode 100644 index e9b28ef3c5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832224.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80832224 -/* 00014 80832224 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00018 80832228 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0001C 8083222C 0C20C884 */ jal func_80832210 -/* 00020 80832230 AFA40018 */ sw $a0, 0x0018($sp) -/* 00024 80832234 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00028 80832238 A1C006AD */ sb $zero, 0x06AD($t6) ## 000006AD -/* 0002C 8083223C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00030 80832240 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00034 80832244 03E00008 */ jr $ra -/* 00038 80832248 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083224C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083224C.s deleted file mode 100644 index 1b40533fa8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083224C.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_8083224C -/* 0003C 8083224C 8C831C44 */ lw $v1, 0x1C44($a0) ## 00001C44 -/* 00040 80832250 8C620004 */ lw $v0, 0x0004($v1) ## 00000004 -/* 00044 80832254 30420100 */ andi $v0, $v0, 0x0100 ## $v0 = 00000000 -/* 00048 80832258 38420100 */ xori $v0, $v0, 0x0100 ## $v0 = 00000100 -/* 0004C 8083225C 03E00008 */ jr $ra -/* 00050 80832260 2C420001 */ sltiu $v0, $v0, 0x0001 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s deleted file mode 100644 index 0d05623ae1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80832264 -/* 00054 80832264 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00058 80832268 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0005C 8083226C 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop -/* 00060 80832270 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00064 80832274 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00068 80832278 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0006C 8083227C 03E00008 */ jr $ra -/* 00070 80832280 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s deleted file mode 100644 index 2af2b027bb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80832284 -/* 00074 80832284 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00078 80832288 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0007C 8083228C 0C029050 */ jal SkelAnime_ChangeLinkAnimDefaultRepeat -/* 00080 80832290 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00084 80832294 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00088 80832298 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0008C 8083229C 03E00008 */ jr $ra -/* 00090 808322A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s deleted file mode 100644 index b965fab0aa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_808322A4 -/* 00094 808322A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00098 808322A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0009C 808322AC AFA5001C */ sw $a1, 0x001C($sp) -/* 000A0 808322B0 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 -/* 000A4 808322B4 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 000A8 808322B8 0C029067 */ jal SkelAnime_ChangeLinkAnimPlaybackRepeat -/* 000AC 808322BC 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 000B0 808322C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000B4 808322C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000B8 808322C8 03E00008 */ jr $ra -/* 000BC 808322CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s deleted file mode 100644 index ed7c2479bc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_808322D0 -/* 000C0 808322D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000C4 808322D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000C8 808322D8 AFA5001C */ sw $a1, 0x001C($sp) -/* 000CC 808322DC 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 -/* 000D0 808322E0 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 000D4 808322E4 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop -/* 000D8 808322E8 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 000DC 808322EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000E0 808322F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000E4 808322F4 03E00008 */ jr $ra -/* 000E8 808322F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322FC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322FC.s deleted file mode 100644 index 7df020df9e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322FC.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_808322FC -/* 000EC 808322FC 8C8201D4 */ lw $v0, 0x01D4($a0) ## 000001D4 -/* 000F0 80832300 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 -/* 000F4 80832304 844F0008 */ lh $t7, 0x0008($v0) ## 00000008 -/* 000F8 80832308 01CFC021 */ addu $t8, $t6, $t7 -/* 000FC 8083230C A49800B6 */ sh $t8, 0x00B6($a0) ## 000000B6 -/* 00100 80832310 03E00008 */ jr $ra -/* 00104 80832314 A4400008 */ sh $zero, 0x0008($v0) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832318.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832318.s deleted file mode 100644 index 66ddf1bac0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832318.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80832318 -/* 00108 80832318 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 0010C 8083231C 3C01FFFD */ lui $at, 0xFFFD ## $at = FFFD0000 -/* 00110 80832320 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFDFFFF -/* 00114 80832324 01C17824 */ and $t7, $t6, $at -/* 00118 80832328 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 0011C 8083232C A0800843 */ sb $zero, 0x0843($a0) ## 00000843 -/* 00120 80832330 AC8008EC */ sw $zero, 0x08EC($a0) ## 000008EC -/* 00124 80832334 AC8008D0 */ sw $zero, 0x08D0($a0) ## 000008D0 -/* 00128 80832338 03E00008 */ jr $ra -/* 0012C 8083233C AC8008B4 */ sw $zero, 0x08B4($a0) ## 000008B4 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832340.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832340.s deleted file mode 100644 index 6d8d9a29aa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832340.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80832340 -/* 00130 80832340 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00134 80832344 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00138 80832348 84A6046C */ lh $a2, 0x046C($a1) ## 0000046C -/* 0013C 8083234C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00140 80832350 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00144 80832354 10C1000F */ beq $a2, $at, .L80832394 -/* 00148 80832358 00067080 */ sll $t6, $a2, 2 -/* 0014C 8083235C 008E7821 */ addu $t7, $a0, $t6 -/* 00150 80832360 8DE20790 */ lw $v0, 0x0790($t7) ## 00000790 -/* 00154 80832364 5040000C */ beql $v0, $zero, .L80832398 -/* 00158 80832368 8CE80680 */ lw $t0, 0x0680($a3) ## 00000680 -/* 0015C 8083236C 84580168 */ lh $t8, 0x0168($v0) ## 00000168 -/* 00160 80832370 2401044C */ addiu $at, $zero, 0x044C ## $at = 0000044C -/* 00164 80832374 00062C00 */ sll $a1, $a2, 16 -/* 00168 80832378 17010006 */ bne $t8, $at, .L80832394 -/* 0016C 8083237C 00052C03 */ sra $a1, $a1, 16 -/* 00170 80832380 0C0200FC */ jal func_800803F0 -/* 00174 80832384 AFA7001C */ sw $a3, 0x001C($sp) -/* 00178 80832388 8FA7001C */ lw $a3, 0x001C($sp) -/* 0017C 8083238C 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 00180 80832390 A4F9046C */ sh $t9, 0x046C($a3) ## 0000046C -.L80832394: -/* 00184 80832394 8CE80680 */ lw $t0, 0x0680($a3) ## 00000680 -.L80832398: -/* 00188 80832398 2401F3FF */ addiu $at, $zero, 0xF3FF ## $at = FFFFF3FF -/* 0018C 8083239C 01014824 */ and $t1, $t0, $at -/* 00190 808323A0 ACE90680 */ sw $t1, 0x0680($a3) ## 00000680 -/* 00194 808323A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00198 808323A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0019C 808323AC 03E00008 */ jr $ra -/* 001A0 808323B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808323B4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808323B4.s deleted file mode 100644 index 3f04d42b0f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808323B4.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_808323B4 -/* 001A4 808323B4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 001A8 808323B8 AFBF001C */ sw $ra, 0x001C($sp) -/* 001AC 808323BC AFB00018 */ sw $s0, 0x0018($sp) -/* 001B0 808323C0 AFA40028 */ sw $a0, 0x0028($sp) -/* 001B4 808323C4 8CA303AC */ lw $v1, 0x03AC($a1) ## 000003AC -/* 001B8 808323C8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 001BC 808323CC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001C0 808323D0 1060000D */ beq $v1, $zero, .L80832408 -/* 001C4 808323D4 00000000 */ nop -/* 001C8 808323D8 0C023C41 */ jal func_8008F104 -/* 001CC 808323DC AFA30024 */ sw $v1, 0x0024($sp) -/* 001D0 808323E0 14400009 */ bne $v0, $zero, .L80832408 -/* 001D4 808323E4 8FA30024 */ lw $v1, 0x0024($sp) -/* 001D8 808323E8 AE00011C */ sw $zero, 0x011C($s0) ## 0000011C -/* 001DC 808323EC AE0003AC */ sw $zero, 0x03AC($s0) ## 000003AC -/* 001E0 808323F0 AE000438 */ sw $zero, 0x0438($s0) ## 00000438 -/* 001E4 808323F4 AC600118 */ sw $zero, 0x0118($v1) ## 00000118 -/* 001E8 808323F8 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 001EC 808323FC 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 001F0 80832400 01C17824 */ and $t7, $t6, $at -/* 001F4 80832404 AE0F067C */ sw $t7, 0x067C($s0) ## 0000067C -.L80832408: -/* 001F8 80832408 0C023CA7 */ jal func_8008F29C -/* 001FC 8083240C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00200 80832410 04400006 */ bltz $v0, .L8083242C -/* 00204 80832414 8FA40028 */ lw $a0, 0x0028($sp) -/* 00208 80832418 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0020C 8083241C 0C20CE67 */ jal func_8083399C -/* 00210 80832420 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00214 80832424 241800FE */ addiu $t8, $zero, 0x00FE ## $t8 = 000000FE -/* 00218 80832428 A2180152 */ sb $t8, 0x0152($s0) ## 00000152 -.L8083242C: -/* 0021C 8083242C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00220 80832430 8FB00018 */ lw $s0, 0x0018($sp) -/* 00224 80832434 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00228 80832438 03E00008 */ jr $ra -/* 0022C 8083243C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832440.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832440.s deleted file mode 100644 index cad69d4f54..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832440.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_80832440 -/* 00230 80832440 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00234 80832444 AFBF001C */ sw $ra, 0x001C($sp) -/* 00238 80832448 AFB00018 */ sw $s0, 0x0018($sp) -/* 0023C 8083244C AFA40020 */ sw $a0, 0x0020($sp) -/* 00240 80832450 8CA2067C */ lw $v0, 0x067C($a1) ## 0000067C -/* 00244 80832454 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00248 80832458 304E0800 */ andi $t6, $v0, 0x0800 ## $t6 = 00000000 -/* 0024C 8083245C 11C00012 */ beq $t6, $zero, .L808324A8 -/* 00250 80832460 00000000 */ nop -/* 00254 80832464 8CAF03AC */ lw $t7, 0x03AC($a1) ## 000003AC -/* 00258 80832468 15E0000F */ bne $t7, $zero, .L808324A8 -/* 0025C 8083246C 00000000 */ nop -/* 00260 80832470 8CB80438 */ lw $t8, 0x0438($a1) ## 00000438 -/* 00264 80832474 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 00268 80832478 00414824 */ and $t1, $v0, $at -/* 0026C 8083247C 5300000A */ beql $t8, $zero, .L808324A8 -/* 00270 80832480 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C -/* 00274 80832484 80B90434 */ lb $t9, 0x0434($a1) ## 00000434 -/* 00278 80832488 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 0027C 8083248C 00414024 */ and $t0, $v0, $at -/* 00280 80832490 17200005 */ bne $t9, $zero, .L808324A8 -/* 00284 80832494 00000000 */ nop -/* 00288 80832498 ACA8067C */ sw $t0, 0x067C($a1) ## 0000067C -/* 0028C 8083249C 10000002 */ beq $zero, $zero, .L808324A8 -/* 00290 808324A0 ACA00438 */ sw $zero, 0x0438($a1) ## 00000438 -/* 00294 808324A4 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C -.L808324A8: -/* 00298 808324A8 0C20C8C6 */ jal func_80832318 -/* 0029C 808324AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002A0 808324B0 A20006AD */ sb $zero, 0x06AD($s0) ## 000006AD -/* 002A4 808324B4 8FA40020 */ lw $a0, 0x0020($sp) -/* 002A8 808324B8 0C20C8D0 */ jal func_80832340 -/* 002AC 808324BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 002B0 808324C0 8FA40020 */ lw $a0, 0x0020($sp) -/* 002B4 808324C4 0C030129 */ jal Gameplay_GetCamera -/* 002B8 808324C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 002BC 808324CC 0C016C69 */ jal func_8005B1A4 -/* 002C0 808324D0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 002C4 808324D4 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C -/* 002C8 808324D8 3C01FFCF */ lui $at, 0xFFCF ## $at = FFCF0000 -/* 002CC 808324DC 34219FFF */ ori $at, $at, 0x9FFF ## $at = FFCF9FFF -/* 002D0 808324E0 8E0C0680 */ lw $t4, 0x0680($s0) ## 00000680 -/* 002D4 808324E4 A2000844 */ sb $zero, 0x0844($s0) ## 00000844 -/* 002D8 808324E8 01415824 */ and $t3, $t2, $at -/* 002DC 808324EC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 002E0 808324F0 820E0844 */ lb $t6, 0x0844($s0) ## 00000844 -/* 002E4 808324F4 3C01FFFB */ lui $at, 0xFFFB ## $at = FFFB0000 -/* 002E8 808324F8 3421FF6F */ ori $at, $at, 0xFF6F ## $at = FFFBFF6F -/* 002EC 808324FC 01816824 */ and $t5, $t4, $at -/* 002F0 80832500 AE0B067C */ sw $t3, 0x067C($s0) ## 0000067C -/* 002F4 80832504 AE0D0680 */ sw $t5, 0x0680($s0) ## 00000680 -/* 002F8 80832508 A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 -/* 002FC 8083250C E60400BC */ swc1 $f4, 0x00BC($s0) ## 000000BC -/* 00300 80832510 A20E0845 */ sb $t6, 0x0845($s0) ## 00000845 -/* 00304 80832514 8FBF001C */ lw $ra, 0x001C($sp) -/* 00308 80832518 8FB00018 */ lw $s0, 0x0018($sp) -/* 0030C 8083251C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00310 80832520 03E00008 */ jr $ra -/* 00314 80832524 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832528.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832528.s deleted file mode 100644 index c9cf9102e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832528.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80832528 -/* 00318 80832528 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0031C 8083252C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00320 80832530 80AE0151 */ lb $t6, 0x0151($a1) ## 00000151 -/* 00324 80832534 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00328 80832538 29C10002 */ slti $at, $t6, 0x0002 -/* 0032C 8083253C 14200005 */ bne $at, $zero, .L80832554 -/* 00330 80832540 00000000 */ nop -/* 00334 80832544 0C20D7D1 */ jal func_80835F44 -/* 00338 80832548 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 0033C 8083254C 10000001 */ beq $zero, $zero, .L80832554 -/* 00340 80832550 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80832554: -/* 00344 80832554 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00348 80832558 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0034C 8083255C 03E00008 */ jr $ra -/* 00350 80832560 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832564.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832564.s deleted file mode 100644 index 9a13c8eb65..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832564.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80832564 -/* 00354 80832564 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00358 80832568 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0035C 8083256C AFA40018 */ sw $a0, 0x0018($sp) -/* 00360 80832570 0C20C910 */ jal func_80832440 -/* 00364 80832574 AFA5001C */ sw $a1, 0x001C($sp) -/* 00368 80832578 8FA40018 */ lw $a0, 0x0018($sp) -/* 0036C 8083257C 0C20C8ED */ jal func_808323B4 -/* 00370 80832580 8FA5001C */ lw $a1, 0x001C($sp) -/* 00374 80832584 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00378 80832588 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0037C 8083258C 03E00008 */ jr $ra -/* 00380 80832590 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832594.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832594.s deleted file mode 100644 index aec0be19af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832594.s +++ /dev/null @@ -1,48 +0,0 @@ -.late_rodata -glabel D_8085534C - .word 0x362A9004 - -.text -glabel func_80832594 -/* 00384 80832594 3C0F8085 */ lui $t7, %hi(D_808535D8) ## $t7 = 80850000 -/* 00388 80832598 85EF35D8 */ lh $t7, %lo(D_808535D8)($t7) -/* 0038C 8083259C 848E0A80 */ lh $t6, 0x0A80($a0) ## 00000A80 -/* 00390 808325A0 3C018085 */ lui $at, %hi(D_808535D4) ## $at = 80850000 -/* 00394 808325A4 C42035D4 */ lwc1 $f0, %lo(D_808535D4)($at) -/* 00398 808325A8 01CF1023 */ subu $v0, $t6, $t7 -/* 0039C 808325AC 00021400 */ sll $v0, $v0, 16 -/* 003A0 808325B0 00021403 */ sra $v0, $v0, 16 -/* 003A4 808325B4 04400003 */ bltz $v0, .L808325C4 -/* 003A8 808325B8 46000005 */ abs.s $f0, $f0 -/* 003AC 808325BC 10000002 */ beq $zero, $zero, .L808325C8 -/* 003B0 808325C0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L808325C4: -/* 003B4 808325C4 00021823 */ subu $v1, $zero, $v0 -.L808325C8: -/* 003B8 808325C8 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 -/* 003BC 808325CC 3C018085 */ lui $at, %hi(D_8085534C) ## $at = 80850000 -/* 003C0 808325D0 C42A534C */ lwc1 $f10, %lo(D_8085534C)($at) -/* 003C4 808325D4 468021A0 */ cvt.s.w $f6, $f4 -/* 003C8 808325D8 848A0850 */ lh $t2, 0x0850($a0) ## 00000850 -/* 003CC 808325DC 3C0D8086 */ lui $t5, %hi(D_80858AB4) ## $t5 = 80860000 -/* 003D0 808325E0 01455821 */ addu $t3, $t2, $a1 -/* 003D4 808325E4 46003202 */ mul.s $f8, $f6, $f0 -/* 003D8 808325E8 00000000 */ nop -/* 003DC 808325EC 460A4402 */ mul.s $f16, $f8, $f10 -/* 003E0 808325F0 4600848D */ trunc.w.s $f18, $f16 -/* 003E4 808325F4 44099000 */ mfc1 $t1, $f18 -/* 003E8 808325F8 00000000 */ nop -/* 003EC 808325FC 01696021 */ addu $t4, $t3, $t1 -/* 003F0 80832600 A48C0850 */ sh $t4, 0x0850($a0) ## 00000850 -/* 003F4 80832604 8DAD8AB4 */ lw $t5, %lo(D_80858AB4)($t5) -/* 003F8 80832608 95AE000C */ lhu $t6, 0x000C($t5) ## 8086000C -/* 003FC 8083260C 31CFC000 */ andi $t7, $t6, 0xC000 ## $t7 = 00000000 -/* 00400 80832610 11E00004 */ beq $t7, $zero, .L80832624 -/* 00404 80832614 00000000 */ nop -/* 00408 80832618 84980850 */ lh $t8, 0x0850($a0) ## 00000850 -/* 0040C 8083261C 27190005 */ addiu $t9, $t8, 0x0005 ## $t9 = 00000005 -/* 00410 80832620 A4990850 */ sh $t9, 0x0850($a0) ## 00000850 -.L80832624: -/* 00414 80832624 84880850 */ lh $t0, 0x0850($a0) ## 00000850 -/* 00418 80832628 03E00008 */ jr $ra -/* 0041C 8083262C 00C8102A */ slt $v0, $a2, $t0 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832630.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832630.s deleted file mode 100644 index 3de2dda7d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832630.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80832630 -/* 00420 80832630 908E1C24 */ lbu $t6, 0x1C24($a0) ## 00001C24 -/* 00424 80832634 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00428 80832638 15C00002 */ bne $t6, $zero, .L80832644 -/* 0042C 8083263C 00000000 */ nop -/* 00430 80832640 A08F1C24 */ sb $t7, 0x1C24($a0) ## 00001C24 -.L80832644: -/* 00434 80832644 03E00008 */ jr $ra -/* 00438 80832648 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083264C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083264C.s deleted file mode 100644 index d6e1584ab3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083264C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8083264C -/* 0043C 8083264C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00440 80832650 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00444 80832654 AFA5001C */ sw $a1, 0x001C($sp) -/* 00448 80832658 AFA60020 */ sw $a2, 0x0020($sp) -/* 0044C 8083265C AFA70024 */ sw $a3, 0x0024($sp) -/* 00450 80832660 908E0002 */ lbu $t6, 0x0002($a0) ## 00000002 -/* 00454 80832664 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00458 80832668 93A5001F */ lbu $a1, 0x001F($sp) -/* 0045C 8083266C 15C10006 */ bne $t6, $at, .L80832688 -/* 00460 80832670 8FAF0028 */ lw $t7, 0x0028($sp) -/* 00464 80832674 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00468 80832678 93A60023 */ lbu $a2, 0x0023($sp) -/* 0046C 8083267C 93A70027 */ lbu $a3, 0x0027($sp) -/* 00470 80832680 0C02A800 */ jal func_800AA000 -/* 00474 80832684 46802320 */ cvt.s.w $f12, $f4 -.L80832688: -/* 00478 80832688 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0047C 8083268C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00480 80832690 03E00008 */ jr $ra -/* 00484 80832694 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832698.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832698.s deleted file mode 100644 index 203454659d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832698.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80832698 -/* 00488 80832698 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0048C 8083269C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00490 808326A0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00494 808326A4 908E0002 */ lbu $t6, 0x0002($a0) ## 00000002 -/* 00498 808326A8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0049C 808326AC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 004A0 808326B0 15C10008 */ bne $t6, $at, .L808326D4 -/* 004A4 808326B4 30A7FFFF */ andi $a3, $a1, 0xFFFF ## $a3 = 00000000 -/* 004A8 808326B8 8CCF0678 */ lw $t7, 0x0678($a2) ## 00000678 -/* 004AC 808326BC 95F80092 */ lhu $t8, 0x0092($t7) ## 00000092 -/* 004B0 808326C0 00F82821 */ addu $a1, $a3, $t8 -/* 004B4 808326C4 0C00BDF7 */ jal func_8002F7DC -/* 004B8 808326C8 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00000000 -/* 004BC 808326CC 10000005 */ beq $zero, $zero, .L808326E4 -/* 004C0 808326D0 8FBF0014 */ lw $ra, 0x0014($sp) -.L808326D4: -/* 004C4 808326D4 24C400E4 */ addiu $a0, $a2, 0x00E4 ## $a0 = 000000E4 -/* 004C8 808326D8 0C03D064 */ jal func_800F4190 -/* 004CC 808326DC 30E5FFFF */ andi $a1, $a3, 0xFFFF ## $a1 = 00000000 -/* 004D0 808326E0 8FBF0014 */ lw $ra, 0x0014($sp) -.L808326E4: -/* 004D4 808326E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004D8 808326E8 03E00008 */ jr $ra -/* 004DC 808326EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808326F0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808326F0.s deleted file mode 100644 index 84f36e5d26..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808326F0.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_808326F0 -/* 004E0 808326F0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 004E4 808326F4 AFB00014 */ sw $s0, 0x0014($sp) -/* 004E8 808326F8 AFB30020 */ sw $s3, 0x0020($sp) -/* 004EC 808326FC AFB2001C */ sw $s2, 0x001C($sp) -/* 004F0 80832700 AFB10018 */ sw $s1, 0x0018($sp) -/* 004F4 80832704 3C108085 */ lui $s0, %hi(D_8085361C) ## $s0 = 80850000 -/* 004F8 80832708 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 004FC 8083270C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00500 80832710 2610361C */ addiu $s0, $s0, %lo(D_8085361C) ## $s0 = 8085361C -/* 00504 80832714 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00508 80832718 24130004 */ addiu $s3, $zero, 0x0004 ## $s3 = 00000004 -.L8083271C: -/* 0050C 8083271C 8E4F0678 */ lw $t7, 0x0678($s2) ## 00000678 -/* 00510 80832720 960E0000 */ lhu $t6, 0x0000($s0) ## 8085361C -/* 00514 80832724 95F80092 */ lhu $t8, 0x0092($t7) ## 00000092 -/* 00518 80832728 01D82021 */ addu $a0, $t6, $t8 -/* 0051C 8083272C 0C03E341 */ jal func_800F8D04 -/* 00520 80832730 3084FFFF */ andi $a0, $a0, 0xFFFF ## $a0 = 00000000 -/* 00524 80832734 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00528 80832738 1633FFF8 */ bne $s1, $s3, .L8083271C -/* 0052C 8083273C 26100002 */ addiu $s0, $s0, 0x0002 ## $s0 = 8085361E -/* 00530 80832740 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00534 80832744 8FB00014 */ lw $s0, 0x0014($sp) -/* 00538 80832748 8FB10018 */ lw $s1, 0x0018($sp) -/* 0053C 8083274C 8FB2001C */ lw $s2, 0x001C($sp) -/* 00540 80832750 8FB30020 */ lw $s3, 0x0020($sp) -/* 00544 80832754 03E00008 */ jr $ra -/* 00548 80832758 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083275C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083275C.s deleted file mode 100644 index ac8a7647c9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083275C.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8083275C -/* 0054C 8083275C AFA50004 */ sw $a1, 0x0004($sp) -/* 00550 80832760 948E089E */ lhu $t6, 0x089E($a0) ## 0000089E -/* 00554 80832764 00AE1021 */ addu $v0, $a1, $t6 -/* 00558 80832768 03E00008 */ jr $ra -/* 0055C 8083276C 3042FFFF */ andi $v0, $v0, 0xFFFF ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832770.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832770.s deleted file mode 100644 index 28293d1252..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832770.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80832770 -/* 00560 80832770 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00564 80832774 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00568 80832778 AFA5001C */ sw $a1, 0x001C($sp) -/* 0056C 8083277C 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00000000 -/* 00570 80832780 0C20C9D7 */ jal func_8083275C -/* 00574 80832784 AFA40018 */ sw $a0, 0x0018($sp) -/* 00578 80832788 8FA40018 */ lw $a0, 0x0018($sp) -/* 0057C 8083278C 0C00BDF7 */ jal func_8002F7DC -/* 00580 80832790 3045FFFF */ andi $a1, $v0, 0xFFFF ## $a1 = 00000000 -/* 00584 80832794 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00588 80832798 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0058C 8083279C 03E00008 */ jr $ra -/* 00590 808327A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327A4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327A4.s deleted file mode 100644 index 4ea538058e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327A4.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_808327A4 -/* 00594 808327A4 AFA50004 */ sw $a1, 0x0004($sp) -/* 00598 808327A8 8C980678 */ lw $t8, 0x0678($a0) ## 00000678 -/* 0059C 808327AC 948E089E */ lhu $t6, 0x089E($a0) ## 0000089E -/* 005A0 808327B0 97190094 */ lhu $t9, 0x0094($t8) ## 00000094 -/* 005A4 808327B4 00AE7821 */ addu $t7, $a1, $t6 -/* 005A8 808327B8 01F91021 */ addu $v0, $t7, $t9 -/* 005AC 808327BC 03E00008 */ jr $ra -/* 005B0 808327C0 3042FFFF */ andi $v0, $v0, 0xFFFF ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327C4.s deleted file mode 100644 index 553d5f40e4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327C4.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_808327C4 -/* 005B4 808327C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005B8 808327C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005BC 808327CC AFA5001C */ sw $a1, 0x001C($sp) -/* 005C0 808327D0 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00000000 -/* 005C4 808327D4 0C20C9E9 */ jal func_808327A4 -/* 005C8 808327D8 AFA40018 */ sw $a0, 0x0018($sp) -/* 005CC 808327DC 8FA40018 */ lw $a0, 0x0018($sp) -/* 005D0 808327E0 0C00BDF7 */ jal func_8002F7DC -/* 005D4 808327E4 3045FFFF */ andi $a1, $v0, 0xFFFF ## $a1 = 00000000 -/* 005D8 808327E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005DC 808327EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005E0 808327F0 03E00008 */ jr $ra -/* 005E4 808327F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327F8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327F8.s deleted file mode 100644 index 51ae62733e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808327F8.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_808327F8 -/* 005E8 808327F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005EC 808327FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 005F0 80832800 AFA5001C */ sw $a1, 0x001C($sp) -/* 005F4 80832804 808E014F */ lb $t6, 0x014F($a0) ## 0000014F -/* 005F8 80832808 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 005FC 8083280C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00600 80832810 15C10003 */ bne $t6, $at, .L80832820 -/* 00604 80832814 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00608 80832818 10000006 */ beq $zero, $zero, .L80832834 -/* 0060C 8083281C 2403080D */ addiu $v1, $zero, 0x080D ## $v1 = 0000080D -.L80832820: -/* 00610 80832820 24050800 */ addiu $a1, $zero, 0x0800 ## $a1 = 00000800 -/* 00614 80832824 0C20C9E9 */ jal func_808327A4 -/* 00618 80832828 AFA70018 */ sw $a3, 0x0018($sp) -/* 0061C 8083282C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00620 80832830 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80832834: -/* 00624 80832834 24E400E4 */ addiu $a0, $a3, 0x00E4 ## $a0 = 000000E4 -/* 00628 80832838 3065FFFF */ andi $a1, $v1, 0xFFFF ## $a1 = 00000000 -/* 0062C 8083283C 0C03D004 */ jal func_800F4010 -/* 00630 80832840 8FA6001C */ lw $a2, 0x001C($sp) -/* 00634 80832844 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00638 80832848 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0063C 8083284C 03E00008 */ jr $ra -/* 00640 80832850 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832854.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832854.s deleted file mode 100644 index 42ebd72527..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832854.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80832854 -/* 00644 80832854 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00648 80832858 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0064C 8083285C 808E014F */ lb $t6, 0x014F($a0) ## 0000014F -/* 00650 80832860 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00654 80832864 24050810 */ addiu $a1, $zero, 0x0810 ## $a1 = 00000810 -/* 00658 80832868 15C10003 */ bne $t6, $at, .L80832878 -/* 0065C 8083286C 00000000 */ nop -/* 00660 80832870 10000005 */ beq $zero, $zero, .L80832888 -/* 00664 80832874 2403081D */ addiu $v1, $zero, 0x081D ## $v1 = 0000081D -.L80832878: -/* 00668 80832878 0C20C9E9 */ jal func_808327A4 -/* 0066C 8083287C AFA40018 */ sw $a0, 0x0018($sp) -/* 00670 80832880 8FA40018 */ lw $a0, 0x0018($sp) -/* 00674 80832884 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80832888: -/* 00678 80832888 0C00BDF7 */ jal func_8002F7DC -/* 0067C 8083288C 3065FFFF */ andi $a1, $v1, 0xFFFF ## $a1 = 00000000 -/* 00680 80832890 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00684 80832894 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00688 80832898 03E00008 */ jr $ra -/* 0068C 8083289C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808328A0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808328A0.s deleted file mode 100644 index 15ece49966..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808328A0.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_808328A0 -/* 00690 808328A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00694 808328A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00698 808328A8 808E014F */ lb $t6, 0x014F($a0) ## 0000014F -/* 0069C 808328AC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 006A0 808328B0 24050820 */ addiu $a1, $zero, 0x0820 ## $a1 = 00000820 -/* 006A4 808328B4 15C10003 */ bne $t6, $at, .L808328C4 -/* 006A8 808328B8 00000000 */ nop -/* 006AC 808328BC 10000005 */ beq $zero, $zero, .L808328D4 -/* 006B0 808328C0 2403082D */ addiu $v1, $zero, 0x082D ## $v1 = 0000082D -.L808328C4: -/* 006B4 808328C4 0C20C9E9 */ jal func_808327A4 -/* 006B8 808328C8 AFA40018 */ sw $a0, 0x0018($sp) -/* 006BC 808328CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 006C0 808328D0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L808328D4: -/* 006C4 808328D4 0C00BDF7 */ jal func_8002F7DC -/* 006C8 808328D8 3065FFFF */ andi $a1, $v1, 0xFFFF ## $a1 = 00000000 -/* 006CC 808328DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006D0 808328E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 006D4 808328E4 03E00008 */ jr $ra -/* 006D8 808328E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808328EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808328EC.s deleted file mode 100644 index fc6273715e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808328EC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_808328EC -/* 006DC 808328EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006E0 808328F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 006E4 808328F4 AFA5001C */ sw $a1, 0x001C($sp) -/* 006E8 808328F8 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00000000 -/* 006EC 808328FC 0C00BDF7 */ jal func_8002F7DC -/* 006F0 80832900 AFA40018 */ sw $a0, 0x0018($sp) -/* 006F4 80832904 8FA40018 */ lw $a0, 0x0018($sp) -/* 006F8 80832908 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 006FC 8083290C 35CF0008 */ ori $t7, $t6, 0x0008 ## $t7 = 00000008 -/* 00700 80832910 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 00704 80832914 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00708 80832918 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0070C 8083291C 03E00008 */ jr $ra -/* 00710 80832920 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832924.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832924.s deleted file mode 100644 index b82e0a73fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832924.s +++ /dev/null @@ -1,135 +0,0 @@ -glabel func_80832924 -/* 00714 80832924 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00718 80832928 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 0071C 8083292C F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 00720 80832930 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00724 80832934 AFBE0048 */ sw $s8, 0x0048($sp) -/* 00728 80832938 AFB70044 */ sw $s7, 0x0044($sp) -/* 0072C 8083293C AFB60040 */ sw $s6, 0x0040($sp) -/* 00730 80832940 AFB5003C */ sw $s5, 0x003C($sp) -/* 00734 80832944 AFB40038 */ sw $s4, 0x0038($sp) -/* 00738 80832948 AFB30034 */ sw $s3, 0x0034($sp) -/* 0073C 8083294C AFB20030 */ sw $s2, 0x0030($sp) -/* 00740 80832950 AFB1002C */ sw $s1, 0x002C($sp) -/* 00744 80832954 248E01B4 */ addiu $t6, $a0, 0x01B4 ## $t6 = 000001B4 -/* 00748 80832958 4481B000 */ mtc1 $at, $f22 ## $f22 = 6.00 -/* 0074C 8083295C 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 00750 80832960 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00754 80832964 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00758 80832968 AFBF004C */ sw $ra, 0x004C($sp) -/* 0075C 8083296C AFB00028 */ sw $s0, 0x0028($sp) -/* 00760 80832970 AFAE0054 */ sw $t6, 0x0054($sp) -/* 00764 80832974 24130800 */ addiu $s3, $zero, 0x0800 ## $s3 = 00000800 -/* 00768 80832978 24141000 */ addiu $s4, $zero, 0x1000 ## $s4 = 00001000 -/* 0076C 8083297C 24151800 */ addiu $s5, $zero, 0x1800 ## $s5 = 00001800 -/* 00770 80832980 24162000 */ addiu $s6, $zero, 0x2000 ## $s6 = 00002000 -/* 00774 80832984 24172800 */ addiu $s7, $zero, 0x2800 ## $s7 = 00002800 -/* 00778 80832988 241E3000 */ addiu $s8, $zero, 0x3000 ## $s8 = 00003000 -/* 0077C 8083298C 86420002 */ lh $v0, 0x0002($s2) ## 00000002 -.L80832990: -/* 00780 80832990 04400003 */ bltz $v0, .L808329A0 -/* 00784 80832994 00028023 */ subu $s0, $zero, $v0 -/* 00788 80832998 10000001 */ beq $zero, $zero, .L808329A0 -/* 0078C 8083299C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -.L808329A0: -/* 00790 808329A0 320F07FF */ andi $t7, $s0, 0x07FF ## $t7 = 00000000 -/* 00794 808329A4 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00798 808329A8 8FA40054 */ lw $a0, 0x0054($sp) -/* 0079C 808329AC 46802020 */ cvt.s.w $f0, $f4 -/* 007A0 808329B0 46000005 */ abs.s $f0, $f0 -/* 007A4 808329B4 44050000 */ mfc1 $a1, $f0 -/* 007A8 808329B8 0C02914C */ jal func_800A4530 -/* 007AC 808329BC 00000000 */ nop -/* 007B0 808329C0 1040003E */ beq $v0, $zero, .L80832ABC -/* 007B4 808329C4 32027800 */ andi $v0, $s0, 0x7800 ## $v0 = 00000000 -/* 007B8 808329C8 14530005 */ bne $v0, $s3, .L808329E0 -/* 007BC 808329CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 007C0 808329D0 0C00BDF7 */ jal func_8002F7DC -/* 007C4 808329D4 96450000 */ lhu $a1, 0x0000($s2) ## 00000000 -/* 007C8 808329D8 10000039 */ beq $zero, $zero, .L80832AC0 -/* 007CC 808329DC 86420002 */ lh $v0, 0x0002($s2) ## 00000002 -.L808329E0: -/* 007D0 808329E0 14540005 */ bne $v0, $s4, .L808329F8 -/* 007D4 808329E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 007D8 808329E8 0C20C9DC */ jal func_80832770 -/* 007DC 808329EC 96450000 */ lhu $a1, 0x0000($s2) ## 00000000 -/* 007E0 808329F0 10000033 */ beq $zero, $zero, .L80832AC0 -/* 007E4 808329F4 86420002 */ lh $v0, 0x0002($s2) ## 00000002 -.L808329F8: -/* 007E8 808329F8 14550005 */ bne $v0, $s5, .L80832A10 -/* 007EC 808329FC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 007F0 80832A00 0C20C9F1 */ jal func_808327C4 -/* 007F4 80832A04 96450000 */ lhu $a1, 0x0000($s2) ## 00000000 -/* 007F8 80832A08 1000002D */ beq $zero, $zero, .L80832AC0 -/* 007FC 80832A0C 86420002 */ lh $v0, 0x0002($s2) ## 00000002 -.L80832A10: -/* 00800 80832A10 14560005 */ bne $v0, $s6, .L80832A28 -/* 00804 80832A14 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00808 80832A18 0C20C9A6 */ jal func_80832698 -/* 0080C 80832A1C 96450000 */ lhu $a1, 0x0000($s2) ## 00000000 -/* 00810 80832A20 10000027 */ beq $zero, $zero, .L80832AC0 -/* 00814 80832A24 86420002 */ lh $v0, 0x0002($s2) ## 00000002 -.L80832A28: -/* 00818 80832A28 14570005 */ bne $v0, $s7, .L80832A40 -/* 0081C 80832A2C 00000000 */ nop -/* 00820 80832A30 0C20CA28 */ jal func_808328A0 -/* 00824 80832A34 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00828 80832A38 10000021 */ beq $zero, $zero, .L80832AC0 -/* 0082C 80832A3C 86420002 */ lh $v0, 0x0002($s2) ## 00000002 -.L80832A40: -/* 00830 80832A40 145E0006 */ bne $v0, $s8, .L80832A5C -/* 00834 80832A44 24013800 */ addiu $at, $zero, 0x3800 ## $at = 00003800 -/* 00838 80832A48 4405B000 */ mfc1 $a1, $f22 -/* 0083C 80832A4C 0C20C9FE */ jal func_808327F8 -/* 00840 80832A50 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00844 80832A54 1000001A */ beq $zero, $zero, .L80832AC0 -/* 00848 80832A58 86420002 */ lh $v0, 0x0002($s2) ## 00000002 -.L80832A5C: -/* 0084C 80832A5C 54410006 */ bnel $v0, $at, .L80832A78 -/* 00850 80832A60 24014000 */ addiu $at, $zero, 0x4000 ## $at = 00004000 -/* 00854 80832A64 0C20CA15 */ jal func_80832854 -/* 00858 80832A68 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0085C 80832A6C 10000014 */ beq $zero, $zero, .L80832AC0 -/* 00860 80832A70 86420002 */ lh $v0, 0x0002($s2) ## 00000002 -/* 00864 80832A74 24014000 */ addiu $at, $zero, 0x4000 ## $at = 00004000 -.L80832A78: -/* 00868 80832A78 54410007 */ bnel $v0, $at, .L80832A98 -/* 0086C 80832A7C 24014800 */ addiu $at, $zero, 0x4800 ## $at = 00004800 -/* 00870 80832A80 4405A000 */ mfc1 $a1, $f20 -/* 00874 80832A84 0C20C9FE */ jal func_808327F8 -/* 00878 80832A88 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0087C 80832A8C 1000000C */ beq $zero, $zero, .L80832AC0 -/* 00880 80832A90 86420002 */ lh $v0, 0x0002($s2) ## 00000002 -/* 00884 80832A94 24014800 */ addiu $at, $zero, 0x4800 ## $at = 00004800 -.L80832A98: -/* 00888 80832A98 54410009 */ bnel $v0, $at, .L80832AC0 -/* 0088C 80832A9C 86420002 */ lh $v0, 0x0002($s2) ## 00000002 -/* 00890 80832AA0 8E380678 */ lw $t8, 0x0678($s1) ## 00000678 -/* 00894 80832AA4 4406A000 */ mfc1 $a2, $f20 -/* 00898 80832AA8 262400E4 */ addiu $a0, $s1, 0x00E4 ## $a0 = 000000E4 -/* 0089C 80832AAC 97050094 */ lhu $a1, 0x0094($t8) ## 00000094 -/* 008A0 80832AB0 24A5080A */ addiu $a1, $a1, 0x080A ## $a1 = 0000080A -/* 008A4 80832AB4 0C03D004 */ jal func_800F4010 -/* 008A8 80832AB8 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 0000080A -.L80832ABC: -/* 008AC 80832ABC 86420002 */ lh $v0, 0x0002($s2) ## 00000002 -.L80832AC0: -/* 008B0 80832AC0 26520004 */ addiu $s2, $s2, 0x0004 ## $s2 = 00000004 -/* 008B4 80832AC4 28420000 */ slti $v0, $v0, 0x0000 -/* 008B8 80832AC8 38420001 */ xori $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 008BC 80832ACC 5440FFB0 */ bnel $v0, $zero, .L80832990 -/* 008C0 80832AD0 86420002 */ lh $v0, 0x0002($s2) ## 00000006 -/* 008C4 80832AD4 8FBF004C */ lw $ra, 0x004C($sp) -/* 008C8 80832AD8 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 008CC 80832ADC D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 008D0 80832AE0 8FB00028 */ lw $s0, 0x0028($sp) -/* 008D4 80832AE4 8FB1002C */ lw $s1, 0x002C($sp) -/* 008D8 80832AE8 8FB20030 */ lw $s2, 0x0030($sp) -/* 008DC 80832AEC 8FB30034 */ lw $s3, 0x0034($sp) -/* 008E0 80832AF0 8FB40038 */ lw $s4, 0x0038($sp) -/* 008E4 80832AF4 8FB5003C */ lw $s5, 0x003C($sp) -/* 008E8 80832AF8 8FB60040 */ lw $s6, 0x0040($sp) -/* 008EC 80832AFC 8FB70044 */ lw $s7, 0x0044($sp) -/* 008F0 80832B00 8FBE0048 */ lw $s8, 0x0048($sp) -/* 008F4 80832B04 03E00008 */ jr $ra -/* 008F8 80832B08 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s deleted file mode 100644 index 6b901389d8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80832B0C -/* 008FC 80832B0C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00900 80832B10 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00904 80832B14 AFA40028 */ sw $a0, 0x0028($sp) -/* 00908 80832B18 AFA5002C */ sw $a1, 0x002C($sp) -/* 0090C 80832B1C AFA60030 */ sw $a2, 0x0030($sp) -/* 00910 80832B20 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00914 80832B24 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00918 80832B28 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 0091C 80832B2C 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 00920 80832B30 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 -/* 00924 80832B34 46803220 */ cvt.s.w $f8, $f6 -/* 00928 80832B38 8FA5002C */ lw $a1, 0x002C($sp) -/* 0092C 80832B3C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00930 80832B40 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00934 80832B44 AFAE0018 */ sw $t6, 0x0018($sp) -/* 00938 80832B48 8FA40028 */ lw $a0, 0x0028($sp) -/* 0093C 80832B4C E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00940 80832B50 8FA60030 */ lw $a2, 0x0030($sp) -/* 00944 80832B54 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00948 80832B58 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 0094C 80832B5C 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00950 80832B60 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 00954 80832B64 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00958 80832B68 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0095C 80832B6C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00960 80832B70 03E00008 */ jr $ra -/* 00964 80832B74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s deleted file mode 100644 index 5e364f7050..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80832B78 -/* 00968 80832B78 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0096C 80832B7C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00970 80832B80 AFA40028 */ sw $a0, 0x0028($sp) -/* 00974 80832B84 AFA5002C */ sw $a1, 0x002C($sp) -/* 00978 80832B88 AFA60030 */ sw $a2, 0x0030($sp) -/* 0097C 80832B8C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00980 80832B90 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00984 80832B94 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 00988 80832B98 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 0098C 80832B9C 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 -/* 00990 80832BA0 46803220 */ cvt.s.w $f8, $f6 -/* 00994 80832BA4 8FA5002C */ lw $a1, 0x002C($sp) -/* 00998 80832BA8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0099C 80832BAC 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 -/* 009A0 80832BB0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 009A4 80832BB4 AFAE0018 */ sw $t6, 0x0018($sp) -/* 009A8 80832BB8 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 009AC 80832BBC E7A80014 */ swc1 $f8, 0x0014($sp) -/* 009B0 80832BC0 8FA40028 */ lw $a0, 0x0028($sp) -/* 009B4 80832BC4 8FA60030 */ lw $a2, 0x0030($sp) -/* 009B8 80832BC8 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 009BC 80832BCC 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 009C0 80832BD0 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 009C4 80832BD4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 009C8 80832BD8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 009CC 80832BDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 009D0 80832BE0 03E00008 */ jr $ra -/* 009D4 80832BE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s deleted file mode 100644 index 7243d4c85f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80832BE8 -/* 009D8 80832BE8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 009DC 80832BEC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 009E0 80832BF0 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 009E4 80832BF4 44812000 */ mtc1 $at, $f4 ## $f4 = -6.00 -/* 009E8 80832BF8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 009EC 80832BFC AFA5002C */ sw $a1, 0x002C($sp) -/* 009F0 80832C00 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 009F4 80832C04 AFA00018 */ sw $zero, 0x0018($sp) -/* 009F8 80832C08 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 009FC 80832C0C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00A00 80832C10 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 00A04 80832C14 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 00A08 80832C18 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 00A0C 80832C1C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A10 80832C20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A14 80832C24 03E00008 */ jr $ra -/* 00A18 80832C28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s deleted file mode 100644 index e6ce33ba7d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80832C2C -/* 00A1C 80832C2C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A20 80832C30 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00A24 80832C34 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A28 80832C38 AFA5002C */ sw $a1, 0x002C($sp) -/* 00A2C 80832C3C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00A30 80832C40 AFAE0018 */ sw $t6, 0x0018($sp) -/* 00A34 80832C44 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00A38 80832C48 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00A3C 80832C4C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00A40 80832C50 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 00A44 80832C54 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 00A48 80832C58 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 00A4C 80832C5C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A50 80832C60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A54 80832C64 03E00008 */ jr $ra -/* 00A58 80832C68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s deleted file mode 100644 index 30b93fdff5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80832C6C -/* 00A5C 80832C6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A60 80832C70 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00A64 80832C74 3C01C180 */ lui $at, 0xC180 ## $at = C1800000 -/* 00A68 80832C78 44812000 */ mtc1 $at, $f4 ## $f4 = -16.00 -/* 00A6C 80832C7C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A70 80832C80 AFA5002C */ sw $a1, 0x002C($sp) -/* 00A74 80832C84 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00A78 80832C88 AFA00018 */ sw $zero, 0x0018($sp) -/* 00A7C 80832C8C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00A80 80832C90 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00A84 80832C94 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 00A88 80832C98 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 00A8C 80832C9C E7A4001C */ swc1 $f4, 0x001C($sp) -/* 00A90 80832CA0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A94 80832CA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A98 80832CA8 03E00008 */ jr $ra -/* 00A9C 80832CAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CB0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CB0.s deleted file mode 100644 index b73fa95652..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CB0.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80832CB0 -/* 00AA0 80832CB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AA4 80832CB4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AA8 80832CB8 AFA5001C */ sw $a1, 0x001C($sp) -/* 00AAC 80832CBC AFA40018 */ sw $a0, 0x0018($sp) -/* 00AB0 80832CC0 AFA60020 */ sw $a2, 0x0020($sp) -/* 00AB4 80832CC4 0C028EF0 */ jal func_800A3BC0 -/* 00AB8 80832CC8 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00ABC 80832CCC 10400006 */ beq $v0, $zero, .L80832CE8 -/* 00AC0 80832CD0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00AC4 80832CD4 8FA5001C */ lw $a1, 0x001C($sp) -/* 00AC8 80832CD8 0C20C8A1 */ jal func_80832284 -/* 00ACC 80832CDC 8FA60020 */ lw $a2, 0x0020($sp) -/* 00AD0 80832CE0 10000002 */ beq $zero, $zero, .L80832CEC -/* 00AD4 80832CE4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80832CE8: -/* 00AD8 80832CE8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80832CEC: -/* 00ADC 80832CEC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AE0 80832CF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00AE4 80832CF4 03E00008 */ jr $ra -/* 00AE8 80832CF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CFC.s deleted file mode 100644 index ffd5188287..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CFC.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80832CFC -/* 00AEC 80832CFC 888F01F2 */ lwl $t7, 0x01F2($a0) ## 000001F2 -/* 00AF0 80832D00 988F01F5 */ lwr $t7, 0x01F5($a0) ## 000001F5 -/* 00AF4 80832D04 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 00AF8 80832D08 A88F01EC */ swl $t7, 0x01EC($a0) ## 000001EC -/* 00AFC 80832D0C B88F01EF */ swr $t7, 0x01EF($a0) ## 000001EF -/* 00B00 80832D10 948F01F6 */ lhu $t7, 0x01F6($a0) ## 000001F6 -/* 00B04 80832D14 A49801EA */ sh $t8, 0x01EA($a0) ## 000001EA -/* 00B08 80832D18 03E00008 */ jr $ra -/* 00B0C 80832D1C A48F01F0 */ sh $t7, 0x01F0($a0) ## 000001F0 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832D20.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832D20.s deleted file mode 100644 index 7a7a525473..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832D20.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80832D20 -/* 00B10 80832D20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B14 80832D24 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B18 80832D28 0C20CB3F */ jal func_80832CFC -/* 00B1C 80832D2C AFA40018 */ sw $a0, 0x0018($sp) -/* 00B20 80832D30 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B24 80832D34 848E01EC */ lh $t6, 0x01EC($a0) ## 000001EC -/* 00B28 80832D38 8C820678 */ lw $v0, 0x0678($a0) ## 00000678 -/* 00B2C 80832D3C 849901EE */ lh $t9, 0x01EE($a0) ## 000001EE -/* 00B30 80832D40 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00B34 80832D44 C4480008 */ lwc1 $f8, 0x0008($v0) ## 00000008 -/* 00B38 80832D48 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 00B3C 80832D4C 468021A0 */ cvt.s.w $f6, $f4 -/* 00B40 80832D50 848A01F0 */ lh $t2, 0x01F0($a0) ## 000001F0 -/* 00B44 80832D54 46809120 */ cvt.s.w $f4, $f18 -/* 00B48 80832D58 46083282 */ mul.s $f10, $f6, $f8 -/* 00B4C 80832D5C 4600540D */ trunc.w.s $f16, $f10 -/* 00B50 80832D60 44188000 */ mfc1 $t8, $f16 -/* 00B54 80832D64 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 -/* 00B58 80832D68 A49801EC */ sh $t8, 0x01EC($a0) ## 000001EC -/* 00B5C 80832D6C C4460008 */ lwc1 $f6, 0x0008($v0) ## 00000008 -/* 00B60 80832D70 468084A0 */ cvt.s.w $f18, $f16 -/* 00B64 80832D74 46062202 */ mul.s $f8, $f4, $f6 -/* 00B68 80832D78 4600428D */ trunc.w.s $f10, $f8 -/* 00B6C 80832D7C 44095000 */ mfc1 $t1, $f10 -/* 00B70 80832D80 00000000 */ nop -/* 00B74 80832D84 A48901EE */ sh $t1, 0x01EE($a0) ## 000001EE -/* 00B78 80832D88 C4440008 */ lwc1 $f4, 0x0008($v0) ## 00000008 -/* 00B7C 80832D8C 46049182 */ mul.s $f6, $f18, $f4 -/* 00B80 80832D90 4600320D */ trunc.w.s $f8, $f6 -/* 00B84 80832D94 440C4000 */ mfc1 $t4, $f8 -/* 00B88 80832D98 00000000 */ nop -/* 00B8C 80832D9C A48C01F0 */ sh $t4, 0x01F0($a0) ## 000001F0 -/* 00B90 80832DA0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B94 80832DA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B98 80832DA8 03E00008 */ jr $ra -/* 00B9C 80832DAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DB0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DB0.s deleted file mode 100644 index fb2a8eb6d8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DB0.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80832DB0 -/* 00BA0 80832DB0 8C8E01D4 */ lw $t6, 0x01D4($a0) ## 000001D4 -/* 00BA4 80832DB4 03E00008 */ jr $ra -/* 00BA8 80832DB8 A5C00008 */ sh $zero, 0x0008($t6) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DBC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DBC.s deleted file mode 100644 index d8d6cb1617..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DBC.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80832DBC -/* 00BAC 80832DBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BB0 80832DC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BB4 80832DC4 908E01E9 */ lbu $t6, 0x01E9($a0) ## 000001E9 -/* 00BB8 80832DC8 51C0001C */ beql $t6, $zero, .L80832E3C -/* 00BBC 80832DCC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BC0 80832DD0 0C20C8BF */ jal func_808322FC -/* 00BC4 80832DD4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00BC8 80832DD8 8FA40018 */ lw $a0, 0x0018($sp) -/* 00BCC 80832DDC 848F01F2 */ lh $t7, 0x01F2($a0) ## 000001F2 -/* 00BD0 80832DE0 8C9801D4 */ lw $t8, 0x01D4($a0) ## 000001D4 -/* 00BD4 80832DE4 A70F0000 */ sh $t7, 0x0000($t8) ## 00000000 -/* 00BD8 80832DE8 8C8801D4 */ lw $t0, 0x01D4($a0) ## 000001D4 -/* 00BDC 80832DEC 849901F6 */ lh $t9, 0x01F6($a0) ## 000001F6 -/* 00BE0 80832DF0 A5190004 */ sh $t9, 0x0004($t0) ## 00000004 -/* 00BE4 80832DF4 908201E9 */ lbu $v0, 0x01E9($a0) ## 000001E9 -/* 00BE8 80832DF8 30490008 */ andi $t1, $v0, 0x0008 ## $t1 = 00000000 -/* 00BEC 80832DFC 11200007 */ beq $t1, $zero, .L80832E1C -/* 00BF0 80832E00 304A0002 */ andi $t2, $v0, 0x0002 ## $t2 = 00000000 -/* 00BF4 80832E04 11400008 */ beq $t2, $zero, .L80832E28 -/* 00BF8 80832E08 00000000 */ nop -/* 00BFC 80832E0C 848B01EE */ lh $t3, 0x01EE($a0) ## 000001EE -/* 00C00 80832E10 8C8C01D4 */ lw $t4, 0x01D4($a0) ## 000001D4 -/* 00C04 80832E14 10000004 */ beq $zero, $zero, .L80832E28 -/* 00C08 80832E18 A58B0002 */ sh $t3, 0x0002($t4) ## 00000002 -.L80832E1C: -/* 00C0C 80832E1C 848D01F4 */ lh $t5, 0x01F4($a0) ## 000001F4 -/* 00C10 80832E20 8C8E01D4 */ lw $t6, 0x01D4($a0) ## 000001D4 -/* 00C14 80832E24 A5CD0002 */ sh $t5, 0x0002($t6) ## 00000002 -.L80832E28: -/* 00C18 80832E28 0C20CB3F */ jal func_80832CFC -/* 00C1C 80832E2C AFA40018 */ sw $a0, 0x0018($sp) -/* 00C20 80832E30 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C24 80832E34 A08001E9 */ sb $zero, 0x01E9($a0) ## 000001E9 -/* 00C28 80832E38 8FBF0014 */ lw $ra, 0x0014($sp) -.L80832E3C: -/* 00C2C 80832E3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C30 80832E40 03E00008 */ jr $ra -/* 00C34 80832E44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832E48.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832E48.s deleted file mode 100644 index b32b9761c2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832E48.s +++ /dev/null @@ -1,77 +0,0 @@ -.late_rodata -glabel D_80855350 - .word 0x3F23D70A - -.text -glabel func_80832E48 -/* 00C38 80832E48 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00C3C 80832E4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C40 80832E50 AFA5002C */ sw $a1, 0x002C($sp) -/* 00C44 80832E54 889801F2 */ lwl $t8, 0x01F2($a0) ## 000001F2 -/* 00C48 80832E58 989801F5 */ lwr $t8, 0x01F5($a0) ## 000001F5 -/* 00C4C 80832E5C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00C50 80832E60 A08501E9 */ sb $a1, 0x01E9($a0) ## 000001E9 -/* 00C54 80832E64 A89801EC */ swl $t8, 0x01EC($a0) ## 000001EC -/* 00C58 80832E68 B89801EF */ swr $t8, 0x01EF($a0) ## 000001EF -/* 00C5C 80832E6C 949801F6 */ lhu $t8, 0x01F6($a0) ## 000001F6 -/* 00C60 80832E70 27A5001C */ addiu $a1, $sp, 0x001C ## $a1 = FFFFFFF4 -/* 00C64 80832E74 248401B4 */ addiu $a0, $a0, 0x01B4 ## $a0 = 000001B4 -/* 00C68 80832E78 A498003C */ sh $t8, 0x003C($a0) ## 000001F0 -/* 00C6C 80832E7C 84E600B6 */ lh $a2, 0x00B6($a3) ## 000000B6 -/* 00C70 80832E80 0C02953F */ jal func_800A54FC -/* 00C74 80832E84 AFA70028 */ sw $a3, 0x0028($sp) -/* 00C78 80832E88 8FA2002C */ lw $v0, 0x002C($sp) -/* 00C7C 80832E8C 8FA70028 */ lw $a3, 0x0028($sp) -/* 00C80 80832E90 3C088016 */ lui $t0, %hi(gSaveContext+4) -/* 00C84 80832E94 30590001 */ andi $t9, $v0, 0x0001 ## $t9 = 00000000 -/* 00C88 80832E98 13200019 */ beq $t9, $zero, .L80832F00 -/* 00C8C 80832E9C 30490002 */ andi $t1, $v0, 0x0002 ## $t1 = 00000000 -/* 00C90 80832EA0 8D08E664 */ lw $t0, %lo(gSaveContext+4)($t0) -/* 00C94 80832EA4 3C018085 */ lui $at, %hi(D_80855350) ## $at = 80850000 -/* 00C98 80832EA8 C7A4001C */ lwc1 $f4, 0x001C($sp) -/* 00C9C 80832EAC 51000009 */ beql $t0, $zero, .L80832ED4 -/* 00CA0 80832EB0 C7B0001C */ lwc1 $f16, 0x001C($sp) -/* 00CA4 80832EB4 C4205350 */ lwc1 $f0, %lo(D_80855350)($at) -/* 00CA8 80832EB8 C7A80024 */ lwc1 $f8, 0x0024($sp) -/* 00CAC 80832EBC 46002182 */ mul.s $f6, $f4, $f0 -/* 00CB0 80832EC0 00000000 */ nop -/* 00CB4 80832EC4 46004282 */ mul.s $f10, $f8, $f0 -/* 00CB8 80832EC8 E7A6001C */ swc1 $f6, 0x001C($sp) -/* 00CBC 80832ECC E7AA0024 */ swc1 $f10, 0x0024($sp) -/* 00CC0 80832ED0 C7B0001C */ lwc1 $f16, 0x001C($sp) -.L80832ED4: -/* 00CC4 80832ED4 C4F20050 */ lwc1 $f18, 0x0050($a3) ## 00000050 -/* 00CC8 80832ED8 C4E60024 */ lwc1 $f6, 0x0024($a3) ## 00000024 -/* 00CCC 80832EDC 46128102 */ mul.s $f4, $f16, $f18 -/* 00CD0 80832EE0 C4F00058 */ lwc1 $f16, 0x0058($a3) ## 00000058 -/* 00CD4 80832EE4 46043200 */ add.s $f8, $f6, $f4 -/* 00CD8 80832EE8 C4E6002C */ lwc1 $f6, 0x002C($a3) ## 0000002C -/* 00CDC 80832EEC E4E80024 */ swc1 $f8, 0x0024($a3) ## 00000024 -/* 00CE0 80832EF0 C7AA0024 */ lwc1 $f10, 0x0024($sp) -/* 00CE4 80832EF4 46105482 */ mul.s $f18, $f10, $f16 -/* 00CE8 80832EF8 46123100 */ add.s $f4, $f6, $f18 -/* 00CEC 80832EFC E4E4002C */ swc1 $f4, 0x002C($a3) ## 0000002C -.L80832F00: -/* 00CF0 80832F00 1120000E */ beq $t1, $zero, .L80832F3C -/* 00CF4 80832F04 304A0004 */ andi $t2, $v0, 0x0004 ## $t2 = 00000000 -/* 00CF8 80832F08 55400007 */ bnel $t2, $zero, .L80832F28 -/* 00CFC 80832F0C C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 00D00 80832F10 8CEB0678 */ lw $t3, 0x0678($a3) ## 00000678 -/* 00D04 80832F14 C7A80020 */ lwc1 $f8, 0x0020($sp) -/* 00D08 80832F18 C56A0008 */ lwc1 $f10, 0x0008($t3) ## 00000008 -/* 00D0C 80832F1C 460A4402 */ mul.s $f16, $f8, $f10 -/* 00D10 80832F20 E7B00020 */ swc1 $f16, 0x0020($sp) -/* 00D14 80832F24 C7A60020 */ lwc1 $f6, 0x0020($sp) -.L80832F28: -/* 00D18 80832F28 C4F20054 */ lwc1 $f18, 0x0054($a3) ## 00000054 -/* 00D1C 80832F2C C4E80028 */ lwc1 $f8, 0x0028($a3) ## 00000028 -/* 00D20 80832F30 46123102 */ mul.s $f4, $f6, $f18 -/* 00D24 80832F34 46044280 */ add.s $f10, $f8, $f4 -/* 00D28 80832F38 E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -.L80832F3C: -/* 00D2C 80832F3C 0C20C8BF */ jal func_808322FC -/* 00D30 80832F40 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00D34 80832F44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D38 80832F48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00D3C 80832F4C 03E00008 */ jr $ra -/* 00D40 80832F50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832F54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832F54.s deleted file mode 100644 index 67a92bc644..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832F54.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80832F54 -/* 00D44 80832F54 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D48 80832F58 30CE0200 */ andi $t6, $a2, 0x0200 ## $t6 = 00000000 -/* 00D4C 80832F5C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D50 80832F60 11C00008 */ beq $t6, $zero, .L80832F84 -/* 00D54 80832F64 AFA40018 */ sw $a0, 0x0018($sp) -/* 00D58 80832F68 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00D5C 80832F6C AFA5001C */ sw $a1, 0x001C($sp) -/* 00D60 80832F70 0C20CB48 */ jal func_80832D20 -/* 00D64 80832F74 AFA60020 */ sw $a2, 0x0020($sp) -/* 00D68 80832F78 8FA5001C */ lw $a1, 0x001C($sp) -/* 00D6C 80832F7C 10000016 */ beq $zero, $zero, .L80832FD8 -/* 00D70 80832F80 8FA60020 */ lw $a2, 0x0020($sp) -.L80832F84: -/* 00D74 80832F84 30CF0100 */ andi $t7, $a2, 0x0100 ## $t7 = 00000000 -/* 00D78 80832F88 15E00004 */ bne $t7, $zero, .L80832F9C -/* 00D7C 80832F8C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00D80 80832F90 90B801E9 */ lbu $t8, 0x01E9($a1) ## 000001E9 -/* 00D84 80832F94 53000008 */ beql $t8, $zero, .L80832FB8 -/* 00D88 80832F98 8CB901D4 */ lw $t9, 0x01D4($a1) ## 000001D4 -.L80832F9C: -/* 00D8C 80832F9C AFA5001C */ sw $a1, 0x001C($sp) -/* 00D90 80832FA0 0C20CB3F */ jal func_80832CFC -/* 00D94 80832FA4 AFA60020 */ sw $a2, 0x0020($sp) -/* 00D98 80832FA8 8FA5001C */ lw $a1, 0x001C($sp) -/* 00D9C 80832FAC 1000000A */ beq $zero, $zero, .L80832FD8 -/* 00DA0 80832FB0 8FA60020 */ lw $a2, 0x0020($sp) -/* 00DA4 80832FB4 8CB901D4 */ lw $t9, 0x01D4($a1) ## 000001D4 -.L80832FB8: -/* 00DA8 80832FB8 84AA00B6 */ lh $t2, 0x00B6($a1) ## 000000B6 -/* 00DAC 80832FBC 8B290000 */ lwl $t1, 0x0000($t9) ## 00000000 -/* 00DB0 80832FC0 9B290003 */ lwr $t1, 0x0003($t9) ## 00000003 -/* 00DB4 80832FC4 A8A901EC */ swl $t1, 0x01EC($a1) ## 000001EC -/* 00DB8 80832FC8 B8A901EF */ swr $t1, 0x01EF($a1) ## 000001EF -/* 00DBC 80832FCC 97290004 */ lhu $t1, 0x0004($t9) ## 00000004 -/* 00DC0 80832FD0 A4AA01EA */ sh $t2, 0x01EA($a1) ## 000001EA -/* 00DC4 80832FD4 A4A901F0 */ sh $t1, 0x01F0($a1) ## 000001F0 -.L80832FD8: -/* 00DC8 80832FD8 A0A601E9 */ sb $a2, 0x01E9($a1) ## 000001E9 -/* 00DCC 80832FDC 0C20C884 */ jal func_80832210 -/* 00DD0 80832FE0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00DD4 80832FE4 0C028CC4 */ jal func_800A3310 -/* 00DD8 80832FE8 8FA40018 */ lw $a0, 0x0018($sp) -/* 00DDC 80832FEC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00DE0 80832FF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00DE4 80832FF4 03E00008 */ jr $ra -/* 00DE8 80832FF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s deleted file mode 100644 index 1e0d5a9645..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80832FFC -/* 00DEC 80832FFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00DF0 80833000 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00DF4 80833004 AFA5001C */ sw $a1, 0x001C($sp) -/* 00DF8 80833008 AFA70024 */ sw $a3, 0x0024($sp) -/* 00DFC 8083300C AFA40018 */ sw $a0, 0x0018($sp) -/* 00E00 80833010 8FA70028 */ lw $a3, 0x0028($sp) -/* 00E04 80833014 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop -/* 00E08 80833018 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00E0C 8083301C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00E10 80833020 8FA5001C */ lw $a1, 0x001C($sp) -/* 00E14 80833024 0C20CBD5 */ jal func_80832F54 -/* 00E18 80833028 8FA60024 */ lw $a2, 0x0024($sp) -/* 00E1C 8083302C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E20 80833030 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E24 80833034 03E00008 */ jr $ra -/* 00E28 80833038 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083303C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083303C.s deleted file mode 100644 index 3736968875..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083303C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8083303C -/* 00E2C 8083303C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00E30 80833040 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 00E34 80833044 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00E38 80833048 AFBF001C */ sw $ra, 0x001C($sp) -/* 00E3C 8083304C 0C20CBFF */ jal func_80832FFC -/* 00E40 80833050 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00E44 80833054 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E48 80833058 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E4C 8083305C 03E00008 */ jr $ra -/* 00E50 80833060 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833064.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833064.s deleted file mode 100644 index 818a4cc0ba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833064.s +++ /dev/null @@ -1,16 +0,0 @@ -.late_rodata -glabel D_80855354 - .word 0x3F2AAAAB - -.text -glabel func_80833064 -/* 00E54 80833064 3C018085 */ lui $at, %hi(D_80855354) ## $at = 80850000 -/* 00E58 80833068 C4245354 */ lwc1 $f4, %lo(D_80855354)($at) -/* 00E5C 8083306C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00E60 80833070 AFBF001C */ sw $ra, 0x001C($sp) -/* 00E64 80833074 0C20CBFF */ jal func_80832FFC -/* 00E68 80833078 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00E6C 8083307C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E70 80833080 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E74 80833084 03E00008 */ jr $ra -/* 00E78 80833088 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083308C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083308C.s deleted file mode 100644 index b963e54f64..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083308C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8083308C -/* 00E7C 8083308C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E80 80833090 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E84 80833094 0C20CC19 */ jal func_80833064 -/* 00E88 80833098 2407001C */ addiu $a3, $zero, 0x001C ## $a3 = 0000001C -/* 00E8C 8083309C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E90 808330A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E94 808330A4 03E00008 */ jr $ra -/* 00E98 808330A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s deleted file mode 100644 index 900113c9de..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_808330AC -/* 00E9C 808330AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00EA0 808330B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00EA4 808330B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00EA8 808330B8 AFA70024 */ sw $a3, 0x0024($sp) -/* 00EAC 808330BC AFA40018 */ sw $a0, 0x0018($sp) -/* 00EB0 808330C0 8FA70028 */ lw $a3, 0x0028($sp) -/* 00EB4 808330C4 0C029067 */ jal SkelAnime_ChangeLinkAnimPlaybackRepeat -/* 00EB8 808330C8 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00EBC 808330CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00EC0 808330D0 8FA5001C */ lw $a1, 0x001C($sp) -/* 00EC4 808330D4 0C20CBD5 */ jal func_80832F54 -/* 00EC8 808330D8 8FA60024 */ lw $a2, 0x0024($sp) -/* 00ECC 808330DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00ED0 808330E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00ED4 808330E4 03E00008 */ jr $ra -/* 00ED8 808330E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330EC.s deleted file mode 100644 index cede17106f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330EC.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_808330EC -/* 00EDC 808330EC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00EE0 808330F0 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 00EE4 808330F4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00EE8 808330F8 AFBF001C */ sw $ra, 0x001C($sp) -/* 00EEC 808330FC 0C20CC2B */ jal func_808330AC -/* 00EF0 80833100 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00EF4 80833104 8FBF001C */ lw $ra, 0x001C($sp) -/* 00EF8 80833108 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00EFC 8083310C 03E00008 */ jr $ra -/* 00F00 80833110 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833114.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833114.s deleted file mode 100644 index 3b0da1822a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833114.s +++ /dev/null @@ -1,16 +0,0 @@ -.late_rodata -glabel D_80855358 - .word 0x3F2AAAAB - -.text -glabel func_80833114 -/* 00F04 80833114 3C018085 */ lui $at, %hi(D_80855358) ## $at = 80850000 -/* 00F08 80833118 C4245358 */ lwc1 $f4, %lo(D_80855358)($at) -/* 00F0C 8083311C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00F10 80833120 AFBF001C */ sw $ra, 0x001C($sp) -/* 00F14 80833124 0C20CC2B */ jal func_808330AC -/* 00F18 80833128 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00F1C 8083312C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00F20 80833130 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00F24 80833134 03E00008 */ jr $ra -/* 00F28 80833138 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083313C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083313C.s deleted file mode 100644 index ed8db04285..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083313C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8083313C -/* 00F2C 8083313C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F30 80833140 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F34 80833144 0C20CC45 */ jal func_80833114 -/* 00F38 80833148 2407001C */ addiu $a3, $zero, 0x001C ## $a3 = 0000001C -/* 00F3C 8083314C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F40 80833150 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F44 80833154 03E00008 */ jr $ra -/* 00F48 80833158 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083315C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083315C.s deleted file mode 100644 index 55547544b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083315C.s +++ /dev/null @@ -1,80 +0,0 @@ -glabel func_8083315C -/* 00F4C 8083315C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F50 80833160 AFA40018 */ sw $a0, 0x0018($sp) -/* 00F54 80833164 3C048085 */ lui $a0, %hi(D_808535D4) ## $a0 = 80850000 -/* 00F58 80833168 248435D4 */ addiu $a0, $a0, %lo(D_808535D4) ## $a0 = 808535D4 -/* 00F5C 8083316C C4840000 */ lwc1 $f4, 0x0000($a0) ## 808535D4 -/* 00F60 80833170 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00F64 80833174 3C058085 */ lui $a1, %hi(D_808535D8) ## $a1 = 80850000 -/* 00F68 80833178 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F6C 8083317C 24A535D8 */ addiu $a1, $a1, %lo(D_808535D8) ## $a1 = 808535D8 -/* 00F70 80833180 E4E40A7C */ swc1 $f4, 0x0A7C($a3) ## 00000A7C -/* 00F74 80833184 84AE0000 */ lh $t6, 0x0000($a1) ## 808535D8 -/* 00F78 80833188 3C068086 */ lui $a2, %hi(D_80858AB4) ## $a2 = 80860000 -/* 00F7C 8083318C A4EE0A80 */ sh $t6, 0x0A80($a3) ## 00000A80 -/* 00F80 80833190 AFA7001C */ sw $a3, 0x001C($sp) -/* 00F84 80833194 0C01DF44 */ jal func_80077D10 -/* 00F88 80833198 8CC68AB4 */ lw $a2, %lo(D_80858AB4)($a2) -/* 00F8C 8083319C 8FA20018 */ lw $v0, 0x0018($sp) -/* 00F90 808331A0 844F07A0 */ lh $t7, 0x07A0($v0) ## 000007A0 -/* 00F94 808331A4 000FC080 */ sll $t8, $t7, 2 -/* 00F98 808331A8 0058C821 */ addu $t9, $v0, $t8 -/* 00F9C 808331AC 0C016A52 */ jal func_8005A948 -/* 00FA0 808331B0 8F240790 */ lw $a0, 0x0790($t9) ## 00000790 -/* 00FA4 808331B4 3C058085 */ lui $a1, %hi(D_808535D8) ## $a1 = 80850000 -/* 00FA8 808331B8 24A535D8 */ addiu $a1, $a1, %lo(D_808535D8) ## $a1 = 808535D8 -/* 00FAC 808331BC 84A80000 */ lh $t0, 0x0000($a1) ## 808535D8 -/* 00FB0 808331C0 8FA7001C */ lw $a3, 0x001C($sp) -/* 00FB4 808331C4 3C048085 */ lui $a0, %hi(D_808535DC) ## $a0 = 80850000 -/* 00FB8 808331C8 248435DC */ addiu $a0, $a0, %lo(D_808535DC) ## $a0 = 808535DC -/* 00FBC 808331CC 00484821 */ addu $t1, $v0, $t0 -/* 00FC0 808331D0 A4890000 */ sh $t1, 0x0000($a0) ## 808535DC -/* 00FC4 808331D4 90EA0846 */ lbu $t2, 0x0846($a3) ## 00000846 -/* 00FC8 808331D8 3C018085 */ lui $at, %hi(D_808535D4) ## $at = 80850000 -/* 00FCC 808331DC 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 00FD0 808331E0 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00FD4 808331E4 05610004 */ bgez $t3, .L808331F8 -/* 00FD8 808331E8 316C0003 */ andi $t4, $t3, 0x0003 ## $t4 = 00000001 -/* 00FDC 808331EC 11800002 */ beq $t4, $zero, .L808331F8 -/* 00FE0 808331F0 00000000 */ nop -/* 00FE4 808331F4 258CFFFC */ addiu $t4, $t4, 0xFFFC ## $t4 = FFFFFFFD -.L808331F8: -/* 00FE8 808331F8 A0EC0846 */ sb $t4, 0x0846($a3) ## 00000846 -/* 00FEC 808331FC C42635D4 */ lwc1 $f6, %lo(D_808535D4)($at) -/* 00FF0 80833200 3C01425C */ lui $at, 0x425C ## $at = 425C0000 -/* 00FF4 80833204 44814000 */ mtc1 $at, $f8 ## $f8 = 55.00 -/* 00FF8 80833208 00000000 */ nop -/* 00FFC 8083320C 4608303C */ c.lt.s $f6, $f8 -/* 01000 80833210 00000000 */ nop -/* 01004 80833214 45020004 */ bc1fl .L80833228 -/* 01008 80833218 848D0000 */ lh $t5, 0x0000($a0) ## 808535DC -/* 0100C 8083321C 10000011 */ beq $zero, $zero, .L80833264 -/* 01010 80833220 2403FFFF */ addiu $v1, $zero, 0xFFFF ## $v1 = FFFFFFFF -/* 01014 80833224 848D0000 */ lh $t5, 0x0000($a0) ## 808535DC -.L80833228: -/* 01018 80833228 84EE00B6 */ lh $t6, 0x00B6($a3) ## 000000B6 -/* 0101C 8083322C 84A30000 */ lh $v1, 0x0000($a1) ## 808535D8 -/* 01020 80833230 01AE1023 */ subu $v0, $t5, $t6 -/* 01024 80833234 00021400 */ sll $v0, $v0, 16 -/* 01028 80833238 00021403 */ sra $v0, $v0, 16 -/* 0102C 8083323C 24422000 */ addiu $v0, $v0, 0x2000 ## $v0 = 00001FFF -/* 01030 80833240 24632000 */ addiu $v1, $v1, 0x2000 ## $v1 = 00001FFF -/* 01034 80833244 3063FFFF */ andi $v1, $v1, 0xFFFF ## $v1 = 00001FFF -/* 01038 80833248 3042FFFF */ andi $v0, $v0, 0xFFFF ## $v0 = 00001FFF -/* 0103C 8083324C 00031A43 */ sra $v1, $v1, 9 -/* 01040 80833250 00021383 */ sra $v0, $v0, 14 -/* 01044 80833254 00031E00 */ sll $v1, $v1, 24 -/* 01048 80833258 00021600 */ sll $v0, $v0, 24 -/* 0104C 8083325C 00031E03 */ sra $v1, $v1, 24 -/* 01050 80833260 00021603 */ sra $v0, $v0, 24 -.L80833264: -/* 01054 80833264 90EF0846 */ lbu $t7, 0x0846($a3) ## 00000846 -/* 01058 80833268 00EFC021 */ addu $t8, $a3, $t7 -/* 0105C 8083326C A3030847 */ sb $v1, 0x0847($t8) ## 00000847 -/* 01060 80833270 90F90846 */ lbu $t9, 0x0846($a3) ## 00000846 -/* 01064 80833274 00F94021 */ addu $t0, $a3, $t9 -/* 01068 80833278 A102084B */ sb $v0, 0x084B($t0) ## 0000084B -/* 0106C 8083327C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01070 80833280 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01074 80833284 03E00008 */ jr $ra -/* 01078 80833288 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s deleted file mode 100644 index 5a97cda0cc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_8083328C -/* 0107C 8083328C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01080 80833290 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01084 80833294 AFA5001C */ sw $a1, 0x001C($sp) -/* 01088 80833298 3C078085 */ lui $a3, %hi(D_808535E8) ## $a3 = 80850000 -/* 0108C 8083329C 8CE735E8 */ lw $a3, %lo(D_808535E8)($a3) -/* 01090 808332A0 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop -/* 01094 808332A4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 01098 808332A8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0109C 808332AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010A0 808332B0 03E00008 */ jr $ra -/* 010A4 808332B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332B8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332B8.s deleted file mode 100644 index 761e26b09a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332B8.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_808332B8 -/* 010A8 808332B8 8C82067C */ lw $v0, 0x067C($a0) ## 0000067C -/* 010AC 808332BC 3C010800 */ lui $at, 0x0800 ## $at = 08000000 -/* 010B0 808332C0 00411024 */ and $v0, $v0, $at -/* 010B4 808332C4 0002102B */ sltu $v0, $zero, $v0 -/* 010B8 808332C8 10400004 */ beq $v0, $zero, .L808332DC -/* 010BC 808332CC 00000000 */ nop -/* 010C0 808332D0 8082014F */ lb $v0, 0x014F($a0) ## 0000014F -/* 010C4 808332D4 38420001 */ xori $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 010C8 808332D8 0002102B */ sltu $v0, $zero, $v0 -.L808332DC: -/* 010CC 808332DC 03E00008 */ jr $ra -/* 010D0 808332E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332E4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332E4.s deleted file mode 100644 index 5106343792..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332E4.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_808332E4 -/* 010D4 808332E4 8C82067C */ lw $v0, 0x067C($a0) ## 0000067C -/* 010D8 808332E8 3C010100 */ lui $at, 0x0100 ## $at = 01000000 -/* 010DC 808332EC 03E00008 */ jr $ra -/* 010E0 808332F0 00411024 */ and $v0, $v0, $at diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332F4.s deleted file mode 100644 index be45be778f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808332F4.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_808332F4 -/* 010E4 808332F4 AFA50004 */ sw $a1, 0x0004($sp) -/* 010E8 808332F8 808E0434 */ lb $t6, 0x0434($a0) ## 00000434 -/* 010EC 808332FC 3C198085 */ lui $t9, %hi(D_80853624) ## $t9 = 80850000 -/* 010F0 80833300 27393624 */ addiu $t9, $t9, %lo(D_80853624) ## $t9 = 80853624 -/* 010F4 80833304 000E7880 */ sll $t7, $t6, 2 -/* 010F8 80833308 01EE7823 */ subu $t7, $t7, $t6 -/* 010FC 8083330C 000F7840 */ sll $t7, $t7, 1 -/* 01100 80833310 25F8FFFA */ addiu $t8, $t7, 0xFFFA ## $t8 = FFFFFFFA -/* 01104 80833314 03191021 */ addu $v0, $t8, $t9 -/* 01108 80833318 80430002 */ lb $v1, 0x0002($v0) ## 00000002 -/* 0110C 8083331C 04600003 */ bltz $v1, .L8083332C -/* 01110 80833320 00034023 */ subu $t0, $zero, $v1 -/* 01114 80833324 03E00008 */ jr $ra -/* 01118 80833328 A0830862 */ sb $v1, 0x0862($a0) ## 00000862 -.L8083332C: -/* 0111C 8083332C A0880862 */ sb $t0, 0x0862($a0) ## 00000862 -/* 01120 80833330 03E00008 */ jr $ra -/* 01124 80833334 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833338.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833338.s deleted file mode 100644 index 5b7cbf11ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833338.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80833338 -/* 01128 80833338 908E015B */ lbu $t6, 0x015B($a0) ## 0000015B -/* 0112C 8083333C 3C028085 */ lui $v0, %hi(D_80853914) ## $v0 = 80850000 -/* 01130 80833340 000E7880 */ sll $t7, $t6, 2 -/* 01134 80833344 004F1021 */ addu $v0, $v0, $t7 -/* 01138 80833348 03E00008 */ jr $ra -/* 0113C 8083334C 8C423914 */ lw $v0, %lo(D_80853914)($v0) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833350.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833350.s deleted file mode 100644 index e779730dcb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833350.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80833350 -/* 01140 80833350 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01144 80833354 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01148 80833358 0C20CCCE */ jal func_80833338 -/* 0114C 8083335C AFA40018 */ sw $a0, 0x0018($sp) -/* 01150 80833360 8FAE0018 */ lw $t6, 0x0018($sp) -/* 01154 80833364 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 01158 80833368 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C -/* 0115C 8083336C 8DC401BC */ lw $a0, 0x01BC($t6) ## 000001BC -/* 01160 80833370 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01164 80833374 1044001E */ beq $v0, $a0, .L808333F0 -/* 01168 80833378 3C028085 */ lui $v0, %hi(D_80853D7C) ## $v0 = 80850000 -/* 0116C 8083337C 24423D7C */ addiu $v0, $v0, %lo(D_80853D7C) ## $v0 = 80853D7C -.L80833380: -/* 01170 80833380 8C4F0000 */ lw $t7, 0x0000($v0) ## 80853D7C -/* 01174 80833384 548F0004 */ bnel $a0, $t7, .L80833398 -/* 01178 80833388 8C580004 */ lw $t8, 0x0004($v0) ## 80853D80 -/* 0117C 8083338C 10000019 */ beq $zero, $zero, .L808333F4 -/* 01180 80833390 24620001 */ addiu $v0, $v1, 0x0001 ## $v0 = 00000001 -/* 01184 80833394 8C580004 */ lw $t8, 0x0004($v0) ## 00000005 -.L80833398: -/* 01188 80833398 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 00000005 -/* 0118C 8083339C 54980004 */ bnel $a0, $t8, .L808333B0 -/* 01190 808333A0 8C590004 */ lw $t9, 0x0004($v0) ## 00000009 -/* 01194 808333A4 10000013 */ beq $zero, $zero, .L808333F4 -/* 01198 808333A8 24620002 */ addiu $v0, $v1, 0x0002 ## $v0 = 00000002 -/* 0119C 808333AC 8C590004 */ lw $t9, 0x0004($v0) ## 00000006 -.L808333B0: -/* 011A0 808333B0 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 00000006 -/* 011A4 808333B4 54990004 */ bnel $a0, $t9, .L808333C8 -/* 011A8 808333B8 8C480004 */ lw $t0, 0x0004($v0) ## 0000000A -/* 011AC 808333BC 1000000D */ beq $zero, $zero, .L808333F4 -/* 011B0 808333C0 24620003 */ addiu $v0, $v1, 0x0003 ## $v0 = 00000003 -/* 011B4 808333C4 8C480004 */ lw $t0, 0x0004($v0) ## 00000007 -.L808333C8: -/* 011B8 808333C8 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 00000007 -/* 011BC 808333CC 54880004 */ bnel $a0, $t0, .L808333E0 -/* 011C0 808333D0 24630004 */ addiu $v1, $v1, 0x0004 ## $v1 = 00000004 -/* 011C4 808333D4 10000007 */ beq $zero, $zero, .L808333F4 -/* 011C8 808333D8 24620004 */ addiu $v0, $v1, 0x0004 ## $v0 = 00000008 -/* 011CC 808333DC 24630004 */ addiu $v1, $v1, 0x0004 ## $v1 = 00000008 -.L808333E0: -/* 011D0 808333E0 1465FFE7 */ bne $v1, $a1, .L80833380 -/* 011D4 808333E4 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 0000000C -/* 011D8 808333E8 10000002 */ beq $zero, $zero, .L808333F4 -/* 011DC 808333EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808333F0: -/* 011E0 808333F0 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -.L808333F4: -/* 011E4 808333F4 03E00008 */ jr $ra -/* 011E8 808333F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808333FC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808333FC.s deleted file mode 100644 index 508cedaf48..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808333FC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_808333FC -/* 011EC 808333FC 3C028085 */ lui $v0, %hi(D_80853E7C) ## $v0 = 80850000 -/* 011F0 80833400 00451021 */ addu $v0, $v0, $a1 -/* 011F4 80833404 90423E7C */ lbu $v0, %lo(D_80853E7C)($v0) -/* 011F8 80833408 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 011FC 8083340C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01200 80833410 10400005 */ beq $v0, $zero, .L80833428 -/* 01204 80833414 00027080 */ sll $t6, $v0, 2 -/* 01208 80833418 3C058085 */ lui $a1, %hi(D_80853E4C) ## $a1 = 80850000 -/* 0120C 8083341C 00AE2821 */ addu $a1, $a1, $t6 -/* 01210 80833420 0C20CA49 */ jal func_80832924 -/* 01214 80833424 8CA53E4C */ lw $a1, %lo(D_80853E4C)($a1) -.L80833428: -/* 01218 80833428 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0121C 8083342C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01220 80833430 03E00008 */ jr $ra -/* 01224 80833434 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833438.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833438.s deleted file mode 100644 index 4c7bba19a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833438.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80833438 -/* 01228 80833438 908E0890 */ lbu $t6, 0x0890($a0) ## 00000890 -/* 0122C 8083343C 51C00008 */ beql $t6, $zero, .L80833460 -/* 01230 80833440 8C99067C */ lw $t9, 0x067C($a0) ## 0000067C -/* 01234 80833444 908F015B */ lbu $t7, 0x015B($a0) ## 0000015B -/* 01238 80833448 3C028085 */ lui $v0, %hi(D_8085395C) ## $v0 = 80850000 -/* 0123C 8083344C 000FC080 */ sll $t8, $t7, 2 -/* 01240 80833450 00581021 */ addu $v0, $v0, $t8 -/* 01244 80833454 03E00008 */ jr $ra -/* 01248 80833458 8C42395C */ lw $v0, %lo(D_8085395C)($v0) -.L8083345C: -/* 0124C 8083345C 8C99067C */ lw $t9, 0x067C($a0) ## 0000067C -.L80833460: -/* 01250 80833460 3C012800 */ lui $at, 0x2800 ## $at = 28000000 -/* 01254 80833464 03214024 */ and $t0, $t9, $at -/* 01258 80833468 5500000C */ bnel $t0, $zero, .L8083349C -/* 0125C 8083346C 908C015B */ lbu $t4, 0x015B($a0) ## 0000015B -/* 01260 80833470 8089014F */ lb $t1, 0x014F($a0) ## 0000014F -/* 01264 80833474 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01268 80833478 55210008 */ bnel $t1, $at, .L8083349C -/* 0126C 8083347C 908C015B */ lbu $t4, 0x015B($a0) ## 0000015B -/* 01270 80833480 908A015B */ lbu $t2, 0x015B($a0) ## 0000015B -/* 01274 80833484 3C028085 */ lui $v0, %hi(D_80853974) ## $v0 = 80850000 -/* 01278 80833488 000A5880 */ sll $t3, $t2, 2 -/* 0127C 8083348C 004B1021 */ addu $v0, $v0, $t3 -/* 01280 80833490 03E00008 */ jr $ra -/* 01284 80833494 8C423974 */ lw $v0, %lo(D_80853974)($v0) -.L80833498: -/* 01288 80833498 908C015B */ lbu $t4, 0x015B($a0) ## 0000015B -.L8083349C: -/* 0128C 8083349C 3C028085 */ lui $v0, %hi(D_80853944) ## $v0 = 80850000 -/* 01290 808334A0 000C6880 */ sll $t5, $t4, 2 -/* 01294 808334A4 004D1021 */ addu $v0, $v0, $t5 -/* 01298 808334A8 8C423944 */ lw $v0, %lo(D_80853944)($v0) -/* 0129C 808334AC 03E00008 */ jr $ra -/* 012A0 808334B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808334B4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808334B4.s deleted file mode 100644 index 86e5b4e292..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808334B4.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_808334B4 -/* 012A4 808334B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012A8 808334B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012AC 808334BC 0C20CCB9 */ jal func_808332E4 -/* 012B0 808334C0 AFA40018 */ sw $a0, 0x0018($sp) -/* 012B4 808334C4 0002102B */ sltu $v0, $zero, $v0 -/* 012B8 808334C8 10400004 */ beq $v0, $zero, .L808334DC -/* 012BC 808334CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012C0 808334D0 8FAE0018 */ lw $t6, 0x0018($sp) -/* 012C4 808334D4 85C20834 */ lh $v0, 0x0834($t6) ## 00000834 -/* 012C8 808334D8 0002102B */ sltu $v0, $zero, $v0 -.L808334DC: -/* 012CC 808334DC 03E00008 */ jr $ra -/* 012D0 808334E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808334E4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808334E4.s deleted file mode 100644 index b043bf3106..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808334E4.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_808334E4 -/* 012D4 808334E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012D8 808334E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012DC 808334EC 0C20CD2D */ jal func_808334B4 -/* 012E0 808334F0 AFA40018 */ sw $a0, 0x0018($sp) -/* 012E4 808334F4 10400004 */ beq $v0, $zero, .L80833508 -/* 012E8 808334F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012EC 808334FC 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 -/* 012F0 80833500 10000007 */ beq $zero, $zero, .L80833520 -/* 012F4 80833504 24422638 */ addiu $v0, $v0, 0x2638 ## $v0 = 04002638 -.L80833508: -/* 012F8 80833508 8FAE0018 */ lw $t6, 0x0018($sp) -/* 012FC 8083350C 3C028085 */ lui $v0, %hi(D_808539A4) ## $v0 = 80850000 -/* 01300 80833510 91CF015B */ lbu $t7, 0x015B($t6) ## 0000015B -/* 01304 80833514 000FC080 */ sll $t8, $t7, 2 -/* 01308 80833518 00581021 */ addu $v0, $v0, $t8 -/* 0130C 8083351C 8C4239A4 */ lw $v0, %lo(D_808539A4)($v0) -.L80833520: -/* 01310 80833520 03E00008 */ jr $ra -/* 01314 80833524 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833528.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833528.s deleted file mode 100644 index a26b9c70c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833528.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80833528 -/* 01318 80833528 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0131C 8083352C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01320 80833530 0C20CD2D */ jal func_808334B4 -/* 01324 80833534 AFA40018 */ sw $a0, 0x0018($sp) -/* 01328 80833538 10400004 */ beq $v0, $zero, .L8083354C -/* 0132C 8083353C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01330 80833540 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 -/* 01334 80833544 10000007 */ beq $zero, $zero, .L80833564 -/* 01338 80833548 24422630 */ addiu $v0, $v0, 0x2630 ## $v0 = 04002630 -.L8083354C: -/* 0133C 8083354C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 01340 80833550 3C028085 */ lui $v0, %hi(D_8085398C) ## $v0 = 80850000 -/* 01344 80833554 91CF015B */ lbu $t7, 0x015B($t6) ## 0000015B -/* 01348 80833558 000FC080 */ sll $t8, $t7, 2 -/* 0134C 8083355C 00581021 */ addu $v0, $v0, $t8 -/* 01350 80833560 8C42398C */ lw $v0, %lo(D_8085398C)($v0) -.L80833564: -/* 01354 80833564 03E00008 */ jr $ra -/* 01358 80833568 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083356C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083356C.s deleted file mode 100644 index 89e178ba01..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083356C.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_8083356C -/* 0135C 8083356C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01360 80833570 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01364 80833574 0C00B75E */ jal func_8002DD78 -/* 01368 80833578 AFA40018 */ sw $a0, 0x0018($sp) -/* 0136C 8083357C 10400004 */ beq $v0, $zero, .L80833590 -/* 01370 80833580 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01374 80833584 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 -/* 01378 80833588 10000007 */ beq $zero, $zero, .L808335A8 -/* 0137C 8083358C 244226E8 */ addiu $v0, $v0, 0x26E8 ## $v0 = 040026E8 -.L80833590: -/* 01380 80833590 8FAE0018 */ lw $t6, 0x0018($sp) -/* 01384 80833594 3C028085 */ lui $v0, %hi(D_80853B3C) ## $v0 = 80850000 -/* 01388 80833598 91CF015B */ lbu $t7, 0x015B($t6) ## 0000015B -/* 0138C 8083359C 000FC080 */ sll $t8, $t7, 2 -/* 01390 808335A0 00581021 */ addu $v0, $v0, $t8 -/* 01394 808335A4 8C423B3C */ lw $v0, %lo(D_80853B3C)($v0) -.L808335A8: -/* 01398 808335A8 03E00008 */ jr $ra -/* 0139C 808335AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808335B0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808335B0.s deleted file mode 100644 index b8c6b22395..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808335B0.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_808335B0 -/* 013A0 808335B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 013A4 808335B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 013A8 808335B8 0C20CD2D */ jal func_808334B4 -/* 013AC 808335BC AFA40018 */ sw $a0, 0x0018($sp) -/* 013B0 808335C0 10400004 */ beq $v0, $zero, .L808335D4 -/* 013B4 808335C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 013B8 808335C8 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 -/* 013BC 808335CC 10000007 */ beq $zero, $zero, .L808335EC -/* 013C0 808335D0 24422620 */ addiu $v0, $v0, 0x2620 ## $v0 = 04002620 -.L808335D4: -/* 013C4 808335D4 8FAE0018 */ lw $t6, 0x0018($sp) -/* 013C8 808335D8 3C028085 */ lui $v0, %hi(D_80853B6C) ## $v0 = 80850000 -/* 013CC 808335DC 91CF015B */ lbu $t7, 0x015B($t6) ## 0000015B -/* 013D0 808335E0 000FC080 */ sll $t8, $t7, 2 -/* 013D4 808335E4 00581021 */ addu $v0, $v0, $t8 -/* 013D8 808335E8 8C423B6C */ lw $v0, %lo(D_80853B6C)($v0) -.L808335EC: -/* 013DC 808335EC 03E00008 */ jr $ra -/* 013E0 808335F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808335F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808335F4.s deleted file mode 100644 index a99e7609dd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808335F4.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_808335F4 -/* 013E4 808335F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 013E8 808335F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 013EC 808335FC 0C20CD2D */ jal func_808334B4 -/* 013F0 80833600 AFA40018 */ sw $a0, 0x0018($sp) -/* 013F4 80833604 10400004 */ beq $v0, $zero, .L80833618 -/* 013F8 80833608 8FBF0014 */ lw $ra, 0x0014($sp) -/* 013FC 8083360C 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 -/* 01400 80833610 10000007 */ beq $zero, $zero, .L80833630 -/* 01404 80833614 24422618 */ addiu $v0, $v0, 0x2618 ## $v0 = 04002618 -.L80833618: -/* 01408 80833618 8FAE0018 */ lw $t6, 0x0018($sp) -/* 0140C 8083361C 3C028085 */ lui $v0, %hi(D_80853B54) ## $v0 = 80850000 -/* 01410 80833620 91CF015B */ lbu $t7, 0x015B($t6) ## 0000015B -/* 01414 80833624 000FC080 */ sll $t8, $t7, 2 -/* 01418 80833628 00581021 */ addu $v0, $v0, $t8 -/* 0141C 8083362C 8C423B54 */ lw $v0, %lo(D_80853B54)($v0) -.L80833630: -/* 01420 80833630 03E00008 */ jr $ra -/* 01424 80833634 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833638.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833638.s deleted file mode 100644 index ee10c20122..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833638.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80833638 -/* 01428 80833638 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0142C 8083363C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01430 80833640 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01434 80833644 AC85082C */ sw $a1, 0x082C($a0) ## 0000082C -/* 01438 80833648 A0800836 */ sb $zero, 0x0836($a0) ## 00000836 -/* 0143C 8083364C 0C20C9BC */ jal func_808326F0 -/* 01440 80833650 E4840830 */ swc1 $f4, 0x0830($a0) ## 00000830 -/* 01444 80833654 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01448 80833658 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0144C 8083365C 03E00008 */ jr $ra -/* 01450 80833660 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833664.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833664.s deleted file mode 100644 index 096ed7c051..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833664.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80833664 -/* 01454 80833664 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01458 80833668 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0145C 8083366C AFA40028 */ sw $a0, 0x0028($sp) -/* 01460 80833670 AFA60030 */ sw $a2, 0x0030($sp) -/* 01464 80833674 90AE015B */ lbu $t6, 0x015B($a1) ## 0000015B -/* 01468 80833678 8CB9067C */ lw $t9, 0x067C($a1) ## 0000067C -/* 0146C 8083367C 3C01FEFF */ lui $at, 0xFEFF ## $at = FEFF0000 -/* 01470 80833680 3C188085 */ lui $t8, %hi(D_80853914) ## $t8 = 80850000 -/* 01474 80833684 3421FFF7 */ ori $at, $at, 0xFFF7 ## $at = FEFFFFF7 -/* 01478 80833688 00063600 */ sll $a2, $a2, 24 -/* 0147C 8083368C 27183914 */ addiu $t8, $t8, %lo(D_80853914) ## $t8 = 80853914 -/* 01480 80833690 000E7880 */ sll $t7, $t6, 2 -/* 01484 80833694 03214024 */ and $t0, $t9, $at -/* 01488 80833698 00063603 */ sra $a2, $a2, 24 -/* 0148C 8083369C 8CA701BC */ lw $a3, 0x01BC($a1) ## 000001BC -/* 01490 808336A0 01F81021 */ addu $v0, $t7, $t8 -/* 01494 808336A4 ACA8067C */ sw $t0, 0x067C($a1) ## 0000067C -/* 01498 808336A8 2404002D */ addiu $a0, $zero, 0x002D ## $a0 = 0000002D -/* 0149C 808336AC 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L808336B0: -/* 014A0 808336B0 8C490000 */ lw $t1, 0x0000($v0) ## 00000000 -/* 014A4 808336B4 50E90005 */ beql $a3, $t1, .L808336CC -/* 014A8 808336B8 8FA40028 */ lw $a0, 0x0028($sp) -/* 014AC 808336BC 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 014B0 808336C0 1464FFFB */ bne $v1, $a0, .L808336B0 -/* 014B4 808336C4 24420018 */ addiu $v0, $v0, 0x0018 ## $v0 = 00000018 -/* 014B8 808336C8 8FA40028 */ lw $a0, 0x0028($sp) -.L808336CC: -/* 014BC 808336CC AFA3001C */ sw $v1, 0x001C($sp) -/* 014C0 808336D0 0C20CE67 */ jal func_8083399C -/* 014C4 808336D4 AFA5002C */ sw $a1, 0x002C($sp) -/* 014C8 808336D8 8FA3001C */ lw $v1, 0x001C($sp) -/* 014CC 808336DC 8FA5002C */ lw $a1, 0x002C($sp) -/* 014D0 808336E0 3C0F8085 */ lui $t7, %hi(D_80853914) ## $t7 = 80850000 -/* 014D4 808336E4 2C61002D */ sltiu $at, $v1, 0x002D -/* 014D8 808336E8 1020000A */ beq $at, $zero, .L80833714 -/* 014DC 808336EC 00035080 */ sll $t2, $v1, 2 -/* 014E0 808336F0 90AC015B */ lbu $t4, 0x015B($a1) ## 0000015B -/* 014E4 808336F4 01435023 */ subu $t2, $t2, $v1 -/* 014E8 808336F8 000A5040 */ sll $t2, $t2, 1 -/* 014EC 808336FC 000A5880 */ sll $t3, $t2, 2 -/* 014F0 80833700 000C6880 */ sll $t5, $t4, 2 -/* 014F4 80833704 016D7021 */ addu $t6, $t3, $t5 -/* 014F8 80833708 01EE7821 */ addu $t7, $t7, $t6 -/* 014FC 8083370C 8DEF3914 */ lw $t7, %lo(D_80853914)($t7) -/* 01500 80833710 ACAF01BC */ sw $t7, 0x01BC($a1) ## 000001BC -.L80833714: -/* 01504 80833714 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01508 80833718 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0150C 8083371C 03E00008 */ jr $ra -/* 01510 80833720 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833724.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833724.s deleted file mode 100644 index f23e76451e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833724.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80833724 -/* 01514 80833724 288100FE */ slti $at, $a0, 0x00FE -/* 01518 80833728 54200004 */ bnel $at, $zero, .L8083373C -/* 0151C 8083372C 240100FC */ addiu $at, $zero, 0x00FC ## $at = 000000FC -/* 01520 80833730 03E00008 */ jr $ra -/* 01524 80833734 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80833738: -/* 01528 80833738 240100FC */ addiu $at, $zero, 0x00FC ## $at = 000000FC -.L8083373C: -/* 0152C 8083373C 54810004 */ bnel $a0, $at, .L80833750 -/* 01530 80833740 24010059 */ addiu $at, $zero, 0x0059 ## $at = 00000059 -/* 01534 80833744 03E00008 */ jr $ra -/* 01538 80833748 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083374C: -/* 0153C 8083374C 24010059 */ addiu $at, $zero, 0x0059 ## $at = 00000059 -.L80833750: -/* 01540 80833750 14810003 */ bne $a0, $at, .L80833760 -/* 01544 80833754 3C028085 */ lui $v0, %hi(D_80853E9C) ## $v0 = 80850000 -/* 01548 80833758 03E00008 */ jr $ra -/* 0154C 8083375C 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80833760: -/* 01550 80833760 00441021 */ addu $v0, $v0, $a0 -/* 01554 80833764 80423E9C */ lb $v0, %lo(D_80853E9C)($v0) -/* 01558 80833768 03E00008 */ jr $ra -/* 0155C 8083376C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833770.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833770.s deleted file mode 100644 index 427951fbe2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833770.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80833770 -/* 01560 80833770 AFA40000 */ sw $a0, 0x0000($sp) -/* 01564 80833774 03E00008 */ jr $ra -/* 01568 80833778 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083377C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083377C.s deleted file mode 100644 index c9ecfa422c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083377C.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8083377C -/* 0156C 8083377C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01570 80833780 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 01574 80833784 AFA40000 */ sw $a0, 0x0000($sp) -/* 01578 80833788 03E00008 */ jr $ra -/* 0157C 8083378C E4A4085C */ swc1 $f4, 0x085C($a1) ## 0000085C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833790.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833790.s deleted file mode 100644 index 97411cfa3f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833790.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80833790 -/* 01580 80833790 AFA40000 */ sw $a0, 0x0000($sp) -/* 01584 80833794 03E00008 */ jr $ra -/* 01588 80833798 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083379C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083379C.s deleted file mode 100644 index 27c7917dc3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083379C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8083379C -/* 0158C 8083379C AFA40000 */ sw $a0, 0x0000($sp) -/* 01590 808337A0 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C -/* 01594 808337A4 80B80151 */ lb $t8, 0x0151($a1) ## 00000151 -/* 01598 808337A8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 0159C 808337AC 35CF0008 */ ori $t7, $t6, 0x0008 ## $t7 = 00000008 -/* 015A0 808337B0 13010004 */ beq $t8, $at, .L808337C4 -/* 015A4 808337B4 ACAF067C */ sw $t7, 0x067C($a1) ## 0000067C -/* 015A8 808337B8 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 015AC 808337BC 03E00008 */ jr $ra -/* 015B0 808337C0 A4B90860 */ sh $t9, 0x0860($a1) ## 00000860 -.L808337C4: -/* 015B4 808337C4 2408FFFE */ addiu $t0, $zero, 0xFFFE ## $t0 = FFFFFFFE -/* 015B8 808337C8 A4A80860 */ sh $t0, 0x0860($a1) ## 00000860 -/* 015BC 808337CC 03E00008 */ jr $ra -/* 015C0 808337D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808337D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808337D4.s deleted file mode 100644 index 44314fc53e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808337D4.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel func_808337D4 -/* 015C4 808337D4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 015C8 808337D8 AFBF003C */ sw $ra, 0x003C($sp) -/* 015CC 808337DC AFB00038 */ sw $s0, 0x0038($sp) -/* 015D0 808337E0 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C -/* 015D4 808337E4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 015D8 808337E8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 015DC 808337EC 31CF0800 */ andi $t7, $t6, 0x0800 ## $t7 = 00000000 -/* 015E0 808337F0 51E00006 */ beql $t7, $zero, .L8083380C -/* 015E4 808337F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015E8 808337F8 0C20C94A */ jal func_80832528 -/* 015EC 808337FC 00000000 */ nop -/* 015F0 80833800 1000003F */ beq $zero, $zero, .L80833900 -/* 015F4 80833804 8FBF003C */ lw $ra, 0x003C($sp) -/* 015F8 80833808 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8083380C: -/* 015FC 8083380C 0C023CA7 */ jal func_8008F29C -/* 01600 80833810 AFA60050 */ sw $a2, 0x0050($sp) -/* 01604 80833814 3C198085 */ lui $t9, %hi(D_80854188) ## $t9 = 80850000 -/* 01608 80833818 27394188 */ addiu $t9, $t9, %lo(D_80854188) ## $t9 = 80854188 -/* 0160C 8083381C 0002C080 */ sll $t8, $v0, 2 -/* 01610 80833820 03191821 */ addu $v1, $t8, $t9 -/* 01614 80833824 AFA2004C */ sw $v0, 0x004C($sp) -/* 01618 80833828 AFA30048 */ sw $v1, 0x0048($sp) -/* 0161C 8083382C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 01620 80833830 8FA60050 */ lw $a2, 0x0050($sp) -/* 01624 80833834 84670002 */ lh $a3, 0x0002($v1) ## 00000002 -/* 01628 80833838 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0162C 8083383C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 01630 80833840 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01634 80833844 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 01638 80833848 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 0163C 8083384C C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 01640 80833850 AFA0001C */ sw $zero, 0x001C($sp) -/* 01644 80833854 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01648 80833858 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 0164C 8083385C AFA00028 */ sw $zero, 0x0028($sp) -/* 01650 80833860 AFA00024 */ sw $zero, 0x0024($sp) -/* 01654 80833864 0C00C916 */ jal Actor_SpawnAsChild - -/* 01658 80833868 AFA80020 */ sw $t0, 0x0020($sp) -/* 0165C 8083386C 8FA60050 */ lw $a2, 0x0050($sp) -/* 01660 80833870 10400022 */ beq $v0, $zero, .L808338FC -/* 01664 80833874 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 -/* 01668 80833878 8FA9004C */ lw $t1, 0x004C($sp) -/* 0166C 8083387C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01670 80833880 00C11021 */ addu $v0, $a2, $at -/* 01674 80833884 1120000E */ beq $t1, $zero, .L808338C0 -/* 01678 80833888 8FAD0048 */ lw $t5, 0x0048($sp) -/* 0167C 8083388C 80431E5D */ lb $v1, 0x1E5D($v0) ## 00001E5D -/* 01680 80833890 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01684 80833894 00260821 */ addu $at, $at, $a2 -/* 01688 80833898 10600009 */ beq $v1, $zero, .L808338C0 -/* 0168C 8083389C 246AFFFF */ addiu $t2, $v1, 0xFFFF ## $t2 = FFFFFFFF -/* 01690 808338A0 A02A1E5D */ sb $t2, 0x1E5D($at) ## 00011E5D -/* 01694 808338A4 804B1E5D */ lb $t3, 0x1E5D($v0) ## 00001E5D -/* 01698 808338A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0169C 808338AC 00260821 */ addu $at, $at, $a2 -/* 016A0 808338B0 15600008 */ bne $t3, $zero, .L808338D4 -/* 016A4 808338B4 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 016A8 808338B8 10000006 */ beq $zero, $zero, .L808338D4 -/* 016AC 808338BC A02C1E5D */ sb $t4, 0x1E5D($at) ## 00011E5D -.L808338C0: -/* 016B0 808338C0 91A40000 */ lbu $a0, 0x0000($t5) ## 00000000 -/* 016B4 808338C4 AFA70044 */ sw $a3, 0x0044($sp) -/* 016B8 808338C8 0C021CCC */ jal Inventory_ChangeAmmo -/* 016BC 808338CC 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -/* 016C0 808338D0 8FA70044 */ lw $a3, 0x0044($sp) -.L808338D4: -/* 016C4 808338D4 AE070438 */ sw $a3, 0x0438($s0) ## 00000438 -/* 016C8 808338D8 AE0703AC */ sw $a3, 0x03AC($s0) ## 000003AC -/* 016CC 808338DC A2000434 */ sb $zero, 0x0434($s0) ## 00000434 -/* 016D0 808338E0 84EE00B6 */ lh $t6, 0x00B6($a3) ## 000000B6 -/* 016D4 808338E4 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 016D8 808338E8 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 016DC 808338EC 01CFC023 */ subu $t8, $t6, $t7 -/* 016E0 808338F0 37280800 */ ori $t0, $t9, 0x0800 ## $t0 = 00000800 -/* 016E4 808338F4 A61803BE */ sh $t8, 0x03BE($s0) ## 000003BE -/* 016E8 808338F8 AE08067C */ sw $t0, 0x067C($s0) ## 0000067C -.L808338FC: -/* 016EC 808338FC 8FBF003C */ lw $ra, 0x003C($sp) -.L80833900: -/* 016F0 80833900 8FB00038 */ lw $s0, 0x0038($sp) -/* 016F4 80833904 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 016F8 80833908 03E00008 */ jr $ra -/* 016FC 8083390C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833910.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833910.s deleted file mode 100644 index 4ca2c21712..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833910.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80833910 -/* 01700 80833910 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01704 80833914 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01708 80833918 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C -/* 0170C 8083391C C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 01710 80833920 2418FFFD */ addiu $t8, $zero, 0xFFFD ## $t8 = FFFFFFFD -/* 01714 80833924 35CF0008 */ ori $t7, $t6, 0x0008 ## $t7 = 00000008 -/* 01718 80833928 ACAF067C */ sw $t7, 0x067C($a1) ## 0000067C -/* 0171C 8083392C A4B80860 */ sh $t8, 0x0860($a1) ## 00000860 -/* 01720 80833930 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01724 80833934 C4A60028 */ lwc1 $f6, 0x0028($a1) ## 00000028 -/* 01728 80833938 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0172C 8083393C 24841C24 */ addiu $a0, $a0, 0x1C24 ## $a0 = 00001C24 -/* 01730 80833940 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 01734 80833944 C4A8002C */ lwc1 $f8, 0x002C($a1) ## 0000002C -/* 01738 80833948 AFA0001C */ sw $zero, 0x001C($sp) -/* 0173C 8083394C 24070066 */ addiu $a3, $zero, 0x0066 ## $a3 = 00000066 -/* 01740 80833950 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01744 80833954 84B900B6 */ lh $t9, 0x00B6($a1) ## 000000B6 -/* 01748 80833958 AFA5003C */ sw $a1, 0x003C($sp) -/* 0174C 8083395C AFA00028 */ sw $zero, 0x0028($sp) -/* 01750 80833960 AFA00024 */ sw $zero, 0x0024($sp) -/* 01754 80833964 0C00C916 */ jal Actor_SpawnAsChild - -/* 01758 80833968 AFB90020 */ sw $t9, 0x0020($sp) -/* 0175C 8083396C 8FA5003C */ lw $a1, 0x003C($sp) -/* 01760 80833970 ACA203AC */ sw $v0, 0x03AC($a1) ## 000003AC -/* 01764 80833974 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01768 80833978 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0176C 8083397C 03E00008 */ jr $ra -/* 01770 80833980 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833984.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833984.s deleted file mode 100644 index 069f29fcb5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833984.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80833984 -/* 01774 80833984 AFA40000 */ sw $a0, 0x0000($sp) -/* 01778 80833988 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C -/* 0177C 8083398C 3C010100 */ lui $at, 0x0100 ## $at = 01000000 -/* 01780 80833990 01C17825 */ or $t7, $t6, $at ## $t7 = 01000000 -/* 01784 80833994 03E00008 */ jr $ra -/* 01788 80833998 ACAF067C */ sw $t7, 0x067C($a1) ## 0000067C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083399C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083399C.s deleted file mode 100644 index 5d4f841361..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083399C.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8083399C -/* 0178C 8083399C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01790 808339A0 AFA60020 */ sw $a2, 0x0020($sp) -/* 01794 808339A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01798 808339A8 8CB8067C */ lw $t8, 0x067C($a1) ## 0000067C -/* 0179C 808339AC 00063600 */ sll $a2, $a2, 24 -/* 017A0 808339B0 00063603 */ sra $a2, $a2, 24 -/* 017A4 808339B4 3C01FEFF */ lui $at, 0xFEFF ## $at = FEFF0000 -/* 017A8 808339B8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 017AC 808339BC A0A60154 */ sb $a2, 0x0154($a1) ## 00000154 -/* 017B0 808339C0 3421FFF7 */ ori $at, $at, 0xFFF7 ## $at = FEFFFFF7 -/* 017B4 808339C4 80AE0154 */ lb $t6, 0x0154($a1) ## 00000154 -/* 017B8 808339C8 90AF0159 */ lbu $t7, 0x0159($a1) ## 00000159 -/* 017BC 808339CC 0301C824 */ and $t9, $t8, $at -/* 017C0 808339D0 ACB9067C */ sw $t9, 0x067C($a1) ## 0000067C -/* 017C4 808339D4 3C198085 */ lui $t9, %hi(D_80853FE8) ## $t9 = 80850000 -/* 017C8 808339D8 00064080 */ sll $t0, $a2, 2 -/* 017CC 808339DC A4A00860 */ sh $zero, 0x0860($a1) ## 00000860 -/* 017D0 808339E0 0328C821 */ addu $t9, $t9, $t0 -/* 017D4 808339E4 E4A0085C */ swc1 $f0, 0x085C($a1) ## 0000085C -/* 017D8 808339E8 E4A00858 */ swc1 $f0, 0x0858($a1) ## 00000858 -/* 017DC 808339EC A0AE0151 */ sb $t6, 0x0151($a1) ## 00000151 -/* 017E0 808339F0 A0AF0158 */ sb $t7, 0x0158($a1) ## 00000158 -/* 017E4 808339F4 8F393FE8 */ lw $t9, %lo(D_80853FE8)($t9) -/* 017E8 808339F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 017EC 808339FC 0320F809 */ jalr $ra, $t9 -/* 017F0 80833A00 00000000 */ nop -/* 017F4 80833A04 8FA4001C */ lw $a0, 0x001C($sp) -/* 017F8 80833A08 0C023B01 */ jal func_8008EC04 -/* 017FC 80833A0C 90850158 */ lbu $a1, 0x0158($a0) ## 00000158 -/* 01800 80833A10 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01804 80833A14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01808 80833A18 03E00008 */ jr $ra -/* 0180C 80833A1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833A20.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833A20.s deleted file mode 100644 index dcd265d0ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833A20.s +++ /dev/null @@ -1,76 +0,0 @@ -glabel func_80833A20 -/* 01810 80833A20 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01814 80833A24 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01818 80833A28 AFA50024 */ sw $a1, 0x0024($sp) -/* 0181C 80833A2C 808E0843 */ lb $t6, 0x0843($a0) ## 00000843 -/* 01820 80833A30 55C00039 */ bnel $t6, $zero, .L80833B18 -/* 01824 80833A34 8FA80024 */ lw $t0, 0x0024($sp) -/* 01828 80833A38 80820151 */ lb $v0, 0x0151($a0) ## 00000151 -/* 0182C 80833A3C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01830 80833A40 3C0F8016 */ lui $t7, %hi(gSaveContext+0x36) -/* 01834 80833A44 14410010 */ bne $v0, $at, .L80833A88 -/* 01838 80833A48 24051801 */ addiu $a1, $zero, 0x1801 ## $a1 = 00001801 -/* 0183C 80833A4C 95EFE696 */ lhu $t7, %lo(gSaveContext+0x36)($t7) -/* 01840 80833A50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01844 80833A54 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01848 80833A58 448F3000 */ mtc1 $t7, $f6 ## $f6 = -0.00 -/* 0184C 80833A5C 05E10004 */ bgez $t7, .L80833A70 -/* 01850 80833A60 46803220 */ cvt.s.w $f8, $f6 -/* 01854 80833A64 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 -/* 01858 80833A68 00000000 */ nop -/* 0185C 80833A6C 460A4200 */ add.s $f8, $f8, $f10 -.L80833A70: -/* 01860 80833A70 4608203C */ c.lt.s $f4, $f8 -/* 01864 80833A74 00000000 */ nop -/* 01868 80833A78 45000003 */ bc1f .L80833A88 -/* 0186C 80833A7C 00000000 */ nop -/* 01870 80833A80 10000001 */ beq $zero, $zero, .L80833A88 -/* 01874 80833A84 24051812 */ addiu $a1, $zero, 0x1812 ## $a1 = 00001812 -.L80833A88: -/* 01878 80833A88 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0187C 80833A8C 14410003 */ bne $v0, $at, .L80833A9C -/* 01880 80833A90 24066800 */ addiu $a2, $zero, 0x6800 ## $a2 = 00006800 -/* 01884 80833A94 1000000E */ beq $zero, $zero, .L80833AD0 -/* 01888 80833A98 24051812 */ addiu $a1, $zero, 0x1812 ## $a1 = 00001812 -.L80833A9C: -/* 0188C 80833A9C 80980842 */ lb $t8, 0x0842($a0) ## 00000842 -/* 01890 80833AA0 2B010018 */ slti $at, $t8, 0x0018 -/* 01894 80833AA4 54200005 */ bnel $at, $zero, .L80833ABC -/* 01898 80833AA8 90990845 */ lbu $t9, 0x0845($a0) ## 00000845 -/* 0189C 80833AAC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 018A0 80833AB0 10000007 */ beq $zero, $zero, .L80833AD0 -/* 018A4 80833AB4 24066801 */ addiu $a2, $zero, 0x6801 ## $a2 = 00006801 -/* 018A8 80833AB8 90990845 */ lbu $t9, 0x0845($a0) ## 00000845 -.L80833ABC: -/* 018AC 80833ABC 2B210003 */ slti $at, $t9, 0x0003 -/* 018B0 80833AC0 14200003 */ bne $at, $zero, .L80833AD0 -/* 018B4 80833AC4 00000000 */ nop -/* 018B8 80833AC8 24051818 */ addiu $a1, $zero, 0x1818 ## $a1 = 00001818 -/* 018BC 80833ACC 24066801 */ addiu $a2, $zero, 0x6801 ## $a2 = 00006801 -.L80833AD0: -/* 018C0 80833AD0 50A00007 */ beql $a1, $zero, .L80833AF0 -/* 018C4 80833AD4 80820842 */ lb $v0, 0x0842($a0) ## 00000842 -/* 018C8 80833AD8 AFA40020 */ sw $a0, 0x0020($sp) -/* 018CC 80833ADC 0C20CA3B */ jal func_808328EC -/* 018D0 80833AE0 A7A6001C */ sh $a2, 0x001C($sp) -/* 018D4 80833AE4 8FA40020 */ lw $a0, 0x0020($sp) -/* 018D8 80833AE8 97A6001C */ lhu $a2, 0x001C($sp) -/* 018DC 80833AEC 80820842 */ lb $v0, 0x0842($a0) ## 00000842 -.L80833AF0: -/* 018E0 80833AF0 30C5FFFF */ andi $a1, $a2, 0xFFFF ## $a1 = 00000000 -/* 018E4 80833AF4 28410010 */ slti $at, $v0, 0x0010 -/* 018E8 80833AF8 14200003 */ bne $at, $zero, .L80833B08 -/* 018EC 80833AFC 28410014 */ slti $at, $v0, 0x0014 -/* 018F0 80833B00 54200005 */ bnel $at, $zero, .L80833B18 -/* 018F4 80833B04 8FA80024 */ lw $t0, 0x0024($sp) -.L80833B08: -/* 018F8 80833B08 0C20C9A6 */ jal func_80832698 -/* 018FC 80833B0C AFA40020 */ sw $a0, 0x0020($sp) -/* 01900 80833B10 8FA40020 */ lw $a0, 0x0020($sp) -/* 01904 80833B14 8FA80024 */ lw $t0, 0x0024($sp) -.L80833B18: -/* 01908 80833B18 A0880843 */ sb $t0, 0x0843($a0) ## 00000843 -/* 0190C 80833B1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01910 80833B20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01914 80833B24 03E00008 */ jr $ra -/* 01918 80833B28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B2C.s deleted file mode 100644 index 2817fe4515..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B2C.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80833B2C -/* 0191C 80833B2C 8C8E067C */ lw $t6, 0x067C($a0) ## 0000067C -/* 01920 80833B30 3C014003 */ lui $at, 0x4003 ## $at = 40030000 -/* 01924 80833B34 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01928 80833B38 01C17824 */ and $t7, $t6, $at -/* 0192C 80833B3C 11E00003 */ beq $t7, $zero, .L80833B4C -/* 01930 80833B40 00000000 */ nop -/* 01934 80833B44 03E00008 */ jr $ra -/* 01938 80833B48 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80833B4C: -/* 0193C 80833B4C 03E00008 */ jr $ra -/* 01940 80833B50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B54.s deleted file mode 100644 index ad92b1d039..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B54.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80833B54 -/* 01944 80833B54 8C820664 */ lw $v0, 0x0664($a0) ## 00000664 -/* 01948 80833B58 5040000C */ beql $v0, $zero, .L80833B8C -/* 0194C 80833B5C 8C82067C */ lw $v0, 0x067C($a0) ## 0000067C -/* 01950 80833B60 8C4E0004 */ lw $t6, 0x0004($v0) ## 00000004 -/* 01954 80833B64 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01958 80833B68 31CF0005 */ andi $t7, $t6, 0x0005 ## $t7 = 00000000 -/* 0195C 80833B6C 55E10007 */ bnel $t7, $at, .L80833B8C -/* 01960 80833B70 8C82067C */ lw $v0, 0x067C($a0) ## 0000067C -/* 01964 80833B74 8C98067C */ lw $t8, 0x067C($a0) ## 0000067C -/* 01968 80833B78 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0196C 80833B7C 37190010 */ ori $t9, $t8, 0x0010 ## $t9 = 00000010 -/* 01970 80833B80 03E00008 */ jr $ra -/* 01974 80833B84 AC99067C */ sw $t9, 0x067C($a0) ## 0000067C -.L80833B88: -/* 01978 80833B88 8C82067C */ lw $v0, 0x067C($a0) ## 0000067C -.L80833B8C: -/* 0197C 80833B8C 30480010 */ andi $t0, $v0, 0x0010 ## $t0 = 00000000 -/* 01980 80833B90 5100000C */ beql $t0, $zero, .L80833BC4 -/* 01984 80833B94 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01988 80833B98 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0198C 80833B9C C4860838 */ lwc1 $f6, 0x0838($a0) ## 00000838 -/* 01990 80833BA0 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 01994 80833BA4 00414824 */ and $t1, $v0, $at -/* 01998 80833BA8 46062032 */ c.eq.s $f4, $f6 -/* 0199C 80833BAC AC89067C */ sw $t1, 0x067C($a0) ## 0000067C -/* 019A0 80833BB0 45020004 */ bc1fl .L80833BC4 -/* 019A4 80833BB4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 019A8 80833BB8 848A00B6 */ lh $t2, 0x00B6($a0) ## 000000B6 -/* 019AC 80833BBC A48A083C */ sh $t2, 0x083C($a0) ## 0000083C -/* 019B0 80833BC0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80833BC4: -/* 019B4 80833BC4 03E00008 */ jr $ra -/* 019B8 80833BC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833BCC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833BCC.s deleted file mode 100644 index 5c7d520153..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833BCC.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80833BCC -/* 019BC 80833BCC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 019C0 80833BD0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 019C4 80833BD4 0C023A71 */ jal func_8008E9C4 -/* 019C8 80833BD8 AFA40018 */ sw $a0, 0x0018($sp) -/* 019CC 80833BDC 0002102B */ sltu $v0, $zero, $v0 -/* 019D0 80833BE0 54400005 */ bnel $v0, $zero, .L80833BF8 -/* 019D4 80833BE4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 019D8 80833BE8 0C20CECB */ jal func_80833B2C -/* 019DC 80833BEC 8FA40018 */ lw $a0, 0x0018($sp) -/* 019E0 80833BF0 0002102B */ sltu $v0, $zero, $v0 -/* 019E4 80833BF4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80833BF8: -/* 019E8 80833BF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 019EC 80833BFC 03E00008 */ jr $ra -/* 019F0 80833C00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C04.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C04.s deleted file mode 100644 index 365f261201..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C04.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80833C04 -/* 019F4 80833C04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 019F8 80833C08 AFBF0014 */ sw $ra, 0x0014($sp) -/* 019FC 80833C0C 0C20CED5 */ jal func_80833B54 -/* 01A00 80833C10 AFA40018 */ sw $a0, 0x0018($sp) -/* 01A04 80833C14 0002102B */ sltu $v0, $zero, $v0 -/* 01A08 80833C18 54400005 */ bnel $v0, $zero, .L80833C30 -/* 01A0C 80833C1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01A10 80833C20 0C20CECB */ jal func_80833B2C -/* 01A14 80833C24 8FA40018 */ lw $a0, 0x0018($sp) -/* 01A18 80833C28 0002102B */ sltu $v0, $zero, $v0 -/* 01A1C 80833C2C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80833C30: -/* 01A20 80833C30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01A24 80833C34 03E00008 */ jr $ra -/* 01A28 80833C38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C3C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C3C.s deleted file mode 100644 index 7befb6cca3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C3C.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80833C3C -/* 01A2C 80833C3C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01A30 80833C40 00000000 */ nop -/* 01A34 80833C44 E4800874 */ swc1 $f0, 0x0874($a0) ## 00000874 -/* 01A38 80833C48 03E00008 */ jr $ra -/* 01A3C 80833C4C E4800870 */ swc1 $f0, 0x0870($a0) ## 00000870 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C50.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C50.s deleted file mode 100644 index 70a9b23d60..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C50.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80833C50 -/* 01A40 80833C50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01A44 80833C54 28A100FE */ slti $at, $a1, 0x00FE -/* 01A48 80833C58 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01A4C 80833C5C 10200009 */ beq $at, $zero, .L80833C84 -/* 01A50 80833C60 AFA40018 */ sw $a0, 0x0018($sp) -/* 01A54 80833C64 0C20CDC9 */ jal func_80833724 -/* 01A58 80833C68 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01A5C 80833C6C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 01A60 80833C70 81CF0154 */ lb $t7, 0x0154($t6) ## 00000154 -/* 01A64 80833C74 544F0004 */ bnel $v0, $t7, .L80833C88 -/* 01A68 80833C78 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01A6C 80833C7C 10000002 */ beq $zero, $zero, .L80833C88 -/* 01A70 80833C80 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80833C84: -/* 01A74 80833C84 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80833C88: -/* 01A78 80833C88 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01A7C 80833C8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01A80 80833C90 03E00008 */ jr $ra -/* 01A84 80833C94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C98.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C98.s deleted file mode 100644 index a10f107618..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C98.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80833C98 -/* 01A88 80833C98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01A8C 80833C9C 288100FE */ slti $at, $a0, 0x00FE -/* 01A90 80833CA0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01A94 80833CA4 10200008 */ beq $at, $zero, .L80833CC8 -/* 01A98 80833CA8 AFA5001C */ sw $a1, 0x001C($sp) -/* 01A9C 80833CAC 0C20CDC9 */ jal func_80833724 -/* 01AA0 80833CB0 00000000 */ nop -/* 01AA4 80833CB4 8FAE001C */ lw $t6, 0x001C($sp) -/* 01AA8 80833CB8 544E0004 */ bnel $v0, $t6, .L80833CCC -/* 01AAC 80833CBC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01AB0 80833CC0 10000002 */ beq $zero, $zero, .L80833CCC -/* 01AB4 80833CC4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80833CC8: -/* 01AB8 80833CC8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80833CCC: -/* 01ABC 80833CCC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01AC0 80833CD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01AC4 80833CD4 03E00008 */ jr $ra -/* 01AC8 80833CD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833CDC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833CDC.s deleted file mode 100644 index 2dbfa727e5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833CDC.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel func_80833CDC -/* 01ACC 80833CDC 28A10004 */ slti $at, $a1, 0x0004 -/* 01AD0 80833CE0 14200003 */ bne $at, $zero, .L80833CF0 -/* 01AD4 80833CE4 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 01AD8 80833CE8 03E00008 */ jr $ra -/* 01ADC 80833CEC 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -.L80833CF0: -/* 01AE0 80833CF0 00441021 */ addu $v0, $v0, $a0 -/* 01AE4 80833CF4 80421E5D */ lb $v0, 0x1E5D($v0) ## 00001F5C -/* 01AE8 80833CF8 10400007 */ beq $v0, $zero, .L80833D18 -/* 01AEC 80833CFC 00000000 */ nop -/* 01AF0 80833D00 18400003 */ blez $v0, .L80833D10 -/* 01AF4 80833D04 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 01AF8 80833D08 03E00008 */ jr $ra -/* 01AFC 80833D0C 24020009 */ addiu $v0, $zero, 0x0009 ## $v0 = 00000009 -.L80833D10: -/* 01B00 80833D10 03E00008 */ jr $ra -/* 01B04 80833D14 00601025 */ or $v0, $v1, $zero ## $v0 = 000000FF -.L80833D18: -/* 01B08 80833D18 14A00012 */ bne $a1, $zero, .L80833D64 -/* 01B0C 80833D1C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01B10 80833D20 3C048016 */ lui $a0, %hi(gSaveContext) -/* 01B14 80833D24 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 01B18 80833D28 908E13E2 */ lbu $t6, 0x13E2($a0) ## 8015FA42 -/* 01B1C 80833D2C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01B20 80833D30 55C10004 */ bnel $t6, $at, .L80833D44 -/* 01B24 80833D34 90820068 */ lbu $v0, 0x0068($a0) ## 8015E6C8 -/* 01B28 80833D38 03E00008 */ jr $ra -/* 01B2C 80833D3C 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -.L80833D40: -/* 01B30 80833D40 90820068 */ lbu $v0, 0x0068($a0) ## 8015E6C8 -.L80833D44: -/* 01B34 80833D44 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 01B38 80833D48 14410003 */ bne $v0, $at, .L80833D58 -/* 01B3C 80833D4C 00402025 */ or $a0, $v0, $zero ## $a0 = 000000FF -/* 01B40 80833D50 10000001 */ beq $zero, $zero, .L80833D58 -/* 01B44 80833D54 2404003D */ addiu $a0, $zero, 0x003D ## $a0 = 0000003D -.L80833D58: -/* 01B48 80833D58 00801825 */ or $v1, $a0, $zero ## $v1 = 0000003D -/* 01B4C 80833D5C 03E00008 */ jr $ra -/* 01B50 80833D60 00601025 */ or $v0, $v1, $zero ## $v0 = 0000003D -.L80833D64: -/* 01B54 80833D64 14A1000B */ bne $a1, $at, .L80833D94 -/* 01B58 80833D68 3C048016 */ lui $a0, %hi(gSaveContext) -/* 01B5C 80833D6C 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 01B60 80833D70 908F13E3 */ lbu $t7, 0x13E3($a0) ## 8015FA43 -/* 01B64 80833D74 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01B68 80833D78 51E10004 */ beql $t7, $at, .L80833D8C -/* 01B6C 80833D7C 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 01B70 80833D80 03E00008 */ jr $ra -/* 01B74 80833D84 90820069 */ lbu $v0, 0x0069($a0) ## 8015E6C9 -.L80833D88: -/* 01B78 80833D88 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -.L80833D8C: -/* 01B7C 80833D8C 03E00008 */ jr $ra -/* 01B80 80833D90 00601025 */ or $v0, $v1, $zero ## $v0 = 000000FF -.L80833D94: -/* 01B84 80833D94 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01B88 80833D98 14A1000C */ bne $a1, $at, .L80833DCC -/* 01B8C 80833D9C 3C048016 */ lui $a0, %hi(gSaveContext) -/* 01B90 80833DA0 3C048016 */ lui $a0, %hi(gSaveContext) -/* 01B94 80833DA4 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 01B98 80833DA8 909813E4 */ lbu $t8, 0x13E4($a0) ## 8015FA44 -/* 01B9C 80833DAC 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01BA0 80833DB0 53010004 */ beql $t8, $at, .L80833DC4 -/* 01BA4 80833DB4 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 01BA8 80833DB8 03E00008 */ jr $ra -/* 01BAC 80833DBC 9082006A */ lbu $v0, 0x006A($a0) ## 8015E6CA -.L80833DC0: -/* 01BB0 80833DC0 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -.L80833DC4: -/* 01BB4 80833DC4 03E00008 */ jr $ra -/* 01BB8 80833DC8 00601025 */ or $v0, $v1, $zero ## $v0 = 000000FF -.L80833DCC: -/* 01BBC 80833DCC 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 01BC0 80833DD0 909913E5 */ lbu $t9, 0x13E5($a0) ## 8015E0A5 -/* 01BC4 80833DD4 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01BC8 80833DD8 53210004 */ beql $t9, $at, .L80833DEC -/* 01BCC 80833DDC 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 01BD0 80833DE0 10000002 */ beq $zero, $zero, .L80833DEC -/* 01BD4 80833DE4 9083006B */ lbu $v1, 0x006B($a0) ## 8015CD2B -/* 01BD8 80833DE8 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -.L80833DEC: -/* 01BDC 80833DEC 00601025 */ or $v0, $v1, $zero ## $v0 = 000000FF -/* 01BE0 80833DF0 03E00008 */ jr $ra -/* 01BE4 80833DF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833DF8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833DF8.s deleted file mode 100644 index 63bc223840..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80833DF8.s +++ /dev/null @@ -1,205 +0,0 @@ -glabel func_80833DF8 -/* 01BE8 80833DF8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01BEC 80833DFC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01BF0 80833E00 AFA40028 */ sw $a0, 0x0028($sp) -/* 01BF4 80833E04 AFA5002C */ sw $a1, 0x002C($sp) -/* 01BF8 80833E08 9082015F */ lbu $v0, 0x015F($a0) ## 0000015F -/* 01BFC 80833E0C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 01C00 80833E10 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 01C04 80833E14 50400027 */ beql $v0, $zero, .L80833EB4 -/* 01C08 80833E18 8FA90028 */ lw $t1, 0x0028($sp) -/* 01C0C 80833E1C 906F13E3 */ lbu $t7, 0x13E3($v1) ## 8015FA43 -/* 01C10 80833E20 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01C14 80833E24 24450039 */ addiu $a1, $v0, 0x0039 ## $a1 = 00000039 -/* 01C18 80833E28 11E10003 */ beq $t7, $at, .L80833E38 -/* 01C1C 80833E2C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 01C20 80833E30 10000001 */ beq $zero, $zero, .L80833E38 -/* 01C24 80833E34 90660069 */ lbu $a2, 0x0069($v1) ## 8015E6C9 -.L80833E38: -/* 01C28 80833E38 00C02025 */ or $a0, $a2, $zero ## $a0 = 000000FF -/* 01C2C 80833E3C 0C20CF26 */ jal func_80833C98 -/* 01C30 80833E40 AFA50024 */ sw $a1, 0x0024($sp) -/* 01C34 80833E44 3C038016 */ lui $v1, %hi(gSaveContext) -/* 01C38 80833E48 14400019 */ bne $v0, $zero, .L80833EB0 -/* 01C3C 80833E4C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 01C40 80833E50 907813E4 */ lbu $t8, 0x13E4($v1) ## 8015FA44 -/* 01C44 80833E54 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01C48 80833E58 240400FF */ addiu $a0, $zero, 0x00FF ## $a0 = 000000FF -/* 01C4C 80833E5C 13010003 */ beq $t8, $at, .L80833E6C -/* 01C50 80833E60 00000000 */ nop -/* 01C54 80833E64 10000001 */ beq $zero, $zero, .L80833E6C -/* 01C58 80833E68 9064006A */ lbu $a0, 0x006A($v1) ## 8015E6CA -.L80833E6C: -/* 01C5C 80833E6C 0C20CF26 */ jal func_80833C98 -/* 01C60 80833E70 8FA50024 */ lw $a1, 0x0024($sp) -/* 01C64 80833E74 3C038016 */ lui $v1, %hi(gSaveContext) -/* 01C68 80833E78 1440000D */ bne $v0, $zero, .L80833EB0 -/* 01C6C 80833E7C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 01C70 80833E80 907913E5 */ lbu $t9, 0x13E5($v1) ## 8015FA45 -/* 01C74 80833E84 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01C78 80833E88 8FA50024 */ lw $a1, 0x0024($sp) -/* 01C7C 80833E8C 13210003 */ beq $t9, $at, .L80833E9C -/* 01C80 80833E90 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 01C84 80833E94 10000001 */ beq $zero, $zero, .L80833E9C -/* 01C88 80833E98 9066006B */ lbu $a2, 0x006B($v1) ## 8015E6CB -.L80833E9C: -/* 01C8C 80833E9C 0C20CF26 */ jal func_80833C98 -/* 01C90 80833EA0 00C02025 */ or $a0, $a2, $zero ## $a0 = 000000FF -/* 01C94 80833EA4 14400002 */ bne $v0, $zero, .L80833EB0 -/* 01C98 80833EA8 8FA80028 */ lw $t0, 0x0028($sp) -/* 01C9C 80833EAC A100015F */ sb $zero, 0x015F($t0) ## 0000015F -.L80833EB0: -/* 01CA0 80833EB0 8FA90028 */ lw $t1, 0x0028($sp) -.L80833EB4: -/* 01CA4 80833EB4 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 01CA8 80833EB8 34210800 */ ori $at, $at, 0x0800 ## $at = 20000800 -/* 01CAC 80833EBC 8D2A067C */ lw $t2, 0x067C($t1) ## 0000067C -/* 01CB0 80833EC0 01415824 */ and $t3, $t2, $at -/* 01CB4 80833EC4 55600082 */ bnel $t3, $zero, .L808340D0 -/* 01CB8 80833EC8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01CBC 80833ECC 0C023C4A */ jal func_8008F128 -/* 01CC0 80833ED0 01202025 */ or $a0, $t1, $zero ## $a0 = 00000000 -/* 01CC4 80833ED4 3C038016 */ lui $v1, %hi(gSaveContext) -/* 01CC8 80833ED8 1440007C */ bne $v0, $zero, .L808340CC -/* 01CCC 80833EDC 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 01CD0 80833EE0 8FAC0028 */ lw $t4, 0x0028($sp) -/* 01CD4 80833EE4 818D0154 */ lb $t5, 0x0154($t4) ## 00000154 -/* 01CD8 80833EE8 29A10002 */ slti $at, $t5, 0x0002 -/* 01CDC 80833EEC 1420003C */ bne $at, $zero, .L80833FE0 -/* 01CE0 80833EF0 00000000 */ nop -/* 01CE4 80833EF4 906E13E2 */ lbu $t6, 0x13E2($v1) ## 8015FA42 -/* 01CE8 80833EF8 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01CEC 80833EFC 55C10004 */ bnel $t6, $at, .L80833F10 -/* 01CF0 80833F00 90620068 */ lbu $v0, 0x0068($v1) ## 8015E6C8 -/* 01CF4 80833F04 10000008 */ beq $zero, $zero, .L80833F28 -/* 01CF8 80833F08 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 01CFC 80833F0C 90620068 */ lbu $v0, 0x0068($v1) ## 8015E6C8 -.L80833F10: -/* 01D00 80833F10 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 01D04 80833F14 14410003 */ bne $v0, $at, .L80833F24 -/* 01D08 80833F18 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 01D0C 80833F1C 10000001 */ beq $zero, $zero, .L80833F24 -/* 01D10 80833F20 2404003D */ addiu $a0, $zero, 0x003D ## $a0 = 0000003D -.L80833F24: -/* 01D14 80833F24 00803025 */ or $a2, $a0, $zero ## $a2 = 0000003D -.L80833F28: -/* 01D18 80833F28 8FA40028 */ lw $a0, 0x0028($sp) -/* 01D1C 80833F2C 0C20CF14 */ jal func_80833C50 -/* 01D20 80833F30 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000003D -/* 01D24 80833F34 3C038016 */ lui $v1, %hi(gSaveContext) -/* 01D28 80833F38 14400029 */ bne $v0, $zero, .L80833FE0 -/* 01D2C 80833F3C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 01D30 80833F40 906F13E3 */ lbu $t7, 0x13E3($v1) ## 8015FA43 -/* 01D34 80833F44 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01D38 80833F48 8FA40028 */ lw $a0, 0x0028($sp) -/* 01D3C 80833F4C 11E10003 */ beq $t7, $at, .L80833F5C -/* 01D40 80833F50 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 01D44 80833F54 10000001 */ beq $zero, $zero, .L80833F5C -/* 01D48 80833F58 90660069 */ lbu $a2, 0x0069($v1) ## 8015E6C9 -.L80833F5C: -/* 01D4C 80833F5C 0C20CF14 */ jal func_80833C50 -/* 01D50 80833F60 00C02825 */ or $a1, $a2, $zero ## $a1 = 000000FF -/* 01D54 80833F64 3C038016 */ lui $v1, %hi(gSaveContext) -/* 01D58 80833F68 1440001D */ bne $v0, $zero, .L80833FE0 -/* 01D5C 80833F6C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 01D60 80833F70 907813E4 */ lbu $t8, 0x13E4($v1) ## 8015FA44 -/* 01D64 80833F74 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01D68 80833F78 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 01D6C 80833F7C 13010003 */ beq $t8, $at, .L80833F8C -/* 01D70 80833F80 00000000 */ nop -/* 01D74 80833F84 10000001 */ beq $zero, $zero, .L80833F8C -/* 01D78 80833F88 9065006A */ lbu $a1, 0x006A($v1) ## 8015E6CA -.L80833F8C: -/* 01D7C 80833F8C 0C20CF14 */ jal func_80833C50 -/* 01D80 80833F90 8FA40028 */ lw $a0, 0x0028($sp) -/* 01D84 80833F94 3C038016 */ lui $v1, %hi(gSaveContext) -/* 01D88 80833F98 14400011 */ bne $v0, $zero, .L80833FE0 -/* 01D8C 80833F9C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 01D90 80833FA0 907913E5 */ lbu $t9, 0x13E5($v1) ## 8015FA45 -/* 01D94 80833FA4 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01D98 80833FA8 53210004 */ beql $t9, $at, .L80833FBC -/* 01D9C 80833FAC 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 01DA0 80833FB0 10000002 */ beq $zero, $zero, .L80833FBC -/* 01DA4 80833FB4 9065006B */ lbu $a1, 0x006B($v1) ## 8015E6CB -/* 01DA8 80833FB8 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -.L80833FBC: -/* 01DAC 80833FBC 0C20CF14 */ jal func_80833C50 -/* 01DB0 80833FC0 8FA40028 */ lw $a0, 0x0028($sp) -/* 01DB4 80833FC4 14400006 */ bne $v0, $zero, .L80833FE0 -/* 01DB8 80833FC8 8FA4002C */ lw $a0, 0x002C($sp) -/* 01DBC 80833FCC 8FA50028 */ lw $a1, 0x0028($sp) -/* 01DC0 80833FD0 0C20D7D1 */ jal func_80835F44 -/* 01DC4 80833FD4 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 01DC8 80833FD8 1000003D */ beq $zero, $zero, .L808340D0 -/* 01DCC 80833FDC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80833FE0: -/* 01DD0 80833FE0 3C088086 */ lui $t0, %hi(D_80858AB4) ## $t0 = 80860000 -/* 01DD4 80833FE4 8D088AB4 */ lw $t0, %lo(D_80858AB4)($t0) -/* 01DD8 80833FE8 3C028085 */ lui $v0, %hi(D_80854388) ## $v0 = 80850000 -/* 01DDC 80833FEC 24424388 */ addiu $v0, $v0, %lo(D_80854388) ## $v0 = 80854388 -/* 01DE0 80833FF0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01DE4 80833FF4 9503000C */ lhu $v1, 0x000C($t0) ## 8086000C -.L80833FF8: -/* 01DE8 80833FF8 944A0000 */ lhu $t2, 0x0000($v0) ## 80854388 -/* 01DEC 80833FFC 01405827 */ nor $t3, $t2, $zero -/* 01DF0 80834000 01634827 */ nor $t1, $t3, $v1 -/* 01DF4 80834004 51200006 */ beql $t1, $zero, .L80834020 -/* 01DF8 80834008 8FA4002C */ lw $a0, 0x002C($sp) -/* 01DFC 8083400C 24E70001 */ addiu $a3, $a3, 0x0001 ## $a3 = 00000001 -/* 01E00 80834010 28E10004 */ slti $at, $a3, 0x0004 -/* 01E04 80834014 1420FFF8 */ bne $at, $zero, .L80833FF8 -/* 01E08 80834018 24420002 */ addiu $v0, $v0, 0x0002 ## $v0 = 8085438A -/* 01E0C 8083401C 8FA4002C */ lw $a0, 0x002C($sp) -.L80834020: -/* 01E10 80834020 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000001 -/* 01E14 80834024 0C20CF37 */ jal func_80833CDC -/* 01E18 80834028 AFA7001C */ sw $a3, 0x001C($sp) -/* 01E1C 8083402C 284100FE */ slti $at, $v0, 0x00FE -/* 01E20 80834030 8FA7001C */ lw $a3, 0x001C($sp) -/* 01E24 80834034 14200020 */ bne $at, $zero, .L808340B8 -/* 01E28 80834038 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 01E2C 8083403C 3C0C8086 */ lui $t4, %hi(D_80858AB4) ## $t4 = 80860000 -/* 01E30 80834040 8D8C8AB4 */ lw $t4, %lo(D_80858AB4)($t4) -/* 01E34 80834044 3C028085 */ lui $v0, %hi(D_80854388) ## $v0 = 80850000 -/* 01E38 80834048 24424388 */ addiu $v0, $v0, %lo(D_80854388) ## $v0 = 80854388 -/* 01E3C 8083404C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01E40 80834050 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 01E44 80834054 95830000 */ lhu $v1, 0x0000($t4) ## 80860000 -.L80834058: -/* 01E48 80834058 944D0000 */ lhu $t5, 0x0000($v0) ## 80854388 -/* 01E4C 8083405C 01A07027 */ nor $t6, $t5, $zero -/* 01E50 80834060 01C37827 */ nor $t7, $t6, $v1 -/* 01E54 80834064 51E00005 */ beql $t7, $zero, .L8083407C -/* 01E58 80834068 8FA4002C */ lw $a0, 0x002C($sp) -/* 01E5C 8083406C 24E70001 */ addiu $a3, $a3, 0x0001 ## $a3 = 00000001 -/* 01E60 80834070 14E4FFF9 */ bne $a3, $a0, .L80834058 -/* 01E64 80834074 24420002 */ addiu $v0, $v0, 0x0002 ## $v0 = 8085438A -/* 01E68 80834078 8FA4002C */ lw $a0, 0x002C($sp) -.L8083407C: -/* 01E6C 8083407C 0C20CF37 */ jal func_80833CDC -/* 01E70 80834080 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000001 -/* 01E74 80834084 284100FE */ slti $at, $v0, 0x00FE -/* 01E78 80834088 50200011 */ beql $at, $zero, .L808340D0 -/* 01E7C 8083408C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01E80 80834090 0C20CDC9 */ jal func_80833724 -/* 01E84 80834094 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 01E88 80834098 8FB80028 */ lw $t8, 0x0028($sp) -/* 01E8C 8083409C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01E90 808340A0 3C018085 */ lui $at, %hi(D_80853618) ## $at = 80850000 -/* 01E94 808340A4 83190151 */ lb $t9, 0x0151($t8) ## 00000151 -/* 01E98 808340A8 54590009 */ bnel $v0, $t9, .L808340D0 -/* 01E9C 808340AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01EA0 808340B0 10000006 */ beq $zero, $zero, .L808340CC -/* 01EA4 808340B4 AC283618 */ sw $t0, %lo(D_80853618)($at) -.L808340B8: -/* 01EA8 808340B8 8FAA0028 */ lw $t2, 0x0028($sp) -/* 01EAC 808340BC A1470150 */ sb $a3, 0x0150($t2) ## 00000150 -/* 01EB0 808340C0 8FA50028 */ lw $a1, 0x0028($sp) -/* 01EB4 808340C4 0C20D7D1 */ jal func_80835F44 -/* 01EB8 808340C8 8FA4002C */ lw $a0, 0x002C($sp) -.L808340CC: -/* 01EBC 808340CC 8FBF0014 */ lw $ra, 0x0014($sp) -.L808340D0: -/* 01EC0 808340D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01EC4 808340D4 03E00008 */ jr $ra -/* 01EC8 808340D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s index 8e72bf40ab..ee865806d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s @@ -12,7 +12,7 @@ glabel func_808340DC /* 01ED4 808340E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01ED8 808340E8 AFBF002C */ sw $ra, 0x002C($sp) /* 01EDC 808340EC AFA50054 */ sw $a1, 0x0054($sp) -/* 01EE0 808340F0 0C20CDC9 */ jal func_80833724 +/* 01EE0 808340F0 0C20CDC9 */ jal Player_ItemToActionParam /* 01EE4 808340F4 90840152 */ lbu $a0, 0x0152($a0) ## 00000152 /* 01EE8 808340F8 3C058083 */ lui $a1, %hi(func_80834A2C) ## $a1 = 80830000 /* 01EEC 808340FC 24A54A2C */ addiu $a1, $a1, %lo(func_80834A2C) ## $a1 = 80834A2C @@ -23,8 +23,8 @@ glabel func_808340DC /* 01F00 80834110 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 01F04 80834114 92190158 */ lbu $t9, 0x0158($s0) ## 00000158 /* 01F08 80834118 01C50019 */ multu $t6, $a1 -/* 01F0C 8083411C 3C048012 */ lui $a0, %hi(D_80125C98) -/* 01F10 80834120 24845C98 */ addiu $a0, %lo(D_80125C98) +/* 01F0C 8083411C 3C048012 */ lui $a0, %hi(gPlayerModelTypes) +/* 01F10 80834120 24845C98 */ addiu $a0, %lo(gPlayerModelTypes) /* 01F14 80834124 83A70037 */ lb $a3, 0x0037($sp) /* 01F18 80834128 3C038085 */ lui $v1, %hi(D_80854164) ## $v1 = 80850000 /* 01F1C 8083412C 2406001E */ addiu $a2, $zero, 0x001E ## $a2 = 0000001E diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834298.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834298.s deleted file mode 100644 index 67ea2072df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834298.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_80834298 -/* 02088 80834298 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0208C 8083429C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02090 808342A0 908E0002 */ lbu $t6, 0x0002($a0) ## 00000002 -/* 02094 808342A4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02098 808342A8 55C1002C */ bnel $t6, $at, .L8083435C -/* 0209C 808342AC 8C98067C */ lw $t8, 0x067C($a0) ## 0000067C -/* 020A0 808342B0 8C82067C */ lw $v0, 0x067C($a0) ## 0000067C -/* 020A4 808342B4 304F0100 */ andi $t7, $v0, 0x0100 ## $t7 = 00000000 -/* 020A8 808342B8 55E00028 */ bnel $t7, $zero, .L8083435C -/* 020AC 808342BC 8C98067C */ lw $t8, 0x067C($a0) ## 0000067C -/* 020B0 808342C0 80980154 */ lb $t8, 0x0154($a0) ## 00000154 -/* 020B4 808342C4 80990151 */ lb $t9, 0x0151($a0) ## 00000151 -/* 020B8 808342C8 3C038016 */ lui $v1, %hi(gSaveContext) -/* 020BC 808342CC 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 020C0 808342D0 13190003 */ beq $t8, $t9, .L808342E0 -/* 020C4 808342D4 00024240 */ sll $t0, $v0, 9 -/* 020C8 808342D8 05030020 */ bgezl $t0, .L8083435C -/* 020CC 808342DC 8C98067C */ lw $t8, 0x067C($a0) ## 0000067C -.L808342E0: -/* 020D0 808342E0 84690030 */ lh $t1, 0x0030($v1) ## 8015E690 -/* 020D4 808342E4 5120001D */ beql $t1, $zero, .L8083435C -/* 020D8 808342E8 8C98067C */ lw $t8, 0x067C($a0) ## 0000067C -/* 020DC 808342EC 90AA1D6C */ lbu $t2, 0x1D6C($a1) ## 00001D6C -/* 020E0 808342F0 5540001A */ bnel $t2, $zero, .L8083435C -/* 020E4 808342F4 8C98067C */ lw $t8, 0x067C($a0) ## 0000067C -/* 020E8 808342F8 908B0444 */ lbu $t3, 0x0444($a0) ## 00000444 -/* 020EC 808342FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 020F0 80834300 00A11021 */ addu $v0, $a1, $at -/* 020F4 80834304 55600015 */ bnel $t3, $zero, .L8083435C -/* 020F8 80834308 8C98067C */ lw $t8, 0x067C($a0) ## 0000067C -/* 020FC 8083430C 804C1E5C */ lb $t4, 0x1E5C($v0) ## 00001E5C -/* 02100 80834310 55800012 */ bnel $t4, $zero, .L8083435C -/* 02104 80834314 8C98067C */ lw $t8, 0x067C($a0) ## 0000067C -/* 02108 80834318 84AD07A0 */ lh $t5, 0x07A0($a1) ## 000007A0 -/* 0210C 8083431C 55A0000F */ bnel $t5, $zero, .L8083435C -/* 02110 80834320 8C98067C */ lw $t8, 0x067C($a0) ## 0000067C -/* 02114 80834324 804E1E15 */ lb $t6, 0x1E15($v0) ## 00001E15 -/* 02118 80834328 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 0211C 8083432C 51C1000B */ beql $t6, $at, .L8083435C -/* 02120 80834330 8C98067C */ lw $t8, 0x067C($a0) ## 0000067C -/* 02124 80834334 846F13CE */ lh $t7, 0x13CE($v1) ## 8015FA2E -/* 02128 80834338 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0212C 8083433C 51E10007 */ beql $t7, $at, .L8083435C -/* 02130 80834340 8C98067C */ lw $t8, 0x067C($a0) ## 0000067C -/* 02134 80834344 AFA40018 */ sw $a0, 0x0018($sp) -/* 02138 80834348 0C20CF7E */ jal func_80833DF8 -/* 0213C 8083434C AFA5001C */ sw $a1, 0x001C($sp) -/* 02140 80834350 8FA40018 */ lw $a0, 0x0018($sp) -/* 02144 80834354 8FA5001C */ lw $a1, 0x001C($sp) -/* 02148 80834358 8C98067C */ lw $t8, 0x067C($a0) ## 0000067C -.L8083435C: -/* 0214C 8083435C 33190100 */ andi $t9, $t8, 0x0100 ## $t9 = 00000000 -/* 02150 80834360 53200004 */ beql $t9, $zero, .L80834374 -/* 02154 80834364 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02158 80834368 0C20D037 */ jal func_808340DC -/* 0215C 8083436C 00000000 */ nop -/* 02160 80834370 8FBF0014 */ lw $ra, 0x0014($sp) -.L80834374: -/* 02164 80834374 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02168 80834378 03E00008 */ jr $ra -/* 0216C 8083437C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834380.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834380.s deleted file mode 100644 index 8cd3f190e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834380.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80834380 -/* 02170 80834380 3C088016 */ lui $t0, %hi(gSaveContext) -/* 02174 80834384 2508E660 */ addiu $t0, %lo(gSaveContext) -/* 02178 80834388 8D0E0004 */ lw $t6, 0x0004($t0) ## 8015E664 -/* 0217C 8083438C 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 02180 80834390 240C0006 */ addiu $t4, $zero, 0x0006 ## $t4 = 00000006 -/* 02184 80834394 15C0000D */ bne $t6, $zero, .L808343CC -/* 02188 80834398 240D0009 */ addiu $t5, $zero, 0x0009 ## $t5 = 00000009 -/* 0218C 8083439C ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 02190 808343A0 8CB8067C */ lw $t8, 0x067C($a1) ## 0000067C -/* 02194 808343A4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 02198 808343A8 0018CA00 */ sll $t9, $t8, 8 -/* 0219C 808343AC 07230004 */ bgezl $t9, .L808343C0 -/* 021A0 808343B0 80AA0151 */ lb $t2, 0x0151($a1) ## 00000151 -/* 021A4 808343B4 10000007 */ beq $zero, $zero, .L808343D4 -/* 021A8 808343B8 ACE90000 */ sw $t1, 0x0000($a3) ## 00000000 -/* 021AC 808343BC 80AA0151 */ lb $t2, 0x0151($a1) ## 00000151 -.L808343C0: -/* 021B0 808343C0 254BFFFA */ addiu $t3, $t2, 0xFFFA ## $t3 = FFFFFFFA -/* 021B4 808343C4 10000003 */ beq $zero, $zero, .L808343D4 -/* 021B8 808343C8 ACEB0000 */ sw $t3, 0x0000($a3) ## 00000000 -.L808343CC: -/* 021BC 808343CC ACCC0000 */ sw $t4, 0x0000($a2) ## 00000000 -/* 021C0 808343D0 ACED0000 */ sw $t5, 0x0000($a3) ## 00000000 -.L808343D4: -/* 021C4 808343D4 950E1404 */ lhu $t6, 0x1404($t0) ## 8015FA64 -/* 021C8 808343D8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 021CC 808343DC 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 021D0 808343E0 15C10005 */ bne $t6, $at, .L808343F8 -/* 021D4 808343E4 00641821 */ addu $v1, $v1, $a0 -/* 021D8 808343E8 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 021DC 808343EC 00441021 */ addu $v0, $v0, $a0 -/* 021E0 808343F0 03E00008 */ jr $ra -/* 021E4 808343F4 9442072E */ lhu $v0, 0x072E($v0) ## 0001072E -.L808343F8: -/* 021E8 808343F8 80631E5C */ lb $v1, 0x1E5C($v1) ## 00011E5C -/* 021EC 808343FC 50600004 */ beql $v1, $zero, .L80834410 -/* 021F0 80834400 8CCF0000 */ lw $t7, 0x0000($a2) ## 00000000 -/* 021F4 80834404 03E00008 */ jr $ra -/* 021F8 80834408 00601025 */ or $v0, $v1, $zero ## $v0 = 00010000 -.L8083440C: -/* 021FC 8083440C 8CCF0000 */ lw $t7, 0x0000($a2) ## 00000000 -.L80834410: -/* 02200 80834410 3C188012 */ lui $t8, %hi(gItemSlots) -/* 02204 80834414 030FC021 */ addu $t8, $t8, $t7 -/* 02208 80834418 93187464 */ lbu $t8, %lo(gItemSlots)($t8) -/* 0220C 8083441C 0118C821 */ addu $t9, $t0, $t8 -/* 02210 80834420 8322008C */ lb $v0, 0x008C($t9) ## 0000008C -/* 02214 80834424 03E00008 */ jr $ra -/* 02218 80834428 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s deleted file mode 100644 index c76d943a65..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s +++ /dev/null @@ -1,98 +0,0 @@ -glabel func_8083442C -/* 0221C 8083442C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 02220 80834430 AFBF003C */ sw $ra, 0x003C($sp) -/* 02224 80834434 AFB00038 */ sw $s0, 0x0038($sp) -/* 02228 80834438 AFA5005C */ sw $a1, 0x005C($sp) -/* 0222C 8083443C 80820151 */ lb $v0, 0x0151($a0) ## 00000151 -/* 02230 80834440 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02234 80834444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02238 80834448 28410009 */ slti $at, $v0, 0x0009 -/* 0223C 8083444C 1420000B */ bne $at, $zero, .L8083447C -/* 02240 80834450 3C058083 */ lui $a1, %hi(func_808351D4) ## $a1 = 80830000 -/* 02244 80834454 2841000F */ slti $at, $v0, 0x000F -/* 02248 80834458 10200008 */ beq $at, $zero, .L8083447C -/* 0224C 8083445C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13f0) -/* 02250 80834460 85CEFA50 */ lh $t6, %lo(gSaveContext+0x13f0)($t6) -/* 02254 80834464 11C00005 */ beq $t6, $zero, .L8083447C -/* 02258 80834468 00000000 */ nop -/* 0225C 8083446C 0C01E221 */ jal func_80078884 -/* 02260 80834470 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 02264 80834474 10000042 */ beq $zero, $zero, .L80834580 -/* 02268 80834478 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083447C: -/* 0226C 8083447C 0C20CD8E */ jal func_80833638 -/* 02270 80834480 24A551D4 */ addiu $a1, $a1, %lo(func_808351D4) ## $a1 = 000051D4 -/* 02274 80834484 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 02278 80834488 86020860 */ lh $v0, 0x0860($s0) ## 00000860 -/* 0227C 8083448C 2419000E */ addiu $t9, $zero, 0x000E ## $t9 = 0000000E -/* 02280 80834490 35F80200 */ ori $t8, $t7, 0x0200 ## $t8 = 00000200 -/* 02284 80834494 AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 02288 80834498 04400037 */ bltz $v0, .L80834578 -/* 0228C 8083449C A6190834 */ sh $t9, 0x0834($s0) ## 00000834 -/* 02290 808344A0 04400003 */ bltz $v0, .L808344B0 -/* 02294 808344A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02298 808344A8 10000002 */ beq $zero, $zero, .L808344B4 -/* 0229C 808344AC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L808344B0: -/* 022A0 808344B0 00021823 */ subu $v1, $zero, $v0 -.L808344B4: -/* 022A4 808344B4 00034040 */ sll $t0, $v1, 1 -/* 022A8 808344B8 3C058085 */ lui $a1, %hi(D_80854396) ## $a1 = 80850000 -/* 022AC 808344BC 00A82821 */ addu $a1, $a1, $t0 -/* 022B0 808344C0 0C00BDF7 */ jal func_8002F7DC -/* 022B4 808344C4 94A54396 */ lhu $a1, %lo(D_80854396)($a1) -/* 022B8 808344C8 0C023C41 */ jal func_8008F104 -/* 022BC 808344CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022C0 808344D0 14400029 */ bne $v0, $zero, .L80834578 -/* 022C4 808344D4 8FA4005C */ lw $a0, 0x005C($sp) -/* 022C8 808344D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 022CC 808344DC 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFFC -/* 022D0 808344E0 0C20D0E0 */ jal func_80834380 -/* 022D4 808344E4 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFF8 -/* 022D8 808344E8 18400023 */ blez $v0, .L80834578 -/* 022DC 808344EC 00000000 */ nop -/* 022E0 808344F0 86090860 */ lh $t1, 0x0860($s0) ## 00000860 -/* 022E4 808344F4 8FA20050 */ lw $v0, 0x0050($sp) -/* 022E8 808344F8 0520001F */ bltz $t1, .L80834578 -/* 022EC 808344FC 2442FFFD */ addiu $v0, $v0, 0xFFFD ## $v0 = FFFFFFFD -/* 022F0 80834500 0440000B */ bltz $v0, .L80834530 -/* 022F4 80834504 28410003 */ slti $at, $v0, 0x0003 -/* 022F8 80834508 10200009 */ beq $at, $zero, .L80834530 -/* 022FC 8083450C 8FA4005C */ lw $a0, 0x005C($sp) -/* 02300 80834510 3C058085 */ lui $a1, %hi(D_808543A0) ## $a1 = 80850000 -/* 02304 80834514 00A22821 */ addu $a1, $a1, $v0 -/* 02308 80834518 90A543A0 */ lbu $a1, %lo(D_808543A0)($a1) -/* 0230C 8083451C 0C021DC2 */ jal func_80087708 -/* 02310 80834520 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02314 80834524 14400002 */ bne $v0, $zero, .L80834530 -/* 02318 80834528 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 0231C 8083452C AFAA0050 */ sw $t2, 0x0050($sp) -.L80834530: -/* 02320 80834530 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 02324 80834534 8FA6005C */ lw $a2, 0x005C($sp) -/* 02328 80834538 8FAD0050 */ lw $t5, 0x0050($sp) -/* 0232C 8083453C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02330 80834540 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 02334 80834544 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02338 80834548 24070016 */ addiu $a3, $zero, 0x0016 ## $a3 = 00000016 -/* 0233C 8083454C E7A60014 */ swc1 $f6, 0x0014($sp) -/* 02340 80834550 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 02344 80834554 AFA0001C */ sw $zero, 0x001C($sp) -/* 02348 80834558 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 0234C 8083455C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02350 80834560 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 02354 80834564 AFA00024 */ sw $zero, 0x0024($sp) -/* 02358 80834568 AFAD0028 */ sw $t5, 0x0028($sp) -/* 0235C 8083456C 0C00C916 */ jal Actor_SpawnAsChild - -/* 02360 80834570 AFAC0020 */ sw $t4, 0x0020($sp) -/* 02364 80834574 AE0203AC */ sw $v0, 0x03AC($s0) ## 000003AC -.L80834578: -/* 02368 80834578 10000001 */ beq $zero, $zero, .L80834580 -/* 0236C 8083457C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80834580: -/* 02370 80834580 8FBF003C */ lw $ra, 0x003C($sp) -/* 02374 80834584 8FB00038 */ lw $s0, 0x0038($sp) -/* 02378 80834588 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 0237C 8083458C 03E00008 */ jr $ra -/* 02380 80834590 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834594.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834594.s deleted file mode 100644 index e25ebd3eb2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834594.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80834594 -/* 02384 80834594 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02388 80834598 AFBF001C */ sw $ra, 0x001C($sp) -/* 0238C 8083459C AFB00018 */ sw $s0, 0x0018($sp) -/* 02390 808345A0 AFA40020 */ sw $a0, 0x0020($sp) -/* 02394 808345A4 80A60151 */ lb $a2, 0x0151($a1) ## 00000151 -/* 02398 808345A8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0239C 808345AC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 023A0 808345B0 50C0000D */ beql $a2, $zero, .L808345E8 -/* 023A4 808345B4 8FA40020 */ lw $a0, 0x0020($sp) -/* 023A8 808345B8 0C023CAF */ jal func_8008F2BC -/* 023AC 808345BC 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 023B0 808345C0 04400006 */ bltz $v0, .L808345DC -/* 023B4 808345C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023B8 808345C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023BC 808345CC 0C20CA3B */ jal func_808328EC -/* 023C0 808345D0 24051802 */ addiu $a1, $zero, 0x1802 ## $a1 = 00001802 -/* 023C4 808345D4 10000004 */ beq $zero, $zero, .L808345E8 -/* 023C8 808345D8 8FA40020 */ lw $a0, 0x0020($sp) -.L808345DC: -/* 023CC 808345DC 0C20CA3B */ jal func_808328EC -/* 023D0 808345E0 24050835 */ addiu $a1, $zero, 0x0835 ## $a1 = 00000835 -/* 023D4 808345E4 8FA40020 */ lw $a0, 0x0020($sp) -.L808345E8: -/* 023D8 808345E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 023DC 808345EC 0C20D7D1 */ jal func_80835F44 -/* 023E0 808345F0 92060152 */ lbu $a2, 0x0152($s0) ## 00000152 -/* 023E4 808345F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023E8 808345F8 0C023CAF */ jal func_8008F2BC -/* 023EC 808345FC 82050151 */ lb $a1, 0x0151($s0) ## 00000151 -/* 023F0 80834600 04400005 */ bltz $v0, .L80834618 -/* 023F4 80834604 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023F8 80834608 0C20CA3B */ jal func_808328EC -/* 023FC 8083460C 24051803 */ addiu $a1, $zero, 0x1803 ## $a1 = 00001803 -/* 02400 80834610 10000008 */ beq $zero, $zero, .L80834634 -/* 02404 80834614 8FBF001C */ lw $ra, 0x001C($sp) -.L80834618: -/* 02408 80834618 820E0151 */ lb $t6, 0x0151($s0) ## 00000151 -/* 0240C 8083461C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02410 80834620 51C00004 */ beql $t6, $zero, .L80834634 -/* 02414 80834624 8FBF001C */ lw $ra, 0x001C($sp) -/* 02418 80834628 0C20CA3B */ jal func_808328EC -/* 0241C 8083462C 24050835 */ addiu $a1, $zero, 0x0835 ## $a1 = 00000835 -/* 02420 80834630 8FBF001C */ lw $ra, 0x001C($sp) -.L80834634: -/* 02424 80834634 8FB00018 */ lw $s0, 0x0018($sp) -/* 02428 80834638 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0242C 8083463C 03E00008 */ jr $ra -/* 02430 80834640 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834644.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834644.s deleted file mode 100644 index c22e83b8a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834644.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80834644 -/* 02434 80834644 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02438 80834648 AFBF001C */ sw $ra, 0x001C($sp) -/* 0243C 8083464C AFB00018 */ sw $s0, 0x0018($sp) -/* 02440 80834650 AFA40020 */ sw $a0, 0x0020($sp) -/* 02444 80834654 8CAE082C */ lw $t6, 0x082C($a1) ## 0000082C -/* 02448 80834658 3C0F8083 */ lui $t7, %hi(func_80834A2C) ## $t7 = 80830000 -/* 0244C 8083465C 25EF4A2C */ addiu $t7, $t7, %lo(func_80834A2C) ## $t7 = 80834A2C -/* 02450 80834660 15CF0003 */ bne $t6, $t7, .L80834670 -/* 02454 80834664 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02458 80834668 0C20D165 */ jal func_80834594 -/* 0245C 8083466C 00000000 */ nop -.L80834670: -/* 02460 80834670 82180151 */ lb $t8, 0x0151($s0) ## 00000151 -/* 02464 80834674 3C058085 */ lui $a1, %hi(D_80853EDC) ## $a1 = 80850000 -/* 02468 80834678 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0246C 8083467C 0018C880 */ sll $t9, $t8, 2 -/* 02470 80834680 00B92821 */ addu $a1, $a1, $t9 -/* 02474 80834684 0C20CD8E */ jal func_80833638 -/* 02478 80834688 8CA53EDC */ lw $a1, %lo(D_80853EDC)($a1) -/* 0247C 8083468C A6000834 */ sh $zero, 0x0834($s0) ## 00000834 -/* 02480 80834690 A20006AC */ sb $zero, 0x06AC($s0) ## 000006AC -/* 02484 80834694 8FA40020 */ lw $a0, 0x0020($sp) -/* 02488 80834698 0C20C8ED */ jal func_808323B4 -/* 0248C 8083469C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02490 808346A0 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 02494 808346A4 2401FEFF */ addiu $at, $zero, 0xFEFF ## $at = FFFFFEFF -/* 02498 808346A8 01014824 */ and $t1, $t0, $at -/* 0249C 808346AC AE09067C */ sw $t1, 0x067C($s0) ## 0000067C -/* 024A0 808346B0 8FBF001C */ lw $ra, 0x001C($sp) -/* 024A4 808346B4 8FB00018 */ lw $s0, 0x0018($sp) -/* 024A8 808346B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 024AC 808346BC 03E00008 */ jr $ra -/* 024B0 808346C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808346C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808346C4.s deleted file mode 100644 index 4e91445643..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808346C4.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_808346C4 -/* 024B4 808346C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 024B8 808346C8 AFA40018 */ sw $a0, 0x0018($sp) -/* 024BC 808346CC 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 024C0 808346D0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 024C4 808346D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 024C8 808346D8 3C058083 */ lui $a1, %hi(func_80834B5C) ## $a1 = 80830000 -/* 024CC 808346DC 24A54B5C */ addiu $a1, $a1, %lo(func_80834B5C) ## $a1 = 80834B5C -/* 024D0 808346E0 0C20CD8E */ jal func_80833638 -/* 024D4 808346E4 AFA6001C */ sw $a2, 0x001C($sp) -/* 024D8 808346E8 8FA5001C */ lw $a1, 0x001C($sp) -/* 024DC 808346EC 0C20C8ED */ jal func_808323B4 -/* 024E0 808346F0 8FA40018 */ lw $a0, 0x0018($sp) -/* 024E4 808346F4 8FA6001C */ lw $a2, 0x001C($sp) -/* 024E8 808346F8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 024EC 808346FC 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 024F0 80834700 C4C40870 */ lwc1 $f4, 0x0870($a2) ## 00000870 -/* 024F4 80834704 4606203C */ c.lt.s $f4, $f6 -/* 024F8 80834708 00000000 */ nop -/* 024FC 8083470C 45000008 */ bc1f .L80834730 -/* 02500 80834710 00000000 */ nop -/* 02504 80834714 0C023C68 */ jal func_8008F1A0 -/* 02508 80834718 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0250C 8083471C 00027080 */ sll $t6, $v0, 2 -/* 02510 80834720 3C028085 */ lui $v0, %hi(D_808543A4) ## $v0 = 80850000 -/* 02514 80834724 004E1021 */ addu $v0, $v0, $t6 -/* 02518 80834728 10000007 */ beq $zero, $zero, .L80834748 -/* 0251C 8083472C 8C4243A4 */ lw $v0, %lo(D_808543A4)($v0) -.L80834730: -/* 02520 80834730 0C023C68 */ jal func_8008F1A0 -/* 02524 80834734 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02528 80834738 00027880 */ sll $t7, $v0, 2 -/* 0252C 8083473C 3C028085 */ lui $v0, %hi(D_808543AC) ## $v0 = 80850000 -/* 02530 80834740 004F1021 */ addu $v0, $v0, $t7 -/* 02534 80834744 8C4243AC */ lw $v0, %lo(D_808543AC)($v0) -.L80834748: -/* 02538 80834748 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0253C 8083474C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02540 80834750 03E00008 */ jr $ra -/* 02544 80834754 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s deleted file mode 100644 index 0ae12d2cda..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_80834758 -/* 02548 80834758 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0254C 8083475C AFBF002C */ sw $ra, 0x002C($sp) -/* 02550 80834760 AFB00028 */ sw $s0, 0x0028($sp) -/* 02554 80834764 AFA40038 */ sw $a0, 0x0038($sp) -/* 02558 80834768 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C -/* 0255C 8083476C 3C0120C0 */ lui $at, 0x20C0 ## $at = 20C00000 -/* 02560 80834770 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02564 80834774 01C17824 */ and $t7, $t6, $at -/* 02568 80834778 15E00032 */ bne $t7, $zero, .L80834844 -/* 0256C 8083477C 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 02570 80834780 0324C821 */ addu $t9, $t9, $a0 -/* 02574 80834784 83391E5C */ lb $t9, 0x1E5C($t9) ## 00011E5C -/* 02578 80834788 5720002F */ bnel $t9, $zero, .L80834848 -/* 0257C 8083478C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02580 80834790 80A80154 */ lb $t0, 0x0154($a1) ## 00000154 -/* 02584 80834794 80A90151 */ lb $t1, 0x0151($a1) ## 00000151 -/* 02588 80834798 5509002B */ bnel $t0, $t1, .L80834848 -/* 0258C 8083479C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02590 808347A0 80AA014E */ lb $t2, 0x014E($a1) ## 0000014E -/* 02594 808347A4 51400028 */ beql $t2, $zero, .L80834848 -/* 02598 808347A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0259C 808347AC 0C023A74 */ jal func_8008E9D0 -/* 025A0 808347B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 025A4 808347B4 54400024 */ bnel $v0, $zero, .L80834848 -/* 025A8 808347B8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 025AC 808347BC 0C20CEF3 */ jal func_80833BCC -/* 025B0 808347C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025B4 808347C4 1040001F */ beq $v0, $zero, .L80834844 -/* 025B8 808347C8 3C0B8086 */ lui $t3, %hi(D_80858AB4) ## $t3 = 80860000 -/* 025BC 808347CC 8D6B8AB4 */ lw $t3, %lo(D_80858AB4)($t3) -/* 025C0 808347D0 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 025C4 808347D4 8FA40038 */ lw $a0, 0x0038($sp) -/* 025C8 808347D8 956C0000 */ lhu $t4, 0x0000($t3) ## 80860000 -/* 025CC 808347DC 01816827 */ nor $t5, $t4, $at -/* 025D0 808347E0 55A00019 */ bnel $t5, $zero, .L80834848 -/* 025D4 808347E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 025D8 808347E8 0C20D1B1 */ jal func_808346C4 -/* 025DC 808347EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 025E0 808347F0 AFA20034 */ sw $v0, 0x0034($sp) -/* 025E4 808347F4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 025E8 808347F8 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 025EC 808347FC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 025F0 80834800 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 025F4 80834804 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 025F8 80834808 46802020 */ cvt.s.w $f0, $f4 -/* 025FC 8083480C AFAE0018 */ sw $t6, 0x0018($sp) -/* 02600 80834810 8FA40038 */ lw $a0, 0x0038($sp) -/* 02604 80834814 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 02608 80834818 8FA60034 */ lw $a2, 0x0034($sp) -/* 0260C 8083481C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 02610 80834820 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02614 80834824 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 02618 80834828 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 0261C 8083482C E7A6001C */ swc1 $f6, 0x001C($sp) -/* 02620 80834830 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02624 80834834 0C00BDF7 */ jal func_8002F7DC -/* 02628 80834838 2405181F */ addiu $a1, $zero, 0x181F ## $a1 = 0000181F -/* 0262C 8083483C 10000002 */ beq $zero, $zero, .L80834848 -/* 02630 80834840 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80834844: -/* 02634 80834844 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80834848: -/* 02638 80834848 8FBF002C */ lw $ra, 0x002C($sp) -/* 0263C 8083484C 8FB00028 */ lw $s0, 0x0028($sp) -/* 02640 80834850 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02644 80834854 03E00008 */ jr $ra -/* 02648 80834858 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083485C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083485C.s deleted file mode 100644 index 6d3020fbd7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083485C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8083485C -/* 0264C 8083485C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02650 80834860 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 02654 80834864 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 02658 80834868 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0265C 8083486C AFA40018 */ sw $a0, 0x0018($sp) -/* 02660 80834870 0C20D1D6 */ jal func_80834758 -/* 02664 80834874 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02668 80834878 10400003 */ beq $v0, $zero, .L80834888 -/* 0266C 8083487C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02670 80834880 10000002 */ beq $zero, $zero, .L8083488C -/* 02674 80834884 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80834888: -/* 02678 80834888 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083488C: -/* 0267C 8083488C 03E00008 */ jr $ra -/* 02680 80834890 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s deleted file mode 100644 index cc1f68b97b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80834894 -/* 02684 80834894 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02688 80834898 AFBF001C */ sw $ra, 0x001C($sp) -/* 0268C 8083489C AFB00018 */ sw $s0, 0x0018($sp) -/* 02690 808348A0 3C058083 */ lui $a1, %hi(func_80834C74) ## $a1 = 80830000 -/* 02694 808348A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02698 808348A8 0C20CD8E */ jal func_80833638 -/* 0269C 808348AC 24A54C74 */ addiu $a1, $a1, %lo(func_80834C74) ## $a1 = 80834C74 -/* 026A0 808348B0 820E0154 */ lb $t6, 0x0154($s0) ## 00000154 -/* 026A4 808348B4 05C10003 */ bgez $t6, .L808348C4 -/* 026A8 808348B8 00000000 */ nop -/* 026AC 808348BC 0C023B1C */ jal func_8008EC70 -/* 026B0 808348C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808348C4: -/* 026B4 808348C4 0C029502 */ jal SkelAnime_AnimReverse -/* 026B8 808348C8 260406C8 */ addiu $a0, $s0, 0x06C8 ## $a0 = 000006C8 -/* 026BC 808348CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026C0 808348D0 0C00BDF7 */ jal func_8002F7DC -/* 026C4 808348D4 24051826 */ addiu $a1, $zero, 0x1826 ## $a1 = 00001826 -/* 026C8 808348D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 026CC 808348DC 8FB00018 */ lw $s0, 0x0018($sp) -/* 026D0 808348E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 026D4 808348E4 03E00008 */ jr $ra -/* 026D8 808348E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808348EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808348EC.s deleted file mode 100644 index 09ce7031a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808348EC.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_808348EC -/* 026DC 808348EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 026E0 808348F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 026E4 808348F4 AFA40018 */ sw $a0, 0x0018($sp) -/* 026E8 808348F8 80AE015A */ lb $t6, 0x015A($a1) ## 0000015A -/* 026EC 808348FC 3C188085 */ lui $t8, %hi(D_808540F4) ## $t8 = 80850000 -/* 026F0 80834900 271840F4 */ addiu $t8, $t8, %lo(D_808540F4) ## $t8 = 808540F4 -/* 026F4 80834904 000E78C0 */ sll $t7, $t6, 3 -/* 026F8 80834908 01F81021 */ addu $v0, $t7, $t8 -/* 026FC 8083490C 90590004 */ lbu $t9, 0x0004($v0) ## 00000004 -/* 02700 80834910 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 02704 80834914 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 02708 80834918 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 0270C 8083491C 24C406C8 */ addiu $a0, $a2, 0x06C8 ## $a0 = 000006C8 -/* 02710 80834920 07210005 */ bgez $t9, .L80834938 -/* 02714 80834924 46802020 */ cvt.s.w $f0, $f4 -/* 02718 80834928 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 0271C 8083492C 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 02720 80834930 00000000 */ nop -/* 02724 80834934 46060000 */ add.s $f0, $f0, $f6 -.L80834938: -/* 02728 80834938 C4C806E4 */ lwc1 $f8, 0x06E4($a2) ## 000006E4 -/* 0272C 8083493C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02730 80834940 460A403C */ c.lt.s $f8, $f10 -/* 02734 80834944 00000000 */ nop -/* 02738 80834948 45020005 */ bc1fl .L80834960 -/* 0273C 8083494C 44050000 */ mfc1 $a1, $f0 -/* 02740 80834950 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 02744 80834954 00000000 */ nop -/* 02748 80834958 46100001 */ sub.s $f0, $f0, $f16 -/* 0274C 8083495C 44050000 */ mfc1 $a1, $f0 -.L80834960: -/* 02750 80834960 0C02914C */ jal func_800A4530 -/* 02754 80834964 AFA6001C */ sw $a2, 0x001C($sp) -/* 02758 80834968 10400006 */ beq $v0, $zero, .L80834984 -/* 0275C 8083496C 8FA6001C */ lw $a2, 0x001C($sp) -/* 02760 80834970 8FA40018 */ lw $a0, 0x0018($sp) -/* 02764 80834974 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 02768 80834978 0C20D165 */ jal func_80834594 -/* 0276C 8083497C AFA6001C */ sw $a2, 0x001C($sp) -/* 02770 80834980 8FA6001C */ lw $a2, 0x001C($sp) -.L80834984: -/* 02774 80834984 0C20CED5 */ jal func_80833B54 -/* 02778 80834988 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0277C 8083498C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02780 80834990 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02784 80834994 03E00008 */ jr $ra -/* 02788 80834998 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083499C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083499C.s deleted file mode 100644 index 8c8db1b2cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083499C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8083499C -/* 0278C 8083499C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02790 808349A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02794 808349A4 8C8E067C */ lw $t6, 0x067C($a0) ## 0000067C -/* 02798 808349A8 31CF0100 */ andi $t7, $t6, 0x0100 ## $t7 = 00000000 -/* 0279C 808349AC 11E00005 */ beq $t7, $zero, .L808349C4 -/* 027A0 808349B0 00000000 */ nop -/* 027A4 808349B4 0C20D037 */ jal func_808340DC -/* 027A8 808349B8 00000000 */ nop -/* 027AC 808349BC 10000003 */ beq $zero, $zero, .L808349CC -/* 027B0 808349C0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808349C4: -/* 027B4 808349C4 10000001 */ beq $zero, $zero, .L808349CC -/* 027B8 808349C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808349CC: -/* 027BC 808349CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 027C0 808349D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 027C4 808349D4 03E00008 */ jr $ra -/* 027C8 808349D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808349DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808349DC.s deleted file mode 100644 index 10a34a027a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808349DC.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_808349DC -/* 027CC 808349DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 027D0 808349E0 AFA40018 */ sw $a0, 0x0018($sp) -/* 027D4 808349E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 027D8 808349E8 AFA5001C */ sw $a1, 0x001C($sp) -/* 027DC 808349EC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 027E0 808349F0 0C20D1D6 */ jal func_80834758 -/* 027E4 808349F4 8FA50018 */ lw $a1, 0x0018($sp) -/* 027E8 808349F8 14400005 */ bne $v0, $zero, .L80834A10 -/* 027EC 808349FC 8FA40018 */ lw $a0, 0x0018($sp) -/* 027F0 80834A00 0C20D267 */ jal func_8083499C -/* 027F4 80834A04 8FA5001C */ lw $a1, 0x001C($sp) -/* 027F8 80834A08 50400004 */ beql $v0, $zero, .L80834A1C -/* 027FC 80834A0C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80834A10: -/* 02800 80834A10 10000002 */ beq $zero, $zero, .L80834A1C -/* 02804 80834A14 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02808 80834A18 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80834A1C: -/* 0280C 80834A1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02810 80834A20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02814 80834A24 03E00008 */ jr $ra -/* 02818 80834A28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834A2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834A2C.s deleted file mode 100644 index d2eb3d63bb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834A2C.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_80834A2C -/* 0281C 80834A2C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02820 80834A30 AFB00014 */ sw $s0, 0x0014($sp) -/* 02824 80834A34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02828 80834A38 AFB10018 */ sw $s1, 0x0018($sp) -/* 0282C 80834A3C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02830 80834A40 AFBF001C */ sw $ra, 0x001C($sp) -/* 02834 80834A44 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02838 80834A48 0C028EF0 */ jal func_800A3BC0 -/* 0283C 80834A4C 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 02840 80834A50 54400018 */ bnel $v0, $zero, .L80834AB4 -/* 02844 80834A54 82180151 */ lb $t8, 0x0151($s0) ## 00000151 -/* 02848 80834A58 0C20CDC9 */ jal func_80833724 -/* 0284C 80834A5C 92040152 */ lbu $a0, 0x0152($s0) ## 00000152 -/* 02850 80834A60 820E0151 */ lb $t6, 0x0151($s0) ## 00000151 -/* 02854 80834A64 3C038085 */ lui $v1, %hi(D_80853614) ## $v1 = 80850000 -/* 02858 80834A68 24633614 */ addiu $v1, $v1, %lo(D_80853614) ## $v1 = 80853614 -/* 0285C 80834A6C 144E0024 */ bne $v0, $t6, .L80834B00 -/* 02860 80834A70 00000000 */ nop -/* 02864 80834A74 8C620000 */ lw $v0, 0x0000($v1) ## 80853614 -/* 02868 80834A78 0002102B */ sltu $v0, $zero, $v0 -/* 0286C 80834A7C 1440000A */ bne $v0, $zero, .L80834AA8 -/* 02870 80834A80 00000000 */ nop -/* 02874 80834A84 9202015B */ lbu $v0, 0x015B($s0) ## 0000015B -/* 02878 80834A88 38420003 */ xori $v0, $v0, 0x0003 ## $v0 = 00000003 -/* 0287C 80834A8C 0002102B */ sltu $v0, $zero, $v0 -/* 02880 80834A90 10400005 */ beq $v0, $zero, .L80834AA8 -/* 02884 80834A94 00000000 */ nop -/* 02888 80834A98 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 0288C 80834A9C 00511021 */ addu $v0, $v0, $s1 -/* 02890 80834AA0 80421E5C */ lb $v0, 0x1E5C($v0) ## 00011E5C -/* 02894 80834AA4 2C420001 */ sltiu $v0, $v0, 0x0001 -.L80834AA8: -/* 02898 80834AA8 10400015 */ beq $v0, $zero, .L80834B00 -/* 0289C 80834AAC AC620000 */ sw $v0, 0x0000($v1) ## 80853614 -/* 028A0 80834AB0 82180151 */ lb $t8, 0x0151($s0) ## 00000151 -.L80834AB4: -/* 028A4 80834AB4 3C058085 */ lui $a1, %hi(D_80853EDC) ## $a1 = 80850000 -/* 028A8 80834AB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028AC 80834ABC 0018C880 */ sll $t9, $t8, 2 -/* 028B0 80834AC0 00B92821 */ addu $a1, $a1, $t9 -/* 028B4 80834AC4 0C20CD8E */ jal func_80833638 -/* 028B8 80834AC8 8CA53EDC */ lw $a1, %lo(D_80853EDC)($a1) -/* 028BC 80834ACC A6000834 */ sh $zero, 0x0834($s0) ## 00000834 -/* 028C0 80834AD0 A20006AC */ sb $zero, 0x06AC($s0) ## 000006AC -/* 028C4 80834AD4 3C088085 */ lui $t0, %hi(D_80853614) ## $t0 = 80850000 -/* 028C8 80834AD8 8D083614 */ lw $t0, %lo(D_80853614)($t0) -/* 028CC 80834ADC 3C018085 */ lui $at, %hi(D_80853618) ## $at = 80850000 -/* 028D0 80834AE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028D4 80834AE4 AC283618 */ sw $t0, %lo(D_80853618)($at) -/* 028D8 80834AE8 8E19082C */ lw $t9, 0x082C($s0) ## 0000082C -/* 028DC 80834AEC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 028E0 80834AF0 0320F809 */ jalr $ra, $t9 -/* 028E4 80834AF4 00000000 */ nop -/* 028E8 80834AF8 10000014 */ beq $zero, $zero, .L80834B4C -/* 028EC 80834AFC 8FBF001C */ lw $ra, 0x001C($sp) -.L80834B00: -/* 028F0 80834B00 0C20CCD4 */ jal func_80833350 -/* 028F4 80834B04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028F8 80834B08 1040000C */ beq $v0, $zero, .L80834B3C -/* 028FC 80834B0C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02900 80834B10 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02904 80834B14 0C20D23B */ jal func_808348EC -/* 02908 80834B18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0290C 80834B1C 0C20CCCE */ jal func_80833338 -/* 02910 80834B20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02914 80834B24 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02918 80834B28 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0291C 80834B2C 0C20C899 */ jal func_80832264 -/* 02920 80834B30 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 02924 80834B34 10000003 */ beq $zero, $zero, .L80834B44 -/* 02928 80834B38 A20006AC */ sb $zero, 0x06AC($s0) ## 000006AC -.L80834B3C: -/* 0292C 80834B3C 0C20D23B */ jal func_808348EC -/* 02930 80834B40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L80834B44: -/* 02934 80834B44 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02938 80834B48 8FBF001C */ lw $ra, 0x001C($sp) -.L80834B4C: -/* 0293C 80834B4C 8FB00014 */ lw $s0, 0x0014($sp) -/* 02940 80834B50 8FB10018 */ lw $s1, 0x0018($sp) -/* 02944 80834B54 03E00008 */ jr $ra -/* 02948 80834B58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834B5C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834B5C.s deleted file mode 100644 index f35a02e011..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834B5C.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80834B5C -/* 0294C 80834B5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02950 80834B60 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02954 80834B64 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02958 80834B68 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0295C 80834B6C 24C506C8 */ addiu $a1, $a2, 0x06C8 ## $a1 = 000006C8 -/* 02960 80834B70 0C028EF0 */ jal func_800A3BC0 -/* 02964 80834B74 AFA60018 */ sw $a2, 0x0018($sp) -/* 02968 80834B78 3C0E8086 */ lui $t6, %hi(D_80858AB4) ## $t6 = 80860000 -/* 0296C 80834B7C 8DCE8AB4 */ lw $t6, %lo(D_80858AB4)($t6) -/* 02970 80834B80 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 02974 80834B84 8FA60018 */ lw $a2, 0x0018($sp) -/* 02978 80834B88 95CF0000 */ lhu $t7, 0x0000($t6) ## 80860000 -/* 0297C 80834B8C 01E1C027 */ nor $t8, $t7, $at -/* 02980 80834B90 53000006 */ beql $t8, $zero, .L80834BAC -/* 02984 80834B94 8CD9067C */ lw $t9, 0x067C($a2) ## 0000067C -/* 02988 80834B98 0C20D225 */ jal func_80834894 -/* 0298C 80834B9C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02990 80834BA0 10000008 */ beq $zero, $zero, .L80834BC4 -/* 02994 80834BA4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02998 80834BA8 8CD9067C */ lw $t9, 0x067C($a2) ## 0000067C -.L80834BAC: -/* 0299C 80834BAC 3C010040 */ lui $at, 0x0040 ## $at = 00400000 -/* 029A0 80834BB0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 029A4 80834BB4 03214025 */ or $t0, $t9, $at ## $t0 = 00400000 -/* 029A8 80834BB8 0C023A90 */ jal func_8008EA40 -/* 029AC 80834BBC ACC8067C */ sw $t0, 0x067C($a2) ## 0000067C -/* 029B0 80834BC0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80834BC4: -/* 029B4 80834BC4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 029B8 80834BC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 029BC 80834BCC 03E00008 */ jr $ra -/* 029C0 80834BD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s deleted file mode 100644 index 1ba2d56b72..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80834BD4 -/* 029C4 80834BD4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 029C8 80834BD8 AFB00028 */ sw $s0, 0x0028($sp) -/* 029CC 80834BDC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 029D0 80834BE0 AFA50044 */ sw $a1, 0x0044($sp) -/* 029D4 80834BE4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 029D8 80834BE8 AFBF002C */ sw $ra, 0x002C($sp) -/* 029DC 80834BEC 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 029E0 80834BF0 0C028EF0 */ jal func_800A3BC0 -/* 029E4 80834BF4 AFA50034 */ sw $a1, 0x0034($sp) -/* 029E8 80834BF8 10400013 */ beq $v0, $zero, .L80834C48 -/* 029EC 80834BFC 8FA40044 */ lw $a0, 0x0044($sp) -/* 029F0 80834C00 0C20D1B1 */ jal func_808346C4 -/* 029F4 80834C04 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 029F8 80834C08 AFA2003C */ sw $v0, 0x003C($sp) -/* 029FC 80834C0C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 02A00 80834C10 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 02A04 80834C14 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 02A08 80834C18 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 02A0C 80834C1C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 02A10 80834C20 46802020 */ cvt.s.w $f0, $f4 -/* 02A14 80834C24 AFAE0018 */ sw $t6, 0x0018($sp) -/* 02A18 80834C28 8FA40044 */ lw $a0, 0x0044($sp) -/* 02A1C 80834C2C 8FA50034 */ lw $a1, 0x0034($sp) -/* 02A20 80834C30 8FA6003C */ lw $a2, 0x003C($sp) -/* 02A24 80834C34 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 02A28 80834C38 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02A2C 80834C3C E7A00014 */ swc1 $f0, 0x0014($sp) -/* 02A30 80834C40 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 02A34 80834C44 E7A6001C */ swc1 $f6, 0x001C($sp) -.L80834C48: -/* 02A38 80834C48 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 02A3C 80834C4C 3C010040 */ lui $at, 0x0040 ## $at = 00400000 -/* 02A40 80834C50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A44 80834C54 01E1C025 */ or $t8, $t7, $at ## $t8 = 00400000 -/* 02A48 80834C58 0C023A90 */ jal func_8008EA40 -/* 02A4C 80834C5C AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 02A50 80834C60 8FBF002C */ lw $ra, 0x002C($sp) -/* 02A54 80834C64 8FB00028 */ lw $s0, 0x0028($sp) -/* 02A58 80834C68 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02A5C 80834C6C 03E00008 */ jr $ra -/* 02A60 80834C70 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s deleted file mode 100644 index 0ac40cd6a6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80834C74 -/* 02A64 80834C74 3C0E8085 */ lui $t6, %hi(D_80853618) ## $t6 = 80850000 -/* 02A68 80834C78 8DCE3618 */ lw $t6, %lo(D_80853618)($t6) -/* 02A6C 80834C7C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02A70 80834C80 3C028085 */ lui $v0, %hi(D_80853614) ## $v0 = 80850000 -/* 02A74 80834C84 24423614 */ addiu $v0, $v0, %lo(D_80853614) ## $v0 = 80853614 -/* 02A78 80834C88 AFB00018 */ sw $s0, 0x0018($sp) -/* 02A7C 80834C8C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02A80 80834C90 AFBF001C */ sw $ra, 0x001C($sp) -/* 02A84 80834C94 AFA5002C */ sw $a1, 0x002C($sp) -/* 02A88 80834C98 15C00006 */ bne $t6, $zero, .L80834CB4 -/* 02A8C 80834C9C AC4E0000 */ sw $t6, 0x0000($v0) ## 80853614 -/* 02A90 80834CA0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02A94 80834CA4 0C028EF0 */ jal func_800A3BC0 -/* 02A98 80834CA8 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 02A9C 80834CAC 5040001A */ beql $v0, $zero, .L80834D18 -/* 02AA0 80834CB0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80834CB4: -/* 02AA4 80834CB4 82180151 */ lb $t8, 0x0151($s0) ## 00000151 -/* 02AA8 80834CB8 3C058085 */ lui $a1, %hi(D_80853EDC) ## $a1 = 80850000 -/* 02AAC 80834CBC 260806C8 */ addiu $t0, $s0, 0x06C8 ## $t0 = 000006C8 -/* 02AB0 80834CC0 0018C880 */ sll $t9, $t8, 2 -/* 02AB4 80834CC4 00B92821 */ addu $a1, $a1, $t9 -/* 02AB8 80834CC8 8CA53EDC */ lw $a1, %lo(D_80853EDC)($a1) -/* 02ABC 80834CCC AFA80024 */ sw $t0, 0x0024($sp) -/* 02AC0 80834CD0 0C20CD8E */ jal func_80833638 -/* 02AC4 80834CD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AC8 80834CD8 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B -/* 02ACC 80834CDC 3C068085 */ lui $a2, %hi(D_80853914) ## $a2 = 80850000 -/* 02AD0 80834CE0 8FA4002C */ lw $a0, 0x002C($sp) -/* 02AD4 80834CE4 00095080 */ sll $t2, $t1, 2 -/* 02AD8 80834CE8 00CA3021 */ addu $a2, $a2, $t2 -/* 02ADC 80834CEC 8CC63914 */ lw $a2, %lo(D_80853914)($a2) -/* 02AE0 80834CF0 0C029050 */ jal SkelAnime_ChangeLinkAnimDefaultRepeat -/* 02AE4 80834CF4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02AE8 80834CF8 8E19082C */ lw $t9, 0x082C($s0) ## 0000082C -/* 02AEC 80834CFC A20006AC */ sb $zero, 0x06AC($s0) ## 000006AC -/* 02AF0 80834D00 8FA5002C */ lw $a1, 0x002C($sp) -/* 02AF4 80834D04 0320F809 */ jalr $ra, $t9 -/* 02AF8 80834D08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AFC 80834D0C 10000002 */ beq $zero, $zero, .L80834D18 -/* 02B00 80834D10 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02B04 80834D14 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80834D18: -/* 02B08 80834D18 8FBF001C */ lw $ra, 0x001C($sp) -/* 02B0C 80834D1C 8FB00018 */ lw $s0, 0x0018($sp) -/* 02B10 80834D20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02B14 80834D24 03E00008 */ jr $ra -/* 02B18 80834D28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s deleted file mode 100644 index d47bf7adf0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s +++ /dev/null @@ -1,79 +0,0 @@ -glabel func_80834D2C -/* 02B1C 80834D2C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02B20 80834D30 AFBF001C */ sw $ra, 0x001C($sp) -/* 02B24 80834D34 AFB00018 */ sw $s0, 0x0018($sp) -/* 02B28 80834D38 AFA50024 */ sw $a1, 0x0024($sp) -/* 02B2C 80834D3C 808E0151 */ lb $t6, 0x0151($a0) ## 00000151 -/* 02B30 80834D40 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 02B34 80834D44 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02B38 80834D48 11C10014 */ beq $t6, $at, .L80834D9C -/* 02B3C 80834D4C 00000000 */ nop -/* 02B40 80834D50 0C20D10B */ jal func_8083442C -/* 02B44 80834D54 00000000 */ nop -/* 02B48 80834D58 14400003 */ bne $v0, $zero, .L80834D68 -/* 02B4C 80834D5C 00000000 */ nop -/* 02B50 80834D60 10000033 */ beq $zero, $zero, .L80834E30 -/* 02B54 80834D64 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80834D68: -/* 02B58 80834D68 0C023C41 */ jal func_8008F104 -/* 02B5C 80834D6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B60 80834D70 14400004 */ bne $v0, $zero, .L80834D84 -/* 02B64 80834D74 8FA40024 */ lw $a0, 0x0024($sp) -/* 02B68 80834D78 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 02B6C 80834D7C 10000003 */ beq $zero, $zero, .L80834D8C -/* 02B70 80834D80 24C626A0 */ addiu $a2, $a2, 0x26A0 ## $a2 = 040026A0 -.L80834D84: -/* 02B74 80834D84 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 02B78 80834D88 24C62CA0 */ addiu $a2, $a2, 0x2CA0 ## $a2 = 04002CA0 -.L80834D8C: -/* 02B7C 80834D8C 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop -/* 02B80 80834D90 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 02B84 80834D94 1000000D */ beq $zero, $zero, .L80834DCC -/* 02B88 80834D98 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -.L80834D9C: -/* 02B8C 80834D9C 3C058083 */ lui $a1, %hi(func_80835884) ## $a1 = 80830000 -/* 02B90 80834DA0 24A55884 */ addiu $a1, $a1, %lo(func_80835884) ## $a1 = 80835884 -/* 02B94 80834DA4 0C20CD8E */ jal func_80833638 -/* 02B98 80834DA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B9C 80834DAC 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 02BA0 80834DB0 A60F0834 */ sh $t7, 0x0834($s0) ## 00000834 -/* 02BA4 80834DB4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 02BA8 80834DB8 24C62628 */ addiu $a2, $a2, 0x2628 ## $a2 = 04002628 -/* 02BAC 80834DBC 8FA40024 */ lw $a0, 0x0024($sp) -/* 02BB0 80834DC0 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop -/* 02BB4 80834DC4 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 02BB8 80834DC8 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -.L80834DCC: -/* 02BBC 80834DCC 8FA40024 */ lw $a0, 0x0024($sp) -/* 02BC0 80834DD0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02BC4 80834DD4 0018CA00 */ sll $t9, $t8, 8 -/* 02BC8 80834DD8 07210005 */ bgez $t9, .L80834DF0 -/* 02BCC 80834DDC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 02BD0 80834DE0 0C20C8A1 */ jal func_80832284 -/* 02BD4 80834DE4 24C63380 */ addiu $a2, $a2, 0x3380 ## $a2 = 04003380 -/* 02BD8 80834DE8 10000011 */ beq $zero, $zero, .L80834E30 -/* 02BDC 80834DEC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80834DF0: -/* 02BE0 80834DF0 96080088 */ lhu $t0, 0x0088($s0) ## 00000088 -/* 02BE4 80834DF4 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 02BE8 80834DF8 5120000D */ beql $t1, $zero, .L80834E30 -/* 02BEC 80834DFC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02BF0 80834E00 0C20CED5 */ jal func_80833B54 -/* 02BF4 80834E04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02BF8 80834E08 14400008 */ bne $v0, $zero, .L80834E2C -/* 02BFC 80834E0C 8FA40024 */ lw $a0, 0x0024($sp) -/* 02C00 80834E10 920A015B */ lbu $t2, 0x015B($s0) ## 0000015B -/* 02C04 80834E14 3C068085 */ lui $a2, %hi(D_80853914) ## $a2 = 80850000 -/* 02C08 80834E18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02C0C 80834E1C 000A5880 */ sll $t3, $t2, 2 -/* 02C10 80834E20 00CB3021 */ addu $a2, $a2, $t3 -/* 02C14 80834E24 0C20C8A1 */ jal func_80832284 -/* 02C18 80834E28 8CC63914 */ lw $a2, %lo(D_80853914)($a2) -.L80834E2C: -/* 02C1C 80834E2C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80834E30: -/* 02C20 80834E30 8FBF001C */ lw $ra, 0x001C($sp) -/* 02C24 80834E34 8FB00018 */ lw $s0, 0x0018($sp) -/* 02C28 80834E38 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02C2C 80834E3C 03E00008 */ jr $ra -/* 02C30 80834E40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E44.s deleted file mode 100644 index 878716b37c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E44.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80834E44 -/* 02C34 80834E44 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 02C38 80834E48 00441021 */ addu $v0, $v0, $a0 -/* 02C3C 80834E4C 80421E5C */ lb $v0, 0x1E5C($v0) ## 00011E5C -/* 02C40 80834E50 3C0E8086 */ lui $t6, %hi(D_80858AB4) ## $t6 = 80860000 -/* 02C44 80834E54 0002102A */ slt $v0, $zero, $v0 -/* 02C48 80834E58 10400006 */ beq $v0, $zero, .L80834E74 -/* 02C4C 80834E5C 00000000 */ nop -/* 02C50 80834E60 8DCE8AB4 */ lw $t6, %lo(D_80858AB4)($t6) -/* 02C54 80834E64 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 02C58 80834E68 95C2000C */ lhu $v0, 0x000C($t6) ## 8086000C -/* 02C5C 80834E6C 00411027 */ nor $v0, $v0, $at -/* 02C60 80834E70 2C420001 */ sltiu $v0, $v0, 0x0001 -.L80834E74: -/* 02C64 80834E74 03E00008 */ jr $ra -/* 02C68 80834E78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E7C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E7C.s deleted file mode 100644 index 96741590ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E7C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80834E7C -/* 02C6C 80834E7C 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 02C70 80834E80 00641821 */ addu $v1, $v1, $a0 -/* 02C74 80834E84 80631E5C */ lb $v1, 0x1E5C($v1) ## 00011E5C -/* 02C78 80834E88 0003102B */ sltu $v0, $zero, $v1 -/* 02C7C 80834E8C 10400008 */ beq $v0, $zero, .L80834EB0 -/* 02C80 80834E90 00000000 */ nop -/* 02C84 80834E94 28620000 */ slti $v0, $v1, 0x0000 -/* 02C88 80834E98 14400005 */ bne $v0, $zero, .L80834EB0 -/* 02C8C 80834E9C 3C0E8086 */ lui $t6, %hi(D_80858AB4) ## $t6 = 80860000 -/* 02C90 80834EA0 8DCE8AB4 */ lw $t6, %lo(D_80858AB4)($t6) -/* 02C94 80834EA4 95C20000 */ lhu $v0, 0x0000($t6) ## 80860000 -/* 02C98 80834EA8 3042C00F */ andi $v0, $v0, 0xC00F ## $v0 = 00000000 -/* 02C9C 80834EAC 0002102B */ sltu $v0, $zero, $v0 -.L80834EB0: -/* 02CA0 80834EB0 03E00008 */ jr $ra -/* 02CA4 80834EB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834EB8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834EB8.s deleted file mode 100644 index 3135d5f592..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834EB8.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80834EB8 -/* 02CA8 80834EB8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02CAC 80834EBC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02CB0 80834EC0 AFA5001C */ sw $a1, 0x001C($sp) -/* 02CB4 80834EC4 908206AD */ lbu $v0, 0x06AD($a0) ## 000006AD -/* 02CB8 80834EC8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02CBC 80834ECC 10400003 */ beq $v0, $zero, .L80834EDC -/* 02CC0 80834ED0 00000000 */ nop -/* 02CC4 80834ED4 54410011 */ bnel $v0, $at, .L80834F1C -/* 02CC8 80834ED8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80834EDC: -/* 02CCC 80834EDC 0C20CEF3 */ jal func_80833BCC -/* 02CD0 80834EE0 AFA40018 */ sw $a0, 0x0018($sp) -/* 02CD4 80834EE4 14400008 */ bne $v0, $zero, .L80834F08 -/* 02CD8 80834EE8 8FA4001C */ lw $a0, 0x001C($sp) -/* 02CDC 80834EEC 0C030129 */ jal Gameplay_GetCamera -/* 02CE0 80834EF0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02CE4 80834EF4 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 02CE8 80834EF8 0C01691C */ jal func_8005A470 -/* 02CEC 80834EFC 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 02CF0 80834F00 14400003 */ bne $v0, $zero, .L80834F10 -/* 02CF4 80834F04 8FAF0018 */ lw $t7, 0x0018($sp) -.L80834F08: -/* 02CF8 80834F08 10000004 */ beq $zero, $zero, .L80834F1C -/* 02CFC 80834F0C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80834F10: -/* 02D00 80834F10 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 02D04 80834F14 A1EE06AD */ sb $t6, 0x06AD($t7) ## 000006AD -/* 02D08 80834F18 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80834F1C: -/* 02D0C 80834F1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02D10 80834F20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02D14 80834F24 03E00008 */ jr $ra -/* 02D18 80834F28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834F2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834F2C.s deleted file mode 100644 index 1e8ccbb885..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834F2C.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80834F2C -/* 02D1C 80834F2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02D20 80834F30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02D24 80834F34 AFA5001C */ sw $a1, 0x001C($sp) -/* 02D28 80834F38 808E042C */ lb $t6, 0x042C($a0) ## 0000042C -/* 02D2C 80834F3C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02D30 80834F40 55C0001A */ bnel $t6, $zero, .L80834FAC -/* 02D34 80834F44 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02D38 80834F48 8C8F067C */ lw $t7, 0x067C($a0) ## 0000067C -/* 02D3C 80834F4C 3C198085 */ lui $t9, %hi(D_80853614) ## $t9 = 80850000 -/* 02D40 80834F50 000FC180 */ sll $t8, $t7, 6 -/* 02D44 80834F54 07020015 */ bltzl $t8, .L80834FAC -/* 02D48 80834F58 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02D4C 80834F5C 8F393614 */ lw $t9, %lo(D_80853614)($t9) -/* 02D50 80834F60 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02D54 80834F64 57200006 */ bnel $t9, $zero, .L80834F80 -/* 02D58 80834F68 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02D5C 80834F6C 0C20D391 */ jal func_80834E44 -/* 02D60 80834F70 AFA60018 */ sw $a2, 0x0018($sp) -/* 02D64 80834F74 1040000C */ beq $v0, $zero, .L80834FA8 -/* 02D68 80834F78 8FA60018 */ lw $a2, 0x0018($sp) -/* 02D6C 80834F7C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L80834F80: -/* 02D70 80834F80 8FA5001C */ lw $a1, 0x001C($sp) -/* 02D74 80834F84 0C20D34B */ jal func_80834D2C -/* 02D78 80834F88 AFA60018 */ sw $a2, 0x0018($sp) -/* 02D7C 80834F8C 10400006 */ beq $v0, $zero, .L80834FA8 -/* 02D80 80834F90 8FA60018 */ lw $a2, 0x0018($sp) -/* 02D84 80834F94 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02D88 80834F98 0C20D3AE */ jal func_80834EB8 -/* 02D8C 80834F9C 8FA5001C */ lw $a1, 0x001C($sp) -/* 02D90 80834FA0 10000003 */ beq $zero, $zero, .L80834FB0 -/* 02D94 80834FA4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80834FA8: -/* 02D98 80834FA8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80834FAC: -/* 02D9C 80834FAC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80834FB0: -/* 02DA0 80834FB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02DA4 80834FB4 03E00008 */ jr $ra -/* 02DA8 80834FB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834FBC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834FBC.s deleted file mode 100644 index 554a474936..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834FBC.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80834FBC -/* 02DAC 80834FBC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02DB0 80834FC0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02DB4 80834FC4 8C82011C */ lw $v0, 0x011C($a0) ## 0000011C -/* 02DB8 80834FC8 50400010 */ beql $v0, $zero, .L8083500C -/* 02DBC 80834FCC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02DC0 80834FD0 8C8E03AC */ lw $t6, 0x03AC($a0) ## 000003AC -/* 02DC4 80834FD4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 02DC8 80834FD8 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 02DCC 80834FDC 15C00008 */ bne $t6, $zero, .L80835000 -/* 02DD0 80834FE0 240700FA */ addiu $a3, $zero, 0x00FA ## $a3 = 000000FA -/* 02DD4 80834FE4 AC8203AC */ sw $v0, 0x03AC($a0) ## 000003AC -/* 02DD8 80834FE8 AFA40020 */ sw $a0, 0x0020($sp) -/* 02DDC 80834FEC 0C20C993 */ jal func_8083264C -/* 02DE0 80834FF0 AFA00010 */ sw $zero, 0x0010($sp) -/* 02DE4 80834FF4 8FA40020 */ lw $a0, 0x0020($sp) -/* 02DE8 80834FF8 0C00BDF7 */ jal func_8002F7DC -/* 02DEC 80834FFC 24051828 */ addiu $a1, $zero, 0x1828 ## $a1 = 00001828 -.L80835000: -/* 02DF0 80835000 10000002 */ beq $zero, $zero, .L8083500C -/* 02DF4 80835004 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02DF8 80835008 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083500C: -/* 02DFC 8083500C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E00 80835010 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02E04 80835014 03E00008 */ jr $ra -/* 02E08 80835018 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083501C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083501C.s deleted file mode 100644 index 706d72186d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083501C.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_8083501C -/* 02E0C 8083501C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02E10 80835020 AFBF001C */ sw $ra, 0x001C($sp) -/* 02E14 80835024 AFB00018 */ sw $s0, 0x0018($sp) -/* 02E18 80835028 AFA50024 */ sw $a1, 0x0024($sp) -/* 02E1C 8083502C 84820860 */ lh $v0, 0x0860($a0) ## 00000860 -/* 02E20 80835030 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02E24 80835034 04400002 */ bltz $v0, .L80835040 -/* 02E28 80835038 00027023 */ subu $t6, $zero, $v0 -/* 02E2C 8083503C A48E0860 */ sh $t6, 0x0860($a0) ## 00000860 -.L80835040: -/* 02E30 80835040 0C023C41 */ jal func_8008F104 -/* 02E34 80835044 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02E38 80835048 50400006 */ beql $v0, $zero, .L80835064 -/* 02E3C 8083504C 8FA40024 */ lw $a0, 0x0024($sp) -/* 02E40 80835050 0C20D3EF */ jal func_80834FBC -/* 02E44 80835054 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02E48 80835058 5040000D */ beql $v0, $zero, .L80835090 -/* 02E4C 8083505C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02E50 80835060 8FA40024 */ lw $a0, 0x0024($sp) -.L80835064: -/* 02E54 80835064 0C20D1D6 */ jal func_80834758 -/* 02E58 80835068 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02E5C 8083506C 14400007 */ bne $v0, $zero, .L8083508C -/* 02E60 80835070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02E64 80835074 0C20D3CB */ jal func_80834F2C -/* 02E68 80835078 8FA50024 */ lw $a1, 0x0024($sp) -/* 02E6C 8083507C 54400004 */ bnel $v0, $zero, .L80835090 -/* 02E70 80835080 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02E74 80835084 10000002 */ beq $zero, $zero, .L80835090 -/* 02E78 80835088 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083508C: -/* 02E7C 8083508C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80835090: -/* 02E80 80835090 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E84 80835094 8FB00018 */ lw $s0, 0x0018($sp) -/* 02E88 80835098 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02E8C 8083509C 03E00008 */ jr $ra -/* 02E90 808350A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808350A4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808350A4.s deleted file mode 100644 index 95c4da8e2d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808350A4.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_808350A4 -/* 02E94 808350A4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 02E98 808350A8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02E9C 808350AC AFB10020 */ sw $s1, 0x0020($sp) -/* 02EA0 808350B0 AFB0001C */ sw $s0, 0x001C($sp) -/* 02EA4 808350B4 8CAE03AC */ lw $t6, 0x03AC($a1) ## 000003AC -/* 02EA8 808350B8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02EAC 808350BC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 02EB0 808350C0 11C0003F */ beq $t6, $zero, .L808351C0 -/* 02EB4 808350C4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02EB8 808350C8 0C023C41 */ jal func_8008F104 -/* 02EBC 808350CC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02EC0 808350D0 1440002E */ bne $v0, $zero, .L8083518C -/* 02EC4 808350D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02EC8 808350D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02ECC 808350DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02ED0 808350E0 27A60034 */ addiu $a2, $sp, 0x0034 ## $a2 = FFFFFFFC -/* 02ED4 808350E4 0C20D0E0 */ jal func_80834380 -/* 02ED8 808350E8 27A70030 */ addiu $a3, $sp, 0x0030 ## $a3 = FFFFFFF8 -/* 02EDC 808350EC 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1404) -/* 02EE0 808350F0 95EFFA64 */ lhu $t7, %lo(gSaveContext+0x1404)($t7) -/* 02EE4 808350F4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02EE8 808350F8 15E10007 */ bne $t7, $at, .L80835118 -/* 02EEC 808350FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02EF0 80835100 02211021 */ addu $v0, $s1, $at -/* 02EF4 80835104 9458072E */ lhu $t8, 0x072E($v0) ## 0000072E -/* 02EF8 80835108 00310821 */ addu $at, $at, $s1 -/* 02EFC 8083510C 2719FFFF */ addiu $t9, $t8, 0xFFFF ## $t9 = FFFFFFFF -/* 02F00 80835110 1000000F */ beq $zero, $zero, .L80835150 -/* 02F04 80835114 A439072E */ sh $t9, 0x072E($at) ## 0001072E -.L80835118: -/* 02F08 80835118 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02F0C 8083511C 02211021 */ addu $v0, $s1, $at -/* 02F10 80835120 80431E5C */ lb $v1, 0x1E5C($v0) ## 00001E5C -/* 02F14 80835124 87A40036 */ lh $a0, 0x0036($sp) -/* 02F18 80835128 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -/* 02F1C 8083512C 10600005 */ beq $v1, $zero, .L80835144 -/* 02F20 80835130 2468FFFF */ addiu $t0, $v1, 0xFFFF ## $t0 = FFFFFFFF -/* 02F24 80835134 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02F28 80835138 00310821 */ addu $at, $at, $s1 -/* 02F2C 8083513C 10000004 */ beq $zero, $zero, .L80835150 -/* 02F30 80835140 A0281E5C */ sb $t0, 0x1E5C($at) ## 00011E5C -.L80835144: -/* 02F34 80835144 0C021CCC */ jal Inventory_ChangeAmmo -/* 02F38 80835148 AFA2002C */ sw $v0, 0x002C($sp) -/* 02F3C 8083514C 8FA2002C */ lw $v0, 0x002C($sp) -.L80835150: -/* 02F40 80835150 80491E5C */ lb $t1, 0x1E5C($v0) ## 00001E5C -/* 02F44 80835154 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02F48 80835158 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F4C 8083515C 15210005 */ bne $t1, $at, .L80835174 -/* 02F50 80835160 24050096 */ addiu $a1, $zero, 0x0096 ## $a1 = 00000096 -/* 02F54 80835164 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02F58 80835168 00310821 */ addu $at, $at, $s1 -/* 02F5C 8083516C 240AFFF6 */ addiu $t2, $zero, 0xFFF6 ## $t2 = FFFFFFF6 -/* 02F60 80835170 A02A1E5C */ sb $t2, 0x1E5C($at) ## 00011E5C -.L80835174: -/* 02F64 80835174 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 02F68 80835178 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 02F6C 8083517C 0C20C993 */ jal func_8083264C -/* 02F70 80835180 AFA00010 */ sw $zero, 0x0010($sp) -/* 02F74 80835184 10000007 */ beq $zero, $zero, .L808351A4 -/* 02F78 80835188 8E0C03AC */ lw $t4, 0x03AC($s0) ## 000003AC -.L8083518C: -/* 02F7C 8083518C 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 02F80 80835190 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 02F84 80835194 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 02F88 80835198 0C20C993 */ jal func_8083264C -/* 02F8C 8083519C AFA00010 */ sw $zero, 0x0010($sp) -/* 02F90 808351A0 8E0C03AC */ lw $t4, 0x03AC($s0) ## 000003AC -.L808351A4: -/* 02F94 808351A4 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 -/* 02F98 808351A8 A20B0A73 */ sb $t3, 0x0A73($s0) ## 00000A73 -/* 02F9C 808351AC AD800118 */ sw $zero, 0x0118($t4) ## 00000118 -/* 02FA0 808351B0 AE00011C */ sw $zero, 0x011C($s0) ## 0000011C -/* 02FA4 808351B4 AE0003AC */ sw $zero, 0x03AC($s0) ## 000003AC -/* 02FA8 808351B8 10000001 */ beq $zero, $zero, .L808351C0 -/* 02FAC 808351BC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808351C0: -/* 02FB0 808351C0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02FB4 808351C4 8FB0001C */ lw $s0, 0x001C($sp) -/* 02FB8 808351C8 8FB10020 */ lw $s1, 0x0020($sp) -/* 02FBC 808351CC 03E00008 */ jr $ra -/* 02FC0 808351D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s deleted file mode 100644 index c2f9db38a0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s +++ /dev/null @@ -1,147 +0,0 @@ -glabel func_808351D4 -/* 02FC4 808351D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02FC8 808351D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 02FCC 808351DC AFB00018 */ sw $s0, 0x0018($sp) -/* 02FD0 808351E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02FD4 808351E4 0C023C41 */ jal func_8008F104 -/* 02FD8 808351E8 AFA50034 */ sw $a1, 0x0034($sp) -/* 02FDC 808351EC 14400003 */ bne $v0, $zero, .L808351FC -/* 02FE0 808351F0 260406C0 */ addiu $a0, $s0, 0x06C0 ## $a0 = 000006C0 -/* 02FE4 808351F4 10000003 */ beq $zero, $zero, .L80835204 -/* 02FE8 808351F8 AFA0002C */ sw $zero, 0x002C($sp) -.L808351FC: -/* 02FEC 808351FC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 02FF0 80835200 AFAE002C */ sw $t6, 0x002C($sp) -.L80835204: -/* 02FF4 80835204 240504B0 */ addiu $a1, $zero, 0x04B0 ## $a1 = 000004B0 -/* 02FF8 80835208 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 02FFC 8083520C 24060190 */ addiu $a2, $zero, 0x0190 ## $a2 = 00000190 -/* 03000 80835210 960F06AE */ lhu $t7, 0x06AE($s0) ## 000006AE -/* 03004 80835214 82190836 */ lb $t9, 0x0836($s0) ## 00000836 -/* 03008 80835218 35F80100 */ ori $t8, $t7, 0x0100 ## $t8 = 00000100 -/* 0300C 8083521C 17200014 */ bne $t9, $zero, .L80835270 -/* 03010 80835220 A61806AE */ sh $t8, 0x06AE($s0) ## 000006AE -/* 03014 80835224 0C20CCD4 */ jal func_80833350 -/* 03018 80835228 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0301C 8083522C 54400011 */ bnel $v0, $zero, .L80835274 -/* 03020 80835230 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 03024 80835234 8E0901BC */ lw $t1, 0x01BC($s0) ## 000001BC -/* 03028 80835238 3C080400 */ lui $t0, 0x0400 ## $t0 = 04000000 -/* 0302C 8083523C 250826E8 */ addiu $t0, $t0, 0x26E8 ## $t0 = 040026E8 -/* 03030 80835240 1509000B */ bne $t0, $t1, .L80835270 -/* 03034 80835244 8FA40034 */ lw $a0, 0x0034($sp) -/* 03038 80835248 8FAA002C */ lw $t2, 0x002C($sp) -/* 0303C 8083524C 3C068085 */ lui $a2, %hi(D_808543CC) ## $a2 = 80850000 -/* 03040 80835250 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 03044 80835254 000A5880 */ sll $t3, $t2, 2 -/* 03048 80835258 00CB3021 */ addu $a2, $a2, $t3 -/* 0304C 8083525C 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop -/* 03050 80835260 8CC643CC */ lw $a2, %lo(D_808543CC)($a2) -/* 03054 80835264 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 03058 80835268 10000017 */ beq $zero, $zero, .L808352C8 -/* 0305C 8083526C A20C0836 */ sb $t4, 0x0836($s0) ## 00000836 -.L80835270: -/* 03060 80835270 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -.L80835274: -/* 03064 80835274 AFA50024 */ sw $a1, 0x0024($sp) -/* 03068 80835278 0C028EF0 */ jal func_800A3BC0 -/* 0306C 8083527C 8FA40034 */ lw $a0, 0x0034($sp) -/* 03070 80835280 1040000B */ beq $v0, $zero, .L808352B0 -/* 03074 80835284 8FA50024 */ lw $a1, 0x0024($sp) -/* 03078 80835288 8FAD002C */ lw $t5, 0x002C($sp) -/* 0307C 8083528C 3C068085 */ lui $a2, %hi(D_808543D4) ## $a2 = 80850000 -/* 03080 80835290 8FA40034 */ lw $a0, 0x0034($sp) -/* 03084 80835294 000D7080 */ sll $t6, $t5, 2 -/* 03088 80835298 00CE3021 */ addu $a2, $a2, $t6 -/* 0308C 8083529C 0C029050 */ jal SkelAnime_ChangeLinkAnimDefaultRepeat -/* 03090 808352A0 8CC643D4 */ lw $a2, %lo(D_808543D4)($a2) -/* 03094 808352A4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03098 808352A8 10000007 */ beq $zero, $zero, .L808352C8 -/* 0309C 808352AC A20F0836 */ sb $t7, 0x0836($s0) ## 00000836 -.L808352B0: -/* 030A0 808352B0 82180836 */ lb $t8, 0x0836($s0) ## 00000836 -/* 030A4 808352B4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 030A8 808352B8 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 030AC 808352BC 57010003 */ bnel $t8, $at, .L808352CC -/* 030B0 808352C0 86020834 */ lh $v0, 0x0834($s0) ## 00000834 -/* 030B4 808352C4 A2190836 */ sb $t9, 0x0836($s0) ## 00000836 -.L808352C8: -/* 030B8 808352C8 86020834 */ lh $v0, 0x0834($s0) ## 00000834 -.L808352CC: -/* 030BC 808352CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 030C0 808352D0 2841000B */ slti $at, $v0, 0x000B -/* 030C4 808352D4 14200002 */ bne $at, $zero, .L808352E0 -/* 030C8 808352D8 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 030CC 808352DC A6080834 */ sh $t0, 0x0834($s0) ## 00000834 -.L808352E0: -/* 030D0 808352E0 0C20D3AE */ jal func_80834EB8 -/* 030D4 808352E4 8FA50034 */ lw $a1, 0x0034($sp) -/* 030D8 808352E8 82090836 */ lb $t1, 0x0836($s0) ## 00000836 -/* 030DC 808352EC 59200033 */ blezl $t1, .L808353BC -/* 030E0 808352F0 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 030E4 808352F4 860A0860 */ lh $t2, 0x0860($s0) ## 00000860 -/* 030E8 808352F8 3C0B8085 */ lui $t3, %hi(D_80853618) ## $t3 = 80850000 -/* 030EC 808352FC 05400007 */ bltz $t2, .L8083531C -/* 030F0 80835300 00000000 */ nop -/* 030F4 80835304 8D6B3618 */ lw $t3, %lo(D_80853618)($t3) -/* 030F8 80835308 5560002C */ bnel $t3, $zero, .L808353BC -/* 030FC 8083530C 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 03100 80835310 0C20D39F */ jal func_80834E7C -/* 03104 80835314 8FA40034 */ lw $a0, 0x0034($sp) -/* 03108 80835318 14400027 */ bne $v0, $zero, .L808353B8 -.L8083531C: -/* 0310C 8083531C 3C058083 */ lui $a1, %hi(func_808353D8) ## $a1 = 80830000 -/* 03110 80835320 24A553D8 */ addiu $a1, $a1, %lo(func_808353D8) ## $a1 = 808353D8 -/* 03114 80835324 0C20CD8E */ jal func_80833638 -/* 03118 80835328 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0311C 8083532C 860C0860 */ lh $t4, 0x0860($s0) ## 00000860 -/* 03120 80835330 8FAD002C */ lw $t5, 0x002C($sp) -/* 03124 80835334 0582001B */ bltzl $t4, .L808353A4 -/* 03128 80835338 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -/* 0312C 8083533C 15A00011 */ bne $t5, $zero, .L80835384 -/* 03130 80835340 8FA40034 */ lw $a0, 0x0034($sp) -/* 03134 80835344 0C20D429 */ jal func_808350A4 -/* 03138 80835348 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0313C 8083534C 14400014 */ bne $v0, $zero, .L808353A0 -/* 03140 80835350 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03144 80835354 86020860 */ lh $v0, 0x0860($s0) ## 00000860 -/* 03148 80835358 3C058085 */ lui $a1, %hi(D_808543DA) ## $a1 = 80850000 -/* 0314C 8083535C 04400003 */ bltz $v0, .L8083536C -/* 03150 80835360 00021823 */ subu $v1, $zero, $v0 -/* 03154 80835364 10000001 */ beq $zero, $zero, .L8083536C -/* 03158 80835368 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L8083536C: -/* 0315C 8083536C 00037040 */ sll $t6, $v1, 1 -/* 03160 80835370 00AE2821 */ addu $a1, $a1, $t6 -/* 03164 80835374 0C00BDF7 */ jal func_8002F7DC -/* 03168 80835378 94A543DA */ lhu $a1, %lo(D_808543DA)($a1) -/* 0316C 8083537C 10000009 */ beq $zero, $zero, .L808353A4 -/* 03170 80835380 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -.L80835384: -/* 03174 80835384 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 03178 80835388 8FA40034 */ lw $a0, 0x0034($sp) -/* 0317C 8083538C 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 03180 80835390 53000004 */ beql $t8, $zero, .L808353A4 -/* 03184 80835394 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -/* 03188 80835398 0C20D429 */ jal func_808350A4 -/* 0318C 8083539C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L808353A0: -/* 03190 808353A0 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -.L808353A4: -/* 03194 808353A4 A6190834 */ sh $t9, 0x0834($s0) ## 00000834 -/* 03198 808353A8 0C20C884 */ jal func_80832210 -/* 0319C 808353AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031A0 808353B0 10000005 */ beq $zero, $zero, .L808353C8 -/* 031A4 808353B4 8FBF001C */ lw $ra, 0x001C($sp) -.L808353B8: -/* 031A8 808353B8 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -.L808353BC: -/* 031AC 808353BC 35090200 */ ori $t1, $t0, 0x0200 ## $t1 = 00000200 -/* 031B0 808353C0 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C -/* 031B4 808353C4 8FBF001C */ lw $ra, 0x001C($sp) -.L808353C8: -/* 031B8 808353C8 8FB00018 */ lw $s0, 0x0018($sp) -/* 031BC 808353CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 031C0 808353D0 03E00008 */ jr $ra -/* 031C4 808353D4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s deleted file mode 100644 index 029f2e2049..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s +++ /dev/null @@ -1,124 +0,0 @@ -glabel func_808353D8 -/* 031C8 808353D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 031CC 808353DC AFB00018 */ sw $s0, 0x0018($sp) -/* 031D0 808353E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 031D4 808353E4 AFA5002C */ sw $a1, 0x002C($sp) -/* 031D8 808353E8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 031DC 808353EC AFBF001C */ sw $ra, 0x001C($sp) -/* 031E0 808353F0 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 031E4 808353F4 0C028EF0 */ jal func_800A3BC0 -/* 031E8 808353F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 031EC 808353FC 0C023C41 */ jal func_8008F104 -/* 031F0 80835400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031F4 80835404 50400008 */ beql $v0, $zero, .L80835428 -/* 031F8 80835408 8FA4002C */ lw $a0, 0x002C($sp) -/* 031FC 8083540C 0C20D3EF */ jal func_80834FBC -/* 03200 80835410 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03204 80835414 54400004 */ bnel $v0, $zero, .L80835428 -/* 03208 80835418 8FA4002C */ lw $a0, 0x002C($sp) -/* 0320C 8083541C 10000055 */ beq $zero, $zero, .L80835574 -/* 03210 80835420 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 03214 80835424 8FA4002C */ lw $a0, 0x002C($sp) -.L80835428: -/* 03218 80835428 0C20D1D6 */ jal func_80834758 -/* 0321C 8083542C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03220 80835430 14400027 */ bne $v0, $zero, .L808354D0 -/* 03224 80835434 3C0E8085 */ lui $t6, %hi(D_80853614) ## $t6 = 80850000 -/* 03228 80835438 8DCE3614 */ lw $t6, %lo(D_80853614)($t6) -/* 0322C 8083543C 55C0000D */ bnel $t6, $zero, .L80835474 -/* 03230 80835440 86020860 */ lh $v0, 0x0860($s0) ## 00000860 -/* 03234 80835444 860F0860 */ lh $t7, 0x0860($s0) ## 00000860 -/* 03238 80835448 3C188085 */ lui $t8, %hi(D_80853618) ## $t8 = 80850000 -/* 0323C 8083544C 05E10004 */ bgez $t7, .L80835460 -/* 03240 80835450 00000000 */ nop -/* 03244 80835454 8F183618 */ lw $t8, %lo(D_80853618)($t8) -/* 03248 80835458 57000006 */ bnel $t8, $zero, .L80835474 -/* 0324C 8083545C 86020860 */ lh $v0, 0x0860($s0) ## 00000860 -.L80835460: -/* 03250 80835460 0C20D391 */ jal func_80834E44 -/* 03254 80835464 8FA4002C */ lw $a0, 0x002C($sp) -/* 03258 80835468 5040001A */ beql $v0, $zero, .L808354D4 -/* 0325C 8083546C 86020834 */ lh $v0, 0x0834($s0) ## 00000834 -/* 03260 80835470 86020860 */ lh $v0, 0x0860($s0) ## 00000860 -.L80835474: -/* 03264 80835474 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03268 80835478 04400003 */ bltz $v0, .L80835488 -/* 0326C 8083547C 0002C823 */ subu $t9, $zero, $v0 -/* 03270 80835480 10000002 */ beq $zero, $zero, .L8083548C -/* 03274 80835484 A6020860 */ sh $v0, 0x0860($s0) ## 00000860 -.L80835488: -/* 03278 80835488 A6190860 */ sh $t9, 0x0860($s0) ## 00000860 -.L8083548C: -/* 0327C 8083548C 0C20D10B */ jal func_8083442C -/* 03280 80835490 8FA5002C */ lw $a1, 0x002C($sp) -/* 03284 80835494 50400037 */ beql $v0, $zero, .L80835574 -/* 03288 80835498 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0328C 8083549C 0C023C41 */ jal func_8008F104 -/* 03290 808354A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03294 808354A4 10400004 */ beq $v0, $zero, .L808354B8 -/* 03298 808354A8 8FA4002C */ lw $a0, 0x002C($sp) -/* 0329C 808354AC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 032A0 808354B0 1000002F */ beq $zero, $zero, .L80835570 -/* 032A4 808354B4 A2080836 */ sb $t0, 0x0836($s0) ## 00000836 -.L808354B8: -/* 032A8 808354B8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 032AC 808354BC 24C626B8 */ addiu $a2, $a2, 0x26B8 ## $a2 = 040026B8 -/* 032B0 808354C0 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop -/* 032B4 808354C4 8FA50024 */ lw $a1, 0x0024($sp) -/* 032B8 808354C8 1000002A */ beq $zero, $zero, .L80835574 -/* 032BC 808354CC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808354D0: -/* 032C0 808354D0 86020834 */ lh $v0, 0x0834($s0) ## 00000834 -.L808354D4: -/* 032C4 808354D4 10400002 */ beq $v0, $zero, .L808354E0 -/* 032C8 808354D8 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = 00000000 -/* 032CC 808354DC A6090834 */ sh $t1, 0x0834($s0) ## 00000834 -.L808354E0: -/* 032D0 808354E0 0C20CEF3 */ jal func_80833BCC -/* 032D4 808354E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032D8 808354E8 54400009 */ bnel $v0, $zero, .L80835510 -/* 032DC 808354EC 86020834 */ lh $v0, 0x0834($s0) ## 00000834 -/* 032E0 808354F0 920A06AD */ lbu $t2, 0x06AD($s0) ## 000006AD -/* 032E4 808354F4 55400006 */ bnel $t2, $zero, .L80835510 -/* 032E8 808354F8 86020834 */ lh $v0, 0x0834($s0) ## 00000834 -/* 032EC 808354FC 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 032F0 80835500 000B62C0 */ sll $t4, $t3, 11 -/* 032F4 80835504 05810007 */ bgez $t4, .L80835524 -/* 032F8 80835508 00000000 */ nop -/* 032FC 8083550C 86020834 */ lh $v0, 0x0834($s0) ## 00000834 -.L80835510: -/* 03300 80835510 14400002 */ bne $v0, $zero, .L8083551C -/* 03304 80835514 244D0001 */ addiu $t5, $v0, 0x0001 ## $t5 = 00000001 -/* 03308 80835518 A60D0834 */ sh $t5, 0x0834($s0) ## 00000834 -.L8083551C: -/* 0330C 8083551C 10000015 */ beq $zero, $zero, .L80835574 -/* 03310 80835520 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80835524: -/* 03314 80835524 0C023C41 */ jal func_8008F104 -/* 03318 80835528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0331C 8083552C 10400007 */ beq $v0, $zero, .L8083554C -/* 03320 80835530 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03324 80835534 3C058083 */ lui $a1, %hi(func_8083501C) ## $a1 = 80830000 -/* 03328 80835538 24A5501C */ addiu $a1, $a1, %lo(func_8083501C) ## $a1 = 8083501C -/* 0332C 8083553C 0C20CD8E */ jal func_80833638 -/* 03330 80835540 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03334 80835544 1000000A */ beq $zero, $zero, .L80835570 -/* 03338 80835548 A6000834 */ sh $zero, 0x0834($s0) ## 00000834 -.L8083554C: -/* 0333C 8083554C 3C058083 */ lui $a1, %hi(func_80835588) ## $a1 = 80830000 -/* 03340 80835550 0C20CD8E */ jal func_80833638 -/* 03344 80835554 24A55588 */ addiu $a1, $a1, %lo(func_80835588) ## $a1 = 80835588 -/* 03348 80835558 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0334C 8083555C 24C626B0 */ addiu $a2, $a2, 0x26B0 ## $a2 = 040026B0 -/* 03350 80835560 8FA4002C */ lw $a0, 0x002C($sp) -/* 03354 80835564 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop -/* 03358 80835568 8FA50024 */ lw $a1, 0x0024($sp) -/* 0335C 8083556C A6000834 */ sh $zero, 0x0834($s0) ## 00000834 -.L80835570: -/* 03360 80835570 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80835574: -/* 03364 80835574 8FBF001C */ lw $ra, 0x001C($sp) -/* 03368 80835578 8FB00018 */ lw $s0, 0x0018($sp) -/* 0336C 8083557C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03370 80835580 03E00008 */ jr $ra -/* 03374 80835584 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835588.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835588.s deleted file mode 100644 index 1839ff6311..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835588.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80835588 -/* 03378 80835588 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0337C 8083558C AFBF0014 */ sw $ra, 0x0014($sp) -/* 03380 80835590 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 03384 80835594 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 03388 80835598 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0338C 8083559C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 03390 808355A0 11E00005 */ beq $t7, $zero, .L808355B8 -/* 03394 808355A4 24C506C8 */ addiu $a1, $a2, 0x06C8 ## $a1 = 000006C8 -/* 03398 808355A8 0C028EF0 */ jal func_800A3BC0 -/* 0339C 808355AC AFA60018 */ sw $a2, 0x0018($sp) -/* 033A0 808355B0 10400005 */ beq $v0, $zero, .L808355C8 -/* 033A4 808355B4 8FA60018 */ lw $a2, 0x0018($sp) -.L808355B8: -/* 033A8 808355B8 3C058083 */ lui $a1, %hi(func_8083501C) ## $a1 = 80830000 -/* 033AC 808355BC 24A5501C */ addiu $a1, $a1, %lo(func_8083501C) ## $a1 = 8083501C -/* 033B0 808355C0 0C20CD8E */ jal func_80833638 -/* 033B4 808355C4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L808355C8: -/* 033B8 808355C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 033BC 808355CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 033C0 808355D0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 033C4 808355D4 03E00008 */ jr $ra -/* 033C8 808355D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808355DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808355DC.s deleted file mode 100644 index 52ca881d99..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808355DC.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_808355DC -/* 033CC 808355DC 8C8E067C */ lw $t6, 0x067C($a0) ## 0000067C -/* 033D0 808355E0 909801E9 */ lbu $t8, 0x01E9($a0) ## 000001E9 -/* 033D4 808355E4 3C010002 */ lui $at, 0x0002 ## $at = 00020000 -/* 033D8 808355E8 01C17825 */ or $t7, $t6, $at ## $t7 = 00020000 -/* 033DC 808355EC 33190080 */ andi $t9, $t8, 0x0080 ## $t9 = 00000000 -/* 033E0 808355F0 17200011 */ bne $t9, $zero, .L80835638 -/* 033E4 808355F4 AC8F067C */ sw $t7, 0x067C($a0) ## 0000067C -/* 033E8 808355F8 94880088 */ lhu $t0, 0x0088($a0) ## 00000088 -/* 033EC 808355FC 3C0A8085 */ lui $t2, %hi(D_80853608) ## $t2 = 80850000 -/* 033F0 80835600 31090200 */ andi $t1, $t0, 0x0200 ## $t1 = 00000000 -/* 033F4 80835604 5120000D */ beql $t1, $zero, .L8083563C -/* 033F8 80835608 848B00B6 */ lh $t3, 0x00B6($a0) ## 000000B6 -/* 033FC 8083560C 8D4A3608 */ lw $t2, %lo(D_80853608)($t2) -/* 03400 80835610 29412000 */ slti $at, $t2, 0x2000 -/* 03404 80835614 50200009 */ beql $at, $zero, .L8083563C -/* 03408 80835618 848B00B6 */ lh $t3, 0x00B6($a0) ## 000000B6 -/* 0340C 8083561C 8482007E */ lh $v0, 0x007E($a0) ## 0000007E -/* 03410 80835620 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 03414 80835624 00411021 */ addu $v0, $v0, $at -/* 03418 80835628 00021400 */ sll $v0, $v0, 16 -/* 0341C 8083562C 00021403 */ sra $v0, $v0, 16 -/* 03420 80835630 A48200B6 */ sh $v0, 0x00B6($a0) ## 000000B6 -/* 03424 80835634 A482083C */ sh $v0, 0x083C($a0) ## 0000083C -.L80835638: -/* 03428 80835638 848B00B6 */ lh $t3, 0x00B6($a0) ## 000000B6 -.L8083563C: -/* 0342C 8083563C 03E00008 */ jr $ra -/* 03430 80835640 A48B083E */ sh $t3, 0x083E($a0) ## 0000083E diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835644.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835644.s deleted file mode 100644 index 83d0a62536..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835644.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80835644 -/* 03434 80835644 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03438 80835648 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0343C 8083564C AFA40018 */ sw $a0, 0x0018($sp) -/* 03440 80835650 14C00008 */ bne $a2, $zero, .L80835674 -/* 03444 80835654 AFA5001C */ sw $a1, 0x001C($sp) -/* 03448 80835658 0C20C959 */ jal func_80832564 -/* 0344C 8083565C 00000000 */ nop -/* 03450 80835660 8FA4001C */ lw $a0, 0x001C($sp) -/* 03454 80835664 0C20E7E4 */ jal func_80839F90 -/* 03458 80835668 8FA50018 */ lw $a1, 0x0018($sp) -/* 0345C 8083566C 10000002 */ beq $zero, $zero, .L80835678 -/* 03460 80835670 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80835674: -/* 03464 80835674 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80835678: -/* 03468 80835678 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0346C 8083567C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03470 80835680 03E00008 */ jr $ra -/* 03474 80835684 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s deleted file mode 100644 index 54b88dedf7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80835688 -/* 03478 80835688 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0347C 8083568C AFA5001C */ sw $a1, 0x001C($sp) -/* 03480 80835690 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 03484 80835694 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03488 80835698 AFA40018 */ sw $a0, 0x0018($sp) -/* 0348C 8083569C 8CA603AC */ lw $a2, 0x03AC($a1) ## 000003AC -/* 03490 808356A0 AFA50018 */ sw $a1, 0x0018($sp) -/* 03494 808356A4 0C20D591 */ jal func_80835644 -/* 03498 808356A8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0349C 808356AC 1440000A */ bne $v0, $zero, .L808356D8 -/* 034A0 808356B0 8FA40018 */ lw $a0, 0x0018($sp) -/* 034A4 808356B4 3C058083 */ lui $a1, %hi(func_808356E8) ## $a1 = 80830000 -/* 034A8 808356B8 0C20CD8E */ jal func_80833638 -/* 034AC 808356BC 24A556E8 */ addiu $a1, $a1, %lo(func_808356E8) ## $a1 = 808356E8 -/* 034B0 808356C0 8FA50018 */ lw $a1, 0x0018($sp) -/* 034B4 808356C4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 034B8 808356C8 24C62E10 */ addiu $a2, $a2, 0x2E10 ## $a2 = 04002E10 -/* 034BC 808356CC 8FA4001C */ lw $a0, 0x001C($sp) -/* 034C0 808356D0 0C029050 */ jal SkelAnime_ChangeLinkAnimDefaultRepeat -/* 034C4 808356D4 24A506C8 */ addiu $a1, $a1, 0x06C8 ## $a1 = 000006C8 -.L808356D8: -/* 034C8 808356D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 034CC 808356DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 034D0 808356E0 03E00008 */ jr $ra -/* 034D4 808356E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s deleted file mode 100644 index 5e9c235c1b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel func_808356E8 -/* 034D8 808356E8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 034DC 808356EC AFBF001C */ sw $ra, 0x001C($sp) -/* 034E0 808356F0 AFB10018 */ sw $s1, 0x0018($sp) -/* 034E4 808356F4 AFB00014 */ sw $s0, 0x0014($sp) -/* 034E8 808356F8 8C8E03AC */ lw $t6, 0x03AC($a0) ## 000003AC -/* 034EC 808356FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 034F0 80835700 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 034F4 80835704 15C00004 */ bne $t6, $zero, .L80835718 -/* 034F8 80835708 AFAE0024 */ sw $t6, 0x0024($sp) -/* 034FC 8083570C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03500 80835710 0C20D191 */ jal func_80834644 -/* 03504 80835714 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L80835718: -/* 03508 80835718 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0350C 8083571C 0C20D1D6 */ jal func_80834758 -/* 03510 80835720 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03514 80835724 50400004 */ beql $v0, $zero, .L80835738 -/* 03518 80835728 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 0351C 8083572C 10000029 */ beq $zero, $zero, .L808357D4 -/* 03520 80835730 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 03524 80835734 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -.L80835738: -/* 03528 80835738 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 0352C 8083573C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03530 80835740 33190800 */ andi $t9, $t8, 0x0800 ## $t9 = 00000000 -/* 03534 80835744 13200021 */ beq $t9, $zero, .L808357CC -/* 03538 80835748 00000000 */ nop -/* 0353C 8083574C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03540 80835750 0C028EF0 */ jal func_800A3BC0 -/* 03544 80835754 AFA50020 */ sw $a1, 0x0020($sp) -/* 03548 80835758 10400005 */ beq $v0, $zero, .L80835770 -/* 0354C 8083575C 8FA50020 */ lw $a1, 0x0020($sp) -/* 03550 80835760 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 03554 80835764 24C62E10 */ addiu $a2, $a2, 0x2E10 ## $a2 = 04002E10 -/* 03558 80835768 0C029050 */ jal SkelAnime_ChangeLinkAnimDefaultRepeat -/* 0355C 8083576C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80835770: -/* 03560 80835770 8FA80024 */ lw $t0, 0x0024($sp) -/* 03564 80835774 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 03568 80835778 85090000 */ lh $t1, 0x0000($t0) ## 00000000 -/* 0356C 8083577C 15210011 */ bne $t1, $at, .L808357C4 -/* 03570 80835780 00000000 */ nop -/* 03574 80835784 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 03578 80835788 C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 -/* 0357C 8083578C 4604303E */ c.le.s $f6, $f4 -/* 03580 80835790 00000000 */ nop -/* 03584 80835794 4500000B */ bc1f .L808357C4 -/* 03588 80835798 00000000 */ nop -/* 0358C 8083579C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 03590 808357A0 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 03594 808357A4 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 -/* 03598 808357A8 4600848D */ trunc.w.s $f18, $f16 -/* 0359C 808357AC 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 035A0 808357B0 44815000 */ mtc1 $at, $f10 ## $f10 = -0.50 -/* 035A4 808357B4 E6080070 */ swc1 $f8, 0x0070($s0) ## 00000070 -/* 035A8 808357B8 440B9000 */ mfc1 $t3, $f18 -/* 035AC 808357BC E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 035B0 808357C0 A60B0894 */ sh $t3, 0x0894($s0) ## 00000894 -.L808357C4: -/* 035B4 808357C4 10000003 */ beq $zero, $zero, .L808357D4 -/* 035B8 808357C8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808357CC: -/* 035BC 808357CC 0C20D217 */ jal func_8083485C -/* 035C0 808357D0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L808357D4: -/* 035C4 808357D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 035C8 808357D8 8FB00014 */ lw $s0, 0x0014($sp) -/* 035CC 808357DC 8FB10018 */ lw $s1, 0x0018($sp) -/* 035D0 808357E0 03E00008 */ jr $ra -/* 035D4 808357E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808357E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808357E8.s deleted file mode 100644 index 5697f6f39d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808357E8.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_808357E8 -/* 035D8 808357E8 3C0E8016 */ lui $t6, %hi(gSaveContext+4) -/* 035DC 808357EC 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) -/* 035E0 808357F0 000E7880 */ sll $t7, $t6, 2 -/* 035E4 808357F4 01E5C021 */ addu $t8, $t7, $a1 -/* 035E8 808357F8 03E00008 */ jr $ra -/* 035EC 808357FC AC980164 */ sw $t8, 0x0164($a0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835800.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835800.s deleted file mode 100644 index b13a879040..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835800.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80835800 -/* 035F0 80835800 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 035F4 80835804 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 035F8 80835808 AFBF0014 */ sw $ra, 0x0014($sp) -/* 035FC 8083580C AFA5001C */ sw $a1, 0x001C($sp) -/* 03600 80835810 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03604 80835814 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 03608 80835818 0C20D1D6 */ jal func_80834758 -/* 0360C 8083581C AFA60018 */ sw $a2, 0x0018($sp) -/* 03610 80835820 10400003 */ beq $v0, $zero, .L80835830 -/* 03614 80835824 8FA60018 */ lw $a2, 0x0018($sp) -/* 03618 80835828 10000012 */ beq $zero, $zero, .L80835874 -/* 0361C 8083582C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80835830: -/* 03620 80835830 8CCE067C */ lw $t6, 0x067C($a2) ## 0000067C -/* 03624 80835834 3C058083 */ lui $a1, %hi(func_80835B60) ## $a1 = 80830000 -/* 03628 80835838 24A55B60 */ addiu $a1, $a1, %lo(func_80835B60) ## $a1 = 80835B60 -/* 0362C 8083583C 000E7980 */ sll $t7, $t6, 6 -/* 03630 80835840 05E10005 */ bgez $t7, .L80835858 -/* 03634 80835844 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03638 80835848 0C20CD8E */ jal func_80833638 -/* 0363C 8083584C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03640 80835850 10000008 */ beq $zero, $zero, .L80835874 -/* 03644 80835854 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80835858: -/* 03648 80835858 0C20D3CB */ jal func_80834F2C -/* 0364C 8083585C 8FA5001C */ lw $a1, 0x001C($sp) -/* 03650 80835860 50400004 */ beql $v0, $zero, .L80835874 -/* 03654 80835864 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03658 80835868 10000002 */ beq $zero, $zero, .L80835874 -/* 0365C 8083586C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 03660 80835870 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80835874: -/* 03664 80835874 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03668 80835878 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0366C 8083587C 03E00008 */ jr $ra -/* 03670 80835880 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s deleted file mode 100644 index b85a8cac5d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80835884 -/* 03674 80835884 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03678 80835888 AFA40020 */ sw $a0, 0x0020($sp) -/* 0367C 8083588C AFA50024 */ sw $a1, 0x0024($sp) -/* 03680 80835890 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03684 80835894 8FA50020 */ lw $a1, 0x0020($sp) -/* 03688 80835898 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0368C 8083589C 24A506C8 */ addiu $a1, $a1, 0x06C8 ## $a1 = 000006C8 -/* 03690 808358A0 0C028EF0 */ jal func_800A3BC0 -/* 03694 808358A4 AFA5001C */ sw $a1, 0x001C($sp) -/* 03698 808358A8 10400009 */ beq $v0, $zero, .L808358D0 -/* 0369C 808358AC 8FA40020 */ lw $a0, 0x0020($sp) -/* 036A0 808358B0 3C058083 */ lui $a1, %hi(func_808358F0) ## $a1 = 80830000 -/* 036A4 808358B4 0C20CD8E */ jal func_80833638 -/* 036A8 808358B8 24A558F0 */ addiu $a1, $a1, %lo(func_808358F0) ## $a1 = 808358F0 -/* 036AC 808358BC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 036B0 808358C0 24C62638 */ addiu $a2, $a2, 0x2638 ## $a2 = 04002638 -/* 036B4 808358C4 8FA40024 */ lw $a0, 0x0024($sp) -/* 036B8 808358C8 0C029050 */ jal SkelAnime_ChangeLinkAnimDefaultRepeat -/* 036BC 808358CC 8FA5001C */ lw $a1, 0x001C($sp) -.L808358D0: -/* 036C0 808358D0 8FA40020 */ lw $a0, 0x0020($sp) -/* 036C4 808358D4 0C20D3AE */ jal func_80834EB8 -/* 036C8 808358D8 8FA50024 */ lw $a1, 0x0024($sp) -/* 036CC 808358DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 036D0 808358E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 036D4 808358E4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 036D8 808358E8 03E00008 */ jr $ra -/* 036DC 808358EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s deleted file mode 100644 index b77819d363..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_808358F0 -/* 036E0 808358F0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 036E4 808358F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 036E8 808358F8 AFB00018 */ sw $s0, 0x0018($sp) -/* 036EC 808358FC AFA50034 */ sw $a1, 0x0034($sp) -/* 036F0 80835900 8C8E01BC */ lw $t6, 0x01BC($a0) ## 000001BC -/* 036F4 80835904 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 036F8 80835908 0C20CD39 */ jal func_808334E4 -/* 036FC 8083590C AFAE002C */ sw $t6, 0x002C($sp) -/* 03700 80835910 8FAF002C */ lw $t7, 0x002C($sp) -/* 03704 80835914 504F0012 */ beql $v0, $t7, .L80835960 -/* 03708 80835918 8FA40034 */ lw $a0, 0x0034($sp) -/* 0370C 8083591C 0C20CD4A */ jal func_80833528 -/* 03710 80835920 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03714 80835924 8FB8002C */ lw $t8, 0x002C($sp) -/* 03718 80835928 5058000D */ beql $v0, $t8, .L80835960 -/* 0371C 8083592C 8FA40034 */ lw $a0, 0x0034($sp) -/* 03720 80835930 0C20CD6C */ jal func_808335B0 -/* 03724 80835934 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03728 80835938 8FB9002C */ lw $t9, 0x002C($sp) -/* 0372C 8083593C 50590008 */ beql $v0, $t9, .L80835960 -/* 03730 80835940 8FA40034 */ lw $a0, 0x0034($sp) -/* 03734 80835944 0C20CD7D */ jal func_808335F4 -/* 03738 80835948 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0373C 8083594C 8FA8002C */ lw $t0, 0x002C($sp) -/* 03740 80835950 8FA40034 */ lw $a0, 0x0034($sp) -/* 03744 80835954 14480008 */ bne $v0, $t0, .L80835978 -/* 03748 80835958 00000000 */ nop -/* 0374C 8083595C 8FA40034 */ lw $a0, 0x0034($sp) -.L80835960: -/* 03750 80835960 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 -/* 03754 80835964 8E0606E8 */ lw $a2, 0x06E8($s0) ## 000006E8 -/* 03758 80835968 0C028D1E */ jal SkelAnime_LoadAnimationType1 -/* 0375C 8083596C 8E0701D4 */ lw $a3, 0x01D4($s0) ## 000001D4 -/* 03760 80835970 10000004 */ beq $zero, $zero, .L80835984 -/* 03764 80835974 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80835978: -/* 03768 80835978 0C028EF0 */ jal func_800A3BC0 -/* 0376C 8083597C 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 03770 80835980 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80835984: -/* 03774 80835984 0C20D3AE */ jal func_80834EB8 -/* 03778 80835988 8FA50034 */ lw $a1, 0x0034($sp) -/* 0377C 8083598C 3C098085 */ lui $t1, %hi(D_80853618) ## $t1 = 80850000 -/* 03780 80835990 8D293618 */ lw $t1, %lo(D_80853618)($t1) -/* 03784 80835994 3C058083 */ lui $a1, %hi(func_808359FC) ## $a1 = 80830000 -/* 03788 80835998 24A559FC */ addiu $a1, $a1, %lo(func_808359FC) ## $a1 = 808359FC -/* 0378C 8083599C 15200012 */ bne $t1, $zero, .L808359E8 -/* 03790 808359A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03794 808359A4 260A06C8 */ addiu $t2, $s0, 0x06C8 ## $t2 = 000006C8 -/* 03798 808359A8 0C20CD8E */ jal func_80833638 -/* 0379C 808359AC AFAA0024 */ sw $t2, 0x0024($sp) -/* 037A0 808359B0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 037A4 808359B4 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 037A8 808359B8 C6040870 */ lwc1 $f4, 0x0870($s0) ## 00000870 -/* 037AC 808359BC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 037B0 808359C0 24C62600 */ addiu $a2, $a2, 0x2600 ## $a2 = 04002600 -/* 037B4 808359C4 4606203C */ c.lt.s $f4, $f6 -/* 037B8 808359C8 8FA40034 */ lw $a0, 0x0034($sp) -/* 037BC 808359CC 45000004 */ bc1f .L808359E0 -/* 037C0 808359D0 00000000 */ nop -/* 037C4 808359D4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 037C8 808359D8 10000001 */ beq $zero, $zero, .L808359E0 -/* 037CC 808359DC 24C62608 */ addiu $a2, $a2, 0x2608 ## $a2 = 04002608 -.L808359E0: -/* 037D0 808359E0 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop -/* 037D4 808359E4 8FA50024 */ lw $a1, 0x0024($sp) -.L808359E8: -/* 037D8 808359E8 8FBF001C */ lw $ra, 0x001C($sp) -/* 037DC 808359EC 8FB00018 */ lw $s0, 0x0018($sp) -/* 037E0 808359F0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 037E4 808359F4 03E00008 */ jr $ra -/* 037E8 808359F8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808359FC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808359FC.s deleted file mode 100644 index d6b7e318d8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808359FC.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_808359FC -/* 037EC 808359FC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 037F0 80835A00 AFB00030 */ sw $s0, 0x0030($sp) -/* 037F4 80835A04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 037F8 80835A08 AFBF0034 */ sw $ra, 0x0034($sp) -/* 037FC 80835A0C AFA50054 */ sw $a1, 0x0054($sp) -/* 03800 80835A10 260606C8 */ addiu $a2, $s0, 0x06C8 ## $a2 = 000006C8 -/* 03804 80835A14 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03808 80835A18 00C02825 */ or $a1, $a2, $zero ## $a1 = 000006C8 -/* 0380C 80835A1C 0C028EF0 */ jal func_800A3BC0 -/* 03810 80835A20 AFA6003C */ sw $a2, 0x003C($sp) -/* 03814 80835A24 10400007 */ beq $v0, $zero, .L80835A44 -/* 03818 80835A28 8FA6003C */ lw $a2, 0x003C($sp) -/* 0381C 80835A2C 3C058083 */ lui $a1, %hi(func_80835B60) ## $a1 = 80830000 -/* 03820 80835A30 24A55B60 */ addiu $a1, $a1, %lo(func_80835B60) ## $a1 = 80835B60 -/* 03824 80835A34 0C20CD8E */ jal func_80833638 -/* 03828 80835A38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0382C 80835A3C 10000043 */ beq $zero, $zero, .L80835B4C -/* 03830 80835A40 A6000834 */ sh $zero, 0x0834($s0) ## 00000834 -.L80835A44: -/* 03834 80835A44 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03838 80835A48 0C02914C */ jal func_800A4530 -/* 0383C 80835A4C 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 03840 80835A50 5040003F */ beql $v0, $zero, .L80835B50 -/* 03844 80835A54 8FBF0034 */ lw $ra, 0x0034($sp) -/* 03848 80835A58 0C01DE1C */ jal Math_Sins - ## sins? -/* 0384C 80835A5C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 03850 80835A60 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 03854 80835A64 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 03858 80835A68 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 0385C 80835A6C 46040182 */ mul.s $f6, $f0, $f4 -/* 03860 80835A70 46083280 */ add.s $f10, $f6, $f8 -/* 03864 80835A74 E7AA004C */ swc1 $f10, 0x004C($sp) -/* 03868 80835A78 0C01DE0D */ jal Math_Coss - ## coss? -/* 0386C 80835A7C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 03870 80835A80 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 03874 80835A84 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 03878 80835A88 8E0E0664 */ lw $t6, 0x0664($s0) ## 00000664 -/* 0387C 80835A8C C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 03880 80835A90 46100482 */ mul.s $f18, $f0, $f16 -/* 03884 80835A94 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 03888 80835A98 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 0388C 80835A9C 11C00004 */ beq $t6, $zero, .L80835AB0 -/* 03890 80835AA0 46049080 */ add.s $f2, $f18, $f4 -/* 03894 80835AA4 860200B6 */ lh $v0, 0x00B6($s0) ## 000000B6 -/* 03898 80835AA8 10000002 */ beq $zero, $zero, .L80835AB4 -/* 0389C 80835AAC 244236B0 */ addiu $v0, $v0, 0x36B0 ## $v0 = 000036B0 -.L80835AB0: -/* 038A0 80835AB0 860200B6 */ lh $v0, 0x00B6($s0) ## 000000B6 -.L80835AB4: -/* 038A4 80835AB4 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 038A8 80835AB8 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 038AC 80835ABC 8FA50054 */ lw $a1, 0x0054($sp) -/* 038B0 80835AC0 46083280 */ add.s $f10, $f6, $f8 -/* 038B4 80835AC4 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 -/* 038B8 80835AC8 8FA7004C */ lw $a3, 0x004C($sp) -/* 038BC 80835ACC 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 038C0 80835AD0 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 038C4 80835AD4 860F0044 */ lh $t7, 0x0044($s0) ## 00000044 -/* 038C8 80835AD8 AFA00024 */ sw $zero, 0x0024($sp) -/* 038CC 80835ADC AFA00020 */ sw $zero, 0x0020($sp) -/* 038D0 80835AE0 AFA2001C */ sw $v0, 0x001C($sp) -/* 038D4 80835AE4 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 038D8 80835AE8 AFAF0018 */ sw $t7, 0x0018($sp) -/* 038DC 80835AEC 10400017 */ beq $v0, $zero, .L80835B4C -/* 038E0 80835AF0 AE020688 */ sw $v0, 0x0688($s0) ## 00000688 -/* 038E4 80835AF4 8E180664 */ lw $t8, 0x0664($s0) ## 00000664 -/* 038E8 80835AF8 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 038EC 80835AFC A05901D4 */ sb $t9, 0x01D4($v0) ## 000001D4 -/* 038F0 80835B00 AC5801CC */ sw $t8, 0x01CC($v0) ## 000001CC -/* 038F4 80835B04 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 038F8 80835B08 3C010200 */ lui $at, 0x0200 ## $at = 02000000 -/* 038FC 80835B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03900 80835B10 01014825 */ or $t1, $t0, $at ## $t1 = 02000000 -/* 03904 80835B14 0C023A71 */ jal func_8008E9C4 -/* 03908 80835B18 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C -/* 0390C 80835B1C 54400004 */ bnel $v0, $zero, .L80835B30 -/* 03910 80835B20 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 03914 80835B24 0C20D577 */ jal func_808355DC -/* 03918 80835B28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0391C 80835B2C 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -.L80835B30: -/* 03920 80835B30 A20A0A73 */ sb $t2, 0x0A73($s0) ## 00000A73 -/* 03924 80835B34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03928 80835B38 0C00BDF7 */ jal func_8002F7DC -/* 0392C 80835B3C 24051805 */ addiu $a1, $zero, 0x1805 ## $a1 = 00001805 -/* 03930 80835B40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03934 80835B44 0C20C9A6 */ jal func_80832698 -/* 03938 80835B48 24056800 */ addiu $a1, $zero, 0x6800 ## $a1 = 00006800 -.L80835B4C: -/* 0393C 80835B4C 8FBF0034 */ lw $ra, 0x0034($sp) -.L80835B50: -/* 03940 80835B50 8FB00030 */ lw $s0, 0x0030($sp) -/* 03944 80835B54 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 03948 80835B58 03E00008 */ jr $ra -/* 0394C 80835B5C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s deleted file mode 100644 index e77efbe42f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80835B60 -/* 03950 80835B60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03954 80835B64 AFB00018 */ sw $s0, 0x0018($sp) -/* 03958 80835B68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0395C 80835B6C AFBF001C */ sw $ra, 0x001C($sp) -/* 03960 80835B70 AFA50024 */ sw $a1, 0x0024($sp) -/* 03964 80835B74 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03968 80835B78 0C20D1D6 */ jal func_80834758 -/* 0396C 80835B7C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03970 80835B80 50400004 */ beql $v0, $zero, .L80835B94 -/* 03974 80835B84 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 03978 80835B88 1000001A */ beq $zero, $zero, .L80835BF4 -/* 0397C 80835B8C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 03980 80835B90 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -.L80835B94: -/* 03984 80835B94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03988 80835B98 3C058083 */ lui $a1, %hi(func_80835C08) ## $a1 = 80830000 -/* 0398C 80835B9C 000E7980 */ sll $t7, $t6, 6 -/* 03990 80835BA0 05E00014 */ bltz $t7, .L80835BF4 -/* 03994 80835BA4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03998 80835BA8 0C20CD8E */ jal func_80833638 -/* 0399C 80835BAC 24A55C08 */ addiu $a1, $a1, %lo(func_80835C08) ## $a1 = 80835C08 -/* 039A0 80835BB0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 039A4 80835BB4 24C625F8 */ addiu $a2, $a2, 0x25F8 ## $a2 = 040025F8 -/* 039A8 80835BB8 8FA40024 */ lw $a0, 0x0024($sp) -/* 039AC 80835BBC 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop -/* 039B0 80835BC0 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 039B4 80835BC4 3C058012 */ lui $a1, %hi(D_80125EF8) -/* 039B8 80835BC8 24A55EF8 */ addiu $a1, %lo(D_80125EF8) -/* 039BC 80835BCC 0C20D5FA */ jal func_808357E8 -/* 039C0 80835BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039C4 80835BD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039C8 80835BD8 0C00BDF7 */ jal func_8002F7DC -/* 039CC 80835BDC 24050836 */ addiu $a1, $zero, 0x0836 ## $a1 = 00000836 -/* 039D0 80835BE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039D4 80835BE4 0C20C9A6 */ jal func_80832698 -/* 039D8 80835BE8 24056800 */ addiu $a1, $zero, 0x6800 ## $a1 = 00006800 -/* 039DC 80835BEC 10000001 */ beq $zero, $zero, .L80835BF4 -/* 039E0 80835BF0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80835BF4: -/* 039E4 80835BF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 039E8 80835BF8 8FB00018 */ lw $s0, 0x0018($sp) -/* 039EC 80835BFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 039F0 80835C00 03E00008 */ jr $ra -/* 039F4 80835C04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C08.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C08.s deleted file mode 100644 index b2d9474d9d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C08.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80835C08 -/* 039F8 80835C08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 039FC 80835C0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 03A00 80835C10 AFA40018 */ sw $a0, 0x0018($sp) -/* 03A04 80835C14 0C20D600 */ jal func_80835800 -/* 03A08 80835C18 AFA5001C */ sw $a1, 0x001C($sp) -/* 03A0C 80835C1C 14400009 */ bne $v0, $zero, .L80835C44 -/* 03A10 80835C20 8FA50018 */ lw $a1, 0x0018($sp) -/* 03A14 80835C24 8FA4001C */ lw $a0, 0x001C($sp) -/* 03A18 80835C28 0C028EF0 */ jal func_800A3BC0 -/* 03A1C 80835C2C 24A506C8 */ addiu $a1, $a1, 0x06C8 ## $a1 = 000006C8 -/* 03A20 80835C30 10400004 */ beq $v0, $zero, .L80835C44 -/* 03A24 80835C34 8FA40018 */ lw $a0, 0x0018($sp) -/* 03A28 80835C38 3C058083 */ lui $a1, %hi(func_80835800) ## $a1 = 80830000 -/* 03A2C 80835C3C 0C20CD8E */ jal func_80833638 -/* 03A30 80835C40 24A55800 */ addiu $a1, $a1, %lo(func_80835800) ## $a1 = 80835800 -.L80835C44: -/* 03A34 80835C44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03A38 80835C48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03A3C 80835C4C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 03A40 80835C50 03E00008 */ jr $ra -/* 03A44 80835C54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C58.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C58.s deleted file mode 100644 index 460e79e070..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C58.s +++ /dev/null @@ -1,94 +0,0 @@ -glabel func_80835C58 -/* 03A48 80835C58 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03A4C 80835C5C AFBF001C */ sw $ra, 0x001C($sp) -/* 03A50 80835C60 AFB00018 */ sw $s0, 0x0018($sp) -/* 03A54 80835C64 AFA40020 */ sw $a0, 0x0020($sp) -/* 03A58 80835C68 AFA60028 */ sw $a2, 0x0028($sp) -/* 03A5C 80835C6C AFA7002C */ sw $a3, 0x002C($sp) -/* 03A60 80835C70 8CA20674 */ lw $v0, 0x0674($a1) ## 00000674 -/* 03A64 80835C74 3C0F8085 */ lui $t7, %hi(func_8084E3C4) ## $t7 = 80850000 -/* 03A68 80835C78 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03A6C 80835C7C 14C20003 */ bne $a2, $v0, .L80835C8C -/* 03A70 80835C80 25EFE3C4 */ addiu $t7, $t7, %lo(func_8084E3C4) ## $t7 = 8084E3C4 -/* 03A74 80835C84 10000044 */ beq $zero, $zero, .L80835D98 -/* 03A78 80835C88 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80835C8C: -/* 03A7C 80835C8C 144F0009 */ bne $v0, $t7, .L80835CB4 -/* 03A80 80835C90 3C088085 */ lui $t0, %hi(func_808507F4) ## $t0 = 80850000 -/* 03A84 80835C94 0C03B616 */ jal func_800ED858 -/* 03A88 80835C98 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 03A8C 80835C9C 8E180680 */ lw $t8, 0x0680($s0) ## 00000680 -/* 03A90 80835CA0 3C01FCFF */ lui $at, 0xFCFF ## $at = FCFF0000 -/* 03A94 80835CA4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FCFFFFFF -/* 03A98 80835CA8 0301C824 */ and $t9, $t8, $at -/* 03A9C 80835CAC 10000006 */ beq $zero, $zero, .L80835CC8 -/* 03AA0 80835CB0 AE190680 */ sw $t9, 0x0680($s0) ## 00000680 -.L80835CB4: -/* 03AA4 80835CB4 250807F4 */ addiu $t0, $t0, %lo(func_808507F4) ## $t0 = 000007F4 -/* 03AA8 80835CB8 14480003 */ bne $v0, $t0, .L80835CC8 -/* 03AAC 80835CBC 8FA40020 */ lw $a0, 0x0020($sp) -/* 03AB0 80835CC0 0C20C8D0 */ jal func_80832340 -/* 03AB4 80835CC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L80835CC8: -/* 03AB8 80835CC8 820A0151 */ lb $t2, 0x0151($s0) ## 00000151 -/* 03ABC 80835CCC 820B0154 */ lb $t3, 0x0154($s0) ## 00000154 -/* 03AC0 80835CD0 8FA90028 */ lw $t1, 0x0028($sp) -/* 03AC4 80835CD4 114B000B */ beq $t2, $t3, .L80835D04 -/* 03AC8 80835CD8 AE090674 */ sw $t1, 0x0674($s0) ## 00000674 -/* 03ACC 80835CDC 8FAC002C */ lw $t4, 0x002C($sp) -/* 03AD0 80835CE0 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 03AD4 80835CE4 11A00005 */ beq $t5, $zero, .L80835CFC -/* 03AD8 80835CE8 00000000 */ nop -/* 03ADC 80835CEC 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 03AE0 80835CF0 000E7A40 */ sll $t7, $t6, 9 -/* 03AE4 80835CF4 05E20004 */ bltzl $t7, .L80835D08 -/* 03AE8 80835CF8 8FB8002C */ lw $t8, 0x002C($sp) -.L80835CFC: -/* 03AEC 80835CFC 0C023B1C */ jal func_8008EC70 -/* 03AF0 80835D00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80835D04: -/* 03AF4 80835D04 8FB8002C */ lw $t8, 0x002C($sp) -.L80835D08: -/* 03AF8 80835D08 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 03AFC 80835D0C 1720000D */ bne $t9, $zero, .L80835D44 -/* 03B00 80835D10 00000000 */ nop -/* 03B04 80835D14 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 03B08 80835D18 8FA40020 */ lw $a0, 0x0020($sp) -/* 03B0C 80835D1C 31090800 */ andi $t1, $t0, 0x0800 ## $t1 = 00000000 -/* 03B10 80835D20 15200008 */ bne $t1, $zero, .L80835D44 -/* 03B14 80835D24 00000000 */ nop -/* 03B18 80835D28 0C20D191 */ jal func_80834644 -/* 03B1C 80835D2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03B20 80835D30 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C -/* 03B24 80835D34 3C01FFBF */ lui $at, 0xFFBF ## $at = FFBF0000 -/* 03B28 80835D38 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFBFFFFF -/* 03B2C 80835D3C 01415824 */ and $t3, $t2, $at -/* 03B30 80835D40 AE0B067C */ sw $t3, 0x067C($s0) ## 0000067C -.L80835D44: -/* 03B34 80835D44 0C20CB6F */ jal func_80832DBC -/* 03B38 80835D48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03B3C 80835D4C 8E0C067C */ lw $t4, 0x067C($s0) ## 0000067C -/* 03B40 80835D50 3C014BFF */ lui $at, 0x4BFF ## $at = 4BFF0000 -/* 03B44 80835D54 3421FFBB */ ori $at, $at, 0xFFBB ## $at = 4BFFFFBB -/* 03B48 80835D58 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 -/* 03B4C 80835D5C 92180692 */ lbu $t8, 0x0692($s0) ## 00000692 -/* 03B50 80835D60 01816824 */ and $t5, $t4, $at -/* 03B54 80835D64 3C01E7F7 */ lui $at, 0xE7F7 ## $at = E7F70000 -/* 03B58 80835D68 3421FFFF */ ori $at, $at, 0xFFFF ## $at = E7F7FFFF -/* 03B5C 80835D6C 01C17824 */ and $t7, $t6, $at -/* 03B60 80835D70 3319FF75 */ andi $t9, $t8, 0xFF75 ## $t9 = 00000000 -/* 03B64 80835D74 AE0D067C */ sw $t5, 0x067C($s0) ## 0000067C -/* 03B68 80835D78 AE0F0680 */ sw $t7, 0x0680($s0) ## 00000680 -/* 03B6C 80835D7C A2190692 */ sb $t9, 0x0692($s0) ## 00000692 -/* 03B70 80835D80 A200084F */ sb $zero, 0x084F($s0) ## 0000084F -/* 03B74 80835D84 A6000850 */ sh $zero, 0x0850($s0) ## 00000850 -/* 03B78 80835D88 A20006AC */ sb $zero, 0x06AC($s0) ## 000006AC -/* 03B7C 80835D8C 0C20C9BC */ jal func_808326F0 -/* 03B80 80835D90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03B84 80835D94 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80835D98: -/* 03B88 80835D98 8FBF001C */ lw $ra, 0x001C($sp) -/* 03B8C 80835D9C 8FB00018 */ lw $s0, 0x0018($sp) -/* 03B90 80835DA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03B94 80835DA4 03E00008 */ jr $ra -/* 03B98 80835DA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DAC.s deleted file mode 100644 index 472adbd9b6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DAC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80835DAC -/* 03B9C 80835DAC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03BA0 80835DB0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03BA4 80835DB4 90AE01E9 */ lbu $t6, 0x01E9($a1) ## 000001E9 -/* 03BA8 80835DB8 AFAE001C */ sw $t6, 0x001C($sp) -/* 03BAC 80835DBC A0A001E9 */ sb $zero, 0x01E9($a1) ## 000001E9 -/* 03BB0 80835DC0 0C20D716 */ jal func_80835C58 -/* 03BB4 80835DC4 AFA50024 */ sw $a1, 0x0024($sp) -/* 03BB8 80835DC8 8FA50024 */ lw $a1, 0x0024($sp) -/* 03BBC 80835DCC 8FAF001C */ lw $t7, 0x001C($sp) -/* 03BC0 80835DD0 A0AF01E9 */ sb $t7, 0x01E9($a1) ## 000001E9 -/* 03BC4 80835DD4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03BC8 80835DD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03BCC 80835DDC 03E00008 */ jr $ra -/* 03BD0 80835DE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DE4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DE4.s deleted file mode 100644 index f22ef5b239..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DE4.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80835DE4 -/* 03BD4 80835DE4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03BD8 80835DE8 AFBF001C */ sw $ra, 0x001C($sp) -/* 03BDC 80835DEC AFB00018 */ sw $s0, 0x0018($sp) -/* 03BE0 80835DF0 80A20154 */ lb $v0, 0x0154($a1) ## 00000154 -/* 03BE4 80835DF4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03BE8 80835DF8 0442000E */ bltzl $v0, .L80835E34 -/* 03BEC 80835DFC 8FBF001C */ lw $ra, 0x001C($sp) -/* 03BF0 80835E00 AFA20024 */ sw $v0, 0x0024($sp) -/* 03BF4 80835E04 80AE0151 */ lb $t6, 0x0151($a1) ## 00000151 -/* 03BF8 80835E08 0C20D716 */ jal func_80835C58 -/* 03BFC 80835E0C A0AE0154 */ sb $t6, 0x0154($a1) ## 00000154 -/* 03C00 80835E10 8FAF0024 */ lw $t7, 0x0024($sp) -/* 03C04 80835E14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03C08 80835E18 A20F0154 */ sb $t7, 0x0154($s0) ## 00000154 -/* 03C0C 80835E1C 0C023A7E */ jal func_8008E9F8 -/* 03C10 80835E20 82050154 */ lb $a1, 0x0154($s0) ## 00000154 -/* 03C14 80835E24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03C18 80835E28 0C023ACB */ jal func_8008EB2C -/* 03C1C 80835E2C 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 03C20 80835E30 8FBF001C */ lw $ra, 0x001C($sp) -.L80835E34: -/* 03C24 80835E34 8FB00018 */ lw $s0, 0x0018($sp) -/* 03C28 80835E38 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03C2C 80835E3C 03E00008 */ jr $ra -/* 03C30 80835E40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835E44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835E44.s deleted file mode 100644 index 9ec5462a53..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835E44.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80835E44 -/* 03C34 80835E44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03C38 80835E48 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03C3C 80835E4C AFA40018 */ sw $a0, 0x0018($sp) -/* 03C40 80835E50 0C03032E */ jal func_800C0CB8 -/* 03C44 80835E54 AFA5001C */ sw $a1, 0x001C($sp) -/* 03C48 80835E58 14400009 */ bne $v0, $zero, .L80835E80 -/* 03C4C 80835E5C 8FA40018 */ lw $a0, 0x0018($sp) -/* 03C50 80835E60 87AE001E */ lh $t6, 0x001E($sp) -/* 03C54 80835E64 2401002F */ addiu $at, $zero, 0x002F ## $at = 0000002F -/* 03C58 80835E68 55C1000B */ bnel $t6, $at, .L80835E98 -/* 03C5C 80835E6C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03C60 80835E70 0C020978 */ jal Interface_ChangeAlpha -/* 03C64 80835E74 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -/* 03C68 80835E78 10000007 */ beq $zero, $zero, .L80835E98 -/* 03C6C 80835E7C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80835E80: -/* 03C70 80835E80 0C030129 */ jal Gameplay_GetCamera -/* 03C74 80835E84 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03C78 80835E88 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 03C7C 80835E8C 0C0169DF */ jal func_8005A77C -/* 03C80 80835E90 87A5001E */ lh $a1, 0x001E($sp) -/* 03C84 80835E94 8FBF0014 */ lw $ra, 0x0014($sp) -.L80835E98: -/* 03C88 80835E98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03C8C 80835E9C 03E00008 */ jr $ra -/* 03C90 80835EA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EA4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EA4.s deleted file mode 100644 index eeb3c0405a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EA4.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80835EA4 -/* 03C94 80835EA4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03C98 80835EA8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03C9C 80835EAC AFA5002C */ sw $a1, 0x002C($sp) -/* 03CA0 80835EB0 AFA40028 */ sw $a0, 0x0028($sp) -/* 03CA4 80835EB4 0C20D791 */ jal func_80835E44 -/* 03CA8 80835EB8 24050038 */ addiu $a1, $zero, 0x0038 ## $a1 = 00000038 -/* 03CAC 80835EBC 8FA40028 */ lw $a0, 0x0028($sp) -/* 03CB0 80835EC0 0C030129 */ jal Gameplay_GetCamera -/* 03CB4 80835EC4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03CB8 80835EC8 8FAE002C */ lw $t6, 0x002C($sp) -/* 03CBC 80835ECC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 03CC0 80835ED0 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 03CC4 80835ED4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03CC8 80835ED8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03CCC 80835EDC AFA00014 */ sw $zero, 0x0014($sp) -/* 03CD0 80835EE0 AFA00018 */ sw $zero, 0x0018($sp) -/* 03CD4 80835EE4 0C016BF5 */ jal Camera_SetCameraData - ## setCameraData -/* 03CD8 80835EE8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 03CDC 80835EEC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03CE0 80835EF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03CE4 80835EF4 03E00008 */ jr $ra -/* 03CE8 80835EF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EFC.s deleted file mode 100644 index 04ac6b803c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EFC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80835EFC -/* 03CEC 80835EFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03CF0 80835F00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03CF4 80835F04 0C023C41 */ jal func_8008F104 -/* 03CF8 80835F08 AFA40018 */ sw $a0, 0x0018($sp) -/* 03CFC 80835F0C 10400009 */ beq $v0, $zero, .L80835F34 -/* 03D00 80835F10 8FA50018 */ lw $a1, 0x0018($sp) -/* 03D04 80835F14 8CA403AC */ lw $a0, 0x03AC($a1) ## 000003AC -/* 03D08 80835F18 50800007 */ beql $a0, $zero, .L80835F38 -/* 03D0C 80835F1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03D10 80835F20 0C00B55C */ jal Actor_Kill - -/* 03D14 80835F24 AFA50018 */ sw $a1, 0x0018($sp) -/* 03D18 80835F28 8FA50018 */ lw $a1, 0x0018($sp) -/* 03D1C 80835F2C ACA0011C */ sw $zero, 0x011C($a1) ## 0000011C -/* 03D20 80835F30 ACA003AC */ sw $zero, 0x03AC($a1) ## 000003AC -.L80835F34: -/* 03D24 80835F34 8FBF0014 */ lw $ra, 0x0014($sp) -.L80835F38: -/* 03D28 80835F38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03D2C 80835F3C 03E00008 */ jr $ra -/* 03D30 80835F40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835F44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835F44.s deleted file mode 100644 index efe7d39f3b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835F44.s +++ /dev/null @@ -1,352 +0,0 @@ -glabel func_80835F44 -/* 03D34 80835F44 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03D38 80835F48 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03D3C 80835F4C AFA40028 */ sw $a0, 0x0028($sp) -/* 03D40 80835F50 AFA60030 */ sw $a2, 0x0030($sp) -/* 03D44 80835F54 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03D48 80835F58 0C20CDC9 */ jal func_80833724 -/* 03D4C 80835F5C AFA5002C */ sw $a1, 0x002C($sp) -/* 03D50 80835F60 8FA7002C */ lw $a3, 0x002C($sp) -/* 03D54 80835F64 00023600 */ sll $a2, $v0, 24 -/* 03D58 80835F68 00063603 */ sra $a2, $a2, 24 -/* 03D5C 80835F6C 80E30154 */ lb $v1, 0x0154($a3) ## 00000154 -/* 03D60 80835F70 80EE0151 */ lb $t6, 0x0151($a3) ## 00000151 -/* 03D64 80835F74 146E000F */ bne $v1, $t6, .L80835FB4 -/* 03D68 80835F78 00000000 */ nop -/* 03D6C 80835F7C 8CEF067C */ lw $t7, 0x067C($a3) ## 0000067C -/* 03D70 80835F80 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03D74 80835F84 000FC240 */ sll $t8, $t7, 9 -/* 03D78 80835F88 07010014 */ bgez $t8, .L80835FDC -/* 03D7C 80835F8C 00000000 */ nop -/* 03D80 80835F90 A3A60027 */ sb $a2, 0x0027($sp) -/* 03D84 80835F94 0C023C56 */ jal func_8008F158 -/* 03D88 80835F98 AFA7002C */ sw $a3, 0x002C($sp) -/* 03D8C 80835F9C 83A60027 */ lb $a2, 0x0027($sp) -/* 03D90 80835FA0 1440000E */ bne $v0, $zero, .L80835FDC -/* 03D94 80835FA4 8FA7002C */ lw $a3, 0x002C($sp) -/* 03D98 80835FA8 10C0000C */ beq $a2, $zero, .L80835FDC -/* 03D9C 80835FAC 00000000 */ nop -/* 03DA0 80835FB0 80E30154 */ lb $v1, 0x0154($a3) ## 00000154 -.L80835FB4: -/* 03DA4 80835FB4 04610120 */ bgez $v1, .L80836438 -/* 03DA8 80835FB8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03DAC 80835FBC A3A60027 */ sb $a2, 0x0027($sp) -/* 03DB0 80835FC0 0C023C56 */ jal func_8008F158 -/* 03DB4 80835FC4 AFA7002C */ sw $a3, 0x002C($sp) -/* 03DB8 80835FC8 83A60027 */ lb $a2, 0x0027($sp) -/* 03DBC 80835FCC 14400003 */ bne $v0, $zero, .L80835FDC -/* 03DC0 80835FD0 8FA7002C */ lw $a3, 0x002C($sp) -/* 03DC4 80835FD4 54C00119 */ bnel $a2, $zero, .L8083643C -/* 03DC8 80835FD8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80835FDC: -/* 03DCC 80835FDC 10C0000D */ beq $a2, $zero, .L80836014 -/* 03DD0 80835FE0 8FAB0028 */ lw $t3, 0x0028($sp) -/* 03DD4 80835FE4 8CF9067C */ lw $t9, 0x067C($a3) ## 0000067C -/* 03DD8 80835FE8 00194100 */ sll $t0, $t9, 4 -/* 03DDC 80835FEC 0503000A */ bgezl $t0, .L80836018 -/* 03DE0 80835FF0 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -/* 03DE4 80835FF4 94E90088 */ lhu $t1, 0x0088($a3) ## 00000088 -/* 03DE8 80835FF8 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 03DEC 80835FFC 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 03DF0 80836000 5140010E */ beql $t2, $zero, .L8083643C -/* 03DF4 80836004 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03DF8 80836008 10C10002 */ beq $a2, $at, .L80836014 -/* 03DFC 8083600C 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 03E00 80836010 14C10109 */ bne $a2, $at, .L80836438 -.L80836014: -/* 03E04 80836014 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -.L80836018: -/* 03E08 80836018 018B6021 */ addu $t4, $t4, $t3 -/* 03E0C 8083601C 818C1E5D */ lb $t4, 0x1E5D($t4) ## 00011E5D -/* 03E10 80836020 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 03E14 80836024 15800030 */ bne $t4, $zero, .L808360E8 -/* 03E18 80836028 00000000 */ nop -/* 03E1C 8083602C 14C10007 */ bne $a2, $at, .L8083604C -/* 03E20 80836030 3C0D8012 */ lui $t5, %hi(gItemSlots) -/* 03E24 80836034 91AD7464 */ lbu $t5, %lo(gItemSlots)($t5) -/* 03E28 80836038 3C038016 */ lui $v1, %hi(gSaveContext) -/* 03E2C 8083603C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 03E30 80836040 006D7021 */ addu $t6, $v1, $t5 -/* 03E34 80836044 81CF008C */ lb $t7, 0x008C($t6) ## 0000008C -/* 03E38 80836048 11E00023 */ beq $t7, $zero, .L808360D8 -.L8083604C: -/* 03E3C 8083604C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 03E40 80836050 2401002E */ addiu $at, $zero, 0x002E ## $at = 0000002E -/* 03E44 80836054 14C10006 */ bne $a2, $at, .L80836070 -/* 03E48 80836058 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 03E4C 8083605C 3C188012 */ lui $t8, %hi(gItemSlots+0x10) -/* 03E50 80836060 93187474 */ lbu $t8, %lo(gItemSlots+0x10)($t8) -/* 03E54 80836064 0078C821 */ addu $t9, $v1, $t8 -/* 03E58 80836068 8328008C */ lb $t0, 0x008C($t9) ## 0000008C -/* 03E5C 8083606C 1100001A */ beq $t0, $zero, .L808360D8 -.L80836070: -/* 03E60 80836070 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 03E64 80836074 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 03E68 80836078 A3A60027 */ sb $a2, 0x0027($sp) -/* 03E6C 8083607C 0C023C9C */ jal func_8008F270 -/* 03E70 80836080 AFA7002C */ sw $a3, 0x002C($sp) -/* 03E74 80836084 3C038016 */ lui $v1, %hi(gSaveContext) -/* 03E78 80836088 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 03E7C 8083608C 83A60027 */ lb $a2, 0x0027($sp) -/* 03E80 80836090 04400015 */ bltz $v0, .L808360E8 -/* 03E84 80836094 8FA7002C */ lw $a3, 0x002C($sp) -/* 03E88 80836098 00024880 */ sll $t1, $v0, 2 -/* 03E8C 8083609C 3C0A8085 */ lui $t2, %hi(D_80854188) ## $t2 = 80850000 -/* 03E90 808360A0 01495021 */ addu $t2, $t2, $t1 -/* 03E94 808360A4 914A4188 */ lbu $t2, %lo(D_80854188)($t2) -/* 03E98 808360A8 3C0B8012 */ lui $t3, %hi(gItemSlots) -/* 03E9C 808360AC 8FAE0028 */ lw $t6, 0x0028($sp) -/* 03EA0 808360B0 016A5821 */ addu $t3, $t3, $t2 -/* 03EA4 808360B4 916B7464 */ lbu $t3, %lo(gItemSlots)($t3) -/* 03EA8 808360B8 006B6021 */ addu $t4, $v1, $t3 -/* 03EAC 808360BC 818D008C */ lb $t5, 0x008C($t4) ## 0000008C -/* 03EB0 808360C0 11A00005 */ beq $t5, $zero, .L808360D8 -/* 03EB4 808360C4 00000000 */ nop -/* 03EB8 808360C8 8DCF1C48 */ lw $t7, 0x1C48($t6) ## 00001C48 -/* 03EBC 808360CC 29E10003 */ slti $at, $t7, 0x0003 -/* 03EC0 808360D0 14200005 */ bne $at, $zero, .L808360E8 -/* 03EC4 808360D4 00000000 */ nop -.L808360D8: -/* 03EC8 808360D8 0C01E221 */ jal func_80078884 -/* 03ECC 808360DC 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 03ED0 808360E0 100000D6 */ beq $zero, $zero, .L8083643C -/* 03ED4 808360E4 8FBF0014 */ lw $ra, 0x0014($sp) -.L808360E8: -/* 03ED8 808360E8 3C038016 */ lui $v1, %hi(gSaveContext) -/* 03EDC 808360EC 24010042 */ addiu $at, $zero, 0x0042 ## $at = 00000042 -/* 03EE0 808360F0 14C1001E */ bne $a2, $at, .L8083616C -/* 03EE4 808360F4 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 03EE8 808360F8 8FA40028 */ lw $a0, 0x0028($sp) -/* 03EEC 808360FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03EF0 80836100 0C021DC2 */ jal func_80087708 -/* 03EF4 80836104 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 03EF8 80836108 10400014 */ beq $v0, $zero, .L8083615C -/* 03EFC 8083610C 8FA40028 */ lw $a0, 0x0028($sp) -/* 03F00 80836110 90981C27 */ lbu $t8, 0x1C27($a0) ## 00001C27 -/* 03F04 80836114 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 03F08 80836118 53000006 */ beql $t8, $zero, .L80836134 -/* 03F0C 8083611C A0991C27 */ sb $t9, 0x1C27($a0) ## 00001C27 -/* 03F10 80836120 0C00C12C */ jal func_800304B0 -/* 03F14 80836124 00000000 */ nop -/* 03F18 80836128 10000002 */ beq $zero, $zero, .L80836134 -/* 03F1C 8083612C 8FA40028 */ lw $a0, 0x0028($sp) -/* 03F20 80836130 A0991C27 */ sb $t9, 0x1C27($a0) ## 00001C27 -.L80836134: -/* 03F24 80836134 90881C27 */ lbu $t0, 0x1C27($a0) ## 00001C27 -/* 03F28 80836138 2402482B */ addiu $v0, $zero, 0x482B ## $v0 = 0000482B -/* 03F2C 8083613C 11000003 */ beq $t0, $zero, .L8083614C -/* 03F30 80836140 00000000 */ nop -/* 03F34 80836144 10000001 */ beq $zero, $zero, .L8083614C -/* 03F38 80836148 2402482A */ addiu $v0, $zero, 0x482A ## $v0 = 0000482A -.L8083614C: -/* 03F3C 8083614C 0C01E221 */ jal func_80078884 -/* 03F40 80836150 3044FFFF */ andi $a0, $v0, 0xFFFF ## $a0 = 0000482A -/* 03F44 80836154 100000B9 */ beq $zero, $zero, .L8083643C -/* 03F48 80836158 8FBF0014 */ lw $ra, 0x0014($sp) -.L8083615C: -/* 03F4C 8083615C 0C01E221 */ jal func_80078884 -/* 03F50 80836160 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 03F54 80836164 100000B5 */ beq $zero, $zero, .L8083643C -/* 03F58 80836168 8FBF0014 */ lw $ra, 0x0014($sp) -.L8083616C: -/* 03F5C 8083616C 2401001B */ addiu $at, $zero, 0x001B ## $at = 0000001B -/* 03F60 80836170 14C10010 */ bne $a2, $at, .L808361B4 -/* 03F64 80836174 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 03F68 80836178 3C098012 */ lui $t1, %hi(gItemSlots+1) -/* 03F6C 8083617C 91297465 */ lbu $t1, %lo(gItemSlots+1)($t1) -/* 03F70 80836180 8FA40028 */ lw $a0, 0x0028($sp) -/* 03F74 80836184 00695021 */ addu $t2, $v1, $t1 -/* 03F78 80836188 814B008C */ lb $t3, 0x008C($t2) ## 0000008C -/* 03F7C 8083618C 11600005 */ beq $t3, $zero, .L808361A4 -/* 03F80 80836190 00000000 */ nop -/* 03F84 80836194 0C20F187 */ jal func_8083C61C -/* 03F88 80836198 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 03F8C 8083619C 100000A7 */ beq $zero, $zero, .L8083643C -/* 03F90 808361A0 8FBF0014 */ lw $ra, 0x0014($sp) -.L808361A4: -/* 03F94 808361A4 0C01E221 */ jal func_80078884 -/* 03F98 808361A8 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 03F9C 808361AC 100000A3 */ beq $zero, $zero, .L8083643C -/* 03FA0 808361B0 8FBF0014 */ lw $ra, 0x0014($sp) -.L808361B4: -/* 03FA4 808361B4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 03FA8 808361B8 A3A60027 */ sb $a2, 0x0027($sp) -/* 03FAC 808361BC 0C023C36 */ jal func_8008F0D8 -/* 03FB0 808361C0 AFA7002C */ sw $a3, 0x002C($sp) -/* 03FB4 808361C4 3C038016 */ lui $v1, %hi(gSaveContext) -/* 03FB8 808361C8 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 03FBC 808361CC 83A60027 */ lb $a2, 0x0027($sp) -/* 03FC0 808361D0 0440001B */ bltz $v0, .L80836240 -/* 03FC4 808361D4 8FA7002C */ lw $a3, 0x002C($sp) -/* 03FC8 808361D8 24010018 */ addiu $at, $zero, 0x0018 ## $at = 00000018 -/* 03FCC 808361DC 54C10005 */ bnel $a2, $at, .L808361F4 -/* 03FD0 808361E0 846D13F4 */ lh $t5, 0x13F4($v1) ## 8015FA54 -/* 03FD4 808361E4 806C13B3 */ lb $t4, 0x13B3($v1) ## 8015FA13 -/* 03FD8 808361E8 5D80000E */ bgtzl $t4, .L80836224 -/* 03FDC 808361EC 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 03FE0 808361F0 846D13F4 */ lh $t5, 0x13F4($v1) ## 8015FA54 -.L808361F4: -/* 03FE4 808361F4 11A0000E */ beq $t5, $zero, .L80836230 -/* 03FE8 808361F8 00000000 */ nop -/* 03FEC 808361FC 846E13F0 */ lh $t6, 0x13F0($v1) ## 8015FA50 -/* 03FF0 80836200 3C188085 */ lui $t8, %hi(D_80854390) ## $t8 = 80850000 -/* 03FF4 80836204 0302C021 */ addu $t8, $t8, $v0 -/* 03FF8 80836208 15C00009 */ bne $t6, $zero, .L80836230 -/* 03FFC 8083620C 00000000 */ nop -/* 04000 80836210 806F0033 */ lb $t7, 0x0033($v1) ## 8015E693 -/* 04004 80836214 93184390 */ lbu $t8, %lo(D_80854390)($t8) -/* 04008 80836218 01F8082A */ slt $at, $t7, $t8 -/* 0400C 8083621C 14200004 */ bne $at, $zero, .L80836230 -/* 04010 80836220 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -.L80836224: -/* 04014 80836224 A0E60154 */ sb $a2, 0x0154($a3) ## 00000154 -/* 04018 80836228 10000083 */ beq $zero, $zero, .L80836438 -/* 0401C 8083622C A0F906AD */ sb $t9, 0x06AD($a3) ## 000006AD -.L80836230: -/* 04020 80836230 0C01E221 */ jal func_80078884 -/* 04024 80836234 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 04028 80836238 10000080 */ beq $zero, $zero, .L8083643C -/* 0402C 8083623C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80836240: -/* 04030 80836240 28C1003A */ slti $at, $a2, 0x003A -/* 04034 80836244 1420000C */ bne $at, $zero, .L80836278 -/* 04038 80836248 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0403C 8083624C 90E8015F */ lbu $t0, 0x015F($a3) ## 0000015F -/* 04040 80836250 24C9FFC7 */ addiu $t1, $a2, 0xFFC7 ## $t1 = FFFFFFC7 -/* 04044 80836254 51000004 */ beql $t0, $zero, .L80836268 -/* 04048 80836258 A0E9015F */ sb $t1, 0x015F($a3) ## 0000015F -/* 0404C 8083625C 10000002 */ beq $zero, $zero, .L80836268 -/* 04050 80836260 A0E0015F */ sb $zero, 0x015F($a3) ## 0000015F -/* 04054 80836264 A0E9015F */ sb $t1, 0x015F($a3) ## 0000015F -.L80836268: -/* 04058 80836268 0C20CA3B */ jal func_808328EC -/* 0405C 8083626C 24050835 */ addiu $a1, $zero, 0x0835 ## $a1 = 00000835 -/* 04060 80836270 10000072 */ beq $zero, $zero, .L8083643C -/* 04064 80836274 8FBF0014 */ lw $ra, 0x0014($sp) -.L80836278: -/* 04068 80836278 28C1001C */ slti $at, $a2, 0x001C -/* 0406C 8083627C 14200002 */ bne $at, $zero, .L80836288 -/* 04070 80836280 28C1001E */ slti $at, $a2, 0x001E -/* 04074 80836284 14200002 */ bne $at, $zero, .L80836290 -.L80836288: -/* 04078 80836288 28C1001F */ slti $at, $a2, 0x001F -/* 0407C 8083628C 14200017 */ bne $at, $zero, .L808362EC -.L80836290: -/* 04080 80836290 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04084 80836294 A3A60027 */ sb $a2, 0x0027($sp) -/* 04088 80836298 0C023A71 */ jal func_8008E9C4 -/* 0408C 8083629C AFA7002C */ sw $a3, 0x002C($sp) -/* 04090 808362A0 83A60027 */ lb $a2, 0x0027($sp) -/* 04094 808362A4 10400006 */ beq $v0, $zero, .L808362C0 -/* 04098 808362A8 8FA7002C */ lw $a3, 0x002C($sp) -/* 0409C 808362AC 28C10025 */ slti $at, $a2, 0x0025 -/* 040A0 808362B0 14200061 */ bne $at, $zero, .L80836438 -/* 040A4 808362B4 28C1002B */ slti $at, $a2, 0x002B -/* 040A8 808362B8 50200060 */ beql $at, $zero, .L8083643C -/* 040AC 808362BC 8FBF0014 */ lw $ra, 0x0014($sp) -.L808362C0: -/* 040B0 808362C0 8FA40028 */ lw $a0, 0x0028($sp) -/* 040B4 808362C4 A3A60027 */ sb $a2, 0x0027($sp) -/* 040B8 808362C8 AFA7002C */ sw $a3, 0x002C($sp) -/* 040BC 808362CC 0C00B54F */ jal func_8002D53C -/* 040C0 808362D0 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 00001D4C -/* 040C4 808362D4 8FA7002C */ lw $a3, 0x002C($sp) -/* 040C8 808362D8 83A60027 */ lb $a2, 0x0027($sp) -/* 040CC 808362DC 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 -/* 040D0 808362E0 A0EB06AD */ sb $t3, 0x06AD($a3) ## 000006AD -/* 040D4 808362E4 10000054 */ beq $zero, $zero, .L80836438 -/* 040D8 808362E8 A0E60154 */ sb $a2, 0x0154($a3) ## 00000154 -.L808362EC: -/* 040DC 808362EC 80EC0151 */ lb $t4, 0x0151($a3) ## 00000151 -/* 040E0 808362F0 54CC000D */ bnel $a2, $t4, .L80836328 -/* 040E4 808362F4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 040E8 808362F8 8CED03AC */ lw $t5, 0x03AC($a3) ## 000003AC -/* 040EC 808362FC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 040F0 80836300 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 040F4 80836304 15A00046 */ bne $t5, $zero, .L80836420 -/* 040F8 80836308 00000000 */ nop -/* 040FC 8083630C A3A60027 */ sb $a2, 0x0027($sp) -/* 04100 80836310 0C023C9C */ jal func_8008F270 -/* 04104 80836314 AFA7002C */ sw $a3, 0x002C($sp) -/* 04108 80836318 83A60027 */ lb $a2, 0x0027($sp) -/* 0410C 8083631C 04400040 */ bltz $v0, .L80836420 -/* 04110 80836320 8FA7002C */ lw $a3, 0x002C($sp) -/* 04114 80836324 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L80836328: -/* 04118 80836328 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0411C 8083632C A3A60027 */ sb $a2, 0x0027($sp) -/* 04120 80836330 0C023A7E */ jal func_8008E9F8 -/* 04124 80836334 AFA7002C */ sw $a3, 0x002C($sp) -/* 04128 80836338 8FA7002C */ lw $a3, 0x002C($sp) -/* 0412C 8083633C 304E00FF */ andi $t6, $v0, 0x00FF ## $t6 = 00000000 -/* 04130 80836340 000E7880 */ sll $t7, $t6, 2 -/* 04134 80836344 80F80151 */ lb $t8, 0x0151($a3) ## 00000151 -/* 04138 80836348 83A60027 */ lb $a2, 0x0027($sp) -/* 0413C 8083634C 01EE7821 */ addu $t7, $t7, $t6 -/* 04140 80836350 3C038012 */ lui $v1, %hi(D_80125C98) -/* 04144 80836354 006F1821 */ addu $v1, $v1, $t7 -/* 04148 80836358 A0E20159 */ sb $v0, 0x0159($a3) ## 00000159 -/* 0414C 8083635C 07000023 */ bltz $t8, .L808363EC -/* 04150 80836360 90635C98 */ lbu $v1, %lo(D_80125C98)($v1) -/* 04154 80836364 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04158 80836368 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0415C 8083636C AFA3001C */ sw $v1, 0x001C($sp) -/* 04160 80836370 A3A60027 */ sb $a2, 0x0027($sp) -/* 04164 80836374 0C023C36 */ jal func_8008F0D8 -/* 04168 80836378 AFA7002C */ sw $a3, 0x002C($sp) -/* 0416C 8083637C 8FA3001C */ lw $v1, 0x001C($sp) -/* 04170 80836380 83A60027 */ lb $a2, 0x0027($sp) -/* 04174 80836384 04410019 */ bgez $v0, .L808363EC -/* 04178 80836388 8FA7002C */ lw $a3, 0x002C($sp) -/* 0417C 8083638C 8FA20030 */ lw $v0, 0x0030($sp) -/* 04180 80836390 90F90152 */ lbu $t9, 0x0152($a3) ## 00000152 -/* 04184 80836394 50590016 */ beql $v0, $t9, .L808363F0 -/* 04188 80836398 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0418C 8083639C 90E80158 */ lbu $t0, 0x0158($a3) ## 00000158 -/* 04190 808363A0 3C0A8012 */ lui $t2, %hi(D_80125C98) -/* 04194 808363A4 3C0D8085 */ lui $t5, %hi(D_80854164) ## $t5 = 80850000 -/* 04198 808363A8 00084880 */ sll $t1, $t0, 2 -/* 0419C 808363AC 01284821 */ addu $t1, $t1, $t0 -/* 041A0 808363B0 01495021 */ addu $t2, $t2, $t1 -/* 041A4 808363B4 914A5C98 */ lbu $t2, %lo(D_80125C98)($t2) -/* 041A8 808363B8 000A5880 */ sll $t3, $t2, 2 -/* 041AC 808363BC 016A5823 */ subu $t3, $t3, $t2 -/* 041B0 808363C0 000B5840 */ sll $t3, $t3, 1 -/* 041B4 808363C4 01636021 */ addu $t4, $t3, $v1 -/* 041B8 808363C8 01AC6821 */ addu $t5, $t5, $t4 -/* 041BC 808363CC 81AD4164 */ lb $t5, %lo(D_80854164)($t5) -/* 041C0 808363D0 51A00007 */ beql $t5, $zero, .L808363F0 -/* 041C4 808363D4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 041C8 808363D8 8CEE067C */ lw $t6, 0x067C($a3) ## 0000067C -/* 041CC 808363DC A0E20152 */ sb $v0, 0x0152($a3) ## 00000152 -/* 041D0 808363E0 35CF0100 */ ori $t7, $t6, 0x0100 ## $t7 = 00000100 -/* 041D4 808363E4 10000014 */ beq $zero, $zero, .L80836438 -/* 041D8 808363E8 ACEF067C */ sw $t7, 0x067C($a3) ## 0000067C -.L808363EC: -/* 041DC 808363EC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L808363F0: -/* 041E0 808363F0 A3A60027 */ sb $a2, 0x0027($sp) -/* 041E4 808363F4 0C20D7BF */ jal func_80835EFC -/* 041E8 808363F8 AFA7002C */ sw $a3, 0x002C($sp) -/* 041EC 808363FC 8FA5002C */ lw $a1, 0x002C($sp) -/* 041F0 80836400 0C20C8ED */ jal func_808323B4 -/* 041F4 80836404 8FA40028 */ lw $a0, 0x0028($sp) -/* 041F8 80836408 83A60027 */ lb $a2, 0x0027($sp) -/* 041FC 8083640C 8FA5002C */ lw $a1, 0x002C($sp) -/* 04200 80836410 0C20CD99 */ jal func_80833664 -/* 04204 80836414 8FA40028 */ lw $a0, 0x0028($sp) -/* 04208 80836418 10000008 */ beq $zero, $zero, .L8083643C -/* 0420C 8083641C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80836420: -/* 04210 80836420 3C028085 */ lui $v0, %hi(D_80853618) ## $v0 = 80850000 -/* 04214 80836424 24423618 */ addiu $v0, $v0, %lo(D_80853618) ## $v0 = 80853618 -/* 04218 80836428 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 0421C 8083642C AC580000 */ sw $t8, 0x0000($v0) ## 80853618 -/* 04220 80836430 3C018085 */ lui $at, %hi(D_80853614) ## $at = 80850000 -/* 04224 80836434 AC383614 */ sw $t8, %lo(D_80853614)($at) -.L80836438: -/* 04228 80836438 8FBF0014 */ lw $ra, 0x0014($sp) -.L8083643C: -/* 0422C 8083643C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04230 80836440 03E00008 */ jr $ra -/* 04234 80836444 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s deleted file mode 100644 index 9f4508d987..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s +++ /dev/null @@ -1,105 +0,0 @@ -glabel func_80836448 -/* 04238 80836448 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0423C 8083644C AFBF0024 */ sw $ra, 0x0024($sp) -/* 04240 80836450 AFB00020 */ sw $s0, 0x0020($sp) -/* 04244 80836454 AFA40030 */ sw $a0, 0x0030($sp) -/* 04248 80836458 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0424C 8083645C AFA60038 */ sw $a2, 0x0038($sp) -/* 04250 80836460 0C20CCAE */ jal func_808332B8 -/* 04254 80836464 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 04258 80836468 AFA2002C */ sw $v0, 0x002C($sp) -/* 0425C 8083646C 8FA40030 */ lw $a0, 0x0030($sp) -/* 04260 80836470 0C20C959 */ jal func_80832564 -/* 04264 80836474 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04268 80836478 8FAE002C */ lw $t6, 0x002C($sp) -/* 0426C 8083647C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04270 80836480 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04274 80836484 11C00005 */ beq $t6, $zero, .L8083649C -/* 04278 80836488 3C028084 */ lui $v0, %hi(func_80843CEC) ## $v0 = 80840000 -/* 0427C 8083648C 3C0F8085 */ lui $t7, %hi(func_8084E368) ## $t7 = 80850000 -/* 04280 80836490 25EFE368 */ addiu $t7, $t7, %lo(func_8084E368) ## $t7 = 8084E368 -/* 04284 80836494 10000003 */ beq $zero, $zero, .L808364A4 -/* 04288 80836498 AFAF0028 */ sw $t7, 0x0028($sp) -.L8083649C: -/* 0428C 8083649C 24423CEC */ addiu $v0, $v0, %lo(func_80843CEC) ## $v0 = 80843CEC -/* 04290 808364A0 AFA20028 */ sw $v0, 0x0028($sp) -.L808364A4: -/* 04294 808364A4 8FA40030 */ lw $a0, 0x0030($sp) -/* 04298 808364A8 0C20D716 */ jal func_80835C58 -/* 0429C 808364AC 8FA60028 */ lw $a2, 0x0028($sp) -/* 042A0 808364B0 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 042A4 808364B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 042A8 808364B8 37190080 */ ori $t9, $t8, 0x0080 ## $t9 = 00000080 -/* 042AC 808364BC AE19067C */ sw $t9, 0x067C($s0) ## 0000067C -/* 042B0 808364C0 8FA60038 */ lw $a2, 0x0038($sp) -/* 042B4 808364C4 0C20C899 */ jal func_80832264 -/* 042B8 808364C8 8FA40030 */ lw $a0, 0x0030($sp) -/* 042BC 808364CC 8FA80038 */ lw $t0, 0x0038($sp) -/* 042C0 808364D0 3C090400 */ lui $t1, 0x0400 ## $t1 = 04000000 -/* 042C4 808364D4 25292878 */ addiu $t1, $t1, 0x2878 ## $t1 = 04002878 -/* 042C8 808364D8 15090004 */ bne $t0, $t1, .L808364EC -/* 042CC 808364DC 3C0142A8 */ lui $at, 0x42A8 ## $at = 42A80000 -/* 042D0 808364E0 44812000 */ mtc1 $at, $f4 ## $f4 = 84.00 -/* 042D4 808364E4 00000000 */ nop -/* 042D8 808364E8 E60401C4 */ swc1 $f4, 0x01C4($s0) ## 000001C4 -.L808364EC: -/* 042DC 808364EC 0C20C889 */ jal func_80832224 -/* 042E0 808364F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 042E4 808364F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 042E8 808364F8 0C20C9A6 */ jal func_80832698 -/* 042EC 808364FC 2405680B */ addiu $a1, $zero, 0x680B ## $a1 = 0000680B -/* 042F0 80836500 920A0002 */ lbu $t2, 0x0002($s0) ## 00000002 -/* 042F4 80836504 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 042F8 80836508 5541002B */ bnel $t2, $at, .L808365B8 -/* 042FC 8083650C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04300 80836510 0C03D1EF */ jal func_800F47BC -/* 04304 80836514 00000000 */ nop -/* 04308 80836518 0C021B1C */ jal Inventory_ConsumeFairy -/* 0430C 8083651C 8FA40030 */ lw $a0, 0x0030($sp) -/* 04310 80836520 10400009 */ beq $v0, $zero, .L80836548 -/* 04314 80836524 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 04318 80836528 8FAC0030 */ lw $t4, 0x0030($sp) -/* 0431C 8083652C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04320 80836530 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 04324 80836534 002C0821 */ addu $at, $at, $t4 -/* 04328 80836538 A42B0A20 */ sh $t3, 0x0A20($at) ## 00010A20 -/* 0432C 8083653C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 04330 80836540 1000000E */ beq $zero, $zero, .L8083657C -/* 04334 80836544 A20D084F */ sb $t5, 0x084F($s0) ## 0000084F -.L80836548: -/* 04338 80836548 8FAF0030 */ lw $t7, 0x0030($sp) -/* 0433C 8083654C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04340 80836550 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 04344 80836554 002F0821 */ addu $at, $at, $t7 -/* 04348 80836558 0C03DAAC */ jal func_800F6AB0 -/* 0434C 8083655C A42E0A20 */ sh $t6, 0x0A20($at) ## 00010A20 -/* 04350 80836560 0C03D719 */ jal func_800F5C64 -/* 04354 80836564 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 -/* 04358 80836568 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0435C 8083656C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 04360 80836570 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 04364 80836574 A04313E0 */ sb $v1, 0x13E0($v0) ## 8015FA40 -/* 04368 80836578 A04313E1 */ sb $v1, 0x13E1($v0) ## 8015FA41 -.L8083657C: -/* 0436C 8083657C 8FB8002C */ lw $t8, 0x002C($sp) -/* 04370 80836580 8FA40030 */ lw $a0, 0x0030($sp) -/* 04374 80836584 2405264E */ addiu $a1, $zero, 0x264E ## $a1 = 0000264E -/* 04378 80836588 13000003 */ beq $t8, $zero, .L80836598 -/* 0437C 8083658C 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 04380 80836590 10000002 */ beq $zero, $zero, .L8083659C -/* 04384 80836594 24020078 */ addiu $v0, $zero, 0x0078 ## $v0 = 00000078 -.L80836598: -/* 04388 80836598 2402003C */ addiu $v0, $zero, 0x003C ## $v0 = 0000003C -.L8083659C: -/* 0438C 8083659C 00023400 */ sll $a2, $v0, 16 -/* 04390 808365A0 00063403 */ sra $a2, $a2, 16 -/* 04394 808365A4 0C02003E */ jal func_800800F8 -/* 04398 808365A8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0439C 808365AC 0C02CE10 */ jal ShrinkWindow_SetVal ## letterbox_target_addr -/* 043A0 808365B0 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 -/* 043A4 808365B4 8FBF0024 */ lw $ra, 0x0024($sp) -.L808365B8: -/* 043A8 808365B8 8FB00020 */ lw $s0, 0x0020($sp) -/* 043AC 808365BC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 043B0 808365C0 03E00008 */ jr $ra -/* 043B4 808365C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808365C8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808365C8.s deleted file mode 100644 index 2cc78467e5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808365C8.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_808365C8 -/* 043B8 808365C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 043BC 808365CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 043C0 808365D0 8C8E0674 */ lw $t6, 0x0674($a0) ## 00000674 -/* 043C4 808365D4 3C0F8084 */ lui $t7, %hi(func_808458D0) ## $t7 = 80840000 -/* 043C8 808365D8 25EF58D0 */ addiu $t7, $t7, %lo(func_808458D0) ## $t7 = 808458D0 -/* 043CC 808365DC 01CF1026 */ xor $v0, $t6, $t7 -/* 043D0 808365E0 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 043D4 808365E4 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 043D8 808365E8 1440000E */ bne $v0, $zero, .L80836624 -/* 043DC 808365EC 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 043E0 808365F0 8C82067C */ lw $v0, 0x067C($a0) ## 0000067C -/* 043E4 808365F4 30420100 */ andi $v0, $v0, 0x0100 ## $v0 = 00000000 -/* 043E8 808365F8 0002102B */ sltu $v0, $zero, $v0 -/* 043EC 808365FC 50400019 */ beql $v0, $zero, .L80836664 -/* 043F0 80836600 8FBF0014 */ lw $ra, 0x0014($sp) -/* 043F4 80836604 90830152 */ lbu $v1, 0x0152($a0) ## 00000152 -/* 043F8 80836608 386200FC */ xori $v0, $v1, 0x00FC ## $v0 = 000000FC -/* 043FC 8083660C 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 04400 80836610 14400004 */ bne $v0, $zero, .L80836624 -/* 04404 80836614 386200FF */ xori $v0, $v1, 0x00FF ## $v0 = 000000FF -/* 04408 80836618 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 0440C 8083661C 50400011 */ beql $v0, $zero, .L80836664 -/* 04410 80836620 8FBF0014 */ lw $ra, 0x0014($sp) -.L80836624: -/* 04414 80836624 8CB8082C */ lw $t8, 0x082C($a1) ## 0000082C -/* 04418 80836628 3C198083 */ lui $t9, %hi(func_80834A2C) ## $t9 = 80830000 -/* 0441C 8083662C 27394A2C */ addiu $t9, $t9, %lo(func_80834A2C) ## $t9 = 80834A2C -/* 04420 80836630 03191026 */ xor $v0, $t8, $t9 -/* 04424 80836634 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 04428 80836638 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 0442C 8083663C 54400009 */ bnel $v0, $zero, .L80836664 -/* 04430 80836640 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04434 80836644 90A40152 */ lbu $a0, 0x0152($a1) ## 00000152 -/* 04438 80836648 0C20CDC9 */ jal func_80833724 -/* 0443C 8083664C AFA50018 */ sw $a1, 0x0018($sp) -/* 04440 80836650 8FA50018 */ lw $a1, 0x0018($sp) -/* 04444 80836654 80A80151 */ lb $t0, 0x0151($a1) ## 00000151 -/* 04448 80836658 00481026 */ xor $v0, $v0, $t0 -/* 0444C 8083665C 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 04450 80836660 8FBF0014 */ lw $ra, 0x0014($sp) -.L80836664: -/* 04454 80836664 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04458 80836668 03E00008 */ jr $ra -/* 0445C 8083666C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s deleted file mode 100644 index edc1432944..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s +++ /dev/null @@ -1,150 +0,0 @@ -glabel func_80836670 -/* 04460 80836670 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04464 80836674 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04468 80836678 AFB00020 */ sw $s0, 0x0020($sp) -/* 0446C 8083667C AFA5002C */ sw $a1, 0x002C($sp) -/* 04470 80836680 8C8E067C */ lw $t6, 0x067C($a0) ## 0000067C -/* 04474 80836684 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04478 80836688 000E7A00 */ sll $t7, $t6, 8 -/* 0447C 8083668C 05E00029 */ bltz $t7, .L80836734 -/* 04480 80836690 00000000 */ nop -/* 04484 80836694 8C980118 */ lw $t8, 0x0118($a0) ## 00000118 -/* 04488 80836698 13000026 */ beq $t8, $zero, .L80836734 -/* 0448C 8083669C 00000000 */ nop -/* 04490 808366A0 0C023C41 */ jal func_8008F104 -/* 04494 808366A4 00000000 */ nop -/* 04498 808366A8 10400022 */ beq $v0, $zero, .L80836734 -/* 0449C 808366AC 8FA4002C */ lw $a0, 0x002C($sp) -/* 044A0 808366B0 3C068085 */ lui $a2, %hi(func_80850AEC) ## $a2 = 80850000 -/* 044A4 808366B4 24C60AEC */ addiu $a2, $a2, %lo(func_80850AEC) ## $a2 = 80850AEC -/* 044A8 808366B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 044AC 808366BC 0C20D716 */ jal func_80835C58 -/* 044B0 808366C0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 044B4 808366C4 92190692 */ lbu $t9, 0x0692($s0) ## 00000692 -/* 044B8 808366C8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 044BC 808366CC 24C62C90 */ addiu $a2, $a2, 0x2C90 ## $a2 = 04002C90 -/* 044C0 808366D0 37280080 */ ori $t0, $t9, 0x0080 ## $t0 = 00000080 -/* 044C4 808366D4 A2080692 */ sb $t0, 0x0692($s0) ## 00000692 -/* 044C8 808366D8 8FA4002C */ lw $a0, 0x002C($sp) -/* 044CC 808366DC 0C20C899 */ jal func_80832264 -/* 044D0 808366E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 044D4 808366E4 8FA4002C */ lw $a0, 0x002C($sp) -/* 044D8 808366E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 044DC 808366EC 0C20CBD5 */ jal func_80832F54 -/* 044E0 808366F0 2406009B */ addiu $a2, $zero, 0x009B ## $a2 = 0000009B -/* 044E4 808366F4 0C20C889 */ jal func_80832224 -/* 044E8 808366F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 044EC 808366FC 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 -/* 044F0 80836700 960C06AE */ lhu $t4, 0x06AE($s0) ## 000006AE -/* 044F4 80836704 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 044F8 80836708 314BFFFE */ andi $t3, $t2, 0xFFFE ## $t3 = 00000000 -/* 044FC 8083670C 358D0043 */ ori $t5, $t4, 0x0043 ## $t5 = 00000043 -/* 04500 80836710 A60B0088 */ sh $t3, 0x0088($s0) ## 00000088 -/* 04504 80836714 A2000893 */ sb $zero, 0x0893($s0) ## 00000893 -/* 04508 80836718 A60D06AE */ sh $t5, 0x06AE($s0) ## 000006AE -/* 0450C 8083671C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04510 80836720 24056802 */ addiu $a1, $zero, 0x6802 ## $a1 = 00006802 -/* 04514 80836724 0C20C9A6 */ jal func_80832698 -/* 04518 80836728 A609083C */ sh $t1, 0x083C($s0) ## 0000083C -/* 0451C 8083672C 10000055 */ beq $zero, $zero, .L80836884 -/* 04520 80836730 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80836734: -/* 04524 80836734 0C20D972 */ jal func_808365C8 -/* 04528 80836738 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0452C 8083673C 1040000A */ beq $v0, $zero, .L80836768 -/* 04530 80836740 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04534 80836744 0C20D0A6 */ jal func_80834298 -/* 04538 80836748 8FA5002C */ lw $a1, 0x002C($sp) -/* 0453C 8083674C 8E0E0674 */ lw $t6, 0x0674($s0) ## 00000674 -/* 04540 80836750 3C0F8085 */ lui $t7, %hi(func_8084E604) ## $t7 = 80850000 -/* 04544 80836754 25EFE604 */ addiu $t7, $t7, %lo(func_8084E604) ## $t7 = 8084E604 -/* 04548 80836758 55CF0004 */ bnel $t6, $t7, .L8083676C -/* 0454C 8083675C 8E19082C */ lw $t9, 0x082C($s0) ## 0000082C -/* 04550 80836760 10000048 */ beq $zero, $zero, .L80836884 -/* 04554 80836764 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80836768: -/* 04558 80836768 8E19082C */ lw $t9, 0x082C($s0) ## 0000082C -.L8083676C: -/* 0455C 8083676C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04560 80836770 8FA5002C */ lw $a1, 0x002C($sp) -/* 04564 80836774 0320F809 */ jalr $ra, $t9 -/* 04568 80836778 00000000 */ nop -/* 0456C 8083677C 54400004 */ bnel $v0, $zero, .L80836790 -/* 04570 80836780 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 04574 80836784 1000003F */ beq $zero, $zero, .L80836884 -/* 04578 80836788 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0457C 8083678C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -.L80836790: -/* 04580 80836790 C6060830 */ lwc1 $f6, 0x0830($s0) ## 00000830 -/* 04584 80836794 46062032 */ c.eq.s $f4, $f6 -/* 04588 80836798 00000000 */ nop -/* 0458C 8083679C 45010021 */ bc1t .L80836824 -/* 04590 808367A0 00000000 */ nop -/* 04594 808367A4 0C20CCD4 */ jal func_80833350 -/* 04598 808367A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0459C 808367AC 10400006 */ beq $v0, $zero, .L808367C8 -/* 045A0 808367B0 8FA4002C */ lw $a0, 0x002C($sp) -/* 045A4 808367B4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 045A8 808367B8 C60A0838 */ lwc1 $f10, 0x0838($s0) ## 00000838 -/* 045AC 808367BC 460A4032 */ c.eq.s $f8, $f10 -/* 045B0 808367C0 00000000 */ nop -/* 045B4 808367C4 45010007 */ bc1t .L808367E4 -.L808367C8: -/* 045B8 808367C8 3C188085 */ lui $t8, %hi(D_80853410) ## $t8 = 80850000 -/* 045BC 808367CC 27183410 */ addiu $t8, $t8, %lo(D_80853410) ## $t8 = 80853410 -/* 045C0 808367D0 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 -/* 045C4 808367D4 8E0606E8 */ lw $a2, 0x06E8($s0) ## 000006E8 -/* 045C8 808367D8 8E0701D4 */ lw $a3, 0x01D4($s0) ## 000001D4 -/* 045CC 808367DC 0C028D6D */ jal SkelAnime_LoadAnimationType4 -/* 045D0 808367E0 AFB80010 */ sw $t8, 0x0010($sp) -.L808367E4: -/* 045D4 808367E4 26040830 */ addiu $a0, $s0, 0x0830 ## $a0 = 00000830 -/* 045D8 808367E8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 045DC 808367EC 0C01DE80 */ jal Math_ApproxF - -/* 045E0 808367F0 3C063E80 */ lui $a2, 0x3E80 ## $a2 = 3E800000 -/* 045E4 808367F4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 045E8 808367F8 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 045EC 808367FC C6120830 */ lwc1 $f18, 0x0830($s0) ## 00000830 -/* 045F0 80836800 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 -/* 045F4 80836804 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 -/* 045F8 80836808 46128101 */ sub.s $f4, $f16, $f18 -/* 045FC 8083680C 8E0706E8 */ lw $a3, 0x06E8($s0) ## 000006E8 -/* 04600 80836810 8FA4002C */ lw $a0, 0x002C($sp) -/* 04604 80836814 0C028D37 */ jal SkelAnime_LoadAnimationType2 -/* 04608 80836818 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0460C 8083681C 10000019 */ beq $zero, $zero, .L80836884 -/* 04610 80836820 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80836824: -/* 04614 80836824 0C20CCD4 */ jal func_80833350 -/* 04618 80836828 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0461C 8083682C 10400006 */ beq $v0, $zero, .L80836848 -/* 04620 80836830 8FA4002C */ lw $a0, 0x002C($sp) -/* 04624 80836834 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 04628 80836838 C6080838 */ lwc1 $f8, 0x0838($s0) ## 00000838 -/* 0462C 8083683C 46083032 */ c.eq.s $f6, $f8 -/* 04630 80836840 00000000 */ nop -/* 04634 80836844 45010009 */ bc1t .L8083686C -.L80836848: -/* 04638 80836848 3C088085 */ lui $t0, %hi(D_80853410) ## $t0 = 80850000 -/* 0463C 8083684C 25083410 */ addiu $t0, $t0, %lo(D_80853410) ## $t0 = 80853410 -/* 04640 80836850 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 -/* 04644 80836854 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 -/* 04648 80836858 8E0706E8 */ lw $a3, 0x06E8($s0) ## 000006E8 -/* 0464C 8083685C 0C028D52 */ jal SkelAnime_LoadAnimationType3 -/* 04650 80836860 AFA80010 */ sw $t0, 0x0010($sp) -/* 04654 80836864 10000007 */ beq $zero, $zero, .L80836884 -/* 04658 80836868 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083686C: -/* 0465C 8083686C 8FA4002C */ lw $a0, 0x002C($sp) -/* 04660 80836870 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 -/* 04664 80836874 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 -/* 04668 80836878 0C028D1E */ jal SkelAnime_LoadAnimationType1 -/* 0466C 8083687C 8E0706E8 */ lw $a3, 0x06E8($s0) ## 000006E8 -/* 04670 80836880 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80836884: -/* 04674 80836884 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04678 80836888 8FB00020 */ lw $s0, 0x0020($sp) -/* 0467C 8083688C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04680 80836890 03E00008 */ jr $ra -/* 04684 80836894 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836898.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836898.s deleted file mode 100644 index 40a17419c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836898.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80836898 -/* 04688 80836898 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0468C 8083689C AFBF0014 */ sw $ra, 0x0014($sp) -/* 04690 808368A0 AFA40018 */ sw $a0, 0x0018($sp) -/* 04694 808368A4 AFA60020 */ sw $a2, 0x0020($sp) -/* 04698 808368A8 ACA60A74 */ sw $a2, 0x0A74($a1) ## 00000A74 -/* 0469C 808368AC 3C068084 */ lui $a2, %hi(func_808458D0) ## $a2 = 80840000 -/* 046A0 808368B0 24C658D0 */ addiu $a2, $a2, %lo(func_808458D0) ## $a2 = 808458D0 -/* 046A4 808368B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 046A8 808368B8 8FA40018 */ lw $a0, 0x0018($sp) -/* 046AC 808368BC 0C20D716 */ jal func_80835C58 -/* 046B0 808368C0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 046B4 808368C4 8FA5001C */ lw $a1, 0x001C($sp) -/* 046B8 808368C8 8CAF0680 */ lw $t7, 0x0680($a1) ## 00000680 -/* 046BC 808368CC 35F80040 */ ori $t8, $t7, 0x0040 ## $t8 = 00000040 -/* 046C0 808368D0 ACB80680 */ sw $t8, 0x0680($a1) ## 00000680 -/* 046C4 808368D4 0C20C94A */ jal func_80832528 -/* 046C8 808368D8 8FA40018 */ lw $a0, 0x0018($sp) -/* 046CC 808368DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 046D0 808368E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 046D4 808368E4 03E00008 */ jr $ra -/* 046D8 808368E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808368EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808368EC.s deleted file mode 100644 index 825294fe4a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808368EC.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_808368EC -/* 046DC 808368EC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 046E0 808368F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 046E4 808368F4 AFB00018 */ sw $s0, 0x0018($sp) -/* 046E8 808368F8 848300B6 */ lh $v1, 0x00B6($a0) ## 000000B6 -/* 046EC 808368FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 046F0 80836900 A7A30026 */ sh $v1, 0x0026($sp) -/* 046F4 80836904 8C820680 */ lw $v0, 0x0680($a0) ## 00000680 -/* 046F8 80836908 30460060 */ andi $a2, $v0, 0x0060 ## $a2 = 00000000 -/* 046FC 8083690C 14C00020 */ bne $a2, $zero, .L80836990 -/* 04700 80836910 30480040 */ andi $t0, $v0, 0x0040 ## $t0 = 00000000 -/* 04704 80836914 8C820664 */ lw $v0, 0x0664($a0) ## 00000664 -/* 04708 80836918 50400013 */ beql $v0, $zero, .L80836968 -/* 0470C 8083691C 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 04710 80836920 90AE1CDB */ lbu $t6, 0x1CDB($a1) ## 00001CDB -/* 04714 80836924 24450038 */ addiu $a1, $v0, 0x0038 ## $a1 = 00000038 -/* 04718 80836928 15C00005 */ bne $t6, $zero, .L80836940 -/* 0471C 8083692C 00000000 */ nop -/* 04720 80836930 908F0002 */ lbu $t7, 0x0002($a0) ## 00000002 -/* 04724 80836934 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 04728 80836938 51E1000B */ beql $t7, $at, .L80836968 -/* 0472C 8083693C 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -.L80836940: -/* 04730 80836940 0C01E01A */ jal Math_Vec3f_Yaw - -/* 04734 80836944 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 04738 80836948 00022C00 */ sll $a1, $v0, 16 -/* 0473C 8083694C 00052C03 */ sra $a1, $a1, 16 -/* 04740 80836950 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 04744 80836954 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 04748 80836958 24060FA0 */ addiu $a2, $zero, 0x0FA0 ## $a2 = 00000FA0 -/* 0474C 8083695C 10000012 */ beq $zero, $zero, .L808369A8 -/* 04750 80836960 860300B6 */ lh $v1, 0x00B6($s0) ## 000000B6 -/* 04754 80836964 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -.L80836968: -/* 04758 80836968 0018CB80 */ sll $t9, $t8, 14 -/* 0475C 8083696C 0723000F */ bgezl $t9, .L808369AC -/* 04760 80836970 87A90026 */ lh $t1, 0x0026($sp) -/* 04764 80836974 14C0000C */ bne $a2, $zero, .L808369A8 -/* 04768 80836978 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 0476C 8083697C 8605083E */ lh $a1, 0x083E($s0) ## 0000083E -/* 04770 80836980 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 04774 80836984 24060FA0 */ addiu $a2, $zero, 0x0FA0 ## $a2 = 00000FA0 -/* 04778 80836988 10000007 */ beq $zero, $zero, .L808369A8 -/* 0477C 8083698C 860300B6 */ lh $v1, 0x00B6($s0) ## 000000B6 -.L80836990: -/* 04780 80836990 15000005 */ bne $t0, $zero, .L808369A8 -/* 04784 80836994 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 04788 80836998 8605083C */ lh $a1, 0x083C($s0) ## 0000083C -/* 0478C 8083699C 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 04790 808369A0 240607D0 */ addiu $a2, $zero, 0x07D0 ## $a2 = 000007D0 -/* 04794 808369A4 860300B6 */ lh $v1, 0x00B6($s0) ## 000000B6 -.L808369A8: -/* 04798 808369A8 87A90026 */ lh $t1, 0x0026($sp) -.L808369AC: -/* 0479C 808369AC 00695023 */ subu $t2, $v1, $t1 -/* 047A0 808369B0 A60A087C */ sh $t2, 0x087C($s0) ## 0000087C -/* 047A4 808369B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 047A8 808369B8 8FB00018 */ lw $s0, 0x0018($sp) -/* 047AC 808369BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 047B0 808369C0 03E00008 */ jr $ra -/* 047B4 808369C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808369C8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808369C8.s deleted file mode 100644 index 087b6d2dce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808369C8.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_808369C8 -/* 047B8 808369C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 047BC 808369CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 047C0 808369D0 AFA5001C */ sw $a1, 0x001C($sp) -/* 047C4 808369D4 AFA60020 */ sw $a2, 0x0020($sp) -/* 047C8 808369D8 AFA70024 */ sw $a3, 0x0024($sp) -/* 047CC 808369DC 84830000 */ lh $v1, 0x0000($a0) ## 00000000 -/* 047D0 808369E0 87AE002A */ lh $t6, 0x002A($sp) -/* 047D4 808369E4 87A8002E */ lh $t0, 0x002E($sp) -/* 047D8 808369E8 00073C00 */ sll $a3, $a3, 16 -/* 047DC 808369EC 01C31023 */ subu $v0, $t6, $v1 -/* 047E0 808369F0 00021400 */ sll $v0, $v0, 16 -/* 047E4 808369F4 00021403 */ sra $v0, $v0, 16 -/* 047E8 808369F8 00084023 */ subu $t0, $zero, $t0 -/* 047EC 808369FC 00063400 */ sll $a2, $a2, 16 -/* 047F0 80836A00 00024C00 */ sll $t1, $v0, 16 -/* 047F4 80836A04 0048082A */ slt $at, $v0, $t0 -/* 047F8 80836A08 00063403 */ sra $a2, $a2, 16 -/* 047FC 80836A0C 00073C03 */ sra $a3, $a3, 16 -/* 04800 80836A10 10200004 */ beq $at, $zero, .L80836A24 -/* 04804 80836A14 00094C03 */ sra $t1, $t1, 16 -/* 04808 80836A18 00081400 */ sll $v0, $t0, 16 -/* 0480C 80836A1C 1000000A */ beq $zero, $zero, .L80836A48 -/* 04810 80836A20 00021403 */ sra $v0, $v0, 16 -.L80836A24: -/* 04814 80836A24 87AF002E */ lh $t7, 0x002E($sp) -/* 04818 80836A28 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0481C 80836A2C 01E2082A */ slt $at, $t7, $v0 -/* 04820 80836A30 10200003 */ beq $at, $zero, .L80836A40 -/* 04824 80836A34 00000000 */ nop -/* 04828 80836A38 10000001 */ beq $zero, $zero, .L80836A40 -/* 0482C 80836A3C 01E02825 */ or $a1, $t7, $zero ## $a1 = 00000000 -.L80836A40: -/* 04830 80836A40 00051400 */ sll $v0, $a1, 16 -/* 04834 80836A44 00021403 */ sra $v0, $v0, 16 -.L80836A48: -/* 04838 80836A48 01225023 */ subu $t2, $t1, $v0 -/* 0483C 80836A4C 006A5821 */ addu $t3, $v1, $t2 -/* 04840 80836A50 A48B0000 */ sh $t3, 0x0000($a0) ## 00000000 -/* 04844 80836A54 A7A70026 */ sh $a3, 0x0026($sp) -/* 04848 80836A58 AFA40018 */ sw $a0, 0x0018($sp) -/* 0484C 80836A5C 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 04850 80836A60 87A5001E */ lh $a1, 0x001E($sp) -/* 04854 80836A64 8FA40018 */ lw $a0, 0x0018($sp) -/* 04858 80836A68 87A70026 */ lh $a3, 0x0026($sp) -/* 0485C 80836A6C 84830000 */ lh $v1, 0x0000($a0) ## 00000000 -/* 04860 80836A70 00071023 */ subu $v0, $zero, $a3 -/* 04864 80836A74 00032C00 */ sll $a1, $v1, 16 -/* 04868 80836A78 0062082A */ slt $at, $v1, $v0 -/* 0486C 80836A7C 10200004 */ beq $at, $zero, .L80836A90 -/* 04870 80836A80 00052C03 */ sra $a1, $a1, 16 -/* 04874 80836A84 A4820000 */ sh $v0, 0x0000($a0) ## 00000000 -/* 04878 80836A88 10000006 */ beq $zero, $zero, .L80836AA4 -/* 0487C 80836A8C 84830000 */ lh $v1, 0x0000($a0) ## 00000000 -.L80836A90: -/* 04880 80836A90 00E3082A */ slt $at, $a3, $v1 -/* 04884 80836A94 50200004 */ beql $at, $zero, .L80836AA8 -/* 04888 80836A98 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0488C 80836A9C A4870000 */ sh $a3, 0x0000($a0) ## 00000000 -/* 04890 80836AA0 84830000 */ lh $v1, 0x0000($a0) ## 00000000 -.L80836AA4: -/* 04894 80836AA4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80836AA8: -/* 04898 80836AA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0489C 80836AAC 00A31023 */ subu $v0, $a1, $v1 -/* 048A0 80836AB0 03E00008 */ jr $ra -/* 048A4 80836AB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836AB8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836AB8.s deleted file mode 100644 index f7b46f1ca2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836AB8.s +++ /dev/null @@ -1,80 +0,0 @@ -glabel func_80836AB8 -/* 048A8 80836AB8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 048AC 80836ABC AFBF0024 */ sw $ra, 0x0024($sp) -/* 048B0 80836AC0 AFB10020 */ sw $s1, 0x0020($sp) -/* 048B4 80836AC4 AFB0001C */ sw $s0, 0x001C($sp) -/* 048B8 80836AC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 048BC 80836ACC 10A00008 */ beq $a1, $zero, .L80836AF0 -/* 048C0 80836AD0 849100B6 */ lh $s1, 0x00B6($a0) ## 000000B6 -/* 048C4 80836AD4 948F06AE */ lhu $t7, 0x06AE($a0) ## 000006AE -/* 048C8 80836AD8 848E0044 */ lh $t6, 0x0044($a0) ## 00000044 -/* 048CC 80836ADC 84910046 */ lh $s1, 0x0046($a0) ## 00000046 -/* 048D0 80836AE0 35F80041 */ ori $t8, $t7, 0x0041 ## $t8 = 00000041 -/* 048D4 80836AE4 A49806AE */ sh $t8, 0x06AE($a0) ## 000006AE -/* 048D8 80836AE8 1000003A */ beq $zero, $zero, .L80836BD4 -/* 048DC 80836AEC A48E06BC */ sh $t6, 0x06BC($a0) ## 000006BC -.L80836AF0: -/* 048E0 80836AF0 86050044 */ lh $a1, 0x0044($s0) ## 00000044 -/* 048E4 80836AF4 AFA00014 */ sw $zero, 0x0014($sp) -/* 048E8 80836AF8 260406B6 */ addiu $a0, $s0, 0x06B6 ## $a0 = 000006B6 -/* 048EC 80836AFC 24060258 */ addiu $a2, $zero, 0x0258 ## $a2 = 00000258 -/* 048F0 80836B00 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 -/* 048F4 80836B04 0C20DA72 */ jal func_808369C8 -/* 048F8 80836B08 AFA50010 */ sw $a1, 0x0010($sp) -/* 048FC 80836B0C 861906B6 */ lh $t9, 0x06B6($s0) ## 000006B6 -/* 04900 80836B10 00022C00 */ sll $a1, $v0, 16 -/* 04904 80836B14 24082710 */ addiu $t0, $zero, 0x2710 ## $t0 = 00002710 -/* 04908 80836B18 AFA80014 */ sw $t0, 0x0014($sp) -/* 0490C 80836B1C 00052C03 */ sra $a1, $a1, 16 -/* 04910 80836B20 260406BC */ addiu $a0, $s0, 0x06BC ## $a0 = 000006BC -/* 04914 80836B24 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 04918 80836B28 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 0491C 80836B2C 0C20DA72 */ jal func_808369C8 -/* 04920 80836B30 AFB90010 */ sw $t9, 0x0010($sp) -/* 04924 80836B34 86090046 */ lh $t1, 0x0046($s0) ## 00000046 -/* 04928 80836B38 240C1F40 */ addiu $t4, $zero, 0x1F40 ## $t4 = 00001F40 -/* 0492C 80836B3C 27A40036 */ addiu $a0, $sp, 0x0036 ## $a0 = FFFFFFFE -/* 04930 80836B40 01315023 */ subu $t2, $t1, $s1 -/* 04934 80836B44 A7AA0036 */ sh $t2, 0x0036($sp) -/* 04938 80836B48 860B06BE */ lh $t3, 0x06BE($s0) ## 000006BE -/* 0493C 80836B4C AFAC0014 */ sw $t4, 0x0014($sp) -/* 04940 80836B50 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04944 80836B54 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 04948 80836B58 24075DC0 */ addiu $a3, $zero, 0x5DC0 ## $a3 = 00005DC0 -/* 0494C 80836B5C 0C20DA72 */ jal func_808369C8 -/* 04950 80836B60 AFAB0010 */ sw $t3, 0x0010($sp) -/* 04954 80836B64 87AE0036 */ lh $t6, 0x0036($sp) -/* 04958 80836B68 860D0046 */ lh $t5, 0x0046($s0) ## 00000046 -/* 0495C 80836B6C 860F06BE */ lh $t7, 0x06BE($s0) ## 000006BE -/* 04960 80836B70 24181F40 */ addiu $t8, $zero, 0x1F40 ## $t8 = 00001F40 -/* 04964 80836B74 01AE8823 */ subu $s1, $t5, $t6 -/* 04968 80836B78 01CF2823 */ subu $a1, $t6, $t7 -/* 0496C 80836B7C 00118C00 */ sll $s1, $s1, 16 -/* 04970 80836B80 00052C00 */ sll $a1, $a1, 16 -/* 04974 80836B84 00118C03 */ sra $s1, $s1, 16 -/* 04978 80836B88 00052C03 */ sra $a1, $a1, 16 -/* 0497C 80836B8C AFB80014 */ sw $t8, 0x0014($sp) -/* 04980 80836B90 260406B8 */ addiu $a0, $s0, 0x06B8 ## $a0 = 000006B8 -/* 04984 80836B94 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 04988 80836B98 24071F40 */ addiu $a3, $zero, 0x1F40 ## $a3 = 00001F40 -/* 0498C 80836B9C 0C20DA72 */ jal func_808369C8 -/* 04990 80836BA0 AFAE0010 */ sw $t6, 0x0010($sp) -/* 04994 80836BA4 861906B8 */ lh $t9, 0x06B8($s0) ## 000006B8 -/* 04998 80836BA8 24081F40 */ addiu $t0, $zero, 0x1F40 ## $t0 = 00001F40 -/* 0499C 80836BAC AFA80014 */ sw $t0, 0x0014($sp) -/* 049A0 80836BB0 260406BE */ addiu $a0, $s0, 0x06BE ## $a0 = 000006BE -/* 049A4 80836BB4 87A50036 */ lh $a1, 0x0036($sp) -/* 049A8 80836BB8 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 049AC 80836BBC 24071F40 */ addiu $a3, $zero, 0x1F40 ## $a3 = 00001F40 -/* 049B0 80836BC0 0C20DA72 */ jal func_808369C8 -/* 049B4 80836BC4 AFB90010 */ sw $t9, 0x0010($sp) -/* 049B8 80836BC8 960906AE */ lhu $t1, 0x06AE($s0) ## 000006AE -/* 049BC 80836BCC 352A00D9 */ ori $t2, $t1, 0x00D9 ## $t2 = 000000D9 -/* 049C0 80836BD0 A60A06AE */ sh $t2, 0x06AE($s0) ## 000006AE -.L80836BD4: -/* 049C4 80836BD4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 049C8 80836BD8 02201025 */ or $v0, $s1, $zero ## $v0 = 00000000 -/* 049CC 80836BDC 8FB10020 */ lw $s1, 0x0020($sp) -/* 049D0 80836BE0 8FB0001C */ lw $s0, 0x001C($sp) -/* 049D4 80836BE4 03E00008 */ jr $ra -/* 049D8 80836BE8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836BEC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836BEC.s deleted file mode 100644 index 1e2e0b1614..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836BEC.s +++ /dev/null @@ -1,274 +0,0 @@ -glabel func_80836BEC -/* 049DC 80836BEC 3C0E8086 */ lui $t6, %hi(D_80858AB4) ## $t6 = 80860000 -/* 049E0 80836BF0 8DCE8AB4 */ lw $t6, %lo(D_80858AB4)($t6) -/* 049E4 80836BF4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 049E8 80836BF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 049EC 80836BFC 95C20000 */ lhu $v0, 0x0000($t6) ## 80860000 -/* 049F0 80836C00 2401DFFF */ addiu $at, $zero, 0xDFFF ## $at = FFFFDFFF -/* 049F4 80836C04 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 049F8 80836C08 00411027 */ nor $v0, $v0, $at -/* 049FC 80836C0C 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 04A00 80836C10 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 04A04 80836C14 14400006 */ bne $v0, $zero, .L80836C30 -/* 04A08 80836C18 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 -/* 04A0C 80836C1C 8C8F067C */ lw $t7, 0x067C($a0) ## 0000067C -/* 04A10 80836C20 3C01BFFF */ lui $at, 0xBFFF ## $at = BFFF0000 -/* 04A14 80836C24 3421FFFF */ ori $at, $at, 0xFFFF ## $at = BFFFFFFF -/* 04A18 80836C28 01E1C024 */ and $t8, $t7, $at -/* 04A1C 80836C2C AC98067C */ sw $t8, 0x067C($a0) ## 0000067C -.L80836C30: -/* 04A20 80836C30 90D91D6C */ lbu $t9, 0x1D6C($a2) ## 00001D6C -/* 04A24 80836C34 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 04A28 80836C38 5720000F */ bnel $t9, $zero, .L80836C78 -/* 04A2C 80836C3C ACE0066C */ sw $zero, 0x066C($a3) ## 0000066C -/* 04A30 80836C40 90E90444 */ lbu $t1, 0x0444($a3) ## 00000444 -/* 04A34 80836C44 5520000C */ bnel $t1, $zero, .L80836C78 -/* 04A38 80836C48 ACE0066C */ sw $zero, 0x066C($a3) ## 0000066C -/* 04A3C 80836C4C 8CE3067C */ lw $v1, 0x067C($a3) ## 0000067C -/* 04A40 80836C50 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 04A44 80836C54 34210080 */ ori $at, $at, 0x0080 ## $at = 20000080 -/* 04A48 80836C58 00615024 */ and $t2, $v1, $at -/* 04A4C 80836C5C 55400006 */ bnel $t2, $zero, .L80836C78 -/* 04A50 80836C60 ACE0066C */ sw $zero, 0x066C($a3) ## 0000066C -/* 04A54 80836C64 90EB0692 */ lbu $t3, 0x0692($a3) ## 00000692 -/* 04A58 80836C68 316C0080 */ andi $t4, $t3, 0x0080 ## $t4 = 00000000 -/* 04A5C 80836C6C 11800004 */ beq $t4, $zero, .L80836C80 -/* 04A60 80836C70 00000000 */ nop -/* 04A64 80836C74 ACE0066C */ sw $zero, 0x066C($a3) ## 0000066C -.L80836C78: -/* 04A68 80836C78 1000001E */ beq $zero, $zero, .L80836CF4 -/* 04A6C 80836C7C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80836C80: -/* 04A70 80836C80 5440000A */ bnel $v0, $zero, .L80836CAC -/* 04A74 80836C84 8CE2066C */ lw $v0, 0x066C($a3) ## 0000066C -/* 04A78 80836C88 8CED0680 */ lw $t5, 0x0680($a3) ## 00000680 -/* 04A7C 80836C8C 31AE2000 */ andi $t6, $t5, 0x2000 ## $t6 = 00000000 -/* 04A80 80836C90 55C00006 */ bnel $t6, $zero, .L80836CAC -/* 04A84 80836C94 8CE2066C */ lw $v0, 0x066C($a3) ## 0000066C -/* 04A88 80836C98 8CEF0684 */ lw $t7, 0x0684($a3) ## 00000684 -/* 04A8C 80836C9C 00034B80 */ sll $t1, $v1, 14 -/* 04A90 80836CA0 11E0000B */ beq $t7, $zero, .L80836CD0 -/* 04A94 80836CA4 00000000 */ nop -/* 04A98 80836CA8 8CE2066C */ lw $v0, 0x066C($a3) ## 0000066C -.L80836CAC: -/* 04A9C 80836CAC 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 04AA0 80836CB0 28410006 */ slti $at, $v0, 0x0006 -/* 04AA4 80836CB4 10200003 */ beq $at, $zero, .L80836CC4 -/* 04AA8 80836CB8 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 04AAC 80836CBC 10000002 */ beq $zero, $zero, .L80836CC8 -/* 04AB0 80836CC0 ACF8066C */ sw $t8, 0x066C($a3) ## 0000066C -.L80836CC4: -/* 04AB4 80836CC4 ACF9066C */ sw $t9, 0x066C($a3) ## 0000066C -.L80836CC8: -/* 04AB8 80836CC8 1000000A */ beq $zero, $zero, .L80836CF4 -/* 04ABC 80836CCC 8CE2066C */ lw $v0, 0x066C($a3) ## 0000066C -.L80836CD0: -/* 04AC0 80836CD0 05210003 */ bgez $t1, .L80836CE0 -/* 04AC4 80836CD4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 04AC8 80836CD8 10000006 */ beq $zero, $zero, .L80836CF4 -/* 04ACC 80836CDC ACE0066C */ sw $zero, 0x066C($a3) ## 0000066C -.L80836CE0: -/* 04AD0 80836CE0 8CE2066C */ lw $v0, 0x066C($a3) ## 0000066C -/* 04AD4 80836CE4 10400003 */ beq $v0, $zero, .L80836CF4 -/* 04AD8 80836CE8 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = FFFFFFFF -/* 04ADC 80836CEC ACEA066C */ sw $t2, 0x066C($a3) ## 0000066C -/* 04AE0 80836CF0 01401025 */ or $v0, $t2, $zero ## $v0 = FFFFFFFF -.L80836CF4: -/* 04AE4 80836CF4 28410006 */ slti $at, $v0, 0x0006 -/* 04AE8 80836CF8 54200003 */ bnel $at, $zero, .L80836D08 -/* 04AEC 80836CFC AFA60024 */ sw $a2, 0x0024($sp) -/* 04AF0 80836D00 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 04AF4 80836D04 AFA60024 */ sw $a2, 0x0024($sp) -.L80836D08: -/* 04AF8 80836D08 AFA70020 */ sw $a3, 0x0020($sp) -/* 04AFC 80836D0C 0C20C893 */ jal func_8083224C -/* 04B00 80836D10 AFA8001C */ sw $t0, 0x001C($sp) -/* 04B04 80836D14 8FA60024 */ lw $a2, 0x0024($sp) -/* 04B08 80836D18 1440000A */ bne $v0, $zero, .L80836D44 -/* 04B0C 80836D1C 8FA70020 */ lw $a3, 0x0020($sp) -/* 04B10 80836D20 8CEB066C */ lw $t3, 0x066C($a3) ## 0000066C -/* 04B14 80836D24 15600007 */ bne $t3, $zero, .L80836D44 -/* 04B18 80836D28 00000000 */ nop -/* 04B1C 80836D2C 8CEC067C */ lw $t4, 0x067C($a3) ## 0000067C -/* 04B20 80836D30 3C010200 */ lui $at, 0x0200 ## $at = 02000000 -/* 04B24 80836D34 34211000 */ ori $at, $at, 0x1000 ## $at = 02001000 -/* 04B28 80836D38 01816824 */ and $t5, $t4, $at -/* 04B2C 80836D3C 11A00095 */ beq $t5, $zero, .L80836F94 -/* 04B30 80836D40 00000000 */ nop -.L80836D44: -/* 04B34 80836D44 54400075 */ bnel $v0, $zero, .L80836F1C -/* 04B38 80836D48 8CEB0664 */ lw $t3, 0x0664($a3) ## 00000664 -/* 04B3C 80836D4C 8CE3067C */ lw $v1, 0x067C($a3) ## 0000067C -/* 04B40 80836D50 00037180 */ sll $t6, $v1, 6 -/* 04B44 80836D54 05C2004E */ bltzl $t6, .L80836E90 -/* 04B48 80836D58 8CE40664 */ lw $a0, 0x0664($a3) ## 00000664 -/* 04B4C 80836D5C 80EF0151 */ lb $t7, 0x0151($a3) ## 00000151 -/* 04B50 80836D60 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 04B54 80836D64 3C198086 */ lui $t9, %hi(D_80858AB4) ## $t9 = 80860000 -/* 04B58 80836D68 150F0004 */ bne $t0, $t7, .L80836D7C -/* 04B5C 80836D6C 00000000 */ nop -/* 04B60 80836D70 84F80860 */ lh $t8, 0x0860($a3) ## 00000860 -/* 04B64 80836D74 57000046 */ bnel $t8, $zero, .L80836E90 -/* 04B68 80836D78 8CE40664 */ lw $a0, 0x0664($a3) ## 00000664 -.L80836D7C: -/* 04B6C 80836D7C 8F398AB4 */ lw $t9, %lo(D_80858AB4)($t9) -/* 04B70 80836D80 2401DFFF */ addiu $at, $zero, 0xDFFF ## $at = FFFFDFFF -/* 04B74 80836D84 3C058016 */ lui $a1, %hi(gSaveContext+0x140c) -/* 04B78 80836D88 9729000C */ lhu $t1, 0x000C($t9) ## 8086000C -/* 04B7C 80836D8C 346B8000 */ ori $t3, $v1, 0x8000 ## $t3 = 00008000 -/* 04B80 80836D90 01215027 */ nor $t2, $t1, $at -/* 04B84 80836D94 5540003E */ bnel $t2, $zero, .L80836E90 -/* 04B88 80836D98 8CE40664 */ lw $a0, 0x0664($a3) ## 00000664 -/* 04B8C 80836D9C 90E40002 */ lbu $a0, 0x0002($a3) ## 00000002 -/* 04B90 80836DA0 55040004 */ bnel $t0, $a0, .L80836DB4 -/* 04B94 80836DA4 8CC21C44 */ lw $v0, 0x1C44($a2) ## 00001C44 -/* 04B98 80836DA8 10000002 */ beq $zero, $zero, .L80836DB4 -/* 04B9C 80836DAC 8CC21CC8 */ lw $v0, 0x1CC8($a2) ## 00001CC8 -/* 04BA0 80836DB0 8CC21C44 */ lw $v0, 0x1C44($a2) ## 00001C44 -.L80836DB4: -/* 04BA4 80836DB4 90A5FA6C */ lbu $a1, %lo(gSaveContext+0x140c)($a1) -/* 04BA8 80836DB8 0005282B */ sltu $a1, $zero, $a1 -/* 04BAC 80836DBC 14A00003 */ bne $a1, $zero, .L80836DCC -/* 04BB0 80836DC0 00000000 */ nop -/* 04BB4 80836DC4 01042826 */ xor $a1, $t0, $a0 -/* 04BB8 80836DC8 0005282B */ sltu $a1, $zero, $a1 -.L80836DCC: -/* 04BBC 80836DCC 10400026 */ beq $v0, $zero, .L80836E68 -/* 04BC0 80836DD0 ACEB067C */ sw $t3, 0x067C($a3) ## 0000067C -/* 04BC4 80836DD4 8C4C0004 */ lw $t4, 0x0004($v0) ## 00000004 -/* 04BC8 80836DD8 000C6900 */ sll $t5, $t4, 4 -/* 04BCC 80836DDC 05A20023 */ bltzl $t5, .L80836E6C -/* 04BD0 80836DE0 8CED067C */ lw $t5, 0x067C($a3) ## 0000067C -/* 04BD4 80836DE4 8CE40664 */ lw $a0, 0x0664($a3) ## 00000664 -/* 04BD8 80836DE8 3C01FFDF */ lui $at, 0xFFDF ## $at = FFDF0000 -/* 04BDC 80836DEC 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F -/* 04BE0 80836DF0 14440005 */ bne $v0, $a0, .L80836E08 -/* 04BE4 80836DF4 3421FFFD */ ori $at, $at, 0xFFFD ## $at = FFDFFFFD -/* 04BE8 80836DF8 90EE0002 */ lbu $t6, 0x0002($a3) ## 00000002 -/* 04BEC 80836DFC 150E0002 */ bne $t0, $t6, .L80836E08 -/* 04BF0 80836E00 00000000 */ nop -/* 04BF4 80836E04 8CC21D24 */ lw $v0, 0x1D24($a2) ## 00001D24 -.L80836E08: -/* 04BF8 80836E08 1044000C */ beq $v0, $a0, .L80836E3C -/* 04BFC 80836E0C 00000000 */ nop -/* 04C00 80836E10 54A00005 */ bnel $a1, $zero, .L80836E28 -/* 04C04 80836E14 8CE90680 */ lw $t1, 0x0680($a3) ## 00000680 -/* 04C08 80836E18 8CEF0680 */ lw $t7, 0x0680($a3) ## 00000680 -/* 04C0C 80836E1C 35F82000 */ ori $t8, $t7, 0x2000 ## $t8 = 00002000 -/* 04C10 80836E20 ACF80680 */ sw $t8, 0x0680($a3) ## 00000680 -/* 04C14 80836E24 8CE90680 */ lw $t1, 0x0680($a3) ## 00000680 -.L80836E28: -/* 04C18 80836E28 ACE20664 */ sw $v0, 0x0664($a3) ## 00000664 -/* 04C1C 80836E2C ACF9066C */ sw $t9, 0x066C($a3) ## 0000066C -/* 04C20 80836E30 01215024 */ and $t2, $t1, $at -/* 04C24 80836E34 10000006 */ beq $zero, $zero, .L80836E50 -/* 04C28 80836E38 ACEA0680 */ sw $t2, 0x0680($a3) ## 00000680 -.L80836E3C: -/* 04C2C 80836E3C 14A00004 */ bne $a1, $zero, .L80836E50 -/* 04C30 80836E40 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04C34 80836E44 0C023B7C */ jal func_8008EDF0 -/* 04C38 80836E48 AFA70020 */ sw $a3, 0x0020($sp) -/* 04C3C 80836E4C 8FA70020 */ lw $a3, 0x0020($sp) -.L80836E50: -/* 04C40 80836E50 8CEB067C */ lw $t3, 0x067C($a3) ## 0000067C -/* 04C44 80836E54 3C01BFFF */ lui $at, 0xBFFF ## $at = BFFF0000 -/* 04C48 80836E58 3421FFFF */ ori $at, $at, 0xFFFF ## $at = BFFFFFFF -/* 04C4C 80836E5C 01616024 */ and $t4, $t3, $at -/* 04C50 80836E60 1000000A */ beq $zero, $zero, .L80836E8C -/* 04C54 80836E64 ACEC067C */ sw $t4, 0x067C($a3) ## 0000067C -.L80836E68: -/* 04C58 80836E68 8CED067C */ lw $t5, 0x067C($a3) ## 0000067C -.L80836E6C: -/* 04C5C 80836E6C 3C014002 */ lui $at, 0x4002 ## $at = 40020000 -/* 04C60 80836E70 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04C64 80836E74 01A17024 */ and $t6, $t5, $at -/* 04C68 80836E78 55C00005 */ bnel $t6, $zero, .L80836E90 -/* 04C6C 80836E7C 8CE40664 */ lw $a0, 0x0664($a3) ## 00000664 -/* 04C70 80836E80 0C20D577 */ jal func_808355DC -/* 04C74 80836E84 AFA70020 */ sw $a3, 0x0020($sp) -/* 04C78 80836E88 8FA70020 */ lw $a3, 0x0020($sp) -.L80836E8C: -/* 04C7C 80836E8C 8CE40664 */ lw $a0, 0x0664($a3) ## 00000664 -.L80836E90: -/* 04C80 80836E90 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 04C84 80836E94 5080001D */ beql $a0, $zero, .L80836F0C -/* 04C88 80836E98 8CE20684 */ lw $v0, 0x0684($a3) ## 00000684 -/* 04C8C 80836E9C 90EF0002 */ lbu $t7, 0x0002($a3) ## 00000002 -/* 04C90 80836EA0 550F0014 */ bnel $t0, $t7, .L80836EF4 -/* 04C94 80836EA4 8CE40664 */ lw $a0, 0x0664($a3) ## 00000664 -/* 04C98 80836EA8 8CF80684 */ lw $t8, 0x0684($a3) ## 00000684 -/* 04C9C 80836EAC 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 04CA0 80836EB0 8FA6001C */ lw $a2, 0x001C($sp) -/* 04CA4 80836EB4 5304000F */ beql $t8, $a0, .L80836EF4 -/* 04CA8 80836EB8 8CE40664 */ lw $a0, 0x0664($a3) ## 00000664 -/* 04CAC 80836EBC 0C00BC32 */ jal func_8002F0C8 -/* 04CB0 80836EC0 AFA70020 */ sw $a3, 0x0020($sp) -/* 04CB4 80836EC4 1040000A */ beq $v0, $zero, .L80836EF0 -/* 04CB8 80836EC8 8FA70020 */ lw $a3, 0x0020($sp) -/* 04CBC 80836ECC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04CC0 80836ED0 0C023B7C */ jal func_8008EDF0 -/* 04CC4 80836ED4 AFA70020 */ sw $a3, 0x0020($sp) -/* 04CC8 80836ED8 8FA70020 */ lw $a3, 0x0020($sp) -/* 04CCC 80836EDC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 04CD0 80836EE0 8CF9067C */ lw $t9, 0x067C($a3) ## 0000067C -/* 04CD4 80836EE4 03214825 */ or $t1, $t9, $at ## $t1 = 40000000 -/* 04CD8 80836EE8 1000000B */ beq $zero, $zero, .L80836F18 -/* 04CDC 80836EEC ACE9067C */ sw $t1, 0x067C($a3) ## 0000067C -.L80836EF0: -/* 04CE0 80836EF0 8CE40664 */ lw $a0, 0x0664($a3) ## 00000664 -.L80836EF4: -/* 04CE4 80836EF4 240A0028 */ addiu $t2, $zero, 0x0028 ## $t2 = 00000028 -/* 04CE8 80836EF8 50800008 */ beql $a0, $zero, .L80836F1C -/* 04CEC 80836EFC 8CEB0664 */ lw $t3, 0x0664($a3) ## 00000664 -/* 04CF0 80836F00 10000005 */ beq $zero, $zero, .L80836F18 -/* 04CF4 80836F04 A08A010D */ sb $t2, 0x010D($a0) ## 0000010D -/* 04CF8 80836F08 8CE20684 */ lw $v0, 0x0684($a3) ## 00000684 -.L80836F0C: -/* 04CFC 80836F0C 50400003 */ beql $v0, $zero, .L80836F1C -/* 04D00 80836F10 8CEB0664 */ lw $t3, 0x0664($a3) ## 00000664 -/* 04D04 80836F14 ACE20664 */ sw $v0, 0x0664($a3) ## 00000664 -.L80836F18: -/* 04D08 80836F18 8CEB0664 */ lw $t3, 0x0664($a3) ## 00000664 -.L80836F1C: -/* 04D0C 80836F1C 8CE3067C */ lw $v1, 0x067C($a3) ## 0000067C -/* 04D10 80836F20 3C01FFFC */ lui $at, 0xFFFC ## $at = FFFC0000 -/* 04D14 80836F24 11600010 */ beq $t3, $zero, .L80836F68 -/* 04D18 80836F28 00034B80 */ sll $t1, $v1, 14 -/* 04D1C 80836F2C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFCFFFF -/* 04D20 80836F30 00616024 */ and $t4, $v1, $at -/* 04D24 80836F34 318D0800 */ andi $t5, $t4, 0x0800 ## $t5 = 00000000 -/* 04D28 80836F38 ACEC067C */ sw $t4, 0x067C($a3) ## 0000067C -/* 04D2C 80836F3C 15A00006 */ bne $t5, $zero, .L80836F58 -/* 04D30 80836F40 01801825 */ or $v1, $t4, $zero ## $v1 = 00000000 -/* 04D34 80836F44 8CEE0664 */ lw $t6, 0x0664($a3) ## 00000664 -/* 04D38 80836F48 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 04D3C 80836F4C 8DCF0004 */ lw $t7, 0x0004($t6) ## 00000004 -/* 04D40 80836F50 31F80005 */ andi $t8, $t7, 0x0005 ## $t8 = 00000000 -/* 04D44 80836F54 13010011 */ beq $t8, $at, .L80836F9C -.L80836F58: -/* 04D48 80836F58 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04D4C 80836F5C 0061C825 */ or $t9, $v1, $at ## $t9 = 00010000 -/* 04D50 80836F60 1000000E */ beq $zero, $zero, .L80836F9C -/* 04D54 80836F64 ACF9067C */ sw $t9, 0x067C($a3) ## 0000067C -.L80836F68: -/* 04D58 80836F68 05210006 */ bgez $t1, .L80836F84 -/* 04D5C 80836F6C 00000000 */ nop -/* 04D60 80836F70 8CEA0680 */ lw $t2, 0x0680($a3) ## 00000680 -/* 04D64 80836F74 2401DFFF */ addiu $at, $zero, 0xDFFF ## $at = FFFFDFFF -/* 04D68 80836F78 01415824 */ and $t3, $t2, $at -/* 04D6C 80836F7C 10000007 */ beq $zero, $zero, .L80836F9C -/* 04D70 80836F80 ACEB0680 */ sw $t3, 0x0680($a3) ## 00000680 -.L80836F84: -/* 04D74 80836F84 0C023B82 */ jal func_8008EE08 -/* 04D78 80836F88 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04D7C 80836F8C 10000004 */ beq $zero, $zero, .L80836FA0 -/* 04D80 80836F90 8FBF0014 */ lw $ra, 0x0014($sp) -.L80836F94: -/* 04D84 80836F94 0C023B82 */ jal func_8008EE08 -/* 04D88 80836F98 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L80836F9C: -/* 04D8C 80836F9C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80836FA0: -/* 04D90 80836FA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04D94 80836FA4 03E00008 */ jr $ra -/* 04D98 80836FA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836FAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836FAC.s deleted file mode 100644 index e3bc624e26..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836FAC.s +++ /dev/null @@ -1,186 +0,0 @@ -.late_rodata -glabel D_80855364 - .float 0.8 - -glabel D_80855368 - .float 0.6 - -glabel D_8085536C - .float 0.008 - -glabel D_80855370 - .word 0x3E0F5C29 - -.text -glabel func_80836FAC -/* 04D9C 80836FAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04DA0 80836FB0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04DA4 80836FB4 90AE06AD */ lbu $t6, 0x06AD($a1) ## 000006AD -/* 04DA8 80836FB8 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 04DAC 80836FBC 01E47821 */ addu $t7, $t7, $a0 -/* 04DB0 80836FC0 55C0000B */ bnel $t6, $zero, .L80836FF0 -/* 04DB4 80836FC4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 04DB8 80836FC8 81EF1E15 */ lb $t7, 0x1E15($t7) ## 00011E15 -/* 04DBC 80836FCC 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 04DC0 80836FD0 51E10007 */ beql $t7, $at, .L80836FF0 -/* 04DC4 80836FD4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 04DC8 80836FD8 8CB8067C */ lw $t8, 0x067C($a1) ## 0000067C -/* 04DCC 80836FDC 3C018085 */ lui $at, %hi(D_808535D4) ## $at = 80850000 -/* 04DD0 80836FE0 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 04DD4 80836FE4 13200007 */ beq $t9, $zero, .L80837004 -/* 04DD8 80836FE8 00000000 */ nop -/* 04DDC 80836FEC 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -.L80836FF0: -/* 04DE0 80836FF0 00000000 */ nop -/* 04DE4 80836FF4 E4D00000 */ swc1 $f16, 0x0000($a2) ## 00000000 -/* 04DE8 80836FF8 84A800B6 */ lh $t0, 0x00B6($a1) ## 000000B6 -/* 04DEC 80836FFC 10000082 */ beq $zero, $zero, .L80837208 -/* 04DF0 80837000 A4E80000 */ sh $t0, 0x0000($a3) ## 00000000 -.L80837004: -/* 04DF4 80837004 C42435D4 */ lwc1 $f4, %lo(D_808535D4)($at) -/* 04DF8 80837008 3C098085 */ lui $t1, %hi(D_808535D8) ## $t1 = 80850000 -/* 04DFC 8083700C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 04E00 80837010 E4C40000 */ swc1 $f4, 0x0000($a2) ## 00000000 -/* 04E04 80837014 852935D8 */ lh $t1, %lo(D_808535D8)($t1) -/* 04E08 80837018 3C018085 */ lui $at, %hi(D_80855364) ## $at = 80850000 -/* 04E0C 8083701C A4E90000 */ sh $t1, 0x0000($a3) ## 00000000 -/* 04E10 80837020 C7A60028 */ lwc1 $f6, 0x0028($sp) -/* 04E14 80837024 46103032 */ c.eq.s $f6, $f16 -/* 04E18 80837028 00000000 */ nop -/* 04E1C 8083702C 45030028 */ bc1tl .L808370D0 -/* 04E20 80837030 C4D20000 */ lwc1 $f18, 0x0000($a2) ## 00000000 -/* 04E24 80837034 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 04E28 80837038 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 04E2C 8083703C C4C80000 */ lwc1 $f8, 0x0000($a2) ## 00000000 -/* 04E30 80837040 3C0143E1 */ lui $at, 0x43E1 ## $at = 43E10000 -/* 04E34 80837044 460A4481 */ sub.s $f18, $f8, $f10 -/* 04E38 80837048 E4D20000 */ swc1 $f18, 0x0000($a2) ## 00000000 -/* 04E3C 8083704C C4C00000 */ lwc1 $f0, 0x0000($a2) ## 00000000 -/* 04E40 80837050 4610003C */ c.lt.s $f0, $f16 -/* 04E44 80837054 00000000 */ nop -/* 04E48 80837058 45020004 */ bc1fl .L8083706C -/* 04E4C 8083705C 44812000 */ mtc1 $at, $f4 ## $f4 = 450.00 -/* 04E50 80837060 1000001E */ beq $zero, $zero, .L808370DC -/* 04E54 80837064 E4D00000 */ swc1 $f16, 0x0000($a2) ## 00000000 -/* 04E58 80837068 44812000 */ mtc1 $at, $f4 ## $f4 = 450.00 -.L8083706C: -/* 04E5C 8083706C AFA5001C */ sw $a1, 0x001C($sp) -/* 04E60 80837070 AFA60020 */ sw $a2, 0x0020($sp) -/* 04E64 80837074 46040182 */ mul.s $f6, $f0, $f4 -/* 04E68 80837078 4600320D */ trunc.w.s $f8, $f6 -/* 04E6C 8083707C 44044000 */ mfc1 $a0, $f8 -/* 04E70 80837080 00000000 */ nop -/* 04E74 80837084 00042400 */ sll $a0, $a0, 16 -/* 04E78 80837088 0C01DE0D */ jal Math_Coss - ## coss? -/* 04E7C 8083708C 00042403 */ sra $a0, $a0, 16 -/* 04E80 80837090 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04E84 80837094 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 04E88 80837098 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 04E8C 8083709C 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 04E90 808370A0 46005081 */ sub.s $f2, $f10, $f0 -/* 04E94 808370A4 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 04E98 808370A8 44814000 */ mtc1 $at, $f8 ## $f8 = 7.00 -/* 04E9C 808370AC 8FA60020 */ lw $a2, 0x0020($sp) -/* 04EA0 808370B0 46021482 */ mul.s $f18, $f2, $f2 -/* 04EA4 808370B4 8FA5001C */ lw $a1, 0x001C($sp) -/* 04EA8 808370B8 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 04EAC 808370BC 46049182 */ mul.s $f6, $f18, $f4 -/* 04EB0 808370C0 46083280 */ add.s $f10, $f6, $f8 -/* 04EB4 808370C4 10000005 */ beq $zero, $zero, .L808370DC -/* 04EB8 808370C8 E4CA0000 */ swc1 $f10, 0x0000($a2) ## 00000000 -/* 04EBC 808370CC C4D20000 */ lwc1 $f18, 0x0000($a2) ## 00000000 -.L808370D0: -/* 04EC0 808370D0 C4245364 */ lwc1 $f4, %lo(D_80855364)($at) -/* 04EC4 808370D4 46049182 */ mul.s $f6, $f18, $f4 -/* 04EC8 808370D8 E4C60000 */ swc1 $f6, 0x0000($a2) ## 00000000 -.L808370DC: -/* 04ECC 808370DC 3C018085 */ lui $at, %hi(D_808535D4) ## $at = 80850000 -/* 04ED0 808370E0 C42835D4 */ lwc1 $f8, %lo(D_808535D4)($at) -/* 04ED4 808370E4 46088032 */ c.eq.s $f16, $f8 -/* 04ED8 808370E8 00000000 */ nop -/* 04EDC 808370EC 45030047 */ bc1tl .L8083720C -/* 04EE0 808370F0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 04EE4 808370F4 84A40898 */ lh $a0, 0x0898($a1) ## 00000898 -/* 04EE8 808370F8 AFA60020 */ sw $a2, 0x0020($sp) -/* 04EEC 808370FC 0C01DE1C */ jal Math_Sins - ## sins? -/* 04EF0 80837100 AFA5001C */ sw $a1, 0x001C($sp) -/* 04EF4 80837104 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 04EF8 80837108 8FA5001C */ lw $a1, 0x001C($sp) -/* 04EFC 8083710C 8FA60020 */ lw $a2, 0x0020($sp) -/* 04F00 80837110 4610003C */ c.lt.s $f0, $f16 -/* 04F04 80837114 3C018085 */ lui $at, %hi(D_80855368) ## $at = 80850000 -/* 04F08 80837118 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 04F0C 8083711C C4AC0880 */ lwc1 $f12, 0x0880($a1) ## 00000880 -/* 04F10 80837120 45000003 */ bc1f .L80837130 -/* 04F14 80837124 00000000 */ nop -/* 04F18 80837128 1000000A */ beq $zero, $zero, .L80837154 -/* 04F1C 8083712C 46008386 */ mov.s $f14, $f16 -.L80837130: -/* 04F20 80837130 C42E5368 */ lwc1 $f14, %lo(D_80855368)($at) -/* 04F24 80837134 4600703C */ c.lt.s $f14, $f0 -/* 04F28 80837138 00000000 */ nop -/* 04F2C 8083713C 45020004 */ bc1fl .L80837150 -/* 04F30 80837140 46000086 */ mov.s $f2, $f0 -/* 04F34 80837144 10000002 */ beq $zero, $zero, .L80837150 -/* 04F38 80837148 46007086 */ mov.s $f2, $f14 -/* 04F3C 8083714C 46000086 */ mov.s $f2, $f0 -.L80837150: -/* 04F40 80837150 46001386 */ mov.s $f14, $f2 -.L80837154: -/* 04F44 80837154 C4A006C4 */ lwc1 $f0, 0x06C4($a1) ## 000006C4 -/* 04F48 80837158 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 04F4C 8083715C 46008032 */ c.eq.s $f16, $f0 -/* 04F50 80837160 00000000 */ nop -/* 04F54 80837164 4501000B */ bc1t .L80837194 -/* 04F58 80837168 00000000 */ nop -/* 04F5C 8083716C 44811000 */ mtc1 $at, $f2 ## $f2 = 2.00 -/* 04F60 80837170 3C018085 */ lui $at, %hi(D_8085536C) ## $at = 80850000 -/* 04F64 80837174 C42A536C */ lwc1 $f10, %lo(D_8085536C)($at) -/* 04F68 80837178 460A0482 */ mul.s $f18, $f0, $f10 -/* 04F6C 8083717C 46126301 */ sub.s $f12, $f12, $f18 -/* 04F70 80837180 4602603C */ c.lt.s $f12, $f2 -/* 04F74 80837184 00000000 */ nop -/* 04F78 80837188 45000002 */ bc1f .L80837194 -/* 04F7C 8083718C 00000000 */ nop -/* 04F80 80837190 46001306 */ mov.s $f12, $f2 -.L80837194: -/* 04F84 80837194 3C018085 */ lui $at, %hi(D_80855370) ## $at = 80850000 -/* 04F88 80837198 C4265370 */ lwc1 $f6, %lo(D_80855370)($at) -/* 04F8C 8083719C C4C40000 */ lwc1 $f4, 0x0000($a2) ## 00000000 -/* 04F90 808371A0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 04F94 808371A4 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 04F98 808371A8 46062202 */ mul.s $f8, $f4, $f6 -/* 04F9C 808371AC 00000000 */ nop -/* 04FA0 808371B0 460E5482 */ mul.s $f18, $f10, $f14 -/* 04FA4 808371B4 00000000 */ nop -/* 04FA8 808371B8 460E9102 */ mul.s $f4, $f18, $f14 -/* 04FAC 808371BC 46044181 */ sub.s $f6, $f8, $f4 -/* 04FB0 808371C0 E4C60000 */ swc1 $f6, 0x0000($a2) ## 00000000 -/* 04FB4 808371C4 C4C00000 */ lwc1 $f0, 0x0000($a2) ## 00000000 -/* 04FB8 808371C8 4610003C */ c.lt.s $f0, $f16 -/* 04FBC 808371CC 00000000 */ nop -/* 04FC0 808371D0 45000003 */ bc1f .L808371E0 -/* 04FC4 808371D4 00000000 */ nop -/* 04FC8 808371D8 1000000C */ beq $zero, $zero, .L8083720C -/* 04FCC 808371DC E4D00000 */ swc1 $f16, 0x0000($a2) ## 00000000 -.L808371E0: -/* 04FD0 808371E0 4600603C */ c.lt.s $f12, $f0 -/* 04FD4 808371E4 00000000 */ nop -/* 04FD8 808371E8 45020004 */ bc1fl .L808371FC -/* 04FDC 808371EC 46000086 */ mov.s $f2, $f0 -/* 04FE0 808371F0 10000002 */ beq $zero, $zero, .L808371FC -/* 04FE4 808371F4 46006086 */ mov.s $f2, $f12 -/* 04FE8 808371F8 46000086 */ mov.s $f2, $f0 -.L808371FC: -/* 04FEC 808371FC E4C20000 */ swc1 $f2, 0x0000($a2) ## 00000000 -/* 04FF0 80837200 10000002 */ beq $zero, $zero, .L8083720C -/* 04FF4 80837204 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80837208: -/* 04FF8 80837208 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083720C: -/* 04FFC 8083720C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05000 80837210 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05004 80837214 03E00008 */ jr $ra -/* 05008 80837218 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083721C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083721C.s deleted file mode 100644 index 29e02663cf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083721C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8083721C -/* 0500C 8083721C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 05010 80837220 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 05014 80837224 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05018 80837228 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0501C 8083722C 85CF006A */ lh $t7, 0x006A($t6) ## 8016006A -/* 05020 80837230 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 05024 80837234 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 05028 80837238 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 0502C 8083723C 24840838 */ addiu $a0, $a0, 0x0838 ## $a0 = 00000838 -/* 05030 80837240 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 05034 80837244 468021A0 */ cvt.s.w $f6, $f4 -/* 05038 80837248 46083283 */ div.s $f10, $f6, $f8 -/* 0503C 8083724C 44065000 */ mfc1 $a2, $f10 -/* 05040 80837250 0C01DE80 */ jal Math_ApproxF - -/* 05044 80837254 00000000 */ nop -/* 05048 80837258 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0504C 8083725C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05050 80837260 03E00008 */ jr $ra -/* 05054 80837264 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837268.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837268.s deleted file mode 100644 index ac511df247..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837268.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_80837268 -/* 05058 80837268 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0505C 8083726C AFB10020 */ sw $s1, 0x0020($sp) -/* 05060 80837270 44876000 */ mtc1 $a3, $f12 ## $f12 = 0.00 -/* 05064 80837274 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 05068 80837278 AFB0001C */ sw $s0, 0x001C($sp) -/* 0506C 8083727C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05070 80837280 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 05074 80837284 AFBF0024 */ sw $ra, 0x0024($sp) -/* 05078 80837288 AFA5002C */ sw $a1, 0x002C($sp) -/* 0507C 8083728C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05080 80837290 8FA40038 */ lw $a0, 0x0038($sp) -/* 05084 80837294 02203825 */ or $a3, $s1, $zero ## $a3 = 00000000 -/* 05088 80837298 0C20DBEB */ jal func_80836FAC -/* 0508C 8083729C E7AC0010 */ swc1 $f12, 0x0010($sp) -/* 05090 808372A0 1440001B */ bne $v0, $zero, .L80837310 -/* 05094 808372A4 8FA30038 */ lw $v1, 0x0038($sp) -/* 05098 808372A8 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 0509C 808372AC A62E0000 */ sh $t6, 0x0000($s1) ## 00000000 -/* 050A0 808372B0 8E020664 */ lw $v0, 0x0664($s0) ## 00000664 -/* 050A4 808372B4 1040000E */ beq $v0, $zero, .L808372F0 -/* 050A8 808372B8 00000000 */ nop -/* 050AC 808372BC 906F1CDB */ lbu $t7, 0x1CDB($v1) ## 00001CDB -/* 050B0 808372C0 11E00011 */ beq $t7, $zero, .L80837308 -/* 050B4 808372C4 00000000 */ nop -/* 050B8 808372C8 8E180680 */ lw $t8, 0x0680($s0) ## 00000680 -/* 050BC 808372CC 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 050C0 808372D0 33190040 */ andi $t9, $t8, 0x0040 ## $t9 = 00000000 -/* 050C4 808372D4 1720000C */ bne $t9, $zero, .L80837308 -/* 050C8 808372D8 00000000 */ nop -/* 050CC 808372DC 0C01E01A */ jal Math_Vec3f_Yaw - -/* 050D0 808372E0 24450038 */ addiu $a1, $v0, 0x0038 ## $a1 = 00000038 -/* 050D4 808372E4 A6220000 */ sh $v0, 0x0000($s1) ## 00000000 -/* 050D8 808372E8 10000012 */ beq $zero, $zero, .L80837334 -/* 050DC 808372EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808372F0: -/* 050E0 808372F0 0C20CECB */ jal func_80833B2C -/* 050E4 808372F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 050E8 808372F8 10400003 */ beq $v0, $zero, .L80837308 -/* 050EC 808372FC 00000000 */ nop -/* 050F0 80837300 8608083E */ lh $t0, 0x083E($s0) ## 0000083E -/* 050F4 80837304 A6280000 */ sh $t0, 0x0000($s1) ## 00000000 -.L80837308: -/* 050F8 80837308 1000000A */ beq $zero, $zero, .L80837334 -/* 050FC 8083730C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80837310: -/* 05100 80837310 846907A0 */ lh $t1, 0x07A0($v1) ## 000007A0 -/* 05104 80837314 00095080 */ sll $t2, $t1, 2 -/* 05108 80837318 006A5821 */ addu $t3, $v1, $t2 -/* 0510C 8083731C 0C016A52 */ jal func_8005A948 -/* 05110 80837320 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 -/* 05114 80837324 862C0000 */ lh $t4, 0x0000($s1) ## 00000000 -/* 05118 80837328 01826821 */ addu $t5, $t4, $v0 -/* 0511C 8083732C A62D0000 */ sh $t5, 0x0000($s1) ## 00000000 -/* 05120 80837330 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80837334: -/* 05124 80837334 8FBF0024 */ lw $ra, 0x0024($sp) -/* 05128 80837338 8FB0001C */ lw $s0, 0x001C($sp) -/* 0512C 8083733C 8FB10020 */ lw $s1, 0x0020($sp) -/* 05130 80837340 03E00008 */ jr $ra -/* 05134 80837344 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837348.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837348.s deleted file mode 100644 index 876908564e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837348.s +++ /dev/null @@ -1,94 +0,0 @@ -glabel func_80837348 -/* 05138 80837348 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0513C 8083734C AFBF0024 */ sw $ra, 0x0024($sp) -/* 05140 80837350 AFB30020 */ sw $s3, 0x0020($sp) -/* 05144 80837354 AFB2001C */ sw $s2, 0x001C($sp) -/* 05148 80837358 AFB10018 */ sw $s1, 0x0018($sp) -/* 0514C 8083735C AFB00014 */ sw $s0, 0x0014($sp) -/* 05150 80837360 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C -/* 05154 80837364 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 05158 80837368 34210081 */ ori $at, $at, 0x0081 ## $at = 20000081 -/* 0515C 8083736C 01C17824 */ and $t7, $t6, $at -/* 05160 80837370 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 05164 80837374 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 05168 80837378 15E00041 */ bne $t7, $zero, .L80837480 -/* 0516C 8083737C 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 05170 80837380 10E0000C */ beq $a3, $zero, .L808373B4 -/* 05174 80837384 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 05178 80837388 0C20D99C */ jal func_80836670 -/* 0517C 8083738C 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 05180 80837390 3C018085 */ lui $at, %hi(D_808535E0) ## $at = 80850000 -/* 05184 80837394 AC2235E0 */ sw $v0, %lo(D_808535E0)($at) -/* 05188 80837398 8E580674 */ lw $t8, 0x0674($s2) ## 00000674 -/* 0518C 8083739C 3C198085 */ lui $t9, %hi(func_8084E604) ## $t9 = 80850000 -/* 05190 808373A0 2739E604 */ addiu $t9, $t9, %lo(func_8084E604) ## $t9 = 8084E604 -/* 05194 808373A4 17190003 */ bne $t8, $t9, .L808373B4 -/* 05198 808373A8 00000000 */ nop -/* 0519C 808373AC 10000035 */ beq $zero, $zero, .L80837484 -/* 051A0 808373B0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808373B4: -/* 051A4 808373B4 0C023C4A */ jal func_8008F128 -/* 051A8 808373B8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 051AC 808373BC 50400007 */ beql $v0, $zero, .L808373DC -/* 051B0 808373C0 8E4A067C */ lw $t2, 0x067C($s2) ## 0000067C -/* 051B4 808373C4 964806AE */ lhu $t0, 0x06AE($s2) ## 000006AE -/* 051B8 808373C8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 051BC 808373CC 35090041 */ ori $t1, $t0, 0x0041 ## $t1 = 00000041 -/* 051C0 808373D0 1000002C */ beq $zero, $zero, .L80837484 -/* 051C4 808373D4 A64906AE */ sh $t1, 0x06AE($s2) ## 000006AE -/* 051C8 808373D8 8E4A067C */ lw $t2, 0x067C($s2) ## 0000067C -.L808373DC: -/* 051CC 808373DC 314B0100 */ andi $t3, $t2, 0x0100 ## $t3 = 00000000 -/* 051D0 808373E0 55600028 */ bnel $t3, $zero, .L80837484 -/* 051D4 808373E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 051D8 808373E8 8E4C082C */ lw $t4, 0x082C($s2) ## 0000082C -/* 051DC 808373EC 3C0D8083 */ lui $t5, %hi(func_80834A2C) ## $t5 = 80830000 -/* 051E0 808373F0 25AD4A2C */ addiu $t5, $t5, %lo(func_80834A2C) ## $t5 = 80834A2C -/* 051E4 808373F4 518D0023 */ beql $t4, $t5, .L80837484 -/* 051E8 808373F8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 051EC 808373FC 82020000 */ lb $v0, 0x0000($s0) ## 00000000 -/* 051F0 80837400 3C118085 */ lui $s1, %hi(D_80854448) ## $s1 = 80850000 -/* 051F4 80837404 26314448 */ addiu $s1, $s1, %lo(D_80854448) ## $s1 = 80854448 -/* 051F8 80837408 0440000F */ bltz $v0, .L80837448 -/* 051FC 8083740C 00027080 */ sll $t6, $v0, 2 -.L80837410: -/* 05200 80837410 022E7821 */ addu $t7, $s1, $t6 -/* 05204 80837414 8DF90000 */ lw $t9, 0x0000($t7) ## 00000000 -/* 05208 80837418 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0520C 8083741C 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 05210 80837420 0320F809 */ jalr $ra, $t9 -/* 05214 80837424 00000000 */ nop -/* 05218 80837428 50400004 */ beql $v0, $zero, .L8083743C -/* 0521C 8083742C 82020001 */ lb $v0, 0x0001($s0) ## 00000001 -/* 05220 80837430 10000014 */ beq $zero, $zero, .L80837484 -/* 05224 80837434 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 05228 80837438 82020001 */ lb $v0, 0x0001($s0) ## 00000001 -.L8083743C: -/* 0522C 8083743C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 05230 80837440 0443FFF3 */ bgezl $v0, .L80837410 -/* 05234 80837444 00027080 */ sll $t6, $v0, 2 -.L80837448: -/* 05238 80837448 3C118085 */ lui $s1, %hi(D_80854448) ## $s1 = 80850000 -/* 0523C 8083744C 0002C023 */ subu $t8, $zero, $v0 -/* 05240 80837450 26314448 */ addiu $s1, $s1, %lo(D_80854448) ## $s1 = 80854448 -/* 05244 80837454 00184080 */ sll $t0, $t8, 2 -/* 05248 80837458 02284821 */ addu $t1, $s1, $t0 -/* 0524C 8083745C 8D390000 */ lw $t9, 0x0000($t1) ## 00000000 -/* 05250 80837460 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 05254 80837464 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 05258 80837468 0320F809 */ jalr $ra, $t9 -/* 0525C 8083746C 00000000 */ nop -/* 05260 80837470 50400004 */ beql $v0, $zero, .L80837484 -/* 05264 80837474 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 05268 80837478 10000002 */ beq $zero, $zero, .L80837484 -/* 0526C 8083747C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80837480: -/* 05270 80837480 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80837484: -/* 05274 80837484 8FBF0024 */ lw $ra, 0x0024($sp) -/* 05278 80837488 8FB00014 */ lw $s0, 0x0014($sp) -/* 0527C 8083748C 8FB10018 */ lw $s1, 0x0018($sp) -/* 05280 80837490 8FB2001C */ lw $s2, 0x001C($sp) -/* 05284 80837494 8FB30020 */ lw $s3, 0x0020($sp) -/* 05288 80837498 03E00008 */ jr $ra -/* 0528C 8083749C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808374A0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808374A0.s deleted file mode 100644 index 11068a0036..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808374A0.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_808374A0 -/* 05290 808374A0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 05294 808374A4 AFBF001C */ sw $ra, 0x001C($sp) -/* 05298 808374A8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0529C 808374AC AFA5002C */ sw $a1, 0x002C($sp) -/* 052A0 808374B0 44876000 */ mtc1 $a3, $f12 ## $f12 = 0.00 -/* 052A4 808374B4 C4C60010 */ lwc1 $f6, 0x0010($a2) ## 00000010 -/* 052A8 808374B8 C4C40018 */ lwc1 $f4, 0x0018($a2) ## 00000018 -/* 052AC 808374BC 3C068085 */ lui $a2, %hi(D_80854418) ## $a2 = 80850000 -/* 052B0 808374C0 460C3201 */ sub.s $f8, $f6, $f12 -/* 052B4 808374C4 24C64418 */ addiu $a2, $a2, %lo(D_80854418) ## $a2 = 80854418 -/* 052B8 808374C8 4604403E */ c.le.s $f8, $f4 -/* 052BC 808374CC 00000000 */ nop -/* 052C0 808374D0 45020013 */ bc1fl .L80837520 -/* 052C4 808374D4 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 052C8 808374D8 0C20DCD2 */ jal func_80837348 -/* 052CC 808374DC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 052D0 808374E0 10400003 */ beq $v0, $zero, .L808374F0 -/* 052D4 808374E4 8FA4002C */ lw $a0, 0x002C($sp) -/* 052D8 808374E8 1000000D */ beq $zero, $zero, .L80837520 -/* 052DC 808374EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808374F0: -/* 052E0 808374F0 8FAE0028 */ lw $t6, 0x0028($sp) -/* 052E4 808374F4 3C073C93 */ lui $a3, 0x3C93 ## $a3 = 3C930000 -/* 052E8 808374F8 34E774BC */ ori $a3, $a3, 0x74BC ## $a3 = 3C9374BC -/* 052EC 808374FC 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFFC -/* 052F0 80837500 27A60022 */ addiu $a2, $sp, 0x0022 ## $a2 = FFFFFFFA -/* 052F4 80837504 0C20DC9A */ jal func_80837268 -/* 052F8 80837508 AFAE0010 */ sw $t6, 0x0010($sp) -/* 052FC 8083750C 50400004 */ beql $v0, $zero, .L80837520 -/* 05300 80837510 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 05304 80837514 10000002 */ beq $zero, $zero, .L80837520 -/* 05308 80837518 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0530C 8083751C 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -.L80837520: -/* 05310 80837520 8FBF001C */ lw $ra, 0x001C($sp) -/* 05314 80837524 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 05318 80837528 03E00008 */ jr $ra -/* 0531C 8083752C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837530.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837530.s deleted file mode 100644 index a5331e15ba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837530.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80837530 -/* 05320 80837530 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 05324 80837534 AFB00030 */ sw $s0, 0x0030($sp) -/* 05328 80837538 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0532C 8083753C AFBF0034 */ sw $ra, 0x0034($sp) -/* 05330 80837540 AFA40038 */ sw $a0, 0x0038($sp) -/* 05334 80837544 10C00004 */ beq $a2, $zero, .L80837558 -/* 05338 80837548 AFA60040 */ sw $a2, 0x0040($sp) -/* 0533C 8083754C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 05340 80837550 10000005 */ beq $zero, $zero, .L80837568 -/* 05344 80837554 E4A40858 */ swc1 $f4, 0x0858($a1) ## 00000858 -.L80837558: -/* 05348 80837558 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0534C 8083755C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 05350 80837560 00000000 */ nop -/* 05354 80837564 E6060858 */ swc1 $f6, 0x0858($s0) ## 00000858 -.L80837568: -/* 05358 80837568 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 0535C 8083756C 92190002 */ lbu $t9, 0x0002($s0) ## 00000002 -/* 05360 80837570 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 05364 80837574 35F81000 */ ori $t8, $t7, 0x1000 ## $t8 = 00001000 -/* 05368 80837578 17210012 */ bne $t9, $at, .L808375C4 -/* 0536C 8083757C AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 05370 80837580 0C023C60 */ jal func_8008F180 -/* 05374 80837584 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05378 80837588 C608090C */ lwc1 $f8, 0x090C($s0) ## 0000090C -/* 0537C 8083758C 8E070908 */ lw $a3, 0x0908($s0) ## 00000908 -/* 05380 80837590 8FA80040 */ lw $t0, 0x0040($sp) -/* 05384 80837594 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 05388 80837598 C60A0910 */ lwc1 $f10, 0x0910($s0) ## 00000910 -/* 0538C 8083759C 8FA50038 */ lw $a1, 0x0038($sp) -/* 05390 808375A0 00484825 */ or $t1, $v0, $t0 ## $t1 = 00000000 -/* 05394 808375A4 AFA90024 */ sw $t1, 0x0024($sp) -/* 05398 808375A8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0539C 808375AC AFA0001C */ sw $zero, 0x001C($sp) -/* 053A0 808375B0 AFA00018 */ sw $zero, 0x0018($sp) -/* 053A4 808375B4 24060057 */ addiu $a2, $zero, 0x0057 ## $a2 = 00000057 -/* 053A8 808375B8 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 053AC 808375BC 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 053B0 808375C0 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -.L808375C4: -/* 053B4 808375C4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 053B8 808375C8 8FB00030 */ lw $s0, 0x0030($sp) -/* 053BC 808375CC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 053C0 808375D0 03E00008 */ jr $ra -/* 053C4 808375D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808375D8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808375D8.s deleted file mode 100644 index 693a0194f4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808375D8.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_808375D8 -/* 053C8 808375D8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 053CC 808375DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 053D0 808375E0 808E0151 */ lb $t6, 0x0151($a0) ## 00000151 -/* 053D4 808375E4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 053D8 808375E8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 053DC 808375EC 11C10005 */ beq $t6, $at, .L80837604 -/* 053E0 808375F0 00000000 */ nop -/* 053E4 808375F4 0C023C73 */ jal func_8008F1CC -/* 053E8 808375F8 AFA60040 */ sw $a2, 0x0040($sp) -/* 053EC 808375FC 10400003 */ beq $v0, $zero, .L8083760C -/* 053F0 80837600 8FA60040 */ lw $a2, 0x0040($sp) -.L80837604: -/* 053F4 80837604 1000003B */ beq $zero, $zero, .L808376F4 -/* 053F8 80837608 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083760C: -/* 053FC 8083760C 24C40847 */ addiu $a0, $a2, 0x0847 ## $a0 = 00000847 -/* 05400 80837610 27A3003C */ addiu $v1, $sp, 0x003C ## $v1 = FFFFFFFC -/* 05404 80837614 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -.L80837618: -/* 05408 80837618 80820000 */ lb $v0, 0x0000($a0) ## 00000847 -/* 0540C 8083761C 24A50001 */ addiu $a1, $a1, 0x0001 ## $a1 = 00000001 -/* 05410 80837620 24840001 */ addiu $a0, $a0, 0x0001 ## $a0 = 00000848 -/* 05414 80837624 04410003 */ bgez $v0, .L80837634 -/* 05418 80837628 A0620000 */ sb $v0, 0x0000($v1) ## FFFFFFFC -/* 0541C 8083762C 10000031 */ beq $zero, $zero, .L808376F4 -/* 05420 80837630 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80837634: -/* 05424 80837634 806F0000 */ lb $t7, 0x0000($v1) ## FFFFFFFC -/* 05428 80837638 28A10004 */ slti $at, $a1, 0x0004 -/* 0542C 8083763C 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = FFFFFFFD -/* 05430 80837640 000FC040 */ sll $t8, $t7, 1 -/* 05434 80837644 1420FFF4 */ bne $at, $zero, .L80837618 -/* 05438 80837648 A078FFFF */ sb $t8, -0x0001($v1) ## FFFFFFFC -/* 0543C 8083764C 83B9003C */ lb $t9, 0x003C($sp) -/* 05440 80837650 83A8003D */ lb $t0, 0x003D($sp) -/* 05444 80837654 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 05448 80837658 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 0544C 8083765C 03281823 */ subu $v1, $t9, $t0 -/* 05450 80837660 00031600 */ sll $v0, $v1, 24 -/* 05454 80837664 00021603 */ sra $v0, $v0, 24 -/* 05458 80837668 04400005 */ bltz $v0, .L80837680 -/* 0545C 8083766C 00033600 */ sll $a2, $v1, 24 -/* 05460 80837670 00033600 */ sll $a2, $v1, 24 -/* 05464 80837674 00063603 */ sra $a2, $a2, 24 -/* 05468 80837678 10000003 */ beq $zero, $zero, .L80837688 -/* 0546C 8083767C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L80837680: -/* 05470 80837680 00063603 */ sra $a2, $a2, 24 -/* 05474 80837684 00062023 */ subu $a0, $zero, $a2 -.L80837688: -/* 05478 80837688 2881000A */ slti $at, $a0, 0x000A -/* 0547C 8083768C 10200003 */ beq $at, $zero, .L8083769C -/* 05480 80837690 27A3003D */ addiu $v1, $sp, 0x003D ## $v1 = FFFFFFFD -/* 05484 80837694 10000017 */ beq $zero, $zero, .L808376F4 -/* 05488 80837698 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083769C: -/* 0548C 8083769C 80690000 */ lb $t1, 0x0000($v1) ## FFFFFFFD -/* 05490 808376A0 806A0001 */ lb $t2, 0x0001($v1) ## FFFFFFFE -/* 05494 808376A4 24A50001 */ addiu $a1, $a1, 0x0001 ## $a1 = 00000002 -/* 05498 808376A8 012A1023 */ subu $v0, $t1, $t2 -/* 0549C 808376AC 00021600 */ sll $v0, $v0, 24 -/* 054A0 808376B0 00021603 */ sra $v0, $v0, 24 -/* 054A4 808376B4 04400003 */ bltz $v0, .L808376C4 -/* 054A8 808376B8 00022023 */ subu $a0, $zero, $v0 -/* 054AC 808376BC 10000001 */ beq $zero, $zero, .L808376C4 -/* 054B0 808376C0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -.L808376C4: -/* 054B4 808376C4 2881000A */ slti $at, $a0, 0x000A -/* 054B8 808376C8 14200005 */ bne $at, $zero, .L808376E0 -/* 054BC 808376CC 00000000 */ nop -/* 054C0 808376D0 00460019 */ multu $v0, $a2 -/* 054C4 808376D4 00005812 */ mflo $t3 -/* 054C8 808376D8 05610003 */ bgez $t3, .L808376E8 -/* 054CC 808376DC 00000000 */ nop -.L808376E0: -/* 054D0 808376E0 10000004 */ beq $zero, $zero, .L808376F4 -/* 054D4 808376E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808376E8: -/* 054D8 808376E8 14A7FFEC */ bne $a1, $a3, .L8083769C -/* 054DC 808376EC 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = FFFFFFFE -/* 054E0 808376F0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808376F4: -/* 054E4 808376F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 054E8 808376F8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 054EC 808376FC 03E00008 */ jr $ra -/* 054F0 80837700 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s deleted file mode 100644 index f1b5f1eb21..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80837704 -/* 054F4 80837704 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 054F8 80837708 AFBF002C */ sw $ra, 0x002C($sp) -/* 054FC 8083770C AFB00028 */ sw $s0, 0x0028($sp) -/* 05500 80837710 AFA40038 */ sw $a0, 0x0038($sp) -/* 05504 80837714 80A20842 */ lb $v0, 0x0842($a1) ## 00000842 -/* 05508 80837718 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0550C 8083771C 28410004 */ slti $at, $v0, 0x0004 -/* 05510 80837720 1420000A */ bne $at, $zero, .L8083774C -/* 05514 80837724 28410008 */ slti $at, $v0, 0x0008 -/* 05518 80837728 10200008 */ beq $at, $zero, .L8083774C -/* 0551C 8083772C 00000000 */ nop -/* 05520 80837730 0C023C68 */ jal func_8008F1A0 -/* 05524 80837734 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 05528 80837738 00027080 */ sll $t6, $v0, 2 -/* 0552C 8083773C 3C068085 */ lui $a2, %hi(D_80854358) ## $a2 = 80850000 -/* 05530 80837740 00CE3021 */ addu $a2, $a2, $t6 -/* 05534 80837744 10000007 */ beq $zero, $zero, .L80837764 -/* 05538 80837748 8CC64358 */ lw $a2, %lo(D_80854358)($a2) -.L8083774C: -/* 0553C 8083774C 0C023C68 */ jal func_8008F1A0 -/* 05540 80837750 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05544 80837754 00027880 */ sll $t7, $v0, 2 -/* 05548 80837758 3C068085 */ lui $a2, %hi(D_80854350) ## $a2 = 80850000 -/* 0554C 8083775C 00CF3021 */ addu $a2, $a2, $t7 -/* 05550 80837760 8CC64350 */ lw $a2, %lo(D_80854350)($a2) -.L80837764: -/* 05554 80837764 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05558 80837768 0C20C8C6 */ jal func_80832318 -/* 0555C 8083776C AFA60034 */ sw $a2, 0x0034($sp) -/* 05560 80837770 0C028800 */ jal SkelAnime_GetFrameCount - -/* 05564 80837774 8FA40034 */ lw $a0, 0x0034($sp) -/* 05568 80837778 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 0556C 8083777C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 05570 80837780 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 05574 80837784 46803220 */ cvt.s.w $f8, $f6 -/* 05578 80837788 3C01C110 */ lui $at, 0xC110 ## $at = C1100000 -/* 0557C 8083778C 44815000 */ mtc1 $at, $f10 ## $f10 = -9.00 -/* 05580 80837790 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 05584 80837794 AFB80018 */ sw $t8, 0x0018($sp) -/* 05588 80837798 8FA60034 */ lw $a2, 0x0034($sp) -/* 0558C 8083779C E7A80014 */ swc1 $f8, 0x0014($sp) -/* 05590 808377A0 8FA40038 */ lw $a0, 0x0038($sp) -/* 05594 808377A4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 05598 808377A8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 0559C 808377AC E7A40010 */ swc1 $f4, 0x0010($sp) -/* 055A0 808377B0 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 055A4 808377B4 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 055A8 808377B8 8FA40038 */ lw $a0, 0x0038($sp) -/* 055AC 808377BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 055B0 808377C0 0C20DD4C */ jal func_80837530 -/* 055B4 808377C4 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 -/* 055B8 808377C8 8FBF002C */ lw $ra, 0x002C($sp) -/* 055BC 808377CC 8FB00028 */ lw $s0, 0x0028($sp) -/* 055C0 808377D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 055C4 808377D4 03E00008 */ jr $ra -/* 055C8 808377D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808377DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808377DC.s deleted file mode 100644 index e5b85d5c26..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808377DC.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_808377DC -/* 055CC 808377DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 055D0 808377E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 055D4 808377E4 3C068084 */ lui $a2, %hi(func_80844E68) ## $a2 = 80840000 -/* 055D8 808377E8 AFA40018 */ sw $a0, 0x0018($sp) -/* 055DC 808377EC AFA5001C */ sw $a1, 0x001C($sp) -/* 055E0 808377F0 24C64E68 */ addiu $a2, $a2, %lo(func_80844E68) ## $a2 = 80844E68 -/* 055E4 808377F4 0C20D716 */ jal func_80835C58 -/* 055E8 808377F8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 055EC 808377FC 8FA40018 */ lw $a0, 0x0018($sp) -/* 055F0 80837800 0C20DDC1 */ jal func_80837704 -/* 055F4 80837804 8FA5001C */ lw $a1, 0x001C($sp) -/* 055F8 80837808 8FBF0014 */ lw $ra, 0x0014($sp) -/* 055FC 8083780C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05600 80837810 03E00008 */ jr $ra -/* 05604 80837814 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837818.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837818.s deleted file mode 100644 index 0a11192101..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837818.s +++ /dev/null @@ -1,74 +0,0 @@ -glabel func_80837818 -/* 05608 80837818 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0560C 8083781C AFBF0014 */ sw $ra, 0x0014($sp) -/* 05610 80837820 908E0846 */ lbu $t6, 0x0846($a0) ## 00000846 -/* 05614 80837824 80980151 */ lb $t8, 0x0151($a0) ## 00000151 -/* 05618 80837828 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0561C 8083782C 008E7821 */ addu $t7, $a0, $t6 -/* 05620 80837830 17010008 */ bne $t8, $at, .L80837854 -/* 05624 80837834 81E5084B */ lb $a1, 0x084B($t7) ## 0000084B -/* 05628 80837838 04A10002 */ bgez $a1, .L80837844 -/* 0562C 8083783C 3C038085 */ lui $v1, %hi(D_80854484) ## $v1 = 80850000 -/* 05630 80837840 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -.L80837844: -/* 05634 80837844 00651821 */ addu $v1, $v1, $a1 -/* 05638 80837848 80634484 */ lb $v1, %lo(D_80854484)($v1) -/* 0563C 8083784C 1000002D */ beq $zero, $zero, .L80837904 -/* 05640 80837850 A0800845 */ sb $zero, 0x0845($a0) ## 00000845 -.L80837854: -/* 05644 80837854 AFA40020 */ sw $a0, 0x0020($sp) -/* 05648 80837858 0C20DD76 */ jal func_808375D8 -/* 0564C 8083785C AFA5001C */ sw $a1, 0x001C($sp) -/* 05650 80837860 8FA40020 */ lw $a0, 0x0020($sp) -/* 05654 80837864 10400003 */ beq $v0, $zero, .L80837874 -/* 05658 80837868 8FA5001C */ lw $a1, 0x001C($sp) -/* 0565C 8083786C 10000020 */ beq $zero, $zero, .L808378F0 -/* 05660 80837870 24030018 */ addiu $v1, $zero, 0x0018 ## $v1 = 00000018 -.L80837874: -/* 05664 80837874 04A10009 */ bgez $a1, .L8083789C -/* 05668 80837878 3C038085 */ lui $v1, %hi(D_80854480) ## $v1 = 80850000 -/* 0566C 8083787C 0C20CEF3 */ jal func_80833BCC -/* 05670 80837880 AFA40020 */ sw $a0, 0x0020($sp) -/* 05674 80837884 10400003 */ beq $v0, $zero, .L80837894 -/* 05678 80837888 8FA40020 */ lw $a0, 0x0020($sp) -/* 0567C 8083788C 10000013 */ beq $zero, $zero, .L808378DC -/* 05680 80837890 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80837894: -/* 05684 80837894 10000011 */ beq $zero, $zero, .L808378DC -/* 05688 80837898 24030004 */ addiu $v1, $zero, 0x0004 ## $v1 = 00000004 -.L8083789C: -/* 0568C 8083789C 00651821 */ addu $v1, $v1, $a1 -/* 05690 808378A0 80634480 */ lb $v1, %lo(D_80854480)($v1) -/* 05694 808378A4 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 05698 808378A8 5461000D */ bnel $v1, $at, .L808378E0 -/* 0569C 808378AC 80890151 */ lb $t1, 0x0151($a0) ## 00000151 -/* 056A0 808378B0 8C990680 */ lw $t9, 0x0680($a0) ## 00000680 -/* 056A4 808378B4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 056A8 808378B8 03214025 */ or $t0, $t9, $at ## $t0 = 40000000 -/* 056AC 808378BC AC880680 */ sw $t0, 0x0680($a0) ## 00000680 -/* 056B0 808378C0 AFA40020 */ sw $a0, 0x0020($sp) -/* 056B4 808378C4 0C20CEF3 */ jal func_80833BCC -/* 056B8 808378C8 AFA30018 */ sw $v1, 0x0018($sp) -/* 056BC 808378CC 8FA30018 */ lw $v1, 0x0018($sp) -/* 056C0 808378D0 14400002 */ bne $v0, $zero, .L808378DC -/* 056C4 808378D4 8FA40020 */ lw $a0, 0x0020($sp) -/* 056C8 808378D8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L808378DC: -/* 056CC 808378DC 80890151 */ lb $t1, 0x0151($a0) ## 00000151 -.L808378E0: -/* 056D0 808378E0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 056D4 808378E4 15210002 */ bne $t1, $at, .L808378F0 -/* 056D8 808378E8 00000000 */ nop -/* 056DC 808378EC 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L808378F0: -/* 056E0 808378F0 0C023C68 */ jal func_8008F1A0 -/* 056E4 808378F4 AFA30018 */ sw $v1, 0x0018($sp) -/* 056E8 808378F8 10400002 */ beq $v0, $zero, .L80837904 -/* 056EC 808378FC 8FA30018 */ lw $v1, 0x0018($sp) -/* 056F0 80837900 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -.L80837904: -/* 056F4 80837904 8FBF0014 */ lw $ra, 0x0014($sp) -/* 056F8 80837908 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 056FC 8083790C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000001 -/* 05700 80837910 03E00008 */ jr $ra -/* 05704 80837914 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837918.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837918.s deleted file mode 100644 index 6c7e25cb6b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837918.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80837918 -/* 05708 80837918 000571C0 */ sll $t6, $a1, 7 -/* 0570C 8083791C 008E1021 */ addu $v0, $a0, $t6 -/* 05710 80837920 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 05714 80837924 14C10004 */ bne $a2, $at, .L80837938 -/* 05718 80837928 AC4604FC */ sw $a2, 0x04FC($v0) ## 000004FC -/* 0571C 8083792C 240F0015 */ addiu $t7, $zero, 0x0015 ## $t7 = 00000015 -/* 05720 80837930 03E00008 */ jr $ra -/* 05724 80837934 A04F0511 */ sb $t7, 0x0511($v0) ## 00000511 -.L80837938: -/* 05728 80837938 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 0572C 8083793C A0580511 */ sb $t8, 0x0511($v0) ## 00000511 -/* 05730 80837940 03E00008 */ jr $ra -/* 05734 80837944 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837948.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837948.s deleted file mode 100644 index 953ea2bb8b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837948.s +++ /dev/null @@ -1,113 +0,0 @@ -glabel func_80837948 -/* 05738 80837948 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0573C 8083794C AFA60038 */ sw $a2, 0x0038($sp) -/* 05740 80837950 AFBF001C */ sw $ra, 0x001C($sp) -/* 05744 80837954 AFB00018 */ sw $s0, 0x0018($sp) -/* 05748 80837958 3C068085 */ lui $a2, %hi(func_808502D0) ## $a2 = 80850000 -/* 0574C 8083795C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 05750 80837960 AFA40030 */ sw $a0, 0x0030($sp) -/* 05754 80837964 24C602D0 */ addiu $a2, $a2, %lo(func_808502D0) ## $a2 = 808502D0 -/* 05758 80837968 0C20D716 */ jal func_80835C58 -/* 0575C 8083796C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 05760 80837970 8FA70038 */ lw $a3, 0x0038($sp) -/* 05764 80837974 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 05768 80837978 A20E0844 */ sb $t6, 0x0844($s0) ## 00000844 -/* 0576C 8083797C 28E10012 */ slti $at, $a3, 0x0012 -/* 05770 80837980 14200002 */ bne $at, $zero, .L8083798C -/* 05774 80837984 28E10014 */ slti $at, $a3, 0x0014 -/* 05778 80837988 14200004 */ bne $at, $zero, .L8083799C -.L8083798C: -/* 0577C 8083798C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05780 80837990 0C20C8C6 */ jal func_80832318 -/* 05784 80837994 AFA70038 */ sw $a3, 0x0038($sp) -/* 05788 80837998 8FA70038 */ lw $a3, 0x0038($sp) -.L8083799C: -/* 0578C 8083799C 820F0842 */ lb $t7, 0x0842($s0) ## 00000842 -/* 05790 808379A0 3C098085 */ lui $t1, %hi(D_80854190) ## $t1 = 80850000 -/* 05794 808379A4 25294190 */ addiu $t1, $t1, %lo(D_80854190) ## $t1 = 80854190 -/* 05798 808379A8 14EF0005 */ bne $a3, $t7, .L808379C0 -/* 0579C 808379AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 057A0 808379B0 92020845 */ lbu $v0, 0x0845($s0) ## 00000845 -/* 057A4 808379B4 28410003 */ slti $at, $v0, 0x0003 -/* 057A8 808379B8 54200004 */ bnel $at, $zero, .L808379CC -/* 057AC 808379BC 24580001 */ addiu $t8, $v0, 0x0001 ## $t8 = 00000001 -.L808379C0: -/* 057B0 808379C0 A2000845 */ sb $zero, 0x0845($s0) ## 00000845 -/* 057B4 808379C4 300200FF */ andi $v0, $zero, 0x00FF ## $v0 = 00000000 -/* 057B8 808379C8 24580001 */ addiu $t8, $v0, 0x0001 ## $t8 = 00000001 -.L808379CC: -/* 057BC 808379CC 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000001 -/* 057C0 808379D0 2B210003 */ slti $at, $t9, 0x0003 -/* 057C4 808379D4 14200002 */ bne $at, $zero, .L808379E0 -/* 057C8 808379D8 A2180845 */ sb $t8, 0x0845($s0) ## 00000845 -/* 057CC 808379DC 24E70002 */ addiu $a3, $a3, 0x0002 ## $a3 = 00000002 -.L808379E0: -/* 057D0 808379E0 A2070842 */ sb $a3, 0x0842($s0) ## 00000842 -/* 057D4 808379E4 00074100 */ sll $t0, $a3, 4 -/* 057D8 808379E8 01091821 */ addu $v1, $t0, $t1 -/* 057DC 808379EC 8C660000 */ lw $a2, 0x0000($v1) ## 00000000 -/* 057E0 808379F0 AFA30020 */ sw $v1, 0x0020($sp) -/* 057E4 808379F4 0C20C8B4 */ jal func_808322D0 -/* 057E8 808379F8 8FA40030 */ lw $a0, 0x0030($sp) -/* 057EC 808379FC 8FA30020 */ lw $v1, 0x0020($sp) -/* 057F0 80837A00 3C0A8085 */ lui $t2, %hi(D_80854290) ## $t2 = 80850000 -/* 057F4 80837A04 254A4290 */ addiu $t2, $t2, %lo(D_80854290) ## $t2 = 80854290 -/* 057F8 80837A08 106A0009 */ beq $v1, $t2, .L80837A30 -/* 057FC 80837A0C 3C0B8085 */ lui $t3, %hi(D_808542A0) ## $t3 = 80850000 -/* 05800 80837A10 256B42A0 */ addiu $t3, $t3, %lo(D_808542A0) ## $t3 = 808542A0 -/* 05804 80837A14 106B0006 */ beq $v1, $t3, .L80837A30 -/* 05808 80837A18 8FA40030 */ lw $a0, 0x0030($sp) -/* 0580C 80837A1C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05810 80837A20 24060209 */ addiu $a2, $zero, 0x0209 ## $a2 = 00000209 -/* 05814 80837A24 0C20CBD5 */ jal func_80832F54 -/* 05818 80837A28 AFA30020 */ sw $v1, 0x0020($sp) -/* 0581C 80837A2C 8FA30020 */ lw $v1, 0x0020($sp) -.L80837A30: -/* 05820 80837A30 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 05824 80837A34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05828 80837A38 A60C083C */ sh $t4, 0x083C($s0) ## 0000083C -/* 0582C 80837A3C 0C023C73 */ jal func_8008F1CC -/* 05830 80837A40 AFA30020 */ sw $v1, 0x0020($sp) -/* 05834 80837A44 10400003 */ beq $v0, $zero, .L80837A54 -/* 05838 80837A48 8FA30020 */ lw $v1, 0x0020($sp) -/* 0583C 80837A4C 10000006 */ beq $zero, $zero, .L80837A68 -/* 05840 80837A50 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -.L80837A54: -/* 05844 80837A54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05848 80837A58 0C023C60 */ jal func_8008F180 -/* 0584C 80837A5C AFA30020 */ sw $v1, 0x0020($sp) -/* 05850 80837A60 8FA30020 */ lw $v1, 0x0020($sp) -/* 05854 80837A64 2444FFFF */ addiu $a0, $v0, 0xFFFF ## $a0 = FFFFFFFF -.L80837A68: -/* 05858 80837A68 3C0D8085 */ lui $t5, %hi(D_80854290) ## $t5 = 80850000 -/* 0585C 80837A6C 25AD4290 */ addiu $t5, $t5, %lo(D_80854290) ## $t5 = 80854290 -/* 05860 80837A70 006D082B */ sltu $at, $v1, $t5 -/* 05864 80837A74 1420000A */ bne $at, $zero, .L80837AA0 -/* 05868 80837A78 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0586C 80837A7C 3C0E8085 */ lui $t6, %hi(D_808542D0) ## $t6 = 80850000 -/* 05870 80837A80 25CE42D0 */ addiu $t6, $t6, %lo(D_808542D0) ## $t6 = 808542D0 -/* 05874 80837A84 006E082B */ sltu $at, $v1, $t6 -/* 05878 80837A88 10200005 */ beq $at, $zero, .L80837AA0 -/* 0587C 80837A8C 000478C0 */ sll $t7, $a0, 3 -/* 05880 80837A90 3C068085 */ lui $a2, %hi(D_8085448C) ## $a2 = 80850000 -/* 05884 80837A94 00CF3021 */ addu $a2, $a2, $t7 -/* 05888 80837A98 10000005 */ beq $zero, $zero, .L80837AB0 -/* 0588C 80837A9C 8CC6448C */ lw $a2, %lo(D_8085448C)($a2) -.L80837AA0: -/* 05890 80837AA0 0004C0C0 */ sll $t8, $a0, 3 -/* 05894 80837AA4 3C068085 */ lui $a2, %hi(D_80854488) ## $a2 = 80850000 -/* 05898 80837AA8 00D83021 */ addu $a2, $a2, $t8 -/* 0589C 80837AAC 8CC64488 */ lw $a2, %lo(D_80854488)($a2) -.L80837AB0: -/* 058A0 80837AB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 058A4 80837AB4 0C20DE46 */ jal func_80837918 -/* 058A8 80837AB8 AFA60028 */ sw $a2, 0x0028($sp) -/* 058AC 80837ABC 8FA60028 */ lw $a2, 0x0028($sp) -/* 058B0 80837AC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 058B4 80837AC4 0C20DE46 */ jal func_80837918 -/* 058B8 80837AC8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 058BC 80837ACC 8FBF001C */ lw $ra, 0x001C($sp) -/* 058C0 80837AD0 8FB00018 */ lw $s0, 0x0018($sp) -/* 058C4 80837AD4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 058C8 80837AD8 03E00008 */ jr $ra -/* 058CC 80837ADC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AE0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AE0.s deleted file mode 100644 index 320d405601..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AE0.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80837AE0 -/* 058D0 80837AE0 808E0A78 */ lb $t6, 0x0A78($a0) ## 00000A78 -/* 058D4 80837AE4 05C00003 */ bltz $t6, .L80837AF4 -/* 058D8 80837AE8 00000000 */ nop -/* 058DC 80837AEC A0850A78 */ sb $a1, 0x0A78($a0) ## 00000A78 -/* 058E0 80837AF0 A080088F */ sb $zero, 0x088F($a0) ## 0000088F -.L80837AF4: -/* 058E4 80837AF4 03E00008 */ jr $ra -/* 058E8 80837AF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AFC.s deleted file mode 100644 index e721edd740..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AFC.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80837AFC -/* 058EC 80837AFC 808E0A78 */ lb $t6, 0x0A78($a0) ## 00000A78 -/* 058F0 80837B00 00AE082A */ slt $at, $a1, $t6 -/* 058F4 80837B04 10200002 */ beq $at, $zero, .L80837B10 -/* 058F8 80837B08 00000000 */ nop -/* 058FC 80837B0C A0850A78 */ sb $a1, 0x0A78($a0) ## 00000A78 -.L80837B10: -/* 05900 80837B10 03E00008 */ jr $ra -/* 05904 80837B14 A080088F */ sb $zero, 0x088F($a0) ## 0000088F diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B18.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B18.s deleted file mode 100644 index f712cb13df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B18.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80837B18 -/* 05908 80837B18 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0590C 80837B1C AFBF0014 */ sw $ra, 0x0014($sp) -/* 05910 80837B20 80AE0A78 */ lb $t6, 0x0A78($a1) ## 00000A78 -/* 05914 80837B24 15C00006 */ bne $t6, $zero, .L80837B40 -/* 05918 80837B28 00000000 */ nop -/* 0591C 80837B2C 90AF0002 */ lbu $t7, 0x0002($a1) ## 00000002 -/* 05920 80837B30 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 05924 80837B34 00062C00 */ sll $a1, $a2, 16 -/* 05928 80837B38 11E10003 */ beq $t7, $at, .L80837B48 -/* 0592C 80837B3C 00000000 */ nop -.L80837B40: -/* 05930 80837B40 10000003 */ beq $zero, $zero, .L80837B50 -/* 05934 80837B44 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80837B48: -/* 05938 80837B48 0C021C5D */ jal Health_ChangeBy -/* 0593C 80837B4C 00052C03 */ sra $a1, $a1, 16 -.L80837B50: -/* 05940 80837B50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05944 80837B54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05948 80837B58 03E00008 */ jr $ra -/* 0594C 80837B5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B60.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B60.s deleted file mode 100644 index c31dd89281..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B60.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80837B60 -/* 05950 80837B60 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05954 80837B64 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05958 80837B68 8C8E01D4 */ lw $t6, 0x01D4($a0) ## 000001D4 -/* 0595C 80837B6C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 05960 80837B70 89D80000 */ lwl $t8, 0x0000($t6) ## 00000000 -/* 05964 80837B74 99D80003 */ lwr $t8, 0x0003($t6) ## 00000003 -/* 05968 80837B78 A89801EC */ swl $t8, 0x01EC($a0) ## 000001EC -/* 0596C 80837B7C B89801EF */ swr $t8, 0x01EF($a0) ## 000001EF -/* 05970 80837B80 95D80004 */ lhu $t8, 0x0004($t6) ## 00000004 -/* 05974 80837B84 0C20CB92 */ jal func_80832E48 -/* 05978 80837B88 A49801F0 */ sh $t8, 0x01F0($a0) ## 000001F0 -/* 0597C 80837B8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05980 80837B90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05984 80837B94 03E00008 */ jr $ra -/* 05988 80837B98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B9C.s deleted file mode 100644 index faf9a0c75a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B9C.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80837B9C -/* 0598C 80837B9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05990 80837BA0 AFA5001C */ sw $a1, 0x001C($sp) -/* 05994 80837BA4 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 05998 80837BA8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0599C 80837BAC AFA40018 */ sw $a0, 0x0018($sp) -/* 059A0 80837BB0 3C068084 */ lui $a2, %hi(func_8084411C) ## $a2 = 80840000 -/* 059A4 80837BB4 24C6411C */ addiu $a2, $a2, %lo(func_8084411C) ## $a2 = 8084411C -/* 059A8 80837BB8 AFA50018 */ sw $a1, 0x0018($sp) -/* 059AC 80837BBC 8FA4001C */ lw $a0, 0x001C($sp) -/* 059B0 80837BC0 0C20D716 */ jal func_80835C58 -/* 059B4 80837BC4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 059B8 80837BC8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 059BC 80837BCC 8FA50018 */ lw $a1, 0x0018($sp) -/* 059C0 80837BD0 24C63040 */ addiu $a2, $a2, 0x3040 ## $a2 = 04003040 -/* 059C4 80837BD4 0C20C8A1 */ jal func_80832284 -/* 059C8 80837BD8 8FA4001C */ lw $a0, 0x001C($sp) -/* 059CC 80837BDC 8FA50018 */ lw $a1, 0x0018($sp) -/* 059D0 80837BE0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 059D4 80837BE4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 059D8 80837BE8 90AF06AD */ lbu $t7, 0x06AD($a1) ## 000006AD -/* 059DC 80837BEC A4AE0850 */ sh $t6, 0x0850($a1) ## 00000850 -/* 059E0 80837BF0 51E10003 */ beql $t7, $at, .L80837C00 -/* 059E4 80837BF4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 059E8 80837BF8 A0A006AD */ sb $zero, 0x06AD($a1) ## 000006AD -/* 059EC 80837BFC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80837C00: -/* 059F0 80837C00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 059F4 80837C04 03E00008 */ jr $ra -/* 059F8 80837C08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837C0C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837C0C.s deleted file mode 100644 index 727714c80c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837C0C.s +++ /dev/null @@ -1,361 +0,0 @@ -glabel func_80837C0C -/* 059FC 80837C0C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 05A00 80837C10 AFBF0024 */ sw $ra, 0x0024($sp) -/* 05A04 80837C14 AFB00020 */ sw $s0, 0x0020($sp) -/* 05A08 80837C18 AFA40030 */ sw $a0, 0x0030($sp) -/* 05A0C 80837C1C AFA60038 */ sw $a2, 0x0038($sp) -/* 05A10 80837C20 AFA7003C */ sw $a3, 0x003C($sp) -/* 05A14 80837C24 AFA0002C */ sw $zero, 0x002C($sp) -/* 05A18 80837C28 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C -/* 05A1C 80837C2C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 05A20 80837C30 31CF2000 */ andi $t7, $t6, 0x2000 ## $t7 = 00000000 -/* 05A24 80837C34 51E00004 */ beql $t7, $zero, .L80837C48 -/* 05A28 80837C38 A2000890 */ sb $zero, 0x0890($s0) ## 00000890 -/* 05A2C 80837C3C 0C20DED8 */ jal func_80837B60 -/* 05A30 80837C40 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 05A34 80837C44 A2000890 */ sb $zero, 0x0890($s0) ## 00000890 -.L80837C48: -/* 05A38 80837C48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A3C 80837C4C 0C00BDF7 */ jal func_8002F7DC -/* 05A40 80837C50 2405083F */ addiu $a1, $zero, 0x083F ## $a1 = 0000083F -/* 05A44 80837C54 920600B0 */ lbu $a2, 0x00B0($s0) ## 000000B0 -/* 05A48 80837C58 8FA40030 */ lw $a0, 0x0030($sp) -/* 05A4C 80837C5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05A50 80837C60 0C20DEC6 */ jal func_80837B18 -/* 05A54 80837C64 00063023 */ subu $a2, $zero, $a2 -/* 05A58 80837C68 14400011 */ bne $v0, $zero, .L80837CB0 -/* 05A5C 80837C6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A60 80837C70 8E180680 */ lw $t8, 0x0680($s0) ## 00000680 -/* 05A64 80837C74 96080088 */ lhu $t0, 0x0088($s0) ## 00000088 -/* 05A68 80837C78 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 05A6C 80837C7C 0301C824 */ and $t9, $t8, $at -/* 05A70 80837C80 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 05A74 80837C84 1520012A */ bne $t1, $zero, .L80838130 -/* 05A78 80837C88 AE190680 */ sw $t9, 0x0680($s0) ## 00000680 -/* 05A7C 80837C8C 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C -/* 05A80 80837C90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A84 80837C94 000A5900 */ sll $t3, $t2, 4 -/* 05A88 80837C98 05620126 */ bltzl $t3, .L80838134 -/* 05A8C 80837C9C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 05A90 80837CA0 0C20DEE7 */ jal func_80837B9C -/* 05A94 80837CA4 8FA50030 */ lw $a1, 0x0030($sp) -/* 05A98 80837CA8 10000122 */ beq $zero, $zero, .L80838134 -/* 05A9C 80837CAC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80837CB0: -/* 05AA0 80837CB0 0C20DEB8 */ jal func_80837AE0 -/* 05AA4 80837CB4 8FA50048 */ lw $a1, 0x0048($sp) -/* 05AA8 80837CB8 8FA30038 */ lw $v1, 0x0038($sp) -/* 05AAC 80837CBC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 05AB0 80837CC0 8FA40030 */ lw $a0, 0x0030($sp) -/* 05AB4 80837CC4 14610018 */ bne $v1, $at, .L80837D28 -/* 05AB8 80837CC8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05ABC 80837CCC 3C068085 */ lui $a2, %hi(func_8084FB10) ## $a2 = 80850000 -/* 05AC0 80837CD0 24C6FB10 */ addiu $a2, $a2, %lo(func_8084FB10) ## $a2 = 8084FB10 -/* 05AC4 80837CD4 0C20D716 */ jal func_80835C58 -/* 05AC8 80837CD8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 05ACC 80837CDC 3C0C0400 */ lui $t4, 0x0400 ## $t4 = 04000000 -/* 05AD0 80837CE0 258C2FD0 */ addiu $t4, $t4, 0x2FD0 ## $t4 = 04002FD0 -/* 05AD4 80837CE4 AFAC002C */ sw $t4, 0x002C($sp) -/* 05AD8 80837CE8 0C20C889 */ jal func_80832224 -/* 05ADC 80837CEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05AE0 80837CF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05AE4 80837CF4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 05AE8 80837CF8 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 05AEC 80837CFC 24070028 */ addiu $a3, $zero, 0x0028 ## $a3 = 00000028 -/* 05AF0 80837D00 0C20C993 */ jal func_8083264C -/* 05AF4 80837D04 AFA00010 */ sw $zero, 0x0010($sp) -/* 05AF8 80837D08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05AFC 80837D0C 0C00BDF7 */ jal func_8002F7DC -/* 05B00 80837D10 24050874 */ addiu $a1, $zero, 0x0874 ## $a1 = 00000874 -/* 05B04 80837D14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05B08 80837D18 0C20C9A6 */ jal func_80832698 -/* 05B0C 80837D1C 24056806 */ addiu $a1, $zero, 0x6806 ## $a1 = 00006806 -/* 05B10 80837D20 100000F6 */ beq $zero, $zero, .L808380FC -/* 05B14 80837D24 8FA40030 */ lw $a0, 0x0030($sp) -.L80837D28: -/* 05B18 80837D28 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 05B1C 80837D2C 14610017 */ bne $v1, $at, .L80837D8C -/* 05B20 80837D30 87AE0046 */ lh $t6, 0x0046($sp) -/* 05B24 80837D34 3C068085 */ lui $a2, %hi(func_8084FBF4) ## $a2 = 80850000 -/* 05B28 80837D38 24C6FBF4 */ addiu $a2, $a2, %lo(func_8084FBF4) ## $a2 = 8084FBF4 -/* 05B2C 80837D3C 8FA40030 */ lw $a0, 0x0030($sp) -/* 05B30 80837D40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05B34 80837D44 0C20D716 */ jal func_80835C58 -/* 05B38 80837D48 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 05B3C 80837D4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05B40 80837D50 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 05B44 80837D54 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 -/* 05B48 80837D58 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 05B4C 80837D5C 0C20C993 */ jal func_8083264C -/* 05B50 80837D60 AFA00010 */ sw $zero, 0x0010($sp) -/* 05B54 80837D64 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 05B58 80837D68 24C62F00 */ addiu $a2, $a2, 0x2F00 ## $a2 = 04002F00 -/* 05B5C 80837D6C 8FA40030 */ lw $a0, 0x0030($sp) -/* 05B60 80837D70 0C20C8A9 */ jal func_808322A4 -/* 05B64 80837D74 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05B68 80837D78 0C20C889 */ jal func_80832224 -/* 05B6C 80837D7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05B70 80837D80 240D0014 */ addiu $t5, $zero, 0x0014 ## $t5 = 00000014 -/* 05B74 80837D84 100000DC */ beq $zero, $zero, .L808380F8 -/* 05B78 80837D88 A60D0850 */ sh $t5, 0x0850($s0) ## 00000850 -.L80837D8C: -/* 05B7C 80837D8C 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 05B80 80837D90 3C068085 */ lui $a2, %hi(func_8084E30C) ## $a2 = 80850000 -/* 05B84 80837D94 24C6E30C */ addiu $a2, $a2, %lo(func_8084E30C) ## $a2 = 8084E30C -/* 05B88 80837D98 01CFC023 */ subu $t8, $t6, $t7 -/* 05B8C 80837D9C A7B80046 */ sh $t8, 0x0046($sp) -/* 05B90 80837DA0 8E02067C */ lw $v0, 0x067C($s0) ## 0000067C -/* 05B94 80837DA4 8FA40030 */ lw $a0, 0x0030($sp) -/* 05B98 80837DA8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05B9C 80837DAC 0002C900 */ sll $t9, $v0, 4 -/* 05BA0 80837DB0 07210016 */ bgez $t9, .L80837E0C -/* 05BA4 80837DB4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 05BA8 80837DB8 0C20D716 */ jal func_80835C58 -/* 05BAC 80837DBC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 05BB0 80837DC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05BB4 80837DC4 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 05BB8 80837DC8 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 05BBC 80837DCC 24070032 */ addiu $a3, $zero, 0x0032 ## $a3 = 00000032 -/* 05BC0 80837DD0 0C20C993 */ jal func_8083264C -/* 05BC4 80837DD4 AFA00010 */ sw $zero, 0x0010($sp) -/* 05BC8 80837DD8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 05BCC 80837DDC 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 -/* 05BD0 80837DE0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 05BD4 80837DE4 3C080400 */ lui $t0, 0x0400 ## $t0 = 04000000 -/* 05BD8 80837DE8 25083320 */ addiu $t0, $t0, 0x3320 ## $t0 = 04003320 -/* 05BDC 80837DEC E6040838 */ swc1 $f4, 0x0838($s0) ## 00000838 -/* 05BE0 80837DF0 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -/* 05BE4 80837DF4 AFA8002C */ sw $t0, 0x002C($sp) -/* 05BE8 80837DF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05BEC 80837DFC 0C20C9A6 */ jal func_80832698 -/* 05BF0 80837E00 24056805 */ addiu $a1, $zero, 0x6805 ## $a1 = 00006805 -/* 05BF4 80837E04 100000AD */ beq $zero, $zero, .L808380BC -/* 05BF8 80837E08 87A40046 */ lh $a0, 0x0046($sp) -.L80837E0C: -/* 05BFC 80837E0C 1061000C */ beq $v1, $at, .L80837E40 -/* 05C00 80837E10 8FA40030 */ lw $a0, 0x0030($sp) -/* 05C04 80837E14 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 05C08 80837E18 10610009 */ beq $v1, $at, .L80837E40 -/* 05C0C 80837E1C 00000000 */ nop -/* 05C10 80837E20 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -/* 05C14 80837E24 3C010020 */ lui $at, 0x0020 ## $at = 00200000 -/* 05C18 80837E28 34216000 */ ori $at, $at, 0x6000 ## $at = 00206000 -/* 05C1C 80837E2C 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 05C20 80837E30 11400003 */ beq $t2, $zero, .L80837E40 -/* 05C24 80837E34 00415824 */ and $t3, $v0, $at -/* 05C28 80837E38 11600051 */ beq $t3, $zero, .L80837F80 -/* 05C2C 80837E3C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -.L80837E40: -/* 05C30 80837E40 3C068084 */ lui $a2, %hi(func_8084377C) ## $a2 = 80840000 -/* 05C34 80837E44 24C6377C */ addiu $a2, $a2, %lo(func_8084377C) ## $a2 = 8084377C -/* 05C38 80837E48 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05C3C 80837E4C 0C20D716 */ jal func_80835C58 -/* 05C40 80837E50 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 05C44 80837E54 920C0692 */ lbu $t4, 0x0692($s0) ## 00000692 -/* 05C48 80837E58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C4C 80837E5C 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 05C50 80837E60 358D0002 */ ori $t5, $t4, 0x0002 ## $t5 = 00000002 -/* 05C54 80837E64 A20D0692 */ sb $t5, 0x0692($s0) ## 00000692 -/* 05C58 80837E68 AFA00010 */ sw $zero, 0x0010($sp) -/* 05C5C 80837E6C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 05C60 80837E70 0C20C993 */ jal func_8083264C -/* 05C64 80837E74 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 05C68 80837E78 0C20C889 */ jal func_80832224 -/* 05C6C 80837E7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C70 80837E80 8FAE0038 */ lw $t6, 0x0038($sp) -/* 05C74 80837E84 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 05C78 80837E88 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 05C7C 80837E8C 15C30016 */ bne $t6, $v1, .L80837EE8 -/* 05C80 80837E90 C7AA003C */ lwc1 $f10, 0x003C($sp) -/* 05C84 80837E94 44810000 */ mtc1 $at, $f0 ## $f0 = 3.00 -/* 05C88 80837E98 9218015B */ lbu $t8, 0x015B($s0) ## 0000015B -/* 05C8C 80837E9C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 05C90 80837EA0 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -/* 05C94 80837EA4 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 05C98 80837EA8 3C068085 */ lui $a2, %hi(D_8085395C) ## $a2 = 80850000 -/* 05C9C 80837EAC 0018C880 */ sll $t9, $t8, 2 -/* 05CA0 80837EB0 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 -/* 05CA4 80837EB4 00D93021 */ addu $a2, $a2, $t9 -/* 05CA8 80837EB8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 05CAC 80837EBC E6000838 */ swc1 $f0, 0x0838($s0) ## 00000838 -/* 05CB0 80837EC0 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 05CB4 80837EC4 8CC6395C */ lw $a2, %lo(D_8085395C)($a2) -/* 05CB8 80837EC8 8FA40030 */ lw $a0, 0x0030($sp) -/* 05CBC 80837ECC 0C20CB0B */ jal func_80832C2C -/* 05CC0 80837ED0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05CC4 80837ED4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05CC8 80837ED8 0C20C9A6 */ jal func_80832698 -/* 05CCC 80837EDC 24056805 */ addiu $a1, $zero, 0x6805 ## $a1 = 00006805 -/* 05CD0 80837EE0 10000023 */ beq $zero, $zero, .L80837F70 -/* 05CD4 80837EE4 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -.L80837EE8: -/* 05CD8 80837EE8 87A60046 */ lh $a2, 0x0046($sp) -/* 05CDC 80837EEC E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 05CE0 80837EF0 C7B0003C */ lwc1 $f16, 0x003C($sp) -/* 05CE4 80837EF4 3C090400 */ lui $t1, 0x0400 ## $t1 = 04000000 -/* 05CE8 80837EF8 25292DB0 */ addiu $t1, $t1, 0x2DB0 ## $t1 = 04002DB0 -/* 05CEC 80837EFC E6100838 */ swc1 $f16, 0x0838($s0) ## 00000838 -/* 05CF0 80837F00 C7B20040 */ lwc1 $f18, 0x0040($sp) -/* 05CF4 80837F04 00061023 */ subu $v0, $zero, $a2 -/* 05CF8 80837F08 04C00003 */ bltz $a2, .L80837F18 -/* 05CFC 80837F0C E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 -/* 05D00 80837F10 10000001 */ beq $zero, $zero, .L80837F18 -/* 05D04 80837F14 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000000 -.L80837F18: -/* 05D08 80837F18 28414001 */ slti $at, $v0, 0x4001 -/* 05D0C 80837F1C 14200004 */ bne $at, $zero, .L80837F30 -/* 05D10 80837F20 3C080400 */ lui $t0, 0x0400 ## $t0 = 04000000 -/* 05D14 80837F24 25082F58 */ addiu $t0, $t0, 0x2F58 ## $t0 = 04002F58 -/* 05D18 80837F28 10000002 */ beq $zero, $zero, .L80837F34 -/* 05D1C 80837F2C AFA8002C */ sw $t0, 0x002C($sp) -.L80837F30: -/* 05D20 80837F30 AFA9002C */ sw $t1, 0x002C($sp) -.L80837F34: -/* 05D24 80837F34 920A0002 */ lbu $t2, 0x0002($s0) ## 00000002 -/* 05D28 80837F38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05D2C 80837F3C 106A0009 */ beq $v1, $t2, .L80837F64 -/* 05D30 80837F40 00000000 */ nop -/* 05D34 80837F44 920B00AF */ lbu $t3, 0x00AF($s0) ## 000000AF -/* 05D38 80837F48 2405681D */ addiu $a1, $zero, 0x681D ## $a1 = 0000681D -/* 05D3C 80837F4C 15600005 */ bne $t3, $zero, .L80837F64 -/* 05D40 80837F50 00000000 */ nop -/* 05D44 80837F54 0C20C9A6 */ jal func_80832698 -/* 05D48 80837F58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05D4C 80837F5C 10000004 */ beq $zero, $zero, .L80837F70 -/* 05D50 80837F60 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -.L80837F64: -/* 05D54 80837F64 0C20C9A6 */ jal func_80832698 -/* 05D58 80837F68 24056808 */ addiu $a1, $zero, 0x6808 ## $a1 = 00006808 -/* 05D5C 80837F6C 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -.L80837F70: -/* 05D60 80837F70 A2000893 */ sb $zero, 0x0893($s0) ## 00000893 -/* 05D64 80837F74 318DFFFE */ andi $t5, $t4, 0xFFFE ## $t5 = 00000000 -/* 05D68 80837F78 1000004F */ beq $zero, $zero, .L808380B8 -/* 05D6C 80837F7C A60D0088 */ sh $t5, 0x0088($s0) ## 00000088 -.L80837F80: -/* 05D70 80837F80 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 -/* 05D74 80837F84 C6060838 */ lwc1 $f6, 0x0838($s0) ## 00000838 -/* 05D78 80837F88 4606203C */ c.lt.s $f4, $f6 -/* 05D7C 80837F8C 00000000 */ nop -/* 05D80 80837F90 45000011 */ bc1f .L80837FD8 -/* 05D84 80837F94 00000000 */ nop -/* 05D88 80837F98 0C023A71 */ jal func_8008E9C4 -/* 05D8C 80837F9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05D90 80837FA0 1440000D */ bne $v0, $zero, .L80837FD8 -/* 05D94 80837FA4 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 05D98 80837FA8 A20E0890 */ sb $t6, 0x0890($s0) ## 00000890 -/* 05D9C 80837FAC AFA00010 */ sw $zero, 0x0010($sp) -/* 05DA0 80837FB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05DA4 80837FB4 24050078 */ addiu $a1, $zero, 0x0078 ## $a1 = 00000078 -/* 05DA8 80837FB8 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 05DAC 80837FBC 0C20C993 */ jal func_8083264C -/* 05DB0 80837FC0 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 05DB4 80837FC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05DB8 80837FC8 0C20C9A6 */ jal func_80832698 -/* 05DBC 80837FCC 24056805 */ addiu $a1, $zero, 0x6805 ## $a1 = 00006805 -/* 05DC0 80837FD0 10000058 */ beq $zero, $zero, .L80838134 -/* 05DC4 80837FD4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80837FD8: -/* 05DC8 80837FD8 3C038085 */ lui $v1, %hi(D_808544B0) ## $v1 = 80850000 -/* 05DCC 80837FDC 246344B0 */ addiu $v1, $v1, %lo(D_808544B0) ## $v1 = 808544B0 -/* 05DD0 80837FE0 3C068084 */ lui $a2, %hi(func_8084370C) ## $a2 = 80840000 -/* 05DD4 80837FE4 24C6370C */ addiu $a2, $a2, %lo(func_8084370C) ## $a2 = 8084370C -/* 05DD8 80837FE8 AFA30028 */ sw $v1, 0x0028($sp) -/* 05DDC 80837FEC 8FA40030 */ lw $a0, 0x0030($sp) -/* 05DE0 80837FF0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05DE4 80837FF4 0C20D716 */ jal func_80835C58 -/* 05DE8 80837FF8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 05DEC 80837FFC 0C20CF0F */ jal func_80833C3C -/* 05DF0 80838000 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05DF4 80838004 920F00B0 */ lbu $t7, 0x00B0($s0) ## 000000B0 -/* 05DF8 80838008 8FA30028 */ lw $v1, 0x0028($sp) -/* 05DFC 8083800C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05E00 80838010 29E10005 */ slti $at, $t7, 0x0005 -/* 05E04 80838014 1020000A */ beq $at, $zero, .L80838040 -/* 05E08 80838018 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 05E0C 8083801C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05E10 80838020 24050078 */ addiu $a1, $zero, 0x0078 ## $a1 = 00000078 -/* 05E14 80838024 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 05E18 80838028 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 05E1C 8083802C AFA00010 */ sw $zero, 0x0010($sp) -/* 05E20 80838030 0C20C993 */ jal func_8083264C -/* 05E24 80838034 AFA30028 */ sw $v1, 0x0028($sp) -/* 05E28 80838038 1000000A */ beq $zero, $zero, .L80838064 -/* 05E2C 8083803C 8FA30028 */ lw $v1, 0x0028($sp) -.L80838040: -/* 05E30 80838040 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 05E34 80838044 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 05E38 80838048 0C20C993 */ jal func_8083264C -/* 05E3C 8083804C AFA00010 */ sw $zero, 0x0010($sp) -/* 05E40 80838050 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 05E44 80838054 44814000 */ mtc1 $at, $f8 ## $f8 = 23.00 -/* 05E48 80838058 3C038085 */ lui $v1, %hi(D_808544C0) ## $v1 = 80850000 -/* 05E4C 8083805C 246344C0 */ addiu $v1, $v1, %lo(D_808544C0) ## $v1 = 808544C0 -/* 05E50 80838060 E6080838 */ swc1 $f8, 0x0838($s0) ## 00000838 -.L80838064: -/* 05E54 80838064 87B80046 */ lh $t8, 0x0046($sp) -/* 05E58 80838068 87A20046 */ lh $v0, 0x0046($sp) -/* 05E5C 8083806C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05E60 80838070 07000003 */ bltz $t8, .L80838080 -/* 05E64 80838074 00021023 */ subu $v0, $zero, $v0 -/* 05E68 80838078 10000001 */ beq $zero, $zero, .L80838080 -/* 05E6C 8083807C 03001025 */ or $v0, $t8, $zero ## $v0 = 00000000 -.L80838080: -/* 05E70 80838080 28414001 */ slti $at, $v0, 0x4001 -/* 05E74 80838084 10200002 */ beq $at, $zero, .L80838090 -/* 05E78 80838088 00000000 */ nop -/* 05E7C 8083808C 24630008 */ addiu $v1, $v1, 0x0008 ## $v1 = 808544C8 -.L80838090: -/* 05E80 80838090 0C023A71 */ jal func_8008E9C4 -/* 05E84 80838094 AFA30028 */ sw $v1, 0x0028($sp) -/* 05E88 80838098 10400002 */ beq $v0, $zero, .L808380A4 -/* 05E8C 8083809C 8FA30028 */ lw $v1, 0x0028($sp) -/* 05E90 808380A0 24630004 */ addiu $v1, $v1, 0x0004 ## $v1 = 00000004 -.L808380A4: -/* 05E94 808380A4 8C790000 */ lw $t9, 0x0000($v1) ## 00000004 -/* 05E98 808380A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05E9C 808380AC 24056805 */ addiu $a1, $zero, 0x6805 ## $a1 = 00006805 -/* 05EA0 808380B0 0C20C9A6 */ jal func_80832698 -/* 05EA4 808380B4 AFB9002C */ sw $t9, 0x002C($sp) -.L808380B8: -/* 05EA8 808380B8 87A40046 */ lh $a0, 0x0046($sp) -.L808380BC: -/* 05EAC 808380BC 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 05EB0 808380C0 00041023 */ subu $v0, $zero, $a0 -/* 05EB4 808380C4 01044821 */ addu $t1, $t0, $a0 -/* 05EB8 808380C8 A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 -/* 05EBC 808380CC 860300B6 */ lh $v1, 0x00B6($s0) ## 000000B6 -/* 05EC0 808380D0 A603083C */ sh $v1, 0x083C($s0) ## 0000083C -/* 05EC4 808380D4 04800003 */ bltz $a0, .L808380E4 -/* 05EC8 808380D8 A6030032 */ sh $v1, 0x0032($s0) ## 00000032 -/* 05ECC 808380DC 10000001 */ beq $zero, $zero, .L808380E4 -/* 05ED0 808380E0 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -.L808380E4: -/* 05ED4 808380E4 28414001 */ slti $at, $v0, 0x4001 -/* 05ED8 808380E8 14200003 */ bne $at, $zero, .L808380F8 -/* 05EDC 808380EC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 05EE0 808380F0 00615021 */ addu $t2, $v1, $at -/* 05EE4 808380F4 A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 -.L808380F8: -/* 05EE8 808380F8 8FA40030 */ lw $a0, 0x0030($sp) -.L808380FC: -/* 05EEC 808380FC 0C20C959 */ jal func_80832564 -/* 05EF0 80838100 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05EF4 80838104 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 05EF8 80838108 3C010400 */ lui $at, 0x0400 ## $at = 04000000 -/* 05EFC 8083810C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05F00 80838110 01616025 */ or $t4, $t3, $at ## $t4 = 04000000 -/* 05F04 80838114 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -/* 05F08 80838118 8FAD002C */ lw $t5, 0x002C($sp) -/* 05F0C 8083811C 8FA40030 */ lw $a0, 0x0030($sp) -/* 05F10 80838120 51A00004 */ beql $t5, $zero, .L80838134 -/* 05F14 80838124 8FBF0024 */ lw $ra, 0x0024($sp) -/* 05F18 80838128 0C20C8B4 */ jal func_808322D0 -/* 05F1C 8083812C 01A03025 */ or $a2, $t5, $zero ## $a2 = 00000000 -.L80838130: -/* 05F20 80838130 8FBF0024 */ lw $ra, 0x0024($sp) -.L80838134: -/* 05F24 80838134 8FB00020 */ lw $s0, 0x0020($sp) -/* 05F28 80838138 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 05F2C 8083813C 03E00008 */ jr $ra -/* 05F30 80838140 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838144.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838144.s deleted file mode 100644 index 62e0c98a36..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838144.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80838144 -/* 05F34 80838144 2482FFFE */ addiu $v0, $a0, 0xFFFE ## $v0 = FFFFFFFE -/* 05F38 80838148 04400005 */ bltz $v0, .L80838160 -/* 05F3C 8083814C 28410002 */ slti $at, $v0, 0x0002 -/* 05F40 80838150 50200004 */ beql $at, $zero, .L80838164 -/* 05F44 80838154 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 05F48 80838158 03E00008 */ jr $ra -/* 05F4C 8083815C 00000000 */ nop -.L80838160: -/* 05F50 80838160 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -.L80838164: -/* 05F54 80838164 03E00008 */ jr $ra -/* 05F58 80838168 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083816C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083816C.s deleted file mode 100644 index ed7dd2449d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083816C.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8083816C -/* 05F5C 8083816C 38820004 */ xori $v0, $a0, 0x0004 ## $v0 = 00000004 -/* 05F60 80838170 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 05F64 80838174 14400007 */ bne $v0, $zero, .L80838194 -/* 05F68 80838178 00000000 */ nop -/* 05F6C 8083817C 38820007 */ xori $v0, $a0, 0x0007 ## $v0 = 00000007 -/* 05F70 80838180 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 05F74 80838184 14400003 */ bne $v0, $zero, .L80838194 -/* 05F78 80838188 00000000 */ nop -/* 05F7C 8083818C 3882000C */ xori $v0, $a0, 0x000C ## $v0 = 0000000C -/* 05F80 80838190 2C420001 */ sltiu $v0, $v0, 0x0001 -.L80838194: -/* 05F84 80838194 03E00008 */ jr $ra -/* 05F88 80838198 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083819C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083819C.s deleted file mode 100644 index 17be6fcbf3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083819C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_8083819C -/* 05F8C 8083819C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 05F90 808381A0 AFBF002C */ sw $ra, 0x002C($sp) -/* 05F94 808381A4 AFA40030 */ sw $a0, 0x0030($sp) -/* 05F98 808381A8 808F014E */ lb $t7, 0x014E($a0) ## 0000014E -/* 05F9C 808381AC 00807025 */ or $t6, $a0, $zero ## $t6 = 00000000 -/* 05FA0 808381B0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 05FA4 808381B4 15E10015 */ bne $t7, $at, .L8083820C -/* 05FA8 808381B8 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 05FAC 808381BC C5C40028 */ lwc1 $f4, 0x0028($t6) ## 00000028 -/* 05FB0 808381C0 8DC70024 */ lw $a3, 0x0024($t6) ## 00000024 -/* 05FB4 808381C4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 05FB8 808381C8 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 05FBC 808381CC C5C6002C */ lwc1 $f6, 0x002C($t6) ## 0000002C -/* 05FC0 808381D0 AFA50034 */ sw $a1, 0x0034($sp) -/* 05FC4 808381D4 AFB80024 */ sw $t8, 0x0024($sp) -/* 05FC8 808381D8 AFA00020 */ sw $zero, 0x0020($sp) -/* 05FCC 808381DC AFA0001C */ sw $zero, 0x001C($sp) -/* 05FD0 808381E0 AFA00018 */ sw $zero, 0x0018($sp) -/* 05FD4 808381E4 240600EE */ addiu $a2, $zero, 0x00EE ## $a2 = 000000EE -/* 05FD8 808381E8 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 05FDC 808381EC E7A60014 */ swc1 $f6, 0x0014($sp) -/* 05FE0 808381F0 8FA40034 */ lw $a0, 0x0034($sp) -/* 05FE4 808381F4 0C025E95 */ jal Inventory_DeleteEquipment -/* 05FE8 808381F8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 05FEC 808381FC 8FA40034 */ lw $a0, 0x0034($sp) -/* 05FF0 80838200 2405305F */ addiu $a1, $zero, 0x305F ## $a1 = 0000305F -/* 05FF4 80838204 0C042DA0 */ jal func_8010B680 -/* 05FF8 80838208 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -.L8083820C: -/* 05FFC 8083820C 8FBF002C */ lw $ra, 0x002C($sp) -/* 06000 80838210 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 06004 80838214 03E00008 */ jr $ra -/* 06008 80838218 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083821C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083821C.s deleted file mode 100644 index c1a095929d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083821C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8083821C -/* 0600C 8083821C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 06010 80838220 AFB20020 */ sw $s2, 0x0020($sp) -/* 06014 80838224 AFB1001C */ sw $s1, 0x001C($sp) -/* 06018 80838228 AFB00018 */ sw $s0, 0x0018($sp) -/* 0601C 8083822C AFBF0024 */ sw $ra, 0x0024($sp) -/* 06020 80838230 AFA40028 */ sw $a0, 0x0028($sp) -/* 06024 80838234 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 06028 80838238 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0602C 8083823C 24120012 */ addiu $s2, $zero, 0x0012 ## $s2 = 00000012 -.L80838240: -/* 06030 80838240 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 06034 80838244 0C01DF64 */ jal Math_Rand_S16Offset - -/* 06038 80838248 240500C8 */ addiu $a1, $zero, 0x00C8 ## $a1 = 000000C8 -/* 0603C 8083824C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 06040 80838250 A2220A61 */ sb $v0, 0x0A61($s1) ## 00000A61 -/* 06044 80838254 1612FFFA */ bne $s0, $s2, .L80838240 -/* 06048 80838258 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 0604C 8083825C 8FAF0028 */ lw $t7, 0x0028($sp) -/* 06050 80838260 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 06054 80838264 A1EE0A60 */ sb $t6, 0x0A60($t7) ## 00000A60 -/* 06058 80838268 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0605C 8083826C 8FB20020 */ lw $s2, 0x0020($sp) -/* 06060 80838270 8FB1001C */ lw $s1, 0x001C($sp) -/* 06064 80838274 8FB00018 */ lw $s0, 0x0018($sp) -/* 06068 80838278 03E00008 */ jr $ra -/* 0606C 8083827C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838280.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838280.s deleted file mode 100644 index 201f84f5dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838280.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80838280 -/* 06070 80838280 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06074 80838284 AFBF0014 */ sw $ra, 0x0014($sp) -/* 06078 80838288 908E00B3 */ lbu $t6, 0x00B3($a0) ## 000000B3 -/* 0607C 8083828C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06080 80838290 15C10004 */ bne $t6, $at, .L808382A4 -/* 06084 80838294 00000000 */ nop -/* 06088 80838298 0C20E087 */ jal func_8083821C -/* 0608C 8083829C AFA40018 */ sw $a0, 0x0018($sp) -/* 06090 808382A0 8FA40018 */ lw $a0, 0x0018($sp) -.L808382A4: -/* 06094 808382A4 0C20C9A6 */ jal func_80832698 -/* 06098 808382A8 24056808 */ addiu $a1, $zero, 0x6808 ## $a1 = 00006808 -/* 0609C 808382AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 060A0 808382B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 060A4 808382B4 03E00008 */ jr $ra -/* 060A8 808382B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382BC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382BC.s deleted file mode 100644 index e1ea31f570..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382BC.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_808382BC -/* 060AC 808382BC 80820A78 */ lb $v0, 0x0A78($a0) ## 00000A78 -/* 060B0 808382C0 04400004 */ bltz $v0, .L808382D4 -/* 060B4 808382C4 28410014 */ slti $at, $v0, 0x0014 -/* 060B8 808382C8 10200002 */ beq $at, $zero, .L808382D4 -/* 060BC 808382CC 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 060C0 808382D0 A08E0A78 */ sb $t6, 0x0A78($a0) ## 00000A78 -.L808382D4: -/* 060C4 808382D4 03E00008 */ jr $ra -/* 060C8 808382D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s deleted file mode 100644 index 7f32054939..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s +++ /dev/null @@ -1,451 +0,0 @@ -glabel func_808382DC -/* 060CC 808382DC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 060D0 808382E0 AFBF002C */ sw $ra, 0x002C($sp) -/* 060D4 808382E4 AFB00028 */ sw $s0, 0x0028($sp) -/* 060D8 808382E8 AFA50074 */ sw $a1, 0x0074($sp) -/* 060DC 808382EC 808E0A86 */ lb $t6, 0x0A86($a0) ## 00000A86 -/* 060E0 808382F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 060E4 808382F4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 060E8 808382F8 11C00009 */ beq $t6, $zero, .L80838320 -/* 060EC 808382FC 00000000 */ nop -/* 060F0 80838300 0C023A37 */ jal func_8008E8DC -/* 060F4 80838304 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 060F8 80838308 14400187 */ bne $v0, $zero, .L80838928 -/* 060FC 8083830C 8FA40074 */ lw $a0, 0x0074($sp) -/* 06100 80838310 0C214C38 */ jal func_808530E0 -/* 06104 80838314 2405FFF0 */ addiu $a1, $zero, 0xFFF0 ## $a1 = FFFFFFF0 -/* 06108 80838318 10000183 */ beq $zero, $zero, .L80838928 -/* 0610C 8083831C A2000A86 */ sb $zero, 0x0A86($s0) ## 00000A86 -.L80838320: -/* 06110 80838320 0C00B721 */ jal Player_GetCameraYOffset -/* 06114 80838324 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06118 80838328 C60406C4 */ lwc1 $f4, 0x06C4($s0) ## 000006C4 -/* 0611C 8083832C C6060054 */ lwc1 $f6, 0x0054($s0) ## 00000054 -/* 06120 80838330 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 06124 80838334 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 06128 80838338 46062202 */ mul.s $f8, $f4, $f6 -/* 0612C 8083833C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 06130 80838340 460A0401 */ sub.s $f16, $f0, $f10 -/* 06134 80838344 24056805 */ addiu $a1, $zero, 0x6805 ## $a1 = 00006805 -/* 06138 80838348 4608803C */ c.lt.s $f16, $f8 -/* 0613C 8083834C 00000000 */ nop -/* 06140 80838350 45000002 */ bc1f .L8083835C -/* 06144 80838354 00000000 */ nop -/* 06148 80838358 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083835C: -/* 0614C 8083835C 5440000F */ bnel $v0, $zero, .L8083839C -/* 06150 80838360 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06154 80838364 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 06158 80838368 3C048085 */ lui $a0, %hi(D_808535E4) ## $a0 = 80850000 -/* 0615C 8083836C 31F80100 */ andi $t8, $t7, 0x0100 ## $t8 = 00000000 -/* 06160 80838370 5700000A */ bnel $t8, $zero, .L8083839C -/* 06164 80838374 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06168 80838378 8C8435E4 */ lw $a0, %lo(D_808535E4)($a0) -/* 0616C 8083837C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 06170 80838380 50810006 */ beql $a0, $at, .L8083839C -/* 06174 80838384 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06178 80838388 8E190680 */ lw $t9, 0x0680($s0) ## 00000680 -/* 0617C 8083838C 00194800 */ sll $t1, $t9, 0 -/* 06180 80838390 05230044 */ bgezl $t1, .L808384A4 -/* 06184 80838394 920208A1 */ lbu $v0, 0x08A1($s0) ## 000008A1 -/* 06188 80838398 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8083839C: -/* 0618C 8083839C 0C20C9A6 */ jal func_80832698 -/* 06190 808383A0 AFA20068 */ sw $v0, 0x0068($sp) -/* 06194 808383A4 8FA20068 */ lw $v0, 0x0068($sp) -/* 06198 808383A8 8FA40074 */ lw $a0, 0x0074($sp) -/* 0619C 808383AC 50400008 */ beql $v0, $zero, .L808383D0 -/* 061A0 808383B0 848200A4 */ lh $v0, 0x00A4($a0) ## 000000A4 -/* 061A4 808383B4 0C030322 */ jal Gameplay_TriggerRespawn -/* 061A8 808383B8 8FA40074 */ lw $a0, 0x0074($sp) -/* 061AC 808383BC 0C026528 */ jal func_800994A0 -/* 061B0 808383C0 8FA40074 */ lw $a0, 0x0074($sp) -/* 061B4 808383C4 1000002B */ beq $zero, $zero, .L80838474 -/* 061B8 808383C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 061BC 808383CC 848200A4 */ lh $v0, 0x00A4($a0) ## 000000A4 -.L808383D0: -/* 061C0 808383D0 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 061C4 808383D4 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 061C8 808383D8 14620004 */ bne $v1, $v0, .L808383EC -/* 061CC 808383DC 01445021 */ addu $t2, $t2, $a0 -/* 061D0 808383E0 814A1CBC */ lb $t2, 0x1CBC($t2) ## 00011CBC -/* 061D4 808383E4 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 061D8 808383E8 11410008 */ beq $t2, $at, .L8083840C -.L808383EC: -/* 061DC 808383EC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 061E0 808383F0 1441001D */ bne $v0, $at, .L80838468 -/* 061E4 808383F4 3C0B0001 */ lui $t3, 0x0001 ## $t3 = 00010000 -/* 061E8 808383F8 01645821 */ addu $t3, $t3, $a0 -/* 061EC 808383FC 816B1CBC */ lb $t3, 0x1CBC($t3) ## 00011CBC -/* 061F0 80838400 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 061F4 80838404 15610018 */ bne $t3, $at, .L80838468 -/* 061F8 80838408 00000000 */ nop -.L8083840C: -/* 061FC 8083840C 14620004 */ bne $v1, $v0, .L80838420 -/* 06200 80838410 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 06204 80838414 3C028085 */ lui $v0, %hi(D_808544D4) ## $v0 = 80850000 -/* 06208 80838418 10000003 */ beq $zero, $zero, .L80838428 -/* 0620C 8083841C 244244D4 */ addiu $v0, $v0, %lo(D_808544D4) ## $v0 = 808544D4 -.L80838420: -/* 06210 80838420 3C028085 */ lui $v0, %hi(D_808544E4) ## $v0 = 80850000 -/* 06214 80838424 244244E4 */ addiu $v0, $v0, %lo(D_808544E4) ## $v0 = 808544E4 -.L80838428: -/* 06218 80838428 24060DFF */ addiu $a2, $zero, 0x0DFF ## $a2 = 00000DFF -/* 0621C 8083842C 0C0302BD */ jal Gameplay_SetupRespawnPoint -/* 06220 80838430 AFA20060 */ sw $v0, 0x0060($sp) -/* 06224 80838434 8FA20060 */ lw $v0, 0x0060($sp) -/* 06228 80838438 3C0C8016 */ lui $t4, %hi(gSaveContext+0x1368) -/* 0622C 8083843C 258CF9C8 */ addiu $t4, %lo(gSaveContext+0x1368) -/* 06230 80838440 8C4E0000 */ lw $t6, 0x0000($v0) ## 00000000 -/* 06234 80838444 3C018016 */ lui $at, %hi(gSaveContext+0x1374) -/* 06238 80838448 AD8E0000 */ sw $t6, 0x0000($t4) ## 8015F9C8 -/* 0623C 8083844C 8C4D0004 */ lw $t5, 0x0004($v0) ## 00000004 -/* 06240 80838450 AD8D0004 */ sw $t5, 0x0004($t4) ## 8015F9CC -/* 06244 80838454 8C4E0008 */ lw $t6, 0x0008($v0) ## 00000008 -/* 06248 80838458 AD8E0008 */ sw $t6, 0x0008($t4) ## 8015F9D0 -/* 0624C 8083845C 844F000C */ lh $t7, 0x000C($v0) ## 0000000C -/* 06250 80838460 8FA40074 */ lw $a0, 0x0074($sp) -/* 06254 80838464 A42FF9D4 */ sh $t7, %lo(gSaveContext+0x1374)($at) -.L80838468: -/* 06258 80838468 0C0302D8 */ jal Gameplay_TriggerVoidOut -/* 0625C 8083846C 00000000 */ nop -/* 06260 80838470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80838474: -/* 06264 80838474 0C20C9A6 */ jal func_80832698 -/* 06268 80838478 2405680C */ addiu $a1, $zero, 0x680C ## $a1 = 0000680C -/* 0626C 8083847C 8FB90074 */ lw $t9, 0x0074($sp) -/* 06270 80838480 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 06274 80838484 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 06278 80838488 00390821 */ addu $at, $at, $t9 -/* 0627C 8083848C A0381DE9 */ sb $t8, 0x1DE9($at) ## 00011DE9 -/* 06280 80838490 0C01E221 */ jal func_80078884 -/* 06284 80838494 24045801 */ addiu $a0, $zero, 0x5801 ## $a0 = 00005801 -/* 06288 80838498 10000124 */ beq $zero, $zero, .L8083892C -/* 0628C 8083849C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 06290 808384A0 920208A1 */ lbu $v0, 0x08A1($s0) ## 000008A1 -.L808384A4: -/* 06294 808384A4 10400023 */ beq $v0, $zero, .L80838534 -/* 06298 808384A8 28410002 */ slti $at, $v0, 0x0002 -/* 0629C 808384AC 10200003 */ beq $at, $zero, .L808384BC -/* 062A0 808384B0 27AA005C */ addiu $t2, $sp, 0x005C ## $t2 = FFFFFFEC -/* 062A4 808384B4 82090A78 */ lb $t1, 0x0A78($s0) ## 00000A78 -/* 062A8 808384B8 1520001E */ bne $t1, $zero, .L80838534 -.L808384BC: -/* 062AC 808384BC 3C0B8085 */ lui $t3, %hi(D_808544D0) ## $t3 = 80850000 -/* 062B0 808384C0 256B44D0 */ addiu $t3, $t3, %lo(D_808544D0) ## $t3 = 808544D0 -/* 062B4 808384C4 996D0002 */ lwr $t5, 0x0002($t3) ## 808544D2 -/* 062B8 808384C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 062BC 808384CC 0C20E0A0 */ jal func_80838280 -/* 062C0 808384D0 B94D0002 */ swr $t5, 0x0002($t2) ## FFFFFFEE -/* 062C4 808384D4 920208A1 */ lbu $v0, 0x08A1($s0) ## 000008A1 -/* 062C8 808384D8 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 062CC 808384DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 062D0 808384E0 14620004 */ bne $v1, $v0, .L808384F4 -/* 062D4 808384E4 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 062D8 808384E8 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 -/* 062DC 808384EC A20E0891 */ sb $t6, 0x0891($s0) ## 00000891 -/* 062E0 808384F0 920208A1 */ lbu $v0, 0x08A1($s0) ## 000008A1 -.L808384F4: -/* 062E4 808384F4 920F00B0 */ lbu $t7, 0x00B0($s0) ## 000000B0 -/* 062E8 808384F8 921808A0 */ lbu $t8, 0x08A0($s0) ## 000008A0 -/* 062EC 808384FC C61208A8 */ lwc1 $f18, 0x08A8($s0) ## 000008A8 -/* 062F0 80838500 03A23021 */ addu $a2, $sp, $v0 -/* 062F4 80838504 01F8C821 */ addu $t9, $t7, $t8 -/* 062F8 80838508 A21900B0 */ sb $t9, 0x00B0($s0) ## 000000B0 -/* 062FC 8083850C 90C6005B */ lbu $a2, 0x005B($a2) ## 0000005B -/* 06300 80838510 8E0708A4 */ lw $a3, 0x08A4($s0) ## 000008A4 -/* 06304 80838514 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 06308 80838518 860908A2 */ lh $t1, 0x08A2($s0) ## 000008A2 -/* 0630C 8083851C AFAA0018 */ sw $t2, 0x0018($sp) -/* 06310 80838520 8FA40074 */ lw $a0, 0x0074($sp) -/* 06314 80838524 0C20DF03 */ jal func_80837C0C -/* 06318 80838528 AFA90014 */ sw $t1, 0x0014($sp) -/* 0631C 8083852C 100000FF */ beq $zero, $zero, .L8083892C -/* 06320 80838530 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80838534: -/* 06324 80838534 920805F5 */ lbu $t0, 0x05F5($s0) ## 000005F5 -/* 06328 80838538 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 0632C 8083853C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 06330 80838540 31080080 */ andi $t0, $t0, 0x0080 ## $t0 = 00000000 -/* 06334 80838544 0008402B */ sltu $t0, $zero, $t0 -/* 06338 80838548 1500000F */ bne $t0, $zero, .L80838588 -/* 0633C 8083854C 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 06340 80838550 82030A78 */ lb $v1, 0x0A78($s0) ## 00000A78 -/* 06344 80838554 04630069 */ bgezl $v1, .L808386FC -/* 06348 80838558 920C0A87 */ lbu $t4, 0x0A87($s0) ## 00000A87 -/* 0634C 8083855C 920B04A9 */ lbu $t3, 0x04A9($s0) ## 000004A9 -/* 06350 80838560 316C0002 */ andi $t4, $t3, 0x0002 ## $t4 = 00000000 -/* 06354 80838564 51800065 */ beql $t4, $zero, .L808386FC -/* 06358 80838568 920C0A87 */ lbu $t4, 0x0A87($s0) ## 00000A87 -/* 0635C 8083856C 8E0204C8 */ lw $v0, 0x04C8($s0) ## 000004C8 -/* 06360 80838570 50400062 */ beql $v0, $zero, .L808386FC -/* 06364 80838574 920C0A87 */ lbu $t4, 0x0A87($s0) ## 00000A87 -/* 06368 80838578 904D0010 */ lbu $t5, 0x0010($v0) ## 00000011 -/* 0636C 8083857C 000D7080 */ sll $t6, $t5, 2 -/* 06370 80838580 05C3005E */ bgezl $t6, .L808386FC -/* 06374 80838584 920C0A87 */ lbu $t4, 0x0A87($s0) ## 00000A87 -.L80838588: -/* 06378 80838588 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0637C 8083858C AFA00010 */ sw $zero, 0x0010($sp) -/* 06380 80838590 0C20C993 */ jal func_8083264C -/* 06384 80838594 AFA80064 */ sw $t0, 0x0064($sp) -/* 06388 80838598 0C023A74 */ jal func_8008E9D0 -/* 0638C 8083859C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06390 808385A0 54400049 */ bnel $v0, $zero, .L808386C8 -/* 06394 808385A4 8FA90064 */ lw $t1, 0x0064($sp) -/* 06398 808385A8 820F0A78 */ lb $t7, 0x0A78($s0) ## 00000A78 -/* 0639C 808385AC 3C198084 */ lui $t9, %hi(func_80843188) ## $t9 = 80840000 -/* 063A0 808385B0 05E2003B */ bltzl $t7, .L808386A0 -/* 063A4 808385B4 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 063A8 808385B8 8E180674 */ lw $t8, 0x0674($s0) ## 00000674 -/* 063AC 808385BC 27393188 */ addiu $t9, $t9, %lo(func_80843188) ## $t9 = 80843188 -/* 063B0 808385C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 063B4 808385C4 03194826 */ xor $t1, $t8, $t9 -/* 063B8 808385C8 2D290001 */ sltiu $t1, $t1, 0x0001 -/* 063BC 808385CC 0C20CCAE */ jal func_808332B8 -/* 063C0 808385D0 AFA90054 */ sw $t1, 0x0054($sp) -/* 063C4 808385D4 14400006 */ bne $v0, $zero, .L808385F0 -/* 063C8 808385D8 8FA40074 */ lw $a0, 0x0074($sp) -/* 063CC 808385DC 3C068084 */ lui $a2, %hi(func_808435C4) ## $a2 = 80840000 -/* 063D0 808385E0 24C635C4 */ addiu $a2, $a2, %lo(func_808435C4) ## $a2 = 808435C4 -/* 063D4 808385E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 063D8 808385E8 0C20D716 */ jal func_80835C58 -/* 063DC 808385EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -.L808385F0: -/* 063E0 808385F0 8FA20054 */ lw $v0, 0x0054($sp) -/* 063E4 808385F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 063E8 808385F8 3C058083 */ lui $a1, %hi(func_80834BD4) ## $a1 = 80830000 -/* 063EC 808385FC 00025600 */ sll $t2, $v0, 24 -/* 063F0 80838600 000A5E03 */ sra $t3, $t2, 24 -/* 063F4 80838604 1560001C */ bne $t3, $zero, .L80838678 -/* 063F8 80838608 A202084F */ sb $v0, 0x084F($s0) ## 0000084F -/* 063FC 8083860C 0C20CD8E */ jal func_80833638 -/* 06400 80838610 24A54BD4 */ addiu $a1, $a1, %lo(func_80834BD4) ## $a1 = 80834BD4 -/* 06404 80838614 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 06408 80838618 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 0640C 8083861C C6040870 */ lwc1 $f4, 0x0870($s0) ## 00000870 -/* 06410 80838620 4606203C */ c.lt.s $f4, $f6 -/* 06414 80838624 00000000 */ nop -/* 06418 80838628 45000008 */ bc1f .L8083864C -/* 0641C 8083862C 00000000 */ nop -/* 06420 80838630 0C023C68 */ jal func_8008F1A0 -/* 06424 80838634 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06428 80838638 00026080 */ sll $t4, $v0, 2 -/* 0642C 8083863C 3C068085 */ lui $a2, %hi(D_808543BC) ## $a2 = 80850000 -/* 06430 80838640 00CC3021 */ addu $a2, $a2, $t4 -/* 06434 80838644 10000007 */ beq $zero, $zero, .L80838664 -/* 06438 80838648 8CC643BC */ lw $a2, %lo(D_808543BC)($a2) -.L8083864C: -/* 0643C 8083864C 0C023C68 */ jal func_8008F1A0 -/* 06440 80838650 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06444 80838654 00026880 */ sll $t5, $v0, 2 -/* 06448 80838658 3C068085 */ lui $a2, %hi(D_808543B4) ## $a2 = 80850000 -/* 0644C 8083865C 00CD3021 */ addu $a2, $a2, $t5 -/* 06450 80838660 8CC643B4 */ lw $a2, %lo(D_808543B4)($a2) -.L80838664: -/* 06454 80838664 8FA40074 */ lw $a0, 0x0074($sp) -/* 06458 80838668 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop -/* 0645C 8083866C 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 06460 80838670 1000000B */ beq $zero, $zero, .L808386A0 -/* 06464 80838674 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -.L80838678: -/* 06468 80838678 0C023C68 */ jal func_8008F1A0 -/* 0646C 8083867C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06470 80838680 00027080 */ sll $t6, $v0, 2 -/* 06474 80838684 3C068085 */ lui $a2, %hi(D_808543C4) ## $a2 = 80850000 -/* 06478 80838688 00CE3021 */ addu $a2, $a2, $t6 -/* 0647C 8083868C 8CC643C4 */ lw $a2, %lo(D_808543C4)($a2) -/* 06480 80838690 8FA40074 */ lw $a0, 0x0074($sp) -/* 06484 80838694 0C20C899 */ jal func_80832264 -/* 06488 80838698 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0648C 8083869C 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -.L808386A0: -/* 06490 808386A0 3C010020 */ lui $at, 0x0020 ## $at = 00200000 -/* 06494 808386A4 34216000 */ ori $at, $at, 0x6000 ## $at = 00206000 -/* 06498 808386A8 01E1C024 */ and $t8, $t7, $at -/* 0649C 808386AC 17000005 */ bne $t8, $zero, .L808386C4 -/* 064A0 808386B0 3C01C190 */ lui $at, 0xC190 ## $at = C1900000 -/* 064A4 808386B4 44815000 */ mtc1 $at, $f10 ## $f10 = -18.00 -/* 064A8 808386B8 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 064AC 808386BC E60A0838 */ swc1 $f10, 0x0838($s0) ## 00000838 -/* 064B0 808386C0 A619083C */ sh $t9, 0x083C($s0) ## 0000083C -.L808386C4: -/* 064B4 808386C4 8FA90064 */ lw $t1, 0x0064($sp) -.L808386C8: -/* 064B8 808386C8 11200009 */ beq $t1, $zero, .L808386F0 -/* 064BC 808386CC 00000000 */ nop -/* 064C0 808386D0 8E0A0620 */ lw $t2, 0x0620($s0) ## 00000620 -/* 064C4 808386D4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 064C8 808386D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 064CC 808386DC 914B0004 */ lbu $t3, 0x0004($t2) ## 00000004 -/* 064D0 808386E0 15610003 */ bne $t3, $at, .L808386F0 -/* 064D4 808386E4 00000000 */ nop -/* 064D8 808386E8 0C20E067 */ jal func_8083819C -/* 064DC 808386EC 8FA50074 */ lw $a1, 0x0074($sp) -.L808386F0: -/* 064E0 808386F0 1000008E */ beq $zero, $zero, .L8083892C -/* 064E4 808386F4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 064E8 808386F8 920C0A87 */ lbu $t4, 0x0A87($s0) ## 00000A87 -.L808386FC: -/* 064EC 808386FC 15800012 */ bne $t4, $zero, .L80838748 -/* 064F0 80838700 00000000 */ nop -/* 064F4 80838704 1C600010 */ bgtz $v1, .L80838748 -/* 064F8 80838708 00000000 */ nop -/* 064FC 8083870C 8E02067C */ lw $v0, 0x067C($s0) ## 0000067C -/* 06500 80838710 00026940 */ sll $t5, $v0, 5 -/* 06504 80838714 05A0000C */ bltz $t5, .L80838748 -/* 06508 80838718 00000000 */ nop -/* 0650C 8083871C 920E0444 */ lbu $t6, 0x0444($s0) ## 00000444 -/* 06510 80838720 15C00009 */ bne $t6, $zero, .L80838748 -/* 06514 80838724 00000000 */ nop -/* 06518 80838728 920F04F4 */ lbu $t7, 0x04F4($s0) ## 000004F4 -/* 0651C 8083872C 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 06520 80838730 17000005 */ bne $t8, $zero, .L80838748 -/* 06524 80838734 00000000 */ nop -/* 06528 80838738 92190574 */ lbu $t9, 0x0574($s0) ## 00000574 -/* 0652C 8083873C 33290002 */ andi $t1, $t9, 0x0002 ## $t1 = 00000000 -/* 06530 80838740 51200004 */ beql $t1, $zero, .L80838754 -/* 06534 80838744 920A04A9 */ lbu $t2, 0x04A9($s0) ## 000004A9 -.L80838748: -/* 06538 80838748 10000078 */ beq $zero, $zero, .L8083892C -/* 0653C 8083874C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 06540 80838750 920A04A9 */ lbu $t2, 0x04A9($s0) ## 000004A9 -.L80838754: -/* 06544 80838754 314B0002 */ andi $t3, $t2, 0x0002 ## $t3 = 00000000 -/* 06548 80838758 11600035 */ beq $t3, $zero, .L80838830 -/* 0654C 8083875C 00000000 */ nop -/* 06550 80838760 8E0704A0 */ lw $a3, 0x04A0($s0) ## 000004A0 -/* 06554 80838764 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06558 80838768 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E -/* 0655C 8083876C 8CEC0004 */ lw $t4, 0x0004($a3) ## 00000004 -/* 06560 80838770 000C69C0 */ sll $t5, $t4, 7 -/* 06564 80838774 05A30006 */ bgezl $t5, .L80838790 -/* 06568 80838778 00027100 */ sll $t6, $v0, 4 -/* 0656C 8083877C 0C00BDF7 */ jal func_8002F7DC -/* 06570 80838780 AFA70050 */ sw $a3, 0x0050($sp) -/* 06574 80838784 8FA70050 */ lw $a3, 0x0050($sp) -/* 06578 80838788 8E02067C */ lw $v0, 0x067C($s0) ## 0000067C -/* 0657C 8083878C 00027100 */ sll $t6, $v0, 4 -.L80838790: -/* 06580 80838790 05C30004 */ bgezl $t6, .L808387A4 -/* 06584 80838794 920200B3 */ lbu $v0, 0x00B3($s0) ## 000000B3 -/* 06588 80838798 10000014 */ beq $zero, $zero, .L808387EC -/* 0658C 8083879C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 06590 808387A0 920200B3 */ lbu $v0, 0x00B3($s0) ## 000000B3 -.L808387A4: -/* 06594 808387A4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 06598 808387A8 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 0659C 808387AC 14410003 */ bne $v0, $at, .L808387BC -/* 065A0 808387B0 00000000 */ nop -/* 065A4 808387B4 1000000D */ beq $zero, $zero, .L808387EC -/* 065A8 808387B8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -.L808387BC: -/* 065AC 808387BC 14620003 */ bne $v1, $v0, .L808387CC -/* 065B0 808387C0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 065B4 808387C4 10000009 */ beq $zero, $zero, .L808387EC -/* 065B8 808387C8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L808387CC: -/* 065BC 808387CC 14410003 */ bne $v0, $at, .L808387DC -/* 065C0 808387D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 065C4 808387D4 10000005 */ beq $zero, $zero, .L808387EC -/* 065C8 808387D8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -.L808387DC: -/* 065CC 808387DC 0C20E0A0 */ jal func_80838280 -/* 065D0 808387E0 AFA70050 */ sw $a3, 0x0050($sp) -/* 065D4 808387E4 8FA70050 */ lw $a3, 0x0050($sp) -/* 065D8 808387E8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -.L808387EC: -/* 065DC 808387EC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 065E0 808387F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 065E4 808387F4 0C00B69E */ jal func_8002DA78 -/* 065E8 808387F8 AFA6004C */ sw $a2, 0x004C($sp) -/* 065EC 808387FC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 065F0 80838800 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 065F4 80838804 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 065F8 80838808 AFAF0018 */ sw $t7, 0x0018($sp) -/* 065FC 8083880C 8FA6004C */ lw $a2, 0x004C($sp) -/* 06600 80838810 8FA40074 */ lw $a0, 0x0074($sp) -/* 06604 80838814 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 06608 80838818 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 0660C 8083881C AFA20014 */ sw $v0, 0x0014($sp) -/* 06610 80838820 0C20DF03 */ jal func_80837C0C -/* 06614 80838824 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 06618 80838828 10000040 */ beq $zero, $zero, .L8083892C -/* 0661C 8083882C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80838830: -/* 06620 80838830 10600003 */ beq $v1, $zero, .L80838840 -/* 06624 80838834 00000000 */ nop -/* 06628 80838838 1000003C */ beq $zero, $zero, .L8083892C -/* 0662C 8083883C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80838840: -/* 06630 80838840 0C20E051 */ jal func_80838144 -/* 06634 80838844 00000000 */ nop -/* 06638 80838848 8E050074 */ lw $a1, 0x0074($s0) ## 00000074 -/* 0663C 8083884C 8FA40074 */ lw $a0, 0x0074($sp) -/* 06640 80838850 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 06644 80838854 10A00006 */ beq $a1, $zero, .L80838870 -/* 06648 80838858 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 0664C 8083885C 9206007C */ lbu $a2, 0x007C($s0) ## 0000007C -/* 06650 80838860 0C010842 */ jal func_80042108 -/* 06654 80838864 AFA20048 */ sw $v0, 0x0048($sp) -/* 06658 80838868 1440001C */ bne $v0, $zero, .L808388DC -/* 0665C 8083886C 8FA30048 */ lw $v1, 0x0048($sp) -.L80838870: -/* 06660 80838870 0460000F */ bltz $v1, .L808388B0 -/* 06664 80838874 8FA40074 */ lw $a0, 0x0074($sp) -/* 06668 80838878 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 0666C 8083887C 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 06670 80838880 AFA30048 */ sw $v1, 0x0048($sp) -/* 06674 80838884 0C010842 */ jal func_80042108 -/* 06678 80838888 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 0667C 8083888C 10400008 */ beq $v0, $zero, .L808388B0 -/* 06680 80838890 8FA30048 */ lw $v1, 0x0048($sp) -/* 06684 80838894 3C198085 */ lui $t9, %hi(D_808544F4) ## $t9 = 80850000 -/* 06688 80838898 0323C821 */ addu $t9, $t9, $v1 -/* 0668C 8083889C 933944F4 */ lbu $t9, %lo(D_808544F4)($t9) -/* 06690 808388A0 92180A79 */ lbu $t8, 0x0A79($s0) ## 00000A79 -/* 06694 808388A4 0319082A */ slt $at, $t8, $t9 -/* 06698 808388A8 5020000D */ beql $at, $zero, .L808388E0 -/* 0669C 808388AC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -.L808388B0: -/* 066A0 808388B0 0460001B */ bltz $v1, .L80838920 -/* 066A4 808388B4 00000000 */ nop -/* 066A8 808388B8 8209014C */ lb $t1, 0x014C($s0) ## 0000014C -/* 066AC 808388BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 066B0 808388C0 3C0B8085 */ lui $t3, %hi(D_808544F4) ## $t3 = 80850000 -/* 066B4 808388C4 15210005 */ bne $t1, $at, .L808388DC -/* 066B8 808388C8 01635821 */ addu $t3, $t3, $v1 -/* 066BC 808388CC 920A0A79 */ lbu $t2, 0x0A79($s0) ## 00000A79 -/* 066C0 808388D0 916B44F4 */ lbu $t3, %lo(D_808544F4)($t3) -/* 066C4 808388D4 014B082A */ slt $at, $t2, $t3 -/* 066C8 808388D8 14200011 */ bne $at, $zero, .L80838920 -.L808388DC: -/* 066CC 808388DC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -.L808388E0: -/* 066D0 808388E0 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 066D4 808388E4 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 -/* 066D8 808388E8 A2000A79 */ sb $zero, 0x0A79($s0) ## 00000A79 -/* 066DC 808388EC A20C00B0 */ sb $t4, 0x00B0($s0) ## 000000B0 -/* 066E0 808388F0 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 066E4 808388F4 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 -/* 066E8 808388F8 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 066EC 808388FC AFAE0018 */ sw $t6, 0x0018($sp) -/* 066F0 80838900 8FA40074 */ lw $a0, 0x0074($sp) -/* 066F4 80838904 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 066F8 80838908 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 066FC 8083890C 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 06700 80838910 0C20DF03 */ jal func_80837C0C -/* 06704 80838914 AFAD0014 */ sw $t5, 0x0014($sp) -/* 06708 80838918 10000004 */ beq $zero, $zero, .L8083892C -/* 0670C 8083891C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80838920: -/* 06710 80838920 10000002 */ beq $zero, $zero, .L8083892C -/* 06714 80838924 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80838928: -/* 06718 80838928 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083892C: -/* 0671C 8083892C 8FBF002C */ lw $ra, 0x002C($sp) -/* 06720 80838930 8FB00028 */ lw $s0, 0x0028($sp) -/* 06724 80838934 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 06728 80838938 03E00008 */ jr $ra -/* 0672C 8083893C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838940.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838940.s deleted file mode 100644 index 78a94268f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838940.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80838940 -/* 06730 80838940 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 06734 80838944 AFB00018 */ sw $s0, 0x0018($sp) -/* 06738 80838948 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0673C 8083894C AFA60028 */ sw $a2, 0x0028($sp) -/* 06740 80838950 AFBF001C */ sw $ra, 0x001C($sp) -/* 06744 80838954 AFA50024 */ sw $a1, 0x0024($sp) -/* 06748 80838958 AFA7002C */ sw $a3, 0x002C($sp) -/* 0674C 8083895C 3C068084 */ lui $a2, %hi(func_8084411C) ## $a2 = 80840000 -/* 06750 80838960 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 06754 80838964 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 06758 80838968 24C6411C */ addiu $a2, $a2, %lo(func_8084411C) ## $a2 = 8084411C -/* 0675C 8083896C 0C20D716 */ jal func_80835C58 -/* 06760 80838970 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 06764 80838974 8FA60024 */ lw $a2, 0x0024($sp) -/* 06768 80838978 8FA4002C */ lw $a0, 0x002C($sp) -/* 0676C 8083897C 10C00003 */ beq $a2, $zero, .L8083898C -/* 06770 80838980 00000000 */ nop -/* 06774 80838984 0C20C8B4 */ jal func_808322D0 -/* 06778 80838988 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L8083898C: -/* 0677C 8083898C 3C018085 */ lui $at, %hi(D_808535E8) ## $at = 80850000 -/* 06780 80838990 C42635E8 */ lwc1 $f6, %lo(D_808535E8)($at) -/* 06784 80838994 C7A40028 */ lwc1 $f4, 0x0028($sp) -/* 06788 80838998 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 0678C 8083899C A2000893 */ sb $zero, 0x0893($s0) ## 00000893 -/* 06790 808389A0 46062202 */ mul.s $f8, $f4, $f6 -/* 06794 808389A4 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 -/* 06798 808389A8 A60F0088 */ sh $t7, 0x0088($s0) ## 00000088 -/* 0679C 808389AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 067A0 808389B0 0C20CA15 */ jal func_80832854 -/* 067A4 808389B4 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 067A8 808389B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 067AC 808389BC 0C20C9A6 */ jal func_80832698 -/* 067B0 808389C0 97A50032 */ lhu $a1, 0x0032($sp) -/* 067B4 808389C4 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 067B8 808389C8 3C010004 */ lui $at, 0x0004 ## $at = 00040000 -/* 067BC 808389CC 0301C825 */ or $t9, $t8, $at ## $t9 = 00040000 -/* 067C0 808389D0 AE19067C */ sw $t9, 0x067C($s0) ## 0000067C -/* 067C4 808389D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 067C8 808389D8 8FB00018 */ lw $s0, 0x0018($sp) -/* 067CC 808389DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 067D0 808389E0 03E00008 */ jr $ra -/* 067D4 808389E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808389E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808389E8.s deleted file mode 100644 index 7f58578787..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808389E8.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_808389E8 -/* 067D8 808389E8 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 067DC 808389EC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 067E0 808389F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 067E4 808389F4 240E6800 */ addiu $t6, $zero, 0x6800 ## $t6 = 00006800 -/* 067E8 808389F8 44066000 */ mfc1 $a2, $f12 -/* 067EC 808389FC 0C20E250 */ jal func_80838940 -/* 067F0 80838A00 AFAE0010 */ sw $t6, 0x0010($sp) -/* 067F4 80838A04 8FBF001C */ lw $ra, 0x001C($sp) -/* 067F8 80838A08 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 067FC 80838A0C 03E00008 */ jr $ra -/* 06800 80838A10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s deleted file mode 100644 index e5e1a4e7cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s +++ /dev/null @@ -1,306 +0,0 @@ -.late_rodata -glabel D_80855374 - .word 0x38000100 -glabel D_80855378 - .float 0.08 - -.text -glabel func_80838A14 -/* 06804 80838A14 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 06808 80838A18 AFBF001C */ sw $ra, 0x001C($sp) -/* 0680C 80838A1C AFB00018 */ sw $s0, 0x0018($sp) -/* 06810 80838A20 AFA50044 */ sw $a1, 0x0044($sp) -/* 06814 80838A24 8C82067C */ lw $v0, 0x067C($a0) ## 0000067C -/* 06818 80838A28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0681C 80838A2C 304E0800 */ andi $t6, $v0, 0x0800 ## $t6 = 00000000 -/* 06820 80838A30 55C000EC */ bnel $t6, $zero, .L80838DE4 -/* 06824 80838A34 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -/* 06828 80838A38 908F088C */ lbu $t7, 0x088C($a0) ## 0000088C -/* 0682C 80838A3C 0002C100 */ sll $t8, $v0, 4 -/* 06830 80838A40 29E10002 */ slti $at, $t7, 0x0002 -/* 06834 80838A44 542000E7 */ bnel $at, $zero, .L80838DE4 -/* 06838 80838A48 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -/* 0683C 80838A4C 07030008 */ bgezl $t8, .L80838A70 -/* 06840 80838A50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06844 80838A54 8C990678 */ lw $t9, 0x0678($a0) ## 00000678 -/* 06848 80838A58 C4840884 */ lwc1 $f4, 0x0884($a0) ## 00000884 -/* 0684C 80838A5C C7260014 */ lwc1 $f6, 0x0014($t9) ## 00000014 -/* 06850 80838A60 4606203C */ c.lt.s $f4, $f6 -/* 06854 80838A64 00000000 */ nop -/* 06858 80838A68 450000DD */ bc1f .L80838DE0 -/* 0685C 80838A6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80838A70: -/* 06860 80838A70 0C20CCAE */ jal func_808332B8 -/* 06864 80838A74 AFA0003C */ sw $zero, 0x003C($sp) -/* 06868 80838A78 1040001F */ beq $v0, $zero, .L80838AF8 -/* 0686C 80838A7C 8FA3003C */ lw $v1, 0x003C($sp) -/* 06870 80838A80 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 06874 80838A84 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 06878 80838A88 C6080084 */ lwc1 $f8, 0x0084($s0) ## 00000084 -/* 0687C 80838A8C 460A403C */ c.lt.s $f8, $f10 -/* 06880 80838A90 00000000 */ nop -/* 06884 80838A94 4502000F */ bc1fl .L80838AD4 -/* 06888 80838A98 820A014F */ lb $t2, 0x014F($s0) ## 0000014F -/* 0688C 80838A9C 9208088C */ lbu $t0, 0x088C($s0) ## 0000088C -/* 06890 80838AA0 29010002 */ slti $at, $t0, 0x0002 -/* 06894 80838AA4 14200008 */ bne $at, $zero, .L80838AC8 -/* 06898 80838AA8 00000000 */ nop -/* 0689C 80838AAC 8E090678 */ lw $t1, 0x0678($s0) ## 00000678 -/* 068A0 80838AB0 C6120884 */ lwc1 $f18, 0x0884($s0) ## 00000884 -/* 068A4 80838AB4 C5300010 */ lwc1 $f16, 0x0010($t1) ## 00000010 -/* 068A8 80838AB8 4612803C */ c.lt.s $f16, $f18 -/* 068AC 80838ABC 00000000 */ nop -/* 068B0 80838AC0 4502001F */ bc1fl .L80838B40 -/* 068B4 80838AC4 9219007C */ lbu $t9, 0x007C($s0) ## 0000007C -.L80838AC8: -/* 068B8 80838AC8 100000E4 */ beq $zero, $zero, .L80838E5C -/* 068BC 80838ACC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 068C0 80838AD0 820A014F */ lb $t2, 0x014F($s0) ## 0000014F -.L80838AD4: -/* 068C4 80838AD4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 068C8 80838AD8 15410005 */ bne $t2, $at, .L80838AF0 -/* 068CC 80838ADC 00000000 */ nop -/* 068D0 80838AE0 920B088C */ lbu $t3, 0x088C($s0) ## 0000088C -/* 068D4 80838AE4 29610003 */ slti $at, $t3, 0x0003 -/* 068D8 80838AE8 54200015 */ bnel $at, $zero, .L80838B40 -/* 068DC 80838AEC 9219007C */ lbu $t9, 0x007C($s0) ## 0000007C -.L80838AF0: -/* 068E0 80838AF0 100000DA */ beq $zero, $zero, .L80838E5C -/* 068E4 80838AF4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80838AF8: -/* 068E8 80838AF8 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -/* 068EC 80838AFC 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 068F0 80838B00 11A0000C */ beq $t5, $zero, .L80838B34 -/* 068F4 80838B04 00000000 */ nop -/* 068F8 80838B08 8E0E0678 */ lw $t6, 0x0678($s0) ## 00000678 -/* 068FC 80838B0C C6040884 */ lwc1 $f4, 0x0884($s0) ## 00000884 -/* 06900 80838B10 C5C60014 */ lwc1 $f6, 0x0014($t6) ## 00000014 -/* 06904 80838B14 4604303E */ c.le.s $f6, $f4 -/* 06908 80838B18 00000000 */ nop -/* 0690C 80838B1C 45020008 */ bc1fl .L80838B40 -/* 06910 80838B20 9219007C */ lbu $t9, 0x007C($s0) ## 0000007C -/* 06914 80838B24 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 06918 80838B28 000FC100 */ sll $t8, $t7, 4 -/* 0691C 80838B2C 07030004 */ bgezl $t8, .L80838B40 -/* 06920 80838B30 9219007C */ lbu $t9, 0x007C($s0) ## 0000007C -.L80838B34: -/* 06924 80838B34 100000C9 */ beq $zero, $zero, .L80838E5C -/* 06928 80838B38 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0692C 80838B3C 9219007C */ lbu $t9, 0x007C($s0) ## 0000007C -.L80838B40: -/* 06930 80838B40 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 06934 80838B44 3C088085 */ lui $t0, %hi(D_808535F0) ## $t0 = 80850000 -/* 06938 80838B48 13210016 */ beq $t9, $at, .L80838BA4 -/* 0693C 80838B4C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 06940 80838B50 8D0835F0 */ lw $t0, %lo(D_808535F0)($t0) -/* 06944 80838B54 31090040 */ andi $t1, $t0, 0x0040 ## $t1 = 00000000 -/* 06948 80838B58 51200013 */ beql $t1, $zero, .L80838BA8 -/* 0694C 80838B5C 9218088D */ lbu $t8, 0x088D($s0) ## 0000088D -/* 06950 80838B60 920A088D */ lbu $t2, 0x088D($s0) ## 0000088D -/* 06954 80838B64 29410006 */ slti $at, $t2, 0x0006 -/* 06958 80838B68 1420001B */ bne $at, $zero, .L80838BD8 -/* 0695C 80838B6C 00000000 */ nop -/* 06960 80838B70 8E0B0680 */ lw $t3, 0x0680($s0) ## 00000680 -/* 06964 80838B74 3C0D8086 */ lui $t5, %hi(D_80858AB4) ## $t5 = 80860000 -/* 06968 80838B78 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 0696C 80838B7C 356C0004 */ ori $t4, $t3, 0x0004 ## $t4 = 00000004 -/* 06970 80838B80 AE0C0680 */ sw $t4, 0x0680($s0) ## 00000680 -/* 06974 80838B84 8DAD8AB4 */ lw $t5, %lo(D_80858AB4)($t5) -/* 06978 80838B88 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 0697C 80838B8C 95AE000C */ lhu $t6, 0x000C($t5) ## 8086000C -/* 06980 80838B90 01C17827 */ nor $t7, $t6, $at -/* 06984 80838B94 15E00010 */ bne $t7, $zero, .L80838BD8 -/* 06988 80838B98 00000000 */ nop -/* 0698C 80838B9C 1000000E */ beq $zero, $zero, .L80838BD8 -/* 06990 80838BA0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80838BA4: -/* 06994 80838BA4 9218088D */ lbu $t8, 0x088D($s0) ## 0000088D -.L80838BA8: -/* 06998 80838BA8 3C198086 */ lui $t9, %hi(D_80858AB4) ## $t9 = 80860000 -/* 0699C 80838BAC 2B010006 */ slti $at, $t8, 0x0006 -/* 069A0 80838BB0 50200009 */ beql $at, $zero, .L80838BD8 -/* 069A4 80838BB4 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 069A8 80838BB8 8F398AB4 */ lw $t9, %lo(D_80858AB4)($t9) -/* 069AC 80838BBC 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 069B0 80838BC0 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 069B4 80838BC4 9728000C */ lhu $t0, 0x000C($t9) ## 8086000C -/* 069B8 80838BC8 01014827 */ nor $t1, $t0, $at -/* 069BC 80838BCC 15200002 */ bne $t1, $zero, .L80838BD8 -/* 069C0 80838BD0 00000000 */ nop -/* 069C4 80838BD4 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80838BD8: -/* 069C8 80838BD8 1060009F */ beq $v1, $zero, .L80838E58 -/* 069CC 80838BDC 8FA40044 */ lw $a0, 0x0044($sp) -/* 069D0 80838BE0 3C068084 */ lui $a2, %hi(func_80845668) ## $a2 = 80840000 -/* 069D4 80838BE4 24C65668 */ addiu $a2, $a2, %lo(func_80845668) ## $a2 = 80845668 -/* 069D8 80838BE8 0C20D716 */ jal func_80835C58 -/* 069DC 80838BEC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 069E0 80838BF0 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C -/* 069E4 80838BF4 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 -/* 069E8 80838BF8 3C010004 */ lui $at, 0x0004 ## $at = 00040000 -/* 069EC 80838BFC 01415825 */ or $t3, $t2, $at ## $t3 = 00040000 -/* 069F0 80838C00 AE0B067C */ sw $t3, 0x067C($s0) ## 0000067C -/* 069F4 80838C04 C6000884 */ lwc1 $f0, 0x0884($s0) ## 00000884 -/* 069F8 80838C08 C5880014 */ lwc1 $f8, 0x0014($t4) ## 00000014 -/* 069FC 80838C0C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 06A00 80838C10 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 06A04 80838C14 4600403E */ c.le.s $f8, $f0 -/* 06A08 80838C18 00000000 */ nop -/* 06A0C 80838C1C 45020006 */ bc1fl .L80838C38 -/* 06A10 80838C20 8E020074 */ lw $v0, 0x0074($s0) ## 00000074 -/* 06A14 80838C24 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 06A18 80838C28 24C62D48 */ addiu $a2, $a2, 0x2D48 ## $a2 = 04002D48 -/* 06A1C 80838C2C 10000059 */ beq $zero, $zero, .L80838D94 -/* 06A20 80838C30 E60A0838 */ swc1 $f10, 0x0838($s0) ## 00000838 -/* 06A24 80838C34 8E020074 */ lw $v0, 0x0074($s0) ## 00000074 -.L80838C38: -/* 06A28 80838C38 3C018085 */ lui $at, %hi(D_80855374) ## $at = 80850000 -/* 06A2C 80838C3C C42C5374 */ lwc1 $f12, %lo(D_80855374)($at) -/* 06A30 80838C40 844D0008 */ lh $t5, 0x0008($v0) ## 00000008 -/* 06A34 80838C44 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 06A38 80838C48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06A3C 80838C4C 448D8000 */ mtc1 $t5, $f16 ## $f16 = 0.00 -/* 06A40 80838C50 00000000 */ nop -/* 06A44 80838C54 468084A0 */ cvt.s.w $f18, $f16 -/* 06A48 80838C58 460C9102 */ mul.s $f4, $f18, $f12 -/* 06A4C 80838C5C 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 06A50 80838C60 E7A4002C */ swc1 $f4, 0x002C($sp) -/* 06A54 80838C64 844E000C */ lh $t6, 0x000C($v0) ## 0000000C -/* 06A58 80838C68 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 06A5C 80838C6C 00000000 */ nop -/* 06A60 80838C70 46803220 */ cvt.s.w $f8, $f6 -/* 06A64 80838C74 460C4282 */ mul.s $f10, $f8, $f12 -/* 06A68 80838C78 E7AA0028 */ swc1 $f10, 0x0028($sp) -/* 06A6C 80838C7C C6100888 */ lwc1 $f16, 0x0888($s0) ## 00000888 -/* 06A70 80838C80 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 06A74 80838C84 46128080 */ add.s $f2, $f16, $f18 -/* 06A78 80838C88 35F84000 */ ori $t8, $t7, 0x4000 ## $t8 = 00004000 -/* 06A7C 80838C8C AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 06A80 80838C90 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 06A84 80838C94 0C20CCAE */ jal func_808332B8 -/* 06A88 80838C98 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 06A8C 80838C9C C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 06A90 80838CA0 1040000F */ beq $v0, $zero, .L80838CE0 -/* 06A94 80838CA4 C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 06A98 80838CA8 8E190678 */ lw $t9, 0x0678($s0) ## 00000678 -/* 06A9C 80838CAC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 06AA0 80838CB0 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 -/* 06AA4 80838CB4 C7260008 */ lwc1 $f6, 0x0008($t9) ## 00000008 -/* 06AA8 80838CB8 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 06AAC 80838CBC 3C01F7FF */ lui $at, 0xF7FF ## $at = F7FF0000 -/* 06AB0 80838CC0 46062202 */ mul.s $f8, $f4, $f6 -/* 06AB4 80838CC4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = F7FFFFFF -/* 06AB8 80838CC8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 06ABC 80838CCC 01014824 */ and $t1, $t0, $at -/* 06AC0 80838CD0 24C632E8 */ addiu $a2, $a2, 0x32E8 ## $a2 = 040032E8 -/* 06AC4 80838CD4 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C -/* 06AC8 80838CD8 10000016 */ beq $zero, $zero, .L80838D34 -/* 06ACC 80838CDC 46080001 */ sub.s $f0, $f0, $f8 -.L80838CE0: -/* 06AD0 80838CE0 8E020678 */ lw $v0, 0x0678($s0) ## 00000678 -/* 06AD4 80838CE4 3C014224 */ lui $at, 0x4224 ## $at = 42240000 -/* 06AD8 80838CE8 C44A0018 */ lwc1 $f10, 0x0018($v0) ## 00000018 -/* 06ADC 80838CEC 4600503E */ c.le.s $f10, $f0 -/* 06AE0 80838CF0 00000000 */ nop -/* 06AE4 80838CF4 4502000A */ bc1fl .L80838D20 -/* 06AE8 80838CF8 44813000 */ mtc1 $at, $f6 ## $f6 = 41.00 -/* 06AEC 80838CFC 3C01426C */ lui $at, 0x426C ## $at = 426C0000 -/* 06AF0 80838D00 44818000 */ mtc1 $at, $f16 ## $f16 = 59.00 -/* 06AF4 80838D04 C4520008 */ lwc1 $f18, 0x0008($v0) ## 00000008 -/* 06AF8 80838D08 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 06AFC 80838D0C 24C62D40 */ addiu $a2, $a2, 0x2D40 ## $a2 = 04002D40 -/* 06B00 80838D10 46128102 */ mul.s $f4, $f16, $f18 -/* 06B04 80838D14 10000007 */ beq $zero, $zero, .L80838D34 -/* 06B08 80838D18 46040001 */ sub.s $f0, $f0, $f4 -/* 06B0C 80838D1C 44813000 */ mtc1 $at, $f6 ## $f6 = 59.00 -.L80838D20: -/* 06B10 80838D20 C4480008 */ lwc1 $f8, 0x0008($v0) ## 00000008 -/* 06B14 80838D24 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 06B18 80838D28 24C62D38 */ addiu $a2, $a2, 0x2D38 ## $a2 = 04002D38 -/* 06B1C 80838D2C 46083282 */ mul.s $f10, $f6, $f8 -/* 06B20 80838D30 460A0001 */ sub.s $f0, $f0, $f10 -.L80838D34: -/* 06B24 80838D34 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 06B28 80838D38 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 06B2C 80838D3C C61000BC */ lwc1 $f16, 0x00BC($s0) ## 000000BC -/* 06B30 80838D40 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 06B34 80838D44 46120102 */ mul.s $f4, $f0, $f18 -/* 06B38 80838D48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06B3C 80838D4C 46048181 */ sub.s $f6, $f16, $f4 -/* 06B40 80838D50 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 06B44 80838D54 E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC -/* 06B48 80838D58 C7AA002C */ lwc1 $f10, 0x002C($sp) -/* 06B4C 80838D5C C6060884 */ lwc1 $f6, 0x0884($s0) ## 00000884 -/* 06B50 80838D60 460A1482 */ mul.s $f18, $f2, $f10 -/* 06B54 80838D64 46062280 */ add.s $f10, $f4, $f6 -/* 06B58 80838D68 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 06B5C 80838D6C 46124401 */ sub.s $f16, $f8, $f18 -/* 06B60 80838D70 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 06B64 80838D74 E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 -/* 06B68 80838D78 C7B20028 */ lwc1 $f18, 0x0028($sp) -/* 06B6C 80838D7C 46121402 */ mul.s $f16, $f2, $f18 -/* 06B70 80838D80 46104101 */ sub.s $f4, $f8, $f16 -/* 06B74 80838D84 E604002C */ swc1 $f4, 0x002C($s0) ## 0000002C -/* 06B78 80838D88 0C20C889 */ jal func_80832224 -/* 06B7C 80838D8C AFA60038 */ sw $a2, 0x0038($sp) -/* 06B80 80838D90 8FA60038 */ lw $a2, 0x0038($sp) -.L80838D94: -/* 06B84 80838D94 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 -/* 06B88 80838D98 3C073FA6 */ lui $a3, 0x3FA6 ## $a3 = 3FA60000 -/* 06B8C 80838D9C 34E76666 */ ori $a3, $a3, 0x6666 ## $a3 = 3FA66666 -/* 06B90 80838DA0 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 06B94 80838DA4 A60B0088 */ sh $t3, 0x0088($s0) ## 00000088 -/* 06B98 80838DA8 8FA40044 */ lw $a0, 0x0044($sp) -/* 06B9C 80838DAC 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop -/* 06BA0 80838DB0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 06BA4 80838DB4 0C028CC4 */ jal func_800A3310 -/* 06BA8 80838DB8 8FA40044 */ lw $a0, 0x0044($sp) -/* 06BAC 80838DBC 8603007E */ lh $v1, 0x007E($s0) ## 0000007E -/* 06BB0 80838DC0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 06BB4 80838DC4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 06BB8 80838DC8 00611821 */ addu $v1, $v1, $at -/* 06BBC 80838DCC 00031C00 */ sll $v1, $v1, 16 -/* 06BC0 80838DD0 00031C03 */ sra $v1, $v1, 16 -/* 06BC4 80838DD4 A603083C */ sh $v1, 0x083C($s0) ## 0000083C -/* 06BC8 80838DD8 10000020 */ beq $zero, $zero, .L80838E5C -/* 06BCC 80838DDC A60300B6 */ sh $v1, 0x00B6($s0) ## 000000B6 -.L80838DE0: -/* 06BD0 80838DE0 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -.L80838DE4: -/* 06BD4 80838DE4 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 06BD8 80838DE8 51A0001C */ beql $t5, $zero, .L80838E5C -/* 06BDC 80838DEC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 06BE0 80838DF0 920E088C */ lbu $t6, 0x088C($s0) ## 0000088C -/* 06BE4 80838DF4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06BE8 80838DF8 55C10018 */ bnel $t6, $at, .L80838E5C -/* 06BEC 80838DFC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 06BF0 80838E00 920F088D */ lbu $t7, 0x088D($s0) ## 0000088D -/* 06BF4 80838E04 29E10003 */ slti $at, $t7, 0x0003 -/* 06BF8 80838E08 14200013 */ bne $at, $zero, .L80838E58 -/* 06BFC 80838E0C 3C018085 */ lui $at, %hi(D_80855378) ## $at = 80850000 -/* 06C00 80838E10 C42A5378 */ lwc1 $f10, %lo(D_80855378)($at) -/* 06C04 80838E14 C6060884 */ lwc1 $f6, 0x0884($s0) ## 00000884 -/* 06C08 80838E18 3C0140B0 */ lui $at, 0x40B0 ## $at = 40B00000 -/* 06C0C 80838E1C 44814000 */ mtc1 $at, $f8 ## $f8 = 5.50 -/* 06C10 80838E20 460A3482 */ mul.s $f18, $f6, $f10 -/* 06C14 80838E24 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 06C18 80838E28 24A52FE0 */ addiu $a1, $a1, 0x2FE0 ## $a1 = 04002FE0 -/* 06C1C 80838E2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06C20 80838E30 8FA70044 */ lw $a3, 0x0044($sp) -/* 06C24 80838E34 46089000 */ add.s $f0, $f18, $f8 -/* 06C28 80838E38 44060000 */ mfc1 $a2, $f0 -/* 06C2C 80838E3C 0C20E27A */ jal func_808389E8 -/* 06C30 80838E40 00000000 */ nop -/* 06C34 80838E44 3C014020 */ lui $at, 0x4020 ## $at = 40200000 -/* 06C38 80838E48 44818000 */ mtc1 $at, $f16 ## $f16 = 2.50 -/* 06C3C 80838E4C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 06C40 80838E50 10000002 */ beq $zero, $zero, .L80838E5C -/* 06C44 80838E54 E6100838 */ swc1 $f16, 0x0838($s0) ## 00000838 -.L80838E58: -/* 06C48 80838E58 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80838E5C: -/* 06C4C 80838E5C 8FBF001C */ lw $ra, 0x001C($sp) -/* 06C50 80838E60 8FB00018 */ lw $s0, 0x0018($sp) -/* 06C54 80838E64 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 06C58 80838E68 03E00008 */ jr $ra -/* 06C5C 80838E6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838E70.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838E70.s deleted file mode 100644 index 76f2e91f71..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838E70.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80838E70 -/* 06C60 80838E70 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 06C64 80838E74 AFA60028 */ sw $a2, 0x0028($sp) -/* 06C68 80838E78 AFBF001C */ sw $ra, 0x001C($sp) -/* 06C6C 80838E7C AFB00018 */ sw $s0, 0x0018($sp) -/* 06C70 80838E80 AFA7002C */ sw $a3, 0x002C($sp) -/* 06C74 80838E84 3C068084 */ lui $a2, %hi(func_80845CA4) ## $a2 = 80840000 -/* 06C78 80838E88 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 06C7C 80838E8C AFA40020 */ sw $a0, 0x0020($sp) -/* 06C80 80838E90 24C65CA4 */ addiu $a2, $a2, %lo(func_80845CA4) ## $a2 = 80845CA4 -/* 06C84 80838E94 0C20D716 */ jal func_80835C58 -/* 06C88 80838E98 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 06C8C 80838E9C 8FA40020 */ lw $a0, 0x0020($sp) -/* 06C90 80838EA0 0C20C910 */ jal func_80832440 -/* 06C94 80838EA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 06C98 80838EA8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 06C9C 80838EAC A202084F */ sb $v0, 0x084F($s0) ## 0000084F -/* 06CA0 80838EB0 A6020850 */ sh $v0, 0x0850($s0) ## 00000850 -/* 06CA4 80838EB4 0C01DE1C */ jal Math_Sins - ## sins? -/* 06CA8 80838EB8 87A4002E */ lh $a0, 0x002E($sp) -/* 06CAC 80838EBC C7A40028 */ lwc1 $f4, 0x0028($sp) -/* 06CB0 80838EC0 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 06CB4 80838EC4 46040182 */ mul.s $f6, $f0, $f4 -/* 06CB8 80838EC8 46083280 */ add.s $f10, $f6, $f8 -/* 06CBC 80838ECC E60A0450 */ swc1 $f10, 0x0450($s0) ## 00000450 -/* 06CC0 80838ED0 0C01DE0D */ jal Math_Coss - ## coss? -/* 06CC4 80838ED4 87A4002E */ lh $a0, 0x002E($sp) -/* 06CC8 80838ED8 C7B00028 */ lwc1 $f16, 0x0028($sp) -/* 06CCC 80838EDC C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 06CD0 80838EE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06CD4 80838EE4 46100482 */ mul.s $f18, $f0, $f16 -/* 06CD8 80838EE8 46049180 */ add.s $f6, $f18, $f4 -/* 06CDC 80838EEC 0C20CCCE */ jal func_80833338 -/* 06CE0 80838EF0 E6060458 */ swc1 $f6, 0x0458($s0) ## 00000458 -/* 06CE4 80838EF4 8FA40020 */ lw $a0, 0x0020($sp) -/* 06CE8 80838EF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 06CEC 80838EFC 0C20C899 */ jal func_80832264 -/* 06CF0 80838F00 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 06CF4 80838F04 8FBF001C */ lw $ra, 0x001C($sp) -/* 06CF8 80838F08 8FB00018 */ lw $s0, 0x0018($sp) -/* 06CFC 80838F0C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 06D00 80838F10 03E00008 */ jr $ra -/* 06D04 80838F14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F18.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F18.s deleted file mode 100644 index 597e9952ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F18.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80838F18 -/* 06D08 80838F18 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06D0C 80838F1C AFBF0014 */ sw $ra, 0x0014($sp) -/* 06D10 80838F20 3C068085 */ lui $a2, %hi(func_8084D610) ## $a2 = 80850000 -/* 06D14 80838F24 AFA40018 */ sw $a0, 0x0018($sp) -/* 06D18 80838F28 AFA5001C */ sw $a1, 0x001C($sp) -/* 06D1C 80838F2C 24C6D610 */ addiu $a2, $a2, %lo(func_8084D610) ## $a2 = 8084D610 -/* 06D20 80838F30 0C20D716 */ jal func_80835C58 -/* 06D24 80838F34 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 06D28 80838F38 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 06D2C 80838F3C 24C63328 */ addiu $a2, $a2, 0x3328 ## $a2 = 04003328 -/* 06D30 80838F40 8FA40018 */ lw $a0, 0x0018($sp) -/* 06D34 80838F44 0C20CB1B */ jal func_80832C6C -/* 06D38 80838F48 8FA5001C */ lw $a1, 0x001C($sp) -/* 06D3C 80838F4C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 06D40 80838F50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06D44 80838F54 03E00008 */ jr $ra -/* 06D48 80838F58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F5C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F5C.s deleted file mode 100644 index cc3d9dc43b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F5C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80838F5C -/* 06D4C 80838F5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06D50 80838F60 AFBF0014 */ sw $ra, 0x0014($sp) -/* 06D54 80838F64 3C068085 */ lui $a2, %hi(func_8084F88C) ## $a2 = 80850000 -/* 06D58 80838F68 AFA40018 */ sw $a0, 0x0018($sp) -/* 06D5C 80838F6C AFA5001C */ sw $a1, 0x001C($sp) -/* 06D60 80838F70 24C6F88C */ addiu $a2, $a2, %lo(func_8084F88C) ## $a2 = 8084F88C -/* 06D64 80838F74 0C20D716 */ jal func_80835C58 -/* 06D68 80838F78 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 06D6C 80838F7C 8FA3001C */ lw $v1, 0x001C($sp) -/* 06D70 80838F80 3C01A000 */ lui $at, 0xA000 ## $at = A0000000 -/* 06D74 80838F84 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 06D78 80838F88 8C6E067C */ lw $t6, 0x067C($v1) ## 0000067C -/* 06D7C 80838F8C 01C17825 */ or $t7, $t6, $at ## $t7 = A0000000 -/* 06D80 80838F90 AC6F067C */ sw $t7, 0x067C($v1) ## 0000067C -/* 06D84 80838F94 0C030129 */ jal Gameplay_GetCamera -/* 06D88 80838F98 8FA40018 */ lw $a0, 0x0018($sp) -/* 06D8C 80838F9C 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 06D90 80838FA0 0C0169DF */ jal func_8005A77C -/* 06D94 80838FA4 24050021 */ addiu $a1, $zero, 0x0021 ## $a1 = 00000021 -/* 06D98 80838FA8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 06D9C 80838FAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06DA0 80838FB0 03E00008 */ jr $ra -/* 06DA4 80838FB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838FB8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838FB8.s deleted file mode 100644 index 3575671429..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838FB8.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80838FB8 -/* 06DA8 80838FB8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06DAC 80838FBC 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 06DB0 80838FC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 06DB4 80838FC4 01C47021 */ addu $t6, $t6, $a0 -/* 06DB8 80838FC8 81CE1E15 */ lb $t6, 0x1E15($t6) ## 00011E15 -/* 06DBC 80838FCC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 06DC0 80838FD0 15C00014 */ bne $t6, $zero, .L80839024 -/* 06DC4 80838FD4 00000000 */ nop -/* 06DC8 80838FD8 8CAF067C */ lw $t7, 0x067C($a1) ## 0000067C -/* 06DCC 80838FDC 000FC000 */ sll $t8, $t7, 0 -/* 06DD0 80838FE0 07010010 */ bgez $t8, .L80839024 -/* 06DD4 80838FE4 00000000 */ nop -/* 06DD8 80838FE8 AFA40018 */ sw $a0, 0x0018($sp) -/* 06DDC 80838FEC 0C20E3D7 */ jal func_80838F5C -/* 06DE0 80838FF0 AFA5001C */ sw $a1, 0x001C($sp) -/* 06DE4 80838FF4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 06DE8 80838FF8 8FA40018 */ lw $a0, 0x0018($sp) -/* 06DEC 80838FFC 24C63040 */ addiu $a2, $a2, 0x3040 ## $a2 = 04003040 -/* 06DF0 80839000 0C20C8A1 */ jal func_80832284 -/* 06DF4 80839004 8FA5001C */ lw $a1, 0x001C($sp) -/* 06DF8 80839008 8FA4001C */ lw $a0, 0x001C($sp) -/* 06DFC 8083900C 0C20C9A6 */ jal func_80832698 -/* 06E00 80839010 24056807 */ addiu $a1, $zero, 0x6807 ## $a1 = 00006807 -/* 06E04 80839014 0C01E233 */ jal func_800788CC -/* 06E08 80839018 24045803 */ addiu $a0, $zero, 0x5803 ## $a0 = 00005803 -/* 06E0C 8083901C 10000001 */ beq $zero, $zero, .L80839024 -/* 06E10 80839020 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80839024: -/* 06E14 80839024 8FBF0014 */ lw $ra, 0x0014($sp) -/* 06E18 80839028 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06E1C 8083902C 03E00008 */ jr $ra -/* 06E20 80839030 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s deleted file mode 100644 index 67fb9852ed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s +++ /dev/null @@ -1,395 +0,0 @@ -glabel func_80839034 -/* 06E24 80839034 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 06E28 80839038 AFBF001C */ sw $ra, 0x001C($sp) -/* 06E2C 8083903C AFB00018 */ sw $s0, 0x0018($sp) -/* 06E30 80839040 AFA40040 */ sw $a0, 0x0040($sp) -/* 06E34 80839044 AFA60048 */ sw $a2, 0x0048($sp) -/* 06E38 80839048 AFA7004C */ sw $a3, 0x004C($sp) -/* 06E3C 8083904C 90AE0002 */ lbu $t6, 0x0002($a1) ## 00000002 -/* 06E40 80839050 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 06E44 80839054 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 06E48 80839058 55C1015B */ bnel $t6, $at, .L808395C8 -/* 06E4C 8083905C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 06E50 80839060 8E02067C */ lw $v0, 0x067C($s0) ## 0000067C -/* 06E54 80839064 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 06E58 80839068 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 06E5C 8083906C 304F0080 */ andi $t7, $v0, 0x0080 ## $t7 = 00000000 -/* 06E60 80839070 15E000EB */ bne $t7, $zero, .L80839420 -/* 06E64 80839074 00811821 */ addu $v1, $a0, $at -/* 06E68 80839078 80791E15 */ lb $t9, 0x1E15($v1) ## 00001E15 -/* 06E6C 8083907C 572000E9 */ bnel $t9, $zero, .L80839424 -/* 06E70 80839080 8FAC0040 */ lw $t4, 0x0040($sp) -/* 06E74 80839084 92080444 */ lbu $t0, 0x0444($s0) ## 00000444 -/* 06E78 80839088 30490001 */ andi $t1, $v0, 0x0001 ## $t1 = 00000000 -/* 06E7C 8083908C 550000E5 */ bnel $t0, $zero, .L80839424 -/* 06E80 80839090 8FAC0040 */ lw $t4, 0x0040($sp) -/* 06E84 80839094 552000E3 */ bnel $t1, $zero, .L80839424 -/* 06E88 80839098 8FAC0040 */ lw $t4, 0x0040($sp) -/* 06E8C 8083909C 10C00008 */ beq $a2, $zero, .L808390C0 -/* 06E90 808390A0 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 06E94 808390A4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 06E98 808390A8 00E03025 */ or $a2, $a3, $zero ## $a2 = 00000000 -/* 06E9C 808390AC 0C01074A */ jal func_80041D28 -/* 06EA0 808390B0 AFA30024 */ sw $v1, 0x0024($sp) -/* 06EA4 808390B4 8FA30024 */ lw $v1, 0x0024($sp) -/* 06EA8 808390B8 1440000D */ bne $v0, $zero, .L808390F0 -/* 06EAC 808390BC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -.L808390C0: -/* 06EB0 808390C0 3C048085 */ lui $a0, %hi(D_808535E4) ## $a0 = 80850000 -/* 06EB4 808390C4 8C8435E4 */ lw $a0, %lo(D_808535E4)($a0) -/* 06EB8 808390C8 AFA30024 */ sw $v1, 0x0024($sp) -/* 06EBC 808390CC 0C20E05B */ jal func_8083816C -/* 06EC0 808390D0 AFA5003C */ sw $a1, 0x003C($sp) -/* 06EC4 808390D4 8FA30024 */ lw $v1, 0x0024($sp) -/* 06EC8 808390D8 104000D1 */ beq $v0, $zero, .L80839420 -/* 06ECC 808390DC 8FA5003C */ lw $a1, 0x003C($sp) -/* 06ED0 808390E0 920B0A7A */ lbu $t3, 0x0A7A($s0) ## 00000A7A -/* 06ED4 808390E4 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 06ED8 808390E8 556100CE */ bnel $t3, $at, .L80839424 -/* 06EDC 808390EC 8FAC0040 */ lw $t4, 0x0040($sp) -.L808390F0: -/* 06EE0 808390F0 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 06EE4 808390F4 860C0A84 */ lh $t4, 0x0A84($s0) ## 00000A84 -/* 06EE8 808390F8 3C012880 */ lui $at, 0x2880 ## $at = 28800000 -/* 06EEC 808390FC 4600218D */ trunc.w.s $f6, $f4 -/* 06EF0 80839100 440E3000 */ mfc1 $t6, $f6 -/* 06EF4 80839104 00000000 */ nop -/* 06EF8 80839108 018E7823 */ subu $t7, $t4, $t6 -/* 06EFC 8083910C AFAF0034 */ sw $t7, 0x0034($sp) -/* 06F00 80839110 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 06F04 80839114 03214024 */ and $t0, $t9, $at -/* 06F08 80839118 15000011 */ bne $t0, $zero, .L80839160 -/* 06F0C 8083911C 00000000 */ nop -/* 06F10 80839120 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -/* 06F14 80839124 29E10064 */ slti $at, $t7, 0x0064 -/* 06F18 80839128 31380001 */ andi $t8, $t1, 0x0001 ## $t8 = 00000000 -/* 06F1C 8083912C 1700000C */ bne $t8, $zero, .L80839160 -/* 06F20 80839130 00000000 */ nop -/* 06F24 80839134 1020000A */ beq $at, $zero, .L80839160 -/* 06F28 80839138 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 06F2C 8083913C 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 06F30 80839140 3C018085 */ lui $at, %hi(D_80853600) ## $at = 80850000 -/* 06F34 80839144 C42A3600 */ lwc1 $f10, %lo(D_80853600)($at) -/* 06F38 80839148 460A403C */ c.lt.s $f8, $f10 -/* 06F3C 8083914C 00000000 */ nop -/* 06F40 80839150 45000003 */ bc1f .L80839160 -/* 06F44 80839154 00000000 */ nop -/* 06F48 80839158 1000011B */ beq $zero, $zero, .L808395C8 -/* 06F4C 8083915C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80839160: -/* 06F50 80839160 54A00008 */ bnel $a1, $zero, .L80839184 -/* 06F54 80839164 8C6B1E04 */ lw $t3, 0x1E04($v1) ## 00001E04 -/* 06F58 80839168 0C0302D8 */ jal Gameplay_TriggerVoidOut -/* 06F5C 8083916C 8FA40040 */ lw $a0, 0x0040($sp) -/* 06F60 80839170 0C026528 */ jal func_800994A0 -/* 06F64 80839174 8FA40040 */ lw $a0, 0x0040($sp) -/* 06F68 80839178 10000049 */ beq $zero, $zero, .L808392A0 -/* 06F6C 8083917C 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 06F70 80839180 8C6B1E04 */ lw $t3, 0x1E04($v1) ## 00001E04 -.L80839184: -/* 06F74 80839184 00056840 */ sll $t5, $a1, 1 -/* 06F78 80839188 8FA70040 */ lw $a3, 0x0040($sp) -/* 06F7C 8083918C 016D6021 */ addu $t4, $t3, $t5 -/* 06F80 80839190 858EFFFE */ lh $t6, -0x0002($t4) ## FFFFFFFE -/* 06F84 80839194 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 06F88 80839198 00270821 */ addu $at, $at, $a3 -/* 06F8C 8083919C A42E1E1A */ sh $t6, 0x1E1A($at) ## 00011E1A -/* 06F90 808391A0 84621E1A */ lh $v0, 0x1E1A($v1) ## 00001E1A -/* 06F94 808391A4 24017FFF */ addiu $at, $zero, 0x7FFF ## $at = 00007FFF -/* 06F98 808391A8 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 06F9C 808391AC 1441000E */ bne $v0, $at, .L808391E8 -/* 06FA0 808391B0 3C198016 */ lui $t9, %hi(gSaveContext+0x1394) -/* 06FA4 808391B4 3C018016 */ lui $at, %hi(gSaveContext+0x1364) -/* 06FA8 808391B8 AC2FF9C4 */ sw $t7, %lo(gSaveContext+0x1364)($at) -/* 06FAC 808391BC 8739F9F4 */ lh $t9, %lo(gSaveContext+0x1394)($t9) -/* 06FB0 808391C0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 06FB4 808391C4 00270821 */ addu $at, $at, $a3 -/* 06FB8 808391C8 A4391E1A */ sh $t9, 0x1E1A($at) ## 00011E1A -/* 06FBC 808391CC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 06FC0 808391D0 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -/* 06FC4 808391D4 00270821 */ addu $at, $at, $a3 -/* 06FC8 808391D8 A0221E5E */ sb $v0, 0x1E5E($at) ## 00011E5E -/* 06FCC 808391DC 3C018016 */ lui $at, %hi(gSaveContext+0x141d) -/* 06FD0 808391E0 1000002A */ beq $zero, $zero, .L8083928C -/* 06FD4 808391E4 A022FA7D */ sb $v0, %lo(gSaveContext+0x141d)($at) -.L808391E8: -/* 06FD8 808391E8 28417FF9 */ slti $at, $v0, 0x7FF9 -/* 06FDC 808391EC 14200012 */ bne $at, $zero, .L80839238 -/* 06FE0 808391F0 24E407C0 */ addiu $a0, $a3, 0x07C0 ## $a0 = 000007C0 -/* 06FE4 808391F4 3C088085 */ lui $t0, %hi(D_80854514 - 0x7FF9) ## $t0 = 80850000 -/* 06FE8 808391F8 01024021 */ addu $t0, $t0, $v0 -/* 06FEC 808391FC 9108C51B */ lbu $t0, %lo(D_80854514 - 0x7FF9)($t0) -/* 06FF0 80839200 90781DEA */ lbu $t8, 0x1DEA($v1) ## 00001DEA -/* 06FF4 80839204 3C0D8085 */ lui $t5, %hi(D_808544F8) ## $t5 = 80850000 -/* 06FF8 80839208 00084840 */ sll $t1, $t0, 1 -/* 06FFC 8083920C 00185040 */ sll $t2, $t8, 1 -/* 07000 80839210 012A5821 */ addu $t3, $t1, $t2 -/* 07004 80839214 01AB6821 */ addu $t5, $t5, $t3 -/* 07008 80839218 85AD44F8 */ lh $t5, %lo(D_808544F8)($t5) -/* 0700C 8083921C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 07010 80839220 00270821 */ addu $at, $at, $a3 -/* 07014 80839224 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 07018 80839228 0C026528 */ jal func_800994A0 -/* 0701C 8083922C A42D1E1A */ sh $t5, 0x1E1A($at) ## 00011E1A -/* 07020 80839230 10000016 */ beq $zero, $zero, .L8083928C -/* 07024 80839234 8FA70040 */ lw $a3, 0x0040($sp) -.L80839238: -/* 07028 80839238 8FA50048 */ lw $a1, 0x0048($sp) -/* 0702C 8083923C 8FA6004C */ lw $a2, 0x004C($sp) -/* 07030 80839240 0C0107DF */ jal func_80041F7C -/* 07034 80839244 AFA30024 */ sw $v1, 0x0024($sp) -/* 07038 80839248 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0703C 8083924C 14410009 */ bne $v0, $at, .L80839274 -/* 07040 80839250 8FA30024 */ lw $v1, 0x0024($sp) -/* 07044 80839254 846C1E1A */ lh $t4, 0x1E1A($v1) ## 00001E1A -/* 07048 80839258 3C018016 */ lui $at, %hi(gSaveContext+0x1378) -/* 0704C 8083925C 8FA40040 */ lw $a0, 0x0040($sp) -/* 07050 80839260 0C0302D8 */ jal Gameplay_TriggerVoidOut -/* 07054 80839264 A42CF9D8 */ sh $t4, %lo(gSaveContext+0x1378)($at) -/* 07058 80839268 240EFFFE */ addiu $t6, $zero, 0xFFFE ## $t6 = FFFFFFFE -/* 0705C 8083926C 3C018016 */ lui $at, %hi(gSaveContext+0x1364) -/* 07060 80839270 AC2EF9C4 */ sw $t6, %lo(gSaveContext+0x1364)($at) -.L80839274: -/* 07064 80839274 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 07068 80839278 3C018016 */ lui $at, %hi(gSaveContext+0x13c3) -/* 0706C 8083927C A02FFA23 */ sb $t7, %lo(gSaveContext+0x13c3)($at) -/* 07070 80839280 0C026528 */ jal func_800994A0 -/* 07074 80839284 8FA40040 */ lw $a0, 0x0040($sp) -/* 07078 80839288 8FA70040 */ lw $a3, 0x0040($sp) -.L8083928C: -/* 0707C 8083928C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 07080 80839290 00270821 */ addu $at, $at, $a3 -/* 07084 80839294 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 07088 80839298 A0391E15 */ sb $t9, 0x1E15($at) ## 00011E15 -/* 0708C 8083929C 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -.L808392A0: -/* 07090 808392A0 3C012080 */ lui $at, 0x2080 ## $at = 20800000 -/* 07094 808392A4 0101C024 */ and $t8, $t0, $at -/* 07098 808392A8 5700004E */ bnel $t8, $zero, .L808393E4 -/* 0709C 808392AC 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -/* 070A0 808392B0 8E090680 */ lw $t1, 0x0680($s0) ## 00000680 -/* 070A4 808392B4 00095340 */ sll $t2, $t1, 13 -/* 070A8 808392B8 0542004A */ bltzl $t2, .L808393E4 -/* 070AC 808392BC 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -/* 070B0 808392C0 0C20CCAE */ jal func_808332B8 -/* 070B4 808392C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 070B8 808392C8 14400045 */ bne $v0, $zero, .L808393E0 -/* 070BC 808392CC 8FA40040 */ lw $a0, 0x0040($sp) -/* 070C0 808392D0 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 070C4 808392D4 8FA50048 */ lw $a1, 0x0048($sp) -/* 070C8 808392D8 0C010753 */ jal func_80041D4C -/* 070CC 808392DC 8FA6004C */ lw $a2, 0x004C($sp) -/* 070D0 808392E0 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 070D4 808392E4 1041003E */ beq $v0, $at, .L808393E0 -/* 070D8 808392E8 8FAB0034 */ lw $t3, 0x0034($sp) -/* 070DC 808392EC 29610064 */ slti $at, $t3, 0x0064 -/* 070E0 808392F0 54200005 */ bnel $at, $zero, .L80839308 -/* 070E4 808392F4 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 070E8 808392F8 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 -/* 070EC 808392FC 31AC0001 */ andi $t4, $t5, 0x0001 ## $t4 = 00000000 -/* 070F0 80839300 11800037 */ beq $t4, $zero, .L808393E0 -/* 070F4 80839304 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -.L80839308: -/* 070F8 80839308 5441000C */ bnel $v0, $at, .L8083933C -/* 070FC 8083930C C6000838 */ lwc1 $f0, 0x0838($s0) ## 00000838 -/* 07100 80839310 0C01E233 */ jal func_800788CC -/* 07104 80839314 24045805 */ addiu $a0, $zero, 0x5805 ## $a0 = 00005805 -/* 07108 80839318 0C03DA59 */ jal func_800F6964 -/* 0710C 8083931C 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 07110 80839320 3C038016 */ lui $v1, %hi(gSaveContext) -/* 07114 80839324 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 07118 80839328 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 0711C 8083932C A06213E0 */ sb $v0, 0x13E0($v1) ## 8015FA40 -/* 07120 80839330 10000031 */ beq $zero, $zero, .L808393F8 -/* 07124 80839334 A06213E1 */ sb $v0, 0x13E1($v1) ## 8015FA41 -/* 07128 80839338 C6000838 */ lwc1 $f0, 0x0838($s0) ## 00000838 -.L8083933C: -/* 0712C 8083933C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 07130 80839340 3C198016 */ lui $t9, %hi(gGameInfo) -/* 07134 80839344 3C188085 */ lui $t8, %hi(D_808535F4) ## $t8 = 80850000 -/* 07138 80839348 4610003C */ c.lt.s $f0, $f16 -/* 0713C 8083934C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07140 80839350 3C0643C8 */ lui $a2, 0x43C8 ## $a2 = 43C80000 -/* 07144 80839354 45000006 */ bc1f .L80839370 -/* 07148 80839358 00000000 */ nop -/* 0714C 8083935C 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 07150 80839360 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 07154 80839364 46000007 */ neg.s $f0, $f0 -/* 07158 80839368 01C17821 */ addu $t7, $t6, $at -/* 0715C 8083936C A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -.L80839370: -/* 07160 80839370 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) -/* 07164 80839374 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 07168 80839378 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 0716C 8083937C 8728006E */ lh $t0, 0x006E($t9) ## 8016006E -/* 07170 80839380 44889000 */ mtc1 $t0, $f18 ## $f18 = 0.00 -/* 07174 80839384 00000000 */ nop -/* 07178 80839388 46809120 */ cvt.s.w $f4, $f18 -/* 0717C 8083938C 46062083 */ div.s $f2, $f4, $f6 -/* 07180 80839390 4600103C */ c.lt.s $f2, $f0 -/* 07184 80839394 00000000 */ nop -/* 07188 80839398 45000003 */ bc1f .L808393A8 -/* 0718C 8083939C 3C018016 */ lui $at, %hi(gSaveContext+0x13bc) -/* 07190 808393A0 10000003 */ beq $zero, $zero, .L808393B0 -/* 07194 808393A4 E422FA1C */ swc1 $f2, %lo(gSaveContext+0x13bc)($at) -.L808393A8: -/* 07198 808393A8 3C018016 */ lui $at, %hi(gSaveContext+0x13bc) -/* 0719C 808393AC E420FA1C */ swc1 $f0, %lo(gSaveContext+0x13bc)($at) -.L808393B0: -/* 071A0 808393B0 8F1835F4 */ lw $t8, %lo(D_808535F4)($t8) -/* 071A4 808393B4 8FA40040 */ lw $a0, 0x0040($sp) -/* 071A8 808393B8 13000003 */ beq $t8, $zero, .L808393C8 -/* 071AC 808393BC 3C028085 */ lui $v0, %hi(D_808535FC) ## $v0 = 80850000 -/* 071B0 808393C0 10000002 */ beq $zero, $zero, .L808393CC -/* 071B4 808393C4 844235FC */ lh $v0, %lo(D_808535FC)($v0) -.L808393C8: -/* 071B8 808393C8 86020032 */ lh $v0, 0x0032($s0) ## 00000032 -.L808393CC: -/* 071BC 808393CC 00023C00 */ sll $a3, $v0, 16 -/* 071C0 808393D0 0C20E39C */ jal func_80838E70 -/* 071C4 808393D4 00073C03 */ sra $a3, $a3, 16 -/* 071C8 808393D8 10000008 */ beq $zero, $zero, .L808393FC -/* 071CC 808393DC 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -.L808393E0: -/* 071D0 808393E0 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -.L808393E4: -/* 071D4 808393E4 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 071D8 808393E8 55400004 */ bnel $t2, $zero, .L808393FC -/* 071DC 808393EC 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 071E0 808393F0 0C20C884 */ jal func_80832210 -/* 071E4 808393F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808393F8: -/* 071E8 808393F8 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -.L808393FC: -/* 071EC 808393FC 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 071F0 80839400 34210001 */ ori $at, $at, 0x0001 ## $at = 20000001 -/* 071F4 80839404 01616825 */ or $t5, $t3, $at ## $t5 = 20000001 -/* 071F8 80839408 AE0D067C */ sw $t5, 0x067C($s0) ## 0000067C -/* 071FC 8083940C 8FA40040 */ lw $a0, 0x0040($sp) -/* 07200 80839410 0C20D791 */ jal func_80835E44 -/* 07204 80839414 2405002F */ addiu $a1, $zero, 0x002F ## $a1 = 0000002F -/* 07208 80839418 1000006B */ beq $zero, $zero, .L808395C8 -/* 0720C 8083941C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80839420: -/* 07210 80839420 8FAC0040 */ lw $t4, 0x0040($sp) -.L80839424: -/* 07214 80839424 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 07218 80839428 3C01C57A */ lui $at, 0xC57A ## $at = C57A0000 -/* 0721C 8083942C 01CC7021 */ addu $t6, $t6, $t4 -/* 07220 80839430 81CE1E15 */ lb $t6, 0x1E15($t6) ## 00011E15 -/* 07224 80839434 55C00064 */ bnel $t6, $zero, .L808395C8 -/* 07228 80839438 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0722C 8083943C C6020028 */ lwc1 $f2, 0x0028($s0) ## 00000028 -/* 07230 80839440 44814000 */ mtc1 $at, $f8 ## $f8 = -4000.00 -/* 07234 80839444 00000000 */ nop -/* 07238 80839448 4608103C */ c.lt.s $f2, $f8 -/* 0723C 8083944C 00000000 */ nop -/* 07240 80839450 45030033 */ bc1tl .L80839520 -/* 07244 80839454 960B0088 */ lhu $t3, 0x0088($s0) ## 00000088 -/* 07248 80839458 92020A7A */ lbu $v0, 0x0A7A($s0) ## 00000A7A -/* 0724C 8083945C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 07250 80839460 10410002 */ beq $v0, $at, .L8083946C -/* 07254 80839464 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 07258 80839468 1441001D */ bne $v0, $at, .L808394E0 -.L8083946C: -/* 0725C 8083946C 3C018085 */ lui $at, %hi(D_80853600) ## $at = 80850000 -/* 07260 80839470 C42A3600 */ lwc1 $f10, %lo(D_80853600)($at) -/* 07264 80839474 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 07268 80839478 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 -/* 0726C 8083947C 00000000 */ nop -/* 07270 80839480 4610503C */ c.lt.s $f10, $f16 -/* 07274 80839484 00000000 */ nop -/* 07278 80839488 45030025 */ bc1tl .L80839520 -/* 0727C 8083948C 960B0088 */ lhu $t3, 0x0088($s0) ## 00000088 -/* 07280 80839490 860F0896 */ lh $t7, 0x0896($s0) ## 00000896 -/* 07284 80839494 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 07288 80839498 44812000 */ mtc1 $at, $f4 ## $f4 = 400.00 -/* 0728C 8083949C 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 07290 808394A0 8FB90040 */ lw $t9, 0x0040($sp) -/* 07294 808394A4 46809020 */ cvt.s.w $f0, $f18 -/* 07298 808394A8 4600203C */ c.lt.s $f4, $f0 -/* 0729C 808394AC 00000000 */ nop -/* 072A0 808394B0 4503001B */ bc1tl .L80839520 -/* 072A4 808394B4 960B0088 */ lhu $t3, 0x0088($s0) ## 00000088 -/* 072A8 808394B8 872800A4 */ lh $t0, 0x00A4($t9) ## 000000A4 -/* 072AC 808394BC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 072B0 808394C0 11010007 */ beq $t0, $at, .L808394E0 -/* 072B4 808394C4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 072B8 808394C8 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 072BC 808394CC 00000000 */ nop -/* 072C0 808394D0 4600303C */ c.lt.s $f6, $f0 -/* 072C4 808394D4 00000000 */ nop -/* 072C8 808394D8 45030011 */ bc1tl .L80839520 -/* 072CC 808394DC 960B0088 */ lhu $t3, 0x0088($s0) ## 00000088 -.L808394E0: -/* 072D0 808394E0 8FB80040 */ lw $t8, 0x0040($sp) -/* 072D4 808394E4 2401001A */ addiu $at, $zero, 0x001A ## $at = 0000001A -/* 072D8 808394E8 870900A4 */ lh $t1, 0x00A4($t8) ## 000000A4 -/* 072DC 808394EC 55210032 */ bnel $t1, $at, .L808395B8 -/* 072E0 808394F0 4600148D */ trunc.w.s $f18, $f2 -/* 072E4 808394F4 860A0896 */ lh $t2, 0x0896($s0) ## 00000896 -/* 072E8 808394F8 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 -/* 072EC 808394FC 44814000 */ mtc1 $at, $f8 ## $f8 = 320.00 -/* 072F0 80839500 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 072F4 80839504 00000000 */ nop -/* 072F8 80839508 46805420 */ cvt.s.w $f16, $f10 -/* 072FC 8083950C 4610403C */ c.lt.s $f8, $f16 -/* 07300 80839510 00000000 */ nop -/* 07304 80839514 45020028 */ bc1fl .L808395B8 -/* 07308 80839518 4600148D */ trunc.w.s $f18, $f2 -/* 0730C 8083951C 960B0088 */ lhu $t3, 0x0088($s0) ## 00000088 -.L80839520: -/* 07310 80839520 8FA40040 */ lw $a0, 0x0040($sp) -/* 07314 80839524 316D0001 */ andi $t5, $t3, 0x0001 ## $t5 = 00000000 -/* 07318 80839528 11A00014 */ beq $t5, $zero, .L8083957C -/* 0731C 8083952C 00000000 */ nop -/* 07320 80839530 920C0A7A */ lbu $t4, 0x0A7A($s0) ## 00000A7A -/* 07324 80839534 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 07328 80839538 15810005 */ bne $t4, $at, .L80839550 -/* 0732C 8083953C 00000000 */ nop -/* 07330 80839540 0C030322 */ jal Gameplay_TriggerRespawn -/* 07334 80839544 8FA40040 */ lw $a0, 0x0040($sp) -/* 07338 80839548 10000004 */ beq $zero, $zero, .L8083955C -/* 0733C 8083954C 8FAF0040 */ lw $t7, 0x0040($sp) -.L80839550: -/* 07340 80839550 0C0302D8 */ jal Gameplay_TriggerVoidOut -/* 07344 80839554 8FA40040 */ lw $a0, 0x0040($sp) -/* 07348 80839558 8FAF0040 */ lw $t7, 0x0040($sp) -.L8083955C: -/* 0734C 8083955C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 07350 80839560 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 07354 80839564 002F0821 */ addu $at, $at, $t7 -/* 07358 80839568 A02E1E5E */ sb $t6, 0x1E5E($at) ## 00011E5E -/* 0735C 8083956C 0C01E221 */ jal func_80078884 -/* 07360 80839570 24045801 */ addiu $a0, $zero, 0x5801 ## $a0 = 00005801 -/* 07364 80839574 1000000F */ beq $zero, $zero, .L808395B4 -/* 07368 80839578 C6020028 */ lwc1 $f2, 0x0028($s0) ## 00000028 -.L8083957C: -/* 0736C 8083957C 0C20E3D7 */ jal func_80838F5C -/* 07370 80839580 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07374 80839584 92080A7A */ lbu $t0, 0x0A7A($s0) ## 00000A7A -/* 07378 80839588 2419270F */ addiu $t9, $zero, 0x270F ## $t9 = 0000270F -/* 0737C 8083958C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 07380 80839590 15010005 */ bne $t0, $at, .L808395A8 -/* 07384 80839594 A6190850 */ sh $t9, 0x0850($s0) ## 00000850 -/* 07388 80839598 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 0738C 8083959C A218084F */ sb $t8, 0x084F($s0) ## 0000084F -/* 07390 808395A0 10000004 */ beq $zero, $zero, .L808395B4 -/* 07394 808395A4 C6020028 */ lwc1 $f2, 0x0028($s0) ## 00000028 -.L808395A8: -/* 07398 808395A8 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 0739C 808395AC A209084F */ sb $t1, 0x084F($s0) ## 0000084F -/* 073A0 808395B0 C6020028 */ lwc1 $f2, 0x0028($s0) ## 00000028 -.L808395B4: -/* 073A4 808395B4 4600148D */ trunc.w.s $f18, $f2 -.L808395B8: -/* 073A8 808395B8 440B9000 */ mfc1 $t3, $f18 -/* 073AC 808395BC 00000000 */ nop -/* 073B0 808395C0 A60B0A84 */ sh $t3, 0x0A84($s0) ## 00000A84 -/* 073B4 808395C4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808395C8: -/* 073B8 808395C8 8FBF001C */ lw $ra, 0x001C($sp) -/* 073BC 808395CC 8FB00018 */ lw $s0, 0x0018($sp) -/* 073C0 808395D0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 073C4 808395D4 03E00008 */ jr $ra -/* 073C8 808395D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808395DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808395DC.s deleted file mode 100644 index 460c3f5846..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808395DC.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_808395DC -/* 073CC 808395DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 073D0 808395E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 073D4 808395E4 AFA40020 */ sw $a0, 0x0020($sp) -/* 073D8 808395E8 AFA50024 */ sw $a1, 0x0024($sp) -/* 073DC 808395EC AFA7002C */ sw $a3, 0x002C($sp) -/* 073E0 808395F0 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 073E4 808395F4 0C01DE0D */ jal Math_Coss - ## coss? -/* 073E8 808395F8 AFA60028 */ sw $a2, 0x0028($sp) -/* 073EC 808395FC 8FAF0020 */ lw $t7, 0x0020($sp) -/* 073F0 80839600 85E400B6 */ lh $a0, 0x00B6($t7) ## 000000B6 -/* 073F4 80839604 0C01DE1C */ jal Math_Sins - ## sins? -/* 073F8 80839608 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 073FC 8083960C 8FA60028 */ lw $a2, 0x0028($sp) -/* 07400 80839610 C7A2001C */ lwc1 $f2, 0x001C($sp) -/* 07404 80839614 8FA30024 */ lw $v1, 0x0024($sp) -/* 07408 80839618 C4C40000 */ lwc1 $f4, 0x0000($a2) ## 00000000 -/* 0740C 8083961C C4C80008 */ lwc1 $f8, 0x0008($a2) ## 00000008 -/* 07410 80839620 C4720000 */ lwc1 $f18, 0x0000($v1) ## 00000000 -/* 07414 80839624 46022182 */ mul.s $f6, $f4, $f2 -/* 07418 80839628 8FA2002C */ lw $v0, 0x002C($sp) -/* 0741C 8083962C 46004282 */ mul.s $f10, $f8, $f0 -/* 07420 80839630 460A3400 */ add.s $f16, $f6, $f10 -/* 07424 80839634 46109100 */ add.s $f4, $f18, $f16 -/* 07428 80839638 E4440000 */ swc1 $f4, 0x0000($v0) ## 00000000 -/* 0742C 8083963C C4C60004 */ lwc1 $f6, 0x0004($a2) ## 00000004 -/* 07430 80839640 C4680004 */ lwc1 $f8, 0x0004($v1) ## 00000004 -/* 07434 80839644 46064280 */ add.s $f10, $f8, $f6 -/* 07438 80839648 E44A0004 */ swc1 $f10, 0x0004($v0) ## 00000004 -/* 0743C 8083964C C4D20008 */ lwc1 $f18, 0x0008($a2) ## 00000008 -/* 07440 80839650 C4C40000 */ lwc1 $f4, 0x0000($a2) ## 00000000 -/* 07444 80839654 C46A0008 */ lwc1 $f10, 0x0008($v1) ## 00000008 -/* 07448 80839658 46029402 */ mul.s $f16, $f18, $f2 -/* 0744C 8083965C 00000000 */ nop -/* 07450 80839660 46002202 */ mul.s $f8, $f4, $f0 -/* 07454 80839664 46088181 */ sub.s $f6, $f16, $f8 -/* 07458 80839668 46065480 */ add.s $f18, $f10, $f6 -/* 0745C 8083966C E4520008 */ swc1 $f18, 0x0008($v0) ## 00000008 -/* 07460 80839670 8FBF0014 */ lw $ra, 0x0014($sp) -/* 07464 80839674 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 07468 80839678 03E00008 */ jr $ra -/* 0746C 8083967C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839680.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839680.s deleted file mode 100644 index 8f280157ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839680.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80839680 -/* 07470 80839680 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 07474 80839684 AFA40040 */ sw $a0, 0x0040($sp) -/* 07478 80839688 AFA50044 */ sw $a1, 0x0044($sp) -/* 0747C 8083968C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 07480 80839690 AFA60048 */ sw $a2, 0x0048($sp) -/* 07484 80839694 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 07488 80839698 AFBF002C */ sw $ra, 0x002C($sp) -/* 0748C 8083969C AFA7004C */ sw $a3, 0x004C($sp) -/* 07490 808396A0 00E03025 */ or $a2, $a3, $zero ## $a2 = 00000000 -/* 07494 808396A4 0C20E577 */ jal func_808395DC -/* 07498 808396A8 27A70034 */ addiu $a3, $sp, 0x0034 ## $a3 = FFFFFFF4 -/* 0749C 808396AC 8FA50040 */ lw $a1, 0x0040($sp) -/* 074A0 808396B0 C7A40038 */ lwc1 $f4, 0x0038($sp) -/* 074A4 808396B4 C7A6003C */ lwc1 $f6, 0x003C($sp) -/* 074A8 808396B8 8FAE0050 */ lw $t6, 0x0050($sp) -/* 074AC 808396BC 24060018 */ addiu $a2, $zero, 0x0018 ## $a2 = 00000018 -/* 074B0 808396C0 8FA70034 */ lw $a3, 0x0034($sp) -/* 074B4 808396C4 AFA00018 */ sw $zero, 0x0018($sp) -/* 074B8 808396C8 AFA0001C */ sw $zero, 0x001C($sp) -/* 074BC 808396CC AFA00020 */ sw $zero, 0x0020($sp) -/* 074C0 808396D0 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 074C4 808396D4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 074C8 808396D8 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 074CC 808396DC 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 074D0 808396E0 AFAE0024 */ sw $t6, 0x0024($sp) -/* 074D4 808396E4 8FBF002C */ lw $ra, 0x002C($sp) -/* 074D8 808396E8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 074DC 808396EC 03E00008 */ jr $ra -/* 074E0 808396F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808396F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808396F4.s deleted file mode 100644 index 2ba0b86c40..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808396F4.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_808396F4 -/* 074E4 808396F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 074E8 808396F8 AFA40018 */ sw $a0, 0x0018($sp) -/* 074EC 808396FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 074F0 80839700 AFA5001C */ sw $a1, 0x001C($sp) -/* 074F4 80839704 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 074F8 80839708 AFA70024 */ sw $a3, 0x0024($sp) -/* 074FC 8083970C 0C20E577 */ jal func_808395DC -/* 07500 80839710 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 07504 80839714 8FA40018 */ lw $a0, 0x0018($sp) -/* 07508 80839718 8FA50028 */ lw $a1, 0x0028($sp) -/* 0750C 8083971C 8FA6002C */ lw $a2, 0x002C($sp) -/* 07510 80839720 8FA70024 */ lw $a3, 0x0024($sp) -/* 07514 80839724 0C00F250 */ jal func_8003C940 -/* 07518 80839728 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 0751C 8083972C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 07520 80839730 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 07524 80839734 03E00008 */ jr $ra -/* 07528 80839738 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083973C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083973C.s deleted file mode 100644 index ad57e9237e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083973C.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_8083973C -/* 0752C 8083973C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 07530 80839740 AFBF001C */ sw $ra, 0x001C($sp) -/* 07534 80839744 27AE0024 */ addiu $t6, $sp, 0x0024 ## $t6 = FFFFFFFC -/* 07538 80839748 27AF0020 */ addiu $t7, $sp, 0x0020 ## $t7 = FFFFFFF8 -/* 0753C 8083974C AFAF0014 */ sw $t7, 0x0014($sp) -/* 07540 80839750 0C20E5BD */ jal func_808396F4 -/* 07544 80839754 AFAE0010 */ sw $t6, 0x0010($sp) -/* 07548 80839758 8FBF001C */ lw $ra, 0x001C($sp) -/* 0754C 8083975C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 07550 80839760 03E00008 */ jr $ra -/* 07554 80839764 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839768.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839768.s deleted file mode 100644 index c5126feb72..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839768.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80839768 -/* 07558 80839768 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0755C 8083976C AFBF0034 */ sw $ra, 0x0034($sp) -/* 07560 80839770 AFB00030 */ sw $s0, 0x0030($sp) -/* 07564 80839774 AFA40050 */ sw $a0, 0x0050($sp) -/* 07568 80839778 AFA7005C */ sw $a3, 0x005C($sp) -/* 0756C 8083977C C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 07570 80839780 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 07574 80839784 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 07578 80839788 E7A40044 */ swc1 $f4, 0x0044($sp) -/* 0757C 8083978C C4C80004 */ lwc1 $f8, 0x0004($a2) ## 00000004 -/* 07580 80839790 C4A60004 */ lwc1 $f6, 0x0004($a1) ## 00000028 -/* 07584 80839794 27A70038 */ addiu $a3, $sp, 0x0038 ## $a3 = FFFFFFE8 -/* 07588 80839798 46083280 */ add.s $f10, $f6, $f8 -/* 0758C 8083979C E7AA0048 */ swc1 $f10, 0x0048($sp) -/* 07590 808397A0 C4B00008 */ lwc1 $f16, 0x0008($a1) ## 0000002C -/* 07594 808397A4 0C20E577 */ jal func_808395DC -/* 07598 808397A8 E7B0004C */ swc1 $f16, 0x004C($sp) -/* 0759C 808397AC 8FA40050 */ lw $a0, 0x0050($sp) -/* 075A0 808397B0 8FAE005C */ lw $t6, 0x005C($sp) -/* 075A4 808397B4 8FB90060 */ lw $t9, 0x0060($sp) -/* 075A8 808397B8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 075AC 808397BC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 075B0 808397C0 AFB80020 */ sw $t8, 0x0020($sp) -/* 075B4 808397C4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 075B8 808397C8 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFF4 -/* 075BC 808397CC 27A60038 */ addiu $a2, $sp, 0x0038 ## $a2 = FFFFFFE8 -/* 075C0 808397D0 8FA70064 */ lw $a3, 0x0064($sp) -/* 075C4 808397D4 AFA00018 */ sw $zero, 0x0018($sp) -/* 075C8 808397D8 AFA0001C */ sw $zero, 0x001C($sp) -/* 075CC 808397DC 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 075D0 808397E0 AFAE0010 */ sw $t6, 0x0010($sp) -/* 075D4 808397E4 0C00F7A1 */ jal func_8003DE84 -/* 075D8 808397E8 AFB90024 */ sw $t9, 0x0024($sp) -/* 075DC 808397EC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 075E0 808397F0 8FB00030 */ lw $s0, 0x0030($sp) -/* 075E4 808397F4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 075E8 808397F8 03E00008 */ jr $ra -/* 075EC 808397FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s deleted file mode 100644 index 856f3e61e5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s +++ /dev/null @@ -1,463 +0,0 @@ -.late_rodata -glabel D_8085537C - .float 0.1 - -glabel D_80855380 - .float 0.1 - -.text -glabel func_80839800 -/* 075F0 80839800 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 075F4 80839804 AFBF002C */ sw $ra, 0x002C($sp) -/* 075F8 80839808 AFB10028 */ sw $s1, 0x0028($sp) -/* 075FC 8083980C AFB00024 */ sw $s0, 0x0024($sp) -/* 07600 80839810 AFA5008C */ sw $a1, 0x008C($sp) -/* 07604 80839814 8083042C */ lb $v1, 0x042C($a0) ## 0000042C -/* 07608 80839818 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0760C 8083981C 50600195 */ beql $v1, $zero, .L80839E74 -/* 07610 80839820 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 07614 80839824 8C8E067C */ lw $t6, 0x067C($a0) ## 0000067C -/* 07618 80839828 3C198086 */ lui $t9, %hi(D_80858AB4) ## $t9 = 80860000 -/* 0761C 8083982C 31CF0800 */ andi $t7, $t6, 0x0800 ## $t7 = 00000000 -/* 07620 80839830 11E00008 */ beq $t7, $zero, .L80839854 -/* 07624 80839834 00000000 */ nop -/* 07628 80839838 8C8203AC */ lw $v0, 0x03AC($a0) ## 000003AC -/* 0762C 8083983C 5040018D */ beql $v0, $zero, .L80839E74 -/* 07630 80839840 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 07634 80839844 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -/* 07638 80839848 240100A1 */ addiu $at, $zero, 0x00A1 ## $at = 000000A1 -/* 0763C 8083984C 57010189 */ bnel $t8, $at, .L80839E74 -/* 07640 80839850 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80839854: -/* 07644 80839854 8F398AB4 */ lw $t9, %lo(D_80858AB4)($t9) -/* 07648 80839858 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 0764C 8083985C 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 07650 80839860 9728000C */ lhu $t0, 0x000C($t9) ## 8086000C -/* 07654 80839864 01014827 */ nor $t1, $t0, $at -/* 07658 80839868 11200006 */ beq $t1, $zero, .L80839884 -/* 0765C 8083986C 00000000 */ nop -/* 07660 80839870 8E0A0674 */ lw $t2, 0x0674($s0) ## 00000674 -/* 07664 80839874 3C0B8085 */ lui $t3, %hi(func_8084F9A0) ## $t3 = 80850000 -/* 07668 80839878 256BF9A0 */ addiu $t3, $t3, %lo(func_8084F9A0) ## $t3 = 8084F9A0 -/* 0766C 8083987C 554B017D */ bnel $t2, $t3, .L80839E74 -/* 07670 80839880 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80839884: -/* 07674 80839884 04610008 */ bgez $v1, .L808398A8 -/* 07678 80839888 8E110430 */ lw $s1, 0x0430($s0) ## 00000430 -/* 0767C 8083988C 240C00D0 */ addiu $t4, $zero, 0x00D0 ## $t4 = 000000D0 -/* 07680 80839890 A62C010E */ sh $t4, 0x010E($s1) ## 0000010E -/* 07684 80839894 8FA4008C */ lw $a0, 0x008C($sp) -/* 07688 80839898 0C214C52 */ jal func_80853148 -/* 0768C 8083989C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 07690 808398A0 10000174 */ beq $zero, $zero, .L80839E74 -/* 07694 808398A4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808398A8: -/* 07698 808398A8 820D042D */ lb $t5, 0x042D($s0) ## 0000042D -/* 0769C 808398AC AFAD007C */ sw $t5, 0x007C($sp) -/* 076A0 808398B0 0C01DE0D */ jal Math_Coss - ## coss? -/* 076A4 808398B4 862400B6 */ lh $a0, 0x00B6($s1) ## 000000B6 -/* 076A8 808398B8 E7A00078 */ swc1 $f0, 0x0078($sp) -/* 076AC 808398BC 0C01DE1C */ jal Math_Sins - ## sins? -/* 076B0 808398C0 862400B6 */ lh $a0, 0x00B6($s1) ## 000000B6 -/* 076B4 808398C4 E7A00074 */ swc1 $f0, 0x0074($sp) -/* 076B8 808398C8 820E042C */ lb $t6, 0x042C($s0) ## 0000042C -/* 076BC 808398CC 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 076C0 808398D0 8FB8007C */ lw $t8, 0x007C($sp) -/* 076C4 808398D4 146E0067 */ bne $v1, $t6, .L80839A74 -/* 076C8 808398D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 076CC 808398DC 862F0016 */ lh $t7, 0x0016($s1) ## 00000016 -/* 076D0 808398E0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 076D4 808398E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 076D8 808398E8 A60F083C */ sh $t7, 0x083C($s0) ## 0000083C -/* 076DC 808398EC 8FB8007C */ lw $t8, 0x007C($sp) -/* 076E0 808398F0 3C064248 */ lui $a2, 0x4248 ## $a2 = 42480000 -/* 076E4 808398F4 5B000006 */ blezl $t8, .L80839910 -/* 076E8 808398F8 C6060838 */ lwc1 $f6, 0x0838($s0) ## 00000838 -/* 076EC 808398FC 8619083C */ lh $t9, 0x083C($s0) ## 0000083C -/* 076F0 80839900 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 -/* 076F4 80839904 03214021 */ addu $t0, $t9, $at -/* 076F8 80839908 A608083C */ sh $t0, 0x083C($s0) ## 0000083C -/* 076FC 8083990C C6060838 */ lwc1 $f6, 0x0838($s0) ## 00000838 -.L80839910: -/* 07700 80839910 8609083C */ lh $t1, 0x083C($s0) ## 0000083C -/* 07704 80839914 3C018085 */ lui $at, %hi(D_8085537C) ## $at = 80850000 -/* 07708 80839918 4604303E */ c.le.s $f6, $f4 -/* 0770C 8083991C A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 -/* 07710 80839920 45020004 */ bc1fl .L80839934 -/* 07714 80839924 8FA4008C */ lw $a0, 0x008C($sp) -/* 07718 80839928 C428537C */ lwc1 $f8, %lo(D_8085537C)($at) -/* 0771C 8083992C E6080838 */ swc1 $f8, 0x0838($s0) ## 00000838 -/* 07720 80839930 8FA4008C */ lw $a0, 0x008C($sp) -.L80839934: -/* 07724 80839934 0C20E39C */ jal func_80838E70 -/* 07728 80839938 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 0772C 8083993C 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 07730 80839940 C7B20074 */ lwc1 $f18, 0x0074($sp) -/* 07734 80839944 820A042C */ lb $t2, 0x042C($s0) ## 0000042C -/* 07738 80839948 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 0773C 8083994C 01616025 */ or $t4, $t3, $at ## $t4 = 20000000 -/* 07740 80839950 A200084F */ sb $zero, 0x084F($s0) ## 0000084F -/* 07744 80839954 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -/* 07748 80839958 A20A0447 */ sb $t2, 0x0447($s0) ## 00000447 -/* 0774C 8083995C 8FAD007C */ lw $t5, 0x007C($sp) -/* 07750 80839960 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 07754 80839964 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 07758 80839968 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -/* 0775C 8083996C C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 -/* 07760 80839970 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 -/* 07764 80839974 46805420 */ cvt.s.w $f16, $f10 -/* 07768 80839978 C60C002C */ lwc1 $f12, 0x002C($s0) ## 0000002C -/* 0776C 8083997C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 07770 80839980 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07774 80839984 46048082 */ mul.s $f2, $f16, $f4 -/* 07778 80839988 00000000 */ nop -/* 0777C 8083998C 46121182 */ mul.s $f6, $f2, $f18 -/* 07780 80839990 46060200 */ add.s $f8, $f0, $f6 -/* 07784 80839994 E6080450 */ swc1 $f8, 0x0450($s0) ## 00000450 -/* 07788 80839998 C7AA0078 */ lwc1 $f10, 0x0078($sp) -/* 0778C 8083999C 44814000 */ mtc1 $at, $f8 ## $f8 = -120.00 -/* 07790 808399A0 460A1102 */ mul.s $f4, $f2, $f10 -/* 07794 808399A4 00000000 */ nop -/* 07798 808399A8 46088382 */ mul.s $f14, $f16, $f8 -/* 0779C 808399AC 46046180 */ add.s $f6, $f12, $f4 -/* 077A0 808399B0 46127282 */ mul.s $f10, $f14, $f18 -/* 077A4 808399B4 E6060458 */ swc1 $f6, 0x0458($s0) ## 00000458 -/* 077A8 808399B8 460A0100 */ add.s $f4, $f0, $f10 -/* 077AC 808399BC E604045C */ swc1 $f4, 0x045C($s0) ## 0000045C -/* 077B0 808399C0 C7A60078 */ lwc1 $f6, 0x0078($sp) -/* 077B4 808399C4 46067202 */ mul.s $f8, $f14, $f6 -/* 077B8 808399C8 46086280 */ add.s $f10, $f12, $f8 -/* 077BC 808399CC E60A0464 */ swc1 $f10, 0x0464($s0) ## 00000464 -/* 077C0 808399D0 0C20C889 */ jal func_80832224 -/* 077C4 808399D4 A62E0164 */ sh $t6, 0x0164($s1) ## 00000164 -/* 077C8 808399D8 860F042E */ lh $t7, 0x042E($s0) ## 0000042E -/* 077CC 808399DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 077D0 808399E0 3C018085 */ lui $at, %hi(D_80855380) ## $at = 80850000 -/* 077D4 808399E4 11E0000A */ beq $t7, $zero, .L80839A10 -/* 077D8 808399E8 00000000 */ nop -/* 077DC 808399EC 0C20CCCE */ jal func_80833338 -/* 077E0 808399F0 A6000850 */ sh $zero, 0x0850($s0) ## 00000850 -/* 077E4 808399F4 8FA4008C */ lw $a0, 0x008C($sp) -/* 077E8 808399F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 077EC 808399FC 0C20CAC3 */ jal func_80832B0C -/* 077F0 80839A00 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 077F4 80839A04 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 077F8 80839A08 10000003 */ beq $zero, $zero, .L80839A18 -/* 077FC 80839A0C E60401C4 */ swc1 $f4, 0x01C4($s0) ## 000001C4 -.L80839A10: -/* 07800 80839A10 C4265380 */ lwc1 $f6, %lo(D_80855380)($at) -/* 07804 80839A14 E6060838 */ swc1 $f6, 0x0838($s0) ## 00000838 -.L80839A18: -/* 07808 80839A18 92380002 */ lbu $t8, 0x0002($s1) ## 00000002 -/* 0780C 80839A1C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 07810 80839A20 8FB9007C */ lw $t9, 0x007C($sp) -/* 07814 80839A24 17010011 */ bne $t8, $at, .L80839A6C -/* 07818 80839A28 8FA4008C */ lw $a0, 0x008C($sp) -/* 0781C 80839A2C 1B200003 */ blez $t9, .L80839A3C -/* 07820 80839A30 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 07824 80839A34 10000002 */ beq $zero, $zero, .L80839A40 -/* 07828 80839A38 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80839A3C: -/* 0782C 80839A3C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80839A40: -/* 07830 80839A40 9629001C */ lhu $t1, 0x001C($s1) ## 0000001C -/* 07834 80839A44 01044021 */ addu $t0, $t0, $a0 -/* 07838 80839A48 8D081D38 */ lw $t0, 0x1D38($t0) ## 00011D38 -/* 0783C 80839A4C 00095283 */ sra $t2, $t1, 10 -/* 07840 80839A50 000A5900 */ sll $t3, $t2, 4 -/* 07844 80839A54 00026840 */ sll $t5, $v0, 1 -/* 07848 80839A58 010B6021 */ addu $t4, $t0, $t3 -/* 0784C 80839A5C 018D7021 */ addu $t6, $t4, $t5 -/* 07850 80839A60 81CF0001 */ lb $t7, 0x0001($t6) ## 00000001 -/* 07854 80839A64 0C00C12C */ jal func_800304B0 -/* 07858 80839A68 A60F046A */ sh $t7, 0x046A($s0) ## 0000046A -.L80839A6C: -/* 0785C 80839A6C 100000D5 */ beq $zero, $zero, .L80839DC4 -/* 07860 80839A70 8203042C */ lb $v1, 0x042C($s0) ## 0000042C -.L80839A74: -/* 07864 80839A74 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 07868 80839A78 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0786C 80839A7C 3C068084 */ lui $a2, %hi(func_80845EF8) ## $a2 = 80840000 -/* 07870 80839A80 46804420 */ cvt.s.w $f16, $f8 -/* 07874 80839A84 3C098016 */ lui $t1, %hi(gSaveContext+4) -/* 07878 80839A88 24C65EF8 */ addiu $a2, $a2, %lo(func_80845EF8) ## $a2 = 80845EF8 -/* 0787C 80839A8C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 07880 80839A90 460A803C */ c.lt.s $f16, $f10 -/* 07884 80839A94 00000000 */ nop -/* 07888 80839A98 45000009 */ bc1f .L80839AC0 -/* 0788C 80839A9C 3C198016 */ lui $t9, %hi(gSaveContext+4) -/* 07890 80839AA0 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) -/* 07894 80839AA4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 07898 80839AA8 17200003 */ bne $t9, $zero, .L80839AB8 -/* 0789C 80839AAC 00000000 */ nop -/* 078A0 80839AB0 10000001 */ beq $zero, $zero, .L80839AB8 -/* 078A4 80839AB4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80839AB8: -/* 078A8 80839AB8 10000008 */ beq $zero, $zero, .L80839ADC -/* 078AC 80839ABC A2220190 */ sb $v0, 0x0190($s1) ## 00000190 -.L80839AC0: -/* 078B0 80839AC0 8D29E664 */ lw $t1, %lo(gSaveContext+4)($t1) -/* 078B4 80839AC4 24040003 */ addiu $a0, $zero, 0x0003 ## $a0 = 00000003 -/* 078B8 80839AC8 15200003 */ bne $t1, $zero, .L80839AD8 -/* 078BC 80839ACC 00000000 */ nop -/* 078C0 80839AD0 10000001 */ beq $zero, $zero, .L80839AD8 -/* 078C4 80839AD4 00602025 */ or $a0, $v1, $zero ## $a0 = 00000000 -.L80839AD8: -/* 078C8 80839AD8 A2240190 */ sb $a0, 0x0190($s1) ## 00000190 -.L80839ADC: -/* 078CC 80839ADC 92220190 */ lbu $v0, 0x0190($s1) ## 00000190 -/* 078D0 80839AE0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 078D4 80839AE4 14400008 */ bne $v0, $zero, .L80839B08 -/* 078D8 80839AE8 00000000 */ nop -/* 078DC 80839AEC 920A015B */ lbu $t2, 0x015B($s0) ## 0000015B -/* 078E0 80839AF0 3C0B8085 */ lui $t3, %hi(D_808539EC) ## $t3 = 80850000 -/* 078E4 80839AF4 000A4080 */ sll $t0, $t2, 2 -/* 078E8 80839AF8 01685821 */ addu $t3, $t3, $t0 -/* 078EC 80839AFC 8D6B39EC */ lw $t3, %lo(D_808539EC)($t3) -/* 078F0 80839B00 10000019 */ beq $zero, $zero, .L80839B68 -/* 078F4 80839B04 AFAB005C */ sw $t3, 0x005C($sp) -.L80839B08: -/* 078F8 80839B08 14410008 */ bne $v0, $at, .L80839B2C -/* 078FC 80839B0C 00000000 */ nop -/* 07900 80839B10 920C015B */ lbu $t4, 0x015B($s0) ## 0000015B -/* 07904 80839B14 3C0E8085 */ lui $t6, %hi(D_80853A04) ## $t6 = 80850000 -/* 07908 80839B18 000C6880 */ sll $t5, $t4, 2 -/* 0790C 80839B1C 01CD7021 */ addu $t6, $t6, $t5 -/* 07910 80839B20 8DCE3A04 */ lw $t6, %lo(D_80853A04)($t6) -/* 07914 80839B24 10000010 */ beq $zero, $zero, .L80839B68 -/* 07918 80839B28 AFAE005C */ sw $t6, 0x005C($sp) -.L80839B2C: -/* 0791C 80839B2C 54620009 */ bnel $v1, $v0, .L80839B54 -/* 07920 80839B30 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B -/* 07924 80839B34 920F015B */ lbu $t7, 0x015B($s0) ## 0000015B -/* 07928 80839B38 3C198085 */ lui $t9, %hi(D_80853A1C) ## $t9 = 80850000 -/* 0792C 80839B3C 000FC080 */ sll $t8, $t7, 2 -/* 07930 80839B40 0338C821 */ addu $t9, $t9, $t8 -/* 07934 80839B44 8F393A1C */ lw $t9, %lo(D_80853A1C)($t9) -/* 07938 80839B48 10000007 */ beq $zero, $zero, .L80839B68 -/* 0793C 80839B4C AFB9005C */ sw $t9, 0x005C($sp) -/* 07940 80839B50 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B -.L80839B54: -/* 07944 80839B54 3C088085 */ lui $t0, %hi(D_80853A34) ## $t0 = 80850000 -/* 07948 80839B58 00095080 */ sll $t2, $t1, 2 -/* 0794C 80839B5C 010A4021 */ addu $t0, $t0, $t2 -/* 07950 80839B60 8D083A34 */ lw $t0, %lo(D_80853A34)($t0) -/* 07954 80839B64 AFA8005C */ sw $t0, 0x005C($sp) -.L80839B68: -/* 07958 80839B68 8FA4008C */ lw $a0, 0x008C($sp) -/* 0795C 80839B6C 0C20D716 */ jal func_80835C58 -/* 07960 80839B70 E7B00040 */ swc1 $f16, 0x0040($sp) -/* 07964 80839B74 8FA4008C */ lw $a0, 0x008C($sp) -/* 07968 80839B78 0C20C94A */ jal func_80832528 -/* 0796C 80839B7C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07970 80839B80 8FAB007C */ lw $t3, 0x007C($sp) -/* 07974 80839B84 C7B00040 */ lwc1 $f16, 0x0040($sp) -/* 07978 80839B88 05630005 */ bgezl $t3, .L80839BA0 -/* 0797C 80839B8C 862D00B6 */ lh $t5, 0x00B6($s1) ## 000000B6 -/* 07980 80839B90 862C00B6 */ lh $t4, 0x00B6($s1) ## 000000B6 -/* 07984 80839B94 10000005 */ beq $zero, $zero, .L80839BAC -/* 07988 80839B98 A60C00B6 */ sh $t4, 0x00B6($s0) ## 000000B6 -/* 0798C 80839B9C 862D00B6 */ lh $t5, 0x00B6($s1) ## 000000B6 -.L80839BA0: -/* 07990 80839BA0 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 -/* 07994 80839BA4 01A17021 */ addu $t6, $t5, $at -/* 07998 80839BA8 A60E00B6 */ sh $t6, 0x00B6($s0) ## 000000B6 -.L80839BAC: -/* 0799C 80839BAC 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 079A0 80839BB0 44812000 */ mtc1 $at, $f4 ## $f4 = 22.00 -/* 079A4 80839BB4 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 079A8 80839BB8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 079AC 80839BBC 46048002 */ mul.s $f0, $f16, $f4 -/* 079B0 80839BC0 A60F083C */ sh $t7, 0x083C($s0) ## 0000083C -/* 079B4 80839BC4 C7A80074 */ lwc1 $f8, 0x0074($sp) -/* 079B8 80839BC8 46080282 */ mul.s $f10, $f0, $f8 -/* 079BC 80839BCC E7A0006C */ swc1 $f0, 0x006C($sp) -/* 079C0 80839BD0 C6260024 */ lwc1 $f6, 0x0024($s1) ## 00000024 -/* 079C4 80839BD4 460A3100 */ add.s $f4, $f6, $f10 -/* 079C8 80839BD8 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 079CC 80839BDC C7A60078 */ lwc1 $f6, 0x0078($sp) -/* 079D0 80839BE0 C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C -/* 079D4 80839BE4 46060282 */ mul.s $f10, $f0, $f6 -/* 079D8 80839BE8 460A4100 */ add.s $f4, $f8, $f10 -/* 079DC 80839BEC E604002C */ swc1 $f4, 0x002C($s0) ## 0000002C -/* 079E0 80839BF0 8FA6005C */ lw $a2, 0x005C($sp) -/* 079E4 80839BF4 0C20CCA3 */ jal func_8083328C -/* 079E8 80839BF8 8FA4008C */ lw $a0, 0x008C($sp) -/* 079EC 80839BFC 8618042E */ lh $t8, 0x042E($s0) ## 0000042E -/* 079F0 80839C00 13000004 */ beq $t8, $zero, .L80839C14 -/* 079F4 80839C04 00000000 */ nop -/* 079F8 80839C08 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 079FC 80839C0C 00000000 */ nop -/* 07A00 80839C10 E60601C4 */ swc1 $f6, 0x01C4($s0) ## 000001C4 -.L80839C14: -/* 07A04 80839C14 0C20C889 */ jal func_80832224 -/* 07A08 80839C18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07A0C 80839C1C 8FA4008C */ lw $a0, 0x008C($sp) -/* 07A10 80839C20 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07A14 80839C24 0C20CBD5 */ jal func_80832F54 -/* 07A18 80839C28 2406028F */ addiu $a2, $zero, 0x028F ## $a2 = 0000028F -/* 07A1C 80839C2C 8E390118 */ lw $t9, 0x0118($s1) ## 00000118 -/* 07A20 80839C30 8FA9007C */ lw $t1, 0x007C($sp) -/* 07A24 80839C34 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 07A28 80839C38 13200002 */ beq $t9, $zero, .L80839C44 -/* 07A2C 80839C3C 00095023 */ subu $t2, $zero, $t1 -/* 07A30 80839C40 AFAA007C */ sw $t2, 0x007C($sp) -.L80839C44: -/* 07A34 80839C44 A2280191 */ sb $t0, 0x0191($s1) ## 00000191 -/* 07A38 80839C48 8203042C */ lb $v1, 0x042C($s0) ## 0000042C -/* 07A3C 80839C4C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 07A40 80839C50 5061005D */ beql $v1, $at, .L80839DC8 -/* 07A44 80839C54 8FA4008C */ lw $a0, 0x008C($sp) -/* 07A48 80839C58 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 07A4C 80839C5C 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 07A50 80839C60 01616025 */ or $t4, $t3, $at ## $t4 = 20000000 -/* 07A54 80839C64 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -/* 07A58 80839C68 0C00C12C */ jal func_800304B0 -/* 07A5C 80839C6C 8FA4008C */ lw $a0, 0x008C($sp) -/* 07A60 80839C70 862D001C */ lh $t5, 0x001C($s1) ## 0000001C -/* 07A64 80839C74 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 07A68 80839C78 C7A0006C */ lwc1 $f0, 0x006C($sp) -/* 07A6C 80839C7C 000D71C3 */ sra $t6, $t5, 7 -/* 07A70 80839C80 31CF0007 */ andi $t7, $t6, 0x0007 ## $t7 = 00000000 -/* 07A74 80839C84 15E10024 */ bne $t7, $at, .L80839D18 -/* 07A78 80839C88 8FA4008C */ lw $a0, 0x008C($sp) -/* 07A7C 80839C8C C7AA0074 */ lwc1 $f10, 0x0074($sp) -/* 07A80 80839C90 C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024 -/* 07A84 80839C94 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 07A88 80839C98 460A0102 */ mul.s $f4, $f0, $f10 -/* 07A8C 80839C9C 8FA4008C */ lw $a0, 0x008C($sp) -/* 07A90 80839CA0 27A50058 */ addiu $a1, $sp, 0x0058 ## $a1 = FFFFFFD0 -/* 07A94 80839CA4 27A6004C */ addiu $a2, $sp, 0x004C ## $a2 = FFFFFFC4 -/* 07A98 80839CA8 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 07A9C 80839CAC 46044181 */ sub.s $f6, $f8, $f4 -/* 07AA0 80839CB0 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 07AA4 80839CB4 E7A6004C */ swc1 $f6, 0x004C($sp) -/* 07AA8 80839CB8 C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 -/* 07AAC 80839CBC 46085100 */ add.s $f4, $f10, $f8 -/* 07AB0 80839CC0 C7AA0078 */ lwc1 $f10, 0x0078($sp) -/* 07AB4 80839CC4 460A0202 */ mul.s $f8, $f0, $f10 -/* 07AB8 80839CC8 E7A40050 */ swc1 $f4, 0x0050($sp) -/* 07ABC 80839CCC C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C -/* 07AC0 80839CD0 46083101 */ sub.s $f4, $f6, $f8 -/* 07AC4 80839CD4 0C00F224 */ jal func_8003C890 -/* 07AC8 80839CD8 E7A40054 */ swc1 $f4, 0x0054($sp) -/* 07ACC 80839CDC 8FA4008C */ lw $a0, 0x008C($sp) -/* 07AD0 80839CE0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07AD4 80839CE4 8FA60058 */ lw $a2, 0x0058($sp) -/* 07AD8 80839CE8 0C20E40D */ jal func_80839034 -/* 07ADC 80839CEC 24070032 */ addiu $a3, $zero, 0x0032 ## $a3 = 00000032 -/* 07AE0 80839CF0 10400007 */ beq $v0, $zero, .L80839D10 -/* 07AE4 80839CF4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 07AE8 80839CF8 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 -/* 07AEC 80839CFC 3C028016 */ lui $v0, %hi(gSaveContext) -/* 07AF0 80839D00 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 07AF4 80839D04 24185802 */ addiu $t8, $zero, 0x5802 ## $t8 = 00005802 -/* 07AF8 80839D08 A45813C0 */ sh $t8, 0x13C0($v0) ## 8015FA20 -/* 07AFC 80839D0C E44A13BC */ swc1 $f10, 0x13BC($v0) ## 8015FA1C -.L80839D10: -/* 07B00 80839D10 1000002C */ beq $zero, $zero, .L80839DC4 -/* 07B04 80839D14 8203042C */ lb $v1, 0x042C($s0) ## 0000042C -.L80839D18: -/* 07B08 80839D18 0C030129 */ jal Gameplay_GetCamera -/* 07B0C 80839D1C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 07B10 80839D20 8FB9007C */ lw $t9, 0x007C($sp) -/* 07B14 80839D24 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 07B18 80839D28 8FA9008C */ lw $t1, 0x008C($sp) -/* 07B1C 80839D2C 1B200003 */ blez $t9, .L80839D3C -/* 07B20 80839D30 3C018085 */ lui $at, %hi(D_808535EC) ## $at = 80850000 -/* 07B24 80839D34 10000002 */ beq $zero, $zero, .L80839D40 -/* 07B28 80839D38 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80839D3C: -/* 07B2C 80839D3C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80839D40: -/* 07B30 80839D40 C42035EC */ lwc1 $f0, %lo(D_808535EC)($at) -/* 07B34 80839D44 9628001C */ lhu $t0, 0x001C($s1) ## 0000001C -/* 07B38 80839D48 3C014218 */ lui $at, 0x4218 ## $at = 42180000 -/* 07B3C 80839D4C 44819000 */ mtc1 $at, $f18 ## $f18 = 38.00 -/* 07B40 80839D50 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 -/* 07B44 80839D54 44818000 */ mtc1 $at, $f16 ## $f16 = 26.00 -/* 07B48 80839D58 46009482 */ mul.s $f18, $f18, $f0 -/* 07B4C 80839D5C 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 07B50 80839D60 01495021 */ addu $t2, $t2, $t1 -/* 07B54 80839D64 46008402 */ mul.s $f16, $f16, $f0 -/* 07B58 80839D68 8D4A1D38 */ lw $t2, 0x1D38($t2) ## 00011D38 -/* 07B5C 80839D6C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 07B60 80839D70 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 -/* 07B64 80839D74 00085A83 */ sra $t3, $t0, 10 -/* 07B68 80839D78 000B6100 */ sll $t4, $t3, 4 -/* 07B6C 80839D7C 46007382 */ mul.s $f14, $f14, $f0 -/* 07B70 80839D80 4600948D */ trunc.w.s $f18, $f18 -/* 07B74 80839D84 014C6821 */ addu $t5, $t2, $t4 -/* 07B78 80839D88 00027040 */ sll $t6, $v0, 1 -/* 07B7C 80839D8C 01AE7821 */ addu $t7, $t5, $t6 -/* 07B80 80839D90 44199000 */ mfc1 $t9, $f18 -/* 07B84 80839D94 4600840D */ trunc.w.s $f16, $f16 -/* 07B88 80839D98 81E60001 */ lb $a2, 0x0001($t7) ## 00000001 -/* 07B8C 80839D9C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 07B90 80839DA0 4600738D */ trunc.w.s $f14, $f14 -/* 07B94 80839DA4 44088000 */ mfc1 $t0, $f16 -/* 07B98 80839DA8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 07B9C 80839DAC AFB90010 */ sw $t9, 0x0010($sp) -/* 07BA0 80839DB0 440A7000 */ mfc1 $t2, $f14 -/* 07BA4 80839DB4 AFA80014 */ sw $t0, 0x0014($sp) -/* 07BA8 80839DB8 0C016B50 */ jal func_8005AD40 -/* 07BAC 80839DBC AFAA0018 */ sw $t2, 0x0018($sp) -/* 07BB0 80839DC0 8203042C */ lb $v1, 0x042C($s0) ## 0000042C -.L80839DC4: -/* 07BB4 80839DC4 8FA4008C */ lw $a0, 0x008C($sp) -.L80839DC8: -/* 07BB8 80839DC8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 07BBC 80839DCC 00818021 */ addu $s0, $a0, $at -/* 07BC0 80839DD0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 07BC4 80839DD4 5061001C */ beql $v1, $at, .L80839E48 -/* 07BC8 80839DD8 8E22011C */ lw $v0, 0x011C($s1) ## 0000011C -/* 07BCC 80839DDC 922C0002 */ lbu $t4, 0x0002($s1) ## 00000002 -/* 07BD0 80839DE0 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 07BD4 80839DE4 8FAD007C */ lw $t5, 0x007C($sp) -/* 07BD8 80839DE8 55810017 */ bnel $t4, $at, .L80839E48 -/* 07BDC 80839DEC 8E22011C */ lw $v0, 0x011C($s1) ## 0000011C -/* 07BE0 80839DF0 19A00003 */ blez $t5, .L80839E00 -/* 07BE4 80839DF4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 07BE8 80839DF8 10000001 */ beq $zero, $zero, .L80839E00 -/* 07BEC 80839DFC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80839E00: -/* 07BF0 80839E00 962F001C */ lhu $t7, 0x001C($s1) ## 0000001C -/* 07BF4 80839E04 8E0E1D38 */ lw $t6, 0x1D38($s0) ## 00001D38 -/* 07BF8 80839E08 00024040 */ sll $t0, $v0, 1 -/* 07BFC 80839E0C 000FC283 */ sra $t8, $t7, 10 -/* 07C00 80839E10 0018C900 */ sll $t9, $t8, 4 -/* 07C04 80839E14 01D94821 */ addu $t1, $t6, $t9 -/* 07C08 80839E18 01285821 */ addu $t3, $t1, $t0 -/* 07C0C 80839E1C 81660000 */ lb $a2, 0x0000($t3) ## 00000000 -/* 07C10 80839E20 04C20009 */ bltzl $a2, .L80839E48 -/* 07C14 80839E24 8E22011C */ lw $v0, 0x011C($s1) ## 0000011C -/* 07C18 80839E28 820A1CBC */ lb $t2, 0x1CBC($s0) ## 00001CBC -/* 07C1C 80839E2C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 07C20 80839E30 34211CBC */ ori $at, $at, 0x1CBC ## $at = 00011CBC -/* 07C24 80839E34 50CA0004 */ beql $a2, $t2, .L80839E48 -/* 07C28 80839E38 8E22011C */ lw $v0, 0x011C($s1) ## 0000011C -/* 07C2C 80839E3C 0C025CA3 */ jal func_8009728C -/* 07C30 80839E40 00812821 */ addu $a1, $a0, $at -/* 07C34 80839E44 8E22011C */ lw $v0, 0x011C($s1) ## 0000011C -.L80839E48: -/* 07C38 80839E48 820C1CBC */ lb $t4, 0x1CBC($s0) ## 00001CBC -/* 07C3C 80839E4C 14400004 */ bne $v0, $zero, .L80839E60 -/* 07C40 80839E50 A22C0003 */ sb $t4, 0x0003($s1) ## 00000003 -/* 07C44 80839E54 8E220118 */ lw $v0, 0x0118($s1) ## 00000118 -/* 07C48 80839E58 10400003 */ beq $v0, $zero, .L80839E68 -/* 07C4C 80839E5C 00000000 */ nop -.L80839E60: -/* 07C50 80839E60 820D1CBC */ lb $t5, 0x1CBC($s0) ## 00001CBC -/* 07C54 80839E64 A04D0003 */ sb $t5, 0x0003($v0) ## 00000003 -.L80839E68: -/* 07C58 80839E68 10000002 */ beq $zero, $zero, .L80839E74 -/* 07C5C 80839E6C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 07C60 80839E70 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80839E74: -/* 07C64 80839E74 8FBF002C */ lw $ra, 0x002C($sp) -/* 07C68 80839E78 8FB00024 */ lw $s0, 0x0024($sp) -/* 07C6C 80839E7C 8FB10028 */ lw $s1, 0x0028($sp) -/* 07C70 80839E80 03E00008 */ jr $ra -/* 07C74 80839E84 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839E88.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839E88.s deleted file mode 100644 index 88f48a9de1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839E88.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80839E88 -/* 07C78 80839E88 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 07C7C 80839E8C AFB00018 */ sw $s0, 0x0018($sp) -/* 07C80 80839E90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 07C84 80839E94 AFBF001C */ sw $ra, 0x001C($sp) -/* 07C88 80839E98 AFA50024 */ sw $a1, 0x0024($sp) -/* 07C8C 80839E9C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 07C90 80839EA0 3C068084 */ lui $a2, %hi(func_80840450) ## $a2 = 80840000 -/* 07C94 80839EA4 24C60450 */ addiu $a2, $a2, %lo(func_80840450) ## $a2 = 80840450 -/* 07C98 80839EA8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07C9C 80839EAC 0C20D716 */ jal func_80835C58 -/* 07CA0 80839EB0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 07CA4 80839EB4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 07CA8 80839EB8 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 07CAC 80839EBC C6040870 */ lwc1 $f4, 0x0870($s0) ## 00000870 -/* 07CB0 80839EC0 4606203C */ c.lt.s $f4, $f6 -/* 07CB4 80839EC4 00000000 */ nop -/* 07CB8 80839EC8 45000007 */ bc1f .L80839EE8 -/* 07CBC 80839ECC 00000000 */ nop -/* 07CC0 80839ED0 0C20CD39 */ jal func_808334E4 -/* 07CC4 80839ED4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07CC8 80839ED8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 07CCC 80839EDC 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 07CD0 80839EE0 10000007 */ beq $zero, $zero, .L80839F00 -/* 07CD4 80839EE4 E6080870 */ swc1 $f8, 0x0870($s0) ## 00000870 -.L80839EE8: -/* 07CD8 80839EE8 0C20CD4A */ jal func_80833528 -/* 07CDC 80839EEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07CE0 80839EF0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 07CE4 80839EF4 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 07CE8 80839EF8 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 07CEC 80839EFC E60A0870 */ swc1 $f10, 0x0870($s0) ## 00000870 -.L80839F00: -/* 07CF0 80839F00 C6100870 */ lwc1 $f16, 0x0870($s0) ## 00000870 -/* 07CF4 80839F04 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07CF8 80839F08 E6100874 */ swc1 $f16, 0x0874($s0) ## 00000874 -/* 07CFC 80839F0C 0C20C8A1 */ jal func_80832284 -/* 07D00 80839F10 8FA40024 */ lw $a0, 0x0024($sp) -/* 07D04 80839F14 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 07D08 80839F18 A60E083C */ sh $t6, 0x083C($s0) ## 0000083C -/* 07D0C 80839F1C 8FBF001C */ lw $ra, 0x001C($sp) -/* 07D10 80839F20 8FB00018 */ lw $s0, 0x0018($sp) -/* 07D14 80839F24 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 07D18 80839F28 03E00008 */ jr $ra -/* 07D1C 80839F2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F30.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F30.s deleted file mode 100644 index ffea8e9b19..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F30.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80839F30 -/* 07D20 80839F30 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 07D24 80839F34 AFB00018 */ sw $s0, 0x0018($sp) -/* 07D28 80839F38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 07D2C 80839F3C AFBF001C */ sw $ra, 0x001C($sp) -/* 07D30 80839F40 AFA50024 */ sw $a1, 0x0024($sp) -/* 07D34 80839F44 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 07D38 80839F48 3C068084 */ lui $a2, %hi(func_808407CC) ## $a2 = 80840000 -/* 07D3C 80839F4C 24C607CC */ addiu $a2, $a2, %lo(func_808407CC) ## $a2 = 808407CC -/* 07D40 80839F50 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07D44 80839F54 0C20D716 */ jal func_80835C58 -/* 07D48 80839F58 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 07D4C 80839F5C 0C20CCCE */ jal func_80833338 -/* 07D50 80839F60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07D54 80839F64 8FA40024 */ lw $a0, 0x0024($sp) -/* 07D58 80839F68 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07D5C 80839F6C 0C20CAC3 */ jal func_80832B0C -/* 07D60 80839F70 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 07D64 80839F74 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 07D68 80839F78 A60E083C */ sh $t6, 0x083C($s0) ## 0000083C -/* 07D6C 80839F7C 8FBF001C */ lw $ra, 0x001C($sp) -/* 07D70 80839F80 8FB00018 */ lw $s0, 0x0018($sp) -/* 07D74 80839F84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 07D78 80839F88 03E00008 */ jr $ra -/* 07D7C 80839F8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F90.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F90.s deleted file mode 100644 index d1299d3c29..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F90.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80839F90 -/* 07D80 80839F90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 07D84 80839F94 AFBF0014 */ sw $ra, 0x0014($sp) -/* 07D88 80839F98 AFA5001C */ sw $a1, 0x001C($sp) -/* 07D8C 80839F9C 0C023A71 */ jal func_8008E9C4 -/* 07D90 80839FA0 AFA40018 */ sw $a0, 0x0018($sp) -/* 07D94 80839FA4 8FA40018 */ lw $a0, 0x0018($sp) -/* 07D98 80839FA8 10400005 */ beq $v0, $zero, .L80839FC0 -/* 07D9C 80839FAC 8FA5001C */ lw $a1, 0x001C($sp) -/* 07DA0 80839FB0 0C20E7A2 */ jal func_80839E88 -/* 07DA4 80839FB4 00000000 */ nop -/* 07DA8 80839FB8 1000000D */ beq $zero, $zero, .L80839FF0 -/* 07DAC 80839FBC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80839FC0: -/* 07DB0 80839FC0 0C20CECB */ jal func_80833B2C -/* 07DB4 80839FC4 AFA40018 */ sw $a0, 0x0018($sp) -/* 07DB8 80839FC8 8FA40018 */ lw $a0, 0x0018($sp) -/* 07DBC 80839FCC 10400005 */ beq $v0, $zero, .L80839FE4 -/* 07DC0 80839FD0 8FA5001C */ lw $a1, 0x001C($sp) -/* 07DC4 80839FD4 0C20E7CC */ jal func_80839F30 -/* 07DC8 80839FD8 00000000 */ nop -/* 07DCC 80839FDC 10000004 */ beq $zero, $zero, .L80839FF0 -/* 07DD0 80839FE0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80839FE4: -/* 07DD4 80839FE4 0C214C20 */ jal func_80853080 -/* 07DD8 80839FE8 00000000 */ nop -/* 07DDC 80839FEC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80839FF0: -/* 07DE0 80839FF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 07DE4 80839FF4 03E00008 */ jr $ra -/* 07DE8 80839FF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839FFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839FFC.s deleted file mode 100644 index e9c6393866..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80839FFC.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80839FFC -/* 07DEC 80839FFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 07DF0 8083A000 AFBF0014 */ sw $ra, 0x0014($sp) -/* 07DF4 8083A004 AFA40018 */ sw $a0, 0x0018($sp) -/* 07DF8 8083A008 0C023A71 */ jal func_8008E9C4 -/* 07DFC 8083A00C AFA5001C */ sw $a1, 0x001C($sp) -/* 07E00 8083A010 10400003 */ beq $v0, $zero, .L8083A020 -/* 07E04 8083A014 3C068084 */ lui $a2, %hi(func_80840450) ## $a2 = 80840000 -/* 07E08 8083A018 10000009 */ beq $zero, $zero, .L8083A040 -/* 07E0C 8083A01C 24C60450 */ addiu $a2, $a2, %lo(func_80840450) ## $a2 = 80840450 -.L8083A020: -/* 07E10 8083A020 0C20CECB */ jal func_80833B2C -/* 07E14 8083A024 8FA40018 */ lw $a0, 0x0018($sp) -/* 07E18 8083A028 10400004 */ beq $v0, $zero, .L8083A03C -/* 07E1C 8083A02C 3C068084 */ lui $a2, %hi(func_80840BC8) ## $a2 = 80840000 -/* 07E20 8083A030 3C068084 */ lui $a2, %hi(func_808407CC) ## $a2 = 80840000 -/* 07E24 8083A034 10000002 */ beq $zero, $zero, .L8083A040 -/* 07E28 8083A038 24C607CC */ addiu $a2, $a2, %lo(func_808407CC) ## $a2 = 808407CC -.L8083A03C: -/* 07E2C 8083A03C 24C60BC8 */ addiu $a2, $a2, %lo(func_80840BC8) ## $a2 = 80841394 -.L8083A040: -/* 07E30 8083A040 8FA4001C */ lw $a0, 0x001C($sp) -/* 07E34 8083A044 8FA50018 */ lw $a1, 0x0018($sp) -/* 07E38 8083A048 0C20D716 */ jal func_80835C58 -/* 07E3C 8083A04C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 07E40 8083A050 8FBF0014 */ lw $ra, 0x0014($sp) -/* 07E44 8083A054 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 07E48 8083A058 03E00008 */ jr $ra -/* 07E4C 8083A05C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A060.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A060.s deleted file mode 100644 index f1e1c2ea4d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A060.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8083A060 -/* 07E50 8083A060 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 07E54 8083A064 AFBF0014 */ sw $ra, 0x0014($sp) -/* 07E58 8083A068 0C20E7FF */ jal func_80839FFC -/* 07E5C 8083A06C AFA40018 */ sw $a0, 0x0018($sp) -/* 07E60 8083A070 0C023A71 */ jal func_8008E9C4 -/* 07E64 8083A074 8FA40018 */ lw $a0, 0x0018($sp) -/* 07E68 8083A078 10400003 */ beq $v0, $zero, .L8083A088 -/* 07E6C 8083A07C 8FAF0018 */ lw $t7, 0x0018($sp) -/* 07E70 8083A080 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 07E74 8083A084 A5EE0850 */ sh $t6, 0x0850($t7) ## 00000850 -.L8083A088: -/* 07E78 8083A088 8FBF0014 */ lw $ra, 0x0014($sp) -/* 07E7C 8083A08C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 07E80 8083A090 03E00008 */ jr $ra -/* 07E84 8083A094 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A098.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A098.s deleted file mode 100644 index f3e9dd1d70..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A098.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8083A098 -/* 07E88 8083A098 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 07E8C 8083A09C AFBF0014 */ sw $ra, 0x0014($sp) -/* 07E90 8083A0A0 AFA5001C */ sw $a1, 0x001C($sp) -/* 07E94 8083A0A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 07E98 8083A0A8 AFA60020 */ sw $a2, 0x0020($sp) -/* 07E9C 8083A0AC 0C20E818 */ jal func_8083A060 -/* 07EA0 8083A0B0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 07EA4 8083A0B4 8FA40020 */ lw $a0, 0x0020($sp) -/* 07EA8 8083A0B8 8FA50018 */ lw $a1, 0x0018($sp) -/* 07EAC 8083A0BC 0C20CCA3 */ jal func_8083328C -/* 07EB0 8083A0C0 8FA6001C */ lw $a2, 0x001C($sp) -/* 07EB4 8083A0C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 07EB8 8083A0C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 07EBC 8083A0CC 03E00008 */ jr $ra -/* 07EC0 8083A0D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0D4.s deleted file mode 100644 index d98ceb43f7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0D4.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8083A0D4 -/* 07EC4 8083A0D4 8C820438 */ lw $v0, 0x0438($a0) ## 00000438 -/* 07EC8 8083A0D8 0002102B */ sltu $v0, $zero, $v0 -/* 07ECC 8083A0DC 10400003 */ beq $v0, $zero, .L8083A0EC -/* 07ED0 8083A0E0 00000000 */ nop -/* 07ED4 8083A0E4 8C8203AC */ lw $v0, 0x03AC($a0) ## 000003AC -/* 07ED8 8083A0E8 2C420001 */ sltiu $v0, $v0, 0x0001 -.L8083A0EC: -/* 07EDC 8083A0EC 03E00008 */ jr $ra -/* 07EE0 8083A0F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0F4.s deleted file mode 100644 index b369706f23..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0F4.s +++ /dev/null @@ -1,142 +0,0 @@ -glabel func_8083A0F4 -/* 07EE4 8083A0F4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 07EE8 8083A0F8 AFBF001C */ sw $ra, 0x001C($sp) -/* 07EEC 8083A0FC AFB00018 */ sw $s0, 0x0018($sp) -/* 07EF0 8083A100 AFA40028 */ sw $a0, 0x0028($sp) -/* 07EF4 8083A104 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 07EF8 8083A108 0C20E835 */ jal func_8083A0D4 -/* 07EFC 8083A10C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 07F00 8083A110 1040006E */ beq $v0, $zero, .L8083A2CC -/* 07F04 8083A114 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07F08 8083A118 8E080438 */ lw $t0, 0x0438($s0) ## 00000438 -/* 07F0C 8083A11C 2401006C */ addiu $at, $zero, 0x006C ## $at = 0000006C -/* 07F10 8083A120 3C068085 */ lui $a2, %hi(func_8084F608) ## $a2 = 80850000 -/* 07F14 8083A124 85020000 */ lh $v0, 0x0000($t0) ## 00000000 -/* 07F18 8083A128 24C6F608 */ addiu $a2, $a2, %lo(func_8084F608) ## $a2 = 8084F608 -/* 07F1C 8083A12C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07F20 8083A130 1441000A */ bne $v0, $at, .L8083A15C -/* 07F24 8083A134 01001825 */ or $v1, $t0, $zero ## $v1 = 00000000 -/* 07F28 8083A138 AD100118 */ sw $s0, 0x0118($t0) ## 00000118 -/* 07F2C 8083A13C 8FA40028 */ lw $a0, 0x0028($sp) -/* 07F30 8083A140 0C20D716 */ jal func_80835C58 -/* 07F34 8083A144 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 07F38 8083A148 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 07F3C 8083A14C 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 07F40 8083A150 01C17825 */ or $t7, $t6, $at ## $t7 = 20000000 -/* 07F44 8083A154 10000063 */ beq $zero, $zero, .L8083A2E4 -/* 07F48 8083A158 AE0F067C */ sw $t7, 0x067C($s0) ## 0000067C -.L8083A15C: -/* 07F4C 8083A15C 24010092 */ addiu $at, $zero, 0x0092 ## $at = 00000092 -/* 07F50 8083A160 1441000D */ bne $v0, $at, .L8083A198 -/* 07F54 8083A164 8FA40028 */ lw $a0, 0x0028($sp) -/* 07F58 8083A168 3C068084 */ lui $a2, %hi(func_80846120) ## $a2 = 80840000 -/* 07F5C 8083A16C 24C66120 */ addiu $a2, $a2, %lo(func_80846120) ## $a2 = 80846120 -/* 07F60 8083A170 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07F64 8083A174 0C20D716 */ jal func_80835C58 -/* 07F68 8083A178 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 07F6C 8083A17C 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 07F70 8083A180 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 07F74 8083A184 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 07F78 8083A188 0301C825 */ or $t9, $t8, $at ## $t9 = 20000000 -/* 07F7C 8083A18C AE19067C */ sw $t9, 0x067C($s0) ## 0000067C -/* 07F80 8083A190 10000049 */ beq $zero, $zero, .L8083A2B8 -/* 07F84 8083A194 24C62F98 */ addiu $a2, $a2, 0x2F98 ## $a2 = 04002F98 -.L8083A198: -/* 07F88 8083A198 2401014E */ addiu $at, $zero, 0x014E ## $at = 0000014E -/* 07F8C 8083A19C 5441000F */ bnel $v0, $at, .L8083A1DC -/* 07F90 8083A1A0 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C -/* 07F94 8083A1A4 8469001C */ lh $t1, 0x001C($v1) ## 0000001C -/* 07F98 8083A1A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 07F9C 8083A1AC 8FA40028 */ lw $a0, 0x0028($sp) -/* 07FA0 8083A1B0 312A000F */ andi $t2, $t1, 0x000F ## $t2 = 00000000 -/* 07FA4 8083A1B4 15410008 */ bne $t2, $at, .L8083A1D8 -/* 07FA8 8083A1B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07FAC 8083A1BC 3C068084 */ lui $a2, %hi(func_80846260) ## $a2 = 80840000 -/* 07FB0 8083A1C0 24C66260 */ addiu $a2, $a2, %lo(func_80846260) ## $a2 = 80846260 -/* 07FB4 8083A1C4 0C20D716 */ jal func_80835C58 -/* 07FB8 8083A1C8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 07FBC 8083A1CC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 07FC0 8083A1D0 10000039 */ beq $zero, $zero, .L8083A2B8 -/* 07FC4 8083A1D4 24C632B0 */ addiu $a2, $a2, 0x32B0 ## $a2 = 040032B0 -.L8083A1D8: -/* 07FC8 8083A1D8 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C -.L8083A1DC: -/* 07FCC 8083A1DC 10410003 */ beq $v0, $at, .L8083A1EC -/* 07FD0 8083A1E0 24010125 */ addiu $at, $zero, 0x0125 ## $at = 00000125 -/* 07FD4 8083A1E4 14410029 */ bne $v0, $at, .L8083A28C -/* 07FD8 8083A1E8 00000000 */ nop -.L8083A1EC: -/* 07FDC 8083A1EC 0C023C0D */ jal func_8008F034 -/* 07FE0 8083A1F0 AFA30024 */ sw $v1, 0x0024($sp) -/* 07FE4 8083A1F4 1C400025 */ bgtz $v0, .L8083A28C -/* 07FE8 8083A1F8 8FA30024 */ lw $v1, 0x0024($sp) -/* 07FEC 8083A1FC 3C068084 */ lui $a2, %hi(func_80846408) ## $a2 = 80840000 -/* 07FF0 8083A200 24C66408 */ addiu $a2, $a2, %lo(func_80846408) ## $a2 = 80846408 -/* 07FF4 8083A204 8FA40028 */ lw $a0, 0x0028($sp) -/* 07FF8 8083A208 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07FFC 8083A20C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08000 8083A210 0C20D716 */ jal func_80835C58 -/* 08004 8083A214 AFA30024 */ sw $v1, 0x0024($sp) -/* 08008 8083A218 8FA30024 */ lw $v1, 0x0024($sp) -/* 0800C 8083A21C 0C01DE1C */ jal Math_Sins - ## sins? -/* 08010 8083A220 8464008A */ lh $a0, 0x008A($v1) ## 0000008A -/* 08014 8083A224 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 08018 8083A228 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 0801C 8083A22C 8FA30024 */ lw $v1, 0x0024($sp) -/* 08020 8083A230 46040182 */ mul.s $f6, $f0, $f4 -/* 08024 8083A234 C4680024 */ lwc1 $f8, 0x0024($v1) ## 00000024 -/* 08028 8083A238 46083280 */ add.s $f10, $f6, $f8 -/* 0802C 8083A23C E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 08030 8083A240 0C01DE0D */ jal Math_Coss - ## coss? -/* 08034 8083A244 8464008A */ lh $a0, 0x008A($v1) ## 0000008A -/* 08038 8083A248 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0803C 8083A24C 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 08040 8083A250 8FA30024 */ lw $v1, 0x0024($sp) -/* 08044 8083A254 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 08048 8083A258 46100482 */ mul.s $f18, $f0, $f16 -/* 0804C 8083A25C C464002C */ lwc1 $f4, 0x002C($v1) ## 0000002C -/* 08050 8083A260 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 08054 8083A264 24C63060 */ addiu $a2, $a2, 0x3060 ## $a2 = 04003060 -/* 08058 8083A268 46049180 */ add.s $f6, $f18, $f4 -/* 0805C 8083A26C E606002C */ swc1 $f6, 0x002C($s0) ## 0000002C -/* 08060 8083A270 8462008A */ lh $v0, 0x008A($v1) ## 0000008A -/* 08064 8083A274 00411021 */ addu $v0, $v0, $at -/* 08068 8083A278 00021400 */ sll $v0, $v0, 16 -/* 0806C 8083A27C 00021403 */ sra $v0, $v0, 16 -/* 08070 8083A280 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 08074 8083A284 1000000C */ beq $zero, $zero, .L8083A2B8 -/* 08078 8083A288 A602083C */ sh $v0, 0x083C($s0) ## 0000083C -.L8083A28C: -/* 0807C 8083A28C 3C068084 */ lui $a2, %hi(func_80846050) ## $a2 = 80840000 -/* 08080 8083A290 24C66050 */ addiu $a2, $a2, %lo(func_80846050) ## $a2 = 80846050 -/* 08084 8083A294 8FA40028 */ lw $a0, 0x0028($sp) -/* 08088 8083A298 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0808C 8083A29C 0C20D716 */ jal func_80835C58 -/* 08090 8083A2A0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08094 8083A2A4 920B015B */ lbu $t3, 0x015B($s0) ## 0000015B -/* 08098 8083A2A8 3C068085 */ lui $a2, %hi(D_80853A4C) ## $a2 = 80850000 -/* 0809C 8083A2AC 000B6080 */ sll $t4, $t3, 2 -/* 080A0 8083A2B0 00CC3021 */ addu $a2, $a2, $t4 -/* 080A4 8083A2B4 8CC63A4C */ lw $a2, %lo(D_80853A4C)($a2) -.L8083A2B8: -/* 080A8 8083A2B8 8FA40028 */ lw $a0, 0x0028($sp) -/* 080AC 8083A2BC 0C20C899 */ jal func_80832264 -/* 080B0 8083A2C0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 080B4 8083A2C4 10000008 */ beq $zero, $zero, .L8083A2E8 -/* 080B8 8083A2C8 8FBF001C */ lw $ra, 0x001C($sp) -.L8083A2CC: -/* 080BC 8083A2CC 0C20E7E4 */ jal func_80839F90 -/* 080C0 8083A2D0 8FA50028 */ lw $a1, 0x0028($sp) -/* 080C4 8083A2D4 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C -/* 080C8 8083A2D8 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 080CC 8083A2DC 01A17024 */ and $t6, $t5, $at -/* 080D0 8083A2E0 AE0E067C */ sw $t6, 0x067C($s0) ## 0000067C -.L8083A2E4: -/* 080D4 8083A2E4 8FBF001C */ lw $ra, 0x001C($sp) -.L8083A2E8: -/* 080D8 8083A2E8 8FB00018 */ lw $s0, 0x0018($sp) -/* 080DC 8083A2EC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 080E0 8083A2F0 03E00008 */ jr $ra -/* 080E4 8083A2F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A2F8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A2F8.s deleted file mode 100644 index d638233def..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A2F8.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8083A2F8 -/* 080E8 8083A2F8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 080EC 8083A2FC AFBF001C */ sw $ra, 0x001C($sp) -/* 080F0 8083A300 AFB00018 */ sw $s0, 0x0018($sp) -/* 080F4 8083A304 3C068085 */ lui $a2, %hi(func_8084B530) ## $a2 = 80850000 -/* 080F8 8083A308 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 080FC 8083A30C AFA40020 */ sw $a0, 0x0020($sp) -/* 08100 8083A310 24C6B530 */ addiu $a2, $a2, %lo(func_8084B530) ## $a2 = 8084B530 -/* 08104 8083A314 0C20D76B */ jal func_80835DAC -/* 08108 8083A318 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0810C 8083A31C 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 08110 8083A320 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E -/* 08114 8083A324 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 08118 8083A328 34210040 */ ori $at, $at, 0x0040 ## $at = 20000040 -/* 0811C 8083A32C 01C17825 */ or $t7, $t6, $at ## $t7 = 20000040 -/* 08120 8083A330 10A00006 */ beq $a1, $zero, .L8083A34C -/* 08124 8083A334 AE0F067C */ sw $t7, 0x067C($s0) ## 0000067C -/* 08128 8083A338 8FA40020 */ lw $a0, 0x0020($sp) -/* 0812C 8083A33C 0C042DA0 */ jal func_8010B680 -/* 08130 8083A340 8E060694 */ lw $a2, 0x0694($s0) ## 00000694 -/* 08134 8083A344 8E180694 */ lw $t8, 0x0694($s0) ## 00000694 -/* 08138 8083A348 AE180664 */ sw $t8, 0x0664($s0) ## 00000664 -.L8083A34C: -/* 0813C 8083A34C 8FBF001C */ lw $ra, 0x001C($sp) -/* 08140 8083A350 8FB00018 */ lw $s0, 0x0018($sp) -/* 08144 8083A354 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 08148 8083A358 03E00008 */ jr $ra -/* 0814C 8083A35C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A360.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A360.s deleted file mode 100644 index 7cf2cb33e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A360.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8083A360 -/* 08150 8083A360 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 08154 8083A364 AFBF0014 */ sw $ra, 0x0014($sp) -/* 08158 8083A368 3C068085 */ lui $a2, %hi(func_8084CC98) ## $a2 = 80850000 -/* 0815C 8083A36C 24C6CC98 */ addiu $a2, $a2, %lo(func_8084CC98) ## $a2 = 8084CC98 -/* 08160 8083A370 0C20D76B */ jal func_80835DAC -/* 08164 8083A374 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08168 8083A378 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0816C 8083A37C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 08170 8083A380 03E00008 */ jr $ra -/* 08174 8083A384 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A388.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A388.s deleted file mode 100644 index 48b3c28da2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A388.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8083A388 -/* 08178 8083A388 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0817C 8083A38C AFBF0014 */ sw $ra, 0x0014($sp) -/* 08180 8083A390 3C068085 */ lui $a2, %hi(func_8084B78C) ## $a2 = 80850000 -/* 08184 8083A394 24C6B78C */ addiu $a2, $a2, %lo(func_8084B78C) ## $a2 = 8084B78C -/* 08188 8083A398 0C20D716 */ jal func_80835C58 -/* 0818C 8083A39C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08190 8083A3A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 08194 8083A3A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 08198 8083A3A8 03E00008 */ jr $ra -/* 0819C 8083A3AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A3B0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A3B0.s deleted file mode 100644 index bc35ac5390..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A3B0.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8083A3B0 -/* 081A0 8083A3B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 081A4 8083A3B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 081A8 8083A3B8 84AE0850 */ lh $t6, 0x0850($a1) ## 00000850 -/* 081AC 8083A3BC 3C068085 */ lui $a2, %hi(func_8084BF1C) ## $a2 = 80850000 -/* 081B0 8083A3C0 24C6BF1C */ addiu $a2, $a2, %lo(func_8084BF1C) ## $a2 = 8084BF1C -/* 081B4 8083A3C4 AFAE001C */ sw $t6, 0x001C($sp) -/* 081B8 8083A3C8 80AF084F */ lb $t7, 0x084F($a1) ## 0000084F -/* 081BC 8083A3CC AFA50024 */ sw $a1, 0x0024($sp) -/* 081C0 8083A3D0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 081C4 8083A3D4 0C20D76B */ jal func_80835DAC -/* 081C8 8083A3D8 AFAF0018 */ sw $t7, 0x0018($sp) -/* 081CC 8083A3DC 8FA50024 */ lw $a1, 0x0024($sp) -/* 081D0 8083A3E0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 081D4 8083A3E4 00000000 */ nop -/* 081D8 8083A3E8 E4A40060 */ swc1 $f4, 0x0060($a1) ## 00000060 -/* 081DC 8083A3EC 8FB8001C */ lw $t8, 0x001C($sp) -/* 081E0 8083A3F0 A4B80850 */ sh $t8, 0x0850($a1) ## 00000850 -/* 081E4 8083A3F4 8FB90018 */ lw $t9, 0x0018($sp) -/* 081E8 8083A3F8 A0B9084F */ sb $t9, 0x084F($a1) ## 0000084F -/* 081EC 8083A3FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 081F0 8083A400 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 081F4 8083A404 03E00008 */ jr $ra -/* 081F8 8083A408 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A40C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A40C.s deleted file mode 100644 index 4ea2297e37..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A40C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8083A40C -/* 081FC 8083A40C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 08200 8083A410 AFBF0014 */ sw $ra, 0x0014($sp) -/* 08204 8083A414 3C068085 */ lui $a2, %hi(func_8084C760) ## $a2 = 80850000 -/* 08208 8083A418 24C6C760 */ addiu $a2, $a2, %lo(func_8084C760) ## $a2 = 8084C760 -/* 0820C 8083A41C 0C20D76B */ jal func_80835DAC -/* 08210 8083A420 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08214 8083A424 8FBF0014 */ lw $ra, 0x0014($sp) -/* 08218 8083A428 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0821C 8083A42C 03E00008 */ jr $ra -/* 08220 8083A430 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A434.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A434.s deleted file mode 100644 index 6b652404b6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A434.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_8083A434 -/* 08224 8083A434 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 08228 8083A438 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0822C 8083A43C 3C068085 */ lui $a2, %hi(func_8084E6D4) ## $a2 = 80850000 -/* 08230 8083A440 24C6E6D4 */ addiu $a2, $a2, %lo(func_8084E6D4) ## $a2 = 8084E6D4 -/* 08234 8083A444 AFA5001C */ sw $a1, 0x001C($sp) -/* 08238 8083A448 0C20D76B */ jal func_80835DAC -/* 0823C 8083A44C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08240 8083A450 8FA5001C */ lw $a1, 0x001C($sp) -/* 08244 8083A454 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 08248 8083A458 34210400 */ ori $at, $at, 0x0400 ## $at = 20000400 -/* 0824C 8083A45C 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C -/* 08250 8083A460 80A20434 */ lb $v0, 0x0434($a1) ## 00000434 -/* 08254 8083A464 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 08258 8083A468 01C17825 */ or $t7, $t6, $at ## $t7 = 20000400 -/* 0825C 8083A46C 2401004F */ addiu $at, $zero, 0x004F ## $at = 0000004F -/* 08260 8083A470 14410003 */ bne $v0, $at, .L8083A480 -/* 08264 8083A474 ACAF067C */ sw $t7, 0x067C($a1) ## 0000067C -/* 08268 8083A478 10000007 */ beq $zero, $zero, .L8083A498 -/* 0826C 8083A47C A4B80850 */ sh $t8, 0x0850($a1) ## 00000850 -.L8083A480: -/* 08270 8083A480 04400004 */ bltz $v0, .L8083A494 -/* 08274 8083A484 00024023 */ subu $t0, $zero, $v0 -/* 08278 8083A488 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0827C 8083A48C 10000002 */ beq $zero, $zero, .L8083A498 -/* 08280 8083A490 A4B90850 */ sh $t9, 0x0850($a1) ## 00000850 -.L8083A494: -/* 08284 8083A494 A0A80434 */ sb $t0, 0x0434($a1) ## 00000434 -.L8083A498: -/* 08288 8083A498 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0828C 8083A49C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 08290 8083A4A0 03E00008 */ jr $ra -/* 08294 8083A4A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A4A8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A4A8.s deleted file mode 100644 index 9f4586dd52..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A4A8.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_8083A4A8 -/* 08298 8083A4A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0829C 8083A4AC AFBF001C */ sw $ra, 0x001C($sp) -/* 082A0 8083A4B0 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 082A4 8083A4B4 848E083C */ lh $t6, 0x083C($a0) ## 0000083C -/* 082A8 8083A4B8 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 082AC 8083A4BC 240A6814 */ addiu $t2, $zero, 0x6814 ## $t2 = 00006814 -/* 082B0 8083A4C0 01CF1023 */ subu $v0, $t6, $t7 -/* 082B4 8083A4C4 00021400 */ sll $v0, $v0, 16 -/* 082B8 8083A4C8 00021403 */ sra $v0, $v0, 16 -/* 082BC 8083A4CC 04400003 */ bltz $v0, .L8083A4DC -/* 082C0 8083A4D0 00021823 */ subu $v1, $zero, $v0 -/* 082C4 8083A4D4 10000001 */ beq $zero, $zero, .L8083A4DC -/* 082C8 8083A4D8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L8083A4DC: -/* 082CC 8083A4DC 28611000 */ slti $at, $v1, 0x1000 -/* 082D0 8083A4E0 1020000B */ beq $at, $zero, .L8083A510 -/* 082D4 8083A4E4 3C028016 */ lui $v0, %hi(gGameInfo) -/* 082D8 8083A4E8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 082DC 8083A4EC 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 -/* 082E0 8083A4F0 C4800838 */ lwc1 $f0, 0x0838($a0) ## 00000838 -/* 082E4 8083A4F4 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 082E8 8083A4F8 4600203C */ c.lt.s $f4, $f0 -/* 082EC 8083A4FC 00000000 */ nop -/* 082F0 8083A500 45000003 */ bc1f .L8083A510 -/* 082F4 8083A504 00000000 */ nop -/* 082F8 8083A508 10000004 */ beq $zero, $zero, .L8083A51C -/* 082FC 8083A50C 24A53148 */ addiu $a1, $a1, 0x3148 ## $a1 = 04003148 -.L8083A510: -/* 08300 8083A510 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 08304 8083A514 24A52FE0 */ addiu $a1, $a1, 0x2FE0 ## $a1 = 04002FE0 -/* 08308 8083A518 C4800838 */ lwc1 $f0, 0x0838($a0) ## 00000838 -.L8083A51C: -/* 0830C 8083A51C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 08310 8083A520 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 08314 8083A524 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 08318 8083A528 84580758 */ lh $t8, 0x0758($v0) ## 80160758 -/* 0831C 8083A52C 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 08320 8083A530 00000000 */ nop -/* 08324 8083A534 46803220 */ cvt.s.w $f8, $f6 -/* 08328 8083A538 460C4283 */ div.s $f10, $f8, $f12 -/* 0832C 8083A53C 4600503C */ c.lt.s $f10, $f0 -/* 08330 8083A540 00000000 */ nop -/* 08334 8083A544 45020008 */ bc1fl .L8083A568 -/* 08338 8083A548 8448075E */ lh $t0, 0x075E($v0) ## 8016075E -/* 0833C 8083A54C 8459075A */ lh $t9, 0x075A($v0) ## 8016075A -/* 08340 8083A550 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 08344 8083A554 00000000 */ nop -/* 08348 8083A558 468084A0 */ cvt.s.w $f18, $f16 -/* 0834C 8083A55C 1000000D */ beq $zero, $zero, .L8083A594 -/* 08350 8083A560 460C9083 */ div.s $f2, $f18, $f12 -/* 08354 8083A564 8448075E */ lh $t0, 0x075E($v0) ## 8016075E -.L8083A568: -/* 08358 8083A568 8449075C */ lh $t1, 0x075C($v0) ## 8016075C -/* 0835C 8083A56C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 08360 8083A570 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 08364 8083A574 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 08368 8083A578 44815000 */ mtc1 $at, $f10 ## $f10 = 1000.00 -/* 0836C 8083A57C 468021A0 */ cvt.s.w $f6, $f4 -/* 08370 8083A580 46809120 */ cvt.s.w $f4, $f18 -/* 08374 8083A584 46003202 */ mul.s $f8, $f6, $f0 -/* 08378 8083A588 460C2183 */ div.s $f6, $f4, $f12 -/* 0837C 8083A58C 460A4403 */ div.s $f16, $f8, $f10 -/* 08380 8083A590 46068080 */ add.s $f2, $f16, $f6 -.L8083A594: -/* 08384 8083A594 44061000 */ mfc1 $a2, $f2 -/* 08388 8083A598 AFAA0010 */ sw $t2, 0x0010($sp) -/* 0838C 8083A59C 0C20E250 */ jal func_80838940 -/* 08390 8083A5A0 AFA40020 */ sw $a0, 0x0020($sp) -/* 08394 8083A5A4 8FA40020 */ lw $a0, 0x0020($sp) -/* 08398 8083A5A8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0839C 8083A5AC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 083A0 8083A5B0 A48B0850 */ sh $t3, 0x0850($a0) ## 00000850 -/* 083A4 8083A5B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 083A8 8083A5B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 083AC 8083A5BC 03E00008 */ jr $ra -/* 083B0 8083A5C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A5C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A5C4.s deleted file mode 100644 index 88d32b150f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A5C4.s +++ /dev/null @@ -1,65 +0,0 @@ -.late_rodata -glabel D_80855384 - .word 0x38000100 - -.text -glabel func_8083A5C4 -/* 083B4 8083A5C4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 083B8 8083A5C8 AFBF001C */ sw $ra, 0x001C($sp) -/* 083BC 8083A5CC AFB00018 */ sw $s0, 0x0018($sp) -/* 083C0 8083A5D0 AFA40028 */ sw $a0, 0x0028($sp) -/* 083C4 8083A5D4 AFA60030 */ sw $a2, 0x0030($sp) -/* 083C8 8083A5D8 AFA70034 */ sw $a3, 0x0034($sp) -/* 083CC 8083A5DC 84CF0008 */ lh $t7, 0x0008($a2) ## 00000008 -/* 083D0 8083A5E0 3C018085 */ lui $at, %hi(D_80855384) ## $at = 80850000 -/* 083D4 8083A5E4 C4205384 */ lwc1 $f0, %lo(D_80855384)($at) -/* 083D8 8083A5E8 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 083DC 8083A5EC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 083E0 8083A5F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 083E4 8083A5F4 468021A0 */ cvt.s.w $f6, $f4 -/* 083E8 8083A5F8 46003202 */ mul.s $f8, $f6, $f0 -/* 083EC 8083A5FC E7A80024 */ swc1 $f8, 0x0024($sp) -/* 083F0 8083A600 84D8000C */ lh $t8, 0x000C($a2) ## 0000000C -/* 083F4 8083A604 3C068085 */ lui $a2, %hi(func_8084BBE4) ## $a2 = 80850000 -/* 083F8 8083A608 24C6BBE4 */ addiu $a2, $a2, %lo(func_8084BBE4) ## $a2 = 8084BBE4 -/* 083FC 8083A60C 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 08400 8083A610 00000000 */ nop -/* 08404 8083A614 46805420 */ cvt.s.w $f16, $f10 -/* 08408 8083A618 46008482 */ mul.s $f18, $f16, $f0 -/* 0840C 8083A61C 0C20D716 */ jal func_80835C58 -/* 08410 8083A620 E7B20020 */ swc1 $f18, 0x0020($sp) -/* 08414 8083A624 8FA40028 */ lw $a0, 0x0028($sp) -/* 08418 8083A628 0C20C959 */ jal func_80832564 -/* 0841C 8083A62C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08420 8083A630 8FA40028 */ lw $a0, 0x0028($sp) -/* 08424 8083A634 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08428 8083A638 0C20C899 */ jal func_80832264 -/* 0842C 8083A63C 8FA60038 */ lw $a2, 0x0038($sp) -/* 08430 8083A640 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 08434 8083A644 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 08438 8083A648 C7A40034 */ lwc1 $f4, 0x0034($sp) -/* 0843C 8083A64C C7AE0024 */ lwc1 $f14, 0x0024($sp) -/* 08440 8083A650 C7AC0020 */ lwc1 $f12, 0x0020($sp) -/* 08444 8083A654 46062000 */ add.s $f0, $f4, $f6 -/* 08448 8083A658 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 0844C 8083A65C C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 08450 8083A660 460E0282 */ mul.s $f10, $f0, $f14 -/* 08454 8083A664 00000000 */ nop -/* 08458 8083A668 460C0102 */ mul.s $f4, $f0, $f12 -/* 0845C 8083A66C 460A4401 */ sub.s $f16, $f8, $f10 -/* 08460 8083A670 46049181 */ sub.s $f6, $f18, $f4 -/* 08464 8083A674 E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 -/* 08468 8083A678 0C034199 */ jal atan2s - -/* 0846C 8083A67C E606002C */ swc1 $f6, 0x002C($s0) ## 0000002C -/* 08470 8083A680 A602083C */ sh $v0, 0x083C($s0) ## 0000083C -/* 08474 8083A684 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 08478 8083A688 0C20C889 */ jal func_80832224 -/* 0847C 8083A68C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08480 8083A690 0C20CB3F */ jal func_80832CFC -/* 08484 8083A694 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08488 8083A698 8FBF001C */ lw $ra, 0x001C($sp) -/* 0848C 8083A69C 8FB00018 */ lw $s0, 0x0018($sp) -/* 08490 8083A6A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 08494 8083A6A4 03E00008 */ jr $ra -/* 08498 8083A6A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A6AC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A6AC.s deleted file mode 100644 index e07f49bee7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A6AC.s +++ /dev/null @@ -1,212 +0,0 @@ -.late_rodata -glabel D_80855388 - .word 0x38000100 - -.text -glabel func_8083A6AC -/* 0849C 8083A6AC 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 084A0 8083A6B0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 084A4 8083A6B4 AFB00030 */ sw $s0, 0x0030($sp) -/* 084A8 8083A6B8 AFA5008C */ sw $a1, 0x008C($sp) -/* 084AC 8083A6BC 3C01C2A0 */ lui $at, 0xC2A0 ## $at = C2A00000 -/* 084B0 8083A6C0 44813000 */ mtc1 $at, $f6 ## $f6 = -80.00 -/* 084B4 8083A6C4 C4840084 */ lwc1 $f4, 0x0084($a0) ## 00000084 -/* 084B8 8083A6C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 084BC 8083A6CC 4606203C */ c.lt.s $f4, $f6 -/* 084C0 8083A6D0 00000000 */ nop -/* 084C4 8083A6D4 450200B3 */ bc1fl .L8083A9A4 -/* 084C8 8083A6D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 084CC 8083A6DC 84830898 */ lh $v1, 0x0898($a0) ## 00000898 -/* 084D0 8083A6E0 04600003 */ bltz $v1, .L8083A6F0 -/* 084D4 8083A6E4 00031023 */ subu $v0, $zero, $v1 -/* 084D8 8083A6E8 10000001 */ beq $zero, $zero, .L8083A6F0 -/* 084DC 8083A6EC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L8083A6F0: -/* 084E0 8083A6F0 28410AAA */ slti $at, $v0, 0x0AAA -/* 084E4 8083A6F4 502000AB */ beql $at, $zero, .L8083A9A4 -/* 084E8 8083A6F8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 084EC 8083A6FC 8602089A */ lh $v0, 0x089A($s0) ## 0000089A -/* 084F0 8083A700 04400003 */ bltz $v0, .L8083A710 -/* 084F4 8083A704 00021823 */ subu $v1, $zero, $v0 -/* 084F8 8083A708 10000001 */ beq $zero, $zero, .L8083A710 -/* 084FC 8083A70C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L8083A710: -/* 08500 8083A710 28610AAA */ slti $at, $v1, 0x0AAA -/* 08504 8083A714 502000A3 */ beql $at, $zero, .L8083A9A4 -/* 08508 8083A718 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0850C 8083A71C C6080100 */ lwc1 $f8, 0x0100($s0) ## 00000100 -/* 08510 8083A720 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 08514 8083A724 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 08518 8083A728 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0851C 8083A72C 460A4401 */ sub.s $f16, $f8, $f10 -/* 08520 8083A730 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 08524 8083A734 E7B00074 */ swc1 $f16, 0x0074($sp) -/* 08528 8083A738 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 0852C 8083A73C C6120108 */ lwc1 $f18, 0x0108($s0) ## 00000108 -/* 08530 8083A740 C7A80074 */ lwc1 $f8, 0x0074($sp) -/* 08534 8083A744 46049181 */ sub.s $f6, $f18, $f4 -/* 08538 8083A748 46084282 */ mul.s $f10, $f8, $f8 -/* 0853C 8083A74C C7A80074 */ lwc1 $f8, 0x0074($sp) -/* 08540 8083A750 E7A6007C */ swc1 $f6, 0x007C($sp) -/* 08544 8083A754 C7B0007C */ lwc1 $f16, 0x007C($sp) -/* 08548 8083A758 46108482 */ mul.s $f18, $f16, $f16 -/* 0854C 8083A75C 46125000 */ add.s $f0, $f10, $f18 -/* 08550 8083A760 46000004 */ sqrt.s $f0, $f0 -/* 08554 8083A764 460C0032 */ c.eq.s $f0, $f12 -/* 08558 8083A768 00000000 */ nop -/* 0855C 8083A76C 45030005 */ bc1tl .L8083A784 -/* 08560 8083A770 46006086 */ mov.s $f2, $f12 -/* 08564 8083A774 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 08568 8083A778 10000002 */ beq $zero, $zero, .L8083A784 -/* 0856C 8083A77C 46002083 */ div.s $f2, $f4, $f0 -/* 08570 8083A780 46006086 */ mov.s $f2, $f12 -.L8083A784: -/* 08574 8083A784 46024402 */ mul.s $f16, $f8, $f2 -/* 08578 8083A788 C6060100 */ lwc1 $f6, 0x0100($s0) ## 00000100 -/* 0857C 8083A78C C7A8007C */ lwc1 $f8, 0x007C($sp) -/* 08580 8083A790 8FA4008C */ lw $a0, 0x008C($sp) -/* 08584 8083A794 27AE0084 */ addiu $t6, $sp, 0x0084 ## $t6 = FFFFFFFC -/* 08588 8083A798 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0858C 8083A79C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 08590 8083A7A0 46103280 */ add.s $f10, $f6, $f16 -/* 08594 8083A7A4 46024182 */ mul.s $f6, $f8, $f2 -/* 08598 8083A7A8 27B90080 */ addiu $t9, $sp, 0x0080 ## $t9 = FFFFFFF8 -/* 0859C 8083A7AC 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 085A0 8083A7B0 E7AA0074 */ swc1 $f10, 0x0074($sp) -/* 085A4 8083A7B4 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 085A8 8083A7B8 27A60074 */ addiu $a2, $sp, 0x0074 ## $a2 = FFFFFFEC -/* 085AC 8083A7BC 27A70068 */ addiu $a3, $sp, 0x0068 ## $a3 = FFFFFFE0 -/* 085B0 8083A7C0 E7B20078 */ swc1 $f18, 0x0078($sp) -/* 085B4 8083A7C4 C6040108 */ lwc1 $f4, 0x0108($s0) ## 00000108 -/* 085B8 8083A7C8 AFA50040 */ sw $a1, 0x0040($sp) -/* 085BC 8083A7CC AFA40044 */ sw $a0, 0x0044($sp) -/* 085C0 8083A7D0 46062400 */ add.s $f16, $f4, $f6 -/* 085C4 8083A7D4 AFB90024 */ sw $t9, 0x0024($sp) -/* 085C8 8083A7D8 AFB80020 */ sw $t8, 0x0020($sp) -/* 085CC 8083A7DC AFA0001C */ sw $zero, 0x001C($sp) -/* 085D0 8083A7E0 E7B0007C */ swc1 $f16, 0x007C($sp) -/* 085D4 8083A7E4 AFA00018 */ sw $zero, 0x0018($sp) -/* 085D8 8083A7E8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 085DC 8083A7EC 0C00F7A1 */ jal func_8003DE84 -/* 085E0 8083A7F0 AFAE0010 */ sw $t6, 0x0010($sp) -/* 085E4 8083A7F4 1040006A */ beq $v0, $zero, .L8083A9A0 -/* 085E8 8083A7F8 8FA50040 */ lw $a1, 0x0040($sp) -/* 085EC 8083A7FC 8FA80084 */ lw $t0, 0x0084($sp) -/* 085F0 8083A800 8503000A */ lh $v1, 0x000A($t0) ## 0000000A -/* 085F4 8083A804 04600003 */ bltz $v1, .L8083A814 -/* 085F8 8083A808 00031023 */ subu $v0, $zero, $v1 -/* 085FC 8083A80C 10000001 */ beq $zero, $zero, .L8083A814 -/* 08600 8083A810 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L8083A814: -/* 08604 8083A814 28410258 */ slti $at, $v0, 0x0258 -/* 08608 8083A818 50200062 */ beql $at, $zero, .L8083A9A4 -/* 0860C 8083A81C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 08610 8083A820 8FA90084 */ lw $t1, 0x0084($sp) -/* 08614 8083A824 44834000 */ mtc1 $v1, $f8 ## $f8 = 0.00 -/* 08618 8083A828 3C018085 */ lui $at, %hi(D_80855388) ## $at = 80850000 -/* 0861C 8083A82C 852A0008 */ lh $t2, 0x0008($t1) ## 00000008 -/* 08620 8083A830 852B000C */ lh $t3, 0x000C($t1) ## 0000000C -/* 08624 8083A834 46804120 */ cvt.s.w $f4, $f8 -/* 08628 8083A838 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 0862C 8083A83C C4225388 */ lwc1 $f2, %lo(D_80855388)($at) -/* 08630 8083A840 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 08634 8083A844 852C000E */ lh $t4, 0x000E($t1) ## 0000000E -/* 08638 8083A848 468054A0 */ cvt.s.w $f18, $f10 -/* 0863C 8083A84C AFA50010 */ sw $a1, 0x0010($sp) -/* 08640 8083A850 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 08644 8083A854 46803420 */ cvt.s.w $f16, $f6 -/* 08648 8083A858 46029302 */ mul.s $f12, $f18, $f2 -/* 0864C 8083A85C 00000000 */ nop -/* 08650 8083A860 46022382 */ mul.s $f14, $f4, $f2 -/* 08654 8083A864 00000000 */ nop -/* 08658 8083A868 46028002 */ mul.s $f0, $f16, $f2 -/* 0865C 8083A86C 468052A0 */ cvt.s.w $f10, $f10 -/* 08660 8083A870 44060000 */ mfc1 $a2, $f0 -/* 08664 8083A874 44075000 */ mfc1 $a3, $f10 -/* 08668 8083A878 0C03328F */ jal Math3D_UDistPlaneToPos -/* 0866C 8083A87C 00000000 */ nop -/* 08670 8083A880 3C038085 */ lui $v1, %hi(D_80853604) ## $v1 = 80850000 -/* 08674 8083A884 8C633604 */ lw $v1, %lo(D_80853604)($v1) -/* 08678 8083A888 46000086 */ mov.s $f2, $f0 -/* 0867C 8083A88C 8FA40044 */ lw $a0, 0x0044($sp) -/* 08680 8083A890 38630006 */ xori $v1, $v1, 0x0006 ## $v1 = 80850006 -/* 08684 8083A894 2C630001 */ sltiu $v1, $v1, 0x0001 -/* 08688 8083A898 1460000A */ bne $v1, $zero, .L8083A8C4 -/* 0868C 8083A89C 8FA50084 */ lw $a1, 0x0084($sp) -/* 08690 8083A8A0 8FA60080 */ lw $a2, 0x0080($sp) -/* 08694 8083A8A4 AFA30050 */ sw $v1, 0x0050($sp) -/* 08698 8083A8A8 0C01076E */ jal func_80041DB8 -/* 0869C 8083A8AC E7A20054 */ swc1 $f2, 0x0054($sp) -/* 086A0 8083A8B0 304D0008 */ andi $t5, $v0, 0x0008 ## $t5 = 00000000 -/* 086A4 8083A8B4 8FA30050 */ lw $v1, 0x0050($sp) -/* 086A8 8083A8B8 11A00002 */ beq $t5, $zero, .L8083A8C4 -/* 086AC 8083A8BC C7A20054 */ lwc1 $f2, 0x0054($sp) -/* 086B0 8083A8C0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L8083A8C4: -/* 086B4 8083A8C4 10600004 */ beq $v1, $zero, .L8083A8D8 -/* 086B8 8083A8C8 8FA4008C */ lw $a0, 0x008C($sp) -/* 086BC 8083A8CC 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 -/* 086C0 8083A8D0 10000003 */ beq $zero, $zero, .L8083A8E0 -/* 086C4 8083A8D4 24422D88 */ addiu $v0, $v0, 0x2D88 ## $v0 = 04002D88 -.L8083A8D8: -/* 086C8 8083A8D8 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 -/* 086CC 8083A8DC 24422F10 */ addiu $v0, $v0, 0x2F10 ## $v0 = 04002F10 -.L8083A8E0: -/* 086D0 8083A8E0 44071000 */ mfc1 $a3, $f2 -/* 086D4 8083A8E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 086D8 8083A8E8 8FA60084 */ lw $a2, 0x0084($sp) -/* 086DC 8083A8EC AFA20010 */ sw $v0, 0x0010($sp) -/* 086E0 8083A8F0 0C20E971 */ jal func_8083A5C4 -/* 086E4 8083A8F4 AFA30050 */ sw $v1, 0x0050($sp) -/* 086E8 8083A8F8 8FA30050 */ lw $v1, 0x0050($sp) -/* 086EC 8083A8FC 8FA4008C */ lw $a0, 0x008C($sp) -/* 086F0 8083A900 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 086F4 8083A904 10600017 */ beq $v1, $zero, .L8083A964 -/* 086F8 8083A908 3C068084 */ lui $a2, %hi(func_8083A3B0) ## $a2 = 80840000 -/* 086FC 8083A90C 24C6A3B0 */ addiu $a2, $a2, %lo(func_8083A3B0) ## $a2 = 8083A3B0 -/* 08700 8083A910 0C20DA26 */ jal func_80836898 -/* 08704 8083A914 AFA30050 */ sw $v1, 0x0050($sp) -/* 08708 8083A918 860E083C */ lh $t6, 0x083C($s0) ## 0000083C -/* 0870C 8083A91C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 08710 8083A920 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 08714 8083A924 01C17821 */ addu $t7, $t6, $at -/* 08718 8083A928 A60F083C */ sh $t7, 0x083C($s0) ## 0000083C -/* 0871C 8083A92C 8618083C */ lh $t8, 0x083C($s0) ## 0000083C -/* 08720 8083A930 3C010020 */ lui $at, 0x0020 ## $at = 00200000 -/* 08724 8083A934 03214025 */ or $t0, $t9, $at ## $t0 = 00200000 -/* 08728 8083A938 AE08067C */ sw $t0, 0x067C($s0) ## 0000067C -/* 0872C 8083A93C A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -/* 08730 8083A940 8FA4008C */ lw $a0, 0x008C($sp) -/* 08734 8083A944 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08738 8083A948 0C20CBD5 */ jal func_80832F54 -/* 0873C 8083A94C 2406009F */ addiu $a2, $zero, 0x009F ## $a2 = 0000009F -/* 08740 8083A950 8FA30050 */ lw $v1, 0x0050($sp) -/* 08744 8083A954 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 08748 8083A958 A60A0850 */ sh $t2, 0x0850($s0) ## 00000850 -/* 0874C 8083A95C 10000008 */ beq $zero, $zero, .L8083A980 -/* 08750 8083A960 A203084F */ sb $v1, 0x084F($s0) ## 0000084F -.L8083A964: -/* 08754 8083A964 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 08758 8083A968 3C01FFFD */ lui $at, 0xFFFD ## $at = FFFD0000 -/* 0875C 8083A96C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFDFFFF -/* 08760 8083A970 35692000 */ ori $t1, $t3, 0x2000 ## $t1 = 00002000 -/* 08764 8083A974 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C -/* 08768 8083A978 01216824 */ and $t5, $t1, $at -/* 0876C 8083A97C AE0D067C */ sw $t5, 0x067C($s0) ## 0000067C -.L8083A980: -/* 08770 8083A980 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08774 8083A984 0C00BDF7 */ jal func_8002F7DC -/* 08778 8083A988 24050830 */ addiu $a1, $zero, 0x0830 ## $a1 = 00000830 -/* 0877C 8083A98C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08780 8083A990 0C20C9A6 */ jal func_80832698 -/* 08784 8083A994 24056803 */ addiu $a1, $zero, 0x6803 ## $a1 = 00006803 -/* 08788 8083A998 10000002 */ beq $zero, $zero, .L8083A9A4 -/* 0878C 8083A99C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083A9A0: -/* 08790 8083A9A0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083A9A4: -/* 08794 8083A9A4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08798 8083A9A8 8FB00030 */ lw $s0, 0x0030($sp) -/* 0879C 8083A9AC 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 087A0 8083A9B0 03E00008 */ jr $ra -/* 087A4 8083A9B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s deleted file mode 100644 index ce0b563fe7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8083A9B8 -/* 087A8 8083A9B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 087AC 8083A9BC AFA40018 */ sw $a0, 0x0018($sp) -/* 087B0 8083A9C0 AFA60020 */ sw $a2, 0x0020($sp) -/* 087B4 8083A9C4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 087B8 8083A9C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 087BC 8083A9CC AFA5001C */ sw $a1, 0x001C($sp) -/* 087C0 8083A9D0 3C068085 */ lui $a2, %hi(func_8084BDFC) ## $a2 = 80850000 -/* 087C4 8083A9D4 24C6BDFC */ addiu $a2, $a2, %lo(func_8084BDFC) ## $a2 = 8084BDFC -/* 087C8 8083A9D8 8FA50018 */ lw $a1, 0x0018($sp) -/* 087CC 8083A9DC 0C20D716 */ jal func_80835C58 -/* 087D0 8083A9E0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 087D4 8083A9E4 8FA50018 */ lw $a1, 0x0018($sp) -/* 087D8 8083A9E8 3C073FA6 */ lui $a3, 0x3FA6 ## $a3 = 3FA60000 -/* 087DC 8083A9EC 34E76666 */ ori $a3, $a3, 0x6666 ## $a3 = 3FA66666 -/* 087E0 8083A9F0 8FA40020 */ lw $a0, 0x0020($sp) -/* 087E4 8083A9F4 8FA6001C */ lw $a2, 0x001C($sp) -/* 087E8 8083A9F8 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop -/* 087EC 8083A9FC 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 087F0 8083AA00 8FBF0014 */ lw $ra, 0x0014($sp) -/* 087F4 8083AA04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 087F8 8083AA08 03E00008 */ jr $ra -/* 087FC 8083AA0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AA10.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AA10.s deleted file mode 100644 index 6b565d79b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AA10.s +++ /dev/null @@ -1,222 +0,0 @@ -glabel func_8083AA10 -/* 08800 8083AA10 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 08804 8083AA14 AFBF0024 */ sw $ra, 0x0024($sp) -/* 08808 8083AA18 AFB00020 */ sw $s0, 0x0020($sp) -/* 0880C 8083AA1C AFA50064 */ sw $a1, 0x0064($sp) -/* 08810 8083AA20 C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 -/* 08814 8083AA24 848F0894 */ lh $t7, 0x0894($a0) ## 00000894 -/* 08818 8083AA28 8C99067C */ lw $t9, 0x067C($a0) ## 0000067C -/* 0881C 8083AA2C 4600218D */ trunc.w.s $f6, $f4 -/* 08820 8083AA30 3C012800 */ lui $at, 0x2800 ## $at = 28000000 -/* 08824 8083AA34 03215824 */ and $t3, $t9, $at -/* 08828 8083AA38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0882C 8083AA3C 44023000 */ mfc1 $v0, $f6 -/* 08830 8083AA40 00000000 */ nop -/* 08834 8083AA44 01E2C023 */ subu $t8, $t7, $v0 -/* 08838 8083AA48 156000BA */ bne $t3, $zero, .L8083AD34 -/* 0883C 8083AA4C A4980896 */ sh $t8, 0x0896($a0) ## 00000896 -/* 08840 8083AA50 948C0088 */ lhu $t4, 0x0088($a0) ## 00000088 -/* 08844 8083AA54 8FA40064 */ lw $a0, 0x0064($sp) -/* 08848 8083AA58 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 0884C 8083AA5C 55A000B6 */ bnel $t5, $zero, .L8083AD38 -/* 08850 8083AA60 A6020894 */ sh $v0, 0x0894($s0) ## 00000894 -/* 08854 8083AA64 0C20E3EE */ jal func_80838FB8 -/* 08858 8083AA68 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0885C 8083AA6C 144000B2 */ bne $v0, $zero, .L8083AD38 -/* 08860 8083AA70 3C0A8085 */ lui $t2, %hi(D_80853604) ## $t2 = 80850000 -/* 08864 8083AA74 254A3604 */ addiu $t2, $t2, %lo(D_80853604) ## $t2 = 80853604 -/* 08868 8083AA78 8D430000 */ lw $v1, 0x0000($t2) ## 80853604 -/* 0886C 8083AA7C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 08870 8083AA80 54610007 */ bnel $v1, $at, .L8083AAA0 -/* 08874 8083AA84 920E0692 */ lbu $t6, 0x0692($s0) ## 00000692 -/* 08878 8083AA88 C6080100 */ lwc1 $f8, 0x0100($s0) ## 00000100 -/* 0887C 8083AA8C C60A0108 */ lwc1 $f10, 0x0108($s0) ## 00000108 -/* 08880 8083AA90 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 08884 8083AA94 100000A8 */ beq $zero, $zero, .L8083AD38 -/* 08888 8083AA98 E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 0888C 8083AA9C 920E0692 */ lbu $t6, 0x0692($s0) ## 00000692 -.L8083AAA0: -/* 08890 8083AAA0 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 08894 8083AAA4 55E000A5 */ bnel $t7, $zero, .L8083AD3C -/* 08898 8083AAA8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0889C 8083AAAC 921801E9 */ lbu $t8, 0x01E9($s0) ## 000001E9 -/* 088A0 8083AAB0 33190080 */ andi $t9, $t8, 0x0080 ## $t9 = 00000000 -/* 088A4 8083AAB4 572000A1 */ bnel $t9, $zero, .L8083AD3C -/* 088A8 8083AAB8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 088AC 8083AABC 8E020674 */ lw $v0, 0x0674($s0) ## 00000674 -/* 088B0 8083AAC0 3C068084 */ lui $a2, %hi(func_8084411C) ## $a2 = 80840000 -/* 088B4 8083AAC4 24C6411C */ addiu $a2, $a2, %lo(func_8084411C) ## $a2 = 8084411C -/* 088B8 8083AAC8 1046009B */ beq $v0, $a2, .L8083AD38 -/* 088BC 8083AACC 3C098084 */ lui $t1, %hi(func_80844A44) ## $t1 = 80840000 -/* 088C0 8083AAD0 25294A44 */ addiu $t1, $t1, %lo(func_80844A44) ## $t1 = 80844A44 -/* 088C4 8083AAD4 10490098 */ beq $v0, $t1, .L8083AD38 -/* 088C8 8083AAD8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 088CC 8083AADC 10610004 */ beq $v1, $at, .L8083AAF0 -/* 088D0 8083AAE0 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 088D4 8083AAE4 820B0843 */ lb $t3, 0x0843($s0) ## 00000843 -/* 088D8 8083AAE8 51600008 */ beql $t3, $zero, .L8083AB0C -/* 088DC 8083AAEC 920C0893 */ lbu $t4, 0x0893($s0) ## 00000893 -.L8083AAF0: -/* 088E0 8083AAF0 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 088E4 8083AAF4 26050100 */ addiu $a1, $s0, 0x0100 ## $a1 = 00000100 -/* 088E8 8083AAF8 0C20C884 */ jal func_80832210 -/* 088EC 8083AAFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 088F0 8083AB00 1000008E */ beq $zero, $zero, .L8083AD3C -/* 088F4 8083AB04 8FBF0024 */ lw $ra, 0x0024($sp) -/* 088F8 8083AB08 920C0893 */ lbu $t4, 0x0893($s0) ## 00000893 -.L8083AB0C: -/* 088FC 8083AB0C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 08900 8083AB10 8FA40064 */ lw $a0, 0x0064($sp) -/* 08904 8083AB14 11800006 */ beq $t4, $zero, .L8083AB30 -/* 08908 8083AB18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0890C 8083AB1C 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 08910 8083AB20 240D0009 */ addiu $t5, $zero, 0x0009 ## $t5 = 00000009 -/* 08914 8083AB24 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 -/* 08918 8083AB28 10000083 */ beq $zero, $zero, .L8083AD38 -/* 0891C 8083AB2C AD4D0000 */ sw $t5, 0x0000($t2) ## 00000000 -.L8083AB30: -/* 08920 8083AB30 860E083C */ lh $t6, 0x083C($s0) ## 0000083C -/* 08924 8083AB34 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 08928 8083AB38 AFA90028 */ sw $t1, 0x0028($sp) -/* 0892C 8083AB3C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 08930 8083AB40 01CF4023 */ subu $t0, $t6, $t7 -/* 08934 8083AB44 00084400 */ sll $t0, $t0, 16 -/* 08938 8083AB48 00084403 */ sra $t0, $t0, 16 -/* 0893C 8083AB4C 0C20D716 */ jal func_80835C58 -/* 08940 8083AB50 AFA8005C */ sw $t0, 0x005C($sp) -/* 08944 8083AB54 8FA40064 */ lw $a0, 0x0064($sp) -/* 08948 8083AB58 0C20C910 */ jal func_80832440 -/* 0894C 8083AB5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08950 8083AB60 96190088 */ lhu $t9, 0x0088($s0) ## 00000088 -/* 08954 8083AB64 96180A82 */ lhu $t8, 0x0A82($s0) ## 00000A82 -/* 08958 8083AB68 8FA8005C */ lw $t0, 0x005C($sp) -/* 0895C 8083AB6C 3C0A8085 */ lui $t2, %hi(D_80853604) ## $t2 = 80850000 -/* 08960 8083AB70 332B0004 */ andi $t3, $t9, 0x0004 ## $t3 = 00000000 -/* 08964 8083AB74 254A3604 */ addiu $t2, $t2, %lo(D_80853604) ## $t2 = 80853604 -/* 08968 8083AB78 11600057 */ beq $t3, $zero, .L8083ACD8 -/* 0896C 8083AB7C A618089E */ sh $t8, 0x089E($s0) ## 0000089E -/* 08970 8083AB80 8E04067C */ lw $a0, 0x067C($s0) ## 0000067C -/* 08974 8083AB84 00046100 */ sll $t4, $a0, 4 -/* 08978 8083AB88 05820054 */ bltzl $t4, .L8083ACDC -/* 0897C 8083AB8C 8D4C0000 */ lw $t4, 0x0000($t2) ## 80853604 -/* 08980 8083AB90 8D430000 */ lw $v1, 0x0000($t2) ## 80853604 -/* 08984 8083AB94 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 08988 8083AB98 1061004F */ beq $v1, $at, .L8083ACD8 -/* 0898C 8083AB9C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 08990 8083ABA0 1061004D */ beq $v1, $at, .L8083ACD8 -/* 08994 8083ABA4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 08998 8083ABA8 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 -/* 0899C 8083ABAC 3C018085 */ lui $at, %hi(D_80853600) ## $at = 80850000 -/* 089A0 8083ABB0 C4243600 */ lwc1 $f4, %lo(D_80853600)($at) -/* 089A4 8083ABB4 4604903C */ c.lt.s $f18, $f4 -/* 089A8 8083ABB8 00000000 */ nop -/* 089AC 8083ABBC 45020047 */ bc1fl .L8083ACDC -/* 089B0 8083ABC0 8D4C0000 */ lw $t4, 0x0000($t2) ## 80853604 -/* 089B4 8083ABC4 820D0843 */ lb $t5, 0x0843($s0) ## 00000843 -/* 089B8 8083ABC8 55A00044 */ bnel $t5, $zero, .L8083ACDC -/* 089BC 8083ABCC 8D4C0000 */ lw $t4, 0x0000($t2) ## 80853604 -/* 089C0 8083ABD0 05000003 */ bltz $t0, .L8083ABE0 -/* 089C4 8083ABD4 00081023 */ subu $v0, $zero, $t0 -/* 089C8 8083ABD8 10000001 */ beq $zero, $zero, .L8083ABE0 -/* 089CC 8083ABDC 01001025 */ or $v0, $t0, $zero ## $v0 = 00000000 -.L8083ABE0: -/* 089D0 8083ABE0 28412000 */ slti $at, $v0, 0x2000 -/* 089D4 8083ABE4 1020003C */ beq $at, $zero, .L8083ACD8 -/* 089D8 8083ABE8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 089DC 8083ABEC 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 089E0 8083ABF0 C6080838 */ lwc1 $f8, 0x0838($s0) ## 00000838 -/* 089E4 8083ABF4 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 089E8 8083ABF8 4608303C */ c.lt.s $f6, $f8 -/* 089EC 8083ABFC 00000000 */ nop -/* 089F0 8083AC00 45020036 */ bc1fl .L8083ACDC -/* 089F4 8083AC04 8D4C0000 */ lw $t4, 0x0000($t2) ## 80853604 -/* 089F8 8083AC08 1461002E */ bne $v1, $at, .L8083ACC4 -/* 089FC 8083AC0C 308E0800 */ andi $t6, $a0, 0x0800 ## $t6 = 00000000 -/* 08A00 8083AC10 15C0002C */ bne $t6, $zero, .L8083ACC4 -/* 08A04 8083AC14 8FA40064 */ lw $a0, 0x0064($sp) -/* 08A08 8083AC18 3C068085 */ lui $a2, %hi(D_8085451C) ## $a2 = 80850000 -/* 08A0C 8083AC1C 27AF0058 */ addiu $t7, $sp, 0x0058 ## $t7 = FFFFFFF8 -/* 08A10 8083AC20 27B80054 */ addiu $t8, $sp, 0x0054 ## $t8 = FFFFFFF4 -/* 08A14 8083AC24 AFB80014 */ sw $t8, 0x0014($sp) -/* 08A18 8083AC28 AFAF0010 */ sw $t7, 0x0010($sp) -/* 08A1C 8083AC2C 24C6451C */ addiu $a2, $a2, %lo(D_8085451C) ## $a2 = 8085451C -/* 08A20 8083AC30 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08A24 8083AC34 0C20E5BD */ jal func_808396F4 -/* 08A28 8083AC38 27A70044 */ addiu $a3, $sp, 0x0044 ## $a3 = FFFFFFE4 -/* 08A2C 8083AC3C E7A00040 */ swc1 $f0, 0x0040($sp) -/* 08A30 8083AC40 8FA40064 */ lw $a0, 0x0064($sp) -/* 08A34 8083AC44 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 08A38 8083AC48 27B9003C */ addiu $t9, $sp, 0x003C ## $t9 = FFFFFFDC -/* 08A3C 8083AC4C 27AB0050 */ addiu $t3, $sp, 0x0050 ## $t3 = FFFFFFF0 -/* 08A40 8083AC50 AFAB0014 */ sw $t3, 0x0014($sp) -/* 08A44 8083AC54 AFB90010 */ sw $t9, 0x0010($sp) -/* 08A48 8083AC58 8FA60044 */ lw $a2, 0x0044($sp) -/* 08A4C 8083AC5C 8FA7004C */ lw $a3, 0x004C($sp) -/* 08A50 8083AC60 248507C0 */ addiu $a1, $a0, 0x07C0 ## $a1 = 000007C0 -/* 08A54 8083AC64 0C01084F */ jal func_8004213C -/* 08A58 8083AC68 E7AA003C */ swc1 $f10, 0x003C($sp) -/* 08A5C 8083AC6C 10400015 */ beq $v0, $zero, .L8083ACC4 -/* 08A60 8083AC70 C7B2003C */ lwc1 $f18, 0x003C($sp) -/* 08A64 8083AC74 C7A40040 */ lwc1 $f4, 0x0040($sp) -/* 08A68 8083AC78 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 08A6C 8083AC7C 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 -/* 08A70 8083AC80 46049181 */ sub.s $f6, $f18, $f4 -/* 08A74 8083AC84 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 08A78 8083AC88 24A53158 */ addiu $a1, $a1, 0x3158 ## $a1 = 04003158 -/* 08A7C 8083AC8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08A80 8083AC90 4606803C */ c.lt.s $f16, $f6 -/* 08A84 8083AC94 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 -/* 08A88 8083AC98 4502000B */ bc1fl .L8083ACC8 -/* 08A8C 8083AC9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08A90 8083ACA0 0C20E27A */ jal func_808389E8 -/* 08A94 8083ACA4 8FA70064 */ lw $a3, 0x0064($sp) -/* 08A98 8083ACA8 8FA40064 */ lw $a0, 0x0064($sp) -/* 08A9C 8083ACAC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08AA0 8083ACB0 8FA60028 */ lw $a2, 0x0028($sp) -/* 08AA4 8083ACB4 0C20D716 */ jal func_80835C58 -/* 08AA8 8083ACB8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08AAC 8083ACBC 1000001F */ beq $zero, $zero, .L8083AD3C -/* 08AB0 8083ACC0 8FBF0024 */ lw $ra, 0x0024($sp) -.L8083ACC4: -/* 08AB4 8083ACC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8083ACC8: -/* 08AB8 8083ACC8 0C20E92A */ jal func_8083A4A8 -/* 08ABC 8083ACCC 8FA50064 */ lw $a1, 0x0064($sp) -/* 08AC0 8083ACD0 1000001A */ beq $zero, $zero, .L8083AD3C -/* 08AC4 8083ACD4 8FBF0024 */ lw $ra, 0x0024($sp) -.L8083ACD8: -/* 08AC8 8083ACD8 8D4C0000 */ lw $t4, 0x0000($t2) ## 00000000 -.L8083ACDC: -/* 08ACC 8083ACDC 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 08AD0 8083ACE0 1181000D */ beq $t4, $at, .L8083AD18 -/* 08AD4 8083ACE4 00000000 */ nop -/* 08AD8 8083ACE8 8E0D0678 */ lw $t5, 0x0678($s0) ## 00000678 -/* 08ADC 8083ACEC 3C018085 */ lui $at, %hi(D_80853600) ## $at = 80850000 -/* 08AE0 8083ACF0 C42A3600 */ lwc1 $f10, %lo(D_80853600)($at) -/* 08AE4 8083ACF4 C5A80034 */ lwc1 $f8, 0x0034($t5) ## 00000034 -/* 08AE8 8083ACF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08AEC 8083ACFC 4608503E */ c.le.s $f10, $f8 -/* 08AF0 8083AD00 00000000 */ nop -/* 08AF4 8083AD04 45010004 */ bc1t .L8083AD18 -/* 08AF8 8083AD08 00000000 */ nop -/* 08AFC 8083AD0C 0C20E9AB */ jal func_8083A6AC -/* 08B00 8083AD10 8FA50064 */ lw $a1, 0x0064($sp) -/* 08B04 8083AD14 14400008 */ bne $v0, $zero, .L8083AD38 -.L8083AD18: -/* 08B08 8083AD18 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 08B0C 8083AD1C 24C63040 */ addiu $a2, $a2, 0x3040 ## $a2 = 04003040 -/* 08B10 8083AD20 8FA40064 */ lw $a0, 0x0064($sp) -/* 08B14 8083AD24 0C20C8A1 */ jal func_80832284 -/* 08B18 8083AD28 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08B1C 8083AD2C 10000003 */ beq $zero, $zero, .L8083AD3C -/* 08B20 8083AD30 8FBF0024 */ lw $ra, 0x0024($sp) -.L8083AD34: -/* 08B24 8083AD34 A6020894 */ sh $v0, 0x0894($s0) ## 00000894 -.L8083AD38: -/* 08B28 8083AD38 8FBF0024 */ lw $ra, 0x0024($sp) -.L8083AD3C: -/* 08B2C 8083AD3C 8FB00020 */ lw $s0, 0x0020($sp) -/* 08B30 8083AD40 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 08B34 8083AD44 03E00008 */ jr $ra -/* 08B38 8083AD48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s deleted file mode 100644 index d54569ae87..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8083AD4C -/* 08B3C 8083AD4C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 08B40 8083AD50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 08B44 8083AD54 AFA40020 */ sw $a0, 0x0020($sp) -/* 08B48 8083AD58 90AE06AD */ lbu $t6, 0x06AD($a1) ## 000006AD -/* 08B4C 8083AD5C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 08B50 8083AD60 24030006 */ addiu $v1, $zero, 0x0006 ## $v1 = 00000006 -/* 08B54 8083AD64 15C1000E */ bne $t6, $at, .L8083ADA0 -/* 08B58 8083AD68 00000000 */ nop -/* 08B5C 8083AD6C 0C00B75B */ jal func_8002DD6C -/* 08B60 8083AD70 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 08B64 8083AD74 10400008 */ beq $v0, $zero, .L8083AD98 -/* 08B68 8083AD78 3C0F8016 */ lui $t7, %hi(gSaveContext+4) -/* 08B6C 8083AD7C 8DEFE664 */ lw $t7, %lo(gSaveContext+4)($t7) -/* 08B70 8083AD80 15E00003 */ bne $t7, $zero, .L8083AD90 -/* 08B74 8083AD84 00000000 */ nop -/* 08B78 8083AD88 10000005 */ beq $zero, $zero, .L8083ADA0 -/* 08B7C 8083AD8C 24030007 */ addiu $v1, $zero, 0x0007 ## $v1 = 00000007 -.L8083AD90: -/* 08B80 8083AD90 10000003 */ beq $zero, $zero, .L8083ADA0 -/* 08B84 8083AD94 2403000B */ addiu $v1, $zero, 0x000B ## $v1 = 0000000B -.L8083AD98: -/* 08B88 8083AD98 10000001 */ beq $zero, $zero, .L8083ADA0 -/* 08B8C 8083AD9C 2403000A */ addiu $v1, $zero, 0x000A ## $v1 = 0000000A -.L8083ADA0: -/* 08B90 8083ADA0 8FA40020 */ lw $a0, 0x0020($sp) -/* 08B94 8083ADA4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 08B98 8083ADA8 0C030129 */ jal Gameplay_GetCamera -/* 08B9C 8083ADAC AFA3001C */ sw $v1, 0x001C($sp) -/* 08BA0 8083ADB0 8FA3001C */ lw $v1, 0x001C($sp) -/* 08BA4 8083ADB4 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 08BA8 8083ADB8 00032C00 */ sll $a1, $v1, 16 -/* 08BAC 8083ADBC 0C016911 */ jal func_8005A444 -/* 08BB0 8083ADC0 00052C03 */ sra $a1, $a1, 16 -/* 08BB4 8083ADC4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 08BB8 8083ADC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 08BBC 8083ADCC 03E00008 */ jr $ra -/* 08BC0 8083ADD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083ADD4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083ADD4.s deleted file mode 100644 index b020d96136..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083ADD4.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_8083ADD4 -/* 08BC4 8083ADD4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 08BC8 8083ADD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 08BCC 8083ADDC 90AE06AD */ lbu $t6, 0x06AD($a1) ## 000006AD -/* 08BD0 8083ADE0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 08BD4 8083ADE4 3C068085 */ lui $a2, %hi(func_80852E14) ## $a2 = 80850000 -/* 08BD8 8083ADE8 15C10011 */ bne $t6, $at, .L8083AE30 -/* 08BDC 8083ADEC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 08BE0 8083ADF0 24C62E14 */ addiu $a2, $a2, %lo(func_80852E14) ## $a2 = 80852E14 -/* 08BE4 8083ADF4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08BE8 8083ADF8 0C20D716 */ jal func_80835C58 -/* 08BEC 8083ADFC AFA5001C */ sw $a1, 0x001C($sp) -/* 08BF0 8083AE00 8FA5001C */ lw $a1, 0x001C($sp) -/* 08BF4 8083AE04 84AF046A */ lh $t7, 0x046A($a1) ## 0000046A -/* 08BF8 8083AE08 11E00005 */ beq $t7, $zero, .L8083AE20 -/* 08BFC 8083AE0C 00000000 */ nop -/* 08C00 8083AE10 8CB8067C */ lw $t8, 0x067C($a1) ## 0000067C -/* 08C04 8083AE14 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 08C08 8083AE18 0301C825 */ or $t9, $t8, $at ## $t9 = 20000000 -/* 08C0C 8083AE1C ACB9067C */ sw $t9, 0x067C($a1) ## 0000067C -.L8083AE20: -/* 08C10 8083AE20 0C20C8C6 */ jal func_80832318 -/* 08C14 8083AE24 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 08C18 8083AE28 10000001 */ beq $zero, $zero, .L8083AE30 -/* 08C1C 8083AE2C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083AE30: -/* 08C20 8083AE30 8FBF0014 */ lw $ra, 0x0014($sp) -/* 08C24 8083AE34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 08C28 8083AE38 03E00008 */ jr $ra -/* 08C2C 8083AE3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AE40.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AE40.s deleted file mode 100644 index 1d9fe71cc1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AE40.s +++ /dev/null @@ -1,94 +0,0 @@ -.rdata -glabel D_80855240 - .asciz "../z_player.c" - .balign 4 - -glabel D_80855250 - .asciz "size = %x\n" - .balign 4 - -glabel D_8085525C - .asciz "size <= 1024 * 8" - .balign 4 - -glabel D_80855270 - .asciz "../z_player.c" - .balign 4 - -glabel D_80855280 - .asciz "../z_player.c" - .balign 4 - -.text -glabel func_8083AE40 -/* 08C30 8083AE40 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 08C34 8083AE44 00053C00 */ sll $a3, $a1, 16 -/* 08C38 8083AE48 00073C03 */ sra $a3, $a3, 16 -/* 08C3C 8083AE4C AFB00030 */ sw $s0, 0x0030($sp) -/* 08C40 8083AE50 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 08C44 8083AE54 AFBF0034 */ sw $ra, 0x0034($sp) -/* 08C48 8083AE58 10E00035 */ beq $a3, $zero, .L8083AF30 -/* 08C4C 8083AE5C AFA5004C */ sw $a1, 0x004C($sp) -/* 08C50 8083AE60 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 08C54 8083AE64 A08E0170 */ sb $t6, 0x0170($a0) ## 00000170 -/* 08C58 8083AE68 24840194 */ addiu $a0, $a0, 0x0194 ## $a0 = 00000194 -/* 08C5C 8083AE6C AFA4003C */ sw $a0, 0x003C($sp) -/* 08C60 8083AE70 A7A7004E */ sh $a3, 0x004E($sp) -/* 08C64 8083AE74 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC -/* 08C68 8083AE78 0C001874 */ jal osCreateMesgQueue - -/* 08C6C 8083AE7C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 08C70 8083AE80 87A7004E */ lh $a3, 0x004E($sp) -/* 08C74 8083AE84 3C188012 */ lui $t8, %hi(gObjectTable) -/* 08C78 8083AE88 27187528 */ addiu $t8, %lo(gObjectTable) -/* 08C7C 8083AE8C 000778C0 */ sll $t7, $a3, 3 -/* 08C80 8083AE90 01F81021 */ addu $v0, $t7, $t8 -/* 08C84 8083AE94 8C590004 */ lw $t9, 0x0004($v0) ## 00000004 -/* 08C88 8083AE98 8C480000 */ lw $t0, 0x0000($v0) ## 00000000 -/* 08C8C 8083AE9C 3C048085 */ lui $a0, %hi(D_80855240) ## $a0 = 80850000 -/* 08C90 8083AEA0 24845240 */ addiu $a0, $a0, %lo(D_80855240) ## $a0 = 80855240 -/* 08C94 8083AEA4 03284823 */ subu $t1, $t9, $t0 -/* 08C98 8083AEA8 AFA90040 */ sw $t1, 0x0040($sp) -/* 08C9C 8083AEAC AFA20038 */ sw $v0, 0x0038($sp) -/* 08CA0 8083AEB0 0C000B84 */ jal LogUtils_LogThreadId - -/* 08CA4 8083AEB4 24052382 */ addiu $a1, $zero, 0x2382 ## $a1 = 00002382 -/* 08CA8 8083AEB8 3C048085 */ lui $a0, %hi(D_80855250) ## $a0 = 80850000 -/* 08CAC 8083AEBC 24845250 */ addiu $a0, $a0, %lo(D_80855250) ## $a0 = 80855250 -/* 08CB0 8083AEC0 0C00084C */ jal osSyncPrintf - -/* 08CB4 8083AEC4 8FA50040 */ lw $a1, 0x0040($sp) -/* 08CB8 8083AEC8 8FAA0040 */ lw $t2, 0x0040($sp) -/* 08CBC 8083AECC 3C048085 */ lui $a0, %hi(D_8085525C) ## $a0 = 80850000 -/* 08CC0 8083AED0 8FA20038 */ lw $v0, 0x0038($sp) -/* 08CC4 8083AED4 2D412001 */ sltiu $at, $t2, 0x2001 -/* 08CC8 8083AED8 14200007 */ bne $at, $zero, .L8083AEF8 -/* 08CCC 8083AEDC 2484525C */ addiu $a0, $a0, %lo(D_8085525C) ## $a0 = 8085525C -/* 08CD0 8083AEE0 3C058085 */ lui $a1, %hi(D_80855270) ## $a1 = 80850000 -/* 08CD4 8083AEE4 24A55270 */ addiu $a1, $a1, %lo(D_80855270) ## $a1 = 80855270 -/* 08CD8 8083AEE8 24062383 */ addiu $a2, $zero, 0x2383 ## $a2 = 00002383 -/* 08CDC 8083AEEC 0C0007FC */ jal __assert - -/* 08CE0 8083AEF0 AFA20038 */ sw $v0, 0x0038($sp) -/* 08CE4 8083AEF4 8FA20038 */ lw $v0, 0x0038($sp) -.L8083AEF8: -/* 08CE8 8083AEF8 8E0501B0 */ lw $a1, 0x01B0($s0) ## 000001B0 -/* 08CEC 8083AEFC 8FAB003C */ lw $t3, 0x003C($sp) -/* 08CF0 8083AF00 3C0C8085 */ lui $t4, %hi(D_80855280) ## $t4 = 80850000 -/* 08CF4 8083AF04 258C5280 */ addiu $t4, $t4, %lo(D_80855280) ## $t4 = 80855280 -/* 08CF8 8083AF08 240D238B */ addiu $t5, $zero, 0x238B ## $t5 = 0000238B -/* 08CFC 8083AF0C AFAD0020 */ sw $t5, 0x0020($sp) -/* 08D00 8083AF10 AFAC001C */ sw $t4, 0x001C($sp) -/* 08D04 8083AF14 AFA00018 */ sw $zero, 0x0018($sp) -/* 08D08 8083AF18 AFA00010 */ sw $zero, 0x0010($sp) -/* 08D0C 8083AF1C 26040174 */ addiu $a0, $s0, 0x0174 ## $a0 = 00000174 -/* 08D10 8083AF20 8C460000 */ lw $a2, 0x0000($v0) ## 00000000 -/* 08D14 8083AF24 8FA70040 */ lw $a3, 0x0040($sp) -/* 08D18 8083AF28 0C000697 */ jal DmaMgr_SendRequest2 -/* 08D1C 8083AF2C AFAB0014 */ sw $t3, 0x0014($sp) -.L8083AF30: -/* 08D20 8083AF30 8FBF0034 */ lw $ra, 0x0034($sp) -/* 08D24 8083AF34 8FB00030 */ lw $s0, 0x0030($sp) -/* 08D28 8083AF38 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 08D2C 8083AF3C 03E00008 */ jr $ra -/* 08D30 8083AF40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s deleted file mode 100644 index 4a003168f7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_8083AF44 -/* 08D34 8083AF44 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 08D38 8083AF48 AFA60038 */ sw $a2, 0x0038($sp) -/* 08D3C 8083AF4C AFBF0024 */ sw $ra, 0x0024($sp) -/* 08D40 8083AF50 AFB00020 */ sw $s0, 0x0020($sp) -/* 08D44 8083AF54 3C068085 */ lui $a2, %hi(func_808507F4) ## $a2 = 80850000 -/* 08D48 8083AF58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 08D4C 8083AF5C AFA50034 */ sw $a1, 0x0034($sp) -/* 08D50 8083AF60 24C607F4 */ addiu $a2, $a2, %lo(func_808507F4) ## $a2 = 808507F4 -/* 08D54 8083AF64 0C20D779 */ jal func_80835DE4 -/* 08D58 8083AF68 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08D5C 8083AF6C 8FA30038 */ lw $v1, 0x0038($sp) -/* 08D60 8083AF70 8FAF0034 */ lw $t7, 0x0034($sp) -/* 08D64 8083AF74 3C188085 */ lui $t8, %hi(D_80854390) ## $t8 = 80850000 -/* 08D68 8083AF78 27184390 */ addiu $t8, $t8, %lo(D_80854390) ## $t8 = 80854390 -/* 08D6C 8083AF7C 246EFFFD */ addiu $t6, $v1, 0xFFFD ## $t6 = FFFFFFFD -/* 08D70 8083AF80 00781021 */ addu $v0, $v1, $t8 -/* 08D74 8083AF84 A1EE084F */ sb $t6, 0x084F($t7) ## 0000084F -/* 08D78 8083AF88 AFA2002C */ sw $v0, 0x002C($sp) -/* 08D7C 8083AF8C 90450000 */ lbu $a1, 0x0000($v0) ## 00000000 -/* 08D80 8083AF90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08D84 8083AF94 0C021DC2 */ jal func_80087708 -/* 08D88 8083AF98 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 08D8C 8083AF9C 8FA50034 */ lw $a1, 0x0034($sp) -/* 08D90 8083AFA0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 08D94 8083AFA4 3C073F54 */ lui $a3, 0x3F54 ## $a3 = 3F540000 -/* 08D98 8083AFA8 34E77AE1 */ ori $a3, $a3, 0x7AE1 ## $a3 = 3F547AE1 -/* 08D9C 8083AFAC 24C62D28 */ addiu $a2, $a2, 0x2D28 ## $a2 = 04002D28 -/* 08DA0 8083AFB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08DA4 8083AFB4 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop -/* 08DA8 8083AFB8 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 08DAC 8083AFBC 8FB9002C */ lw $t9, 0x002C($sp) -/* 08DB0 8083AFC0 3C088085 */ lui $t0, %hi(D_80854395) ## $t0 = 80850000 -/* 08DB4 8083AFC4 25084395 */ addiu $t0, $t0, %lo(D_80854395) ## $t0 = 80854395 -/* 08DB8 8083AFC8 1728000A */ bne $t9, $t0, .L8083AFF4 -/* 08DBC 8083AFCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08DC0 8083AFD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08DC4 8083AFD4 2405044C */ addiu $a1, $zero, 0x044C ## $a1 = 0000044C -/* 08DC8 8083AFD8 2406FF9B */ addiu $a2, $zero, 0xFF9B ## $a2 = FFFFFF9B -/* 08DCC 8083AFDC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08DD0 8083AFE0 0C02003E */ jal func_800800F8 -/* 08DD4 8083AFE4 AFA00010 */ sw $zero, 0x0010($sp) -/* 08DD8 8083AFE8 8FA90034 */ lw $t1, 0x0034($sp) -/* 08DDC 8083AFEC 10000003 */ beq $zero, $zero, .L8083AFFC -/* 08DE0 8083AFF0 A522046C */ sh $v0, 0x046C($t1) ## 0000046C -.L8083AFF4: -/* 08DE4 8083AFF4 0C20D7A9 */ jal func_80835EA4 -/* 08DE8 8083AFF8 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -.L8083AFFC: -/* 08DEC 8083AFFC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 08DF0 8083B000 8FB00020 */ lw $s0, 0x0020($sp) -/* 08DF4 8083B004 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 08DF8 8083B008 03E00008 */ jr $ra -/* 08DFC 8083B00C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B010.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B010.s deleted file mode 100644 index cf15e7c9ea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B010.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8083B010 -/* 08E00 8083B010 A48006C0 */ sh $zero, 0x06C0($a0) ## 000006C0 -/* 08E04 8083B014 848206C0 */ lh $v0, 0x06C0($a0) ## 000006C0 -/* 08E08 8083B018 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 -/* 08E0C 8083B01C A48206BE */ sh $v0, 0x06BE($a0) ## 000006BE -/* 08E10 8083B020 A48206BC */ sh $v0, 0x06BC($a0) ## 000006BC -/* 08E14 8083B024 A48206BA */ sh $v0, 0x06BA($a0) ## 000006BA -/* 08E18 8083B028 A48206B8 */ sh $v0, 0x06B8($a0) ## 000006B8 -/* 08E1C 8083B02C A48206B6 */ sh $v0, 0x06B6($a0) ## 000006B6 -/* 08E20 8083B030 A4820048 */ sh $v0, 0x0048($a0) ## 00000048 -/* 08E24 8083B034 A4820044 */ sh $v0, 0x0044($a0) ## 00000044 -/* 08E28 8083B038 03E00008 */ jr $ra -/* 08E2C 8083B03C A48E0046 */ sh $t6, 0x0046($a0) ## 00000046 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s deleted file mode 100644 index cc839e77a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s +++ /dev/null @@ -1,424 +0,0 @@ -glabel func_8083B040 -/* 08E30 8083B040 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 08E34 8083B044 AFBF001C */ sw $ra, 0x001C($sp) -/* 08E38 8083B048 AFB00018 */ sw $s0, 0x0018($sp) -/* 08E3C 8083B04C AFA50034 */ sw $a1, 0x0034($sp) -/* 08E40 8083B050 908E06AD */ lbu $t6, 0x06AD($a0) ## 000006AD -/* 08E44 8083B054 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 08E48 8083B058 51C00175 */ beql $t6, $zero, .L8083B630 -/* 08E4C 8083B05C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 08E50 8083B060 0C20CCAE */ jal func_808332B8 -/* 08E54 8083B064 00000000 */ nop -/* 08E58 8083B068 14400009 */ bne $v0, $zero, .L8083B090 -/* 08E5C 8083B06C 8FA40034 */ lw $a0, 0x0034($sp) -/* 08E60 8083B070 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 08E64 8083B074 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 08E68 8083B078 17000005 */ bne $t8, $zero, .L8083B090 -/* 08E6C 8083B07C 00000000 */ nop -/* 08E70 8083B080 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 08E74 8083B084 00194200 */ sll $t0, $t9, 8 -/* 08E78 8083B088 05030169 */ bgezl $t0, .L8083B630 -/* 08E7C 8083B08C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083B090: -/* 08E80 8083B090 0C20EB75 */ jal func_8083ADD4 -/* 08E84 8083B094 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08E88 8083B098 14400160 */ bne $v0, $zero, .L8083B61C -/* 08E8C 8083B09C 00000000 */ nop -/* 08E90 8083B0A0 920906AD */ lbu $t1, 0x06AD($s0) ## 000006AD -/* 08E94 8083B0A4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 08E98 8083B0A8 8FA40034 */ lw $a0, 0x0034($sp) -/* 08E9C 8083B0AC 15210138 */ bne $t1, $at, .L8083B590 -/* 08EA0 8083B0B0 00000000 */ nop -/* 08EA4 8083B0B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08EA8 8083B0B8 0C023C36 */ jal func_8008F0D8 -/* 08EAC 8083B0BC 82050154 */ lb $a1, 0x0154($s0) ## 00000154 -/* 08EB0 8083B0C0 04400023 */ bltz $v0, .L8083B150 -/* 08EB4 8083B0C4 AFA2002C */ sw $v0, 0x002C($sp) -/* 08EB8 8083B0C8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 08EBC 8083B0CC 14410006 */ bne $v0, $at, .L8083B0E8 -/* 08EC0 8083B0D0 3C0A8016 */ lui $t2, %hi(gSaveContext+0x13b3) -/* 08EC4 8083B0D4 814AFA13 */ lb $t2, %lo(gSaveContext+0x13b3)($t2) -/* 08EC8 8083B0D8 8FA40034 */ lw $a0, 0x0034($sp) -/* 08ECC 8083B0DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08ED0 8083B0E0 1D400007 */ bgtz $t2, .L8083B100 -/* 08ED4 8083B0E4 3C068085 */ lui $a2, %hi(func_8085063C) ## $a2 = 80850000 -.L8083B0E8: -/* 08ED8 8083B0E8 8FA40034 */ lw $a0, 0x0034($sp) -/* 08EDC 8083B0EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08EE0 8083B0F0 0C20EBD1 */ jal func_8083AF44 -/* 08EE4 8083B0F4 8FA6002C */ lw $a2, 0x002C($sp) -/* 08EE8 8083B0F8 10000011 */ beq $zero, $zero, .L8083B140 -/* 08EEC 8083B0FC 00000000 */ nop -.L8083B100: -/* 08EF0 8083B100 24C6063C */ addiu $a2, $a2, %lo(func_8085063C) ## $a2 = 0000063C -/* 08EF4 8083B104 0C20D716 */ jal func_80835C58 -/* 08EF8 8083B108 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 08EFC 8083B10C 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 08F00 8083B110 3C013000 */ lui $at, 0x3000 ## $at = 30000000 -/* 08F04 8083B114 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08F08 8083B118 01616025 */ or $t4, $t3, $at ## $t4 = 30000000 -/* 08F0C 8083B11C 0C20CCCE */ jal func_80833338 -/* 08F10 8083B120 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -/* 08F14 8083B124 8FA40034 */ lw $a0, 0x0034($sp) -/* 08F18 8083B128 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08F1C 8083B12C 0C20C899 */ jal func_80832264 -/* 08F20 8083B130 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 08F24 8083B134 8FA40034 */ lw $a0, 0x0034($sp) -/* 08F28 8083B138 0C20D7A9 */ jal func_80835EA4 -/* 08F2C 8083B13C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -.L8083B140: -/* 08F30 8083B140 0C20C889 */ jal func_80832224 -/* 08F34 8083B144 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08F38 8083B148 10000139 */ beq $zero, $zero, .L8083B630 -/* 08F3C 8083B14C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083B150: -/* 08F40 8083B150 82050154 */ lb $a1, 0x0154($s0) ## 00000154 -/* 08F44 8083B154 24ADFFD5 */ addiu $t5, $a1, 0xFFD5 ## $t5 = FFFFFFD5 -/* 08F48 8083B158 05A1001B */ bgez $t5, .L8083B1C8 -/* 08F4C 8083B15C AFAD002C */ sw $t5, 0x002C($sp) -/* 08F50 8083B160 0C023C89 */ jal func_8008F224 -/* 08F54 8083B164 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08F58 8083B168 2443FFFF */ addiu $v1, $v0, 0xFFFF ## $v1 = FFFFFFFF -/* 08F5C 8083B16C 046000A2 */ bltz $v1, .L8083B3F8 -/* 08F60 8083B170 AFA30028 */ sw $v1, 0x0028($sp) -/* 08F64 8083B174 28610006 */ slti $at, $v1, 0x0006 -/* 08F68 8083B178 502000A0 */ beql $at, $zero, .L8083B3FC -/* 08F6C 8083B17C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08F70 8083B180 82050154 */ lb $a1, 0x0154($s0) ## 00000154 -/* 08F74 8083B184 28A10023 */ slti $at, $a1, 0x0023 -/* 08F78 8083B188 50200010 */ beql $at, $zero, .L8083B1CC -/* 08F7C 8083B18C 8FA40034 */ lw $a0, 0x0034($sp) -/* 08F80 8083B190 8E0F0694 */ lw $t7, 0x0694($s0) ## 00000694 -/* 08F84 8083B194 24010022 */ addiu $at, $zero, 0x0022 ## $at = 00000022 -/* 08F88 8083B198 51E00098 */ beql $t7, $zero, .L8083B3FC -/* 08F8C 8083B19C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08F90 8083B1A0 54A10006 */ bnel $a1, $at, .L8083B1BC -/* 08F94 8083B1A4 82190693 */ lb $t9, 0x0693($s0) ## 00000693 -/* 08F98 8083B1A8 82180693 */ lb $t8, 0x0693($s0) ## 00000693 -/* 08F9C 8083B1AC 2401001B */ addiu $at, $zero, 0x001B ## $at = 0000001B -/* 08FA0 8083B1B0 53010006 */ beql $t8, $at, .L8083B1CC -/* 08FA4 8083B1B4 8FA40034 */ lw $a0, 0x0034($sp) -/* 08FA8 8083B1B8 82190693 */ lb $t9, 0x0693($s0) ## 00000693 -.L8083B1BC: -/* 08FAC 8083B1BC 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 08FB0 8083B1C0 5721008E */ bnel $t9, $at, .L8083B3FC -/* 08FB4 8083B1C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8083B1C8: -/* 08FB8 8083B1C8 8FA40034 */ lw $a0, 0x0034($sp) -.L8083B1CC: -/* 08FBC 8083B1CC 90881D57 */ lbu $t0, 0x1D57($a0) ## 00001D57 -/* 08FC0 8083B1D0 15000087 */ bne $t0, $zero, .L8083B3F0 -/* 08FC4 8083B1D4 00000000 */ nop -/* 08FC8 8083B1D8 84891D58 */ lh $t1, 0x1D58($a0) ## 00001D58 -/* 08FCC 8083B1DC 3C068085 */ lui $a2, %hi(func_8084F104) ## $a2 = 80850000 -/* 08FD0 8083B1E0 24C6F104 */ addiu $a2, $a2, %lo(func_8084F104) ## $a2 = 8084F104 -/* 08FD4 8083B1E4 15200082 */ bne $t1, $zero, .L8083B3F0 -/* 08FD8 8083B1E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08FDC 8083B1EC 0C20D779 */ jal func_80835DE4 -/* 08FE0 8083B1F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08FE4 8083B1F4 8FAA002C */ lw $t2, 0x002C($sp) -/* 08FE8 8083B1F8 3C0B8085 */ lui $t3, %hi(D_80854528) ## $t3 = 80850000 -/* 08FEC 8083B1FC 3C0E8085 */ lui $t6, %hi(D_80853624) ## $t6 = 80850000 -/* 08FF0 8083B200 0540000B */ bltz $t2, .L8083B230 -/* 08FF4 8083B204 016A5821 */ addu $t3, $t3, $t2 -/* 08FF8 8083B208 916B4528 */ lbu $t3, %lo(D_80854528)($t3) -/* 08FFC 8083B20C 25CE3624 */ addiu $t6, $t6, %lo(D_80853624) ## $t6 = 80853624 -/* 09000 8083B210 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09004 8083B214 000B6080 */ sll $t4, $t3, 2 -/* 09008 8083B218 018B6023 */ subu $t4, $t4, $t3 -/* 0900C 8083B21C 000C6040 */ sll $t4, $t4, 1 -/* 09010 8083B220 258DFFFA */ addiu $t5, $t4, 0xFFFA ## $t5 = FFFFFFFA -/* 09014 8083B224 01AE1021 */ addu $v0, $t5, $t6 -/* 09018 8083B228 0C20EB90 */ jal func_8083AE40 -/* 0901C 8083B22C 84450004 */ lh $a1, 0x0004($v0) ## 00000004 -.L8083B230: -/* 09020 8083B230 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 09024 8083B234 3C013000 */ lui $at, 0x3000 ## $at = 30000000 -/* 09028 8083B238 34210040 */ ori $at, $at, 0x0040 ## $at = 30000040 -/* 0902C 8083B23C 01E1C025 */ or $t8, $t7, $at ## $t8 = 30000040 -/* 09030 8083B240 AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 09034 8083B244 8FB9002C */ lw $t9, 0x002C($sp) -/* 09038 8083B248 8FA90028 */ lw $t1, 0x0028($sp) -/* 0903C 8083B24C 07200004 */ bltz $t9, .L8083B260 -/* 09040 8083B250 252A0018 */ addiu $t2, $t1, 0x0018 ## $t2 = 00000018 -/* 09044 8083B254 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 09048 8083B258 10000002 */ beq $zero, $zero, .L8083B264 -/* 0904C 8083B25C AFA8002C */ sw $t0, 0x002C($sp) -.L8083B260: -/* 09050 8083B260 AFAA002C */ sw $t2, 0x002C($sp) -.L8083B264: -/* 09054 8083B264 8E030694 */ lw $v1, 0x0694($s0) ## 00000694 -/* 09058 8083B268 8FAB002C */ lw $t3, 0x002C($sp) -/* 0905C 8083B26C 50600034 */ beql $v1, $zero, .L8083B340 -/* 09060 8083B270 8FAC002C */ lw $t4, 0x002C($sp) -/* 09064 8083B274 82020693 */ lb $v0, 0x0693($s0) ## 00000693 -/* 09068 8083B278 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 0906C 8083B27C 5162000F */ beql $t3, $v0, .L8083B2BC -/* 09070 8083B280 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 09074 8083B284 1041000C */ beq $v0, $at, .L8083B2B8 -/* 09078 8083B288 2401001B */ addiu $at, $zero, 0x001B ## $at = 0000001B -/* 0907C 8083B28C 14410005 */ bne $v0, $at, .L8083B2A4 -/* 09080 8083B290 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 09084 8083B294 820C0154 */ lb $t4, 0x0154($s0) ## 00000154 -/* 09088 8083B298 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 0908C 8083B29C 51810007 */ beql $t4, $at, .L8083B2BC -/* 09090 8083B2A0 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -.L8083B2A4: -/* 09094 8083B2A4 54820026 */ bnel $a0, $v0, .L8083B340 -/* 09098 8083B2A8 8FAC002C */ lw $t4, 0x002C($sp) -/* 0909C 8083B2AC 820D0154 */ lb $t5, 0x0154($s0) ## 00000154 -/* 090A0 8083B2B0 24010021 */ addiu $at, $zero, 0x0021 ## $at = 00000021 -/* 090A4 8083B2B4 15A10021 */ bne $t5, $at, .L8083B33C -.L8083B2B8: -/* 090A8 8083B2B8 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -.L8083B2BC: -/* 090AC 8083B2BC 14820005 */ bne $a0, $v0, .L8083B2D4 -/* 090B0 8083B2C0 00000000 */ nop -/* 090B4 8083B2C4 820E0154 */ lb $t6, 0x0154($s0) ## 00000154 -/* 090B8 8083B2C8 2401002E */ addiu $at, $zero, 0x002E ## $at = 0000002E -/* 090BC 8083B2CC 55C1001C */ bnel $t6, $at, .L8083B340 -/* 090C0 8083B2D0 8FAC002C */ lw $t4, 0x002C($sp) -.L8083B2D4: -/* 090C4 8083B2D4 14820013 */ bne $a0, $v0, .L8083B324 -/* 090C8 8083B2D8 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -/* 090CC 8083B2DC 24040010 */ addiu $a0, $zero, 0x0010 ## $a0 = 00000010 -/* 090D0 8083B2E0 0C021CCC */ jal Inventory_ChangeAmmo -/* 090D4 8083B2E4 AFA30020 */ sw $v1, 0x0020($sp) -/* 090D8 8083B2E8 3C068084 */ lui $a2, %hi(func_8084279C) ## $a2 = 80840000 -/* 090DC 8083B2EC 24C6279C */ addiu $a2, $a2, %lo(func_8084279C) ## $a2 = 8084279C -/* 090E0 8083B2F0 8FA40034 */ lw $a0, 0x0034($sp) -/* 090E4 8083B2F4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 090E8 8083B2F8 0C20D779 */ jal func_80835DE4 -/* 090EC 8083B2FC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 090F0 8083B300 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 090F4 8083B304 8FA30020 */ lw $v1, 0x0020($sp) -/* 090F8 8083B308 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 090FC 8083B30C 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 -/* 09100 8083B310 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 09104 8083B314 01E1C025 */ or $t8, $t7, $at ## $t8 = 20000000 -/* 09108 8083B318 AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 0910C 8083B31C A6190850 */ sh $t9, 0x0850($s0) ## 00000850 -/* 09110 8083B320 A208084F */ sb $t0, 0x084F($s0) ## 0000084F -.L8083B324: -/* 09114 8083B324 8C690004 */ lw $t1, 0x0004($v1) ## 00000004 -/* 09118 8083B328 352A0100 */ ori $t2, $t1, 0x0100 ## $t2 = 00000100 -/* 0911C 8083B32C AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 -/* 09120 8083B330 8E0B0694 */ lw $t3, 0x0694($s0) ## 00000694 -/* 09124 8083B334 10000014 */ beq $zero, $zero, .L8083B388 -/* 09128 8083B338 AE0B0664 */ sw $t3, 0x0664($s0) ## 00000664 -.L8083B33C: -/* 0912C 8083B33C 8FAC002C */ lw $t4, 0x002C($sp) -.L8083B340: -/* 09130 8083B340 2401001D */ addiu $at, $zero, 0x001D ## $at = 0000001D -/* 09134 8083B344 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 09138 8083B348 1581000A */ bne $t4, $at, .L8083B374 -/* 0913C 8083B34C 241800CF */ addiu $t8, $zero, 0x00CF ## $t8 = 000000CF -/* 09140 8083B350 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 09144 8083B354 240E4005 */ addiu $t6, $zero, 0x4005 ## $t6 = 00004005 -/* 09148 8083B358 A20D084F */ sb $t5, 0x084F($s0) ## 0000084F -/* 0914C 8083B35C A60E010E */ sh $t6, 0x010E($s0) ## 0000010E -/* 09150 8083B360 8FA40034 */ lw $a0, 0x0034($sp) -/* 09154 8083B364 0C20D7A9 */ jal func_80835EA4 -/* 09158 8083B368 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0915C 8083B36C 10000007 */ beq $zero, $zero, .L8083B38C -/* 09160 8083B370 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -.L8083B374: -/* 09164 8083B374 A20F084F */ sb $t7, 0x084F($s0) ## 0000084F -/* 09168 8083B378 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 0916C 8083B37C 8FA40034 */ lw $a0, 0x0034($sp) -/* 09170 8083B380 0C20D7A9 */ jal func_80835EA4 -/* 09174 8083B384 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -.L8083B388: -/* 09178 8083B388 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -.L8083B38C: -/* 0917C 8083B38C 8202084F */ lb $v0, 0x084F($s0) ## 0000084F -/* 09180 8083B390 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 09184 8083B394 37280100 */ ori $t0, $t9, 0x0100 ## $t0 = 00000100 -/* 09188 8083B398 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 0918C 8083B39C 8FA9002C */ lw $t1, 0x002C($sp) -/* 09190 8083B3A0 00026080 */ sll $t4, $v0, 2 -/* 09194 8083B3A4 0441000B */ bgez $v0, .L8083B3D4 -/* 09198 8083B3A8 A2090693 */ sb $t1, 0x0693($s0) ## 00000693 -/* 0919C 8083B3AC 920A015B */ lbu $t2, 0x015B($s0) ## 0000015B -/* 091A0 8083B3B0 3C068085 */ lui $a2, %hi(D_80853C14) ## $a2 = 80850000 -/* 091A4 8083B3B4 8FA40034 */ lw $a0, 0x0034($sp) -/* 091A8 8083B3B8 000A5880 */ sll $t3, $t2, 2 -/* 091AC 8083B3BC 00CB3021 */ addu $a2, $a2, $t3 -/* 091B0 8083B3C0 8CC63C14 */ lw $a2, %lo(D_80853C14)($a2) -/* 091B4 8083B3C4 0C20CAC3 */ jal func_80832B0C -/* 091B8 8083B3C8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 091BC 8083B3CC 10000006 */ beq $zero, $zero, .L8083B3E8 -/* 091C0 8083B3D0 00000000 */ nop -.L8083B3D4: -/* 091C4 8083B3D4 3C068085 */ lui $a2, %hi(D_80854548) ## $a2 = 80850000 -/* 091C8 8083B3D8 00CC3021 */ addu $a2, $a2, $t4 -/* 091CC 8083B3DC 8CC64548 */ lw $a2, %lo(D_80854548)($a2) -/* 091D0 8083B3E0 0C20C899 */ jal func_80832264 -/* 091D4 8083B3E4 8FA40034 */ lw $a0, 0x0034($sp) -.L8083B3E8: -/* 091D8 8083B3E8 0C20C889 */ jal func_80832224 -/* 091DC 8083B3EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8083B3F0: -/* 091E0 8083B3F0 1000008F */ beq $zero, $zero, .L8083B630 -/* 091E4 8083B3F4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083B3F8: -/* 091E8 8083B3F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8083B3FC: -/* 091EC 8083B3FC 0C023C89 */ jal func_8008F224 -/* 091F0 8083B400 82050154 */ lb $a1, 0x0154($s0) ## 00000154 -/* 091F4 8083B404 0440003C */ bltz $v0, .L8083B4F8 -/* 091F8 8083B408 AFA2002C */ sw $v0, 0x002C($sp) -/* 091FC 8083B40C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 09200 8083B410 14410010 */ bne $v0, $at, .L8083B454 -/* 09204 8083B414 8FA40034 */ lw $a0, 0x0034($sp) -/* 09208 8083B418 3C068085 */ lui $a2, %hi(func_8084EED8) ## $a2 = 80850000 -/* 0920C 8083B41C 24C6EED8 */ addiu $a2, $a2, %lo(func_8084EED8) ## $a2 = 8084EED8 -/* 09210 8083B420 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 09214 8083B424 0C20D779 */ jal func_80835DE4 -/* 09218 8083B428 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0921C 8083B42C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 09220 8083B430 24C62650 */ addiu $a2, $a2, 0x2650 ## $a2 = 04002650 -/* 09224 8083B434 8FA40034 */ lw $a0, 0x0034($sp) -/* 09228 8083B438 0C20C8B4 */ jal func_808322D0 -/* 0922C 8083B43C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 09230 8083B440 8FA40034 */ lw $a0, 0x0034($sp) -/* 09234 8083B444 0C20D7A9 */ jal func_80835EA4 -/* 09238 8083B448 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 0923C 8083B44C 10000070 */ beq $zero, $zero, .L8083B610 -/* 09240 8083B450 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C -.L8083B454: -/* 09244 8083B454 18400018 */ blez $v0, .L8083B4B8 -/* 09248 8083B458 28410004 */ slti $at, $v0, 0x0004 -/* 0924C 8083B45C 10200016 */ beq $at, $zero, .L8083B4B8 -/* 09250 8083B460 8FA40034 */ lw $a0, 0x0034($sp) -/* 09254 8083B464 3C068085 */ lui $a2, %hi(func_8084EFC0) ## $a2 = 80850000 -/* 09258 8083B468 24C6EFC0 */ addiu $a2, $a2, %lo(func_8084EFC0) ## $a2 = 8084EFC0 -/* 0925C 8083B46C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 09260 8083B470 0C20D779 */ jal func_80835DE4 -/* 09264 8083B474 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09268 8083B478 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0926C 8083B47C 24C62688 */ addiu $a2, $a2, 0x2688 ## $a2 = 04002688 -/* 09270 8083B480 8FA40034 */ lw $a0, 0x0034($sp) -/* 09274 8083B484 0C20C8B4 */ jal func_808322D0 -/* 09278 8083B488 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0927C 8083B48C 8FAD002C */ lw $t5, 0x002C($sp) -/* 09280 8083B490 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 09284 8083B494 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 09288 8083B498 15A10003 */ bne $t5, $at, .L8083B4A8 -/* 0928C 8083B49C 00000000 */ nop -/* 09290 8083B4A0 10000001 */ beq $zero, $zero, .L8083B4A8 -/* 09294 8083B4A4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -.L8083B4A8: -/* 09298 8083B4A8 0C20D7A9 */ jal func_80835EA4 -/* 0929C 8083B4AC 8FA40034 */ lw $a0, 0x0034($sp) -/* 092A0 8083B4B0 10000057 */ beq $zero, $zero, .L8083B610 -/* 092A4 8083B4B4 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C -.L8083B4B8: -/* 092A8 8083B4B8 3C068085 */ lui $a2, %hi(func_8084EAC0) ## $a2 = 80850000 -/* 092AC 8083B4BC 24C6EAC0 */ addiu $a2, $a2, %lo(func_8084EAC0) ## $a2 = 8084EAC0 -/* 092B0 8083B4C0 8FA40034 */ lw $a0, 0x0034($sp) -/* 092B4 8083B4C4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 092B8 8083B4C8 0C20D779 */ jal func_80835DE4 -/* 092BC 8083B4CC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 092C0 8083B4D0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 092C4 8083B4D4 24C62668 */ addiu $a2, $a2, 0x2668 ## $a2 = 04002668 -/* 092C8 8083B4D8 8FA40034 */ lw $a0, 0x0034($sp) -/* 092CC 8083B4DC 0C20CADE */ jal func_80832B78 -/* 092D0 8083B4E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 092D4 8083B4E4 8FA40034 */ lw $a0, 0x0034($sp) -/* 092D8 8083B4E8 0C20D7A9 */ jal func_80835EA4 -/* 092DC 8083B4EC 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 092E0 8083B4F0 10000047 */ beq $zero, $zero, .L8083B610 -/* 092E4 8083B4F4 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C -.L8083B4F8: -/* 092E8 8083B4F8 3C068085 */ lui $a2, %hi(func_8084E3C4) ## $a2 = 80850000 -/* 092EC 8083B4FC 24C6E3C4 */ addiu $a2, $a2, %lo(func_8084E3C4) ## $a2 = 8084E3C4 -/* 092F0 8083B500 8FA40034 */ lw $a0, 0x0034($sp) -/* 092F4 8083B504 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 092F8 8083B508 0C20D779 */ jal func_80835DE4 -/* 092FC 8083B50C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09300 8083B510 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 09304 8083B514 24C630A0 */ addiu $a2, $a2, 0x30A0 ## $a2 = 040030A0 -/* 09308 8083B518 8FA40034 */ lw $a0, 0x0034($sp) -/* 0930C 8083B51C 0C20C8B4 */ jal func_808322D0 -/* 09310 8083B520 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 09314 8083B524 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 -/* 09318 8083B528 8E1806A8 */ lw $t8, 0x06A8($s0) ## 000006A8 -/* 0931C 8083B52C 3C010800 */ lui $at, 0x0800 ## $at = 08000000 -/* 09320 8083B530 01C17825 */ or $t7, $t6, $at ## $t7 = 08000000 -/* 09324 8083B534 13000003 */ beq $t8, $zero, .L8083B544 -/* 09328 8083B538 AE0F0680 */ sw $t7, 0x0680($s0) ## 00000680 -/* 0932C 8083B53C 10000002 */ beq $zero, $zero, .L8083B548 -/* 09330 8083B540 2405005B */ addiu $a1, $zero, 0x005B ## $a1 = 0000005B -.L8083B544: -/* 09334 8083B544 2405005A */ addiu $a1, $zero, 0x005A ## $a1 = 0000005A -.L8083B548: -/* 09338 8083B548 0C20D7A9 */ jal func_80835EA4 -/* 0933C 8083B54C 8FA40034 */ lw $a0, 0x0034($sp) -/* 09340 8083B550 8E1906A8 */ lw $t9, 0x06A8($s0) ## 000006A8 -/* 09344 8083B554 5320002E */ beql $t9, $zero, .L8083B610 -/* 09348 8083B558 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C -/* 0934C 8083B55C 8E080680 */ lw $t0, 0x0680($s0) ## 00000680 -/* 09350 8083B560 3C010200 */ lui $at, 0x0200 ## $at = 02000000 -/* 09354 8083B564 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 09358 8083B568 01014825 */ or $t1, $t0, $at ## $t1 = 02000000 -/* 0935C 8083B56C AE090680 */ sw $t1, 0x0680($s0) ## 00000680 -/* 09360 8083B570 0C030129 */ jal Gameplay_GetCamera -/* 09364 8083B574 8FA40034 */ lw $a0, 0x0034($sp) -/* 09368 8083B578 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 0936C 8083B57C 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 09370 8083B580 0C016AA4 */ jal Camera_SetParam -/* 09374 8083B584 8E0606A8 */ lw $a2, 0x06A8($s0) ## 000006A8 -/* 09378 8083B588 10000021 */ beq $zero, $zero, .L8083B610 -/* 0937C 8083B58C 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C -.L8083B590: -/* 09380 8083B590 0C20EB53 */ jal func_8083AD4C -/* 09384 8083B594 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 09388 8083B598 10400018 */ beq $v0, $zero, .L8083B5FC -/* 0938C 8083B59C 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 09390 8083B5A0 8E02067C */ lw $v0, 0x067C($s0) ## 0000067C -/* 09394 8083B5A4 8FA40034 */ lw $a0, 0x0034($sp) -/* 09398 8083B5A8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0939C 8083B5AC 00025200 */ sll $t2, $v0, 8 -/* 093A0 8083B5B0 05400009 */ bltz $t2, .L8083B5D8 -/* 093A4 8083B5B4 3C068085 */ lui $a2, %hi(func_8084B1D8) ## $a2 = 80850000 -/* 093A8 8083B5B8 24C6B1D8 */ addiu $a2, $a2, %lo(func_8084B1D8) ## $a2 = 8084B1D8 -/* 093AC 8083B5BC 0C20D716 */ jal func_80835C58 -/* 093B0 8083B5C0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 093B4 8083B5C4 240B000D */ addiu $t3, $zero, 0x000D ## $t3 = 0000000D -/* 093B8 8083B5C8 A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 -/* 093BC 8083B5CC 0C20EC04 */ jal func_8083B010 -/* 093C0 8083B5D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 093C4 8083B5D4 8E02067C */ lw $v0, 0x067C($s0) ## 0000067C -.L8083B5D8: -/* 093C8 8083B5D8 3C010010 */ lui $at, 0x0010 ## $at = 00100000 -/* 093CC 8083B5DC 00416025 */ or $t4, $v0, $at ## $t4 = 00100000 -/* 093D0 8083B5E0 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -/* 093D4 8083B5E4 0C01E221 */ jal func_80078884 -/* 093D8 8083B5E8 24044813 */ addiu $a0, $zero, 0x4813 ## $a0 = 00004813 -/* 093DC 8083B5EC 0C20C884 */ jal func_80832210 -/* 093E0 8083B5F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 093E4 8083B5F4 1000000E */ beq $zero, $zero, .L8083B630 -/* 093E8 8083B5F8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083B5FC: -/* 093EC 8083B5FC 0C01E221 */ jal func_80078884 -/* 093F0 8083B600 A20006AD */ sb $zero, 0x06AD($s0) ## 000006AD -/* 093F4 8083B604 1000000A */ beq $zero, $zero, .L8083B630 -/* 093F8 8083B608 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 093FC 8083B60C 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C -.L8083B610: -/* 09400 8083B610 3C013000 */ lui $at, 0x3000 ## $at = 30000000 -/* 09404 8083B614 01A17025 */ or $t6, $t5, $at ## $t6 = 30000000 -/* 09408 8083B618 AE0E067C */ sw $t6, 0x067C($s0) ## 0000067C -.L8083B61C: -/* 0940C 8083B61C 0C20C889 */ jal func_80832224 -/* 09410 8083B620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09414 8083B624 10000002 */ beq $zero, $zero, .L8083B630 -/* 09418 8083B628 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0941C 8083B62C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083B630: -/* 09420 8083B630 8FBF001C */ lw $ra, 0x001C($sp) -/* 09424 8083B634 8FB00018 */ lw $s0, 0x0018($sp) -/* 09428 8083B638 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0942C 8083B63C 03E00008 */ jr $ra -/* 09430 8083B640 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B644.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B644.s deleted file mode 100644 index 0bc7f613a0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B644.s +++ /dev/null @@ -1,198 +0,0 @@ -glabel func_8083B644 -/* 09434 8083B644 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 09438 8083B648 AFBF001C */ sw $ra, 0x001C($sp) -/* 0943C 8083B64C AFB00018 */ sw $s0, 0x0018($sp) -/* 09440 8083B650 AFA5003C */ sw $a1, 0x003C($sp) -/* 09444 8083B654 8C8E0694 */ lw $t6, 0x0694($a0) ## 00000694 -/* 09448 8083B658 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0944C 8083B65C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09450 8083B660 AFAE0034 */ sw $t6, 0x0034($sp) -/* 09454 8083B664 8C860664 */ lw $a2, 0x0664($a0) ## 00000664 -/* 09458 8083B668 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 -/* 0945C 8083B66C 0006102B */ sltu $v0, $zero, $a2 -/* 09460 8083B670 1040000C */ beq $v0, $zero, .L8083B6A4 -/* 09464 8083B674 00000000 */ nop -/* 09468 8083B678 8CCF0004 */ lw $t7, 0x0004($a2) ## 00000004 -/* 0946C 8083B67C 3C030004 */ lui $v1, 0x0004 ## $v1 = 00040000 -/* 09470 8083B680 34630001 */ ori $v1, $v1, 0x0001 ## $v1 = 00040001 -/* 09474 8083B684 01E3C024 */ and $t8, $t7, $v1 -/* 09478 8083B688 00781026 */ xor $v0, $v1, $t8 -/* 0947C 8083B68C 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 09480 8083B690 14400004 */ bne $v0, $zero, .L8083B6A4 -/* 09484 8083B694 00000000 */ nop -/* 09488 8083B698 90C20117 */ lbu $v0, 0x0117($a2) ## 00000117 -/* 0948C 8083B69C 384200FF */ xori $v0, $v0, 0x00FF ## $v0 = 000000FF -/* 09490 8083B6A0 0002102B */ sltu $v0, $zero, $v0 -.L8083B6A4: -/* 09494 8083B6A4 14400004 */ bne $v0, $zero, .L8083B6B8 -/* 09498 8083B6A8 00402825 */ or $a1, $v0, $zero ## $a1 = 000000FF -/* 0949C 8083B6AC 86190690 */ lh $t9, 0x0690($s0) ## 00000690 -/* 094A0 8083B6B0 53200016 */ beql $t9, $zero, .L8083B70C -/* 094A4 8083B6B4 8FA90034 */ lw $t1, 0x0034($sp) -.L8083B6B8: -/* 094A8 8083B6B8 86030690 */ lh $v1, 0x0690($s0) ## 00000690 -/* 094AC 8083B6BC 28620000 */ slti $v0, $v1, 0x0000 -/* 094B0 8083B6C0 10400008 */ beq $v0, $zero, .L8083B6E4 -/* 094B4 8083B6C4 00000000 */ nop -/* 094B8 8083B6C8 04600003 */ bltz $v1, .L8083B6D8 -/* 094BC 8083B6CC 00032023 */ subu $a0, $zero, $v1 -/* 094C0 8083B6D0 10000001 */ beq $zero, $zero, .L8083B6D8 -/* 094C4 8083B6D4 00602025 */ or $a0, $v1, $zero ## $a0 = 00040001 -.L8083B6D8: -/* 094C8 8083B6D8 3082FF00 */ andi $v0, $a0, 0xFF00 ## $v0 = 00000000 -/* 094CC 8083B6DC 38420200 */ xori $v0, $v0, 0x0200 ## $v0 = 00000200 -/* 094D0 8083B6E0 0002102B */ sltu $v0, $zero, $v0 -.L8083B6E4: -/* 094D4 8083B6E4 14400003 */ bne $v0, $zero, .L8083B6F4 -/* 094D8 8083B6E8 00404025 */ or $t0, $v0, $zero ## $t0 = 00000200 -/* 094DC 8083B6EC 14A00006 */ bne $a1, $zero, .L8083B708 -/* 094E0 8083B6F0 00C03825 */ or $a3, $a2, $zero ## $a3 = 00000000 -.L8083B6F4: -/* 094E4 8083B6F4 10400004 */ beq $v0, $zero, .L8083B708 -/* 094E8 8083B6F8 8E07068C */ lw $a3, 0x068C($s0) ## 0000068C -/* 094EC 8083B6FC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 094F0 8083B700 10000001 */ beq $zero, $zero, .L8083B708 -/* 094F4 8083B704 AFA00034 */ sw $zero, 0x0034($sp) -.L8083B708: -/* 094F8 8083B708 8FA90034 */ lw $t1, 0x0034($sp) -.L8083B70C: -/* 094FC 8083B70C 15200003 */ bne $t1, $zero, .L8083B71C -/* 09500 8083B710 00000000 */ nop -/* 09504 8083B714 50E00072 */ beql $a3, $zero, .L8083B8E0 -/* 09508 8083B718 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083B71C: -/* 0950C 8083B71C 10C00005 */ beq $a2, $zero, .L8083B734 -/* 09510 8083B720 8FAA0034 */ lw $t2, 0x0034($sp) -/* 09514 8083B724 50CA0004 */ beql $a2, $t2, .L8083B738 -/* 09518 8083B728 8E03067C */ lw $v1, 0x067C($s0) ## 0000067C -/* 0951C 8083B72C 54C7006C */ bnel $a2, $a3, .L8083B8E0 -/* 09520 8083B730 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083B734: -/* 09524 8083B734 8E03067C */ lw $v1, 0x067C($s0) ## 0000067C -.L8083B738: -/* 09528 8083B738 306B0800 */ andi $t3, $v1, 0x0800 ## $t3 = 00000000 -/* 0952C 8083B73C 51600011 */ beql $t3, $zero, .L8083B784 -/* 09530 8083B740 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 09534 8083B744 8E0203AC */ lw $v0, 0x03AC($s0) ## 000003AC -/* 09538 8083B748 50400065 */ beql $v0, $zero, .L8083B8E0 -/* 0953C 8083B74C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09540 8083B750 1500000B */ bne $t0, $zero, .L8083B780 -/* 09544 8083B754 8FAC0034 */ lw $t4, 0x0034($sp) -/* 09548 8083B758 5182000A */ beql $t4, $v0, .L8083B784 -/* 0954C 8083B75C 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 09550 8083B760 50E20008 */ beql $a3, $v0, .L8083B784 -/* 09554 8083B764 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 09558 8083B768 5180005D */ beql $t4, $zero, .L8083B8E0 -/* 0955C 8083B76C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09560 8083B770 8D8D0004 */ lw $t5, 0x0004($t4) ## 00000004 -/* 09564 8083B774 000D73C0 */ sll $t6, $t5, 15 -/* 09568 8083B778 05C30059 */ bgezl $t6, .L8083B8E0 -/* 0956C 8083B77C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083B780: -/* 09570 8083B780 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -.L8083B784: -/* 09574 8083B784 0003CA00 */ sll $t9, $v1, 8 -/* 09578 8083B788 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 0957C 8083B78C 57000010 */ bnel $t8, $zero, .L8083B7D0 -/* 09580 8083B790 8FAB0034 */ lw $t3, 0x0034($sp) -/* 09584 8083B794 0720000D */ bltz $t9, .L8083B7CC -/* 09588 8083B798 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0958C 8083B79C AFA50024 */ sw $a1, 0x0024($sp) -/* 09590 8083B7A0 AFA7002C */ sw $a3, 0x002C($sp) -/* 09594 8083B7A4 0C20CCAE */ jal func_808332B8 -/* 09598 8083B7A8 AFA80028 */ sw $t0, 0x0028($sp) -/* 0959C 8083B7AC 8FA50024 */ lw $a1, 0x0024($sp) -/* 095A0 8083B7B0 8FA7002C */ lw $a3, 0x002C($sp) -/* 095A4 8083B7B4 10400049 */ beq $v0, $zero, .L8083B8DC -/* 095A8 8083B7B8 8FA80028 */ lw $t0, 0x0028($sp) -/* 095AC 8083B7BC 8E090680 */ lw $t1, 0x0680($s0) ## 00000680 -/* 095B0 8083B7C0 312A0400 */ andi $t2, $t1, 0x0400 ## $t2 = 00000000 -/* 095B4 8083B7C4 55400046 */ bnel $t2, $zero, .L8083B8E0 -/* 095B8 8083B7C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083B7CC: -/* 095BC 8083B7CC 8FAB0034 */ lw $t3, 0x0034($sp) -.L8083B7D0: -/* 095C0 8083B7D0 11600017 */ beq $t3, $zero, .L8083B830 -/* 095C4 8083B7D4 00000000 */ nop -/* 095C8 8083B7D8 8E0C0680 */ lw $t4, 0x0680($s0) ## 00000680 -/* 095CC 8083B7DC 3C0E8086 */ lui $t6, %hi(D_80858AB4) ## $t6 = 80860000 -/* 095D0 8083B7E0 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 095D4 8083B7E4 358D0002 */ ori $t5, $t4, 0x0002 ## $t5 = 00000002 -/* 095D8 8083B7E8 AE0D0680 */ sw $t5, 0x0680($s0) ## 00000680 -/* 095DC 8083B7EC 8DCE8AB4 */ lw $t6, %lo(D_80858AB4)($t6) -/* 095E0 8083B7F0 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 095E4 8083B7F4 8FB90034 */ lw $t9, 0x0034($sp) -/* 095E8 8083B7F8 95CF000C */ lhu $t7, 0x000C($t6) ## 8086000C -/* 095EC 8083B7FC 01E1C027 */ nor $t8, $t7, $at -/* 095F0 8083B800 13000005 */ beq $t8, $zero, .L8083B818 -/* 095F4 8083B804 00000000 */ nop -/* 095F8 8083B808 8F290004 */ lw $t1, 0x0004($t9) ## 00000004 -/* 095FC 8083B80C 000953C0 */ sll $t2, $t1, 15 -/* 09600 8083B810 05410003 */ bgez $t2, .L8083B820 -/* 09604 8083B814 00000000 */ nop -.L8083B818: -/* 09608 8083B818 10000005 */ beq $zero, $zero, .L8083B830 -/* 0960C 8083B81C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -.L8083B820: -/* 09610 8083B820 14E00003 */ bne $a3, $zero, .L8083B830 -/* 09614 8083B824 00000000 */ nop -/* 09618 8083B828 1000002D */ beq $zero, $zero, .L8083B8E0 -/* 0961C 8083B82C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083B830: -/* 09620 8083B830 10E00022 */ beq $a3, $zero, .L8083B8BC -/* 09624 8083B834 3C0D8086 */ lui $t5, %hi(D_80858AB4) ## $t5 = 80860000 -/* 09628 8083B838 15000005 */ bne $t0, $zero, .L8083B850 -/* 0962C 8083B83C 00000000 */ nop -/* 09630 8083B840 8E0B0680 */ lw $t3, 0x0680($s0) ## 00000680 -/* 09634 8083B844 3C010020 */ lui $at, 0x0020 ## $at = 00200000 -/* 09638 8083B848 01616025 */ or $t4, $t3, $at ## $t4 = 00200000 -/* 0963C 8083B84C AE0C0680 */ sw $t4, 0x0680($s0) ## 00000680 -.L8083B850: -/* 09640 8083B850 8DAD8AB4 */ lw $t5, %lo(D_80858AB4)($t5) -/* 09644 8083B854 2401FFF7 */ addiu $at, $zero, 0xFFF7 ## $at = FFFFFFF7 -/* 09648 8083B858 95AE000C */ lhu $t6, 0x000C($t5) ## 8086000C -/* 0964C 8083B85C 01C17827 */ nor $t7, $t6, $at -/* 09650 8083B860 51E00006 */ beql $t7, $zero, .L8083B87C -/* 09654 8083B864 AFA70034 */ sw $a3, 0x0034($sp) -/* 09658 8083B868 55000004 */ bnel $t0, $zero, .L8083B87C -/* 0965C 8083B86C AFA70034 */ sw $a3, 0x0034($sp) -/* 09660 8083B870 1000001B */ beq $zero, $zero, .L8083B8E0 -/* 09664 8083B874 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09668 8083B878 AFA70034 */ sw $a3, 0x0034($sp) -.L8083B87C: -/* 0966C 8083B87C 15000003 */ bne $t0, $zero, .L8083B88C -/* 09670 8083B880 AE000694 */ sw $zero, 0x0694($s0) ## 00000694 -/* 09674 8083B884 54A00009 */ bnel $a1, $zero, .L8083B8AC -/* 09678 8083B888 90E20117 */ lbu $v0, 0x0117($a3) ## 00000117 -.L8083B88C: -/* 0967C 8083B88C 86030690 */ lh $v1, 0x0690($s0) ## 00000690 -/* 09680 8083B890 04600003 */ bltz $v1, .L8083B8A0 -/* 09684 8083B894 0003C023 */ subu $t8, $zero, $v1 -/* 09688 8083B898 10000008 */ beq $zero, $zero, .L8083B8BC -/* 0968C 8083B89C A4E3010E */ sh $v1, 0x010E($a3) ## 0000010E -.L8083B8A0: -/* 09690 8083B8A0 10000006 */ beq $zero, $zero, .L8083B8BC -/* 09694 8083B8A4 A4F8010E */ sh $t8, 0x010E($a3) ## 0000010E -/* 09698 8083B8A8 90E20117 */ lbu $v0, 0x0117($a3) ## 00000117 -.L8083B8AC: -/* 0969C 8083B8AC 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 096A0 8083B8B0 10410002 */ beq $v0, $at, .L8083B8BC -/* 096A4 8083B8B4 24590600 */ addiu $t9, $v0, 0x0600 ## $t9 = 00000600 -/* 096A8 8083B8B8 A4F9010E */ sh $t9, 0x010E($a3) ## 0000010E -.L8083B8BC: -/* 096AC 8083B8BC 3C098086 */ lui $t1, %hi(D_80858AA4) ## $t1 = 80860000 -/* 096B0 8083B8C0 8D298AA4 */ lw $t1, %lo(D_80858AA4)($t1) -/* 096B4 8083B8C4 A209015F */ sb $t1, 0x015F($s0) ## 0000015F -/* 096B8 8083B8C8 8FA50034 */ lw $a1, 0x0034($sp) -/* 096BC 8083B8CC 0C214C52 */ jal func_80853148 -/* 096C0 8083B8D0 8FA4003C */ lw $a0, 0x003C($sp) -/* 096C4 8083B8D4 10000002 */ beq $zero, $zero, .L8083B8E0 -/* 096C8 8083B8D8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083B8DC: -/* 096CC 8083B8DC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083B8E0: -/* 096D0 8083B8E0 8FBF001C */ lw $ra, 0x001C($sp) -/* 096D4 8083B8E4 8FB00018 */ lw $s0, 0x0018($sp) -/* 096D8 8083B8E8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 096DC 8083B8EC 03E00008 */ jr $ra -/* 096E0 8083B8F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B8F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B8F4.s deleted file mode 100644 index 6552ada5dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B8F4.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_8083B8F4 -/* 096E4 8083B8F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 096E8 8083B8F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 096EC 8083B8FC 8C8E067C */ lw $t6, 0x067C($a0) ## 0000067C -/* 096F0 8083B900 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 096F4 8083B904 34210800 */ ori $at, $at, 0x0800 ## $at = 00800800 -/* 096F8 8083B908 01C17824 */ and $t7, $t6, $at -/* 096FC 8083B90C 15E0001D */ bne $t7, $zero, .L8083B984 -/* 09700 8083B910 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 09704 8083B914 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 09708 8083B918 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0970C 8083B91C 0C030129 */ jal Gameplay_GetCamera -/* 09710 8083B920 AFA60018 */ sw $a2, 0x0018($sp) -/* 09714 8083B924 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 09718 8083B928 0C01691C */ jal func_8005A470 -/* 0971C 8083B92C 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 09720 8083B930 10400014 */ beq $v0, $zero, .L8083B984 -/* 09724 8083B934 8FA60018 */ lw $a2, 0x0018($sp) -/* 09728 8083B938 94D80088 */ lhu $t8, 0x0088($a2) ## 00000088 -/* 0972C 8083B93C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 09730 8083B940 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 09734 8083B944 5720000C */ bnel $t9, $zero, .L8083B978 -/* 09738 8083B948 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 0973C 8083B94C 0C20CCAE */ jal func_808332B8 -/* 09740 8083B950 AFA60018 */ sw $a2, 0x0018($sp) -/* 09744 8083B954 1040000B */ beq $v0, $zero, .L8083B984 -/* 09748 8083B958 8FA60018 */ lw $a2, 0x0018($sp) -/* 0974C 8083B95C 8CC80678 */ lw $t0, 0x0678($a2) ## 00000678 -/* 09750 8083B960 C4C40084 */ lwc1 $f4, 0x0084($a2) ## 00000084 -/* 09754 8083B964 C506002C */ lwc1 $f6, 0x002C($t0) ## 0000002C -/* 09758 8083B968 4606203C */ c.lt.s $f4, $f6 -/* 0975C 8083B96C 00000000 */ nop -/* 09760 8083B970 45000004 */ bc1f .L8083B984 -/* 09764 8083B974 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -.L8083B978: -/* 09768 8083B978 A0C906AD */ sb $t1, 0x06AD($a2) ## 000006AD -/* 0976C 8083B97C 10000002 */ beq $zero, $zero, .L8083B988 -/* 09770 8083B980 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083B984: -/* 09774 8083B984 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083B988: -/* 09778 8083B988 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0977C 8083B98C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 09780 8083B990 03E00008 */ jr $ra -/* 09784 8083B994 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B998.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B998.s deleted file mode 100644 index 184fac365f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B998.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_8083B998 -/* 09788 8083B998 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0978C 8083B99C AFBF0014 */ sw $ra, 0x0014($sp) -/* 09790 8083B9A0 908E06AD */ lbu $t6, 0x06AD($a0) ## 000006AD -/* 09794 8083B9A4 51C00006 */ beql $t6, $zero, .L8083B9C0 -/* 09798 8083B9A8 8C820664 */ lw $v0, 0x0664($a0) ## 00000664 -/* 0979C 8083B9AC 0C20EC10 */ jal func_8083B040 -/* 097A0 8083B9B0 00000000 */ nop -/* 097A4 8083B9B4 10000032 */ beq $zero, $zero, .L8083BA80 -/* 097A8 8083B9B8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 097AC 8083B9BC 8C820664 */ lw $v0, 0x0664($a0) ## 00000664 -.L8083B9C0: -/* 097B0 8083B9C0 50400011 */ beql $v0, $zero, .L8083BA08 -/* 097B4 8083B9C4 848A0690 */ lh $t2, 0x0690($a0) ## 00000690 -/* 097B8 8083B9C8 8C4F0004 */ lw $t7, 0x0004($v0) ## 00000005 -/* 097BC 8083B9CC 3C030004 */ lui $v1, 0x0004 ## $v1 = 00040000 -/* 097C0 8083B9D0 34630001 */ ori $v1, $v1, 0x0001 ## $v1 = 00040001 -/* 097C4 8083B9D4 01E3C024 */ and $t8, $t7, $v1 -/* 097C8 8083B9D8 50780006 */ beql $v1, $t8, .L8083B9F4 -/* 097CC 8083B9DC 8C880680 */ lw $t0, 0x0680($a0) ## 00000680 -/* 097D0 8083B9E0 90590117 */ lbu $t9, 0x0117($v0) ## 00000118 -/* 097D4 8083B9E4 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 097D8 8083B9E8 53210007 */ beql $t9, $at, .L8083BA08 -/* 097DC 8083B9EC 848A0690 */ lh $t2, 0x0690($a0) ## 00000690 -/* 097E0 8083B9F0 8C880680 */ lw $t0, 0x0680($a0) ## 00000680 -.L8083B9F4: -/* 097E4 8083B9F4 3C010020 */ lui $at, 0x0020 ## $at = 00200000 -/* 097E8 8083B9F8 01014825 */ or $t1, $t0, $at ## $t1 = 00200000 -/* 097EC 8083B9FC 1000001F */ beq $zero, $zero, .L8083BA7C -/* 097F0 8083BA00 AC890680 */ sw $t1, 0x0680($a0) ## 00000680 -/* 097F4 8083BA04 848A0690 */ lh $t2, 0x0690($a0) ## 00000690 -.L8083BA08: -/* 097F8 8083BA08 5540001D */ bnel $t2, $zero, .L8083BA80 -/* 097FC 8083BA0C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09800 8083BA10 AFA40018 */ sw $a0, 0x0018($sp) -/* 09804 8083BA14 0C023A71 */ jal func_8008E9C4 -/* 09808 8083BA18 AFA5001C */ sw $a1, 0x001C($sp) -/* 0980C 8083BA1C 8FA40018 */ lw $a0, 0x0018($sp) -/* 09810 8083BA20 14400016 */ bne $v0, $zero, .L8083BA7C -/* 09814 8083BA24 8FA5001C */ lw $a1, 0x001C($sp) -/* 09818 8083BA28 3C0B8086 */ lui $t3, %hi(D_80858AB4) ## $t3 = 80860000 -/* 0981C 8083BA2C 8D6B8AB4 */ lw $t3, %lo(D_80858AB4)($t3) -/* 09820 8083BA30 2401FFF7 */ addiu $at, $zero, 0xFFF7 ## $at = FFFFFFF7 -/* 09824 8083BA34 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 09828 8083BA38 956C000C */ lhu $t4, 0x000C($t3) ## 8086000C -/* 0982C 8083BA3C 01816827 */ nor $t5, $t4, $at -/* 09830 8083BA40 55A0000F */ bnel $t5, $zero, .L8083BA80 -/* 09834 8083BA44 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09838 8083BA48 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 0983C 8083BA4C 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 09840 8083BA50 85C204B2 */ lh $v0, 0x04B2($t6) ## 801604B2 -/* 09844 8083BA54 10410009 */ beq $v0, $at, .L8083BA7C -/* 09848 8083BA58 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 0984C 8083BA5C 50410008 */ beql $v0, $at, .L8083BA80 -/* 09850 8083BA60 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09854 8083BA64 0C20EE3D */ jal func_8083B8F4 -/* 09858 8083BA68 00000000 */ nop -/* 0985C 8083BA6C 54400004 */ bnel $v0, $zero, .L8083BA80 -/* 09860 8083BA70 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09864 8083BA74 0C01E221 */ jal func_80078884 -/* 09868 8083BA78 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -.L8083BA7C: -/* 0986C 8083BA7C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083BA80: -/* 09870 8083BA80 8FBF0014 */ lw $ra, 0x0014($sp) -/* 09874 8083BA84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 09878 8083BA88 03E00008 */ jr $ra -/* 0987C 8083BA8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BA90.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BA90.s deleted file mode 100644 index 8739a6ede1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BA90.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_8083BA90 -/* 09880 8083BA90 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 09884 8083BA94 AFBF001C */ sw $ra, 0x001C($sp) -/* 09888 8083BA98 AFB00018 */ sw $s0, 0x0018($sp) -/* 0988C 8083BA9C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 09890 8083BAA0 AFA40020 */ sw $a0, 0x0020($sp) -/* 09894 8083BAA4 0C20DE52 */ jal func_80837948 -/* 09898 8083BAA8 AFA7002C */ sw $a3, 0x002C($sp) -/* 0989C 8083BAAC 3C068084 */ lui $a2, %hi(func_80844AF4) ## $a2 = 80840000 -/* 098A0 8083BAB0 24C64AF4 */ addiu $a2, $a2, %lo(func_80844AF4) ## $a2 = 80844AF4 -/* 098A4 8083BAB4 8FA40020 */ lw $a0, 0x0020($sp) -/* 098A8 8083BAB8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 098AC 8083BABC 0C20D716 */ jal func_80835C58 -/* 098B0 8083BAC0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 098B4 8083BAC4 920E0692 */ lbu $t6, 0x0692($s0) ## 00000692 -/* 098B8 8083BAC8 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 098BC 8083BACC 96190088 */ lhu $t9, 0x0088($s0) ## 00000088 -/* 098C0 8083BAD0 35CF0002 */ ori $t7, $t6, 0x0002 ## $t7 = 00000002 -/* 098C4 8083BAD4 A20F0692 */ sb $t7, 0x0692($s0) ## 00000692 -/* 098C8 8083BAD8 A618083C */ sh $t8, 0x083C($s0) ## 0000083C -/* 098CC 8083BADC C7A4002C */ lwc1 $f4, 0x002C($sp) -/* 098D0 8083BAE0 3328FFFE */ andi $t0, $t9, 0xFFFE ## $t0 = 00000000 -/* 098D4 8083BAE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 098D8 8083BAE8 E6040838 */ swc1 $f4, 0x0838($s0) ## 00000838 -/* 098DC 8083BAEC C7A60030 */ lwc1 $f6, 0x0030($sp) -/* 098E0 8083BAF0 A6080088 */ sh $t0, 0x0088($s0) ## 00000088 -/* 098E4 8083BAF4 A2000893 */ sb $zero, 0x0893($s0) ## 00000893 -/* 098E8 8083BAF8 0C20CA15 */ jal func_80832854 -/* 098EC 8083BAFC E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -/* 098F0 8083BB00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 098F4 8083BB04 0C20C9A6 */ jal func_80832698 -/* 098F8 8083BB08 24056801 */ addiu $a1, $zero, 0x6801 ## $a1 = 00006801 -/* 098FC 8083BB0C 8FBF001C */ lw $ra, 0x001C($sp) -/* 09900 8083BB10 8FB00018 */ lw $s0, 0x0018($sp) -/* 09904 8083BB14 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 09908 8083BB18 03E00008 */ jr $ra -/* 0990C 8083BB1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BB20.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BB20.s deleted file mode 100644 index cc2a687c64..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BB20.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_8083BB20 -/* 09910 8083BB20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 09914 8083BB24 AFBF0014 */ sw $ra, 0x0014($sp) -/* 09918 8083BB28 8C8E067C */ lw $t6, 0x067C($a0) ## 0000067C -/* 0991C 8083BB2C 000E7A40 */ sll $t7, $t6, 9 -/* 09920 8083BB30 05E20017 */ bltzl $t7, .L8083BB90 -/* 09924 8083BB34 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09928 8083BB38 0C023C60 */ jal func_8008F180 -/* 0992C 8083BB3C AFA40018 */ sw $a0, 0x0018($sp) -/* 09930 8083BB40 10400012 */ beq $v0, $zero, .L8083BB8C -/* 09934 8083BB44 8FA40018 */ lw $a0, 0x0018($sp) -/* 09938 8083BB48 3C188085 */ lui $t8, %hi(D_80853614) ## $t8 = 80850000 -/* 0993C 8083BB4C 8F183614 */ lw $t8, %lo(D_80853614)($t8) -/* 09940 8083BB50 1700000C */ bne $t8, $zero, .L8083BB84 -/* 09944 8083BB54 00000000 */ nop -/* 09948 8083BB58 90990002 */ lbu $t9, 0x0002($a0) ## 00000002 -/* 0994C 8083BB5C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 09950 8083BB60 3C088086 */ lui $t0, %hi(D_80858AB4) ## $t0 = 80860000 -/* 09954 8083BB64 5321000A */ beql $t9, $at, .L8083BB90 -/* 09958 8083BB68 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0995C 8083BB6C 8D088AB4 */ lw $t0, %lo(D_80858AB4)($t0) -/* 09960 8083BB70 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 09964 8083BB74 9509000C */ lhu $t1, 0x000C($t0) ## 8086000C -/* 09968 8083BB78 01215027 */ nor $t2, $t1, $at -/* 0996C 8083BB7C 55400004 */ bnel $t2, $zero, .L8083BB90 -/* 09970 8083BB80 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083BB84: -/* 09974 8083BB84 10000002 */ beq $zero, $zero, .L8083BB90 -/* 09978 8083BB88 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083BB8C: -/* 0997C 8083BB8C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083BB90: -/* 09980 8083BB90 8FBF0014 */ lw $ra, 0x0014($sp) -/* 09984 8083BB94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 09988 8083BB98 03E00008 */ jr $ra -/* 0998C 8083BB9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BBA0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BBA0.s deleted file mode 100644 index 8ee7863126..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BBA0.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8083BBA0 -/* 09990 8083BBA0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 09994 8083BBA4 AFBF001C */ sw $ra, 0x001C($sp) -/* 09998 8083BBA8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0999C 8083BBAC 0C20EEC8 */ jal func_8083BB20 -/* 099A0 8083BBB0 AFA50024 */ sw $a1, 0x0024($sp) -/* 099A4 8083BBB4 1040000E */ beq $v0, $zero, .L8083BBF0 -/* 099A8 8083BBB8 3C0E8085 */ lui $t6, %hi(D_808535E4) ## $t6 = 80850000 -/* 099AC 8083BBBC 8DCE35E4 */ lw $t6, %lo(D_808535E4)($t6) -/* 099B0 8083BBC0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 099B4 8083BBC4 8FA40024 */ lw $a0, 0x0024($sp) -/* 099B8 8083BBC8 11C10009 */ beq $t6, $at, .L8083BBF0 -/* 099BC 8083BBCC 8FA50020 */ lw $a1, 0x0020($sp) -/* 099C0 8083BBD0 3C014090 */ lui $at, 0x4090 ## $at = 40900000 -/* 099C4 8083BBD4 44812000 */ mtc1 $at, $f4 ## $f4 = 4.50 -/* 099C8 8083BBD8 24060011 */ addiu $a2, $zero, 0x0011 ## $a2 = 00000011 -/* 099CC 8083BBDC 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 099D0 8083BBE0 0C20EEA4 */ jal func_8083BA90 -/* 099D4 8083BBE4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 099D8 8083BBE8 10000002 */ beq $zero, $zero, .L8083BBF4 -/* 099DC 8083BBEC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083BBF0: -/* 099E0 8083BBF0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083BBF4: -/* 099E4 8083BBF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 099E8 8083BBF8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 099EC 8083BBFC 03E00008 */ jr $ra -/* 099F0 8083BC00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s deleted file mode 100644 index 43e9fe33b4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8083BC04 -/* 099F4 8083BC04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 099F8 8083BC08 AFA40018 */ sw $a0, 0x0018($sp) -/* 099FC 8083BC0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 09A00 8083BC10 AFA5001C */ sw $a1, 0x001C($sp) -/* 09A04 8083BC14 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 09A08 8083BC18 3C068084 */ lui $a2, %hi(func_80844708) ## $a2 = 80840000 -/* 09A0C 8083BC1C 24C64708 */ addiu $a2, $a2, %lo(func_80844708) ## $a2 = 80844708 -/* 09A10 8083BC20 8FA50018 */ lw $a1, 0x0018($sp) -/* 09A14 8083BC24 0C20D716 */ jal func_80835C58 -/* 09A18 8083BC28 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09A1C 8083BC2C 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 -/* 09A20 8083BC30 44812000 */ mtc1 $at, $f4 ## $f4 = 1.25 -/* 09A24 8083BC34 3C018085 */ lui $at, %hi(D_808535E8) ## $at = 80850000 -/* 09A28 8083BC38 C42635E8 */ lwc1 $f6, %lo(D_808535E8)($at) -/* 09A2C 8083BC3C 8FA20018 */ lw $v0, 0x0018($sp) -/* 09A30 8083BC40 3C068085 */ lui $a2, %hi(D_80853A94) ## $a2 = 80850000 -/* 09A34 8083BC44 46062202 */ mul.s $f8, $f4, $f6 -/* 09A38 8083BC48 904E015B */ lbu $t6, 0x015B($v0) ## 0000015B -/* 09A3C 8083BC4C 8FA4001C */ lw $a0, 0x001C($sp) -/* 09A40 8083BC50 244501B4 */ addiu $a1, $v0, 0x01B4 ## $a1 = 000001B4 -/* 09A44 8083BC54 000E7880 */ sll $t7, $t6, 2 -/* 09A48 8083BC58 00CF3021 */ addu $a2, $a2, $t7 -/* 09A4C 8083BC5C 8CC63A94 */ lw $a2, %lo(D_80853A94)($a2) -/* 09A50 8083BC60 44074000 */ mfc1 $a3, $f8 -/* 09A54 8083BC64 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop -/* 09A58 8083BC68 00000000 */ nop -/* 09A5C 8083BC6C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 09A60 8083BC70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 09A64 8083BC74 03E00008 */ jr $ra -/* 09A68 8083BC78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC7C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC7C.s deleted file mode 100644 index 745174a42d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC7C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8083BC7C -/* 09A6C 8083BC7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 09A70 8083BC80 AFBF0014 */ sw $ra, 0x0014($sp) -/* 09A74 8083BC84 908E0846 */ lbu $t6, 0x0846($a0) ## 00000846 -/* 09A78 8083BC88 3C198085 */ lui $t9, %hi(D_808535E4) ## $t9 = 80850000 -/* 09A7C 8083BC8C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09A80 8083BC90 008E7821 */ addu $t7, $a0, $t6 -/* 09A84 8083BC94 81F8084B */ lb $t8, 0x084B($t7) ## 0000084B -/* 09A88 8083BC98 17000009 */ bne $t8, $zero, .L8083BCC0 -/* 09A8C 8083BC9C 00000000 */ nop -/* 09A90 8083BCA0 8F3935E4 */ lw $t9, %lo(D_808535E4)($t9) -/* 09A94 8083BCA4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 09A98 8083BCA8 13210005 */ beq $t9, $at, .L8083BCC0 -/* 09A9C 8083BCAC 00000000 */ nop -/* 09AA0 8083BCB0 0C20EF01 */ jal func_8083BC04 -/* 09AA4 8083BCB4 00000000 */ nop -/* 09AA8 8083BCB8 10000001 */ beq $zero, $zero, .L8083BCC0 -/* 09AAC 8083BCBC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083BCC0: -/* 09AB0 8083BCC0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 09AB4 8083BCC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 09AB8 8083BCC8 03E00008 */ jr $ra -/* 09ABC 8083BCCC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BCD0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BCD0.s deleted file mode 100644 index 37662f520c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BCD0.s +++ /dev/null @@ -1,71 +0,0 @@ -.late_rodata -glabel D_8085538C - .word 0x40B9999A - -.text -glabel func_8083BCD0 -/* 09AC0 8083BCD0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 09AC4 8083BCD4 AFB00020 */ sw $s0, 0x0020($sp) -/* 09AC8 8083BCD8 30C30001 */ andi $v1, $a2, 0x0001 ## $v1 = 00000000 -/* 09ACC 8083BCDC 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 09AD0 8083BCE0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 09AD4 8083BCE4 14600004 */ bne $v1, $zero, .L8083BCF8 -/* 09AD8 8083BCE8 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 09ADC 8083BCEC 3C018085 */ lui $at, %hi(D_8085538C) ## $at = 80850000 -/* 09AE0 8083BCF0 10000004 */ beq $zero, $zero, .L8083BD04 -/* 09AE4 8083BCF4 C420538C */ lwc1 $f0, %lo(D_8085538C)($at) -.L8083BCF8: -/* 09AE8 8083BCF8 3C014060 */ lui $at, 0x4060 ## $at = 40600000 -/* 09AEC 8083BCFC 44810000 */ mtc1 $at, $f0 ## $f0 = 3.50 -/* 09AF0 8083BD00 00000000 */ nop -.L8083BD04: -/* 09AF4 8083BD04 00107080 */ sll $t6, $s0, 2 -/* 09AF8 8083BD08 01D07023 */ subu $t6, $t6, $s0 -/* 09AFC 8083BD0C 000E7080 */ sll $t6, $t6, 2 -/* 09B00 8083BD10 3C058085 */ lui $a1, %hi(D_80853D4C) ## $a1 = 80850000 -/* 09B04 8083BD14 00AE2821 */ addu $a1, $a1, $t6 -/* 09B08 8083BD18 44060000 */ mfc1 $a2, $f0 -/* 09B0C 8083BD1C 240F6800 */ addiu $t7, $zero, 0x6800 ## $t7 = 00006800 -/* 09B10 8083BD20 AFAF0010 */ sw $t7, 0x0010($sp) -/* 09B14 8083BD24 8CA53D4C */ lw $a1, %lo(D_80853D4C)($a1) -/* 09B18 8083BD28 AFA3002C */ sw $v1, 0x002C($sp) -/* 09B1C 8083BD2C 0C20E250 */ jal func_80838940 -/* 09B20 8083BD30 AFA40038 */ sw $a0, 0x0038($sp) -/* 09B24 8083BD34 8FA40038 */ lw $a0, 0x0038($sp) -/* 09B28 8083BD38 8FA3002C */ lw $v1, 0x002C($sp) -/* 09B2C 8083BD3C 00101380 */ sll $v0, $s0, 14 -/* 09B30 8083BD40 849900B6 */ lh $t9, 0x00B6($a0) ## 000000B6 -/* 09B34 8083BD44 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 09B38 8083BD48 A4980850 */ sh $t8, 0x0850($a0) ## 00000850 -/* 09B3C 8083BD4C 03224021 */ addu $t0, $t9, $v0 -/* 09B40 8083BD50 A090084F */ sb $s0, 0x084F($a0) ## 0000084F -/* 09B44 8083BD54 14600005 */ bne $v1, $zero, .L8083BD6C -/* 09B48 8083BD58 A488083C */ sh $t0, 0x083C($a0) ## 0000083C -/* 09B4C 8083BD5C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 09B50 8083BD60 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 09B54 8083BD64 10000005 */ beq $zero, $zero, .L8083BD7C -/* 09B58 8083BD68 E4840838 */ swc1 $f4, 0x0838($a0) ## 00000838 -.L8083BD6C: -/* 09B5C 8083BD6C 3C014108 */ lui $at, 0x4108 ## $at = 41080000 -/* 09B60 8083BD70 44813000 */ mtc1 $at, $f6 ## $f6 = 8.50 -/* 09B64 8083BD74 00000000 */ nop -/* 09B68 8083BD78 E4860838 */ swc1 $f6, 0x0838($a0) ## 00000838 -.L8083BD7C: -/* 09B6C 8083BD7C 8C890680 */ lw $t1, 0x0680($a0) ## 00000680 -/* 09B70 8083BD80 3C010008 */ lui $at, 0x0008 ## $at = 00080000 -/* 09B74 8083BD84 01215025 */ or $t2, $t1, $at ## $t2 = 00080000 -/* 09B78 8083BD88 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 09B7C 8083BD8C 14410003 */ bne $v0, $at, .L8083BD9C -/* 09B80 8083BD90 AC8A0680 */ sw $t2, 0x0680($a0) ## 00000680 -/* 09B84 8083BD94 10000002 */ beq $zero, $zero, .L8083BDA0 -/* 09B88 8083BD98 2402083C */ addiu $v0, $zero, 0x083C ## $v0 = 0000083C -.L8083BD9C: -/* 09B8C 8083BD9C 2402083D */ addiu $v0, $zero, 0x083D ## $v0 = 0000083D -.L8083BDA0: -/* 09B90 8083BDA0 0C00BDF7 */ jal func_8002F7DC -/* 09B94 8083BDA4 3045FFFF */ andi $a1, $v0, 0xFFFF ## $a1 = 0000083D -/* 09B98 8083BDA8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 09B9C 8083BDAC 8FB00020 */ lw $s0, 0x0020($sp) -/* 09BA0 8083BDB0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 09BA4 8083BDB4 03E00008 */ jr $ra -/* 09BA8 8083BDB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BDBC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BDBC.s deleted file mode 100644 index a3484676f4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BDBC.s +++ /dev/null @@ -1,109 +0,0 @@ -glabel func_8083BDBC -/* 09BAC 8083BDBC 3C0E8086 */ lui $t6, %hi(D_80858AB4) ## $t6 = 80860000 -/* 09BB0 8083BDC0 8DCE8AB4 */ lw $t6, %lo(D_80858AB4)($t6) -/* 09BB4 8083BDC4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 09BB8 8083BDC8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 09BBC 8083BDCC AFB00020 */ sw $s0, 0x0020($sp) -/* 09BC0 8083BDD0 95CF000C */ lhu $t7, 0x000C($t6) ## 8086000C -/* 09BC4 8083BDD4 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 09BC8 8083BDD8 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 09BCC 8083BDDC 01E1C027 */ nor $t8, $t7, $at -/* 09BD0 8083BDE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 09BD4 8083BDE4 17000054 */ bne $t8, $zero, .L8083BF38 -/* 09BD8 8083BDE8 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 09BDC 8083BDEC 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 09BE0 8083BDF0 0325C821 */ addu $t9, $t9, $a1 -/* 09BE4 8083BDF4 93391CBF */ lbu $t9, 0x1CBF($t9) ## 00011CBF -/* 09BE8 8083BDF8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 09BEC 8083BDFC 3C088085 */ lui $t0, %hi(D_808535E4) ## $t0 = 80850000 -/* 09BF0 8083BE00 5321004E */ beql $t9, $at, .L8083BF3C -/* 09BF4 8083BE04 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09BF8 8083BE08 8D0835E4 */ lw $t0, %lo(D_808535E4)($t0) -/* 09BFC 8083BE0C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 09C00 8083BE10 24A407C0 */ addiu $a0, $a1, 0x07C0 ## $a0 = 000007C0 -/* 09C04 8083BE14 51010049 */ beql $t0, $at, .L8083BF3C -/* 09C08 8083BE18 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09C0C 8083BE1C 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 09C10 8083BE20 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 09C14 8083BE24 0C0107DF */ jal func_80041F7C -/* 09C18 8083BE28 AFA70034 */ sw $a3, 0x0034($sp) -/* 09C1C 8083BE2C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 09C20 8083BE30 50410042 */ beql $v0, $at, .L8083BF3C -/* 09C24 8083BE34 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09C28 8083BE38 92090846 */ lbu $t1, 0x0846($s0) ## 00000846 -/* 09C2C 8083BE3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09C30 8083BE40 02095021 */ addu $t2, $s0, $t1 -/* 09C34 8083BE44 8146084B */ lb $a2, 0x084B($t2) ## 0000084B -/* 09C38 8083BE48 1CC00037 */ bgtz $a2, .L8083BF28 -/* 09C3C 8083BE4C 00000000 */ nop -/* 09C40 8083BE50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09C44 8083BE54 0C20CEF3 */ jal func_80833BCC -/* 09C48 8083BE58 AFA6002C */ sw $a2, 0x002C($sp) -/* 09C4C 8083BE5C 10400036 */ beq $v0, $zero, .L8083BF38 -/* 09C50 8083BE60 8FA6002C */ lw $a2, 0x002C($sp) -/* 09C54 8083BE64 920B0002 */ lbu $t3, 0x0002($s0) ## 00000002 -/* 09C58 8083BE68 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 09C5C 8083BE6C 11610018 */ beq $t3, $at, .L8083BED0 -/* 09C60 8083BE70 00000000 */ nop -/* 09C64 8083BE74 04C10012 */ bgez $a2, .L8083BEC0 -/* 09C68 8083BE78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09C6C 8083BE7C 3C0C8016 */ lui $t4, %hi(gGameInfo) -/* 09C70 8083BE80 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) -/* 09C74 8083BE84 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 09C78 8083BE88 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 09C7C 8083BE8C 858D009E */ lh $t5, 0x009E($t4) ## 8016009E -/* 09C80 8083BE90 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 09C84 8083BE94 24A52FE0 */ addiu $a1, $a1, 0x2FE0 ## $a1 = 04002FE0 -/* 09C88 8083BE98 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 09C8C 8083BE9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09C90 8083BEA0 8FA70034 */ lw $a3, 0x0034($sp) -/* 09C94 8083BEA4 468021A0 */ cvt.s.w $f6, $f4 -/* 09C98 8083BEA8 46083283 */ div.s $f10, $f6, $f8 -/* 09C9C 8083BEAC 44065000 */ mfc1 $a2, $f10 -/* 09CA0 8083BEB0 0C20E27A */ jal func_808389E8 -/* 09CA4 8083BEB4 00000000 */ nop -/* 09CA8 8083BEB8 10000020 */ beq $zero, $zero, .L8083BF3C -/* 09CAC 8083BEBC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083BEC0: -/* 09CB0 8083BEC0 0C20EF01 */ jal func_8083BC04 -/* 09CB4 8083BEC4 8FA50034 */ lw $a1, 0x0034($sp) -/* 09CB8 8083BEC8 1000001C */ beq $zero, $zero, .L8083BF3C -/* 09CBC 8083BECC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083BED0: -/* 09CC0 8083BED0 0C023C60 */ jal func_8008F180 -/* 09CC4 8083BED4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09CC8 8083BED8 5040000F */ beql $v0, $zero, .L8083BF18 -/* 09CCC 8083BEDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09CD0 8083BEE0 0C20D972 */ jal func_808365C8 -/* 09CD4 8083BEE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09CD8 8083BEE8 1040000A */ beq $v0, $zero, .L8083BF14 -/* 09CDC 8083BEEC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 09CE0 8083BEF0 44810000 */ mtc1 $at, $f0 ## $f0 = 5.00 -/* 09CE4 8083BEF4 8FA40034 */ lw $a0, 0x0034($sp) -/* 09CE8 8083BEF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 09CEC 8083BEFC 44070000 */ mfc1 $a3, $f0 -/* 09CF0 8083BF00 24060011 */ addiu $a2, $zero, 0x0011 ## $a2 = 00000011 -/* 09CF4 8083BF04 0C20EEA4 */ jal func_8083BA90 -/* 09CF8 8083BF08 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 09CFC 8083BF0C 1000000B */ beq $zero, $zero, .L8083BF3C -/* 09D00 8083BF10 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083BF14: -/* 09D04 8083BF14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8083BF18: -/* 09D08 8083BF18 0C20EF01 */ jal func_8083BC04 -/* 09D0C 8083BF1C 8FA50034 */ lw $a1, 0x0034($sp) -/* 09D10 8083BF20 10000006 */ beq $zero, $zero, .L8083BF3C -/* 09D14 8083BF24 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083BF28: -/* 09D18 8083BF28 0C20EF34 */ jal func_8083BCD0 -/* 09D1C 8083BF2C 8FA50034 */ lw $a1, 0x0034($sp) -/* 09D20 8083BF30 10000002 */ beq $zero, $zero, .L8083BF3C -/* 09D24 8083BF34 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083BF38: -/* 09D28 8083BF38 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083BF3C: -/* 09D2C 8083BF3C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 09D30 8083BF40 8FB00020 */ lw $s0, 0x0020($sp) -/* 09D34 8083BF44 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 09D38 8083BF48 03E00008 */ jr $ra -/* 09D3C 8083BF4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s deleted file mode 100644 index e8efde6d31..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s +++ /dev/null @@ -1,97 +0,0 @@ -glabel func_8083BF50 -/* 09D40 8083BF50 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 09D44 8083BF54 AFBF002C */ sw $ra, 0x002C($sp) -/* 09D48 8083BF58 AFB00028 */ sw $s0, 0x0028($sp) -/* 09D4C 8083BF5C AFA5003C */ sw $a1, 0x003C($sp) -/* 09D50 8083BF60 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 09D54 8083BF64 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 09D58 8083BF68 C4840868 */ lwc1 $f4, 0x0868($a0) ## 00000868 -/* 09D5C 8083BF6C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 09D60 8083BF70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 09D64 8083BF74 46062001 */ sub.s $f0, $f4, $f6 -/* 09D68 8083BF78 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -/* 09D6C 8083BF7C 4602003C */ c.lt.s $f0, $f2 -/* 09D70 8083BF80 00000000 */ nop -/* 09D74 8083BF84 45020005 */ bc1fl .L8083BF9C -/* 09D78 8083BF88 3C014160 */ lui $at, 0x4160 ## $at = 41600000 -/* 09D7C 8083BF8C 44814000 */ mtc1 $at, $f8 ## $f8 = 14.00 -/* 09D80 8083BF90 00000000 */ nop -/* 09D84 8083BF94 46080000 */ add.s $f0, $f0, $f8 -/* 09D88 8083BF98 3C014160 */ lui $at, 0x4160 ## $at = 41600000 -.L8083BF9C: -/* 09D8C 8083BF9C 44815000 */ mtc1 $at, $f10 ## $f10 = 14.00 -/* 09D90 8083BFA0 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 -/* 09D94 8083BFA4 460A003C */ c.lt.s $f0, $f10 -/* 09D98 8083BFA8 00000000 */ nop -/* 09D9C 8083BFAC 45020014 */ bc1fl .L8083C000 -/* 09DA0 8083BFB0 44812000 */ mtc1 $at, $f4 ## $f4 = 26.00 -/* 09DA4 8083BFB4 3C014130 */ lui $at, 0x4130 ## $at = 41300000 -/* 09DA8 8083BFB8 44816000 */ mtc1 $at, $f12 ## $f12 = 11.00 -/* 09DAC 8083BFBC 920E015B */ lbu $t6, 0x015B($s0) ## 0000015B -/* 09DB0 8083BFC0 3C068085 */ lui $a2, %hi(D_80853AC4) ## $a2 = 80850000 -/* 09DB4 8083BFC4 46006001 */ sub.s $f0, $f12, $f0 -/* 09DB8 8083BFC8 000E7880 */ sll $t7, $t6, 2 -/* 09DBC 8083BFCC 00CF3021 */ addu $a2, $a2, $t7 -/* 09DC0 8083BFD0 8CC63AC4 */ lw $a2, %lo(D_80853AC4)($a2) -/* 09DC4 8083BFD4 4602003C */ c.lt.s $f0, $f2 -/* 09DC8 8083BFD8 3C013FB0 */ lui $at, 0x3FB0 ## $at = 3FB00000 -/* 09DCC 8083BFDC 45000005 */ bc1f .L8083BFF4 -/* 09DD0 8083BFE0 00000000 */ nop -/* 09DD4 8083BFE4 44819000 */ mtc1 $at, $f18 ## $f18 = 1.38 -/* 09DD8 8083BFE8 46000407 */ neg.s $f16, $f0 -/* 09DDC 8083BFEC 46128002 */ mul.s $f0, $f16, $f18 -/* 09DE0 8083BFF0 00000000 */ nop -.L8083BFF4: -/* 09DE4 8083BFF4 10000014 */ beq $zero, $zero, .L8083C048 -/* 09DE8 8083BFF8 460C0003 */ div.s $f0, $f0, $f12 -/* 09DEC 8083BFFC 44812000 */ mtc1 $at, $f4 ## $f4 = 1.38 -.L8083C000: -/* 09DF0 8083C000 9218015B */ lbu $t8, 0x015B($s0) ## 0000015B -/* 09DF4 8083C004 3C068085 */ lui $a2, %hi(D_80853ADC) ## $a2 = 80850000 -/* 09DF8 8083C008 46002001 */ sub.s $f0, $f4, $f0 -/* 09DFC 8083C00C 0018C880 */ sll $t9, $t8, 2 -/* 09E00 8083C010 00D93021 */ addu $a2, $a2, $t9 -/* 09E04 8083C014 8CC63ADC */ lw $a2, %lo(D_80853ADC)($a2) -/* 09E08 8083C018 4602003C */ c.lt.s $f0, $f2 -/* 09E0C 8083C01C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 09E10 8083C020 45020006 */ bc1fl .L8083C03C -/* 09E14 8083C024 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 09E18 8083C028 44814000 */ mtc1 $at, $f8 ## $f8 = 12.00 -/* 09E1C 8083C02C 46000187 */ neg.s $f6, $f0 -/* 09E20 8083C030 46083002 */ mul.s $f0, $f6, $f8 -/* 09E24 8083C034 00000000 */ nop -/* 09E28 8083C038 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -.L8083C03C: -/* 09E2C 8083C03C 44815000 */ mtc1 $at, $f10 ## $f10 = 12.00 -/* 09E30 8083C040 00000000 */ nop -/* 09E34 8083C044 460A0003 */ div.s $f0, $f0, $f10 -.L8083C048: -/* 09E38 8083C048 00C02025 */ or $a0, $a2, $zero ## $a0 = 80850000 -/* 09E3C 8083C04C AFA60034 */ sw $a2, 0x0034($sp) -/* 09E40 8083C050 0C028800 */ jal SkelAnime_GetFrameCount - -/* 09E44 8083C054 E7A00030 */ swc1 $f0, 0x0030($sp) -/* 09E48 8083C058 C7B20030 */ lwc1 $f18, 0x0030($sp) -/* 09E4C 8083C05C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 09E50 8083C060 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 09E54 8083C064 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 09E58 8083C068 46808420 */ cvt.s.w $f16, $f16 -/* 09E5C 8083C06C 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 -/* 09E60 8083C070 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 09E64 8083C074 8FA60034 */ lw $a2, 0x0034($sp) -/* 09E68 8083C078 46126482 */ mul.s $f18, $f12, $f18 -/* 09E6C 8083C07C E7AE0010 */ swc1 $f14, 0x0010($sp) -/* 09E70 8083C080 8FA4003C */ lw $a0, 0x003C($sp) -/* 09E74 8083C084 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 09E78 8083C088 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 09E7C 8083C08C E7B00014 */ swc1 $f16, 0x0014($sp) -/* 09E80 8083C090 AFA80018 */ sw $t0, 0x0018($sp) -/* 09E84 8083C094 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 09E88 8083C098 E7B2001C */ swc1 $f18, 0x001C($sp) -/* 09E8C 8083C09C 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 09E90 8083C0A0 A609083C */ sh $t1, 0x083C($s0) ## 0000083C -/* 09E94 8083C0A4 8FBF002C */ lw $ra, 0x002C($sp) -/* 09E98 8083C0A8 8FB00028 */ lw $s0, 0x0028($sp) -/* 09E9C 8083C0AC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 09EA0 8083C0B0 03E00008 */ jr $ra -/* 09EA4 8083C0B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0B8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0B8.s deleted file mode 100644 index 4ab199ecee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0B8.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8083C0B8 -/* 09EA8 8083C0B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 09EAC 8083C0BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 09EB0 8083C0C0 AFA40018 */ sw $a0, 0x0018($sp) -/* 09EB4 8083C0C4 0C20E7FF */ jal func_80839FFC -/* 09EB8 8083C0C8 AFA5001C */ sw $a1, 0x001C($sp) -/* 09EBC 8083C0CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 09EC0 8083C0D0 0C20EFD4 */ jal func_8083BF50 -/* 09EC4 8083C0D4 8FA5001C */ lw $a1, 0x001C($sp) -/* 09EC8 8083C0D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 09ECC 8083C0DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 09ED0 8083C0E0 03E00008 */ jr $ra -/* 09ED4 8083C0E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0E8.s deleted file mode 100644 index e71e29d39c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0E8.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8083C0E8 -/* 09ED8 8083C0E8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 09EDC 8083C0EC AFB00018 */ sw $s0, 0x0018($sp) -/* 09EE0 8083C0F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 09EE4 8083C0F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 09EE8 8083C0F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 09EEC 8083C0FC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 09EF0 8083C100 3C068084 */ lui $a2, %hi(func_80840BC8) ## $a2 = 80840000 -/* 09EF4 8083C104 24C60BC8 */ addiu $a2, $a2, %lo(func_80840BC8) ## $a2 = 80840BC8 -/* 09EF8 8083C108 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 09EFC 8083C10C 0C20D716 */ jal func_80835C58 -/* 09F00 8083C110 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 09F04 8083C114 0C20CCCE */ jal func_80833338 -/* 09F08 8083C118 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09F0C 8083C11C 8FA40024 */ lw $a0, 0x0024($sp) -/* 09F10 8083C120 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 09F14 8083C124 0C20C899 */ jal func_80832264 -/* 09F18 8083C128 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 09F1C 8083C12C 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 09F20 8083C130 A60E083C */ sh $t6, 0x083C($s0) ## 0000083C -/* 09F24 8083C134 8FBF001C */ lw $ra, 0x001C($sp) -/* 09F28 8083C138 8FB00018 */ lw $s0, 0x0018($sp) -/* 09F2C 8083C13C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 09F30 8083C140 03E00008 */ jr $ra -/* 09F34 8083C144 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C148.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C148.s deleted file mode 100644 index 935db5d0b2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C148.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8083C148 -/* 09F38 8083C148 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 09F3C 8083C14C AFBF001C */ sw $ra, 0x001C($sp) -/* 09F40 8083C150 AFB00018 */ sw $s0, 0x0018($sp) -/* 09F44 8083C154 908E0692 */ lbu $t6, 0x0692($a0) ## 00000692 -/* 09F48 8083C158 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 09F4C 8083C15C 31CF0080 */ andi $t7, $t6, 0x0080 ## $t7 = 00000000 -/* 09F50 8083C160 55E00015 */ bnel $t7, $zero, .L8083C1B8 -/* 09F54 8083C164 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 09F58 8083C168 0C20EC04 */ jal func_8083B010 -/* 09F5C 8083C16C AFA50024 */ sw $a1, 0x0024($sp) -/* 09F60 8083C170 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 09F64 8083C174 8FA60024 */ lw $a2, 0x0024($sp) -/* 09F68 8083C178 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 09F6C 8083C17C 0018C900 */ sll $t9, $t8, 4 -/* 09F70 8083C180 07210005 */ bgez $t9, .L8083C198 -/* 09F74 8083C184 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 09F78 8083C188 0C20E3C6 */ jal func_80838F18 -/* 09F7C 8083C18C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 09F80 8083C190 10000004 */ beq $zero, $zero, .L8083C1A4 -/* 09F84 8083C194 920806AD */ lbu $t0, 0x06AD($s0) ## 000006AD -.L8083C198: -/* 09F88 8083C198 0C20E7E4 */ jal func_80839F90 -/* 09F8C 8083C19C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 09F90 8083C1A0 920806AD */ lbu $t0, 0x06AD($s0) ## 000006AD -.L8083C1A4: -/* 09F94 8083C1A4 29010004 */ slti $at, $t0, 0x0004 -/* 09F98 8083C1A8 50200003 */ beql $at, $zero, .L8083C1B8 -/* 09F9C 8083C1AC 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 09FA0 8083C1B0 A20006AD */ sb $zero, 0x06AD($s0) ## 000006AD -/* 09FA4 8083C1B4 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -.L8083C1B8: -/* 09FA8 8083C1B8 3C01FFEF */ lui $at, 0xFFEF ## $at = FFEF0000 -/* 09FAC 8083C1BC 34219FFF */ ori $at, $at, 0x9FFF ## $at = FFEF9FFF -/* 09FB0 8083C1C0 01215024 */ and $t2, $t1, $at -/* 09FB4 8083C1C4 AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C -/* 09FB8 8083C1C8 8FBF001C */ lw $ra, 0x001C($sp) -/* 09FBC 8083C1CC 8FB00018 */ lw $s0, 0x0018($sp) -/* 09FC0 8083C1D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 09FC4 8083C1D4 03E00008 */ jr $ra -/* 09FC8 8083C1D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C1DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C1DC.s deleted file mode 100644 index 060725164e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C1DC.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_8083C1DC -/* 09FCC 8083C1DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 09FD0 8083C1E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 09FD4 8083C1E4 AFA5001C */ sw $a1, 0x001C($sp) -/* 09FD8 8083C1E8 0C20CED5 */ jal func_80833B54 -/* 09FDC 8083C1EC AFA40018 */ sw $a0, 0x0018($sp) -/* 09FE0 8083C1F0 1440002A */ bne $v0, $zero, .L8083C29C -/* 09FE4 8083C1F4 8FA70018 */ lw $a3, 0x0018($sp) -/* 09FE8 8083C1F8 3C0E8085 */ lui $t6, %hi(D_808535E0) ## $t6 = 80850000 -/* 09FEC 8083C1FC 8DCE35E0 */ lw $t6, %lo(D_808535E0)($t6) -/* 09FF0 8083C200 55C00027 */ bnel $t6, $zero, .L8083C2A0 -/* 09FF4 8083C204 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 09FF8 8083C208 8CEF067C */ lw $t7, 0x067C($a3) ## 0000067C -/* 09FFC 8083C20C 3C198086 */ lui $t9, %hi(D_80858AB4) ## $t9 = 80860000 -/* 0A000 8083C210 000FC200 */ sll $t8, $t7, 8 -/* 0A004 8083C214 07020022 */ bltzl $t8, .L8083C2A0 -/* 0A008 8083C218 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A00C 8083C21C 8F398AB4 */ lw $t9, %lo(D_80858AB4)($t9) -/* 0A010 8083C220 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 0A014 8083C224 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 0A018 8083C228 9728000C */ lhu $t0, 0x000C($t9) ## 8086000C -/* 0A01C 8083C22C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0A020 8083C230 8FA5001C */ lw $a1, 0x001C($sp) -/* 0A024 8083C234 01014827 */ nor $t1, $t0, $at -/* 0A028 8083C238 55200019 */ bnel $t1, $zero, .L8083C2A0 -/* 0A02C 8083C23C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A030 8083C240 0C20EF1F */ jal func_8083BC7C -/* 0A034 8083C244 AFA70018 */ sw $a3, 0x0018($sp) -/* 0A038 8083C248 10400003 */ beq $v0, $zero, .L8083C258 -/* 0A03C 8083C24C 8FA70018 */ lw $a3, 0x0018($sp) -/* 0A040 8083C250 10000013 */ beq $zero, $zero, .L8083C2A0 -/* 0A044 8083C254 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083C258: -/* 0A048 8083C258 90EA0837 */ lbu $t2, 0x0837($a3) ## 00000837 -/* 0A04C 8083C25C 5540000C */ bnel $t2, $zero, .L8083C290 -/* 0A050 8083C260 8CEC0680 */ lw $t4, 0x0680($a3) ## 00000680 -/* 0A054 8083C264 80EB0151 */ lb $t3, 0x0151($a3) ## 00000151 -/* 0A058 8083C268 8FA4001C */ lw $a0, 0x001C($sp) -/* 0A05C 8083C26C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 0A060 8083C270 29610003 */ slti $at, $t3, 0x0003 -/* 0A064 8083C274 54200006 */ bnel $at, $zero, .L8083C290 -/* 0A068 8083C278 8CEC0680 */ lw $t4, 0x0680($a3) ## 00000680 -/* 0A06C 8083C27C 0C20D7D1 */ jal func_80835F44 -/* 0A070 8083C280 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 0A074 8083C284 10000006 */ beq $zero, $zero, .L8083C2A0 -/* 0A078 8083C288 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A07C 8083C28C 8CEC0680 */ lw $t4, 0x0680($a3) ## 00000680 -.L8083C290: -/* 0A080 8083C290 3C010010 */ lui $at, 0x0010 ## $at = 00100000 -/* 0A084 8083C294 01816826 */ xor $t5, $t4, $at -/* 0A088 8083C298 ACED0680 */ sw $t5, 0x0680($a3) ## 00000680 -.L8083C29C: -/* 0A08C 8083C29C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083C2A0: -/* 0A090 8083C2A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0A094 8083C2A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0A098 8083C2A8 03E00008 */ jr $ra -/* 0A09C 8083C2AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s deleted file mode 100644 index d739b7e70f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s +++ /dev/null @@ -1,128 +0,0 @@ -glabel func_8083C2B0 -/* 0A0A0 8083C2B0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0A0A4 8083C2B4 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 0A0A8 8083C2B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0A0AC 8083C2BC AFB00028 */ sw $s0, 0x0028($sp) -/* 0A0B0 8083C2C0 AFA5003C */ sw $a1, 0x003C($sp) -/* 0A0B4 8083C2C4 01E57821 */ addu $t7, $t7, $a1 -/* 0A0B8 8083C2C8 81EF1E5C */ lb $t7, 0x1E5C($t7) ## 00011E5C -/* 0A0BC 8083C2CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0A0C0 8083C2D0 55E00067 */ bnel $t7, $zero, .L8083C470 -/* 0A0C4 8083C2D4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A0C8 8083C2D8 8098014E */ lb $t8, 0x014E($a0) ## 0000014E -/* 0A0CC 8083C2DC 3C198086 */ lui $t9, %hi(D_80858AB4) ## $t9 = 80860000 -/* 0A0D0 8083C2E0 53000063 */ beql $t8, $zero, .L8083C470 -/* 0A0D4 8083C2E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A0D8 8083C2E8 8F398AB4 */ lw $t9, %lo(D_80858AB4)($t9) -/* 0A0DC 8083C2EC 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 0A0E0 8083C2F0 97280000 */ lhu $t0, 0x0000($t9) ## 80860000 -/* 0A0E4 8083C2F4 01014827 */ nor $t1, $t0, $at -/* 0A0E8 8083C2F8 5520005D */ bnel $t1, $zero, .L8083C470 -/* 0A0EC 8083C2FC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A0F0 8083C300 0C023A74 */ jal func_8008E9D0 -/* 0A0F4 8083C304 00000000 */ nop -/* 0A0F8 8083C308 14400008 */ bne $v0, $zero, .L8083C32C -/* 0A0FC 8083C30C 00000000 */ nop -/* 0A100 8083C310 0C20CECB */ jal func_80833B2C -/* 0A104 8083C314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A108 8083C318 54400055 */ bnel $v0, $zero, .L8083C470 -/* 0A10C 8083C31C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A110 8083C320 8E0A0664 */ lw $t2, 0x0664($s0) ## 00000664 -/* 0A114 8083C324 55400052 */ bnel $t2, $zero, .L8083C470 -/* 0A118 8083C328 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083C32C: -/* 0A11C 8083C32C 0C20C8C6 */ jal func_80832318 -/* 0A120 8083C330 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A124 8083C334 8FA4003C */ lw $a0, 0x003C($sp) -/* 0A128 8083C338 0C20C8ED */ jal func_808323B4 -/* 0A12C 8083C33C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A130 8083C340 3C068084 */ lui $a2, %hi(func_80843188) ## $a2 = 80840000 -/* 0A134 8083C344 24C63188 */ addiu $a2, $a2, %lo(func_80843188) ## $a2 = 80843188 -/* 0A138 8083C348 8FA4003C */ lw $a0, 0x003C($sp) -/* 0A13C 8083C34C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A140 8083C350 0C20D716 */ jal func_80835C58 -/* 0A144 8083C354 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0A148 8083C358 10400042 */ beq $v0, $zero, .L8083C464 -/* 0A14C 8083C35C 00000000 */ nop -/* 0A150 8083C360 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 0A154 8083C364 3C010040 */ lui $at, 0x0040 ## $at = 00400000 -/* 0A158 8083C368 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A15C 8083C36C 01616025 */ or $t4, $t3, $at ## $t4 = 00400000 -/* 0A160 8083C370 0C023A74 */ jal func_8008E9D0 -/* 0A164 8083C374 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -/* 0A168 8083C378 14400009 */ bne $v0, $zero, .L8083C3A0 -/* 0A16C 8083C37C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0A170 8083C380 0C023A90 */ jal func_8008EA40 -/* 0A174 8083C384 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A178 8083C388 920D015B */ lbu $t5, 0x015B($s0) ## 0000015B -/* 0A17C 8083C38C 3C068085 */ lui $a2, %hi(D_80853AF4) ## $a2 = 80850000 -/* 0A180 8083C390 000D7080 */ sll $t6, $t5, 2 -/* 0A184 8083C394 00CE3021 */ addu $a2, $a2, $t6 -/* 0A188 8083C398 10000002 */ beq $zero, $zero, .L8083C3A4 -/* 0A18C 8083C39C 8CC63AF4 */ lw $a2, %lo(D_80853AF4)($a2) -.L8083C3A0: -/* 0A190 8083C3A0 24C62400 */ addiu $a2, $a2, 0x2400 ## $a2 = 80852400 -.L8083C3A4: -/* 0A194 8083C3A4 8E0F01BC */ lw $t7, 0x01BC($s0) ## 000001BC -/* 0A198 8083C3A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A19C 8083C3AC 50CF0014 */ beql $a2, $t7, .L8083C400 -/* 0A1A0 8083C3B0 00C02025 */ or $a0, $a2, $zero ## $a0 = 80852400 -/* 0A1A4 8083C3B4 0C023A71 */ jal func_8008E9C4 -/* 0A1A8 8083C3B8 AFA60034 */ sw $a2, 0x0034($sp) -/* 0A1AC 8083C3BC 10400005 */ beq $v0, $zero, .L8083C3D4 -/* 0A1B0 8083C3C0 8FA60034 */ lw $a2, 0x0034($sp) -/* 0A1B4 8083C3C4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0A1B8 8083C3C8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 0A1BC 8083C3CC 10000007 */ beq $zero, $zero, .L8083C3EC -/* 0A1C0 8083C3D0 E604086C */ swc1 $f4, 0x086C($s0) ## 0000086C -.L8083C3D4: -/* 0A1C4 8083C3D4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0A1C8 8083C3D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A1CC 8083C3DC E606086C */ swc1 $f6, 0x086C($s0) ## 0000086C -/* 0A1D0 8083C3E0 0C20CF0F */ jal func_80833C3C -/* 0A1D4 8083C3E4 AFA60034 */ sw $a2, 0x0034($sp) -/* 0A1D8 8083C3E8 8FA60034 */ lw $a2, 0x0034($sp) -.L8083C3EC: -/* 0A1DC 8083C3EC A60006C0 */ sh $zero, 0x06C0($s0) ## 000006C0 -/* 0A1E0 8083C3F0 860206C0 */ lh $v0, 0x06C0($s0) ## 000006C0 -/* 0A1E4 8083C3F4 A60206BE */ sh $v0, 0x06BE($s0) ## 000006BE -/* 0A1E8 8083C3F8 A60206BC */ sh $v0, 0x06BC($s0) ## 000006BC -/* 0A1EC 8083C3FC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L8083C400: -/* 0A1F0 8083C400 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0A1F4 8083C404 AFA60034 */ sw $a2, 0x0034($sp) -/* 0A1F8 8083C408 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 0A1FC 8083C40C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0A200 8083C410 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0A204 8083C414 46804020 */ cvt.s.w $f0, $f8 -/* 0A208 8083C418 8FA60034 */ lw $a2, 0x0034($sp) -/* 0A20C 8083C41C AFB80018 */ sw $t8, 0x0018($sp) -/* 0A210 8083C420 8FA4003C */ lw $a0, 0x003C($sp) -/* 0A214 8083C424 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0A218 8083C428 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 0A21C 8083C42C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0A220 8083C430 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 0A224 8083C434 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 0A228 8083C438 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 0A22C 8083C43C 0C023A74 */ jal func_8008E9D0 -/* 0A230 8083C440 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A234 8083C444 10400004 */ beq $v0, $zero, .L8083C458 -/* 0A238 8083C448 8FA4003C */ lw $a0, 0x003C($sp) -/* 0A23C 8083C44C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A240 8083C450 0C20CBD5 */ jal func_80832F54 -/* 0A244 8083C454 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L8083C458: -/* 0A248 8083C458 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A24C 8083C45C 0C00BDF7 */ jal func_8002F7DC -/* 0A250 8083C460 2405181F */ addiu $a1, $zero, 0x181F ## $a1 = 0000181F -.L8083C464: -/* 0A254 8083C464 10000002 */ beq $zero, $zero, .L8083C470 -/* 0A258 8083C468 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0A25C 8083C46C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083C470: -/* 0A260 8083C470 8FBF002C */ lw $ra, 0x002C($sp) -/* 0A264 8083C474 8FB00028 */ lw $s0, 0x0028($sp) -/* 0A268 8083C478 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0A26C 8083C47C 03E00008 */ jr $ra -/* 0A270 8083C480 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C484.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C484.s deleted file mode 100644 index faef3b9965..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C484.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_8083C484 -/* 0A274 8083C484 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0A278 8083C488 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0A27C 8083C48C AFA5001C */ sw $a1, 0x001C($sp) -/* 0A280 8083C490 84CF0000 */ lh $t7, 0x0000($a2) ## 00000000 -/* 0A284 8083C494 848E083C */ lh $t6, 0x083C($a0) ## 0000083C -/* 0A288 8083C498 01CF1023 */ subu $v0, $t6, $t7 -/* 0A28C 8083C49C 00021400 */ sll $v0, $v0, 16 -/* 0A290 8083C4A0 00021403 */ sra $v0, $v0, 16 -/* 0A294 8083C4A4 04400003 */ bltz $v0, .L8083C4B4 -/* 0A298 8083C4A8 00021823 */ subu $v1, $zero, $v0 -/* 0A29C 8083C4AC 10000001 */ beq $zero, $zero, .L8083C4B4 -/* 0A2A0 8083C4B0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L8083C4B4: -/* 0A2A4 8083C4B4 28616001 */ slti $at, $v1, 0x6001 -/* 0A2A8 8083C4B8 54200010 */ bnel $at, $zero, .L8083C4FC -/* 0A2AC 8083C4BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A2B0 8083C4C0 AFA40018 */ sw $a0, 0x0018($sp) -/* 0A2B4 8083C4C4 0C20DC87 */ jal func_8083721C -/* 0A2B8 8083C4C8 AFA60020 */ sw $a2, 0x0020($sp) -/* 0A2BC 8083C4CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 0A2C0 8083C4D0 10400007 */ beq $v0, $zero, .L8083C4F0 -/* 0A2C4 8083C4D4 8FA60020 */ lw $a2, 0x0020($sp) -/* 0A2C8 8083C4D8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0A2CC 8083C4DC 8FB8001C */ lw $t8, 0x001C($sp) -/* 0A2D0 8083C4E0 E7040000 */ swc1 $f4, 0x0000($t8) ## 00000000 -/* 0A2D4 8083C4E4 8499083C */ lh $t9, 0x083C($a0) ## 0000083C -/* 0A2D8 8083C4E8 10000003 */ beq $zero, $zero, .L8083C4F8 -/* 0A2DC 8083C4EC A4D90000 */ sh $t9, 0x0000($a2) ## 00000000 -.L8083C4F0: -/* 0A2E0 8083C4F0 10000002 */ beq $zero, $zero, .L8083C4FC -/* 0A2E4 8083C4F4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083C4F8: -/* 0A2E8 8083C4F8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083C4FC: -/* 0A2EC 8083C4FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0A2F0 8083C500 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0A2F4 8083C504 03E00008 */ jr $ra -/* 0A2F8 8083C508 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C50C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C50C.s deleted file mode 100644 index 77133da7ec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C50C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8083C50C -/* 0A2FC 8083C50C 80820844 */ lb $v0, 0x0844($a0) ## 00000844 -/* 0A300 8083C510 3C0E8086 */ lui $t6, %hi(D_80858AB4) ## $t6 = 80860000 -/* 0A304 8083C514 18400009 */ blez $v0, .L8083C53C -/* 0A308 8083C518 00000000 */ nop -/* 0A30C 8083C51C 8DCE8AB4 */ lw $t6, %lo(D_80858AB4)($t6) -/* 0A310 8083C520 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 0A314 8083C524 0002C823 */ subu $t9, $zero, $v0 -/* 0A318 8083C528 95CF0000 */ lhu $t7, 0x0000($t6) ## 80860000 -/* 0A31C 8083C52C 01E1C027 */ nor $t8, $t7, $at -/* 0A320 8083C530 13000002 */ beq $t8, $zero, .L8083C53C -/* 0A324 8083C534 00000000 */ nop -/* 0A328 8083C538 A0990844 */ sb $t9, 0x0844($a0) ## 00000844 -.L8083C53C: -/* 0A32C 8083C53C 03E00008 */ jr $ra -/* 0A330 8083C540 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C544.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C544.s deleted file mode 100644 index 2cec5847cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C544.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_8083C544 -/* 0A334 8083C544 3C0E8086 */ lui $t6, %hi(D_80858AB4) ## $t6 = 80860000 -/* 0A338 8083C548 8DCE8AB4 */ lw $t6, %lo(D_80858AB4)($t6) -/* 0A33C 8083C54C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0A340 8083C550 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0A344 8083C554 AFA5001C */ sw $a1, 0x001C($sp) -/* 0A348 8083C558 95CF0000 */ lhu $t7, 0x0000($t6) ## 80860000 -/* 0A34C 8083C55C 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 0A350 8083C560 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0A354 8083C564 01E1C027 */ nor $t8, $t7, $at -/* 0A358 8083C568 17000025 */ bne $t8, $zero, .L8083C600 -/* 0A35C 8083C56C 00000000 */ nop -/* 0A360 8083C570 8C99067C */ lw $t9, 0x067C($a0) ## 0000067C -/* 0A364 8083C574 00194240 */ sll $t0, $t9, 9 -/* 0A368 8083C578 05020024 */ bltzl $t0, .L8083C60C -/* 0A36C 8083C57C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A370 8083C580 0C023C60 */ jal func_8008F180 -/* 0A374 8083C584 AFA60018 */ sw $a2, 0x0018($sp) -/* 0A378 8083C588 1040001F */ beq $v0, $zero, .L8083C608 -/* 0A37C 8083C58C 8FA60018 */ lw $a2, 0x0018($sp) -/* 0A380 8083C590 80C90844 */ lb $t1, 0x0844($a2) ## 00000844 -/* 0A384 8083C594 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0A388 8083C598 5521001C */ bnel $t1, $at, .L8083C60C -/* 0A38C 8083C59C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A390 8083C5A0 80C20151 */ lb $v0, 0x0151($a2) ## 00000151 -/* 0A394 8083C5A4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0A398 8083C5A8 10410017 */ beq $v0, $at, .L8083C608 -/* 0A39C 8083C5AC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0A3A0 8083C5B0 1441000E */ bne $v0, $at, .L8083C5EC -/* 0A3A4 8083C5B4 3C0A8016 */ lui $t2, %hi(gSaveContext+0x36) -/* 0A3A8 8083C5B8 954AE696 */ lhu $t2, %lo(gSaveContext+0x36)($t2) -/* 0A3AC 8083C5BC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0A3B0 8083C5C0 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 0A3B4 8083C5C4 448A3000 */ mtc1 $t2, $f6 ## $f6 = -0.00 -/* 0A3B8 8083C5C8 05410004 */ bgez $t2, .L8083C5DC -/* 0A3BC 8083C5CC 46803220 */ cvt.s.w $f8, $f6 -/* 0A3C0 8083C5D0 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 -/* 0A3C4 8083C5D4 00000000 */ nop -/* 0A3C8 8083C5D8 460A4200 */ add.s $f8, $f8, $f10 -.L8083C5DC: -/* 0A3CC 8083C5DC 4608203C */ c.lt.s $f4, $f8 -/* 0A3D0 8083C5E0 00000000 */ nop -/* 0A3D4 8083C5E4 45020009 */ bc1fl .L8083C60C -/* 0A3D8 8083C5E8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083C5EC: -/* 0A3DC 8083C5EC 8FA4001C */ lw $a0, 0x001C($sp) -/* 0A3E0 8083C5F0 0C20DDF7 */ jal func_808377DC -/* 0A3E4 8083C5F4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0A3E8 8083C5F8 10000004 */ beq $zero, $zero, .L8083C60C -/* 0A3EC 8083C5FC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083C600: -/* 0A3F0 8083C600 0C20F143 */ jal func_8083C50C -/* 0A3F4 8083C604 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L8083C608: -/* 0A3F8 8083C608 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083C60C: -/* 0A3FC 8083C60C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0A400 8083C610 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0A404 8083C614 03E00008 */ jr $ra -/* 0A408 8083C618 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C61C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C61C.s deleted file mode 100644 index ba82e3730b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C61C.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8083C61C -/* 0A40C 8083C61C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0A410 8083C620 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 0A414 8083C624 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0A418 8083C628 01C47021 */ addu $t6, $t6, $a0 -/* 0A41C 8083C62C 91CE1CBF */ lbu $t6, 0x1CBF($t6) ## 00011CBF -/* 0A420 8083C630 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0A424 8083C634 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A428 8083C638 11C1001B */ beq $t6, $at, .L8083C6A8 -/* 0A42C 8083C63C 00000000 */ nop -/* 0A430 8083C640 94AF0088 */ lhu $t7, 0x0088($a1) ## 00000088 -/* 0A434 8083C644 3C198012 */ lui $t9, %hi(gItemSlots+1) -/* 0A438 8083C648 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 0A43C 8083C64C 13000016 */ beq $t8, $zero, .L8083C6A8 -/* 0A440 8083C650 00000000 */ nop -/* 0A444 8083C654 93397465 */ lbu $t9, %lo(gItemSlots+1)($t9) -/* 0A448 8083C658 3C088016 */ lui $t0, %hi(gSaveContext+0x8c) -/* 0A44C 8083C65C 3C068085 */ lui $a2, %hi(func_8084E604) ## $a2 = 80850000 -/* 0A450 8083C660 01194021 */ addu $t0, $t0, $t9 -/* 0A454 8083C664 8108E6EC */ lb $t0, %lo(gSaveContext+0x8c)($t0) -/* 0A458 8083C668 24C6E604 */ addiu $a2, $a2, %lo(func_8084E604) ## $a2 = 8084E604 -/* 0A45C 8083C66C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0A460 8083C670 1100000D */ beq $t0, $zero, .L8083C6A8 -/* 0A464 8083C674 00000000 */ nop -/* 0A468 8083C678 AFA40018 */ sw $a0, 0x0018($sp) -/* 0A46C 8083C67C 0C20D716 */ jal func_80835C58 -/* 0A470 8083C680 AFA5001C */ sw $a1, 0x001C($sp) -/* 0A474 8083C684 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0A478 8083C688 8FA40018 */ lw $a0, 0x0018($sp) -/* 0A47C 8083C68C 24C63048 */ addiu $a2, $a2, 0x3048 ## $a2 = 04003048 -/* 0A480 8083C690 0C20C899 */ jal func_80832264 -/* 0A484 8083C694 8FA5001C */ lw $a1, 0x001C($sp) -/* 0A488 8083C698 8FA9001C */ lw $t1, 0x001C($sp) -/* 0A48C 8083C69C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0A490 8083C6A0 10000001 */ beq $zero, $zero, .L8083C6A8 -/* 0A494 8083C6A4 A12006AD */ sb $zero, 0x06AD($t1) ## 000006AD -.L8083C6A8: -/* 0A498 8083C6A8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0A49C 8083C6AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0A4A0 8083C6B0 03E00008 */ jr $ra -/* 0A4A4 8083C6B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C6B8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C6B8.s deleted file mode 100644 index 0903e8d309..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C6B8.s +++ /dev/null @@ -1,117 +0,0 @@ -.late_rodata -glabel D_80855390 - .float 1300.0 - -.text -glabel func_8083C6B8 -/* 0A4A8 8083C6B8 3C0E8085 */ lui $t6, %hi(D_80853614) ## $t6 = 80850000 -/* 0A4AC 8083C6BC 8DCE3614 */ lw $t6, %lo(D_80853614)($t6) -/* 0A4B0 8083C6C0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0A4B4 8083C6C4 AFB00018 */ sw $s0, 0x0018($sp) -/* 0A4B8 8083C6C8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0A4BC 8083C6CC AFBF001C */ sw $ra, 0x001C($sp) -/* 0A4C0 8083C6D0 11C0005B */ beq $t6, $zero, .L8083C840 -/* 0A4C4 8083C6D4 AFA40030 */ sw $a0, 0x0030($sp) -/* 0A4C8 8083C6D8 0C023C94 */ jal func_8008F250 -/* 0A4CC 8083C6DC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0A4D0 8083C6E0 04400021 */ bltz $v0, .L8083C768 -/* 0A4D4 8083C6E4 8FA40030 */ lw $a0, 0x0030($sp) -/* 0A4D8 8083C6E8 3C068085 */ lui $a2, %hi(func_8084ECA4) ## $a2 = 80850000 -/* 0A4DC 8083C6EC 24C6ECA4 */ addiu $a2, $a2, %lo(func_8084ECA4) ## $a2 = 8084ECA4 -/* 0A4E0 8083C6F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A4E4 8083C6F4 0C20D716 */ jal func_80835C58 -/* 0A4E8 8083C6F8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0A4EC 8083C6FC 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 0A4F0 8083C700 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 -/* 0A4F4 8083C704 C6060084 */ lwc1 $f6, 0x0084($s0) ## 00000084 -/* 0A4F8 8083C708 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0A4FC 8083C70C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A500 8083C710 4606203C */ c.lt.s $f4, $f6 -/* 0A504 8083C714 00000000 */ nop -/* 0A508 8083C718 45020003 */ bc1fl .L8083C728 -/* 0A50C 8083C71C 86180850 */ lh $t8, 0x0850($s0) ## 00000850 -/* 0A510 8083C720 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 -/* 0A514 8083C724 86180850 */ lh $t8, 0x0850($s0) ## 00000850 -.L8083C728: -/* 0A518 8083C728 3C068085 */ lui $a2, %hi(D_80854554) ## $a2 = 80850000 -/* 0A51C 8083C72C 8FA40030 */ lw $a0, 0x0030($sp) -/* 0A520 8083C730 0018C880 */ sll $t9, $t8, 2 -/* 0A524 8083C734 0338C823 */ subu $t9, $t9, $t8 -/* 0A528 8083C738 0019C880 */ sll $t9, $t9, 2 -/* 0A52C 8083C73C 00D93021 */ addu $a2, $a2, $t9 -/* 0A530 8083C740 0C20C8B4 */ jal func_808322D0 -/* 0A534 8083C744 8CC64554 */ lw $a2, %lo(D_80854554)($a2) -/* 0A538 8083C748 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A53C 8083C74C 0C00BDF7 */ jal func_8002F7DC -/* 0A540 8083C750 24051801 */ addiu $a1, $zero, 0x1801 ## $a1 = 00001801 -/* 0A544 8083C754 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A548 8083C758 0C20C9A6 */ jal func_80832698 -/* 0A54C 8083C75C 24056814 */ addiu $a1, $zero, 0x6814 ## $a1 = 00006814 -/* 0A550 8083C760 10000038 */ beq $zero, $zero, .L8083C844 -/* 0A554 8083C764 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083C768: -/* 0A558 8083C768 82080151 */ lb $t0, 0x0151($s0) ## 00000151 -/* 0A55C 8083C76C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0A560 8083C770 15010031 */ bne $t0, $at, .L8083C838 -/* 0A564 8083C774 00000000 */ nop -/* 0A568 8083C778 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 -/* 0A56C 8083C77C 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 0A570 8083C780 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0A574 8083C784 ACAA0000 */ sw $t2, 0x0000($a1) ## FFFFFFF4 -/* 0A578 8083C788 8E090028 */ lw $t1, 0x0028($s0) ## 00000028 -/* 0A57C 8083C78C 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 0A580 8083C790 3C018085 */ lui $at, %hi(D_80855390) ## $at = 80850000 -/* 0A584 8083C794 ACA90004 */ sw $t1, 0x0004($a1) ## FFFFFFF8 -/* 0A588 8083C798 8E0A002C */ lw $t2, 0x002C($s0) ## 0000002C -/* 0A58C 8083C79C ACAA0008 */ sw $t2, 0x0008($a1) ## FFFFFFFC -/* 0A590 8083C7A0 C7A80028 */ lwc1 $f8, 0x0028($sp) -/* 0A594 8083C7A4 460A4400 */ add.s $f16, $f8, $f10 -/* 0A598 8083C7A8 E7B00028 */ swc1 $f16, 0x0028($sp) -/* 0A59C 8083C7AC 960B0088 */ lhu $t3, 0x0088($s0) ## 00000088 -/* 0A5A0 8083C7B0 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 0A5A4 8083C7B4 1180000C */ beq $t4, $zero, .L8083C7E8 -/* 0A5A8 8083C7B8 00000000 */ nop -/* 0A5AC 8083C7BC C4325390 */ lwc1 $f18, %lo(D_80855390)($at) -/* 0A5B0 8083C7C0 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 0A5B4 8083C7C4 8FA40030 */ lw $a0, 0x0030($sp) -/* 0A5B8 8083C7C8 4604903C */ c.lt.s $f18, $f4 -/* 0A5BC 8083C7CC 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 0A5C0 8083C7D0 45010005 */ bc1t .L8083C7E8 -/* 0A5C4 8083C7D4 00000000 */ nop -/* 0A5C8 8083C7D8 0C00F8C3 */ jal func_8003E30C -/* 0A5CC 8083C7DC 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 0A5D0 8083C7E0 10400005 */ beq $v0, $zero, .L8083C7F8 -/* 0A5D4 8083C7E4 8FA40030 */ lw $a0, 0x0030($sp) -.L8083C7E8: -/* 0A5D8 8083C7E8 0C01E221 */ jal func_80078884 -/* 0A5DC 8083C7EC 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 0A5E0 8083C7F0 10000014 */ beq $zero, $zero, .L8083C844 -/* 0A5E4 8083C7F4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083C7F8: -/* 0A5E8 8083C7F8 3C068085 */ lui $a2, %hi(func_80850C68) ## $a2 = 80850000 -/* 0A5EC 8083C7FC 24C60C68 */ addiu $a2, $a2, %lo(func_80850C68) ## $a2 = 80850C68 -/* 0A5F0 8083C800 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A5F4 8083C804 0C20D716 */ jal func_80835C58 -/* 0A5F8 8083C808 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0A5FC 8083C80C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 0A600 8083C810 A60D0860 */ sh $t5, 0x0860($s0) ## 00000860 -/* 0A604 8083C814 0C20C884 */ jal func_80832210 -/* 0A608 8083C818 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A60C 8083C81C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0A610 8083C820 24C62C30 */ addiu $a2, $a2, 0x2C30 ## $a2 = 04002C30 -/* 0A614 8083C824 8FA40030 */ lw $a0, 0x0030($sp) -/* 0A618 8083C828 0C20C899 */ jal func_80832264 -/* 0A61C 8083C82C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A620 8083C830 10000004 */ beq $zero, $zero, .L8083C844 -/* 0A624 8083C834 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083C838: -/* 0A628 8083C838 10000002 */ beq $zero, $zero, .L8083C844 -/* 0A62C 8083C83C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083C840: -/* 0A630 8083C840 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083C844: -/* 0A634 8083C844 8FBF001C */ lw $ra, 0x001C($sp) -/* 0A638 8083C848 8FB00018 */ lw $s0, 0x0018($sp) -/* 0A63C 8083C84C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0A640 8083C850 03E00008 */ jr $ra -/* 0A644 8083C854 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C858.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C858.s deleted file mode 100644 index 4afb00f521..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C858.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_8083C858 -/* 0A648 8083C858 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0A64C 8083C85C AFBF001C */ sw $ra, 0x001C($sp) -/* 0A650 8083C860 AFB00018 */ sw $s0, 0x0018($sp) -/* 0A654 8083C864 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0A658 8083C868 0C20CEF3 */ jal func_80833BCC -/* 0A65C 8083C86C AFA50024 */ sw $a1, 0x0024($sp) -/* 0A660 8083C870 10400004 */ beq $v0, $zero, .L8083C884 -/* 0A664 8083C874 8FA40024 */ lw $a0, 0x0024($sp) -/* 0A668 8083C878 3C068084 */ lui $a2, %hi(func_8084227C) ## $a2 = 80840000 -/* 0A66C 8083C87C 10000003 */ beq $zero, $zero, .L8083C88C -/* 0A670 8083C880 24C6227C */ addiu $a2, $a2, %lo(func_8084227C) ## $a2 = 8084227C -.L8083C884: -/* 0A674 8083C884 3C068084 */ lui $a2, %hi(func_80842180) ## $a2 = 80840000 -/* 0A678 8083C888 24C62180 */ addiu $a2, $a2, %lo(func_80842180) ## $a2 = 80842180 -.L8083C88C: -/* 0A67C 8083C88C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A680 8083C890 0C20D716 */ jal func_80835C58 -/* 0A684 8083C894 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0A688 8083C898 920E015B */ lbu $t6, 0x015B($s0) ## 0000015B -/* 0A68C 8083C89C 3C068085 */ lui $a2, %hi(D_80853944) ## $a2 = 80850000 -/* 0A690 8083C8A0 8FA40024 */ lw $a0, 0x0024($sp) -/* 0A694 8083C8A4 000E7880 */ sll $t7, $t6, 2 -/* 0A698 8083C8A8 00CF3021 */ addu $a2, $a2, $t7 -/* 0A69C 8083C8AC 8CC63944 */ lw $a2, %lo(D_80853944)($a2) -/* 0A6A0 8083C8B0 0C20CAFA */ jal func_80832BE8 -/* 0A6A4 8083C8B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A6A8 8083C8B8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0A6AC 8083C8BC A600089C */ sh $zero, 0x089C($s0) ## 0000089C -/* 0A6B0 8083C8C0 E6000868 */ swc1 $f0, 0x0868($s0) ## 00000868 -/* 0A6B4 8083C8C4 E6000864 */ swc1 $f0, 0x0864($s0) ## 00000864 -/* 0A6B8 8083C8C8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0A6BC 8083C8CC 8FB00018 */ lw $s0, 0x0018($sp) -/* 0A6C0 8083C8D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0A6C4 8083C8D4 03E00008 */ jr $ra -/* 0A6C8 8083C8D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C8DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C8DC.s deleted file mode 100644 index 522e327782..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C8DC.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8083C8DC -/* 0A6CC 8083C8DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0A6D0 8083C8E0 AFA60020 */ sw $a2, 0x0020($sp) -/* 0A6D4 8083C8E4 00063400 */ sll $a2, $a2, 16 -/* 0A6D8 8083C8E8 00063403 */ sra $a2, $a2, 16 -/* 0A6DC 8083C8EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 0A6E0 8083C8F0 A486083C */ sh $a2, 0x083C($a0) ## 0000083C -/* 0A6E4 8083C8F4 848E083C */ lh $t6, 0x083C($a0) ## 0000083C -/* 0A6E8 8083C8F8 0C20F216 */ jal func_8083C858 -/* 0A6EC 8083C8FC A48E00B6 */ sh $t6, 0x00B6($a0) ## 000000B6 -/* 0A6F0 8083C900 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0A6F4 8083C904 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0A6F8 8083C908 03E00008 */ jr $ra -/* 0A6FC 8083C90C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C910.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C910.s deleted file mode 100644 index d0b7615c43..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C910.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_8083C910 -/* 0A700 8083C910 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0A704 8083C914 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0A708 8083C918 AFB10020 */ sw $s1, 0x0020($sp) -/* 0A70C 8083C91C AFB0001C */ sw $s0, 0x001C($sp) -/* 0A710 8083C920 AFA60038 */ sw $a2, 0x0038($sp) -/* 0A714 8083C924 C4A40028 */ lwc1 $f4, 0x0028($a1) ## 00000028 -/* 0A718 8083C928 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0A71C 8083C92C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0A720 8083C930 E7A40028 */ swc1 $f4, 0x0028($sp) -/* 0A724 8083C934 8E07002C */ lw $a3, 0x002C($s0) ## 0000002C -/* 0A728 8083C938 8E060024 */ lw $a2, 0x0024($s0) ## 00000024 -/* 0A72C 8083C93C 27AE0028 */ addiu $t6, $sp, 0x0028 ## $t6 = FFFFFFF8 -/* 0A730 8083C940 27AF002C */ addiu $t7, $sp, 0x002C ## $t7 = FFFFFFFC -/* 0A734 8083C944 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0A738 8083C948 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0A73C 8083C94C 0C01084F */ jal func_8004213C -/* 0A740 8083C950 262507C0 */ addiu $a1, $s1, 0x07C0 ## $a1 = 000007C0 -/* 0A744 8083C954 10400023 */ beq $v0, $zero, .L8083C9E4 -/* 0A748 8083C958 C7A60028 */ lwc1 $f6, 0x0028($sp) -/* 0A74C 8083C95C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 0A750 8083C960 3C068085 */ lui $a2, %hi(func_8084D7C4) ## $a2 = 80850000 -/* 0A754 8083C964 24C6D7C4 */ addiu $a2, $a2, %lo(func_8084D7C4) ## $a2 = 8084D7C4 -/* 0A758 8083C968 46083281 */ sub.s $f10, $f6, $f8 -/* 0A75C 8083C96C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0A760 8083C970 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A764 8083C974 E7AA0028 */ swc1 $f10, 0x0028($sp) -/* 0A768 8083C978 8E180678 */ lw $t8, 0x0678($s0) ## 00000678 -/* 0A76C 8083C97C C7100024 */ lwc1 $f16, 0x0024($t8) ## 00000024 -/* 0A770 8083C980 460A803E */ c.le.s $f16, $f10 -/* 0A774 8083C984 00000000 */ nop -/* 0A778 8083C988 45020017 */ bc1fl .L8083C9E8 -/* 0A77C 8083C98C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0A780 8083C990 0C20D716 */ jal func_80835C58 -/* 0A784 8083C994 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0A788 8083C998 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0A78C 8083C99C 24C632F0 */ addiu $a2, $a2, 0x32F0 ## $a2 = 040032F0 -/* 0A790 8083C9A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0A794 8083C9A4 0C20CB1B */ jal func_80832C6C -/* 0A798 8083C9A8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A79C 8083C9AC 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 0A7A0 8083C9B0 3C012800 */ lui $at, 0x2800 ## $at = 28000000 -/* 0A7A4 8083C9B4 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 0A7A8 8083C9B8 03214025 */ or $t0, $t9, $at ## $t0 = 28000000 -/* 0A7AC 8083C9BC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0A7B0 8083C9C0 44819000 */ mtc1 $at, $f18 ## $f18 = 2.00 -/* 0A7B4 8083C9C4 AE08067C */ sw $t0, 0x067C($s0) ## 0000067C -/* 0A7B8 8083C9C8 A6090850 */ sh $t1, 0x0850($s0) ## 00000850 -/* 0A7BC 8083C9CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0A7C0 8083C9D0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A7C4 8083C9D4 0C0239D4 */ jal func_8008E750 -/* 0A7C8 8083C9D8 E6120838 */ swc1 $f18, 0x0838($s0) ## 00000838 -/* 0A7CC 8083C9DC 1000000B */ beq $zero, $zero, .L8083CA0C -/* 0A7D0 8083C9E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083C9E4: -/* 0A7D4 8083C9E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L8083C9E8: -/* 0A7D8 8083C9E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A7DC 8083C9EC 8FA60038 */ lw $a2, 0x0038($sp) -/* 0A7E0 8083C9F0 0C20E39C */ jal func_80838E70 -/* 0A7E4 8083C9F4 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 0A7E8 8083C9F8 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C -/* 0A7EC 8083C9FC 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 0A7F0 8083CA00 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0A7F4 8083CA04 01415825 */ or $t3, $t2, $at ## $t3 = 20000000 -/* 0A7F8 8083CA08 AE0B067C */ sw $t3, 0x067C($s0) ## 0000067C -.L8083CA0C: -/* 0A7FC 8083CA0C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0A800 8083CA10 8FB0001C */ lw $s0, 0x001C($sp) -/* 0A804 8083CA14 8FB10020 */ lw $s1, 0x0020($sp) -/* 0A808 8083CA18 03E00008 */ jr $ra -/* 0A80C 8083CA1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA20.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA20.s deleted file mode 100644 index 51d1e98a33..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA20.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8083CA20 -/* 0A810 8083CA20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0A814 8083CA24 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0A818 8083CA28 AFA5001C */ sw $a1, 0x001C($sp) -/* 0A81C 8083CA2C 0C20F244 */ jal func_8083C910 -/* 0A820 8083CA30 3C064334 */ lui $a2, 0x4334 ## $a2 = 43340000 -/* 0A824 8083CA34 10400003 */ beq $v0, $zero, .L8083CA44 -/* 0A828 8083CA38 8FAF001C */ lw $t7, 0x001C($sp) -/* 0A82C 8083CA3C 240EFFEC */ addiu $t6, $zero, 0xFFEC ## $t6 = FFFFFFEC -/* 0A830 8083CA40 A5EE0850 */ sh $t6, 0x0850($t7) ## 00000850 -.L8083CA44: -/* 0A834 8083CA44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0A838 8083CA48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0A83C 8083CA4C 03E00008 */ jr $ra -/* 0A840 8083CA50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA54.s deleted file mode 100644 index eff627df4d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA54.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_8083CA54 -/* 0A844 8083CA54 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0A848 8083CA58 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 -/* 0A84C 8083CA5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0A850 8083CA60 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0A854 8083CA64 3C018016 */ lui $at, %hi(gSaveContext+0x13bc) -/* 0A858 8083CA68 E4A00838 */ swc1 $f0, 0x0838($a1) ## 00000838 -/* 0A85C 8083CA6C AFA5001C */ sw $a1, 0x001C($sp) -/* 0A860 8083CA70 3C0642F0 */ lui $a2, 0x42F0 ## $a2 = 42F00000 -/* 0A864 8083CA74 0C20F244 */ jal func_8083C910 -/* 0A868 8083CA78 E420FA1C */ swc1 $f0, %lo(gSaveContext+0x13bc)($at) -/* 0A86C 8083CA7C 10400003 */ beq $v0, $zero, .L8083CA8C -/* 0A870 8083CA80 8FA5001C */ lw $a1, 0x001C($sp) -/* 0A874 8083CA84 240EFFF1 */ addiu $t6, $zero, 0xFFF1 ## $t6 = FFFFFFF1 -/* 0A878 8083CA88 A4AE0850 */ sh $t6, 0x0850($a1) ## 00000850 -.L8083CA8C: -/* 0A87C 8083CA8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0A880 8083CA90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0A884 8083CA94 03E00008 */ jr $ra -/* 0A888 8083CA98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA9C.s deleted file mode 100644 index df7988aaca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA9C.s +++ /dev/null @@ -1,45 +0,0 @@ -.late_rodata -glabel D_80855394 - .float 0.1 - -.text -glabel func_8083CA9C -/* 0A88C 8083CA9C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0A890 8083CAA0 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 0A894 8083CAA4 3C018085 */ lui $at, %hi(D_80855394) ## $at = 80850000 -/* 0A898 8083CAA8 C4225394 */ lwc1 $f2, %lo(D_80855394)($at) -/* 0A89C 8083CAAC C44013BC */ lwc1 $f0, 0x13BC($v0) ## 8015FA1C -/* 0A8A0 8083CAB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0A8A4 8083CAB4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0A8A8 8083CAB8 4602003C */ c.lt.s $f0, $f2 -/* 0A8AC 8083CABC 3C064448 */ lui $a2, 0x4448 ## $a2 = 44480000 -/* 0A8B0 8083CAC0 45020004 */ bc1fl .L8083CAD4 -/* 0A8B4 8083CAC4 E4A00838 */ swc1 $f0, 0x0838($a1) ## 00000838 -/* 0A8B8 8083CAC8 E44213BC */ swc1 $f2, 0x13BC($v0) ## 8015FA1C -/* 0A8BC 8083CACC C44013BC */ lwc1 $f0, 0x13BC($v0) ## 8015FA1C -/* 0A8C0 8083CAD0 E4A00838 */ swc1 $f0, 0x0838($a1) ## 00000838 -.L8083CAD4: -/* 0A8C4 8083CAD4 0C20F244 */ jal func_8083C910 -/* 0A8C8 8083CAD8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0A8CC 8083CADC 1040000F */ beq $v0, $zero, .L8083CB1C -/* 0A8D0 8083CAE0 8FA5001C */ lw $a1, 0x001C($sp) -/* 0A8D4 8083CAE4 3C01C2A0 */ lui $at, 0xC2A0 ## $at = C2A00000 -/* 0A8D8 8083CAE8 44812000 */ mtc1 $at, $f4 ## $f4 = -80.00 -/* 0A8DC 8083CAEC C4A60838 */ lwc1 $f6, 0x0838($a1) ## 00000838 -/* 0A8E0 8083CAF0 2419FFEC */ addiu $t9, $zero, 0xFFEC ## $t9 = FFFFFFEC -/* 0A8E4 8083CAF4 46062203 */ div.s $f8, $f4, $f6 -/* 0A8E8 8083CAF8 4600428D */ trunc.w.s $f10, $f8 -/* 0A8EC 8083CAFC 440F5000 */ mfc1 $t7, $f10 -/* 0A8F0 8083CB00 00000000 */ nop -/* 0A8F4 8083CB04 A4AF0850 */ sh $t7, 0x0850($a1) ## 00000850 -/* 0A8F8 8083CB08 84B80850 */ lh $t8, 0x0850($a1) ## 00000850 -/* 0A8FC 8083CB0C 2B01FFEC */ slti $at, $t8, 0xFFEC -/* 0A900 8083CB10 50200003 */ beql $at, $zero, .L8083CB20 -/* 0A904 8083CB14 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0A908 8083CB18 A4B90850 */ sh $t9, 0x0850($a1) ## 00000850 -.L8083CB1C: -/* 0A90C 8083CB1C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8083CB20: -/* 0A910 8083CB20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0A914 8083CB24 03E00008 */ jr $ra -/* 0A918 8083CB28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB2C.s deleted file mode 100644 index c04f6c9c8c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB2C.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_8083CB2C -/* 0A91C 8083CB2C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0A920 8083CB30 AFB00018 */ sw $s0, 0x0018($sp) -/* 0A924 8083CB34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0A928 8083CB38 AFA60028 */ sw $a2, 0x0028($sp) -/* 0A92C 8083CB3C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0A930 8083CB40 AFBF001C */ sw $ra, 0x001C($sp) -/* 0A934 8083CB44 AFA50024 */ sw $a1, 0x0024($sp) -/* 0A938 8083CB48 3C068084 */ lui $a2, %hi(func_808414F8) ## $a2 = 80840000 -/* 0A93C 8083CB4C 24C614F8 */ addiu $a2, $a2, %lo(func_808414F8) ## $a2 = 808414F8 -/* 0A940 8083CB50 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A944 8083CB54 0C20D716 */ jal func_80835C58 -/* 0A948 8083CB58 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0A94C 8083CB5C 8FA40028 */ lw $a0, 0x0028($sp) -/* 0A950 8083CB60 0C02907F */ jal func_800A41FC -/* 0A954 8083CB64 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0A958 8083CB68 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0A95C 8083CB6C 00000000 */ nop -/* 0A960 8083CB70 E6000868 */ swc1 $f0, 0x0868($s0) ## 00000868 -/* 0A964 8083CB74 E6000864 */ swc1 $f0, 0x0864($s0) ## 00000864 -/* 0A968 8083CB78 87AE0026 */ lh $t6, 0x0026($sp) -/* 0A96C 8083CB7C A60E083C */ sh $t6, 0x083C($s0) ## 0000083C -/* 0A970 8083CB80 8FBF001C */ lw $ra, 0x001C($sp) -/* 0A974 8083CB84 8FB00018 */ lw $s0, 0x0018($sp) -/* 0A978 8083CB88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0A97C 8083CB8C 03E00008 */ jr $ra -/* 0A980 8083CB90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB94.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB94.s deleted file mode 100644 index 57493ea100..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB94.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8083CB94 -/* 0A984 8083CB94 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0A988 8083CB98 AFA5001C */ sw $a1, 0x001C($sp) -/* 0A98C 8083CB9C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0A990 8083CBA0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0A994 8083CBA4 AFA40018 */ sw $a0, 0x0018($sp) -/* 0A998 8083CBA8 3C068084 */ lui $a2, %hi(func_80840DE4) ## $a2 = 80840000 -/* 0A99C 8083CBAC 24C60DE4 */ addiu $a2, $a2, %lo(func_80840DE4) ## $a2 = 80840DE4 -/* 0A9A0 8083CBB0 AFA50018 */ sw $a1, 0x0018($sp) -/* 0A9A4 8083CBB4 8FA4001C */ lw $a0, 0x001C($sp) -/* 0A9A8 8083CBB8 0C20D716 */ jal func_80835C58 -/* 0A9AC 8083CBBC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0A9B0 8083CBC0 8FA50018 */ lw $a1, 0x0018($sp) -/* 0A9B4 8083CBC4 3C068085 */ lui $a2, %hi(D_8085392C) ## $a2 = 80850000 -/* 0A9B8 8083CBC8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0A9BC 8083CBCC 90AE015B */ lbu $t6, 0x015B($a1) ## 0000015B -/* 0A9C0 8083CBD0 000E7880 */ sll $t7, $t6, 2 -/* 0A9C4 8083CBD4 00CF3021 */ addu $a2, $a2, $t7 -/* 0A9C8 8083CBD8 0C20CAFA */ jal func_80832BE8 -/* 0A9CC 8083CBDC 8CC6392C */ lw $a2, %lo(D_8085392C)($a2) -/* 0A9D0 8083CBE0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0A9D4 8083CBE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0A9D8 8083CBE8 03E00008 */ jr $ra -/* 0A9DC 8083CBEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s deleted file mode 100644 index 142051618f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_8083CBF0 -/* 0A9E0 8083CBF0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0A9E4 8083CBF4 AFA40028 */ sw $a0, 0x0028($sp) -/* 0A9E8 8083CBF8 AFA60030 */ sw $a2, 0x0030($sp) -/* 0A9EC 8083CBFC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0A9F0 8083CC00 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0A9F4 8083CC04 AFA5002C */ sw $a1, 0x002C($sp) -/* 0A9F8 8083CC08 3C068084 */ lui $a2, %hi(func_808423EC) ## $a2 = 80840000 -/* 0A9FC 8083CC0C 24C623EC */ addiu $a2, $a2, %lo(func_808423EC) ## $a2 = 808423EC -/* 0AA00 8083CC10 8FA50028 */ lw $a1, 0x0028($sp) -/* 0AA04 8083CC14 0C20D716 */ jal func_80835C58 -/* 0AA08 8083CC18 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0AA0C 8083CC1C 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 -/* 0AA10 8083CC20 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0AA14 8083CC24 248424F8 */ addiu $a0, $a0, 0x24F8 ## $a0 = 040024F8 -/* 0AA18 8083CC28 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 0AA1C 8083CC2C 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 0AA20 8083CC30 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 -/* 0AA24 8083CC34 46803220 */ cvt.s.w $f8, $f6 -/* 0AA28 8083CC38 8FA50028 */ lw $a1, 0x0028($sp) -/* 0AA2C 8083CC3C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0AA30 8083CC40 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0AA34 8083CC44 3C07400C */ lui $a3, 0x400C ## $a3 = 400C0000 -/* 0AA38 8083CC48 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0AA3C 8083CC4C AFAE0018 */ sw $t6, 0x0018($sp) -/* 0AA40 8083CC50 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 400CCCCD -/* 0AA44 8083CC54 24C624F8 */ addiu $a2, $a2, 0x24F8 ## $a2 = 040024F8 -/* 0AA48 8083CC58 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 0AA4C 8083CC5C 8FA40030 */ lw $a0, 0x0030($sp) -/* 0AA50 8083CC60 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 0AA54 8083CC64 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 0AA58 8083CC68 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 0AA5C 8083CC6C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0AA60 8083CC70 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 0AA64 8083CC74 44818000 */ mtc1 $at, $f16 ## $f16 = 8.00 -/* 0AA68 8083CC78 8FAF0028 */ lw $t7, 0x0028($sp) -/* 0AA6C 8083CC7C E5F00838 */ swc1 $f16, 0x0838($t7) ## 00000838 -/* 0AA70 8083CC80 8FB90028 */ lw $t9, 0x0028($sp) -/* 0AA74 8083CC84 87B8002E */ lh $t8, 0x002E($sp) -/* 0AA78 8083CC88 A738083C */ sh $t8, 0x083C($t9) ## 0000083C -/* 0AA7C 8083CC8C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0AA80 8083CC90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0AA84 8083CC94 03E00008 */ jr $ra -/* 0AA88 8083CC98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CC9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CC9C.s deleted file mode 100644 index 2997af3e0b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CC9C.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_8083CC9C -/* 0AA8C 8083CC9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0AA90 8083CCA0 AFA40018 */ sw $a0, 0x0018($sp) -/* 0AA94 8083CCA4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0AA98 8083CCA8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0AA9C 8083CCAC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0AAA0 8083CCB0 3C068084 */ lui $a2, %hi(func_8084193C) ## $a2 = 80840000 -/* 0AAA4 8083CCB4 24C6193C */ addiu $a2, $a2, %lo(func_8084193C) ## $a2 = 8084193C -/* 0AAA8 8083CCB8 8FA50018 */ lw $a1, 0x0018($sp) -/* 0AAAC 8083CCBC 0C20D716 */ jal func_80835C58 -/* 0AAB0 8083CCC0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0AAB4 8083CCC4 8FA50018 */ lw $a1, 0x0018($sp) -/* 0AAB8 8083CCC8 3C068085 */ lui $a2, %hi(D_80853B6C) ## $a2 = 80850000 -/* 0AABC 8083CCCC 8FA4001C */ lw $a0, 0x001C($sp) -/* 0AAC0 8083CCD0 90AE015B */ lbu $t6, 0x015B($a1) ## 0000015B -/* 0AAC4 8083CCD4 000E7880 */ sll $t7, $t6, 2 -/* 0AAC8 8083CCD8 00CF3021 */ addu $a2, $a2, $t7 -/* 0AACC 8083CCDC 0C20CAFA */ jal func_80832BE8 -/* 0AAD0 8083CCE0 8CC63B6C */ lw $a2, %lo(D_80853B6C)($a2) -/* 0AAD4 8083CCE4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0AAD8 8083CCE8 8FB80018 */ lw $t8, 0x0018($sp) -/* 0AADC 8083CCEC E7040868 */ swc1 $f4, 0x0868($t8) ## 00000868 -/* 0AAE0 8083CCF0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0AAE4 8083CCF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0AAE8 8083CCF8 03E00008 */ jr $ra -/* 0AAEC 8083CCFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s deleted file mode 100644 index a44ee10cc4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8083CD00 -/* 0AAF0 8083CD00 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0AAF4 8083CD04 AFA40018 */ sw $a0, 0x0018($sp) -/* 0AAF8 8083CD08 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0AAFC 8083CD0C AFA5001C */ sw $a1, 0x001C($sp) -/* 0AB00 8083CD10 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0AB04 8083CD14 3C068084 */ lui $a2, %hi(func_8084251C) ## $a2 = 80840000 -/* 0AB08 8083CD18 24C6251C */ addiu $a2, $a2, %lo(func_8084251C) ## $a2 = 8084251C -/* 0AB0C 8083CD1C 8FA50018 */ lw $a1, 0x0018($sp) -/* 0AB10 8083CD20 0C20D716 */ jal func_80835C58 -/* 0AB14 8083CD24 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0AB18 8083CD28 8FA50018 */ lw $a1, 0x0018($sp) -/* 0AB1C 8083CD2C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0AB20 8083CD30 24C624E8 */ addiu $a2, $a2, 0x24E8 ## $a2 = 040024E8 -/* 0AB24 8083CD34 8FA4001C */ lw $a0, 0x001C($sp) -/* 0AB28 8083CD38 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 0AB2C 8083CD3C 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop -/* 0AB30 8083CD40 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 0AB34 8083CD44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0AB38 8083CD48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0AB3C 8083CD4C 03E00008 */ jr $ra -/* 0AB40 8083CD50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s deleted file mode 100644 index 912c07962f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_8083CD54 -/* 0AB44 8083CD54 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0AB48 8083CD58 AFA60038 */ sw $a2, 0x0038($sp) -/* 0AB4C 8083CD5C 87AE003A */ lh $t6, 0x003A($sp) -/* 0AB50 8083CD60 AFBF002C */ sw $ra, 0x002C($sp) -/* 0AB54 8083CD64 AFB00028 */ sw $s0, 0x0028($sp) -/* 0AB58 8083CD68 AFA40030 */ sw $a0, 0x0030($sp) -/* 0AB5C 8083CD6C 3C068084 */ lui $a2, %hi(func_80841BA8) ## $a2 = 80840000 -/* 0AB60 8083CD70 A4AE083C */ sh $t6, 0x083C($a1) ## 0000083C -/* 0AB64 8083CD74 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0AB68 8083CD78 8FA40030 */ lw $a0, 0x0030($sp) -/* 0AB6C 8083CD7C 24C61BA8 */ addiu $a2, $a2, %lo(func_80841BA8) ## $a2 = 80841BA8 -/* 0AB70 8083CD80 0C20D716 */ jal func_80835C58 -/* 0AB74 8083CD84 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0AB78 8083CD88 240F04B0 */ addiu $t7, $zero, 0x04B0 ## $t7 = 000004B0 -/* 0AB7C 8083CD8C A60F087E */ sh $t7, 0x087E($s0) ## 0000087E -/* 0AB80 8083CD90 8618087E */ lh $t8, 0x087E($s0) ## 0000087E -/* 0AB84 8083CD94 3C018085 */ lui $at, %hi(D_808535E8) ## $at = 80850000 -/* 0AB88 8083CD98 C42835E8 */ lwc1 $f8, %lo(D_808535E8)($at) -/* 0AB8C 8083CD9C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 0AB90 8083CDA0 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B -/* 0AB94 8083CDA4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0AB98 8083CDA8 468021A0 */ cvt.s.w $f6, $f4 -/* 0AB9C 8083CDAC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 0ABA0 8083CDB0 44819000 */ mtc1 $at, $f18 ## $f18 = -6.00 -/* 0ABA4 8083CDB4 3C068085 */ lui $a2, %hi(D_80853B84) ## $a2 = 80850000 -/* 0ABA8 8083CDB8 00095080 */ sll $t2, $t1, 2 -/* 0ABAC 8083CDBC 00CA3021 */ addu $a2, $a2, $t2 -/* 0ABB0 8083CDC0 46083282 */ mul.s $f10, $f6, $f8 -/* 0ABB4 8083CDC4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0ABB8 8083CDC8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 0ABBC 8083CDCC 4600540D */ trunc.w.s $f16, $f10 -/* 0ABC0 8083CDD0 44088000 */ mfc1 $t0, $f16 -/* 0ABC4 8083CDD4 00000000 */ nop -/* 0ABC8 8083CDD8 A608087E */ sh $t0, 0x087E($s0) ## 0000087E -/* 0ABCC 8083CDDC AFA00018 */ sw $zero, 0x0018($sp) -/* 0ABD0 8083CDE0 8CC63B84 */ lw $a2, %lo(D_80853B84)($a2) -/* 0ABD4 8083CDE4 8FA40030 */ lw $a0, 0x0030($sp) -/* 0ABD8 8083CDE8 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 0ABDC 8083CDEC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0ABE0 8083CDF0 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 0ABE4 8083CDF4 E7B2001C */ swc1 $f18, 0x001C($sp) -/* 0ABE8 8083CDF8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0ABEC 8083CDFC 8FB00028 */ lw $s0, 0x0028($sp) -/* 0ABF0 8083CE00 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0ABF4 8083CE04 03E00008 */ jr $ra -/* 0ABF8 8083CE08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CE0C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CE0C.s deleted file mode 100644 index 71125e20b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CE0C.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_8083CE0C -/* 0ABFC 8083CE0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0AC00 8083CE10 AFA5001C */ sw $a1, 0x001C($sp) -/* 0AC04 8083CE14 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0AC08 8083CE18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0AC0C 8083CE1C AFA40018 */ sw $a0, 0x0018($sp) -/* 0AC10 8083CE20 3C068084 */ lui $a2, %hi(func_80840BC8) ## $a2 = 80840000 -/* 0AC14 8083CE24 24C60BC8 */ addiu $a2, $a2, %lo(func_80840BC8) ## $a2 = 80840BC8 -/* 0AC18 8083CE28 AFA50018 */ sw $a1, 0x0018($sp) -/* 0AC1C 8083CE2C 8FA4001C */ lw $a0, 0x001C($sp) -/* 0AC20 8083CE30 0C20D716 */ jal func_80835C58 -/* 0AC24 8083CE34 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0AC28 8083CE38 8FA50018 */ lw $a1, 0x0018($sp) -/* 0AC2C 8083CE3C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0AC30 8083CE40 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 0AC34 8083CE44 C4A40870 */ lwc1 $f4, 0x0870($a1) ## 00000870 -/* 0AC38 8083CE48 8FA4001C */ lw $a0, 0x001C($sp) -/* 0AC3C 8083CE4C 4606203C */ c.lt.s $f4, $f6 -/* 0AC40 8083CE50 00000000 */ nop -/* 0AC44 8083CE54 45020008 */ bc1fl .L8083CE78 -/* 0AC48 8083CE58 90B8015B */ lbu $t8, 0x015B($a1) ## 0000015B -/* 0AC4C 8083CE5C 90AE015B */ lbu $t6, 0x015B($a1) ## 0000015B -/* 0AC50 8083CE60 3C068085 */ lui $a2, %hi(D_80853BB4) ## $a2 = 80850000 -/* 0AC54 8083CE64 000E7880 */ sll $t7, $t6, 2 -/* 0AC58 8083CE68 00CF3021 */ addu $a2, $a2, $t7 -/* 0AC5C 8083CE6C 10000006 */ beq $zero, $zero, .L8083CE88 -/* 0AC60 8083CE70 8CC63BB4 */ lw $a2, %lo(D_80853BB4)($a2) -/* 0AC64 8083CE74 90B8015B */ lbu $t8, 0x015B($a1) ## 0000015B -.L8083CE78: -/* 0AC68 8083CE78 3C068085 */ lui $a2, %hi(D_80853B9C) ## $a2 = 80850000 -/* 0AC6C 8083CE7C 0018C880 */ sll $t9, $t8, 2 -/* 0AC70 8083CE80 00D93021 */ addu $a2, $a2, $t9 -/* 0AC74 8083CE84 8CC63B9C */ lw $a2, %lo(D_80853B9C)($a2) -.L8083CE88: -/* 0AC78 8083CE88 0C20C899 */ jal func_80832264 -/* 0AC7C 8083CE8C AFA50018 */ sw $a1, 0x0018($sp) -/* 0AC80 8083CE90 8FA50018 */ lw $a1, 0x0018($sp) -/* 0AC84 8083CE94 84A800B6 */ lh $t0, 0x00B6($a1) ## 000000B6 -/* 0AC88 8083CE98 A4A8083C */ sh $t0, 0x083C($a1) ## 0000083C -/* 0AC8C 8083CE9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0AC90 8083CEA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0AC94 8083CEA4 03E00008 */ jr $ra -/* 0AC98 8083CEA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CEAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CEAC.s deleted file mode 100644 index 64b83e1c54..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CEAC.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_8083CEAC -/* 0AC9C 8083CEAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0ACA0 8083CEB0 AFA40018 */ sw $a0, 0x0018($sp) -/* 0ACA4 8083CEB4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0ACA8 8083CEB8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0ACAC 8083CEBC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0ACB0 8083CEC0 3C068084 */ lui $a2, %hi(func_80840450) ## $a2 = 80840000 -/* 0ACB4 8083CEC4 24C60450 */ addiu $a2, $a2, %lo(func_80840450) ## $a2 = 80840450 -/* 0ACB8 8083CEC8 8FA50018 */ lw $a1, 0x0018($sp) -/* 0ACBC 8083CECC 0C20D716 */ jal func_80835C58 -/* 0ACC0 8083CED0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0ACC4 8083CED4 8FA50018 */ lw $a1, 0x0018($sp) -/* 0ACC8 8083CED8 3C068085 */ lui $a2, %hi(D_808539BC) ## $a2 = 80850000 -/* 0ACCC 8083CEDC 8FA4001C */ lw $a0, 0x001C($sp) -/* 0ACD0 8083CEE0 90AE015B */ lbu $t6, 0x015B($a1) ## 0000015B -/* 0ACD4 8083CEE4 000E7880 */ sll $t7, $t6, 2 -/* 0ACD8 8083CEE8 00CF3021 */ addu $a2, $a2, $t7 -/* 0ACDC 8083CEEC 0C20CAC3 */ jal func_80832B0C -/* 0ACE0 8083CEF0 8CC639BC */ lw $a2, %lo(D_808539BC)($a2) -/* 0ACE4 8083CEF4 8FB90018 */ lw $t9, 0x0018($sp) -/* 0ACE8 8083CEF8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 0ACEC 8083CEFC A7380850 */ sh $t8, 0x0850($t9) ## 00000850 -/* 0ACF0 8083CF00 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0ACF4 8083CF04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0ACF8 8083CF08 03E00008 */ jr $ra -/* 0ACFC 8083CF0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF10.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF10.s deleted file mode 100644 index 74895358bd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF10.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8083CF10 -/* 0AD00 8083CF10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0AD04 8083CF14 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0AD08 8083CF18 C4860838 */ lwc1 $f6, 0x0838($a0) ## 00000838 -/* 0AD0C 8083CF1C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0AD10 8083CF20 00000000 */ nop -/* 0AD14 8083CF24 46062032 */ c.eq.s $f4, $f6 -/* 0AD18 8083CF28 00000000 */ nop -/* 0AD1C 8083CF2C 45010005 */ bc1t .L8083CF44 -/* 0AD20 8083CF30 00000000 */ nop -/* 0AD24 8083CF34 0C20F216 */ jal func_8083C858 -/* 0AD28 8083CF38 00000000 */ nop -/* 0AD2C 8083CF3C 10000004 */ beq $zero, $zero, .L8083CF50 -/* 0AD30 8083CF40 8FBF0014 */ lw $ra, 0x0014($sp) -.L8083CF44: -/* 0AD34 8083CF44 0C20F383 */ jal func_8083CE0C -/* 0AD38 8083CF48 00000000 */ nop -/* 0AD3C 8083CF4C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8083CF50: -/* 0AD40 8083CF50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0AD44 8083CF54 03E00008 */ jr $ra -/* 0AD48 8083CF58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF5C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF5C.s deleted file mode 100644 index fbd26f3c02..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF5C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8083CF5C -/* 0AD4C 8083CF5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0AD50 8083CF60 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0AD54 8083CF64 C4860838 */ lwc1 $f6, 0x0838($a0) ## 00000838 -/* 0AD58 8083CF68 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0AD5C 8083CF6C 00000000 */ nop -/* 0AD60 8083CF70 46062032 */ c.eq.s $f4, $f6 -/* 0AD64 8083CF74 00000000 */ nop -/* 0AD68 8083CF78 45010005 */ bc1t .L8083CF90 -/* 0AD6C 8083CF7C 00000000 */ nop -/* 0AD70 8083CF80 0C20F216 */ jal func_8083C858 -/* 0AD74 8083CF84 00000000 */ nop -/* 0AD78 8083CF88 10000004 */ beq $zero, $zero, .L8083CF9C -/* 0AD7C 8083CF8C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8083CF90: -/* 0AD80 8083CF90 0C20E7E4 */ jal func_80839F90 -/* 0AD84 8083CF94 00000000 */ nop -/* 0AD88 8083CF98 8FBF0014 */ lw $ra, 0x0014($sp) -.L8083CF9C: -/* 0AD8C 8083CF9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0AD90 8083CFA0 03E00008 */ jr $ra -/* 0AD94 8083CFA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CFA8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CFA8.s deleted file mode 100644 index eaf3fdc872..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CFA8.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_8083CFA8 -/* 0AD98 8083CFA8 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 0AD9C 8083CFAC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0ADA0 8083CFB0 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 0ADA4 8083CFB4 46006085 */ abs.s $f2, $f12 -/* 0ADA8 8083CFB8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0ADAC 8083CFBC 4602203C */ c.lt.s $f4, $f2 -/* 0ADB0 8083CFC0 AFBF001C */ sw $ra, 0x001C($sp) -/* 0ADB4 8083CFC4 AFA50044 */ sw $a1, 0x0044($sp) -/* 0ADB8 8083CFC8 AFA7004C */ sw $a3, 0x004C($sp) -/* 0ADBC 8083CFCC 45020032 */ bc1fl .L8083D098 -/* 0ADC0 8083CFD0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0ADC4 8083CFD4 C4A60908 */ lwc1 $f6, 0x0908($a1) ## 00000908 -/* 0ADC8 8083CFD8 27AF0034 */ addiu $t7, $sp, 0x0034 ## $t7 = FFFFFFF4 -/* 0ADCC 8083CFDC 27B80038 */ addiu $t8, $sp, 0x0038 ## $t8 = FFFFFFF8 -/* 0ADD0 8083CFE0 E7A60028 */ swc1 $f6, 0x0028($sp) -/* 0ADD4 8083CFE4 C4A80910 */ lwc1 $f8, 0x0910($a1) ## 00000910 -/* 0ADD8 8083CFE8 44063000 */ mfc1 $a2, $f6 -/* 0ADDC 8083CFEC E7A80030 */ swc1 $f8, 0x0030($sp) -/* 0ADE0 8083CFF0 C4AA0028 */ lwc1 $f10, 0x0028($a1) ## 00000028 -/* 0ADE4 8083CFF4 44074000 */ mfc1 $a3, $f8 -/* 0ADE8 8083CFF8 E7A2003C */ swc1 $f2, 0x003C($sp) -/* 0ADEC 8083CFFC AFA40040 */ sw $a0, 0x0040($sp) -/* 0ADF0 8083D000 AFB80014 */ sw $t8, 0x0014($sp) -/* 0ADF4 8083D004 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0ADF8 8083D008 248507C0 */ addiu $a1, $a0, 0x07C0 ## $a1 = 000007C0 -/* 0ADFC 8083D00C 0C01084F */ jal func_8004213C -/* 0AE00 8083D010 E7AA0034 */ swc1 $f10, 0x0034($sp) -/* 0AE04 8083D014 8FA40040 */ lw $a0, 0x0040($sp) -/* 0AE08 8083D018 1040001E */ beq $v0, $zero, .L8083D094 -/* 0AE0C 8083D01C C7A2003C */ lwc1 $f2, 0x003C($sp) -/* 0AE10 8083D020 8FB90044 */ lw $t9, 0x0044($sp) -/* 0AE14 8083D024 C7B00034 */ lwc1 $f16, 0x0034($sp) -/* 0AE18 8083D028 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0AE1C 8083D02C C7320028 */ lwc1 $f18, 0x0028($t9) ## 00000028 -/* 0AE20 8083D030 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 0AE24 8083D034 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0AE28 8083D038 46128101 */ sub.s $f4, $f16, $f18 -/* 0AE2C 8083D03C C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 0AE30 8083D040 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFE8 -/* 0AE34 8083D044 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0AE38 8083D048 460A203C */ c.lt.s $f4, $f10 -/* 0AE3C 8083D04C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0AE40 8083D050 45020011 */ bc1fl .L8083D098 -/* 0AE44 8083D054 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0AE48 8083D058 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 0AE4C 8083D05C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0AE50 8083D060 4606103E */ c.le.s $f2, $f6 -/* 0AE54 8083D064 00000000 */ nop -/* 0AE58 8083D068 45000003 */ bc1f .L8083D078 -/* 0AE5C 8083D06C 00000000 */ nop -/* 0AE60 8083D070 10000001 */ beq $zero, $zero, .L8083D078 -/* 0AE64 8083D074 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083D078: -/* 0AE68 8083D078 8FA8004C */ lw $t0, 0x004C($sp) -/* 0AE6C 8083D07C E7A8002C */ swc1 $f8, 0x002C($sp) -/* 0AE70 8083D080 AFA20010 */ sw $v0, 0x0010($sp) -/* 0AE74 8083D084 0C00A527 */ jal func_8002949C -/* 0AE78 8083D088 AFA80014 */ sw $t0, 0x0014($sp) -/* 0AE7C 8083D08C 10000002 */ beq $zero, $zero, .L8083D098 -/* 0AE80 8083D090 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083D094: -/* 0AE84 8083D094 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083D098: -/* 0AE88 8083D098 8FBF001C */ lw $ra, 0x001C($sp) -/* 0AE8C 8083D09C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0AE90 8083D0A0 03E00008 */ jr $ra -/* 0AE94 8083D0A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D0A8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D0A8.s deleted file mode 100644 index cf69e4cb06..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D0A8.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_8083D0A8 -/* 0AE98 8083D0A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0AE9C 8083D0AC AFBF001C */ sw $ra, 0x001C($sp) -/* 0AEA0 8083D0B0 AFB00018 */ sw $s0, 0x0018($sp) -/* 0AEA4 8083D0B4 AFA40020 */ sw $a0, 0x0020($sp) -/* 0AEA8 8083D0B8 AFA60028 */ sw $a2, 0x0028($sp) -/* 0AEAC 8083D0BC 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C -/* 0AEB0 8083D0C0 3C010004 */ lui $at, 0x0004 ## $at = 00040000 -/* 0AEB4 8083D0C4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0AEB8 8083D0C8 01C17825 */ or $t7, $t6, $at ## $t7 = 00040000 -/* 0AEBC 8083D0CC 3C01F7FF */ lui $at, 0xF7FF ## $at = F7FF0000 -/* 0AEC0 8083D0D0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = F7FFFFFF -/* 0AEC4 8083D0D4 ACAF067C */ sw $t7, 0x067C($a1) ## 0000067C -/* 0AEC8 8083D0D8 01E1C824 */ and $t9, $t7, $at -/* 0AECC 8083D0DC ACB9067C */ sw $t9, 0x067C($a1) ## 0000067C -/* 0AED0 8083D0E0 0C20C8D0 */ jal func_80832340 -/* 0AED4 8083D0E4 8FA40020 */ lw $a0, 0x0020($sp) -/* 0AED8 8083D0E8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0AEDC 8083D0EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0AEE0 8083D0F0 8FA60028 */ lw $a2, 0x0028($sp) -/* 0AEE4 8083D0F4 0C20F3EA */ jal func_8083CFA8 -/* 0AEE8 8083D0F8 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 0AEEC 8083D0FC 10400003 */ beq $v0, $zero, .L8083D10C -/* 0AEF0 8083D100 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0AEF4 8083D104 0C00BDF7 */ jal func_8002F7DC -/* 0AEF8 8083D108 2405288A */ addiu $a1, $zero, 0x288A ## $a1 = 0000288A -.L8083D10C: -/* 0AEFC 8083D10C 8FA40020 */ lw $a0, 0x0020($sp) -/* 0AF00 8083D110 0C0239D4 */ jal func_8008E750 -/* 0AF04 8083D114 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0AF08 8083D118 8FBF001C */ lw $ra, 0x001C($sp) -/* 0AF0C 8083D11C 8FB00018 */ lw $s0, 0x0018($sp) -/* 0AF10 8083D120 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0AF14 8083D124 03E00008 */ jr $ra -/* 0AF18 8083D128 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D12C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D12C.s deleted file mode 100644 index 468a53d064..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D12C.s +++ /dev/null @@ -1,140 +0,0 @@ -glabel func_8083D12C -/* 0AF1C 8083D12C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0AF20 8083D130 AFBF001C */ sw $ra, 0x001C($sp) -/* 0AF24 8083D134 AFB00018 */ sw $s0, 0x0018($sp) -/* 0AF28 8083D138 AFA40020 */ sw $a0, 0x0020($sp) -/* 0AF2C 8083D13C AFA60028 */ sw $a2, 0x0028($sp) -/* 0AF30 8083D140 8CA3067C */ lw $v1, 0x067C($a1) ## 0000067C -/* 0AF34 8083D144 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0AF38 8083D148 30630400 */ andi $v1, $v1, 0x0400 ## $v1 = 00000000 -/* 0AF3C 8083D14C 14600031 */ bne $v1, $zero, .L8083D214 -/* 0AF40 8083D150 00000000 */ nop -/* 0AF44 8083D154 8CAE0680 */ lw $t6, 0x0680($a1) ## 00000680 -/* 0AF48 8083D158 31CF0400 */ andi $t7, $t6, 0x0400 ## $t7 = 00000000 -/* 0AF4C 8083D15C 15E0002D */ bne $t7, $zero, .L8083D214 -/* 0AF50 8083D160 00000000 */ nop -/* 0AF54 8083D164 10C00012 */ beq $a2, $zero, .L8083D1B0 -/* 0AF58 8083D168 8FA40020 */ lw $a0, 0x0020($sp) -/* 0AF5C 8083D16C 94D9000C */ lhu $t9, 0x000C($a2) ## 0000000C -/* 0AF60 8083D170 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 0AF64 8083D174 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 0AF68 8083D178 03214027 */ nor $t0, $t9, $at -/* 0AF6C 8083D17C 15000025 */ bne $t0, $zero, .L8083D214 -/* 0AF70 8083D180 00000000 */ nop -/* 0AF74 8083D184 84A206C2 */ lh $v0, 0x06C2($a1) ## 000006C2 -/* 0AF78 8083D188 04400003 */ bltz $v0, .L8083D198 -/* 0AF7C 8083D18C 00023023 */ subu $a2, $zero, $v0 -/* 0AF80 8083D190 10000001 */ beq $zero, $zero, .L8083D198 -/* 0AF84 8083D194 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -.L8083D198: -/* 0AF88 8083D198 28C12EE0 */ slti $at, $a2, 0x2EE0 -/* 0AF8C 8083D19C 1020001D */ beq $at, $zero, .L8083D214 -/* 0AF90 8083D1A0 00000000 */ nop -/* 0AF94 8083D1A4 8209014F */ lb $t1, 0x014F($s0) ## 0000014F -/* 0AF98 8083D1A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0AF9C 8083D1AC 11210019 */ beq $t1, $at, .L8083D214 -.L8083D1B0: -/* 0AFA0 8083D1B0 3C068085 */ lui $a2, %hi(func_8084DC48) ## $a2 = 80850000 -/* 0AFA4 8083D1B4 24C6DC48 */ addiu $a2, $a2, %lo(func_8084DC48) ## $a2 = 8084DC48 -/* 0AFA8 8083D1B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0AFAC 8083D1BC 0C20D716 */ jal func_80835C58 -/* 0AFB0 8083D1C0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0AFB4 8083D1C4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0AFB8 8083D1C8 24C63308 */ addiu $a2, $a2, 0x3308 ## $a2 = 04003308 -/* 0AFBC 8083D1CC 8FA40020 */ lw $a0, 0x0020($sp) -/* 0AFC0 8083D1D0 0C20C899 */ jal func_80832264 -/* 0AFC4 8083D1D4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0AFC8 8083D1D8 8E0A0680 */ lw $t2, 0x0680($s0) ## 00000680 -/* 0AFCC 8083D1DC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0AFD0 8083D1E0 A60006C2 */ sh $zero, 0x06C2($s0) ## 000006C2 -/* 0AFD4 8083D1E4 354B0400 */ ori $t3, $t2, 0x0400 ## $t3 = 00000400 -/* 0AFD8 8083D1E8 AE0B0680 */ sw $t3, 0x0680($s0) ## 00000680 -/* 0AFDC 8083D1EC E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 0AFE0 8083D1F0 8FAC0028 */ lw $t4, 0x0028($sp) -/* 0AFE4 8083D1F4 356E0800 */ ori $t6, $t3, 0x0800 ## $t6 = 00000C00 -/* 0AFE8 8083D1F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0AFEC 8083D1FC 11800003 */ beq $t4, $zero, .L8083D20C -/* 0AFF0 8083D200 24050864 */ addiu $a1, $zero, 0x0864 ## $a1 = 00000864 -/* 0AFF4 8083D204 0C00BDF7 */ jal func_8002F7DC -/* 0AFF8 8083D208 AE0E0680 */ sw $t6, 0x0680($s0) ## 00000680 -.L8083D20C: -/* 0AFFC 8083D20C 10000043 */ beq $zero, $zero, .L8083D31C -/* 0B000 8083D210 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083D214: -/* 0B004 8083D214 54600006 */ bnel $v1, $zero, .L8083D230 -/* 0B008 8083D218 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0B00C 8083D21C 8E0F0680 */ lw $t7, 0x0680($s0) ## 00000680 -/* 0B010 8083D220 31F80400 */ andi $t8, $t7, 0x0400 ## $t8 = 00000000 -/* 0B014 8083D224 5300003D */ beql $t8, $zero, .L8083D31C -/* 0B018 8083D228 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0B01C 8083D22C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -.L8083D230: -/* 0B020 8083D230 C6080060 */ lwc1 $f8, 0x0060($s0) ## 00000060 -/* 0B024 8083D234 4608303C */ c.lt.s $f6, $f8 -/* 0B028 8083D238 00000000 */ nop -/* 0B02C 8083D23C 45020037 */ bc1fl .L8083D31C -/* 0B030 8083D240 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0B034 8083D244 8E190678 */ lw $t9, 0x0678($s0) ## 00000678 -/* 0B038 8083D248 C60A0084 */ lwc1 $f10, 0x0084($s0) ## 00000084 -/* 0B03C 8083D24C C7300030 */ lwc1 $f16, 0x0030($t9) ## 00000030 -/* 0B040 8083D250 4610503C */ c.lt.s $f10, $f16 -/* 0B044 8083D254 00000000 */ nop -/* 0B048 8083D258 45020030 */ bc1fl .L8083D31C -/* 0B04C 8083D25C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0B050 8083D260 8E080680 */ lw $t0, 0x0680($s0) ## 00000680 -/* 0B054 8083D264 2401FBFF */ addiu $at, $zero, 0xFBFF ## $at = FFFFFBFF -/* 0B058 8083D268 3C068085 */ lui $a2, %hi(func_8084E1EC) ## $a2 = 80850000 -/* 0B05C 8083D26C 01014824 */ and $t1, $t0, $at -/* 0B060 8083D270 AE090680 */ sw $t1, 0x0680($s0) ## 00000680 -/* 0B064 8083D274 8FAA0028 */ lw $t2, 0x0028($sp) -/* 0B068 8083D278 8FA40020 */ lw $a0, 0x0020($sp) -/* 0B06C 8083D27C 24C6E1EC */ addiu $a2, $a2, %lo(func_8084E1EC) ## $a2 = 8084E1EC -/* 0B070 8083D280 1140000C */ beq $t2, $zero, .L8083D2B4 -/* 0B074 8083D284 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0B078 8083D288 0C20D716 */ jal func_80835C58 -/* 0B07C 8083D28C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B080 8083D290 8E03067C */ lw $v1, 0x067C($s0) ## 0000067C -/* 0B084 8083D294 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 0B088 8083D298 34210C00 */ ori $at, $at, 0x0C00 ## $at = 20000C00 -/* 0B08C 8083D29C 306B0400 */ andi $t3, $v1, 0x0400 ## $t3 = 00000000 -/* 0B090 8083D2A0 11600003 */ beq $t3, $zero, .L8083D2B0 -/* 0B094 8083D2A4 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 0B098 8083D2A8 00616025 */ or $t4, $v1, $at ## $t4 = 20000C00 -/* 0B09C 8083D2AC AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -.L8083D2B0: -/* 0B0A0 8083D2B0 A60D0850 */ sh $t5, 0x0850($s0) ## 00000850 -.L8083D2B4: -/* 0B0A4 8083D2B4 8FA40020 */ lw $a0, 0x0020($sp) -/* 0B0A8 8083D2B8 0C20C8D0 */ jal func_80832340 -/* 0B0AC 8083D2BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0B0B0 8083D2C0 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 0B0B4 8083D2C4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0B0B8 8083D2C8 24C63300 */ addiu $a2, $a2, 0x3300 ## $a2 = 04003300 -/* 0B0BC 8083D2CC 31CF0800 */ andi $t7, $t6, 0x0800 ## $t7 = 00000000 -/* 0B0C0 8083D2D0 11E00004 */ beq $t7, $zero, .L8083D2E4 -/* 0B0C4 8083D2D4 8FA40020 */ lw $a0, 0x0020($sp) -/* 0B0C8 8083D2D8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0B0CC 8083D2DC 10000001 */ beq $zero, $zero, .L8083D2E4 -/* 0B0D0 8083D2E0 24C63318 */ addiu $a2, $a2, 0x3318 ## $a2 = 04003318 -.L8083D2E4: -/* 0B0D4 8083D2E4 0C20CAC3 */ jal func_80832B0C -/* 0B0D8 8083D2E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0B0DC 8083D2EC 8FA40020 */ lw $a0, 0x0020($sp) -/* 0B0E0 8083D2F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0B0E4 8083D2F4 8E060060 */ lw $a2, 0x0060($s0) ## 00000060 -/* 0B0E8 8083D2F8 0C20F3EA */ jal func_8083CFA8 -/* 0B0EC 8083D2FC 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 0B0F0 8083D300 10400003 */ beq $v0, $zero, .L8083D310 -/* 0B0F4 8083D304 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0B0F8 8083D308 0C00BDF7 */ jal func_8002F7DC -/* 0B0FC 8083D30C 24050863 */ addiu $a1, $zero, 0x0863 ## $a1 = 00000863 -.L8083D310: -/* 0B100 8083D310 10000002 */ beq $zero, $zero, .L8083D31C -/* 0B104 8083D314 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0B108 8083D318 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083D31C: -/* 0B10C 8083D31C 8FBF001C */ lw $ra, 0x001C($sp) -/* 0B110 8083D320 8FB00018 */ lw $s0, 0x0018($sp) -/* 0B114 8083D324 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0B118 8083D328 03E00008 */ jr $ra -/* 0B11C 8083D32C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D330.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D330.s deleted file mode 100644 index d28f538586..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D330.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8083D330 -/* 0B120 8083D330 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0B124 8083D334 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0B128 8083D338 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0B12C 8083D33C 24C632F0 */ addiu $a2, $a2, 0x32F0 ## $a2 = 040032F0 -/* 0B130 8083D340 0C20C8A1 */ jal func_80832284 -/* 0B134 8083D344 AFA5001C */ sw $a1, 0x001C($sp) -/* 0B138 8083D348 8FA5001C */ lw $a1, 0x001C($sp) -/* 0B13C 8083D34C 240E3E80 */ addiu $t6, $zero, 0x3E80 ## $t6 = 00003E80 -/* 0B140 8083D350 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0B144 8083D354 A4AE06C2 */ sh $t6, 0x06C2($a1) ## 000006C2 -/* 0B148 8083D358 A4AF0850 */ sh $t7, 0x0850($a1) ## 00000850 -/* 0B14C 8083D35C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0B150 8083D360 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0B154 8083D364 03E00008 */ jr $ra -/* 0B158 8083D368 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D36C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D36C.s deleted file mode 100644 index 24b90a362a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D36C.s +++ /dev/null @@ -1,127 +0,0 @@ -glabel func_8083D36C -/* 0B15C 8083D36C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0B160 8083D370 AFBF001C */ sw $ra, 0x001C($sp) -/* 0B164 8083D374 AFB00018 */ sw $s0, 0x0018($sp) -/* 0B168 8083D378 AFA40020 */ sw $a0, 0x0020($sp) -/* 0B16C 8083D37C 80AE014F */ lb $t6, 0x014F($a1) ## 0000014F -/* 0B170 8083D380 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0B174 8083D384 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0B178 8083D388 15C10005 */ bne $t6, $at, .L8083D3A0 -/* 0B17C 8083D38C 8FA40020 */ lw $a0, 0x0020($sp) -/* 0B180 8083D390 94AF0088 */ lhu $t7, 0x0088($a1) ## 00000088 -/* 0B184 8083D394 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 0B188 8083D398 57000035 */ bnel $t8, $zero, .L8083D470 -/* 0B18C 8083D39C 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -.L8083D3A0: -/* 0B190 8083D3A0 0C20C959 */ jal func_80832564 -/* 0B194 8083D3A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0B198 8083D3A8 8219014F */ lb $t9, 0x014F($s0) ## 0000014F -/* 0B19C 8083D3AC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0B1A0 8083D3B0 5321000F */ beql $t9, $at, .L8083D3F0 -/* 0B1A4 8083D3B4 8E0B0674 */ lw $t3, 0x0674($s0) ## 00000674 -/* 0B1A8 8083D3B8 8E020680 */ lw $v0, 0x0680($s0) ## 00000680 -/* 0B1AC 8083D3BC 2401FBFF */ addiu $at, $zero, 0xFBFF ## $at = FFFFFBFF -/* 0B1B0 8083D3C0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0B1B4 8083D3C4 30480400 */ andi $t0, $v0, 0x0400 ## $t0 = 00000000 -/* 0B1B8 8083D3C8 11000008 */ beq $t0, $zero, .L8083D3EC -/* 0B1BC 8083D3CC 00414824 */ and $t1, $v0, $at -/* 0B1C0 8083D3D0 AE090680 */ sw $t1, 0x0680($s0) ## 00000680 -/* 0B1C4 8083D3D4 8FA40020 */ lw $a0, 0x0020($sp) -/* 0B1C8 8083D3D8 0C20F44B */ jal func_8083D12C -/* 0B1CC 8083D3DC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0B1D0 8083D3E0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0B1D4 8083D3E4 10000021 */ beq $zero, $zero, .L8083D46C -/* 0B1D8 8083D3E8 A20A084F */ sb $t2, 0x084F($s0) ## 0000084F -.L8083D3EC: -/* 0B1DC 8083D3EC 8E0B0674 */ lw $t3, 0x0674($s0) ## 00000674 -.L8083D3F0: -/* 0B1E0 8083D3F0 3C0C8084 */ lui $t4, %hi(func_80844A44) ## $t4 = 80840000 -/* 0B1E4 8083D3F4 258C4A44 */ addiu $t4, $t4, %lo(func_80844A44) ## $t4 = 80844A44 -/* 0B1E8 8083D3F8 156C000C */ bne $t3, $t4, .L8083D42C -/* 0B1EC 8083D3FC 8FA40020 */ lw $a0, 0x0020($sp) -/* 0B1F0 8083D400 3C068085 */ lui $a2, %hi(func_8084DC48) ## $a2 = 80850000 -/* 0B1F4 8083D404 24C6DC48 */ addiu $a2, $a2, %lo(func_8084DC48) ## $a2 = 8084DC48 -/* 0B1F8 8083D408 8FA40020 */ lw $a0, 0x0020($sp) -/* 0B1FC 8083D40C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0B200 8083D410 0C20D716 */ jal func_80835C58 -/* 0B204 8083D414 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0B208 8083D418 8FA40020 */ lw $a0, 0x0020($sp) -/* 0B20C 8083D41C 0C20F4CC */ jal func_8083D330 -/* 0B210 8083D420 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0B214 8083D424 10000012 */ beq $zero, $zero, .L8083D470 -/* 0B218 8083D428 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -.L8083D42C: -/* 0B21C 8083D42C 3C068085 */ lui $a2, %hi(func_8084D610) ## $a2 = 80850000 -/* 0B220 8083D430 24C6D610 */ addiu $a2, $a2, %lo(func_8084D610) ## $a2 = 8084D610 -/* 0B224 8083D434 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0B228 8083D438 0C20D716 */ jal func_80835C58 -/* 0B22C 8083D43C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B230 8083D440 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 -/* 0B234 8083D444 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0B238 8083D448 24C632E0 */ addiu $a2, $a2, 0x32E0 ## $a2 = 040032E0 -/* 0B23C 8083D44C 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 0B240 8083D450 11C00004 */ beq $t6, $zero, .L8083D464 -/* 0B244 8083D454 8FA40020 */ lw $a0, 0x0020($sp) -/* 0B248 8083D458 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0B24C 8083D45C 10000001 */ beq $zero, $zero, .L8083D464 -/* 0B250 8083D460 24C63330 */ addiu $a2, $a2, 0x3330 ## $a2 = 04003330 -.L8083D464: -/* 0B254 8083D464 0C20CAC3 */ jal func_80832B0C -/* 0B258 8083D468 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L8083D46C: -/* 0B25C 8083D46C 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -.L8083D470: -/* 0B260 8083D470 8FA40020 */ lw $a0, 0x0020($sp) -/* 0B264 8083D474 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0B268 8083D478 000FC100 */ sll $t8, $t7, 4 -/* 0B26C 8083D47C 07010008 */ bgez $t8, .L8083D4A0 -/* 0B270 8083D480 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 0B274 8083D484 8E190678 */ lw $t9, 0x0678($s0) ## 00000678 -/* 0B278 8083D488 C6040084 */ lwc1 $f4, 0x0084($s0) ## 00000084 -/* 0B27C 8083D48C C726002C */ lwc1 $f6, 0x002C($t9) ## 0000002C -/* 0B280 8083D490 4606203C */ c.lt.s $f4, $f6 -/* 0B284 8083D494 00000000 */ nop -/* 0B288 8083D498 45020014 */ bc1fl .L8083D4EC -/* 0B28C 8083D49C 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -.L8083D4A0: -/* 0B290 8083D4A0 0C20F3EA */ jal func_8083CFA8 -/* 0B294 8083D4A4 8E060060 */ lw $a2, 0x0060($s0) ## 00000060 -/* 0B298 8083D4A8 1040000F */ beq $v0, $zero, .L8083D4E8 -/* 0B29C 8083D4AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0B2A0 8083D4B0 0C00BDF7 */ jal func_8002F7DC -/* 0B2A4 8083D4B4 24052889 */ addiu $a1, $zero, 0x2889 ## $a1 = 00002889 -/* 0B2A8 8083D4B8 86080896 */ lh $t0, 0x0896($s0) ## 00000896 -/* 0B2AC 8083D4BC 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 0B2B0 8083D4C0 44814000 */ mtc1 $at, $f8 ## $f8 = 800.00 -/* 0B2B4 8083D4C4 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 0B2B8 8083D4C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0B2BC 8083D4CC 46805420 */ cvt.s.w $f16, $f10 -/* 0B2C0 8083D4D0 4610403C */ c.lt.s $f8, $f16 -/* 0B2C4 8083D4D4 00000000 */ nop -/* 0B2C8 8083D4D8 45020004 */ bc1fl .L8083D4EC -/* 0B2CC 8083D4DC 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 0B2D0 8083D4E0 0C20C9A6 */ jal func_80832698 -/* 0B2D4 8083D4E4 24056804 */ addiu $a1, $zero, 0x6804 ## $a1 = 00006804 -.L8083D4E8: -/* 0B2D8 8083D4E8 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -.L8083D4EC: -/* 0B2DC 8083D4EC 3C010800 */ lui $at, 0x0800 ## $at = 08000000 -/* 0B2E0 8083D4F0 8E0B0680 */ lw $t3, 0x0680($s0) ## 00000680 -/* 0B2E4 8083D4F4 01215025 */ or $t2, $t1, $at ## $t2 = 08000000 -/* 0B2E8 8083D4F8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 0B2EC 8083D4FC 3C01FFF3 */ lui $at, 0xFFF3 ## $at = FFF30000 -/* 0B2F0 8083D500 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFF3FFFF -/* 0B2F4 8083D504 AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C -/* 0B2F8 8083D508 01417024 */ and $t6, $t2, $at -/* 0B2FC 8083D50C 356C0400 */ ori $t4, $t3, 0x0400 ## $t4 = 00000400 -/* 0B300 8083D510 AE0C0680 */ sw $t4, 0x0680($s0) ## 00000680 -/* 0B304 8083D514 AE0E067C */ sw $t6, 0x067C($s0) ## 0000067C -/* 0B308 8083D518 E6120854 */ swc1 $f18, 0x0854($s0) ## 00000854 -/* 0B30C 8083D51C 8FA40020 */ lw $a0, 0x0020($sp) -/* 0B310 8083D520 0C0239D4 */ jal func_8008E750 -/* 0B314 8083D524 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0B318 8083D528 8FBF001C */ lw $ra, 0x001C($sp) -/* 0B31C 8083D52C 8FB00018 */ lw $s0, 0x0018($sp) -/* 0B320 8083D530 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0B324 8083D534 03E00008 */ jr $ra -/* 0B328 8083D538 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D53C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D53C.s deleted file mode 100644 index 0dc2eb3de7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D53C.s +++ /dev/null @@ -1,117 +0,0 @@ -glabel func_8083D53C -/* 0B32C 8083D53C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0B330 8083D540 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0B334 8083D544 AFA40018 */ sw $a0, 0x0018($sp) -/* 0B338 8083D548 8CAE0678 */ lw $t6, 0x0678($a1) ## 00000678 -/* 0B33C 8083D54C C4A40084 */ lwc1 $f4, 0x0084($a1) ## 00000084 -/* 0B340 8083D550 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 -/* 0B344 8083D554 C5C6002C */ lwc1 $f6, 0x002C($t6) ## 0000002C -/* 0B348 8083D558 4606203C */ c.lt.s $f4, $f6 -/* 0B34C 8083D55C 00000000 */ nop -/* 0B350 8083D560 45000007 */ bc1f .L8083D580 -/* 0B354 8083D564 00000000 */ nop -/* 0B358 8083D568 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 0B35C 8083D56C 0C03D9E8 */ jal func_800F67A0 -/* 0B360 8083D570 AFA5001C */ sw $a1, 0x001C($sp) -/* 0B364 8083D574 8FA5001C */ lw $a1, 0x001C($sp) -/* 0B368 8083D578 10000009 */ beq $zero, $zero, .L8083D5A0 -/* 0B36C 8083D57C A4A00840 */ sh $zero, 0x0840($a1) ## 00000840 -.L8083D580: -/* 0B370 8083D580 0C03D9E8 */ jal func_800F67A0 -/* 0B374 8083D584 AFA5001C */ sw $a1, 0x001C($sp) -/* 0B378 8083D588 8FA5001C */ lw $a1, 0x001C($sp) -/* 0B37C 8083D58C 94A20840 */ lhu $v0, 0x0840($a1) ## 00000840 -/* 0B380 8083D590 2841012C */ slti $at, $v0, 0x012C -/* 0B384 8083D594 10200002 */ beq $at, $zero, .L8083D5A0 -/* 0B388 8083D598 244F0001 */ addiu $t7, $v0, 0x0001 ## $t7 = 00000001 -/* 0B38C 8083D59C A4AF0840 */ sh $t7, 0x0840($a1) ## 00000840 -.L8083D5A0: -/* 0B390 8083D5A0 8CA20674 */ lw $v0, 0x0674($a1) ## 00000674 -/* 0B394 8083D5A4 3C188084 */ lui $t8, %hi(func_80845668) ## $t8 = 80840000 -/* 0B398 8083D5A8 27185668 */ addiu $t8, $t8, %lo(func_80845668) ## $t8 = 80845668 -/* 0B39C 8083D5AC 1058004B */ beq $v0, $t8, .L8083D6DC -/* 0B3A0 8083D5B0 3C198085 */ lui $t9, %hi(func_8084BDFC) ## $t9 = 80850000 -/* 0B3A4 8083D5B4 2739BDFC */ addiu $t9, $t9, %lo(func_8084BDFC) ## $t9 = 8084BDFC -/* 0B3A8 8083D5B8 50590049 */ beql $v0, $t9, .L8083D6E0 -/* 0B3AC 8083D5BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0B3B0 8083D5C0 8CA30678 */ lw $v1, 0x0678($a1) ## 00000678 -/* 0B3B4 8083D5C4 C4A00084 */ lwc1 $f0, 0x0084($a1) ## 00000084 -/* 0B3B8 8083D5C8 C468002C */ lwc1 $f8, 0x002C($v1) ## 0000002C -/* 0B3BC 8083D5CC 4600403C */ c.lt.s $f8, $f0 -/* 0B3C0 8083D5D0 00000000 */ nop -/* 0B3C4 8083D5D4 4502002A */ bc1fl .L8083D680 -/* 0B3C8 8083D5D8 8CAB067C */ lw $t3, 0x067C($a1) ## 0000067C -/* 0B3CC 8083D5DC 8CA8067C */ lw $t0, 0x067C($a1) ## 0000067C -/* 0B3D0 8083D5E0 00084900 */ sll $t1, $t0, 4 -/* 0B3D4 8083D5E4 05210021 */ bgez $t1, .L8083D66C -/* 0B3D8 8083D5E8 00000000 */ nop -/* 0B3DC 8083D5EC 80AA014F */ lb $t2, 0x014F($a1) ## 0000014F -/* 0B3E0 8083D5F0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0B3E4 8083D5F4 3C0D8085 */ lui $t5, %hi(func_8084E30C) ## $t5 = 80850000 -/* 0B3E8 8083D5F8 15410005 */ bne $t2, $at, .L8083D610 -/* 0B3EC 8083D5FC 25ADE30C */ addiu $t5, $t5, %lo(func_8084E30C) ## $t5 = 8084E30C -/* 0B3F0 8083D600 94AB0088 */ lhu $t3, 0x0088($a1) ## 00000088 -/* 0B3F4 8083D604 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 0B3F8 8083D608 55800035 */ bnel $t4, $zero, .L8083D6E0 -/* 0B3FC 8083D60C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8083D610: -/* 0B400 8083D610 104D0032 */ beq $v0, $t5, .L8083D6DC -/* 0B404 8083D614 3C0E8085 */ lui $t6, %hi(func_8084E368) ## $t6 = 80850000 -/* 0B408 8083D618 25CEE368 */ addiu $t6, $t6, %lo(func_8084E368) ## $t6 = 8084E368 -/* 0B40C 8083D61C 104E002F */ beq $v0, $t6, .L8083D6DC -/* 0B410 8083D620 3C0F8085 */ lui $t7, %hi(func_8084D610) ## $t7 = 80850000 -/* 0B414 8083D624 25EFD610 */ addiu $t7, $t7, %lo(func_8084D610) ## $t7 = 8084D610 -/* 0B418 8083D628 104F002C */ beq $v0, $t7, .L8083D6DC -/* 0B41C 8083D62C 3C188085 */ lui $t8, %hi(func_8084D84C) ## $t8 = 80850000 -/* 0B420 8083D630 2718D84C */ addiu $t8, $t8, %lo(func_8084D84C) ## $t8 = 8084D84C -/* 0B424 8083D634 10580029 */ beq $v0, $t8, .L8083D6DC -/* 0B428 8083D638 3C198085 */ lui $t9, %hi(func_8084DAB4) ## $t9 = 80850000 -/* 0B42C 8083D63C 2739DAB4 */ addiu $t9, $t9, %lo(func_8084DAB4) ## $t9 = 8084DAB4 -/* 0B430 8083D640 10590026 */ beq $v0, $t9, .L8083D6DC -/* 0B434 8083D644 3C088085 */ lui $t0, %hi(func_8084DC48) ## $t0 = 80850000 -/* 0B438 8083D648 2508DC48 */ addiu $t0, $t0, %lo(func_8084DC48) ## $t0 = 8084DC48 -/* 0B43C 8083D64C 10480023 */ beq $v0, $t0, .L8083D6DC -/* 0B440 8083D650 3C098085 */ lui $t1, %hi(func_8084E1EC) ## $t1 = 80850000 -/* 0B444 8083D654 2529E1EC */ addiu $t1, $t1, %lo(func_8084E1EC) ## $t1 = 8084E1EC -/* 0B448 8083D658 10490020 */ beq $v0, $t1, .L8083D6DC -/* 0B44C 8083D65C 3C0A8085 */ lui $t2, %hi(func_8084D7C4) ## $t2 = 80850000 -/* 0B450 8083D660 254AD7C4 */ addiu $t2, $t2, %lo(func_8084D7C4) ## $t2 = 8084D7C4 -/* 0B454 8083D664 504A001E */ beql $v0, $t2, .L8083D6E0 -/* 0B458 8083D668 8FBF0014 */ lw $ra, 0x0014($sp) -.L8083D66C: -/* 0B45C 8083D66C 0C20F4DB */ jal func_8083D36C -/* 0B460 8083D670 8FA40018 */ lw $a0, 0x0018($sp) -/* 0B464 8083D674 1000001A */ beq $zero, $zero, .L8083D6E0 -/* 0B468 8083D678 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0B46C 8083D67C 8CAB067C */ lw $t3, 0x067C($a1) ## 0000067C -.L8083D680: -/* 0B470 8083D680 000B6100 */ sll $t4, $t3, 4 -/* 0B474 8083D684 05830016 */ bgezl $t4, .L8083D6E0 -/* 0B478 8083D688 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0B47C 8083D68C C46A0024 */ lwc1 $f10, 0x0024($v1) ## 00000024 -/* 0B480 8083D690 460A003C */ c.lt.s $f0, $f10 -/* 0B484 8083D694 00000000 */ nop -/* 0B488 8083D698 45020011 */ bc1fl .L8083D6E0 -/* 0B48C 8083D69C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0B490 8083D6A0 90AD01E9 */ lbu $t5, 0x01E9($a1) ## 000001E9 -/* 0B494 8083D6A4 55A0000B */ bnel $t5, $zero, .L8083D6D4 -/* 0B498 8083D6A8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0B49C 8083D6AC 80AE014F */ lb $t6, 0x014F($a1) ## 0000014F -/* 0B4A0 8083D6B0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0B4A4 8083D6B4 8FA40018 */ lw $a0, 0x0018($sp) -/* 0B4A8 8083D6B8 51C10006 */ beql $t6, $at, .L8083D6D4 -/* 0B4AC 8083D6BC 8FA40018 */ lw $a0, 0x0018($sp) -/* 0B4B0 8083D6C0 84A600B6 */ lh $a2, 0x00B6($a1) ## 000000B6 -/* 0B4B4 8083D6C4 0C20F355 */ jal func_8083CD54 -/* 0B4B8 8083D6C8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0B4BC 8083D6CC 8FA5001C */ lw $a1, 0x001C($sp) -/* 0B4C0 8083D6D0 8FA40018 */ lw $a0, 0x0018($sp) -.L8083D6D4: -/* 0B4C4 8083D6D4 0C20F42A */ jal func_8083D0A8 -/* 0B4C8 8083D6D8 8CA60060 */ lw $a2, 0x0060($a1) ## 00000060 -.L8083D6DC: -/* 0B4CC 8083D6DC 8FBF0014 */ lw $ra, 0x0014($sp) -.L8083D6E0: -/* 0B4D0 8083D6E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0B4D4 8083D6E4 03E00008 */ jr $ra -/* 0B4D8 8083D6E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D6EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D6EC.s deleted file mode 100644 index bcc18cde8e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D6EC.s +++ /dev/null @@ -1,348 +0,0 @@ -.late_rodata -glabel D_80855398 - .float 1300.0 - -glabel D_8085539C - .float 0.3 - -glabel D_808553A0 - .word 0x469C4000 -glabel D_808553A4 - .float 0.02 - -glabel D_808553A8 - .word 0x3B83126F -glabel D_808553AC - .float 0.2 - -glabel D_808553B0 - .word 0x3E051EB8 - -.text -glabel func_8083D6EC -/* 0B4DC 8083D6EC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 0B4E0 8083D6F0 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 -/* 0B4E4 8083D6F4 44812000 */ mtc1 $at, $f4 ## $f4 = -20.00 -/* 0B4E8 8083D6F8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0B4EC 8083D6FC AFB00028 */ sw $s0, 0x0028($sp) -/* 0B4F0 8083D700 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 0B4F4 8083D704 AFA40068 */ sw $a0, 0x0068($sp) -/* 0B4F8 8083D708 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 0B4FC 8083D70C E4A40070 */ swc1 $f4, 0x0070($a1) ## 00000070 -/* 0B500 8083D710 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 0B504 8083D714 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0B508 8083D718 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 0B50C 8083D71C 85CF009C */ lh $t7, 0x009C($t6) ## 8016009C -/* 0B510 8083D720 3C048085 */ lui $a0, %hi(D_808535E4) ## $a0 = 80850000 -/* 0B514 8083D724 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0B518 8083D728 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 0B51C 8083D72C 00000000 */ nop -/* 0B520 8083D730 46803220 */ cvt.s.w $f8, $f6 -/* 0B524 8083D734 460A4103 */ div.s $f4, $f8, $f10 -/* 0B528 8083D738 E4A4006C */ swc1 $f4, 0x006C($a1) ## 0000006C -/* 0B52C 8083D73C 0C20E05B */ jal func_8083816C -/* 0B530 8083D740 8C8435E4 */ lw $a0, %lo(D_808535E4)($a0) -/* 0B534 8083D744 5040006B */ beql $v0, $zero, .L8083D8F4 -/* 0B538 8083D748 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0B53C 8083D74C C6000838 */ lwc1 $f0, 0x0838($s0) ## 00000838 -/* 0B540 8083D750 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0B544 8083D754 4481A000 */ mtc1 $at, $f20 ## $f20 = 20.00 -/* 0B548 8083D758 46000005 */ abs.s $f0, $f0 -/* 0B54C 8083D75C 3C028085 */ lui $v0, %hi(D_808535E4) ## $v0 = 80850000 -/* 0B550 8083D760 46140082 */ mul.s $f2, $f0, $f20 -/* 0B554 8083D764 8C4235E4 */ lw $v0, %lo(D_808535E4)($v0) -/* 0B558 8083D768 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 0B55C 8083D76C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0B560 8083D770 14410018 */ bne $v0, $at, .L8083D7D4 -/* 0B564 8083D774 46001406 */ mov.s $f16, $f2 -/* 0B568 8083D778 3C018085 */ lui $at, %hi(D_80855398) ## $at = 80850000 -/* 0B56C 8083D77C C42C5398 */ lwc1 $f12, %lo(D_80855398)($at) -/* 0B570 8083D780 C60006C4 */ lwc1 $f0, 0x06C4($s0) ## 000006C4 -/* 0B574 8083D784 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0B578 8083D788 4600603C */ c.lt.s $f12, $f0 -/* 0B57C 8083D78C 00000000 */ nop -/* 0B580 8083D790 45020004 */ bc1fl .L8083D7A4 -/* 0B584 8083D794 46006486 */ mov.s $f18, $f12 -/* 0B588 8083D798 10000002 */ beq $zero, $zero, .L8083D7A4 -/* 0B58C 8083D79C 46000486 */ mov.s $f18, $f0 -/* 0B590 8083D7A0 46006486 */ mov.s $f18, $f12 -.L8083D7A4: -/* 0B594 8083D7A4 8203014F */ lb $v1, 0x014F($s0) ## 0000014F -/* 0B598 8083D7A8 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -/* 0B59C 8083D7AC 14830003 */ bne $a0, $v1, .L8083D7BC -/* 0B5A0 8083D7B0 00000000 */ nop -/* 0B5A4 8083D7B4 10000015 */ beq $zero, $zero, .L8083D80C -/* 0B5A8 8083D7B8 46021400 */ add.s $f16, $f2, $f2 -.L8083D7BC: -/* 0B5AC 8083D7BC 14610013 */ bne $v1, $at, .L8083D80C -/* 0B5B0 8083D7C0 3C018085 */ lui $at, %hi(D_8085539C) ## $at = 80850000 -/* 0B5B4 8083D7C4 C426539C */ lwc1 $f6, %lo(D_8085539C)($at) -/* 0B5B8 8083D7C8 46061402 */ mul.s $f16, $f2, $f6 -/* 0B5BC 8083D7CC 1000000F */ beq $zero, $zero, .L8083D80C -/* 0B5C0 8083D7D0 00000000 */ nop -.L8083D7D4: -/* 0B5C4 8083D7D4 8203014F */ lb $v1, 0x014F($s0) ## 0000014F -/* 0B5C8 8083D7D8 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -/* 0B5CC 8083D7DC 3C018085 */ lui $at, %hi(D_808553A0) ## $at = 80850000 -/* 0B5D0 8083D7E0 10830003 */ beq $a0, $v1, .L8083D7F0 -/* 0B5D4 8083D7E4 C43253A0 */ lwc1 $f18, %lo(D_808553A0)($at) -/* 0B5D8 8083D7E8 10000008 */ beq $zero, $zero, .L8083D80C -/* 0B5DC 8083D7EC 46021400 */ add.s $f16, $f2, $f2 -.L8083D7F0: -/* 0B5E0 8083D7F0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0B5E4 8083D7F4 10410003 */ beq $v0, $at, .L8083D804 -/* 0B5E8 8083D7F8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0B5EC 8083D7FC 14610003 */ bne $v1, $at, .L8083D80C -/* 0B5F0 8083D800 00000000 */ nop -.L8083D804: -/* 0B5F4 8083D804 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0B5F8 8083D808 00000000 */ nop -.L8083D80C: -/* 0B5FC 8083D80C 1083001C */ beq $a0, $v1, .L8083D880 -/* 0B600 8083D810 C60006C4 */ lwc1 $f0, 0x06C4($s0) ## 000006C4 -/* 0B604 8083D814 46009201 */ sub.s $f8, $f18, $f0 -/* 0B608 8083D818 3C018085 */ lui $at, %hi(D_808553A4) ## $at = 80850000 -/* 0B60C 8083D81C C42A53A4 */ lwc1 $f10, %lo(D_808553A4)($at) -/* 0B610 8083D820 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0B614 8083D824 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 0B618 8083D828 460A4382 */ mul.s $f14, $f8, $f10 -/* 0B61C 8083D82C 4604703C */ c.lt.s $f14, $f4 -/* 0B620 8083D830 00000000 */ nop -/* 0B624 8083D834 45020005 */ bc1fl .L8083D84C -/* 0B628 8083D838 44811000 */ mtc1 $at, $f2 ## $f2 = 300.00 -/* 0B62C 8083D83C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 0B630 8083D840 1000000C */ beq $zero, $zero, .L8083D874 -/* 0B634 8083D844 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0B638 8083D848 44811000 */ mtc1 $at, $f2 ## $f2 = 0.00 -.L8083D84C: -/* 0B63C 8083D84C 00000000 */ nop -/* 0B640 8083D850 460E103C */ c.lt.s $f2, $f14 -/* 0B644 8083D854 00000000 */ nop -/* 0B648 8083D858 45020004 */ bc1fl .L8083D86C -/* 0B64C 8083D85C 46007306 */ mov.s $f12, $f14 -/* 0B650 8083D860 10000002 */ beq $zero, $zero, .L8083D86C -/* 0B654 8083D864 46001306 */ mov.s $f12, $f2 -/* 0B658 8083D868 46007306 */ mov.s $f12, $f14 -.L8083D86C: -/* 0B65C 8083D86C 46006386 */ mov.s $f14, $f12 -/* 0B660 8083D870 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L8083D874: -/* 0B664 8083D874 54610003 */ bnel $v1, $at, .L8083D884 -/* 0B668 8083D878 46107181 */ sub.s $f6, $f14, $f16 -/* 0B66C 8083D87C 460E7380 */ add.s $f14, $f14, $f14 -.L8083D880: -/* 0B670 8083D880 46107181 */ sub.s $f6, $f14, $f16 -.L8083D884: -/* 0B674 8083D884 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0B678 8083D888 3C018085 */ lui $at, %hi(D_808553A8) ## $at = 80850000 -/* 0B67C 8083D88C 46060200 */ add.s $f8, $f0, $f6 -/* 0B680 8083D890 E60806C4 */ swc1 $f8, 0x06C4($s0) ## 000006C4 -/* 0B684 8083D894 C60006C4 */ lwc1 $f0, 0x06C4($s0) ## 000006C4 -/* 0B688 8083D898 460A003C */ c.lt.s $f0, $f10 -/* 0B68C 8083D89C 00000000 */ nop -/* 0B690 8083D8A0 45020005 */ bc1fl .L8083D8B8 -/* 0B694 8083D8A4 4600903C */ c.lt.s $f18, $f0 -/* 0B698 8083D8A8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0B69C 8083D8AC 10000009 */ beq $zero, $zero, .L8083D8D4 -/* 0B6A0 8083D8B0 E60406C4 */ swc1 $f4, 0x06C4($s0) ## 000006C4 -/* 0B6A4 8083D8B4 4600903C */ c.lt.s $f18, $f0 -.L8083D8B8: -/* 0B6A8 8083D8B8 00000000 */ nop -/* 0B6AC 8083D8BC 45020004 */ bc1fl .L8083D8D0 -/* 0B6B0 8083D8C0 46000306 */ mov.s $f12, $f0 -/* 0B6B4 8083D8C4 10000002 */ beq $zero, $zero, .L8083D8D0 -/* 0B6B8 8083D8C8 46009306 */ mov.s $f12, $f18 -/* 0B6BC 8083D8CC 46000306 */ mov.s $f12, $f0 -.L8083D8D0: -/* 0B6C0 8083D8D0 E60C06C4 */ swc1 $f12, 0x06C4($s0) ## 000006C4 -.L8083D8D4: -/* 0B6C4 8083D8D4 C60606C4 */ lwc1 $f6, 0x06C4($s0) ## 000006C4 -/* 0B6C8 8083D8D8 C42853A8 */ lwc1 $f8, %lo(D_808553A8)($at) -/* 0B6CC 8083D8DC C604006C */ lwc1 $f4, 0x006C($s0) ## 0000006C -/* 0B6D0 8083D8E0 46083282 */ mul.s $f10, $f6, $f8 -/* 0B6D4 8083D8E4 460A2181 */ sub.s $f6, $f4, $f10 -/* 0B6D8 8083D8E8 10000005 */ beq $zero, $zero, .L8083D900 -/* 0B6DC 8083D8EC E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 0B6E0 8083D8F0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -.L8083D8F4: -/* 0B6E4 8083D8F4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0B6E8 8083D8F8 4481A000 */ mtc1 $at, $f20 ## $f20 = 20.00 -/* 0B6EC 8083D8FC E60806C4 */ swc1 $f8, 0x06C4($s0) ## 000006C4 -.L8083D900: -/* 0B6F0 8083D900 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -/* 0B6F4 8083D904 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0B6F8 8083D908 33190020 */ andi $t9, $t8, 0x0020 ## $t9 = 00000000 -/* 0B6FC 8083D90C 5320009E */ beql $t9, $zero, .L8083DB88 -/* 0B700 8083D910 8FBF002C */ lw $ra, 0x002C($sp) -/* 0B704 8083D914 C6040084 */ lwc1 $f4, 0x0084($s0) ## 00000084 -/* 0B708 8083D918 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 0B70C 8083D91C 00000000 */ nop -/* 0B710 8083D920 460A203C */ c.lt.s $f4, $f10 -/* 0B714 8083D924 00000000 */ nop -/* 0B718 8083D928 4502005E */ bc1fl .L8083DAA4 -/* 0B71C 8083D92C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0B720 8083D930 C606090C */ lwc1 $f6, 0x090C($s0) ## 0000090C -/* 0B724 8083D934 C6080A8C */ lwc1 $f8, 0x0A8C($s0) ## 00000A8C -/* 0B728 8083D938 C6040908 */ lwc1 $f4, 0x0908($s0) ## 00000908 -/* 0B72C 8083D93C C60A0A88 */ lwc1 $f10, 0x0A88($s0) ## 00000A88 -/* 0B730 8083D940 46083001 */ sub.s $f0, $f6, $f8 -/* 0B734 8083D944 C6080A90 */ lwc1 $f8, 0x0A90($s0) ## 00000A90 -/* 0B738 8083D948 C6060910 */ lwc1 $f6, 0x0910($s0) ## 00000910 -/* 0B73C 8083D94C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 0B740 8083D950 46000385 */ abs.s $f14, $f0 -/* 0B744 8083D954 460A2001 */ sub.s $f0, $f4, $f10 -/* 0B748 8083D958 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 -/* 0B74C 8083D95C 46000305 */ abs.s $f12, $f0 -/* 0B750 8083D960 46083001 */ sub.s $f0, $f6, $f8 -/* 0B754 8083D964 460E6100 */ add.s $f4, $f12, $f14 -/* 0B758 8083D968 46000005 */ abs.s $f0, $f0 -/* 0B75C 8083D96C 46040400 */ add.s $f16, $f0, $f4 -/* 0B760 8083D970 4610903C */ c.lt.s $f18, $f16 -/* 0B764 8083D974 00000000 */ nop -/* 0B768 8083D978 45020003 */ bc1fl .L8083D988 -/* 0B76C 8083D97C C60A0854 */ lwc1 $f10, 0x0854($s0) ## 00000854 -/* 0B770 8083D980 46009406 */ mov.s $f16, $f18 -/* 0B774 8083D984 C60A0854 */ lwc1 $f10, 0x0854($s0) ## 00000854 -.L8083D988: -/* 0B778 8083D988 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 0B77C 8083D98C 44814000 */ mtc1 $at, $f8 ## $f8 = 15.00 -/* 0B780 8083D990 46105180 */ add.s $f6, $f10, $f16 -/* 0B784 8083D994 E6060854 */ swc1 $f6, 0x0854($s0) ## 00000854 -/* 0B788 8083D998 C6040854 */ lwc1 $f4, 0x0854($s0) ## 00000854 -/* 0B78C 8083D99C 4604403C */ c.lt.s $f8, $f4 -/* 0B790 8083D9A0 00000000 */ nop -/* 0B794 8083D9A4 4502003F */ bc1fl .L8083DAA4 -/* 0B798 8083D9A8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0B79C 8083D9AC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0B7A0 8083D9B0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0B7A4 8083D9B4 E60A0854 */ swc1 $f10, 0x0854($s0) ## 00000854 -/* 0B7A8 8083D9B8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0B7AC 8083D9BC 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 0B7B0 8083D9C0 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 0B7B4 8083D9C4 46060202 */ mul.s $f8, $f0, $f6 -/* 0B7B8 8083D9C8 46044280 */ add.s $f10, $f8, $f4 -/* 0B7BC 8083D9CC E7AA005C */ swc1 $f10, 0x005C($sp) -/* 0B7C0 8083D9D0 C6080084 */ lwc1 $f8, 0x0084($s0) ## 00000084 -/* 0B7C4 8083D9D4 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 0B7C8 8083D9D8 46083100 */ add.s $f4, $f6, $f8 -/* 0B7CC 8083D9DC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0B7D0 8083D9E0 E7A40060 */ swc1 $f4, 0x0060($sp) -/* 0B7D4 8083D9E4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0B7D8 8083D9E8 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 0B7DC 8083D9EC C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 0B7E0 8083D9F0 AFA00010 */ sw $zero, 0x0010($sp) -/* 0B7E4 8083D9F4 460A0182 */ mul.s $f6, $f0, $f10 -/* 0B7E8 8083D9F8 8FA40068 */ lw $a0, 0x0068($sp) -/* 0B7EC 8083D9FC 27A5005C */ addiu $a1, $sp, 0x005C ## $a1 = FFFFFFF4 -/* 0B7F0 8083DA00 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 0B7F4 8083DA04 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 0B7F8 8083DA08 46083100 */ add.s $f4, $f6, $f8 -/* 0B7FC 8083DA0C 0C00A511 */ jal func_80029444 -/* 0B800 8083DA10 E7A40064 */ swc1 $f4, 0x0064($sp) -/* 0B804 8083DA14 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 0B808 8083DA18 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 0B80C 8083DA1C C6060838 */ lwc1 $f6, 0x0838($s0) ## 00000838 -/* 0B810 8083DA20 4606503C */ c.lt.s $f10, $f6 -/* 0B814 8083DA24 00000000 */ nop -/* 0B818 8083DA28 4502001E */ bc1fl .L8083DAA4 -/* 0B81C 8083DA2C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0B820 8083DA30 0C20CCAE */ jal func_808332B8 -/* 0B824 8083DA34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0B828 8083DA38 5440001A */ bnel $v0, $zero, .L8083DAA4 -/* 0B82C 8083DA3C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0B830 8083DA40 C6020084 */ lwc1 $f2, 0x0084($s0) ## 00000084 -/* 0B834 8083DA44 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 0B838 8083DA48 C60A090C */ lwc1 $f10, 0x090C($s0) ## 0000090C -/* 0B83C 8083DA4C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0B840 8083DA50 46024100 */ add.s $f4, $f8, $f2 -/* 0B844 8083DA54 460A203C */ c.lt.s $f4, $f10 -/* 0B848 8083DA58 00000000 */ nop -/* 0B84C 8083DA5C 45020011 */ bc1fl .L8083DAA4 -/* 0B850 8083DA60 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0B854 8083DA64 C6000838 */ lwc1 $f0, 0x0838($s0) ## 00000838 -/* 0B858 8083DA68 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 0B85C 8083DA6C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0B860 8083DA70 46000005 */ abs.s $f0, $f0 -/* 0B864 8083DA74 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 0B868 8083DA78 46060202 */ mul.s $f8, $f0, $f6 -/* 0B86C 8083DA7C 4406A000 */ mfc1 $a2, $f20 -/* 0B870 8083DA80 8FA40068 */ lw $a0, 0x0068($sp) -/* 0B874 8083DA84 46041282 */ mul.s $f10, $f2, $f4 -/* 0B878 8083DA88 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0B87C 8083DA8C 460A4180 */ add.s $f6, $f8, $f10 -/* 0B880 8083DA90 4600310D */ trunc.w.s $f4, $f6 -/* 0B884 8083DA94 44072000 */ mfc1 $a3, $f4 -/* 0B888 8083DA98 0C20F3EA */ jal func_8083CFA8 -/* 0B88C 8083DA9C 00000000 */ nop -/* 0B890 8083DAA0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -.L8083DAA4: -/* 0B894 8083DAA4 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 0B898 8083DAA8 C60A0084 */ lwc1 $f10, 0x0084($s0) ## 00000084 -/* 0B89C 8083DAAC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 0B8A0 8083DAB0 460A403C */ c.lt.s $f8, $f10 -/* 0B8A4 8083DAB4 00000000 */ nop -/* 0B8A8 8083DAB8 45020033 */ bc1fl .L8083DB88 -/* 0B8AC 8083DABC 8FBF002C */ lw $ra, 0x002C($sp) -/* 0B8B0 8083DAC0 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 -/* 0B8B4 8083DAC4 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 -/* 0B8B8 8083DAC8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 0B8BC 8083DACC 4600303C */ c.lt.s $f6, $f0 -/* 0B8C0 8083DAD0 00000000 */ nop -/* 0B8C4 8083DAD4 45010006 */ bc1t .L8083DAF0 -/* 0B8C8 8083DAD8 00000000 */ nop -/* 0B8CC 8083DADC 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -/* 0B8D0 8083DAE0 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 0B8D4 8083DAE4 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 0B8D8 8083DAE8 5140000D */ beql $t2, $zero, .L8083DB20 -/* 0B8DC 8083DAEC 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 -.L8083DAF0: -/* 0B8E0 8083DAF0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0B8E4 8083DAF4 AFA30048 */ sw $v1, 0x0048($sp) -/* 0B8E8 8083DAF8 3C018085 */ lui $at, %hi(D_808553AC) ## $at = 80850000 -/* 0B8EC 8083DAFC C42453AC */ lwc1 $f4, %lo(D_808553AC)($at) -/* 0B8F0 8083DB00 8FA30048 */ lw $v1, 0x0048($sp) -/* 0B8F4 8083DB04 4604003C */ c.lt.s $f0, $f4 -/* 0B8F8 8083DB08 00000000 */ nop -/* 0B8FC 8083DB0C 45000009 */ bc1f .L8083DB34 -/* 0B900 8083DB10 00000000 */ nop -/* 0B904 8083DB14 10000007 */ beq $zero, $zero, .L8083DB34 -/* 0B908 8083DB18 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 0B90C 8083DB1C 44814000 */ mtc1 $at, $f8 ## $f8 = -0.00 -.L8083DB20: -/* 0B910 8083DB20 00000000 */ nop -/* 0B914 8083DB24 46080282 */ mul.s $f10, $f0, $f8 -/* 0B918 8083DB28 4600518D */ trunc.w.s $f6, $f10 -/* 0B91C 8083DB2C 44033000 */ mfc1 $v1, $f6 -/* 0B920 8083DB30 00000000 */ nop -.L8083DB34: -/* 0B924 8083DB34 18600013 */ blez $v1, .L8083DB84 -/* 0B928 8083DB38 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0B92C 8083DB3C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 0B930 8083DB40 AFA50038 */ sw $a1, 0x0038($sp) -.L8083DB44: -/* 0B934 8083DB44 3C018085 */ lui $at, %hi(D_808553B0) ## $at = 80850000 -/* 0B938 8083DB48 C42453B0 */ lwc1 $f4, %lo(D_808553B0)($at) -/* 0B93C 8083DB4C 4406A000 */ mfc1 $a2, $f20 -/* 0B940 8083DB50 8FA50038 */ lw $a1, 0x0038($sp) -/* 0B944 8083DB54 8FA40068 */ lw $a0, 0x0068($sp) -/* 0B948 8083DB58 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 0B94C 8083DB5C E7B40010 */ swc1 $f20, 0x0010($sp) -/* 0B950 8083DB60 AFA20044 */ sw $v0, 0x0044($sp) -/* 0B954 8083DB64 AFA30048 */ sw $v1, 0x0048($sp) -/* 0B958 8083DB68 0C00A4F9 */ jal func_800293E4 -/* 0B95C 8083DB6C E7A40014 */ swc1 $f4, 0x0014($sp) -/* 0B960 8083DB70 8FA20044 */ lw $v0, 0x0044($sp) -/* 0B964 8083DB74 8FA30048 */ lw $v1, 0x0048($sp) -/* 0B968 8083DB78 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 0B96C 8083DB7C 1443FFF1 */ bne $v0, $v1, .L8083DB44 -/* 0B970 8083DB80 00000000 */ nop -.L8083DB84: -/* 0B974 8083DB84 8FBF002C */ lw $ra, 0x002C($sp) -.L8083DB88: -/* 0B978 8083DB88 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 0B97C 8083DB8C 8FB00028 */ lw $s0, 0x0028($sp) -/* 0B980 8083DB90 03E00008 */ jr $ra -/* 0B984 8083DB94 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DB98.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DB98.s deleted file mode 100644 index 7010a60813..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DB98.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_8083DB98 -/* 0B988 8083DB98 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0B98C 8083DB9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 0B990 8083DBA0 AFB00020 */ sw $s0, 0x0020($sp) -/* 0B994 8083DBA4 AFA50044 */ sw $a1, 0x0044($sp) -/* 0B998 8083DBA8 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 0B99C 8083DBAC 8C820664 */ lw $v0, 0x0664($a0) ## 00000664 -/* 0B9A0 8083DBB0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 0B9A4 8083DBB4 E7A40030 */ swc1 $f4, 0x0030($sp) -/* 0B9A8 8083DBB8 C4860960 */ lwc1 $f6, 0x0960($a0) ## 00000960 -/* 0B9AC 8083DBBC 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 0B9B0 8083DBC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0B9B4 8083DBC4 24450038 */ addiu $a1, $v0, 0x0038 ## $a1 = 00000038 -/* 0B9B8 8083DBC8 46083280 */ add.s $f10, $f6, $f8 -/* 0B9BC 8083DBCC E7AA0034 */ swc1 $f10, 0x0034($sp) -/* 0B9C0 8083DBD0 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 0B9C4 8083DBD4 AFA50028 */ sw $a1, 0x0028($sp) -/* 0B9C8 8083DBD8 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFF0 -/* 0B9CC 8083DBDC 0C01E027 */ jal Math_Vec3f_Pitch - -/* 0B9D0 8083DBE0 E7B00038 */ swc1 $f16, 0x0038($sp) -/* 0B9D4 8083DBE4 8FA50028 */ lw $a1, 0x0028($sp) -/* 0B9D8 8083DBE8 A7A2002E */ sh $v0, 0x002E($sp) -/* 0B9DC 8083DBEC 0C01E01A */ jal Math_Vec3f_Yaw - -/* 0B9E0 8083DBF0 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFF0 -/* 0B9E4 8083DBF4 00022C00 */ sll $a1, $v0, 16 -/* 0B9E8 8083DBF8 00052C03 */ sra $a1, $a1, 16 -/* 0B9EC 8083DBFC 26040046 */ addiu $a0, $s0, 0x0046 ## $a0 = 00000046 -/* 0B9F0 8083DC00 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0B9F4 8083DC04 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 -/* 0B9F8 8083DC08 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0B9FC 8083DC0C AFA00010 */ sw $zero, 0x0010($sp) -/* 0BA00 8083DC10 26040044 */ addiu $a0, $s0, 0x0044 ## $a0 = 00000044 -/* 0BA04 8083DC14 87A5002E */ lh $a1, 0x002E($sp) -/* 0BA08 8083DC18 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0BA0C 8083DC1C 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 -/* 0BA10 8083DC20 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0BA14 8083DC24 AFA00010 */ sw $zero, 0x0010($sp) -/* 0BA18 8083DC28 960E06AE */ lhu $t6, 0x06AE($s0) ## 000006AE -/* 0BA1C 8083DC2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BA20 8083DC30 35CF0002 */ ori $t7, $t6, 0x0002 ## $t7 = 00000002 -/* 0BA24 8083DC34 A60F06AE */ sh $t7, 0x06AE($s0) ## 000006AE -/* 0BA28 8083DC38 0C20DAAE */ jal func_80836AB8 -/* 0BA2C 8083DC3C 8FA50044 */ lw $a1, 0x0044($sp) -/* 0BA30 8083DC40 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0BA34 8083DC44 8FB00020 */ lw $s0, 0x0020($sp) -/* 0BA38 8083DC48 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0BA3C 8083DC4C 03E00008 */ jr $ra -/* 0BA40 8083DC50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DC54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DC54.s deleted file mode 100644 index ed6ebb88d4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DC54.s +++ /dev/null @@ -1,108 +0,0 @@ -glabel func_8083DC54 -/* 0BA44 8083DC54 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0BA48 8083DC58 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0BA4C 8083DC5C AFB00020 */ sw $s0, 0x0020($sp) -/* 0BA50 8083DC60 AFA5004C */ sw $a1, 0x004C($sp) -/* 0BA54 8083DC64 8C8E0664 */ lw $t6, 0x0664($a0) ## 00000664 -/* 0BA58 8083DC68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0BA5C 8083DC6C 3C0F8085 */ lui $t7, %hi(D_808535E4) ## $t7 = 80850000 -/* 0BA60 8083DC70 11C00012 */ beq $t6, $zero, .L8083DCBC -/* 0BA64 8083DC74 00000000 */ nop -/* 0BA68 8083DC78 0C00B75E */ jal func_8002DD78 -/* 0BA6C 8083DC7C 00000000 */ nop -/* 0BA70 8083DC80 54400006 */ bnel $v0, $zero, .L8083DC9C -/* 0BA74 8083DC84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BA78 8083DC88 0C20CD2D */ jal func_808334B4 -/* 0BA7C 8083DC8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BA80 8083DC90 10400006 */ beq $v0, $zero, .L8083DCAC -/* 0BA84 8083DC94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BA88 8083DC98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8083DC9C: -/* 0BA8C 8083DC9C 0C20F6E6 */ jal func_8083DB98 -/* 0BA90 8083DCA0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0BA94 8083DCA4 10000044 */ beq $zero, $zero, .L8083DDB8 -/* 0BA98 8083DCA8 8FBF0024 */ lw $ra, 0x0024($sp) -.L8083DCAC: -/* 0BA9C 8083DCAC 0C20F6E6 */ jal func_8083DB98 -/* 0BAA0 8083DCB0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0BAA4 8083DCB4 10000040 */ beq $zero, $zero, .L8083DDB8 -/* 0BAA8 8083DCB8 8FBF0024 */ lw $ra, 0x0024($sp) -.L8083DCBC: -/* 0BAAC 8083DCBC 8DEF35E4 */ lw $t7, %lo(D_808535E4)($t7) -/* 0BAB0 8083DCC0 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 0BAB4 8083DCC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0BAB8 8083DCC8 15E1000A */ bne $t7, $at, .L8083DCF4 -/* 0BABC 8083DCCC 3C068085 */ lui $a2, %hi(D_8085456C) ## $a2 = 80850000 -/* 0BAC0 8083DCD0 24180320 */ addiu $t8, $zero, 0x0320 ## $t8 = 00000320 -/* 0BAC4 8083DCD4 AFB80010 */ sw $t8, 0x0010($sp) -/* 0BAC8 8083DCD8 26040044 */ addiu $a0, $s0, 0x0044 ## $a0 = 00000044 -/* 0BACC 8083DCDC 2405B1E0 */ addiu $a1, $zero, 0xB1E0 ## $a1 = FFFFB1E0 -/* 0BAD0 8083DCE0 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0BAD4 8083DCE4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0BAD8 8083DCE8 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 0BADC 8083DCEC 10000027 */ beq $zero, $zero, .L8083DD8C -/* 0BAE0 8083DCF0 00000000 */ nop -.L8083DCF4: -/* 0BAE4 8083DCF4 A7A00046 */ sh $zero, 0x0046($sp) -/* 0BAE8 8083DCF8 8FA4004C */ lw $a0, 0x004C($sp) -/* 0BAEC 8083DCFC 24C6456C */ addiu $a2, $a2, %lo(D_8085456C) ## $a2 = 0000456C -/* 0BAF0 8083DD00 0C20E5CF */ jal func_8083973C -/* 0BAF4 8083DD04 27A70034 */ addiu $a3, $sp, 0x0034 ## $a3 = FFFFFFEC -/* 0BAF8 8083DD08 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 -/* 0BAFC 8083DD0C 44812000 */ mtc1 $at, $f4 ## $f4 = -32000.00 -/* 0BB00 8083DD10 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0BB04 8083DD14 4600203C */ c.lt.s $f4, $f0 -/* 0BB08 8083DD18 00000000 */ nop -/* 0BB0C 8083DD1C 45020013 */ bc1fl .L8083DD6C -/* 0BB10 8083DD20 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 0BB14 8083DD24 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 0BB18 8083DD28 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 0BB1C 8083DD2C 0C034199 */ jal atan2s - -/* 0BB20 8083DD30 46003381 */ sub.s $f14, $f6, $f0 -/* 0BB24 8083DD34 2841F060 */ slti $at, $v0, 0xF060 -/* 0BB28 8083DD38 10200004 */ beq $at, $zero, .L8083DD4C -/* 0BB2C 8083DD3C 00021C00 */ sll $v1, $v0, 16 -/* 0BB30 8083DD40 2419F060 */ addiu $t9, $zero, 0xF060 ## $t9 = FFFFF060 -/* 0BB34 8083DD44 10000008 */ beq $zero, $zero, .L8083DD68 -/* 0BB38 8083DD48 A7B90046 */ sh $t9, 0x0046($sp) -.L8083DD4C: -/* 0BB3C 8083DD4C 00031C03 */ sra $v1, $v1, 16 -/* 0BB40 8083DD50 28610FA1 */ slti $at, $v1, 0x0FA1 -/* 0BB44 8083DD54 14200003 */ bne $at, $zero, .L8083DD64 -/* 0BB48 8083DD58 00602825 */ or $a1, $v1, $zero ## $a1 = 00000000 -/* 0BB4C 8083DD5C 10000001 */ beq $zero, $zero, .L8083DD64 -/* 0BB50 8083DD60 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 -.L8083DD64: -/* 0BB54 8083DD64 A7A50046 */ sh $a1, 0x0046($sp) -.L8083DD68: -/* 0BB58 8083DD68 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -.L8083DD6C: -/* 0BB5C 8083DD6C 2409001E */ addiu $t1, $zero, 0x001E ## $t1 = 0000001E -/* 0BB60 8083DD70 26040044 */ addiu $a0, $s0, 0x0044 ## $a0 = 00000044 -/* 0BB64 8083DD74 A6080046 */ sh $t0, 0x0046($s0) ## 00000046 -/* 0BB68 8083DD78 AFA90010 */ sw $t1, 0x0010($sp) -/* 0BB6C 8083DD7C 87A50046 */ lh $a1, 0x0046($sp) -/* 0BB70 8083DD80 2406000E */ addiu $a2, $zero, 0x000E ## $a2 = 0000000E -/* 0BB74 8083DD84 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0BB78 8083DD88 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -.L8083DD8C: -/* 0BB7C 8083DD8C 0C00B75E */ jal func_8002DD78 -/* 0BB80 8083DD90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BB84 8083DD94 0002282B */ sltu $a1, $zero, $v0 -/* 0BB88 8083DD98 14A00004 */ bne $a1, $zero, .L8083DDAC -/* 0BB8C 8083DD9C 00000000 */ nop -/* 0BB90 8083DDA0 0C20CD2D */ jal func_808334B4 -/* 0BB94 8083DDA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BB98 8083DDA8 0002282B */ sltu $a1, $zero, $v0 -.L8083DDAC: -/* 0BB9C 8083DDAC 0C20DAAE */ jal func_80836AB8 -/* 0BBA0 8083DDB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BBA4 8083DDB4 8FBF0024 */ lw $ra, 0x0024($sp) -.L8083DDB8: -/* 0BBA8 8083DDB8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0BBAC 8083DDBC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 0BBB0 8083DDC0 03E00008 */ jr $ra -/* 0BBB4 8083DDC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DDC8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DDC8.s deleted file mode 100644 index 822c707c8a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DDC8.s +++ /dev/null @@ -1,122 +0,0 @@ -.late_rodata -glabel D_808553B4 - .float 0.1 - -.text -glabel func_8083DDC8 -/* 0BBB8 8083DDC8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0BBBC 8083DDCC AFBF001C */ sw $ra, 0x001C($sp) -/* 0BBC0 8083DDD0 AFB00018 */ sw $s0, 0x0018($sp) -/* 0BBC4 8083DDD4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0BBC8 8083DDD8 0C00B75E */ jal func_8002DD78 -/* 0BBCC 8083DDDC AFA5002C */ sw $a1, 0x002C($sp) -/* 0BBD0 8083DDE0 5440005A */ bnel $v0, $zero, .L8083DF4C -/* 0BBD4 8083DDE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BBD8 8083DDE8 0C20CD2D */ jal func_808334B4 -/* 0BBDC 8083DDEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BBE0 8083DDF0 14400055 */ bne $v0, $zero, .L8083DF48 -/* 0BBE4 8083DDF4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0BBE8 8083DDF8 C6000838 */ lwc1 $f0, 0x0838($s0) ## 00000838 -/* 0BBEC 8083DDFC 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 0BBF0 8083DE00 260406BC */ addiu $a0, $s0, 0x06BC ## $a0 = 000006BC -/* 0BBF4 8083DE04 24060384 */ addiu $a2, $zero, 0x0384 ## $a2 = 00000384 -/* 0BBF8 8083DE08 4600203C */ c.lt.s $f4, $f0 -/* 0BBFC 8083DE0C 00000000 */ nop -/* 0BC00 8083DE10 4502004E */ bc1fl .L8083DF4C -/* 0BC04 8083DE14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BC08 8083DE18 860F083C */ lh $t7, 0x083C($s0) ## 0000083C -/* 0BC0C 8083DE1C 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 0BC10 8083DE20 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 0BC14 8083DE24 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 0BC18 8083DE28 01F8C823 */ subu $t9, $t7, $t8 -/* 0BC1C 8083DE2C 00194400 */ sll $t0, $t9, 16 -/* 0BC20 8083DE30 00084C03 */ sra $t1, $t0, 16 -/* 0BC24 8083DE34 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 -/* 0BC28 8083DE38 46060202 */ mul.s $f8, $f0, $f6 -/* 0BC2C 8083DE3C 3C018085 */ lui $at, %hi(D_808553B4) ## $at = 80850000 -/* 0BC30 8083DE40 C42653B4 */ lwc1 $f6, %lo(D_808553B4)($at) -/* 0BC34 8083DE44 468084A0 */ cvt.s.w $f18, $f16 -/* 0BC38 8083DE48 4600428D */ trunc.w.s $f10, $f8 -/* 0BC3C 8083DE4C 46009102 */ mul.s $f4, $f18, $f0 -/* 0BC40 8083DE50 44055000 */ mfc1 $a1, $f10 -/* 0BC44 8083DE54 00000000 */ nop -/* 0BC48 8083DE58 00052C00 */ sll $a1, $a1, 16 -/* 0BC4C 8083DE5C 46062202 */ mul.s $f8, $f4, $f6 -/* 0BC50 8083DE60 00052C03 */ sra $a1, $a1, 16 -/* 0BC54 8083DE64 28A1F060 */ slti $at, $a1, 0xF060 -/* 0BC58 8083DE68 4600428D */ trunc.w.s $f10, $f8 -/* 0BC5C 8083DE6C 44075000 */ mfc1 $a3, $f10 -/* 0BC60 8083DE70 00000000 */ nop -/* 0BC64 8083DE74 00073C00 */ sll $a3, $a3, 16 -/* 0BC68 8083DE78 10200003 */ beq $at, $zero, .L8083DE88 -/* 0BC6C 8083DE7C 00073C03 */ sra $a3, $a3, 16 -/* 0BC70 8083DE80 10000008 */ beq $zero, $zero, .L8083DEA4 -/* 0BC74 8083DE84 2405F060 */ addiu $a1, $zero, 0xF060 ## $a1 = FFFFF060 -.L8083DE88: -/* 0BC78 8083DE88 28A10FA1 */ slti $at, $a1, 0x0FA1 -/* 0BC7C 8083DE8C 14200003 */ bne $at, $zero, .L8083DE9C -/* 0BC80 8083DE90 00A01025 */ or $v0, $a1, $zero ## $v0 = FFFFF060 -/* 0BC84 8083DE94 10000001 */ beq $zero, $zero, .L8083DE9C -/* 0BC88 8083DE98 24020FA0 */ addiu $v0, $zero, 0x0FA0 ## $v0 = 00000FA0 -.L8083DE9C: -/* 0BC8C 8083DE9C 00022C00 */ sll $a1, $v0, 16 -/* 0BC90 8083DEA0 00052C03 */ sra $a1, $a1, 16 -.L8083DEA4: -/* 0BC94 8083DEA4 00071823 */ subu $v1, $zero, $a3 -/* 0BC98 8083DEA8 2861F060 */ slti $at, $v1, 0xF060 -/* 0BC9C 8083DEAC 50200004 */ beql $at, $zero, .L8083DEC0 -/* 0BCA0 8083DEB0 28610FA1 */ slti $at, $v1, 0x0FA1 -/* 0BCA4 8083DEB4 10000008 */ beq $zero, $zero, .L8083DED8 -/* 0BCA8 8083DEB8 2407F060 */ addiu $a3, $zero, 0xF060 ## $a3 = FFFFF060 -/* 0BCAC 8083DEBC 28610FA1 */ slti $at, $v1, 0x0FA1 -.L8083DEC0: -/* 0BCB0 8083DEC0 14200003 */ bne $at, $zero, .L8083DED0 -/* 0BCB4 8083DEC4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 0BCB8 8083DEC8 10000001 */ beq $zero, $zero, .L8083DED0 -/* 0BCBC 8083DECC 24020FA0 */ addiu $v0, $zero, 0x0FA0 ## $v0 = 00000FA0 -.L8083DED0: -/* 0BCC0 8083DED0 00023C00 */ sll $a3, $v0, 16 -/* 0BCC4 8083DED4 00073C03 */ sra $a3, $a3, 16 -.L8083DED8: -/* 0BCC8 8083DED8 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 0BCCC 8083DEDC A7A70024 */ sh $a3, 0x0024($sp) -/* 0BCD0 8083DEE0 860B06BC */ lh $t3, 0x06BC($s0) ## 000006BC -/* 0BCD4 8083DEE4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0BCD8 8083DEE8 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 0BCDC 8083DEEC 448B8000 */ mtc1 $t3, $f16 ## $f16 = 0.00 -/* 0BCE0 8083DEF0 87A70024 */ lh $a3, 0x0024($sp) -/* 0BCE4 8083DEF4 260406BA */ addiu $a0, $s0, 0x06BA ## $a0 = 000006BA -/* 0BCE8 8083DEF8 468084A0 */ cvt.s.w $f18, $f16 -/* 0BCEC 8083DEFC 00072C00 */ sll $a1, $a3, 16 -/* 0BCF0 8083DF00 00052C03 */ sra $a1, $a1, 16 -/* 0BCF4 8083DF04 2406012C */ addiu $a2, $zero, 0x012C ## $a2 = 0000012C -/* 0BCF8 8083DF08 46009107 */ neg.s $f4, $f18 -/* 0BCFC 8083DF0C 46062202 */ mul.s $f8, $f4, $f6 -/* 0BD00 8083DF10 4600428D */ trunc.w.s $f10, $f8 -/* 0BD04 8083DF14 440D5000 */ mfc1 $t5, $f10 -/* 0BD08 8083DF18 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 0BD0C 8083DF1C A60D06B6 */ sh $t5, 0x06B6($s0) ## 000006B6 -/* 0BD10 8083DF20 87A70024 */ lh $a3, 0x0024($sp) -/* 0BD14 8083DF24 260406C0 */ addiu $a0, $s0, 0x06C0 ## $a0 = 000006C0 -/* 0BD18 8083DF28 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 0BD1C 8083DF2C 00072C00 */ sll $a1, $a3, 16 -/* 0BD20 8083DF30 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 0BD24 8083DF34 00052C03 */ sra $a1, $a1, 16 -/* 0BD28 8083DF38 960E06AE */ lhu $t6, 0x06AE($s0) ## 000006AE -/* 0BD2C 8083DF3C 35CF0168 */ ori $t7, $t6, 0x0168 ## $t7 = 00000168 -/* 0BD30 8083DF40 10000004 */ beq $zero, $zero, .L8083DF54 -/* 0BD34 8083DF44 A60F06AE */ sh $t7, 0x06AE($s0) ## 000006AE -.L8083DF48: -/* 0BD38 8083DF48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8083DF4C: -/* 0BD3C 8083DF4C 0C20F715 */ jal func_8083DC54 -/* 0BD40 8083DF50 8FA5002C */ lw $a1, 0x002C($sp) -.L8083DF54: -/* 0BD44 8083DF54 8FBF001C */ lw $ra, 0x001C($sp) -/* 0BD48 8083DF58 8FB00018 */ lw $s0, 0x0018($sp) -/* 0BD4C 8083DF5C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0BD50 8083DF60 03E00008 */ jr $ra -/* 0BD54 8083DF64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DF68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DF68.s deleted file mode 100644 index 2e19a9eb26..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DF68.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_8083DF68 -/* 0BD58 8083DF68 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0BD5C 8083DF6C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 0BD60 8083DF70 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 0BD64 8083DF74 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0BD68 8083DF78 AFA40018 */ sw $a0, 0x0018($sp) -/* 0BD6C 8083DF7C AFA60020 */ sw $a2, 0x0020($sp) -/* 0BD70 8083DF80 85CF003A */ lh $t7, 0x003A($t6) ## 8016003A -/* 0BD74 8083DF84 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0BD78 8083DF88 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 0BD7C 8083DF8C 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 0BD80 8083DF90 44856000 */ mtc1 $a1, $f12 ## $f12 = 0.00 -/* 0BD84 8083DF94 24840838 */ addiu $a0, $a0, 0x0838 ## $a0 = 00000838 -/* 0BD88 8083DF98 468021A0 */ cvt.s.w $f6, $f4 -/* 0BD8C 8083DF9C 44056000 */ mfc1 $a1, $f12 -/* 0BD90 8083DFA0 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 0BD94 8083DFA4 46083283 */ div.s $f10, $f6, $f8 -/* 0BD98 8083DFA8 44065000 */ mfc1 $a2, $f10 -/* 0BD9C 8083DFAC 0C01DF1B */ jal func_80077C6C -/* 0BDA0 8083DFB0 00000000 */ nop -/* 0BDA4 8083DFB4 3C188016 */ lui $t8, %hi(gGameInfo) -/* 0BDA8 8083DFB8 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* 0BDAC 8083DFBC 8FA40018 */ lw $a0, 0x0018($sp) -/* 0BDB0 8083DFC0 87A50022 */ lh $a1, 0x0022($sp) -/* 0BDB4 8083DFC4 8706004A */ lh $a2, 0x004A($t8) ## 8016004A -/* 0BDB8 8083DFC8 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 0BDBC 8083DFCC 2484083C */ addiu $a0, $a0, 0x083C ## $a0 = 0000083C -/* 0BDC0 8083DFD0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0BDC4 8083DFD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0BDC8 8083DFD8 03E00008 */ jr $ra -/* 0BDCC 8083DFDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DFE0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DFE0.s deleted file mode 100644 index 6fd9557e9f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DFE0.s +++ /dev/null @@ -1,80 +0,0 @@ -glabel func_8083DFE0 -/* 0BDD0 8083DFE0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0BDD4 8083DFE4 AFBF001C */ sw $ra, 0x001C($sp) -/* 0BDD8 8083DFE8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0BDDC 8083DFEC AFA50024 */ sw $a1, 0x0024($sp) -/* 0BDE0 8083DFF0 AFA60028 */ sw $a2, 0x0028($sp) -/* 0BDE4 8083DFF4 84D80000 */ lh $t8, 0x0000($a2) ## 00000000 -/* 0BDE8 8083DFF8 848E083C */ lh $t6, 0x083C($a0) ## 0000083C -/* 0BDEC 8083DFFC 80990843 */ lb $t9, 0x0843($a0) ## 00000843 -/* 0BDF0 8083E000 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0BDF4 8083E004 01D81823 */ subu $v1, $t6, $t8 -/* 0BDF8 8083E008 00031C00 */ sll $v1, $v1, 16 -/* 0BDFC 8083E00C 1720001A */ bne $t9, $zero, .L8083E078 -/* 0BE00 8083E010 00031C03 */ sra $v1, $v1, 16 -/* 0BE04 8083E014 3C088016 */ lui $t0, %hi(gGameInfo) -/* 0BE08 8083E018 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) -/* 0BE0C 8083E01C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0BE10 8083E020 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 0BE14 8083E024 8509006E */ lh $t1, 0x006E($t0) ## 8016006E -/* 0BE18 8083E028 C4800838 */ lwc1 $f0, 0x0838($a0) ## 00000838 -/* 0BE1C 8083E02C 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 0BE20 8083E030 00000000 */ nop -/* 0BE24 8083E034 468021A0 */ cvt.s.w $f6, $f4 -/* 0BE28 8083E038 46083083 */ div.s $f2, $f6, $f8 -/* 0BE2C 8083E03C 46001307 */ neg.s $f12, $f2 -/* 0BE30 8083E040 460C003C */ c.lt.s $f0, $f12 -/* 0BE34 8083E044 00000000 */ nop -/* 0BE38 8083E048 45020004 */ bc1fl .L8083E05C -/* 0BE3C 8083E04C 4600103C */ c.lt.s $f2, $f0 -/* 0BE40 8083E050 10000009 */ beq $zero, $zero, .L8083E078 -/* 0BE44 8083E054 E48C0838 */ swc1 $f12, 0x0838($a0) ## 00000838 -/* 0BE48 8083E058 4600103C */ c.lt.s $f2, $f0 -.L8083E05C: -/* 0BE4C 8083E05C 00000000 */ nop -/* 0BE50 8083E060 45020004 */ bc1fl .L8083E074 -/* 0BE54 8083E064 46000306 */ mov.s $f12, $f0 -/* 0BE58 8083E068 10000002 */ beq $zero, $zero, .L8083E074 -/* 0BE5C 8083E06C 46001306 */ mov.s $f12, $f2 -/* 0BE60 8083E070 46000306 */ mov.s $f12, $f0 -.L8083E074: -/* 0BE64 8083E074 E60C0838 */ swc1 $f12, 0x0838($s0) ## 00000838 -.L8083E078: -/* 0BE68 8083E078 04600003 */ bltz $v1, .L8083E088 -/* 0BE6C 8083E07C 00031023 */ subu $v0, $zero, $v1 -/* 0BE70 8083E080 10000001 */ beq $zero, $zero, .L8083E088 -/* 0BE74 8083E084 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L8083E088: -/* 0BE78 8083E088 28416001 */ slti $at, $v0, 0x6001 -/* 0BE7C 8083E08C 1420000A */ bne $at, $zero, .L8083E0B8 -/* 0BE80 8083E090 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 0BE84 8083E094 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 0BE88 8083E098 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0BE8C 8083E09C 0C01DE80 */ jal Math_ApproxF - -/* 0BE90 8083E0A0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0BE94 8083E0A4 10400010 */ beq $v0, $zero, .L8083E0E8 -/* 0BE98 8083E0A8 8FAA0028 */ lw $t2, 0x0028($sp) -/* 0BE9C 8083E0AC 854B0000 */ lh $t3, 0x0000($t2) ## 00000000 -/* 0BEA0 8083E0B0 1000000D */ beq $zero, $zero, .L8083E0E8 -/* 0BEA4 8083E0B4 A60B083C */ sh $t3, 0x083C($s0) ## 0000083C -.L8083E0B8: -/* 0BEA8 8083E0B8 8FAC0024 */ lw $t4, 0x0024($sp) -/* 0BEAC 8083E0BC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 0BEB0 8083E0C0 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 0BEB4 8083E0C4 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 0BEB8 8083E0C8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 0BEBC 8083E0CC 0C01DF1B */ jal func_80077C6C -/* 0BEC0 8083E0D0 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 0BEC4 8083E0D4 8FAD0028 */ lw $t5, 0x0028($sp) -/* 0BEC8 8083E0D8 2604083C */ addiu $a0, $s0, 0x083C ## $a0 = 0000083C -/* 0BECC 8083E0DC 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 0BED0 8083E0E0 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 0BED4 8083E0E4 85A50000 */ lh $a1, 0x0000($t5) ## 00000000 -.L8083E0E8: -/* 0BED8 8083E0E8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0BEDC 8083E0EC 8FB00018 */ lw $s0, 0x0018($sp) -/* 0BEE0 8083E0F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0BEE4 8083E0F4 03E00008 */ jr $ra -/* 0BEE8 8083E0F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E0FC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E0FC.s deleted file mode 100644 index c43f1e7bff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E0FC.s +++ /dev/null @@ -1,110 +0,0 @@ -glabel func_8083E0FC -/* 0BEEC 8083E0FC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0BEF0 8083E100 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0BEF4 8083E104 AFB20020 */ sw $s2, 0x0020($sp) -/* 0BEF8 8083E108 AFB1001C */ sw $s1, 0x001C($sp) -/* 0BEFC 8083E10C AFB00018 */ sw $s0, 0x0018($sp) -/* 0BF00 8083E110 8C910440 */ lw $s1, 0x0440($a0) ## 00000440 -/* 0BF04 8083E114 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0BF08 8083E118 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 0BF0C 8083E11C 12200057 */ beq $s1, $zero, .L8083E27C -/* 0BF10 8083E120 3C0E8086 */ lui $t6, %hi(D_80858AB4) ## $t6 = 80860000 -/* 0BF14 8083E124 8DCE8AB4 */ lw $t6, %lo(D_80858AB4)($t6) -/* 0BF18 8083E128 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 0BF1C 8083E12C 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 0BF20 8083E130 95CF000C */ lhu $t7, 0x000C($t6) ## 8086000C -/* 0BF24 8083E134 01E1C027 */ nor $t8, $t7, $at -/* 0BF28 8083E138 57000051 */ bnel $t8, $zero, .L8083E280 -/* 0BF2C 8083E13C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0BF30 8083E140 0C01DE0D */ jal Math_Coss - ## coss? -/* 0BF34 8083E144 862400B6 */ lh $a0, 0x00B6($s1) ## 000000B6 -/* 0BF38 8083E148 E7A00038 */ swc1 $f0, 0x0038($sp) -/* 0BF3C 8083E14C 0C01DE1C */ jal Math_Sins - ## sins? -/* 0BF40 8083E150 862400B6 */ lh $a0, 0x00B6($s1) ## 000000B6 -/* 0BF44 8083E154 3C068084 */ lui $a2, %hi(func_8083A360) ## $a2 = 80840000 -/* 0BF48 8083E158 24C6A360 */ addiu $a2, $a2, %lo(func_8083A360) ## $a2 = 8083A360 -/* 0BF4C 8083E15C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0BF50 8083E160 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0BF54 8083E164 0C20DA26 */ jal func_80836898 -/* 0BF58 8083E168 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 0BF5C 8083E16C 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 0BF60 8083E170 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -/* 0BF64 8083E174 820B043C */ lb $t3, 0x043C($s0) ## 0000043C -/* 0BF68 8083E178 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 0BF6C 8083E17C C7AC0034 */ lwc1 $f12, 0x0034($sp) -/* 0BF70 8083E180 03214025 */ or $t0, $t9, $at ## $t0 = 00800000 -/* 0BF74 8083E184 312AFFDF */ andi $t2, $t1, 0xFFDF ## $t2 = 00000000 -/* 0BF78 8083E188 AE08067C */ sw $t0, 0x067C($s0) ## 0000067C -/* 0BF7C 8083E18C 05610003 */ bgez $t3, .L8083E19C -/* 0BF80 8083E190 A60A0088 */ sh $t2, 0x0088($s0) ## 00000088 -/* 0BF84 8083E194 10000002 */ beq $zero, $zero, .L8083E1A0 -/* 0BF88 8083E198 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L8083E19C: -/* 0BF8C 8083E19C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L8083E1A0: -/* 0BF90 8083E1A0 00036080 */ sll $t4, $v1, 2 -/* 0BF94 8083E1A4 01836023 */ subu $t4, $t4, $v1 -/* 0BF98 8083E1A8 3C0D8085 */ lui $t5, %hi(D_80854578) ## $t5 = 80850000 -/* 0BF9C 8083E1AC 25AD4578 */ addiu $t5, $t5, %lo(D_80854578) ## $t5 = 80854578 -/* 0BFA0 8083E1B0 000C6080 */ sll $t4, $t4, 2 -/* 0BFA4 8083E1B4 018D1021 */ addu $v0, $t4, $t5 -/* 0BFA8 8083E1B8 C7AE0038 */ lwc1 $f14, 0x0038($sp) -/* 0BFAC 8083E1BC C4400004 */ lwc1 $f0, 0x0004($v0) ## 00000004 -/* 0BFB0 8083E1C0 C4420008 */ lwc1 $f2, 0x0008($v0) ## 00000008 -/* 0BFB4 8083E1C4 C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 -/* 0BFB8 8083E1C8 460E0282 */ mul.s $f10, $f0, $f14 -/* 0BFBC 8083E1CC C6260258 */ lwc1 $f6, 0x0258($s1) ## 00000258 -/* 0BFC0 8083E1D0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0BFC4 8083E1D4 460C1402 */ mul.s $f16, $f2, $f12 -/* 0BFC8 8083E1D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0BFCC 8083E1DC 46062200 */ add.s $f8, $f4, $f6 -/* 0BFD0 8083E1E0 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 0BFD4 8083E1E4 46105480 */ add.s $f18, $f10, $f16 -/* 0BFD8 8083E1E8 46124100 */ add.s $f4, $f8, $f18 -/* 0BFDC 8083E1EC 460E1202 */ mul.s $f8, $f2, $f14 -/* 0BFE0 8083E1F0 00000000 */ nop -/* 0BFE4 8083E1F4 460C0482 */ mul.s $f18, $f0, $f12 -/* 0BFE8 8083E1F8 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 0BFEC 8083E1FC C62A0260 */ lwc1 $f10, 0x0260($s1) ## 00000260 -/* 0BFF0 8083E200 C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C -/* 0BFF4 8083E204 460A3400 */ add.s $f16, $f6, $f10 -/* 0BFF8 8083E208 46124101 */ sub.s $f4, $f8, $f18 -/* 0BFFC 8083E20C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 0C000 8083E210 46048180 */ add.s $f6, $f16, $f4 -/* 0C004 8083E214 E606002C */ swc1 $f6, 0x002C($s0) ## 0000002C -/* 0C008 8083E218 C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 -/* 0C00C 8083E21C 46085481 */ sub.s $f18, $f10, $f8 -/* 0C010 8083E220 E6120878 */ swc1 $f18, 0x0878($s0) ## 00000878 -/* 0C014 8083E224 862700B6 */ lh $a3, 0x00B6($s1) ## 000000B6 -/* 0C018 8083E228 A60700B6 */ sh $a3, 0x00B6($s0) ## 000000B6 -/* 0C01C 8083E22C A607083C */ sh $a3, 0x083C($s0) ## 0000083C -/* 0C020 8083E230 0C00B7B3 */ jal func_8002DECC -/* 0C024 8083E234 AFA20028 */ sw $v0, 0x0028($sp) -/* 0C028 8083E238 8FA20028 */ lw $v0, 0x0028($sp) -/* 0C02C 8083E23C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0C030 8083E240 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C034 8083E244 0C20C899 */ jal func_80832264 -/* 0C038 8083E248 8C460000 */ lw $a2, 0x0000($v0) ## 00000000 -/* 0C03C 8083E24C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0C040 8083E250 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C044 8083E254 0C20CBD5 */ jal func_80832F54 -/* 0C048 8083E258 2406009B */ addiu $a2, $zero, 0x009B ## $a2 = 0000009B -/* 0C04C 8083E25C 8E0E0440 */ lw $t6, 0x0440($s0) ## 00000440 -/* 0C050 8083E260 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C054 8083E264 0C20C889 */ jal func_80832224 -/* 0C058 8083E268 AE0E0118 */ sw $t6, 0x0118($s0) ## 00000118 -/* 0C05C 8083E26C 0C00C12C */ jal func_800304B0 -/* 0C060 8083E270 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0C064 8083E274 10000002 */ beq $zero, $zero, .L8083E280 -/* 0C068 8083E278 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083E27C: -/* 0C06C 8083E27C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083E280: -/* 0C070 8083E280 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0C074 8083E284 8FB00018 */ lw $s0, 0x0018($sp) -/* 0C078 8083E288 8FB1001C */ lw $s1, 0x001C($sp) -/* 0C07C 8083E28C 8FB20020 */ lw $s2, 0x0020($sp) -/* 0C080 8083E290 03E00008 */ jr $ra -/* 0C084 8083E294 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E298.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E298.s deleted file mode 100644 index 35a9edac93..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E298.s +++ /dev/null @@ -1,39 +0,0 @@ -.late_rodata -glabel D_808553B8 - .word 0x38000100 - -.text -glabel func_8083E298 -/* 0C088 8083E298 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0C08C 8083E29C AFBF0014 */ sw $ra, 0x0014($sp) -/* 0C090 8083E2A0 AFA60020 */ sw $a2, 0x0020($sp) -/* 0C094 8083E2A4 848E0008 */ lh $t6, 0x0008($a0) ## 00000008 -/* 0C098 8083E2A8 3C018085 */ lui $at, %hi(D_808553B8) ## $at = 80850000 -/* 0C09C 8083E2AC C42053B8 */ lwc1 $f0, %lo(D_808553B8)($at) -/* 0C0A0 8083E2B0 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 0C0A4 8083E2B4 00000000 */ nop -/* 0C0A8 8083E2B8 468021A0 */ cvt.s.w $f6, $f4 -/* 0C0AC 8083E2BC 46003202 */ mul.s $f8, $f6, $f0 -/* 0C0B0 8083E2C0 E4A80000 */ swc1 $f8, 0x0000($a1) ## 00000000 -/* 0C0B4 8083E2C4 848F000A */ lh $t7, 0x000A($a0) ## 0000000A -/* 0C0B8 8083E2C8 C4AE0000 */ lwc1 $f14, 0x0000($a1) ## 00000000 -/* 0C0BC 8083E2CC 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 0C0C0 8083E2D0 00000000 */ nop -/* 0C0C4 8083E2D4 46805420 */ cvt.s.w $f16, $f10 -/* 0C0C8 8083E2D8 46008482 */ mul.s $f18, $f16, $f0 -/* 0C0CC 8083E2DC E4B20004 */ swc1 $f18, 0x0004($a1) ## 00000004 -/* 0C0D0 8083E2E0 8498000C */ lh $t8, 0x000C($a0) ## 0000000C -/* 0C0D4 8083E2E4 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 0C0D8 8083E2E8 00000000 */ nop -/* 0C0DC 8083E2EC 468021A0 */ cvt.s.w $f6, $f4 -/* 0C0E0 8083E2F0 46003202 */ mul.s $f8, $f6, $f0 -/* 0C0E4 8083E2F4 E4A80008 */ swc1 $f8, 0x0008($a1) ## 00000008 -/* 0C0E8 8083E2F8 0C034199 */ jal atan2s - -/* 0C0EC 8083E2FC C4AC0008 */ lwc1 $f12, 0x0008($a1) ## 00000008 -/* 0C0F0 8083E300 8FB90020 */ lw $t9, 0x0020($sp) -/* 0C0F4 8083E304 A7220000 */ sh $v0, 0x0000($t9) ## 00000000 -/* 0C0F8 8083E308 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0C0FC 8083E30C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0C100 8083E310 03E00008 */ jr $ra -/* 0C104 8083E314 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E318.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E318.s deleted file mode 100644 index 7b884e6252..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E318.s +++ /dev/null @@ -1,124 +0,0 @@ -.late_rodata -glabel D_808553BC - .float 1.2 - -glabel D_808553C0 - .word 0x3C75C28F - -.text -glabel func_8083E318 -/* 0C108 8083E318 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0C10C 8083E31C AFBF001C */ sw $ra, 0x001C($sp) -/* 0C110 8083E320 AFB00018 */ sw $s0, 0x0018($sp) -/* 0C114 8083E324 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0C118 8083E328 AFA40050 */ sw $a0, 0x0050($sp) -/* 0C11C 8083E32C 0C023A37 */ jal func_8008E8DC -/* 0C120 8083E330 AFA60058 */ sw $a2, 0x0058($sp) -/* 0C124 8083E334 5440005E */ bnel $v0, $zero, .L8083E4B0 -/* 0C128 8083E338 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0C12C 8083E33C 8E0E0674 */ lw $t6, 0x0674($s0) ## 00000674 -/* 0C130 8083E340 3C028085 */ lui $v0, %hi(func_8084F390) ## $v0 = 80850000 -/* 0C134 8083E344 2442F390 */ addiu $v0, $v0, %lo(func_8084F390) ## $v0 = 8084F390 -/* 0C138 8083E348 11C20058 */ beq $t6, $v0, .L8083E4AC -/* 0C13C 8083E34C 8FA40050 */ lw $a0, 0x0050($sp) -/* 0C140 8083E350 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 0C144 8083E354 AFA20024 */ sw $v0, 0x0024($sp) -/* 0C148 8083E358 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 0C14C 8083E35C 0C0107DF */ jal func_80041F7C -/* 0C150 8083E360 8FA50058 */ lw $a1, 0x0058($sp) -/* 0C154 8083E364 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0C158 8083E368 54410051 */ bnel $v0, $at, .L8083E4B0 -/* 0C15C 8083E36C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0C160 8083E370 C60C0064 */ lwc1 $f12, 0x0064($s0) ## 00000064 -/* 0C164 8083E374 0C034199 */ jal atan2s - -/* 0C168 8083E378 C60E005C */ lwc1 $f14, 0x005C($s0) ## 0000005C -/* 0C16C 8083E37C A7A2004A */ sh $v0, 0x004A($sp) -/* 0C170 8083E380 8FA40058 */ lw $a0, 0x0058($sp) -/* 0C174 8083E384 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFEC -/* 0C178 8083E388 0C20F8A6 */ jal func_8083E298 -/* 0C17C 8083E38C 27A6003A */ addiu $a2, $sp, 0x003A ## $a2 = FFFFFFEA -/* 0C180 8083E390 87AF003A */ lh $t7, 0x003A($sp) -/* 0C184 8083E394 87B8004A */ lh $t8, 0x004A($sp) -/* 0C188 8083E398 8FA40050 */ lw $a0, 0x0050($sp) -/* 0C18C 8083E39C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C190 8083E3A0 01F81023 */ subu $v0, $t7, $t8 -/* 0C194 8083E3A4 00021400 */ sll $v0, $v0, 16 -/* 0C198 8083E3A8 00021403 */ sra $v0, $v0, 16 -/* 0C19C 8083E3AC 04400003 */ bltz $v0, .L8083E3BC -/* 0C1A0 8083E3B0 00021823 */ subu $v1, $zero, $v0 -/* 0C1A4 8083E3B4 10000001 */ beq $zero, $zero, .L8083E3BC -/* 0C1A8 8083E3B8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L8083E3BC: -/* 0C1AC 8083E3BC 28613E81 */ slti $at, $v1, 0x3E81 -/* 0C1B0 8083E3C0 1420001B */ bne $at, $zero, .L8083E430 -/* 0C1B4 8083E3C4 8FA60024 */ lw $a2, 0x0024($sp) -/* 0C1B8 8083E3C8 3C018085 */ lui $at, %hi(D_808553BC) ## $at = 80850000 -/* 0C1BC 8083E3CC C43053BC */ lwc1 $f16, %lo(D_808553BC)($at) -/* 0C1C0 8083E3D0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0C1C4 8083E3D4 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 0C1C8 8083E3D8 C7A60040 */ lwc1 $f6, 0x0040($sp) -/* 0C1CC 8083E3DC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0C1D0 8083E3E0 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 0C1D4 8083E3E4 46062201 */ sub.s $f8, $f4, $f6 -/* 0C1D8 8083E3E8 3C018085 */ lui $at, %hi(D_808553C0) ## $at = 80850000 -/* 0C1DC 8083E3EC C42453C0 */ lwc1 $f4, %lo(D_808553C0)($at) -/* 0C1E0 8083E3F0 87B9003A */ lh $t9, 0x003A($sp) -/* 0C1E4 8083E3F4 460A4382 */ mul.s $f14, $f8, $f10 -/* 0C1E8 8083E3F8 260408AC */ addiu $a0, $s0, 0x08AC ## $a0 = 000008AC -/* 0C1EC 8083E3FC 460E7482 */ mul.s $f18, $f14, $f14 -/* 0C1F0 8083E400 44057000 */ mfc1 $a1, $f14 -/* 0C1F4 8083E404 46049302 */ mul.s $f12, $f18, $f4 -/* 0C1F8 8083E408 4610603C */ c.lt.s $f12, $f16 -/* 0C1FC 8083E40C 00000000 */ nop -/* 0C200 8083E410 45020003 */ bc1fl .L8083E420 -/* 0C204 8083E414 44066000 */ mfc1 $a2, $f12 -/* 0C208 8083E418 46008306 */ mov.s $f12, $f16 -/* 0C20C 8083E41C 44066000 */ mfc1 $a2, $f12 -.L8083E420: -/* 0C210 8083E420 0C01DE80 */ jal Math_ApproxF - -/* 0C214 8083E424 A61908B0 */ sh $t9, 0x08B0($s0) ## 000008B0 -/* 0C218 8083E428 10000021 */ beq $zero, $zero, .L8083E4B0 -/* 0C21C 8083E42C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083E430: -/* 0C220 8083E430 0C20D716 */ jal func_80835C58 -/* 0C224 8083E434 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0C228 8083E438 8FA40050 */ lw $a0, 0x0050($sp) -/* 0C22C 8083E43C 0C20C959 */ jal func_80832564 -/* 0C230 8083E440 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C234 8083E444 3C088085 */ lui $t0, %hi(D_80853610) ## $t0 = 80850000 -/* 0C238 8083E448 85083610 */ lh $t0, %lo(D_80853610)($t0) -/* 0C23C 8083E44C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 0C240 8083E450 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C244 8083E454 05020003 */ bltzl $t0, .L8083E464 -/* 0C248 8083E458 820A084F */ lb $t2, 0x084F($s0) ## 0000084F -/* 0C24C 8083E45C A209084F */ sb $t1, 0x084F($s0) ## 0000084F -/* 0C250 8083E460 820A084F */ lb $t2, 0x084F($s0) ## 0000084F -.L8083E464: -/* 0C254 8083E464 3C068085 */ lui $a2, %hi(D_80854590) ## $a2 = 80850000 -/* 0C258 8083E468 8FA40050 */ lw $a0, 0x0050($sp) -/* 0C25C 8083E46C 000A5880 */ sll $t3, $t2, 2 -/* 0C260 8083E470 00CB3021 */ addu $a2, $a2, $t3 -/* 0C264 8083E474 0C20CAFA */ jal func_80832BE8 -/* 0C268 8083E478 8CC64590 */ lw $a2, %lo(D_80854590)($a2) -/* 0C26C 8083E47C C60C005C */ lwc1 $f12, 0x005C($s0) ## 0000005C -/* 0C270 8083E480 C6020064 */ lwc1 $f2, 0x0064($s0) ## 00000064 -/* 0C274 8083E484 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0C278 8083E488 460C6182 */ mul.s $f6, $f12, $f12 -/* 0C27C 8083E48C 00000000 */ nop -/* 0C280 8083E490 46021202 */ mul.s $f8, $f2, $f2 -/* 0C284 8083E494 46083000 */ add.s $f0, $f6, $f8 -/* 0C288 8083E498 46000004 */ sqrt.s $f0, $f0 -/* 0C28C 8083E49C E6000838 */ swc1 $f0, 0x0838($s0) ## 00000838 -/* 0C290 8083E4A0 87AC004A */ lh $t4, 0x004A($sp) -/* 0C294 8083E4A4 10000002 */ beq $zero, $zero, .L8083E4B0 -/* 0C298 8083E4A8 A60C083C */ sh $t4, 0x083C($s0) ## 0000083C -.L8083E4AC: -/* 0C29C 8083E4AC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083E4B0: -/* 0C2A0 8083E4B0 8FBF001C */ lw $ra, 0x001C($sp) -/* 0C2A4 8083E4B4 8FB00018 */ lw $s0, 0x0018($sp) -/* 0C2A8 8083E4B8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 0C2AC 8083E4BC 03E00008 */ jr $ra -/* 0C2B0 8083E4C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E4C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E4C4.s deleted file mode 100644 index 0f62c8b8a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E4C4.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_8083E4C4 -/* 0C2B4 8083E4C4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0C2B8 8083E4C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0C2BC 8083E4CC AFA50024 */ sw $a1, 0x0024($sp) -/* 0C2C0 8083E4D0 90C20001 */ lbu $v0, 0x0001($a2) ## 00000001 -/* 0C2C4 8083E4D4 00C03825 */ or $a3, $a2, $zero ## $a3 = 00000000 -/* 0C2C8 8083E4D8 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 0C2CC 8083E4DC 304E0080 */ andi $t6, $v0, 0x0080 ## $t6 = 00000000 -/* 0C2D0 8083E4E0 15C00022 */ bne $t6, $zero, .L8083E56C -/* 0C2D4 8083E4E4 3043001F */ andi $v1, $v0, 0x001F ## $v1 = 00000000 -/* 0C2D8 8083E4E8 34668000 */ ori $a2, $v1, 0x8000 ## $a2 = 00008000 -/* 0C2DC 8083E4EC 00063400 */ sll $a2, $a2, 16 -/* 0C2E0 8083E4F0 00063403 */ sra $a2, $a2, 16 -/* 0C2E4 8083E4F4 AFA3001C */ sw $v1, 0x001C($sp) -/* 0C2E8 8083E4F8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0C2EC 8083E4FC 0C007D52 */ jal Item_DropCollectible - -/* 0C2F0 8083E500 AFA70028 */ sw $a3, 0x0028($sp) -/* 0C2F4 8083E504 8FA3001C */ lw $v1, 0x001C($sp) -/* 0C2F8 8083E508 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0C2FC 8083E50C 8FA40020 */ lw $a0, 0x0020($sp) -/* 0C300 8083E510 10610018 */ beq $v1, $at, .L8083E574 -/* 0C304 8083E514 8FA70028 */ lw $a3, 0x0028($sp) -/* 0C308 8083E518 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 0C30C 8083E51C 10610015 */ beq $v1, $at, .L8083E574 -/* 0C310 8083E520 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0C314 8083E524 10610013 */ beq $v1, $at, .L8083E574 -/* 0C318 8083E528 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0C31C 8083E52C 50610012 */ beql $v1, $at, .L8083E578 -/* 0C320 8083E530 8FAF0024 */ lw $t7, 0x0024($sp) -/* 0C324 8083E534 1060000F */ beq $v1, $zero, .L8083E574 -/* 0C328 8083E538 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0C32C 8083E53C 1061000D */ beq $v1, $at, .L8083E574 -/* 0C330 8083E540 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0C334 8083E544 1061000B */ beq $v1, $at, .L8083E574 -/* 0C338 8083E548 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 0C33C 8083E54C 10610009 */ beq $v1, $at, .L8083E574 -/* 0C340 8083E550 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 0C344 8083E554 50610008 */ beql $v1, $at, .L8083E578 -/* 0C348 8083E558 8FAF0024 */ lw $t7, 0x0024($sp) -/* 0C34C 8083E55C 0C021344 */ jal Item_Give -/* 0C350 8083E560 90E50000 */ lbu $a1, 0x0000($a3) ## 00000000 -/* 0C354 8083E564 10000004 */ beq $zero, $zero, .L8083E578 -/* 0C358 8083E568 8FAF0024 */ lw $t7, 0x0024($sp) -.L8083E56C: -/* 0C35C 8083E56C 0C021344 */ jal Item_Give -/* 0C360 8083E570 90E50000 */ lbu $a1, 0x0000($a3) ## 00000000 -.L8083E574: -/* 0C364 8083E574 8FAF0024 */ lw $t7, 0x0024($sp) -.L8083E578: -/* 0C368 8083E578 24024824 */ addiu $v0, $zero, 0x4824 ## $v0 = 00004824 -/* 0C36C 8083E57C 81F80434 */ lb $t8, 0x0434($t7) ## 00000434 -/* 0C370 8083E580 07010003 */ bgez $t8, .L8083E590 -/* 0C374 8083E584 00000000 */ nop -/* 0C378 8083E588 10000001 */ beq $zero, $zero, .L8083E590 -/* 0C37C 8083E58C 24024831 */ addiu $v0, $zero, 0x4831 ## $v0 = 00004831 -.L8083E590: -/* 0C380 8083E590 0C01E221 */ jal func_80078884 -/* 0C384 8083E594 3044FFFF */ andi $a0, $v0, 0xFFFF ## $a0 = 00004831 -/* 0C388 8083E598 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0C38C 8083E59C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0C390 8083E5A0 03E00008 */ jr $ra -/* 0C394 8083E5A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s deleted file mode 100644 index 16cac3f025..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s +++ /dev/null @@ -1,347 +0,0 @@ -.late_rodata -glabel D_808553C4 - .word 0x41EB7972 -glabel D_808553C8 - .word 0x41EB7972 - -.text -glabel func_8083E5A8 -/* 0C398 8083E5A8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0C39C 8083E5AC 3C038016 */ lui $v1, %hi(gGameInfo) -/* 0C3A0 8083E5B0 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -/* 0C3A4 8083E5B4 AFBF001C */ sw $ra, 0x001C($sp) -/* 0C3A8 8083E5B8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0C3AC 8083E5BC AFA5003C */ sw $a1, 0x003C($sp) -/* 0C3B0 8083E5C0 84660D5A */ lh $a2, 0x0D5A($v1) ## 80160D5A -/* 0C3B4 8083E5C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0C3B8 8083E5C8 14C0000C */ bne $a2, $zero, .L8083E5FC -/* 0C3BC 8083E5CC 00000000 */ nop -/* 0C3C0 8083E5D0 8C820438 */ lw $v0, 0x0438($a0) ## 00000438 -/* 0C3C4 8083E5D4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0C3C8 8083E5D8 24A51D4C */ addiu $a1, $a1, 0x1D4C ## $a1 = 00001D4C -/* 0C3CC 8083E5DC 50400128 */ beql $v0, $zero, .L8083EA80 -/* 0C3D0 8083E5E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0C3D4 8083E5E4 0C00B54F */ jal func_8002D53C -/* 0C3D8 8083E5E8 AFA20034 */ sw $v0, 0x0034($sp) -/* 0C3DC 8083E5EC 10400123 */ beq $v0, $zero, .L8083EA7C -/* 0C3E0 8083E5F0 3C038016 */ lui $v1, %hi(gGameInfo) -/* 0C3E4 8083E5F4 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -/* 0C3E8 8083E5F8 84660D5A */ lh $a2, 0x0D5A($v1) ## 80160D5A -.L8083E5FC: -/* 0C3EC 8083E5FC 14C00005 */ bne $a2, $zero, .L8083E614 -/* 0C3F0 8083E600 00000000 */ nop -/* 0C3F4 8083E604 82020434 */ lb $v0, 0x0434($s0) ## 00000434 -/* 0C3F8 8083E608 3C188086 */ lui $t8, %hi(D_80858AB4) ## $t8 = 80860000 -/* 0C3FC 8083E60C 1840004D */ blez $v0, .L8083E744 -/* 0C400 8083E610 00000000 */ nop -.L8083E614: -/* 0C404 8083E614 10C00003 */ beq $a2, $zero, .L8083E624 -/* 0C408 8083E618 3C088085 */ lui $t0, %hi(D_80853624) ## $t0 = 80850000 -/* 0C40C 8083E61C 846F0D5C */ lh $t7, 0x0D5C($v1) ## 80160D5C -/* 0C410 8083E620 A20F0434 */ sb $t7, 0x0434($s0) ## 00000434 -.L8083E624: -/* 0C414 8083E624 82020434 */ lb $v0, 0x0434($s0) ## 00000434 -/* 0C418 8083E628 8FA40034 */ lw $a0, 0x0034($sp) -/* 0C41C 8083E62C 25083624 */ addiu $t0, $t0, %lo(D_80853624) ## $t0 = 80853624 -/* 0C420 8083E630 2841007E */ slti $at, $v0, 0x007E -/* 0C424 8083E634 10200111 */ beq $at, $zero, .L8083EA7C -/* 0C428 8083E638 0002C080 */ sll $t8, $v0, 2 -/* 0C42C 8083E63C 0302C023 */ subu $t8, $t8, $v0 -/* 0C430 8083E640 0018C040 */ sll $t8, $t8, 1 -/* 0C434 8083E644 2719FFFA */ addiu $t9, $t8, 0xFFFA ## $t9 = 8085FFFA -/* 0C438 8083E648 3C038016 */ lui $v1, %hi(gGameInfo) -/* 0C43C 8083E64C 03283021 */ addu $a2, $t9, $t0 -/* 0C440 8083E650 12040007 */ beq $s0, $a0, .L8083E670 -/* 0C444 8083E654 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -/* 0C448 8083E658 84690D5A */ lh $t1, 0x0D5A($v1) ## 80160D5A -/* 0C44C 8083E65C 55200005 */ bnel $t1, $zero, .L8083E674 -/* 0C450 8083E660 A4600D5A */ sh $zero, 0x0D5A($v1) ## 80160D5A -/* 0C454 8083E664 AC900118 */ sw $s0, 0x0118($a0) ## 00000118 -/* 0C458 8083E668 3C038016 */ lui $v1, %hi(gGameInfo) -/* 0C45C 8083E66C 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -.L8083E670: -/* 0C460 8083E670 A4600D5A */ sh $zero, 0x0D5A($v1) ## 80160D5A -.L8083E674: -/* 0C464 8083E674 90C40000 */ lbu $a0, 0x0000($a2) ## 00000000 -/* 0C468 8083E678 0C0218E2 */ jal Item_CheckObtainability -/* 0C46C 8083E67C AFA60030 */ sw $a2, 0x0030($sp) -/* 0C470 8083E680 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 0C474 8083E684 10410006 */ beq $v0, $at, .L8083E6A0 -/* 0C478 8083E688 8FA60030 */ lw $a2, 0x0030($sp) -/* 0C47C 8083E68C 8FA4003C */ lw $a0, 0x003C($sp) -/* 0C480 8083E690 2401004B */ addiu $at, $zero, 0x004B ## $at = 0000004B -/* 0C484 8083E694 848A00A4 */ lh $t2, 0x00A4($a0) ## 000000A4 -/* 0C488 8083E698 15410026 */ bne $t2, $at, .L8083E734 -/* 0C48C 8083E69C 00000000 */ nop -.L8083E6A0: -/* 0C490 8083E6A0 8FA4003C */ lw $a0, 0x003C($sp) -/* 0C494 8083E6A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C498 8083E6A8 0C20C8ED */ jal func_808323B4 -/* 0C49C 8083E6AC AFA60030 */ sw $a2, 0x0030($sp) -/* 0C4A0 8083E6B0 8FA60030 */ lw $a2, 0x0030($sp) -/* 0C4A4 8083E6B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C4A8 8083E6B8 0C20EB90 */ jal func_8083AE40 -/* 0C4AC 8083E6BC 84C50004 */ lh $a1, 0x0004($a2) ## 00000004 -/* 0C4B0 8083E6C0 8E0B0680 */ lw $t3, 0x0680($s0) ## 00000680 -/* 0C4B4 8083E6C4 8FA4003C */ lw $a0, 0x003C($sp) -/* 0C4B8 8083E6C8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C4BC 8083E6CC 316C0400 */ andi $t4, $t3, 0x0400 ## $t4 = 00000000 -/* 0C4C0 8083E6D0 11800005 */ beq $t4, $zero, .L8083E6E8 -/* 0C4C4 8083E6D4 3C068084 */ lui $a2, %hi(func_8083A434) ## $a2 = 80840000 -/* 0C4C8 8083E6D8 820D014F */ lb $t5, 0x014F($s0) ## 0000014F -/* 0C4CC 8083E6DC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0C4D0 8083E6E0 55A1000C */ bnel $t5, $at, .L8083E714 -/* 0C4D4 8083E6E4 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -.L8083E6E8: -/* 0C4D8 8083E6E8 0C20DA26 */ jal func_80836898 -/* 0C4DC 8083E6EC 24C6A434 */ addiu $a2, $a2, %lo(func_8083A434) ## $a2 = 8083A434 -/* 0C4E0 8083E6F0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0C4E4 8083E6F4 24C62788 */ addiu $a2, $a2, 0x2788 ## $a2 = 04002788 -/* 0C4E8 8083E6F8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0C4EC 8083E6FC 0C20C8B4 */ jal func_808322D0 -/* 0C4F0 8083E700 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C4F4 8083E704 8FA4003C */ lw $a0, 0x003C($sp) -/* 0C4F8 8083E708 0C20D7A9 */ jal func_80835EA4 -/* 0C4FC 8083E70C 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 0C500 8083E710 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -.L8083E714: -/* 0C504 8083E714 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 0C508 8083E718 34210C00 */ ori $at, $at, 0x0C00 ## $at = 20000C00 -/* 0C50C 8083E71C 01C17825 */ or $t7, $t6, $at ## $t7 = 20000C00 -/* 0C510 8083E720 AE0F067C */ sw $t7, 0x067C($s0) ## 0000067C -/* 0C514 8083E724 0C20C889 */ jal func_80832224 -/* 0C518 8083E728 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C51C 8083E72C 100000D4 */ beq $zero, $zero, .L8083EA80 -/* 0C520 8083E730 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083E734: -/* 0C524 8083E734 0C20F931 */ jal func_8083E4C4 -/* 0C528 8083E738 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C52C 8083E73C 100000CF */ beq $zero, $zero, .L8083EA7C -/* 0C530 8083E740 A2000434 */ sb $zero, 0x0434($s0) ## 00000434 -.L8083E744: -/* 0C534 8083E744 8F188AB4 */ lw $t8, %lo(D_80858AB4)($t8) -/* 0C538 8083E748 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 0C53C 8083E74C 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 0C540 8083E750 9719000C */ lhu $t9, 0x000C($t8) ## 0000000C -/* 0C544 8083E754 03214027 */ nor $t0, $t9, $at -/* 0C548 8083E758 550000C9 */ bnel $t0, $zero, .L8083EA80 -/* 0C54C 8083E75C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0C550 8083E760 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 0C554 8083E764 312A0800 */ andi $t2, $t1, 0x0800 ## $t2 = 00000000 -/* 0C558 8083E768 554000C5 */ bnel $t2, $zero, .L8083EA80 -/* 0C55C 8083E76C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0C560 8083E770 8E0B0680 */ lw $t3, 0x0680($s0) ## 00000680 -/* 0C564 8083E774 316C0400 */ andi $t4, $t3, 0x0400 ## $t4 = 00000000 -/* 0C568 8083E778 558000C1 */ bnel $t4, $zero, .L8083EA80 -/* 0C56C 8083E77C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0C570 8083E780 10400074 */ beq $v0, $zero, .L8083E954 -/* 0C574 8083E784 00026823 */ subu $t5, $zero, $v0 -/* 0C578 8083E788 000D7080 */ sll $t6, $t5, 2 -/* 0C57C 8083E78C 01CD7023 */ subu $t6, $t6, $t5 -/* 0C580 8083E790 000E7040 */ sll $t6, $t6, 1 -/* 0C584 8083E794 3C188085 */ lui $t8, %hi(D_80853624) ## $t8 = 80850000 -/* 0C588 8083E798 27183624 */ addiu $t8, $t8, %lo(D_80853624) ## $t8 = 80853624 -/* 0C58C 8083E79C 25CFFFFA */ addiu $t7, $t6, 0xFFFA ## $t7 = FFFFFFFA -/* 0C590 8083E7A0 01F8C821 */ addu $t9, $t7, $t8 -/* 0C594 8083E7A4 AFB9002C */ sw $t9, 0x002C($sp) -/* 0C598 8083E7A8 93240000 */ lbu $a0, 0x0000($t9) ## 00000000 -/* 0C59C 8083E7AC 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 0C5A0 8083E7B0 10810018 */ beq $a0, $at, .L8083E814 -/* 0C5A4 8083E7B4 00000000 */ nop -/* 0C5A8 8083E7B8 0C0218E2 */ jal Item_CheckObtainability -/* 0C5AC 8083E7BC 00000000 */ nop -/* 0C5B0 8083E7C0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 0C5B4 8083E7C4 14410005 */ bne $v0, $at, .L8083E7DC -/* 0C5B8 8083E7C8 8FA8002C */ lw $t0, 0x002C($sp) -/* 0C5BC 8083E7CC 91090001 */ lbu $t1, 0x0001($t0) ## 00000001 -/* 0C5C0 8083E7D0 312A0040 */ andi $t2, $t1, 0x0040 ## $t2 = 00000000 -/* 0C5C4 8083E7D4 5540000B */ bnel $t2, $zero, .L8083E804 -/* 0C5C8 8083E7D8 240FFFB3 */ addiu $t7, $zero, 0xFFB3 ## $t7 = FFFFFFB3 -.L8083E7DC: -/* 0C5CC 8083E7DC 8FAB002C */ lw $t3, 0x002C($sp) -/* 0C5D0 8083E7E0 0C0218E2 */ jal Item_CheckObtainability -/* 0C5D4 8083E7E4 91640000 */ lbu $a0, 0x0000($t3) ## 00000000 -/* 0C5D8 8083E7E8 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 0C5DC 8083E7EC 10410009 */ beq $v0, $at, .L8083E814 -/* 0C5E0 8083E7F0 8FAC002C */ lw $t4, 0x002C($sp) -/* 0C5E4 8083E7F4 918D0001 */ lbu $t5, 0x0001($t4) ## 00000001 -/* 0C5E8 8083E7F8 31AE0020 */ andi $t6, $t5, 0x0020 ## $t6 = 00000000 -/* 0C5EC 8083E7FC 11C00005 */ beq $t6, $zero, .L8083E814 -/* 0C5F0 8083E800 240FFFB3 */ addiu $t7, $zero, 0xFFB3 ## $t7 = FFFFFFB3 -.L8083E804: -/* 0C5F4 8083E804 3C188085 */ lui $t8, %hi(D_808537EC) ## $t8 = 80850000 -/* 0C5F8 8083E808 A20F0434 */ sb $t7, 0x0434($s0) ## 00000434 -/* 0C5FC 8083E80C 271837EC */ addiu $t8, $t8, %lo(D_808537EC) ## $t8 = 808537EC -/* 0C600 8083E810 AFB8002C */ sw $t8, 0x002C($sp) -.L8083E814: -/* 0C604 8083E814 3C068084 */ lui $a2, %hi(func_8083A434) ## $a2 = 80840000 -/* 0C608 8083E818 24C6A434 */ addiu $a2, $a2, %lo(func_8083A434) ## $a2 = 8083A434 -/* 0C60C 8083E81C 8FA4003C */ lw $a0, 0x003C($sp) -/* 0C610 8083E820 0C20DA26 */ jal func_80836898 -/* 0C614 8083E824 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C618 8083E828 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 0C61C 8083E82C 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 0C620 8083E830 34210C00 */ ori $at, $at, 0x0C00 ## $at = 20000C00 -/* 0C624 8083E834 03214025 */ or $t0, $t9, $at ## $t0 = 20000C00 -/* 0C628 8083E838 AE08067C */ sw $t0, 0x067C($s0) ## 0000067C -/* 0C62C 8083E83C 8FA9002C */ lw $t1, 0x002C($sp) -/* 0C630 8083E840 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C634 8083E844 0C20EB90 */ jal func_8083AE40 -/* 0C638 8083E848 85250004 */ lh $a1, 0x0004($t1) ## 00000004 -/* 0C63C 8083E84C 8FAA0034 */ lw $t2, 0x0034($sp) -/* 0C640 8083E850 0C01DE1C */ jal Math_Sins - ## sins? -/* 0C644 8083E854 854400B6 */ lh $a0, 0x00B6($t2) ## 000000B6 -/* 0C648 8083E858 3C018085 */ lui $at, %hi(D_808553C4) ## $at = 80850000 -/* 0C64C 8083E85C C42653C4 */ lwc1 $f6, %lo(D_808553C4)($at) -/* 0C650 8083E860 8FA20034 */ lw $v0, 0x0034($sp) -/* 0C654 8083E864 46060202 */ mul.s $f8, $f0, $f6 -/* 0C658 8083E868 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 0C65C 8083E86C 46082281 */ sub.s $f10, $f4, $f8 -/* 0C660 8083E870 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 0C664 8083E874 0C01DE0D */ jal Math_Coss - ## coss? -/* 0C668 8083E878 844400B6 */ lh $a0, 0x00B6($v0) ## 000000B6 -/* 0C66C 8083E87C 3C018085 */ lui $at, %hi(D_808553C8) ## $at = 80850000 -/* 0C670 8083E880 C43253C8 */ lwc1 $f18, %lo(D_808553C8)($at) -/* 0C674 8083E884 8FA30034 */ lw $v1, 0x0034($sp) -/* 0C678 8083E888 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C67C 8083E88C 46120182 */ mul.s $f6, $f0, $f18 -/* 0C680 8083E890 C470002C */ lwc1 $f16, 0x002C($v1) ## 0000002C -/* 0C684 8083E894 46068101 */ sub.s $f4, $f16, $f6 -/* 0C688 8083E898 E604002C */ swc1 $f4, 0x002C($s0) ## 0000002C -/* 0C68C 8083E89C 846200B6 */ lh $v0, 0x00B6($v1) ## 000000B6 -/* 0C690 8083E8A0 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 0C694 8083E8A4 0C20C889 */ jal func_80832224 -/* 0C698 8083E8A8 A602083C */ sh $v0, 0x083C($s0) ## 0000083C -/* 0C69C 8083E8AC 8FAB002C */ lw $t3, 0x002C($sp) -/* 0C6A0 8083E8B0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 0C6A4 8083E8B4 91640000 */ lbu $a0, 0x0000($t3) ## 00000000 -/* 0C6A8 8083E8B8 1081001C */ beq $a0, $at, .L8083E92C -/* 0C6AC 8083E8BC 00000000 */ nop -/* 0C6B0 8083E8C0 816C0002 */ lb $t4, 0x0002($t3) ## 00000002 -/* 0C6B4 8083E8C4 05800019 */ bltz $t4, .L8083E92C -/* 0C6B8 8083E8C8 00000000 */ nop -/* 0C6BC 8083E8CC 0C0218E2 */ jal Item_CheckObtainability -/* 0C6C0 8083E8D0 00000000 */ nop -/* 0C6C4 8083E8D4 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 0C6C8 8083E8D8 14410014 */ bne $v0, $at, .L8083E92C -/* 0C6CC 8083E8DC 8FA4003C */ lw $a0, 0x003C($sp) -/* 0C6D0 8083E8E0 8E0D0678 */ lw $t5, 0x0678($s0) ## 00000678 -/* 0C6D4 8083E8E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C6D8 8083E8E8 0C20C8B4 */ jal func_808322D0 -/* 0C6DC 8083E8EC 8DA60098 */ lw $a2, 0x0098($t5) ## 00000098 -/* 0C6E0 8083E8F0 8FA4003C */ lw $a0, 0x003C($sp) -/* 0C6E4 8083E8F4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C6E8 8083E8F8 0C20CBD5 */ jal func_80832F54 -/* 0C6EC 8083E8FC 2406028F */ addiu $a2, $zero, 0x028F ## $a2 = 0000028F -/* 0C6F0 8083E900 8FAF0034 */ lw $t7, 0x0034($sp) -/* 0C6F4 8083E904 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0C6F8 8083E908 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0C6FC 8083E90C A5EE01F4 */ sh $t6, 0x01F4($t7) ## 000001F4 -/* 0C700 8083E910 0C030129 */ jal Gameplay_GetCamera -/* 0C704 8083E914 8FA4003C */ lw $a0, 0x003C($sp) -/* 0C708 8083E918 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 0C70C 8083E91C 0C0169DF */ jal func_8005A77C -/* 0C710 8083E920 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 -/* 0C714 8083E924 10000056 */ beq $zero, $zero, .L8083EA80 -/* 0C718 8083E928 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083E92C: -/* 0C71C 8083E92C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0C720 8083E930 24C62DF8 */ addiu $a2, $a2, 0x2DF8 ## $a2 = 04002DF8 -/* 0C724 8083E934 8FA4003C */ lw $a0, 0x003C($sp) -/* 0C728 8083E938 0C20C899 */ jal func_80832264 -/* 0C72C 8083E93C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C730 8083E940 8FB90034 */ lw $t9, 0x0034($sp) -/* 0C734 8083E944 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 0C738 8083E948 A73801F4 */ sh $t8, 0x01F4($t9) ## 000001F4 -/* 0C73C 8083E94C 1000004C */ beq $zero, $zero, .L8083EA80 -/* 0C740 8083E950 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083E954: -/* 0C744 8083E954 8E0803AC */ lw $t0, 0x03AC($s0) ## 000003AC -/* 0C748 8083E958 51000006 */ beql $t0, $zero, .L8083E974 -/* 0C74C 8083E95C 8FA90034 */ lw $t1, 0x0034($sp) -/* 0C750 8083E960 0C023C41 */ jal func_8008F104 -/* 0C754 8083E964 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C758 8083E968 50400045 */ beql $v0, $zero, .L8083EA80 -/* 0C75C 8083E96C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0C760 8083E970 8FA90034 */ lw $t1, 0x0034($sp) -.L8083E974: -/* 0C764 8083E974 2401006C */ addiu $at, $zero, 0x006C ## $at = 0000006C -/* 0C768 8083E978 3C0B8016 */ lui $t3, %hi(gSaveContext+4) -/* 0C76C 8083E97C 852A0000 */ lh $t2, 0x0000($t1) ## 00000000 -/* 0C770 8083E980 15410022 */ bne $t2, $at, .L8083EA0C -/* 0C774 8083E984 00000000 */ nop -/* 0C778 8083E988 8D6BE664 */ lw $t3, %lo(gSaveContext+4)($t3) -/* 0C77C 8083E98C 1560001F */ bne $t3, $zero, .L8083EA0C -/* 0C780 8083E990 00000000 */ nop -/* 0C784 8083E994 820C0154 */ lb $t4, 0x0154($s0) ## 00000154 -/* 0C788 8083E998 3C068084 */ lui $a2, %hi(func_8083A0F4) ## $a2 = 80840000 -/* 0C78C 8083E99C 24C6A0F4 */ addiu $a2, $a2, %lo(func_8083A0F4) ## $a2 = 8083A0F4 -/* 0C790 8083E9A0 AFAC0024 */ sw $t4, 0x0024($sp) -/* 0C794 8083E9A4 A2000154 */ sb $zero, 0x0154($s0) ## 00000154 -/* 0C798 8083E9A8 820D0154 */ lb $t5, 0x0154($s0) ## 00000154 -/* 0C79C 8083E9AC A200015B */ sb $zero, 0x015B($s0) ## 0000015B -/* 0C7A0 8083E9B0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C7A4 8083E9B4 A20D0151 */ sb $t5, 0x0151($s0) ## 00000151 -/* 0C7A8 8083E9B8 0C20DA26 */ jal func_80836898 -/* 0C7AC 8083E9BC 8FA4003C */ lw $a0, 0x003C($sp) -/* 0C7B0 8083E9C0 8FAE0024 */ lw $t6, 0x0024($sp) -/* 0C7B4 8083E9C4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0C7B8 8083E9C8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0C7BC 8083E9CC 15C1000B */ bne $t6, $at, .L8083E9FC -/* 0C7C0 8083E9D0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C7C4 8083E9D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C7C8 8083E9D8 0C023A7E */ jal func_8008E9F8 -/* 0C7CC 8083E9DC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0C7D0 8083E9E0 A2020159 */ sb $v0, 0x0159($s0) ## 00000159 -/* 0C7D4 8083E9E4 8FA4003C */ lw $a0, 0x003C($sp) -/* 0C7D8 8083E9E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C7DC 8083E9EC 0C20CE67 */ jal func_8083399C -/* 0C7E0 8083E9F0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0C7E4 8083E9F4 1000001A */ beq $zero, $zero, .L8083EA60 -/* 0C7E8 8083E9F8 00000000 */ nop -.L8083E9FC: -/* 0C7EC 8083E9FC 0C20D7D1 */ jal func_80835F44 -/* 0C7F0 8083EA00 240600FC */ addiu $a2, $zero, 0x00FC ## $a2 = 000000FC -/* 0C7F4 8083EA04 10000016 */ beq $zero, $zero, .L8083EA60 -/* 0C7F8 8083EA08 00000000 */ nop -.L8083EA0C: -/* 0C7FC 8083EA0C 0C023C0D */ jal func_8008F034 -/* 0C800 8083EA10 00000000 */ nop -/* 0C804 8083EA14 8FAF0034 */ lw $t7, 0x0034($sp) -/* 0C808 8083EA18 2401014E */ addiu $at, $zero, 0x014E ## $at = 0000014E -/* 0C80C 8083EA1C 8FA4003C */ lw $a0, 0x003C($sp) -/* 0C810 8083EA20 85F80000 */ lh $t8, 0x0000($t7) ## 00000000 -/* 0C814 8083EA24 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C818 8083EA28 3C068084 */ lui $a2, %hi(func_8083A0F4) ## $a2 = 80840000 -/* 0C81C 8083EA2C 1701000A */ bne $t8, $at, .L8083EA58 -/* 0C820 8083EA30 00000000 */ nop -/* 0C824 8083EA34 85F9001C */ lh $t9, 0x001C($t7) ## 0000001C -/* 0C828 8083EA38 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0C82C 8083EA3C 3328000F */ andi $t0, $t9, 0x000F ## $t0 = 00000000 -/* 0C830 8083EA40 15010005 */ bne $t0, $at, .L8083EA58 -/* 0C834 8083EA44 28410002 */ slti $at, $v0, 0x0002 -/* 0C838 8083EA48 10200003 */ beq $at, $zero, .L8083EA58 -/* 0C83C 8083EA4C 00000000 */ nop -/* 0C840 8083EA50 1000000B */ beq $zero, $zero, .L8083EA80 -/* 0C844 8083EA54 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083EA58: -/* 0C848 8083EA58 0C20DA26 */ jal func_80836898 -/* 0C84C 8083EA5C 24C6A0F4 */ addiu $a2, $a2, %lo(func_8083A0F4) ## $a2 = 8083A0F4 -.L8083EA60: -/* 0C850 8083EA60 0C20C889 */ jal func_80832224 -/* 0C854 8083EA64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C858 8083EA68 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 0C85C 8083EA6C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0C860 8083EA70 352A0800 */ ori $t2, $t1, 0x0800 ## $t2 = 00000800 -/* 0C864 8083EA74 10000002 */ beq $zero, $zero, .L8083EA80 -/* 0C868 8083EA78 AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C -.L8083EA7C: -/* 0C86C 8083EA7C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083EA80: -/* 0C870 8083EA80 8FBF001C */ lw $ra, 0x001C($sp) -/* 0C874 8083EA84 8FB00018 */ lw $s0, 0x0018($sp) -/* 0C878 8083EA88 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0C87C 8083EA8C 03E00008 */ jr $ra -/* 0C880 8083EA90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EA94.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EA94.s deleted file mode 100644 index 7c6fb47b2f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EA94.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8083EA94 -/* 0C884 8083EA94 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0C888 8083EA98 AFA5001C */ sw $a1, 0x001C($sp) -/* 0C88C 8083EA9C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0C890 8083EAA0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0C894 8083EAA4 AFA40018 */ sw $a0, 0x0018($sp) -/* 0C898 8083EAA8 3C068084 */ lui $a2, %hi(func_80846578) ## $a2 = 80840000 -/* 0C89C 8083EAAC 24C66578 */ addiu $a2, $a2, %lo(func_80846578) ## $a2 = 80846578 -/* 0C8A0 8083EAB0 AFA50018 */ sw $a1, 0x0018($sp) -/* 0C8A4 8083EAB4 8FA4001C */ lw $a0, 0x001C($sp) -/* 0C8A8 8083EAB8 0C20D716 */ jal func_80835C58 -/* 0C8AC 8083EABC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0C8B0 8083EAC0 8FA50018 */ lw $a1, 0x0018($sp) -/* 0C8B4 8083EAC4 3C068085 */ lui $a2, %hi(D_80853BCC) ## $a2 = 80850000 -/* 0C8B8 8083EAC8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0C8BC 8083EACC 90AE015B */ lbu $t6, 0x015B($a1) ## 0000015B -/* 0C8C0 8083EAD0 000E7880 */ sll $t7, $t6, 2 -/* 0C8C4 8083EAD4 00CF3021 */ addu $a2, $a2, $t7 -/* 0C8C8 8083EAD8 0C20C899 */ jal func_80832264 -/* 0C8CC 8083EADC 8CC63BCC */ lw $a2, %lo(D_80853BCC)($a2) -/* 0C8D0 8083EAE0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0C8D4 8083EAE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0C8D8 8083EAE8 03E00008 */ jr $ra -/* 0C8DC 8083EAEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EAF0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EAF0.s deleted file mode 100644 index c6ea34a9de..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EAF0.s +++ /dev/null @@ -1,29 +0,0 @@ -.late_rodata -glabel D_808553CC - .float 1.1 - -.text -glabel func_8083EAF0 -/* 0C8E0 8083EAF0 10A00012 */ beq $a1, $zero, .L8083EB3C -/* 0C8E4 8083EAF4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0C8E8 8083EAF8 8CAE0004 */ lw $t6, 0x0004($a1) ## 00000004 -/* 0C8EC 8083EAFC 3C018085 */ lui $at, %hi(D_808553CC) ## $at = 80850000 -/* 0C8F0 8083EB00 000E7A00 */ sll $t7, $t6, 8 -/* 0C8F4 8083EB04 05E0000D */ bltz $t7, .L8083EB3C -/* 0C8F8 8083EB08 00000000 */ nop -/* 0C8FC 8083EB0C C4840838 */ lwc1 $f4, 0x0838($a0) ## 00000838 -/* 0C900 8083EB10 C42653CC */ lwc1 $f6, %lo(D_808553CC)($at) -/* 0C904 8083EB14 4606203C */ c.lt.s $f4, $f6 -/* 0C908 8083EB18 00000000 */ nop -/* 0C90C 8083EB1C 45010005 */ bc1t .L8083EB34 -/* 0C910 8083EB20 00000000 */ nop -/* 0C914 8083EB24 84B80000 */ lh $t8, 0x0000($a1) ## 00000000 -/* 0C918 8083EB28 240100DA */ addiu $at, $zero, 0x00DA ## $at = 000000DA -/* 0C91C 8083EB2C 17010003 */ bne $t8, $at, .L8083EB3C -/* 0C920 8083EB30 00000000 */ nop -.L8083EB34: -/* 0C924 8083EB34 03E00008 */ jr $ra -/* 0C928 8083EB38 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083EB3C: -/* 0C92C 8083EB3C 03E00008 */ jr $ra -/* 0C930 8083EB40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EB44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EB44.s deleted file mode 100644 index 026b43ce63..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EB44.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_8083EB44 -/* 0C934 8083EB44 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0C938 8083EB48 AFBF001C */ sw $ra, 0x001C($sp) -/* 0C93C 8083EB4C AFB00018 */ sw $s0, 0x0018($sp) -/* 0C940 8083EB50 AFA50024 */ sw $a1, 0x0024($sp) -/* 0C944 8083EB54 8C8E067C */ lw $t6, 0x067C($a0) ## 0000067C -/* 0C948 8083EB58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0C94C 8083EB5C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0C950 8083EB60 31CF0800 */ andi $t7, $t6, 0x0800 ## $t7 = 00000000 -/* 0C954 8083EB64 11E00027 */ beq $t7, $zero, .L8083EC04 -/* 0C958 8083EB68 00000000 */ nop -/* 0C95C 8083EB6C 8C8603AC */ lw $a2, 0x03AC($a0) ## 000003AC -/* 0C960 8083EB70 3C188086 */ lui $t8, %hi(D_80858AB4) ## $t8 = 80860000 -/* 0C964 8083EB74 10C00023 */ beq $a2, $zero, .L8083EC04 -/* 0C968 8083EB78 00000000 */ nop -/* 0C96C 8083EB7C 8F188AB4 */ lw $t8, %lo(D_80858AB4)($t8) -/* 0C970 8083EB80 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0C974 8083EB84 9719000C */ lhu $t9, 0x000C($t8) ## 8086000C -/* 0C978 8083EB88 3328C007 */ andi $t0, $t9, 0xC007 ## $t0 = 00000000 -/* 0C97C 8083EB8C 1100001D */ beq $t0, $zero, .L8083EC04 -/* 0C980 8083EB90 00000000 */ nop -/* 0C984 8083EB94 0C20D591 */ jal func_80835644 -/* 0C988 8083EB98 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C98C 8083EB9C 14400017 */ bne $v0, $zero, .L8083EBFC -/* 0C990 8083EBA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C994 8083EBA4 0C20FABC */ jal func_8083EAF0 -/* 0C998 8083EBA8 8E0503AC */ lw $a1, 0x03AC($s0) ## 000003AC -/* 0C99C 8083EBAC 14400011 */ bne $v0, $zero, .L8083EBF4 -/* 0C9A0 8083EBB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C9A4 8083EBB4 3C068084 */ lui $a2, %hi(func_808464B0) ## $a2 = 80840000 -/* 0C9A8 8083EBB8 24C664B0 */ addiu $a2, $a2, %lo(func_808464B0) ## $a2 = 808464B0 -/* 0C9AC 8083EBBC 8FA40024 */ lw $a0, 0x0024($sp) -/* 0C9B0 8083EBC0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C9B4 8083EBC4 0C20D716 */ jal func_80835C58 -/* 0C9B8 8083EBC8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0C9BC 8083EBCC 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B -/* 0C9C0 8083EBD0 3C068085 */ lui $a2, %hi(D_80853BE4) ## $a2 = 80850000 -/* 0C9C4 8083EBD4 8FA40024 */ lw $a0, 0x0024($sp) -/* 0C9C8 8083EBD8 00095080 */ sll $t2, $t1, 2 -/* 0C9CC 8083EBDC 00CA3021 */ addu $a2, $a2, $t2 -/* 0C9D0 8083EBE0 8CC63BE4 */ lw $a2, %lo(D_80853BE4)($a2) -/* 0C9D4 8083EBE4 0C20C899 */ jal func_80832264 -/* 0C9D8 8083EBE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C9DC 8083EBEC 10000005 */ beq $zero, $zero, .L8083EC04 -/* 0C9E0 8083EBF0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083EBF4: -/* 0C9E4 8083EBF4 0C20FAA5 */ jal func_8083EA94 -/* 0C9E8 8083EBF8 8FA50024 */ lw $a1, 0x0024($sp) -.L8083EBFC: -/* 0C9EC 8083EBFC 10000001 */ beq $zero, $zero, .L8083EC04 -/* 0C9F0 8083EC00 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083EC04: -/* 0C9F4 8083EC04 8FBF001C */ lw $ra, 0x001C($sp) -/* 0C9F8 8083EC08 8FB00018 */ lw $s0, 0x0018($sp) -/* 0C9FC 8083EC0C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0CA00 8083EC10 03E00008 */ jr $ra -/* 0CA04 8083EC14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EC18.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EC18.s index 9b93a5d07e..10788ff473 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EC18.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EC18.s @@ -1,14 +1,18 @@ .late_rodata glabel D_808553D0 - .word 0x38000100 + .float 3.051851E-05 + glabel D_808553D4 - .word 0x38000100 + .float 3.051851E-05 + glabel D_808553D8 - .word 0x402E0000, 0x07800000 + .double 1.500000022351741790771484375E+01 + glabel D_808553E0 - .word 0x402E0000, 0x07800000 + .double 1.500000022351741790771484375E+01 + glabel D_808553E8 - .word 0x38000100 + .float 3.051851E-05 .text glabel func_8083EC18 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s deleted file mode 100644 index 486939d1f5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8083F070 -/* 0CE60 8083F070 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0CE64 8083F074 AFA40018 */ sw $a0, 0x0018($sp) -/* 0CE68 8083F078 AFA60020 */ sw $a2, 0x0020($sp) -/* 0CE6C 8083F07C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0CE70 8083F080 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0CE74 8083F084 AFA5001C */ sw $a1, 0x001C($sp) -/* 0CE78 8083F088 3C068085 */ lui $a2, %hi(func_8084C5F8) ## $a2 = 80850000 -/* 0CE7C 8083F08C 24C6C5F8 */ addiu $a2, $a2, %lo(func_8084C5F8) ## $a2 = 8084C5F8 -/* 0CE80 8083F090 8FA50018 */ lw $a1, 0x0018($sp) -/* 0CE84 8083F094 0C20D76B */ jal func_80835DAC -/* 0CE88 8083F098 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0CE8C 8083F09C 8FA50018 */ lw $a1, 0x0018($sp) -/* 0CE90 8083F0A0 3C073FAA */ lui $a3, 0x3FAA ## $a3 = 3FAA0000 -/* 0CE94 8083F0A4 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3FAAAAAB -/* 0CE98 8083F0A8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0CE9C 8083F0AC 8FA6001C */ lw $a2, 0x001C($sp) -/* 0CEA0 8083F0B0 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop -/* 0CEA4 8083F0B4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 0CEA8 8083F0B8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0CEAC 8083F0BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0CEB0 8083F0C0 03E00008 */ jr $ra -/* 0CEB4 8083F0C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F0C8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F0C8.s index a203d39f02..ee614ba947 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F0C8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F0C8.s @@ -1,6 +1,6 @@ .late_rodata glabel D_808553EC - .word 0x38000100 + .float 3.051851E-05 .text glabel func_8083F0C8 @@ -99,10 +99,10 @@ glabel func_8083F0C8 /* 0D010 8083F220 00000000 */ nop /* 0D014 8083F224 8E0A0680 */ lw $t2, 0x0680($s0) ## 00000680 /* 0D018 8083F228 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0D01C 8083F22C 3C0C8086 */ lui $t4, %hi(D_80858AB4) ## $t4 = 80860000 +/* 0D01C 8083F22C 3C0C8086 */ lui $t4, %hi(sControlInput) ## $t4 = 80860000 /* 0D020 8083F230 01415825 */ or $t3, $t2, $at ## $t3 = 00010000 /* 0D024 8083F234 AE0B0680 */ sw $t3, 0x0680($s0) ## 00000680 -/* 0D028 8083F238 8D8C8AB4 */ lw $t4, %lo(D_80858AB4)($t4) +/* 0D028 8083F238 8D8C8AB4 */ lw $t4, %lo(sControlInput)($t4) /* 0D02C 8083F23C 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 0D030 8083F240 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF /* 0D034 8083F244 958D000C */ lhu $t5, 0x000C($t4) ## 8086000C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F360.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F360.s deleted file mode 100644 index 3699d3d114..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F360.s +++ /dev/null @@ -1,127 +0,0 @@ -.late_rodata -glabel D_808553F0 - .word 0x38000100 - -.text -glabel func_8083F360 -/* 0D150 8083F360 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 0D154 8083F364 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0D158 8083F368 AFB00030 */ sw $s0, 0x0030($sp) -/* 0D15C 8083F36C AFA40080 */ sw $a0, 0x0080($sp) -/* 0D160 8083F370 AFA60088 */ sw $a2, 0x0088($sp) -/* 0D164 8083F374 AFA7008C */ sw $a3, 0x008C($sp) -/* 0D168 8083F378 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0D16C 8083F37C 0C01DE0D */ jal Math_Coss - ## coss? -/* 0D170 8083F380 84A400B6 */ lh $a0, 0x00B6($a1) ## 000000B6 -/* 0D174 8083F384 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0D178 8083F388 0C01DE1C */ jal Math_Sins - ## sins? -/* 0D17C 8083F38C E7A00050 */ swc1 $f0, 0x0050($sp) -/* 0D180 8083F390 C7AC0094 */ lwc1 $f12, 0x0094($sp) -/* 0D184 8083F394 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 0D188 8083F398 C7A20050 */ lwc1 $f2, 0x0050($sp) -/* 0D18C 8083F39C 46006182 */ mul.s $f6, $f12, $f0 -/* 0D190 8083F3A0 C7AE0090 */ lwc1 $f14, 0x0090($sp) -/* 0D194 8083F3A4 8FA40080 */ lw $a0, 0x0080($sp) -/* 0D198 8083F3A8 46026482 */ mul.s $f18, $f12, $f2 -/* 0D19C 8083F3AC 260E0074 */ addiu $t6, $s0, 0x0074 ## $t6 = 00000074 -/* 0D1A0 8083F3B0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0D1A4 8083F3B4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 0D1A8 8083F3B8 27B90078 */ addiu $t9, $sp, 0x0078 ## $t9 = FFFFFFF8 -/* 0D1AC 8083F3BC 46062200 */ add.s $f8, $f4, $f6 -/* 0D1B0 8083F3C0 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 0D1B4 8083F3C4 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFEC -/* 0D1B8 8083F3C8 27A60060 */ addiu $a2, $sp, 0x0060 ## $a2 = FFFFFFE0 -/* 0D1BC 8083F3CC E7A8006C */ swc1 $f8, 0x006C($sp) -/* 0D1C0 8083F3D0 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 0D1C4 8083F3D4 46007202 */ mul.s $f8, $f14, $f0 -/* 0D1C8 8083F3D8 27A70054 */ addiu $a3, $sp, 0x0054 ## $a3 = FFFFFFD4 -/* 0D1CC 8083F3DC 46125100 */ add.s $f4, $f10, $f18 -/* 0D1D0 8083F3E0 E7A40074 */ swc1 $f4, 0x0074($sp) -/* 0D1D4 8083F3E4 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 0D1D8 8083F3E8 46027102 */ mul.s $f4, $f14, $f2 -/* 0D1DC 8083F3EC 46083280 */ add.s $f10, $f6, $f8 -/* 0D1E0 8083F3F0 E7AA0060 */ swc1 $f10, 0x0060($sp) -/* 0D1E4 8083F3F4 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 0D1E8 8083F3F8 C7AA0088 */ lwc1 $f10, 0x0088($sp) -/* 0D1EC 8083F3FC 46049180 */ add.s $f6, $f18, $f4 -/* 0D1F0 8083F400 E7A60068 */ swc1 $f6, 0x0068($sp) -/* 0D1F4 8083F404 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 0D1F8 8083F408 AFA4003C */ sw $a0, 0x003C($sp) -/* 0D1FC 8083F40C AFB90024 */ sw $t9, 0x0024($sp) -/* 0D200 8083F410 460A4480 */ add.s $f18, $f8, $f10 -/* 0D204 8083F414 AFB80020 */ sw $t8, 0x0020($sp) -/* 0D208 8083F418 AFA0001C */ sw $zero, 0x001C($sp) -/* 0D20C 8083F41C AFA00018 */ sw $zero, 0x0018($sp) -/* 0D210 8083F420 E7B20070 */ swc1 $f18, 0x0070($sp) -/* 0D214 8083F424 C7A40070 */ lwc1 $f4, 0x0070($sp) -/* 0D218 8083F428 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0D21C 8083F42C AFAE0010 */ sw $t6, 0x0010($sp) -/* 0D220 8083F430 0C00F7A1 */ jal func_8003DE84 -/* 0D224 8083F434 E7A40064 */ swc1 $f4, 0x0064($sp) -/* 0D228 8083F438 10400031 */ beq $v0, $zero, .L8083F500 -/* 0D22C 8083F43C 8FA4003C */ lw $a0, 0x003C($sp) -/* 0D230 8083F440 96080088 */ lhu $t0, 0x0088($s0) ## 00000088 -/* 0D234 8083F444 8E050074 */ lw $a1, 0x0074($s0) ## 00000074 -/* 0D238 8083F448 35090200 */ ori $t1, $t0, 0x0200 ## $t1 = 00000200 -/* 0D23C 8083F44C A6090088 */ sh $t1, 0x0088($s0) ## 00000088 -/* 0D240 8083F450 8FAA0078 */ lw $t2, 0x0078($sp) -/* 0D244 8083F454 A20A007C */ sb $t2, 0x007C($s0) ## 0000007C -/* 0D248 8083F458 8FA60078 */ lw $a2, 0x0078($sp) -/* 0D24C 8083F45C 0C01076E */ jal func_80041DB8 -/* 0D250 8083F460 AFA5007C */ sw $a1, 0x007C($sp) -/* 0D254 8083F464 3C018085 */ lui $at, %hi(D_808553F0) ## $at = 80850000 -/* 0D258 8083F468 C43053F0 */ lwc1 $f16, %lo(D_808553F0)($at) -/* 0D25C 8083F46C 8FA5007C */ lw $a1, 0x007C($sp) -/* 0D260 8083F470 3C018085 */ lui $at, %hi(D_808535F0) ## $at = 80850000 -/* 0D264 8083F474 AC2235F0 */ sw $v0, %lo(D_808535F0)($at) -/* 0D268 8083F478 84AB0008 */ lh $t3, 0x0008($a1) ## 00000008 -/* 0D26C 8083F47C 84AC000C */ lh $t4, 0x000C($a1) ## 0000000C -/* 0D270 8083F480 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 0D274 8083F484 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 0D278 8083F488 46803220 */ cvt.s.w $f8, $f6 -/* 0D27C 8083F48C 468054A0 */ cvt.s.w $f18, $f10 -/* 0D280 8083F490 46104002 */ mul.s $f0, $f8, $f16 -/* 0D284 8083F494 00000000 */ nop -/* 0D288 8083F498 46109082 */ mul.s $f2, $f18, $f16 -/* 0D28C 8083F49C 46000387 */ neg.s $f14, $f0 -/* 0D290 8083F4A0 0C034199 */ jal atan2s - -/* 0D294 8083F4A4 46001307 */ neg.s $f12, $f2 -/* 0D298 8083F4A8 00022C00 */ sll $a1, $v0, 16 -/* 0D29C 8083F4AC 00052C03 */ sra $a1, $a1, 16 -/* 0D2A0 8083F4B0 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 0D2A4 8083F4B4 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 0D2A8 8083F4B8 24060320 */ addiu $a2, $zero, 0x0320 ## $a2 = 00000320 -/* 0D2AC 8083F4BC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0D2B0 8083F4C0 0C01DE1C */ jal Math_Sins - ## sins? -/* 0D2B4 8083F4C4 A604083C */ sh $a0, 0x083C($s0) ## 0000083C -/* 0D2B8 8083F4C8 C7A6008C */ lwc1 $f6, 0x008C($sp) -/* 0D2BC 8083F4CC C7A40054 */ lwc1 $f4, 0x0054($sp) -/* 0D2C0 8083F4D0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0D2C4 8083F4D4 46060202 */ mul.s $f8, $f0, $f6 -/* 0D2C8 8083F4D8 46082281 */ sub.s $f10, $f4, $f8 -/* 0D2CC 8083F4DC 0C01DE0D */ jal Math_Coss - ## coss? -/* 0D2D0 8083F4E0 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 0D2D4 8083F4E4 C7A6008C */ lwc1 $f6, 0x008C($sp) -/* 0D2D8 8083F4E8 C7B2005C */ lwc1 $f18, 0x005C($sp) -/* 0D2DC 8083F4EC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0D2E0 8083F4F0 46060102 */ mul.s $f4, $f0, $f6 -/* 0D2E4 8083F4F4 46049201 */ sub.s $f8, $f18, $f4 -/* 0D2E8 8083F4F8 10000005 */ beq $zero, $zero, .L8083F510 -/* 0D2EC 8083F4FC E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -.L8083F500: -/* 0D2F0 8083F500 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 -/* 0D2F4 8083F504 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0D2F8 8083F508 31AEFDFF */ andi $t6, $t5, 0xFDFF ## $t6 = 00000000 -/* 0D2FC 8083F50C A60E0088 */ sh $t6, 0x0088($s0) ## 00000088 -.L8083F510: -/* 0D300 8083F510 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0D304 8083F514 8FB00030 */ lw $s0, 0x0030($sp) -/* 0D308 8083F518 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 0D30C 8083F51C 03E00008 */ jr $ra -/* 0D310 8083F520 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F524.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F524.s deleted file mode 100644 index bfdff606b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F524.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_8083F524 -/* 0D314 8083F524 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0D318 8083F528 AFBF001C */ sw $ra, 0x001C($sp) -/* 0D31C 8083F52C 8CAE0678 */ lw $t6, 0x0678($a1) ## 00000678 -/* 0D320 8083F530 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0D324 8083F534 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 0D328 8083F538 C5C40038 */ lwc1 $f4, 0x0038($t6) ## 00000038 -/* 0D32C 8083F53C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 0D330 8083F540 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 -/* 0D334 8083F544 46062200 */ add.s $f8, $f4, $f6 -/* 0D338 8083F548 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0D33C 8083F54C 3C0641D0 */ lui $a2, 0x41D0 ## $a2 = 41D00000 -/* 0D340 8083F550 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 0D344 8083F554 44074000 */ mfc1 $a3, $f8 -/* 0D348 8083F558 0C20FCD8 */ jal func_8083F360 -/* 0D34C 8083F55C E7B00014 */ swc1 $f16, 0x0014($sp) -/* 0D350 8083F560 8FBF001C */ lw $ra, 0x001C($sp) -/* 0D354 8083F564 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0D358 8083F568 03E00008 */ jr $ra -/* 0D35C 8083F56C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s deleted file mode 100644 index a2bed119c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel func_8083F570 -/* 0D360 8083F570 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0D364 8083F574 AFBF002C */ sw $ra, 0x002C($sp) -/* 0D368 8083F578 AFB10028 */ sw $s1, 0x0028($sp) -/* 0D36C 8083F57C AFB00024 */ sw $s0, 0x0024($sp) -/* 0D370 8083F580 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0D374 8083F584 C4800838 */ lwc1 $f0, 0x0838($a0) ## 00000838 -/* 0D378 8083F588 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0D37C 8083F58C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0D380 8083F590 46001032 */ c.eq.s $f2, $f0 -/* 0D384 8083F594 00000000 */ nop -/* 0D388 8083F598 4503005F */ bc1tl .L8083F718 -/* 0D38C 8083F59C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0D390 8083F5A0 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 0D394 8083F5A4 3C188085 */ lui $t8, %hi(D_808535F0) ## $t8 = 80850000 -/* 0D398 8083F5A8 31CF0008 */ andi $t7, $t6, 0x0008 ## $t7 = 00000000 -/* 0D39C 8083F5AC 51E0005A */ beql $t7, $zero, .L8083F718 -/* 0D3A0 8083F5B0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0D3A4 8083F5B4 8F1835F0 */ lw $t8, %lo(D_808535F0)($t8) -/* 0D3A8 8083F5B8 33190030 */ andi $t9, $t8, 0x0030 ## $t9 = 00000000 -/* 0D3AC 8083F5BC 53200056 */ beql $t9, $zero, .L8083F718 -/* 0D3B0 8083F5C0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0D3B4 8083F5C4 848800B6 */ lh $t0, 0x00B6($a0) ## 000000B6 -/* 0D3B8 8083F5C8 8489007E */ lh $t1, 0x007E($a0) ## 0000007E -/* 0D3BC 8083F5CC 4602003C */ c.lt.s $f0, $f2 -/* 0D3C0 8083F5D0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 0D3C4 8083F5D4 01091023 */ subu $v0, $t0, $t1 -/* 0D3C8 8083F5D8 00021400 */ sll $v0, $v0, 16 -/* 0D3CC 8083F5DC 45000004 */ bc1f .L8083F5F0 -/* 0D3D0 8083F5E0 00021403 */ sra $v0, $v0, 16 -/* 0D3D4 8083F5E4 00411021 */ addu $v0, $v0, $at -/* 0D3D8 8083F5E8 00021400 */ sll $v0, $v0, 16 -/* 0D3DC 8083F5EC 00021403 */ sra $v0, $v0, 16 -.L8083F5F0: -/* 0D3E0 8083F5F0 04400003 */ bltz $v0, .L8083F600 -/* 0D3E4 8083F5F4 00021823 */ subu $v1, $zero, $v0 -/* 0D3E8 8083F5F8 10000001 */ beq $zero, $zero, .L8083F600 -/* 0D3EC 8083F5FC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L8083F600: -/* 0D3F0 8083F600 28614001 */ slti $at, $v1, 0x4001 -/* 0D3F4 8083F604 14200043 */ bne $at, $zero, .L8083F714 -/* 0D3F8 8083F608 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0D3FC 8083F60C 3C068085 */ lui $a2, %hi(func_8084C81C) ## $a2 = 80850000 -/* 0D400 8083F610 24C6C81C */ addiu $a2, $a2, %lo(func_8084C81C) ## $a2 = 8084C81C -/* 0D404 8083F614 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D408 8083F618 0C20D716 */ jal func_80835C58 -/* 0D40C 8083F61C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0D410 8083F620 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0D414 8083F624 C6040838 */ lwc1 $f4, 0x0838($s0) ## 00000838 -/* 0D418 8083F628 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 0D41C 8083F62C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D420 8083F630 4604103C */ c.lt.s $f2, $f4 -/* 0D424 8083F634 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0D428 8083F638 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 -/* 0D42C 8083F63C 45020014 */ bc1fl .L8083F690 -/* 0D430 8083F640 860C007E */ lh $t4, 0x007E($s0) ## 0000007E -/* 0D434 8083F644 860A007E */ lh $t2, 0x007E($s0) ## 0000007E -/* 0D438 8083F648 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0D43C 8083F64C 24C62700 */ addiu $a2, $a2, 0x2700 ## $a2 = 04002700 -/* 0D440 8083F650 01415821 */ addu $t3, $t2, $at -/* 0D444 8083F654 0C20C899 */ jal func_80832264 -/* 0D448 8083F658 A60B00B6 */ sh $t3, 0x00B6($s0) ## 000000B6 -/* 0D44C 8083F65C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0D450 8083F660 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D454 8083F664 0C20CBD5 */ jal func_80832F54 -/* 0D458 8083F668 2406009D */ addiu $a2, $zero, 0x009D ## $a2 = 0000009D -/* 0D45C 8083F66C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0D460 8083F670 24052581 */ addiu $a1, $zero, 0x2581 ## $a1 = 00002581 -/* 0D464 8083F674 240603E7 */ addiu $a2, $zero, 0x03E7 ## $a2 = 000003E7 -/* 0D468 8083F678 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0D46C 8083F67C 0C02003E */ jal func_800800F8 -/* 0D470 8083F680 AFA00010 */ sw $zero, 0x0010($sp) -/* 0D474 8083F684 1000001E */ beq $zero, $zero, .L8083F700 -/* 0D478 8083F688 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 0D47C 8083F68C 860C007E */ lh $t4, 0x007E($s0) ## 0000007E -.L8083F690: -/* 0D480 8083F690 24842708 */ addiu $a0, $a0, 0x2708 ## $a0 = 00002708 -/* 0D484 8083F694 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0D488 8083F698 A60C00B6 */ sh $t4, 0x00B6($s0) ## 000000B6 -/* 0D48C 8083F69C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 0D490 8083F6A0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0D494 8083F6A4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0D498 8083F6A8 46803220 */ cvt.s.w $f8, $f6 -/* 0D49C 8083F6AC 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 0D4A0 8083F6B0 AFAD0018 */ sw $t5, 0x0018($sp) -/* 0D4A4 8083F6B4 24C62708 */ addiu $a2, $a2, 0x2708 ## $a2 = 04002708 -/* 0D4A8 8083F6B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0D4AC 8083F6BC 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0D4B0 8083F6C0 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 0D4B4 8083F6C4 3C07BF80 */ lui $a3, 0xBF80 ## $a3 = BF800000 -/* 0D4B8 8083F6C8 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 0D4BC 8083F6CC 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 0D4C0 8083F6D0 E7A2001C */ swc1 $f2, 0x001C($sp) -/* 0D4C4 8083F6D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0D4C8 8083F6D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D4CC 8083F6DC 0C20CBD5 */ jal func_80832F54 -/* 0D4D0 8083F6E0 2406009D */ addiu $a2, $zero, 0x009D ## $a2 = 0000009D -/* 0D4D4 8083F6E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0D4D8 8083F6E8 24052582 */ addiu $a1, $zero, 0x2582 ## $a1 = 00002582 -/* 0D4DC 8083F6EC 240603E7 */ addiu $a2, $zero, 0x03E7 ## $a2 = 000003E7 -/* 0D4E0 8083F6F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0D4E4 8083F6F4 0C02003E */ jal func_800800F8 -/* 0D4E8 8083F6F8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0D4EC 8083F6FC 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -.L8083F700: -/* 0D4F0 8083F700 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0D4F4 8083F704 0C20C884 */ jal func_80832210 -/* 0D4F8 8083F708 A60E083C */ sh $t6, 0x083C($s0) ## 0000083C -/* 0D4FC 8083F70C 10000002 */ beq $zero, $zero, .L8083F718 -/* 0D500 8083F710 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083F714: -/* 0D504 8083F714 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083F718: -/* 0D508 8083F718 8FBF002C */ lw $ra, 0x002C($sp) -/* 0D50C 8083F71C 8FB00024 */ lw $s0, 0x0024($sp) -/* 0D510 8083F720 8FB10028 */ lw $s1, 0x0028($sp) -/* 0D514 8083F724 03E00008 */ jr $ra -/* 0D518 8083F728 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F72C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F72C.s deleted file mode 100644 index 4b49722662..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F72C.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8083F72C -/* 0D51C 8083F72C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0D520 8083F730 AFB00018 */ sw $s0, 0x0018($sp) -/* 0D524 8083F734 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0D528 8083F738 AFA60028 */ sw $a2, 0x0028($sp) -/* 0D52C 8083F73C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0D530 8083F740 AFBF001C */ sw $ra, 0x001C($sp) -/* 0D534 8083F744 AFA50024 */ sw $a1, 0x0024($sp) -/* 0D538 8083F748 3C068084 */ lui $a2, %hi(func_8083A388) ## $a2 = 80840000 -/* 0D53C 8083F74C 24C6A388 */ addiu $a2, $a2, %lo(func_8083A388) ## $a2 = 8083A388 -/* 0D540 8083F750 0C20DA26 */ jal func_80836898 -/* 0D544 8083F754 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D548 8083F758 14400006 */ bne $v0, $zero, .L8083F774 -/* 0D54C 8083F75C 8FA40028 */ lw $a0, 0x0028($sp) -/* 0D550 8083F760 3C068085 */ lui $a2, %hi(func_8084B78C) ## $a2 = 80850000 -/* 0D554 8083F764 24C6B78C */ addiu $a2, $a2, %lo(func_8084B78C) ## $a2 = 8084B78C -/* 0D558 8083F768 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D55C 8083F76C 0C20D716 */ jal func_80835C58 -/* 0D560 8083F770 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -.L8083F774: -/* 0D564 8083F774 8FA40028 */ lw $a0, 0x0028($sp) -/* 0D568 8083F778 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D56C 8083F77C 0C20C899 */ jal func_80832264 -/* 0D570 8083F780 8FA60024 */ lw $a2, 0x0024($sp) -/* 0D574 8083F784 0C20C889 */ jal func_80832224 -/* 0D578 8083F788 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0D57C 8083F78C 8603007E */ lh $v1, 0x007E($s0) ## 0000007E -/* 0D580 8083F790 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 0D584 8083F794 00611821 */ addu $v1, $v1, $at -/* 0D588 8083F798 00031C00 */ sll $v1, $v1, 16 -/* 0D58C 8083F79C 00031C03 */ sra $v1, $v1, 16 -/* 0D590 8083F7A0 A603083C */ sh $v1, 0x083C($s0) ## 0000083C -/* 0D594 8083F7A4 A60300B6 */ sh $v1, 0x00B6($s0) ## 000000B6 -/* 0D598 8083F7A8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0D59C 8083F7AC 8FB00018 */ lw $s0, 0x0018($sp) -/* 0D5A0 8083F7B0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0D5A4 8083F7B4 03E00008 */ jr $ra -/* 0D5A8 8083F7B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F7BC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F7BC.s deleted file mode 100644 index 3aed71185c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F7BC.s +++ /dev/null @@ -1,144 +0,0 @@ -glabel func_8083F7BC -/* 0D5AC 8083F7BC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0D5B0 8083F7C0 AFBF001C */ sw $ra, 0x001C($sp) -/* 0D5B4 8083F7C4 AFB00018 */ sw $s0, 0x0018($sp) -/* 0D5B8 8083F7C8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0D5BC 8083F7CC 8C8E067C */ lw $t6, 0x067C($a0) ## 0000067C -/* 0D5C0 8083F7D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0D5C4 8083F7D4 31CF0800 */ andi $t7, $t6, 0x0800 ## $t7 = 00000000 -/* 0D5C8 8083F7D8 55E00078 */ bnel $t7, $zero, .L8083F9BC -/* 0D5CC 8083F7DC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0D5D0 8083F7E0 94980088 */ lhu $t8, 0x0088($a0) ## 00000088 -/* 0D5D4 8083F7E4 3C088085 */ lui $t0, %hi(D_80853608) ## $t0 = 80850000 -/* 0D5D8 8083F7E8 33190200 */ andi $t9, $t8, 0x0200 ## $t9 = 00000000 -/* 0D5DC 8083F7EC 53200073 */ beql $t9, $zero, .L8083F9BC -/* 0D5E0 8083F7F0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0D5E4 8083F7F4 8D083608 */ lw $t0, %lo(D_80853608)($t0) -/* 0D5E8 8083F7F8 29013000 */ slti $at, $t0, 0x3000 -/* 0D5EC 8083F7FC 5020006F */ beql $at, $zero, .L8083F9BC -/* 0D5F0 8083F800 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0D5F4 8083F804 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0D5F8 8083F808 C4860838 */ lwc1 $f6, 0x0838($a0) ## 00000838 -/* 0D5FC 8083F80C 3C068085 */ lui $a2, %hi(D_808535F0) ## $a2 = 80850000 -/* 0D600 8083F810 4606203C */ c.lt.s $f4, $f6 -/* 0D604 8083F814 00000000 */ nop -/* 0D608 8083F818 45000004 */ bc1f .L8083F82C -/* 0D60C 8083F81C 00000000 */ nop -/* 0D610 8083F820 0C20FB06 */ jal func_8083EC18 -/* 0D614 8083F824 8CC635F0 */ lw $a2, %lo(D_808535F0)($a2) -/* 0D618 8083F828 14400007 */ bne $v0, $zero, .L8083F848 -.L8083F82C: -/* 0D61C 8083F82C 3C068085 */ lui $a2, %hi(D_808535F0) ## $a2 = 80850000 -/* 0D620 8083F830 8CC635F0 */ lw $a2, %lo(D_808535F0)($a2) -/* 0D624 8083F834 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0D628 8083F838 0C20FC32 */ jal func_8083F0C8 -/* 0D62C 8083F83C 8FA5002C */ lw $a1, 0x002C($sp) -/* 0D630 8083F840 10400003 */ beq $v0, $zero, .L8083F850 -/* 0D634 8083F844 00000000 */ nop -.L8083F848: -/* 0D638 8083F848 1000005C */ beq $zero, $zero, .L8083F9BC -/* 0D63C 8083F84C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083F850: -/* 0D640 8083F850 0C20CCAE */ jal func_808332B8 -/* 0D644 8083F854 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0D648 8083F858 54400058 */ bnel $v0, $zero, .L8083F9BC -/* 0D64C 8083F85C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0D650 8083F860 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0D654 8083F864 C60A0838 */ lwc1 $f10, 0x0838($s0) ## 00000838 -/* 0D658 8083F868 3C0B8085 */ lui $t3, %hi(D_808535F0) ## $t3 = 80850000 -/* 0D65C 8083F86C 460A4032 */ c.eq.s $f8, $f10 -/* 0D660 8083F870 00000000 */ nop -/* 0D664 8083F874 45010005 */ bc1t .L8083F88C -/* 0D668 8083F878 00000000 */ nop -/* 0D66C 8083F87C 8E090680 */ lw $t1, 0x0680($s0) ## 00000680 -/* 0D670 8083F880 312A0004 */ andi $t2, $t1, 0x0004 ## $t2 = 00000000 -/* 0D674 8083F884 5540004D */ bnel $t2, $zero, .L8083F9BC -/* 0D678 8083F888 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083F88C: -/* 0D67C 8083F88C 8D6B35F0 */ lw $t3, %lo(D_808535F0)($t3) -/* 0D680 8083F890 316C0040 */ andi $t4, $t3, 0x0040 ## $t4 = 00000000 -/* 0D684 8083F894 51800049 */ beql $t4, $zero, .L8083F9BC -/* 0D688 8083F898 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0D68C 8083F89C 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 -/* 0D690 8083F8A0 3C01421C */ lui $at, 0x421C ## $at = 421C0000 -/* 0D694 8083F8A4 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 0D698 8083F8A8 51C00044 */ beql $t6, $zero, .L8083F9BC -/* 0D69C 8083F8AC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0D6A0 8083F8B0 C6100884 */ lwc1 $f16, 0x0884($s0) ## 00000884 -/* 0D6A4 8083F8B4 44819000 */ mtc1 $at, $f18 ## $f18 = 39.00 -/* 0D6A8 8083F8B8 00000000 */ nop -/* 0D6AC 8083F8BC 4610903E */ c.le.s $f18, $f16 -/* 0D6B0 8083F8C0 00000000 */ nop -/* 0D6B4 8083F8C4 4502003D */ bc1fl .L8083F9BC -/* 0D6B8 8083F8C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0D6BC 8083F8CC 8E0F0680 */ lw $t7, 0x0680($s0) ## 00000680 -/* 0D6C0 8083F8D0 3C198086 */ lui $t9, %hi(D_80858AB4) ## $t9 = 80860000 -/* 0D6C4 8083F8D4 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 0D6C8 8083F8D8 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 0D6CC 8083F8DC AE180680 */ sw $t8, 0x0680($s0) ## 00000680 -/* 0D6D0 8083F8E0 8F398AB4 */ lw $t9, %lo(D_80858AB4)($t9) -/* 0D6D4 8083F8E4 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 0D6D8 8083F8E8 97280000 */ lhu $t0, 0x0000($t9) ## 80860000 -/* 0D6DC 8083F8EC 01014827 */ nor $t1, $t0, $at -/* 0D6E0 8083F8F0 55200032 */ bnel $t1, $zero, .L8083F9BC -/* 0D6E4 8083F8F4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0D6E8 8083F8F8 9205007C */ lbu $a1, 0x007C($s0) ## 0000007C -/* 0D6EC 8083F8FC 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 0D6F0 8083F900 8FA4002C */ lw $a0, 0x002C($sp) -/* 0D6F4 8083F904 50A10025 */ beql $a1, $at, .L8083F99C -/* 0D6F8 8083F908 AE0003C4 */ sw $zero, 0x03C4($s0) ## 000003C4 -/* 0D6FC 8083F90C 0C00FAE1 */ jal DynaPolyInfo_GetActor - ## DynaPolyInfo_getActor -/* 0D700 8083F910 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 0D704 8083F914 10400020 */ beq $v0, $zero, .L8083F998 -/* 0D708 8083F918 AFA20024 */ sw $v0, 0x0024($sp) -/* 0D70C 8083F91C 844A0000 */ lh $t2, 0x0000($v0) ## 00000000 -/* 0D710 8083F920 24010092 */ addiu $at, $zero, 0x0092 ## $at = 00000092 -/* 0D714 8083F924 1541001A */ bne $t2, $at, .L8083F990 -/* 0D718 8083F928 00000000 */ nop -/* 0D71C 8083F92C 0C023C0D */ jal func_8008F034 -/* 0D720 8083F930 00000000 */ nop -/* 0D724 8083F934 28410003 */ slti $at, $v0, 0x0003 -/* 0D728 8083F938 10200003 */ beq $at, $zero, .L8083F948 -/* 0D72C 8083F93C 8FA4002C */ lw $a0, 0x002C($sp) -/* 0D730 8083F940 1000001E */ beq $zero, $zero, .L8083F9BC -/* 0D734 8083F944 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083F948: -/* 0D738 8083F948 3C068084 */ lui $a2, %hi(func_8083A0F4) ## $a2 = 80840000 -/* 0D73C 8083F94C 24C6A0F4 */ addiu $a2, $a2, %lo(func_8083A0F4) ## $a2 = 8083A0F4 -/* 0D740 8083F950 0C20DA26 */ jal func_80836898 -/* 0D744 8083F954 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D748 8083F958 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 0D74C 8083F95C 860E007E */ lh $t6, 0x007E($s0) ## 0000007E -/* 0D750 8083F960 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 0D754 8083F964 356C0800 */ ori $t4, $t3, 0x0800 ## $t4 = 00000800 -/* 0D758 8083F968 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -/* 0D75C 8083F96C 8FAD0024 */ lw $t5, 0x0024($sp) -/* 0D760 8083F970 01C17821 */ addu $t7, $t6, $at -/* 0D764 8083F974 A2000434 */ sb $zero, 0x0434($s0) ## 00000434 -/* 0D768 8083F978 A60F083C */ sh $t7, 0x083C($s0) ## 0000083C -/* 0D76C 8083F97C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0D770 8083F980 0C20C889 */ jal func_80832224 -/* 0D774 8083F984 AE0D0438 */ sw $t5, 0x0438($s0) ## 00000438 -/* 0D778 8083F988 1000000C */ beq $zero, $zero, .L8083F9BC -/* 0D77C 8083F98C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083F990: -/* 0D780 8083F990 10000002 */ beq $zero, $zero, .L8083F99C -/* 0D784 8083F994 AE0203C4 */ sw $v0, 0x03C4($s0) ## 000003C4 -.L8083F998: -/* 0D788 8083F998 AE0003C4 */ sw $zero, 0x03C4($s0) ## 000003C4 -.L8083F99C: -/* 0D78C 8083F99C 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 0D790 8083F9A0 24A530F8 */ addiu $a1, $a1, 0x30F8 ## $a1 = 040030F8 -/* 0D794 8083F9A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0D798 8083F9A8 0C20FDCB */ jal func_8083F72C -/* 0D79C 8083F9AC 8FA6002C */ lw $a2, 0x002C($sp) -/* 0D7A0 8083F9B0 10000002 */ beq $zero, $zero, .L8083F9BC -/* 0D7A4 8083F9B4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0D7A8 8083F9B8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083F9BC: -/* 0D7AC 8083F9BC 8FBF001C */ lw $ra, 0x001C($sp) -/* 0D7B0 8083F9C0 8FB00018 */ lw $s0, 0x0018($sp) -/* 0D7B4 8083F9C4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0D7B8 8083F9C8 03E00008 */ jr $ra -/* 0D7BC 8083F9CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F9D0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F9D0.s deleted file mode 100644 index b0494d0d08..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F9D0.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_8083F9D0 -/* 0D7C0 8083F9D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0D7C4 8083F9D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 0D7C8 8083F9D8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0D7CC 8083F9DC AFA40020 */ sw $a0, 0x0020($sp) -/* 0D7D0 8083F9E0 94AE0088 */ lhu $t6, 0x0088($a1) ## 00000088 -/* 0D7D4 8083F9E4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0D7D8 8083F9E8 31CF0200 */ andi $t7, $t6, 0x0200 ## $t7 = 00000000 -/* 0D7DC 8083F9EC 51E00021 */ beql $t7, $zero, .L8083FA74 -/* 0D7E0 8083F9F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0D7E4 8083F9F4 8CB80680 */ lw $t8, 0x0680($a1) ## 00000680 -/* 0D7E8 8083F9F8 3C088086 */ lui $t0, %hi(D_80858AB4) ## $t0 = 80860000 -/* 0D7EC 8083F9FC 33190010 */ andi $t9, $t8, 0x0010 ## $t9 = 00000000 -/* 0D7F0 8083FA00 57200009 */ bnel $t9, $zero, .L8083FA28 -/* 0D7F4 8083FA04 9205007C */ lbu $a1, 0x007C($s0) ## 0000007C -/* 0D7F8 8083FA08 8D088AB4 */ lw $t0, %lo(D_80858AB4)($t0) -/* 0D7FC 8083FA0C 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 0D800 8083FA10 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 0D804 8083FA14 95090000 */ lhu $t1, 0x0000($t0) ## 80860000 -/* 0D808 8083FA18 01215027 */ nor $t2, $t1, $at -/* 0D80C 8083FA1C 55400015 */ bnel $t2, $zero, .L8083FA74 -/* 0D810 8083FA20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0D814 8083FA24 9205007C */ lbu $a1, 0x007C($s0) ## 0000007C -.L8083FA28: -/* 0D818 8083FA28 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 0D81C 8083FA2C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 0D820 8083FA30 10A10004 */ beq $a1, $at, .L8083FA44 -/* 0D824 8083FA34 8FA40020 */ lw $a0, 0x0020($sp) -/* 0D828 8083FA38 0C00FAE1 */ jal DynaPolyInfo_GetActor - ## DynaPolyInfo_getActor -/* 0D82C 8083FA3C 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 0D830 8083FA40 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L8083FA44: -/* 0D834 8083FA44 8E0B03C4 */ lw $t3, 0x03C4($s0) ## 000003C4 -/* 0D838 8083FA48 546B000A */ bnel $v1, $t3, .L8083FA74 -/* 0D83C 8083FA4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0D840 8083FA50 8E0C0680 */ lw $t4, 0x0680($s0) ## 00000680 -/* 0D844 8083FA54 318D0010 */ andi $t5, $t4, 0x0010 ## $t5 = 00000000 -/* 0D848 8083FA58 11A00003 */ beq $t5, $zero, .L8083FA68 -/* 0D84C 8083FA5C 00000000 */ nop -/* 0D850 8083FA60 10000010 */ beq $zero, $zero, .L8083FAA4 -/* 0D854 8083FA64 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083FA68: -/* 0D858 8083FA68 1000000E */ beq $zero, $zero, .L8083FAA4 -/* 0D85C 8083FA6C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0D860 8083FA70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8083FA74: -/* 0D864 8083FA74 0C20E7FF */ jal func_80839FFC -/* 0D868 8083FA78 8FA50020 */ lw $a1, 0x0020($sp) -/* 0D86C 8083FA7C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0D870 8083FA80 24C63100 */ addiu $a2, $a2, 0x3100 ## $a2 = 04003100 -/* 0D874 8083FA84 8FA40020 */ lw $a0, 0x0020($sp) -/* 0D878 8083FA88 0C20C899 */ jal func_80832264 -/* 0D87C 8083FA8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D880 8083FA90 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 -/* 0D884 8083FA94 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 0D888 8083FA98 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0D88C 8083FA9C 01C17824 */ and $t7, $t6, $at -/* 0D890 8083FAA0 AE0F0680 */ sw $t7, 0x0680($s0) ## 00000680 -.L8083FAA4: -/* 0D894 8083FAA4 8FBF001C */ lw $ra, 0x001C($sp) -/* 0D898 8083FAA8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0D89C 8083FAAC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0D8A0 8083FAB0 03E00008 */ jr $ra -/* 0D8A4 8083FAB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FAB8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FAB8.s deleted file mode 100644 index 9690509599..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FAB8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8083FAB8 -/* 0D8A8 8083FAB8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0D8AC 8083FABC AFA5001C */ sw $a1, 0x001C($sp) -/* 0D8B0 8083FAC0 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0D8B4 8083FAC4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0D8B8 8083FAC8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0D8BC 8083FACC 3C068085 */ lui $a2, %hi(func_8084B898) ## $a2 = 80850000 -/* 0D8C0 8083FAD0 24C6B898 */ addiu $a2, $a2, %lo(func_8084B898) ## $a2 = 8084B898 -/* 0D8C4 8083FAD4 AFA50018 */ sw $a1, 0x0018($sp) -/* 0D8C8 8083FAD8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0D8CC 8083FADC 0C20D716 */ jal func_80835C58 -/* 0D8D0 8083FAE0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0D8D4 8083FAE4 8FA50018 */ lw $a1, 0x0018($sp) -/* 0D8D8 8083FAE8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0D8DC 8083FAEC 24C630F0 */ addiu $a2, $a2, 0x30F0 ## $a2 = 040030F0 -/* 0D8E0 8083FAF0 8CAE0680 */ lw $t6, 0x0680($a1) ## 00000680 -/* 0D8E4 8083FAF4 35CF0010 */ ori $t7, $t6, 0x0010 ## $t7 = 00000010 -/* 0D8E8 8083FAF8 ACAF0680 */ sw $t7, 0x0680($a1) ## 00000680 -/* 0D8EC 8083FAFC 0C20C899 */ jal func_80832264 -/* 0D8F0 8083FB00 8FA4001C */ lw $a0, 0x001C($sp) -/* 0D8F4 8083FB04 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0D8F8 8083FB08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0D8FC 8083FB0C 03E00008 */ jr $ra -/* 0D900 8083FB10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB14.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB14.s deleted file mode 100644 index 3df1af907c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB14.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_8083FB14 -/* 0D904 8083FB14 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0D908 8083FB18 AFA5001C */ sw $a1, 0x001C($sp) -/* 0D90C 8083FB1C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0D910 8083FB20 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0D914 8083FB24 AFA40018 */ sw $a0, 0x0018($sp) -/* 0D918 8083FB28 3C068085 */ lui $a2, %hi(func_8084B9E4) ## $a2 = 80850000 -/* 0D91C 8083FB2C 24C6B9E4 */ addiu $a2, $a2, %lo(func_8084B9E4) ## $a2 = 8084B9E4 -/* 0D920 8083FB30 AFA50018 */ sw $a1, 0x0018($sp) -/* 0D924 8083FB34 8FA4001C */ lw $a0, 0x001C($sp) -/* 0D928 8083FB38 0C20D716 */ jal func_80835C58 -/* 0D92C 8083FB3C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0D930 8083FB40 8FA50018 */ lw $a1, 0x0018($sp) -/* 0D934 8083FB44 3C068085 */ lui $a2, %hi(D_80853C5C) ## $a2 = 80850000 -/* 0D938 8083FB48 8CAE0680 */ lw $t6, 0x0680($a1) ## 00000680 -/* 0D93C 8083FB4C 90B8015B */ lbu $t8, 0x015B($a1) ## 0000015B -/* 0D940 8083FB50 35CF0010 */ ori $t7, $t6, 0x0010 ## $t7 = 00000010 -/* 0D944 8083FB54 0018C880 */ sll $t9, $t8, 2 -/* 0D948 8083FB58 00D93021 */ addu $a2, $a2, $t9 -/* 0D94C 8083FB5C ACAF0680 */ sw $t7, 0x0680($a1) ## 00000680 -/* 0D950 8083FB60 8CC63C5C */ lw $a2, %lo(D_80853C5C)($a2) -/* 0D954 8083FB64 0C20C899 */ jal func_80832264 -/* 0D958 8083FB68 8FA4001C */ lw $a0, 0x001C($sp) -/* 0D95C 8083FB6C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0D960 8083FB70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0D964 8083FB74 03E00008 */ jr $ra -/* 0D968 8083FB78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB7C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB7C.s deleted file mode 100644 index 91063f1696..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB7C.s +++ /dev/null @@ -1,23 +0,0 @@ -.late_rodata -glabel D_808553F4 - .word 0xBECCCCCD - -.text -glabel func_8083FB7C -/* 0D96C 8083FB7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0D970 8083FB80 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0D974 8083FB84 8C8E067C */ lw $t6, 0x067C($a0) ## 0000067C -/* 0D978 8083FB88 3C01F7DF */ lui $at, 0xF7DF ## $at = F7DF0000 -/* 0D97C 8083FB8C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = F7DFFFFF -/* 0D980 8083FB90 01C17824 */ and $t7, $t6, $at -/* 0D984 8083FB94 AC8F067C */ sw $t7, 0x067C($a0) ## 0000067C -/* 0D988 8083FB98 0C20DEE7 */ jal func_80837B9C -/* 0D98C 8083FB9C AFA40018 */ sw $a0, 0x0018($sp) -/* 0D990 8083FBA0 3C018085 */ lui $at, %hi(D_808553F4) ## $at = 80850000 -/* 0D994 8083FBA4 8FA40018 */ lw $a0, 0x0018($sp) -/* 0D998 8083FBA8 C42453F4 */ lwc1 $f4, %lo(D_808553F4)($at) -/* 0D99C 8083FBAC E4840838 */ swc1 $f4, 0x0838($a0) ## 00000838 -/* 0D9A0 8083FBB0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0D9A4 8083FBB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0D9A8 8083FBB8 03E00008 */ jr $ra -/* 0D9AC 8083FBBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FBC0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FBC0.s deleted file mode 100644 index 89513030f2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FBC0.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_8083FBC0 -/* 0D9B0 8083FBC0 3C0E8086 */ lui $t6, %hi(D_80858AB4) ## $t6 = 80860000 -/* 0D9B4 8083FBC4 8DCE8AB4 */ lw $t6, %lo(D_80858AB4)($t6) -/* 0D9B8 8083FBC8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0D9BC 8083FBCC AFBF0014 */ sw $ra, 0x0014($sp) -/* 0D9C0 8083FBD0 AFA5001C */ sw $a1, 0x001C($sp) -/* 0D9C4 8083FBD4 95CF000C */ lhu $t7, 0x000C($t6) ## 8086000C -/* 0D9C8 8083FBD8 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 0D9CC 8083FBDC 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 0D9D0 8083FBE0 01E1C027 */ nor $t8, $t7, $at -/* 0D9D4 8083FBE4 13000014 */ beq $t8, $zero, .L8083FC38 -/* 0D9D8 8083FBE8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0D9DC 8083FBEC 94990088 */ lhu $t9, 0x0088($a0) ## 00000088 -/* 0D9E0 8083FBF0 3C028085 */ lui $v0, %hi(D_808535F0) ## $v0 = 80850000 -/* 0D9E4 8083FBF4 33280200 */ andi $t0, $t9, 0x0200 ## $t0 = 00000000 -/* 0D9E8 8083FBF8 51000010 */ beql $t0, $zero, .L8083FC3C -/* 0D9EC 8083FBFC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0D9F0 8083FC00 8C4235F0 */ lw $v0, %lo(D_808535F0)($v0) -/* 0D9F4 8083FC04 30490008 */ andi $t1, $v0, 0x0008 ## $t1 = 00000000 -/* 0D9F8 8083FC08 15200009 */ bne $t1, $zero, .L8083FC30 -/* 0D9FC 8083FC0C 304A0002 */ andi $t2, $v0, 0x0002 ## $t2 = 00000000 -/* 0DA00 8083FC10 15400007 */ bne $t2, $zero, .L8083FC30 -/* 0DA04 8083FC14 24A407C0 */ addiu $a0, $a1, 0x07C0 ## $a0 = 000007C0 -/* 0DA08 8083FC18 8CE50074 */ lw $a1, 0x0074($a3) ## 00000074 -/* 0DA0C 8083FC1C 90E6007C */ lbu $a2, 0x007C($a3) ## 0000007C -/* 0DA10 8083FC20 0C010793 */ jal func_80041E4C -/* 0DA14 8083FC24 AFA70018 */ sw $a3, 0x0018($sp) -/* 0DA18 8083FC28 10400003 */ beq $v0, $zero, .L8083FC38 -/* 0DA1C 8083FC2C 8FA70018 */ lw $a3, 0x0018($sp) -.L8083FC30: -/* 0DA20 8083FC30 10000009 */ beq $zero, $zero, .L8083FC58 -/* 0DA24 8083FC34 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083FC38: -/* 0DA28 8083FC38 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L8083FC3C: -/* 0DA2C 8083FC3C 8FA5001C */ lw $a1, 0x001C($sp) -/* 0DA30 8083FC40 0C20FEDF */ jal func_8083FB7C -/* 0DA34 8083FC44 AFA70018 */ sw $a3, 0x0018($sp) -/* 0DA38 8083FC48 8FA40018 */ lw $a0, 0x0018($sp) -/* 0DA3C 8083FC4C 0C20C9A6 */ jal func_80832698 -/* 0DA40 8083FC50 24056814 */ addiu $a1, $zero, 0x6814 ## $a1 = 00006814 -/* 0DA44 8083FC54 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083FC58: -/* 0DA48 8083FC58 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0DA4C 8083FC5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0DA50 8083FC60 03E00008 */ jr $ra -/* 0DA54 8083FC64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FC68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FC68.s deleted file mode 100644 index af0e65a58b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FC68.s +++ /dev/null @@ -1,78 +0,0 @@ -.late_rodata -glabel D_808553F8 - .word 0x40D9999A - -.text -glabel func_8083FC68 -/* 0DA58 8083FC68 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0DA5C 8083FC6C AFBF0014 */ sw $ra, 0x0014($sp) -/* 0DA60 8083FC70 AFA50024 */ sw $a1, 0x0024($sp) -/* 0DA64 8083FC74 AFA60028 */ sw $a2, 0x0028($sp) -/* 0DA68 8083FC78 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 -/* 0DA6C 8083FC7C 00063400 */ sll $a2, $a2, 16 -/* 0DA70 8083FC80 00063403 */ sra $a2, $a2, 16 -/* 0DA74 8083FC84 00CE7823 */ subu $t7, $a2, $t6 -/* 0DA78 8083FC88 000FC400 */ sll $t8, $t7, 16 -/* 0DA7C 8083FC8C 0018CC03 */ sra $t9, $t8, 16 -/* 0DA80 8083FC90 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 0DA84 8083FC94 00000000 */ nop -/* 0DA88 8083FC98 468021A0 */ cvt.s.w $f6, $f4 -/* 0DA8C 8083FC9C E7A6001C */ swc1 $f6, 0x001C($sp) -/* 0DA90 8083FCA0 8C880664 */ lw $t0, 0x0664($a0) ## 00000664 -/* 0DA94 8083FCA4 5100000D */ beql $t0, $zero, .L8083FCDC -/* 0DA98 8083FCA8 C7A0001C */ lwc1 $f0, 0x001C($sp) -/* 0DA9C 8083FCAC 0C00B75E */ jal func_8002DD78 -/* 0DAA0 8083FCB0 AFA40020 */ sw $a0, 0x0020($sp) -/* 0DAA4 8083FCB4 0002282B */ sltu $a1, $zero, $v0 -/* 0DAA8 8083FCB8 14A00005 */ bne $a1, $zero, .L8083FCD0 -/* 0DAAC 8083FCBC 8FA40020 */ lw $a0, 0x0020($sp) -/* 0DAB0 8083FCC0 0C20CD2D */ jal func_808334B4 -/* 0DAB4 8083FCC4 AFA40020 */ sw $a0, 0x0020($sp) -/* 0DAB8 8083FCC8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0DABC 8083FCCC 0002282B */ sltu $a1, $zero, $v0 -.L8083FCD0: -/* 0DAC0 8083FCD0 0C20F6E6 */ jal func_8083DB98 -/* 0DAC4 8083FCD4 00000000 */ nop -/* 0DAC8 8083FCD8 C7A0001C */ lwc1 $f0, 0x001C($sp) -.L8083FCDC: -/* 0DACC 8083FCDC 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 0DAD0 8083FCE0 44814000 */ mtc1 $at, $f8 ## $f8 = 32768.00 -/* 0DAD4 8083FCE4 46000005 */ abs.s $f0, $f0 -/* 0DAD8 8083FCE8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0DADC 8083FCEC 46080083 */ div.s $f2, $f0, $f8 -/* 0DAE0 8083FCF0 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 -/* 0DAE4 8083FCF4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 0DAE8 8083FCF8 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 0DAEC 8083FCFC C7A80024 */ lwc1 $f8, 0x0024($sp) -/* 0DAF0 8083FD00 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0DAF4 8083FD04 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0DAF8 8083FD08 46021282 */ mul.s $f10, $f2, $f2 -/* 0DAFC 8083FD0C 00000000 */ nop -/* 0DB00 8083FD10 46105482 */ mul.s $f18, $f10, $f16 -/* 0DB04 8083FD14 46049180 */ add.s $f6, $f18, $f4 -/* 0DB08 8083FD18 4608303C */ c.lt.s $f6, $f8 -/* 0DB0C 8083FD1C 00000000 */ nop -/* 0DB10 8083FD20 45000003 */ bc1f .L8083FD30 -/* 0DB14 8083FD24 00000000 */ nop -/* 0DB18 8083FD28 10000011 */ beq $zero, $zero, .L8083FD70 -/* 0DB1C 8083FD2C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083FD30: -/* 0DB20 8083FD30 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 0DB24 8083FD34 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0DB28 8083FD38 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 0DB2C 8083FD3C 46025401 */ sub.s $f16, $f10, $f2 -/* 0DB30 8083FD40 3C018085 */ lui $at, %hi(D_808553F8) ## $at = 80850000 -/* 0DB34 8083FD44 C42653F8 */ lwc1 $f6, %lo(D_808553F8)($at) -/* 0DB38 8083FD48 C7AA0024 */ lwc1 $f10, 0x0024($sp) -/* 0DB3C 8083FD4C 46128102 */ mul.s $f4, $f16, $f18 -/* 0DB40 8083FD50 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0DB44 8083FD54 46062200 */ add.s $f8, $f4, $f6 -/* 0DB48 8083FD58 460A403C */ c.lt.s $f8, $f10 -/* 0DB4C 8083FD5C 00000000 */ nop -/* 0DB50 8083FD60 45000003 */ bc1f .L8083FD70 -/* 0DB54 8083FD64 00000000 */ nop -/* 0DB58 8083FD68 10000001 */ beq $zero, $zero, .L8083FD70 -/* 0DB5C 8083FD6C 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -.L8083FD70: -/* 0DB60 8083FD70 03E00008 */ jr $ra -/* 0DB64 8083FD74 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FD78.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FD78.s deleted file mode 100644 index 2d1aa983f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FD78.s +++ /dev/null @@ -1,161 +0,0 @@ -glabel func_8083FD78 -/* 0DB68 8083FD78 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0DB6C 8083FD7C AFBF0024 */ sw $ra, 0x0024($sp) -/* 0DB70 8083FD80 AFB00020 */ sw $s0, 0x0020($sp) -/* 0DB74 8083FD84 AFA50034 */ sw $a1, 0x0034($sp) -/* 0DB78 8083FD88 AFA60038 */ sw $a2, 0x0038($sp) -/* 0DB7C 8083FD8C AFA7003C */ sw $a3, 0x003C($sp) -/* 0DB80 8083FD90 8498083E */ lh $t8, 0x083E($a0) ## 0000083E -/* 0DB84 8083FD94 84CF0000 */ lh $t7, 0x0000($a2) ## 00000000 -/* 0DB88 8083FD98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0DB8C 8083FD9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0DB90 8083FDA0 01F81823 */ subu $v1, $t7, $t8 -/* 0DB94 8083FDA4 00031C00 */ sll $v1, $v1, 16 -/* 0DB98 8083FDA8 00031C03 */ sra $v1, $v1, 16 -/* 0DB9C 8083FDAC 04600003 */ bltz $v1, .L8083FDBC -/* 0DBA0 8083FDB0 00033023 */ subu $a2, $zero, $v1 -/* 0DBA4 8083FDB4 10000002 */ beq $zero, $zero, .L8083FDC0 -/* 0DBA8 8083FDB8 3066FFFF */ andi $a2, $v1, 0xFFFF ## $a2 = 00000000 -.L8083FDBC: -/* 0DBAC 8083FDBC 30C6FFFF */ andi $a2, $a2, 0xFFFF ## $a2 = 00000000 -.L8083FDC0: -/* 0DBB0 8083FDC0 A7A3002E */ sh $v1, 0x002E($sp) -/* 0DBB4 8083FDC4 0C00B75E */ jal func_8002DD78 -/* 0DBB8 8083FDC8 A7A6002C */ sh $a2, 0x002C($sp) -/* 0DBBC 8083FDCC 87A3002E */ lh $v1, 0x002E($sp) -/* 0DBC0 8083FDD0 97A6002C */ lhu $a2, 0x002C($sp) -/* 0DBC4 8083FDD4 14400009 */ bne $v0, $zero, .L8083FDFC -/* 0DBC8 8083FDD8 8FA70034 */ lw $a3, 0x0034($sp) -/* 0DBCC 8083FDDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0DBD0 8083FDE0 A7A3002E */ sh $v1, 0x002E($sp) -/* 0DBD4 8083FDE4 0C20CD2D */ jal func_808334B4 -/* 0DBD8 8083FDE8 A7A6002C */ sh $a2, 0x002C($sp) -/* 0DBDC 8083FDEC 87A3002E */ lh $v1, 0x002E($sp) -/* 0DBE0 8083FDF0 97A6002C */ lhu $a2, 0x002C($sp) -/* 0DBE4 8083FDF4 10400040 */ beq $v0, $zero, .L8083FEF8 -/* 0DBE8 8083FDF8 8FA70034 */ lw $a3, 0x0034($sp) -.L8083FDFC: -/* 0DBEC 8083FDFC 8E190664 */ lw $t9, 0x0664($s0) ## 00000664 -/* 0DBF0 8083FE00 00062400 */ sll $a0, $a2, 16 -/* 0DBF4 8083FE04 00042403 */ sra $a0, $a0, 16 -/* 0DBF8 8083FE08 5720003C */ bnel $t9, $zero, .L8083FEFC -/* 0DBFC 8083FE0C 8E090664 */ lw $t1, 0x0664($s0) ## 00000664 -/* 0DC00 8083FE10 0C01DE1C */ jal Math_Sins - ## sins? -/* 0DC04 8083FE14 A7A3002E */ sh $v1, 0x002E($sp) -/* 0DC08 8083FE18 8FA70034 */ lw $a3, 0x0034($sp) -/* 0DC0C 8083FE1C 87A3002E */ lh $v1, 0x002E($sp) -/* 0DC10 8083FE20 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0DC14 8083FE24 C4E40000 */ lwc1 $f4, 0x0000($a3) ## 00000000 -/* 0DC18 8083FE28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0DC1C 8083FE2C 3C0F8086 */ lui $t7, %hi(D_80858AB4) ## $t7 = 80860000 -/* 0DC20 8083FE30 46002182 */ mul.s $f6, $f4, $f0 -/* 0DC24 8083FE34 E4E60000 */ swc1 $f6, 0x0000($a3) ## 00000000 -/* 0DC28 8083FE38 C4EA0000 */ lwc1 $f10, 0x0000($a3) ## 00000000 -/* 0DC2C 8083FE3C 8FAD0038 */ lw $t5, 0x0038($sp) -/* 0DC30 8083FE40 460A4032 */ c.eq.s $f8, $f10 -/* 0DC34 8083FE44 00000000 */ nop -/* 0DC38 8083FE48 4503000C */ bc1tl .L8083FE7C -/* 0DC3C 8083FE4C 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 0DC40 8083FE50 04600003 */ bltz $v1, .L8083FE60 -/* 0DC44 8083FE54 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 0DC48 8083FE58 10000001 */ beq $zero, $zero, .L8083FE60 -/* 0DC4C 8083FE5C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083FE60: -/* 0DC50 8083FE60 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 0DC54 8083FE64 8FAB0038 */ lw $t3, 0x0038($sp) -/* 0DC58 8083FE68 00024380 */ sll $t0, $v0, 14 -/* 0DC5C 8083FE6C 01095021 */ addu $t2, $t0, $t1 -/* 0DC60 8083FE70 10000003 */ beq $zero, $zero, .L8083FE80 -/* 0DC64 8083FE74 A56A0000 */ sh $t2, 0x0000($t3) ## 00000000 -/* 0DC68 8083FE78 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -.L8083FE7C: -/* 0DC6C 8083FE7C A5AC0000 */ sh $t4, 0x0000($t5) ## 00000000 -.L8083FE80: -/* 0DC70 8083FE80 8E0E0664 */ lw $t6, 0x0664($s0) ## 00000664 -/* 0DC74 8083FE84 11C00005 */ beq $t6, $zero, .L8083FE9C -/* 0DC78 8083FE88 00000000 */ nop -/* 0DC7C 8083FE8C 0C20F6E6 */ jal func_8083DB98 -/* 0DC80 8083FE90 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0DC84 8083FE94 10000043 */ beq $zero, $zero, .L8083FFA4 -/* 0DC88 8083FE98 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083FE9C: -/* 0DC8C 8083FE9C 8DEF8AB4 */ lw $t7, %lo(D_80858AB4)($t7) -/* 0DC90 8083FEA0 3C014370 */ lui $at, 0x4370 ## $at = 43700000 -/* 0DC94 8083FEA4 44812000 */ mtc1 $at, $f4 ## $f4 = 240.00 -/* 0DC98 8083FEA8 81F80015 */ lb $t8, 0x0015($t7) ## 00000015 -/* 0DC9C 8083FEAC 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 0DCA0 8083FEB0 AFA80010 */ sw $t0, 0x0010($sp) -/* 0DCA4 8083FEB4 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 0DCA8 8083FEB8 26040044 */ addiu $a0, $s0, 0x0044 ## $a0 = 00000044 -/* 0DCAC 8083FEBC 2406000E */ addiu $a2, $zero, 0x000E ## $a2 = 0000000E -/* 0DCB0 8083FEC0 468084A0 */ cvt.s.w $f18, $f16 -/* 0DCB4 8083FEC4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 0DCB8 8083FEC8 46049182 */ mul.s $f6, $f18, $f4 -/* 0DCBC 8083FECC 4600320D */ trunc.w.s $f8, $f6 -/* 0DCC0 8083FED0 44054000 */ mfc1 $a1, $f8 -/* 0DCC4 8083FED4 00000000 */ nop -/* 0DCC8 8083FED8 00052C00 */ sll $a1, $a1, 16 -/* 0DCCC 8083FEDC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0DCD0 8083FEE0 00052C03 */ sra $a1, $a1, 16 -/* 0DCD4 8083FEE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0DCD8 8083FEE8 0C20DAAE */ jal func_80836AB8 -/* 0DCDC 8083FEEC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0DCE0 8083FEF0 1000002C */ beq $zero, $zero, .L8083FFA4 -/* 0DCE4 8083FEF4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083FEF8: -/* 0DCE8 8083FEF8 8E090664 */ lw $t1, 0x0664($s0) ## 00000664 -.L8083FEFC: -/* 0DCEC 8083FEFC 8FAA0038 */ lw $t2, 0x0038($sp) -/* 0DCF0 8083FF00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0DCF4 8083FF04 11200007 */ beq $t1, $zero, .L8083FF24 -/* 0DCF8 8083FF08 8FA5003C */ lw $a1, 0x003C($sp) -/* 0DCFC 8083FF0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0DD00 8083FF10 8CE50000 */ lw $a1, 0x0000($a3) ## 00000000 -/* 0DD04 8083FF14 0C20FF1A */ jal func_8083FC68 -/* 0DD08 8083FF18 85460000 */ lh $a2, 0x0000($t2) ## 00000000 -/* 0DD0C 8083FF1C 10000022 */ beq $zero, $zero, .L8083FFA8 -/* 0DD10 8083FF20 8FBF0024 */ lw $ra, 0x0024($sp) -.L8083FF24: -/* 0DD14 8083FF24 0C20F715 */ jal func_8083DC54 -/* 0DD18 8083FF28 A7A6002C */ sh $a2, 0x002C($sp) -/* 0DD1C 8083FF2C 8FA70034 */ lw $a3, 0x0034($sp) -/* 0DD20 8083FF30 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0DD24 8083FF34 97A6002C */ lhu $a2, 0x002C($sp) -/* 0DD28 8083FF38 C4F00000 */ lwc1 $f16, 0x0000($a3) ## 00000000 -/* 0DD2C 8083FF3C 240C4000 */ addiu $t4, $zero, 0x4000 ## $t4 = 00004000 -/* 0DD30 8083FF40 00065843 */ sra $t3, $a2, 1 -/* 0DD34 8083FF44 46105032 */ c.eq.s $f10, $f16 -/* 0DD38 8083FF48 018B2023 */ subu $a0, $t4, $t3 -/* 0DD3C 8083FF4C 00042400 */ sll $a0, $a0, 16 -/* 0DD40 8083FF50 28C11770 */ slti $at, $a2, 0x1770 -/* 0DD44 8083FF54 45010005 */ bc1t .L8083FF6C -/* 0DD48 8083FF58 00000000 */ nop -/* 0DD4C 8083FF5C 10200003 */ beq $at, $zero, .L8083FF6C -/* 0DD50 8083FF60 00000000 */ nop -/* 0DD54 8083FF64 1000000F */ beq $zero, $zero, .L8083FFA4 -/* 0DD58 8083FF68 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8083FF6C: -/* 0DD5C 8083FF6C 0C01DE1C */ jal Math_Sins - ## sins? -/* 0DD60 8083FF70 00042403 */ sra $a0, $a0, 16 -/* 0DD64 8083FF74 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 0DD68 8083FF78 44819000 */ mtc1 $at, $f18 ## $f18 = 200.00 -/* 0DD6C 8083FF7C 8FA70034 */ lw $a3, 0x0034($sp) -/* 0DD70 8083FF80 46120102 */ mul.s $f4, $f0, $f18 -/* 0DD74 8083FF84 C4E60000 */ lwc1 $f6, 0x0000($a3) ## 00000000 -/* 0DD78 8083FF88 4606203C */ c.lt.s $f4, $f6 -/* 0DD7C 8083FF8C 00000000 */ nop -/* 0DD80 8083FF90 45020004 */ bc1fl .L8083FFA4 -/* 0DD84 8083FF94 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0DD88 8083FF98 10000002 */ beq $zero, $zero, .L8083FFA4 -/* 0DD8C 8083FF9C 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 0DD90 8083FFA0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8083FFA4: -/* 0DD94 8083FFA4 8FBF0024 */ lw $ra, 0x0024($sp) -.L8083FFA8: -/* 0DD98 8083FFA8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0DD9C 8083FFAC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0DDA0 8083FFB0 03E00008 */ jr $ra -/* 0DDA4 8083FFB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FFB8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FFB8.s deleted file mode 100644 index 881ea67725..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FFB8.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_8083FFB8 -/* 0DDA8 8083FFB8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0DDAC 8083FFBC AFBF0014 */ sw $ra, 0x0014($sp) -/* 0DDB0 8083FFC0 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 0DDB4 8083FFC4 84CE0000 */ lh $t6, 0x0000($a2) ## 00000000 -/* 0DDB8 8083FFC8 01CF1023 */ subu $v0, $t6, $t7 -/* 0DDBC 8083FFCC 00021400 */ sll $v0, $v0, 16 -/* 0DDC0 8083FFD0 00021403 */ sra $v0, $v0, 16 -/* 0DDC4 8083FFD4 04400003 */ bltz $v0, .L8083FFE4 -/* 0DDC8 8083FFD8 00021823 */ subu $v1, $zero, $v0 -/* 0DDCC 8083FFDC 10000002 */ beq $zero, $zero, .L8083FFE8 -/* 0DDD0 8083FFE0 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 -.L8083FFE4: -/* 0DDD4 8083FFE4 3063FFFF */ andi $v1, $v1, 0xFFFF ## $v1 = 00000000 -.L8083FFE8: -/* 0DDD8 8083FFE8 00032400 */ sll $a0, $v1, 16 -/* 0DDDC 8083FFEC 00042403 */ sra $a0, $a0, 16 -/* 0DDE0 8083FFF0 0C01DE0D */ jal Math_Coss - ## coss? -/* 0DDE4 8083FFF4 AFA5001C */ sw $a1, 0x001C($sp) -/* 0DDE8 8083FFF8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0DDEC 8083FFFC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0DDF0 80840000 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0DDF4 80840004 C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000000 -/* 0DDF8 80840008 46002182 */ mul.s $f6, $f4, $f0 -/* 0DDFC 8084000C E4A60000 */ swc1 $f6, 0x0000($a1) ## 00000000 -/* 0DE00 80840010 C4AA0000 */ lwc1 $f10, 0x0000($a1) ## 00000000 -/* 0DE04 80840014 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0DE08 80840018 460A4032 */ c.eq.s $f8, $f10 -/* 0DE0C 8084001C 00000000 */ nop -/* 0DE10 80840020 4501000B */ bc1t .L80840050 -/* 0DE14 80840024 00000000 */ nop -/* 0DE18 80840028 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0DE1C 8084002C 00000000 */ nop -/* 0DE20 80840030 4600803C */ c.lt.s $f16, $f0 -/* 0DE24 80840034 00000000 */ nop -/* 0DE28 80840038 45000003 */ bc1f .L80840048 -/* 0DE2C 8084003C 00000000 */ nop -/* 0DE30 80840040 10000003 */ beq $zero, $zero, .L80840050 -/* 0DE34 80840044 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80840048: -/* 0DE38 80840048 10000001 */ beq $zero, $zero, .L80840050 -/* 0DE3C 8084004C 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -.L80840050: -/* 0DE40 80840050 03E00008 */ jr $ra -/* 0DE44 80840054 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840058.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840058.s deleted file mode 100644 index aebde08bd5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840058.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_80840058 -/* 0DE48 80840058 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0DE4C 8084005C AFBF0014 */ sw $ra, 0x0014($sp) -/* 0DE50 80840060 AFA5001C */ sw $a1, 0x001C($sp) -/* 0DE54 80840064 AFA40018 */ sw $a0, 0x0018($sp) -/* 0DE58 80840068 AFA60020 */ sw $a2, 0x0020($sp) -/* 0DE5C 8084006C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 0DE60 80840070 0C20F715 */ jal func_8083DC54 -/* 0DE64 80840074 AFA70024 */ sw $a3, 0x0024($sp) -/* 0DE68 80840078 8FAE001C */ lw $t6, 0x001C($sp) -/* 0DE6C 8084007C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0DE70 80840080 8FA70024 */ lw $a3, 0x0024($sp) -/* 0DE74 80840084 C5C60000 */ lwc1 $f6, 0x0000($t6) ## 00000000 -/* 0DE78 80840088 8FAF0018 */ lw $t7, 0x0018($sp) -/* 0DE7C 8084008C 46062032 */ c.eq.s $f4, $f6 -/* 0DE80 80840090 00000000 */ nop -/* 0DE84 80840094 4502000A */ bc1fl .L808400C0 -/* 0DE88 80840098 84F807A0 */ lh $t8, 0x07A0($a3) ## 000007A0 -/* 0DE8C 8084009C 85E2087C */ lh $v0, 0x087C($t7) ## 0000087C -/* 0DE90 808400A0 04400003 */ bltz $v0, .L808400B0 -/* 0DE94 808400A4 00021823 */ subu $v1, $zero, $v0 -/* 0DE98 808400A8 10000001 */ beq $zero, $zero, .L808400B0 -/* 0DE9C 808400AC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L808400B0: -/* 0DEA0 808400B0 28610191 */ slti $at, $v1, 0x0191 -/* 0DEA4 808400B4 1420001C */ bne $at, $zero, .L80840128 -/* 0DEA8 808400B8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0DEAC 808400BC 84F807A0 */ lh $t8, 0x07A0($a3) ## 000007A0 -.L808400C0: -/* 0DEB0 808400C0 0018C880 */ sll $t9, $t8, 2 -/* 0DEB4 808400C4 00F94021 */ addu $t0, $a3, $t9 -/* 0DEB8 808400C8 0C016A52 */ jal func_8005A948 -/* 0DEBC 808400CC 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 0DEC0 808400D0 8FA90020 */ lw $t1, 0x0020($sp) -/* 0DEC4 808400D4 8FAE0018 */ lw $t6, 0x0018($sp) -/* 0DEC8 808400D8 852A0000 */ lh $t2, 0x0000($t1) ## 00000000 -/* 0DECC 808400DC 01422023 */ subu $a0, $t2, $v0 -/* 0DED0 808400E0 00042400 */ sll $a0, $a0, 16 -/* 0DED4 808400E4 00042403 */ sra $a0, $a0, 16 -/* 0DED8 808400E8 04800003 */ bltz $a0, .L808400F8 -/* 0DEDC 808400EC 00041823 */ subu $v1, $zero, $a0 -/* 0DEE0 808400F0 10000001 */ beq $zero, $zero, .L808400F8 -/* 0DEE4 808400F4 00801825 */ or $v1, $a0, $zero ## $v1 = 00000000 -.L808400F8: -/* 0DEE8 808400F8 246CE000 */ addiu $t4, $v1, 0xE000 ## $t4 = FFFFE000 -/* 0DEEC 808400FC 318DFFFF */ andi $t5, $t4, 0xFFFF ## $t5 = 0000E000 -/* 0DEF0 80840100 29A14000 */ slti $at, $t5, 0x4000 -/* 0DEF4 80840104 14200004 */ bne $at, $zero, .L80840118 -/* 0DEF8 80840108 00000000 */ nop -/* 0DEFC 8084010C 85CF087C */ lh $t7, 0x087C($t6) ## 0000087C -/* 0DF00 80840110 11E00003 */ beq $t7, $zero, .L80840120 -/* 0DF04 80840114 00000000 */ nop -.L80840118: -/* 0DF08 80840118 10000003 */ beq $zero, $zero, .L80840128 -/* 0DF0C 8084011C 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -.L80840120: -/* 0DF10 80840120 10000001 */ beq $zero, $zero, .L80840128 -/* 0DF14 80840124 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80840128: -/* 0DF18 80840128 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0DF1C 8084012C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0DF20 80840130 03E00008 */ jr $ra -/* 0DF24 80840134 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840138.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840138.s deleted file mode 100644 index cfe8549fc6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840138.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80840138 -/* 0DF28 80840138 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0DF2C 8084013C 44856000 */ mtc1 $a1, $f12 ## $f12 = 0.00 -/* 0DF30 80840140 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0DF34 80840144 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0DF38 80840148 AFA60020 */ sw $a2, 0x0020($sp) -/* 0DF3C 8084014C 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 -/* 0DF40 80840150 460C003C */ c.lt.s $f0, $f12 -/* 0DF44 80840154 00063400 */ sll $a2, $a2, 16 -/* 0DF48 80840158 00063403 */ sra $a2, $a2, 16 -/* 0DF4C 8084015C 00CE1023 */ subu $v0, $a2, $t6 -/* 0DF50 80840160 00021400 */ sll $v0, $v0, 16 -/* 0DF54 80840164 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0DF58 80840168 45000008 */ bc1f .L8084018C -/* 0DF5C 8084016C 00021403 */ sra $v0, $v0, 16 -/* 0DF60 80840170 04410003 */ bgez $v0, .L80840180 -/* 0DF64 80840174 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0DF68 80840178 10000004 */ beq $zero, $zero, .L8084018C -/* 0DF6C 8084017C E4800874 */ swc1 $f0, 0x0874($a0) ## 00000874 -.L80840180: -/* 0DF70 80840180 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 0DF74 80840184 00000000 */ nop -/* 0DF78 80840188 E4E40874 */ swc1 $f4, 0x0874($a3) ## 00000874 -.L8084018C: -/* 0DF7C 8084018C 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 0DF80 80840190 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 0DF84 80840194 24E40870 */ addiu $a0, $a3, 0x0870 ## $a0 = 00000870 -/* 0DF88 80840198 0C01DE80 */ jal Math_ApproxF - -/* 0DF8C 8084019C 8CE50874 */ lw $a1, 0x0874($a3) ## 00000874 -/* 0DF90 808401A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0DF94 808401A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0DF98 808401A8 03E00008 */ jr $ra -/* 0DF9C 808401AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808401B0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808401B0.s deleted file mode 100644 index b21cc4cfe3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808401B0.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_808401B0 -/* 0DFA0 808401B0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0DFA4 808401B4 AFBF002C */ sw $ra, 0x002C($sp) -/* 0DFA8 808401B8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0DFAC 808401BC AFA40038 */ sw $a0, 0x0038($sp) -/* 0DFB0 808401C0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0DFB4 808401C4 0C20CD39 */ jal func_808334E4 -/* 0DFB8 808401C8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0DFBC 808401CC AFA20030 */ sw $v0, 0x0030($sp) -/* 0DFC0 808401D0 0C20CD4A */ jal func_80833528 -/* 0DFC4 808401D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0DFC8 808401D8 C6000868 */ lwc1 $f0, 0x0868($s0) ## 00000868 -/* 0DFCC 808401DC AFA20010 */ sw $v0, 0x0010($sp) -/* 0DFD0 808401E0 260E0318 */ addiu $t6, $s0, 0x0318 ## $t6 = 00000318 -/* 0DFD4 808401E4 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 0DFD8 808401E8 C6040870 */ lwc1 $f4, 0x0870($s0) ## 00000870 -/* 0DFDC 808401EC 44070000 */ mfc1 $a3, $f0 -/* 0DFE0 808401F0 AFAE001C */ sw $t6, 0x001C($sp) -/* 0DFE4 808401F4 8FA40038 */ lw $a0, 0x0038($sp) -/* 0DFE8 808401F8 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0DFEC 808401FC 8FA60030 */ lw $a2, 0x0030($sp) -/* 0DFF0 80840200 0C0290C7 */ jal func_800A431C -/* 0DFF4 80840204 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 0DFF8 80840208 8FBF002C */ lw $ra, 0x002C($sp) -/* 0DFFC 8084020C 8FB00028 */ lw $s0, 0x0028($sp) -/* 0E000 80840210 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0E004 80840214 03E00008 */ jr $ra -/* 0E008 80840218 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084021C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084021C.s deleted file mode 100644 index 9ff2645c22..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084021C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_8084021C -/* 0E00C 8084021C AFA7000C */ sw $a3, 0x000C($sp) -/* 0E010 80840220 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0E014 80840224 C7A4000C */ lwc1 $f4, 0x000C($sp) -/* 0E018 80840228 AFA60008 */ sw $a2, 0x0008($sp) -/* 0E01C 8084022C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0E020 80840230 46022032 */ c.eq.s $f4, $f2 -/* 0E024 80840234 00000000 */ nop -/* 0E028 80840238 45020007 */ bc1fl .L80840258 -/* 0E02C 8084023C 460E6200 */ add.s $f8, $f12, $f14 -/* 0E030 80840240 460E103C */ c.lt.s $f2, $f14 -/* 0E034 80840244 C7A60008 */ lwc1 $f6, 0x0008($sp) -/* 0E038 80840248 45020003 */ bc1fl .L80840258 -/* 0E03C 8084024C 460E6200 */ add.s $f8, $f12, $f14 -/* 0E040 80840250 E7A6000C */ swc1 $f6, 0x000C($sp) -/* 0E044 80840254 460E6200 */ add.s $f8, $f12, $f14 -.L80840258: -/* 0E048 80840258 C7AA000C */ lwc1 $f10, 0x000C($sp) -/* 0E04C 8084025C 460A4001 */ sub.s $f0, $f8, $f10 -/* 0E050 80840260 460E0402 */ mul.s $f16, $f0, $f14 -/* 0E054 80840264 4610103E */ c.le.s $f2, $f16 -/* 0E058 80840268 00000000 */ nop -/* 0E05C 8084026C 45000009 */ bc1f .L80840294 -/* 0E060 80840270 00000000 */ nop -/* 0E064 80840274 460E0481 */ sub.s $f18, $f0, $f14 -/* 0E068 80840278 460E9102 */ mul.s $f4, $f18, $f14 -/* 0E06C 8084027C 4602203C */ c.lt.s $f4, $f2 -/* 0E070 80840280 00000000 */ nop -/* 0E074 80840284 45000003 */ bc1f .L80840294 -/* 0E078 80840288 00000000 */ nop -/* 0E07C 8084028C 03E00008 */ jr $ra -/* 0E080 80840290 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80840294: -/* 0E084 80840294 03E00008 */ jr $ra -/* 0E088 80840298 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084029C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084029C.s deleted file mode 100644 index cf0d8eefd3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084029C.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel func_8084029C -/* 0E08C 8084029C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 0E090 808402A0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 0E094 808402A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0E098 808402A8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0E09C 808402AC AFB00018 */ sw $s0, 0x0018($sp) -/* 0E0A0 808402B0 85CF0110 */ lh $t7, 0x0110($t6) ## 80160110 -/* 0E0A4 808402B4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0E0A8 808402B8 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 0E0AC 808402BC 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 0E0B0 808402C0 44857000 */ mtc1 $a1, $f14 ## $f14 = 0.00 -/* 0E0B4 808402C4 3C01C01D */ lui $at, 0xC01D ## $at = C01D0000 -/* 0E0B8 808402C8 468021A0 */ cvt.s.w $f6, $f4 -/* 0E0BC 808402CC 44818800 */ mtc1 $at, $f17 ## $f17 = -2.45 -/* 0E0C0 808402D0 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0E0C4 808402D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0E0C8 808402D8 3C0140E8 */ lui $at, 0x40E8 ## $at = 40E80000 -/* 0E0CC 808402DC 3C0641E8 */ lui $a2, 0x41E8 ## $a2 = 41E80000 -/* 0E0D0 808402E0 46083002 */ mul.s $f0, $f6, $f8 -/* 0E0D4 808402E4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 0E0D8 808402E8 46007382 */ mul.s $f14, $f14, $f0 -/* 0E0DC 808402EC 460072A1 */ cvt.d.s $f10, $f14 -/* 0E0E0 808402F0 4630503C */ c.lt.d $f10, $f16 -/* 0E0E4 808402F4 00000000 */ nop -/* 0E0E8 808402F8 45020006 */ bc1fl .L80840314 -/* 0E0EC 808402FC 44810000 */ mtc1 $at, $f0 ## $f0 = 7.25 -/* 0E0F0 80840300 3C01C0E8 */ lui $at, 0xC0E8 ## $at = C0E80000 -/* 0E0F4 80840304 44817000 */ mtc1 $at, $f14 ## $f14 = -7.25 -/* 0E0F8 80840308 10000009 */ beq $zero, $zero, .L80840330 -/* 0E0FC 8084030C 8218014F */ lb $t8, 0x014F($s0) ## 0000014F -/* 0E100 80840310 44810000 */ mtc1 $at, $f0 ## $f0 = -7.25 -.L80840314: -/* 0E104 80840314 00000000 */ nop -/* 0E108 80840318 460E003C */ c.lt.s $f0, $f14 -/* 0E10C 8084031C 00000000 */ nop -/* 0E110 80840320 45020003 */ bc1fl .L80840330 -/* 0E114 80840324 8218014F */ lb $t8, 0x014F($s0) ## 0000014F -/* 0E118 80840328 46000386 */ mov.s $f14, $f0 -/* 0E11C 8084032C 8218014F */ lb $t8, 0x014F($s0) ## 0000014F -.L80840330: -/* 0E120 80840330 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0E124 80840334 5701000F */ bnel $t8, $at, .L80840374 -/* 0E128 80840338 C60C0868 */ lwc1 $f12, 0x0868($s0) ## 00000868 -/* 0E12C 8084033C 96190088 */ lhu $t9, 0x0088($s0) ## 00000088 -/* 0E130 80840340 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 0E134 80840344 5500000B */ bnel $t0, $zero, .L80840374 -/* 0E138 80840348 C60C0868 */ lwc1 $f12, 0x0868($s0) ## 00000868 -/* 0E13C 8084034C 92090893 */ lbu $t1, 0x0893($s0) ## 00000893 -/* 0E140 80840350 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E144 80840354 240500C9 */ addiu $a1, $zero, 0x00C9 ## $a1 = 000000C9 -/* 0E148 80840358 51200006 */ beql $t1, $zero, .L80840374 -/* 0E14C 8084035C C60C0868 */ lwc1 $f12, 0x0868($s0) ## 00000868 -/* 0E150 80840360 0C00BE3C */ jal func_8002F8F0 -/* 0E154 80840364 E7AE0024 */ swc1 $f14, 0x0024($sp) -/* 0E158 80840368 1000001C */ beq $zero, $zero, .L808403DC -/* 0E15C 8084036C C7AE0024 */ lwc1 $f14, 0x0024($sp) -/* 0E160 80840370 C60C0868 */ lwc1 $f12, 0x0868($s0) ## 00000868 -.L80840374: -/* 0E164 80840374 0C210087 */ jal func_8084021C -/* 0E168 80840378 E7AE0024 */ swc1 $f14, 0x0024($sp) -/* 0E16C 8084037C 14400008 */ bne $v0, $zero, .L808403A0 -/* 0E170 80840380 C7AE0024 */ lwc1 $f14, 0x0024($sp) -/* 0E174 80840384 C60C0868 */ lwc1 $f12, 0x0868($s0) ## 00000868 -/* 0E178 80840388 E7AE0024 */ swc1 $f14, 0x0024($sp) -/* 0E17C 8084038C 3C0641E8 */ lui $a2, 0x41E8 ## $a2 = 41E80000 -/* 0E180 80840390 0C210087 */ jal func_8084021C -/* 0E184 80840394 3C0741C0 */ lui $a3, 0x41C0 ## $a3 = 41C00000 -/* 0E188 80840398 10400010 */ beq $v0, $zero, .L808403DC -/* 0E18C 8084039C C7AE0024 */ lwc1 $f14, 0x0024($sp) -.L808403A0: -/* 0E190 808403A0 8E050838 */ lw $a1, 0x0838($s0) ## 00000838 -/* 0E194 808403A4 E7AE0024 */ swc1 $f14, 0x0024($sp) -/* 0E198 808403A8 0C20C9FE */ jal func_808327F8 -/* 0E19C 808403AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E1A0 808403B0 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 0E1A4 808403B4 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 -/* 0E1A8 808403B8 C6040838 */ lwc1 $f4, 0x0838($s0) ## 00000838 -/* 0E1AC 808403BC C7AE0024 */ lwc1 $f14, 0x0024($sp) -/* 0E1B0 808403C0 4604903C */ c.lt.s $f18, $f4 -/* 0E1B4 808403C4 00000000 */ nop -/* 0E1B8 808403C8 45020005 */ bc1fl .L808403E0 -/* 0E1BC 808403CC C6060868 */ lwc1 $f6, 0x0868($s0) ## 00000868 -/* 0E1C0 808403D0 8E0A0680 */ lw $t2, 0x0680($s0) ## 00000680 -/* 0E1C4 808403D4 354B0008 */ ori $t3, $t2, 0x0008 ## $t3 = 00000008 -/* 0E1C8 808403D8 AE0B0680 */ sw $t3, 0x0680($s0) ## 00000680 -.L808403DC: -/* 0E1CC 808403DC C6060868 */ lwc1 $f6, 0x0868($s0) ## 00000868 -.L808403E0: -/* 0E1D0 808403E0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0E1D4 808403E4 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -/* 0E1D8 808403E8 460E3200 */ add.s $f8, $f6, $f14 -/* 0E1DC 808403EC E6080868 */ swc1 $f8, 0x0868($s0) ## 00000868 -/* 0E1E0 808403F0 C6000868 */ lwc1 $f0, 0x0868($s0) ## 00000868 -/* 0E1E4 808403F4 460A003C */ c.lt.s $f0, $f10 -/* 0E1E8 808403F8 00000000 */ nop -/* 0E1EC 808403FC 45020008 */ bc1fl .L80840420 -/* 0E1F0 80840400 44811000 */ mtc1 $at, $f2 ## $f2 = 29.00 -/* 0E1F4 80840404 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -/* 0E1F8 80840408 44818000 */ mtc1 $at, $f16 ## $f16 = 29.00 -/* 0E1FC 8084040C 00000000 */ nop -/* 0E200 80840410 46100480 */ add.s $f18, $f0, $f16 -/* 0E204 80840414 10000009 */ beq $zero, $zero, .L8084043C -/* 0E208 80840418 E6120868 */ swc1 $f18, 0x0868($s0) ## 00000868 -/* 0E20C 8084041C 44811000 */ mtc1 $at, $f2 ## $f2 = 29.00 -.L80840420: -/* 0E210 80840420 00000000 */ nop -/* 0E214 80840424 4600103E */ c.le.s $f2, $f0 -/* 0E218 80840428 00000000 */ nop -/* 0E21C 8084042C 45020004 */ bc1fl .L80840440 -/* 0E220 80840430 8FBF001C */ lw $ra, 0x001C($sp) -/* 0E224 80840434 46020101 */ sub.s $f4, $f0, $f2 -/* 0E228 80840438 E6040868 */ swc1 $f4, 0x0868($s0) ## 00000868 -.L8084043C: -/* 0E22C 8084043C 8FBF001C */ lw $ra, 0x001C($sp) -.L80840440: -/* 0E230 80840440 8FB00018 */ lw $s0, 0x0018($sp) -/* 0E234 80840444 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0E238 80840448 03E00008 */ jr $ra -/* 0E23C 8084044C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840450.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840450.s deleted file mode 100644 index 43ab0d48ed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840450.s +++ /dev/null @@ -1,258 +0,0 @@ -.late_rodata -glabel D_808553FC - .float 0.3 - -glabel D_80855400 - .float 0.3 - -glabel D_80855404 - .float 0.1 - -.text -glabel func_80840450 -/* 0E240 80840450 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0E244 80840454 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0E248 80840458 AFB00020 */ sw $s0, 0x0020($sp) -/* 0E24C 8084045C AFA5004C */ sw $a1, 0x004C($sp) -/* 0E250 80840460 908E0692 */ lbu $t6, 0x0692($a0) ## 00000692 -/* 0E254 80840464 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0E258 80840468 31CF0008 */ andi $t7, $t6, 0x0008 ## $t7 = 00000000 -/* 0E25C 8084046C 51E0000D */ beql $t7, $zero, .L808404A4 -/* 0E260 80840470 860A0850 */ lh $t2, 0x0850($s0) ## 00000850 -/* 0E264 80840474 0C023C60 */ jal func_8008F180 -/* 0E268 80840478 00000000 */ nop -/* 0E26C 8084047C 50400006 */ beql $v0, $zero, .L80840498 -/* 0E270 80840480 92080692 */ lbu $t0, 0x0692($s0) ## 00000692 -/* 0E274 80840484 8E180680 */ lw $t8, 0x0680($s0) ## 00000680 -/* 0E278 80840488 37190060 */ ori $t9, $t8, 0x0060 ## $t9 = 00000060 -/* 0E27C 8084048C 10000004 */ beq $zero, $zero, .L808404A0 -/* 0E280 80840490 AE190680 */ sw $t9, 0x0680($s0) ## 00000680 -/* 0E284 80840494 92080692 */ lbu $t0, 0x0692($s0) ## 00000692 -.L80840498: -/* 0E288 80840498 3109FFF7 */ andi $t1, $t0, 0xFFF7 ## $t1 = 00000000 -/* 0E28C 8084049C A2090692 */ sb $t1, 0x0692($s0) ## 00000692 -.L808404A0: -/* 0E290 808404A0 860A0850 */ lh $t2, 0x0850($s0) ## 00000850 -.L808404A4: -/* 0E294 808404A4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0E298 808404A8 8FA4004C */ lw $a0, 0x004C($sp) -/* 0E29C 808404AC 11400015 */ beq $t2, $zero, .L80840504 -/* 0E2A0 808404B0 00000000 */ nop -/* 0E2A4 808404B4 0C028EF0 */ jal func_800A3BC0 -/* 0E2A8 808404B8 8FA4004C */ lw $a0, 0x004C($sp) -/* 0E2AC 808404BC 1040000D */ beq $v0, $zero, .L808404F4 -/* 0E2B0 808404C0 00000000 */ nop -/* 0E2B4 808404C4 0C20CB6F */ jal func_80832DBC -/* 0E2B8 808404C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E2BC 808404CC 0C20CD39 */ jal func_808334E4 -/* 0E2C0 808404D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E2C4 808404D4 8FA4004C */ lw $a0, 0x004C($sp) -/* 0E2C8 808404D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0E2CC 808404DC 0C20C8A1 */ jal func_80832284 -/* 0E2D0 808404E0 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 0E2D4 808404E4 920B0692 */ lbu $t3, 0x0692($s0) ## 00000692 -/* 0E2D8 808404E8 A6000850 */ sh $zero, 0x0850($s0) ## 00000850 -/* 0E2DC 808404EC 316CFFF7 */ andi $t4, $t3, 0xFFF7 ## $t4 = 00000000 -/* 0E2E0 808404F0 A20C0692 */ sb $t4, 0x0692($s0) ## 00000692 -.L808404F4: -/* 0E2E4 808404F4 0C20CF0F */ jal func_80833C3C -/* 0E2E8 808404F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E2EC 808404FC 10000003 */ beq $zero, $zero, .L8084050C -/* 0E2F0 80840500 00000000 */ nop -.L80840504: -/* 0E2F4 80840504 0C21006C */ jal func_808401B0 -/* 0E2F8 80840508 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L8084050C: -/* 0E2FC 8084050C 0C20DC87 */ jal func_8083721C -/* 0E300 80840510 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E304 80840514 3C068085 */ lui $a2, %hi(D_808543E0) ## $a2 = 80850000 -/* 0E308 80840518 24C643E0 */ addiu $a2, $a2, %lo(D_808543E0) ## $a2 = 808543E0 -/* 0E30C 8084051C 8FA4004C */ lw $a0, 0x004C($sp) -/* 0E310 80840520 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0E314 80840524 0C20DCD2 */ jal func_80837348 -/* 0E318 80840528 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0E31C 8084052C 544000A3 */ bnel $v0, $zero, .L808407BC -/* 0E320 80840530 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0E324 80840534 0C20CED5 */ jal func_80833B54 -/* 0E328 80840538 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E32C 8084053C 5440000F */ bnel $v0, $zero, .L8084057C -/* 0E330 80840540 8FAF004C */ lw $t7, 0x004C($sp) -/* 0E334 80840544 0C20CECB */ jal func_80833B2C -/* 0E338 80840548 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E33C 8084054C 10400006 */ beq $v0, $zero, .L80840568 -/* 0E340 80840550 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E344 80840554 8E0D082C */ lw $t5, 0x082C($s0) ## 0000082C -/* 0E348 80840558 3C0E8083 */ lui $t6, %hi(func_80834B5C) ## $t6 = 80830000 -/* 0E34C 8084055C 25CE4B5C */ addiu $t6, $t6, %lo(func_80834B5C) ## $t6 = 80834B5C -/* 0E350 80840560 51AE0006 */ beql $t5, $t6, .L8084057C -/* 0E354 80840564 8FAF004C */ lw $t7, 0x004C($sp) -.L80840568: -/* 0E358 80840568 0C20F3C4 */ jal func_8083CF10 -/* 0E35C 8084056C 8FA5004C */ lw $a1, 0x004C($sp) -/* 0E360 80840570 10000092 */ beq $zero, $zero, .L808407BC -/* 0E364 80840574 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0E368 80840578 8FAF004C */ lw $t7, 0x004C($sp) -.L8084057C: -/* 0E36C 8084057C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E370 80840580 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFFC -/* 0E374 80840584 27A60042 */ addiu $a2, $sp, 0x0042 ## $a2 = FFFFFFFA -/* 0E378 80840588 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0E37C 8084058C 0C20DC9A */ jal func_80837268 -/* 0E380 80840590 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0E384 80840594 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E388 80840598 8FA50044 */ lw $a1, 0x0044($sp) -/* 0E38C 8084059C 0C20FF1A */ jal func_8083FC68 -/* 0E390 808405A0 87A60042 */ lh $a2, 0x0042($sp) -/* 0E394 808405A4 18400006 */ blez $v0, .L808405C0 -/* 0E398 808405A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E39C 808405AC 8FA5004C */ lw $a1, 0x004C($sp) -/* 0E3A0 808405B0 0C20F237 */ jal func_8083C8DC -/* 0E3A4 808405B4 87A60042 */ lh $a2, 0x0042($sp) -/* 0E3A8 808405B8 10000080 */ beq $zero, $zero, .L808407BC -/* 0E3AC 808405BC 8FBF0024 */ lw $ra, 0x0024($sp) -.L808405C0: -/* 0E3B0 808405C0 04410007 */ bgez $v0, .L808405E0 -/* 0E3B4 808405C4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 0E3B8 808405C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E3BC 808405CC 87A50042 */ lh $a1, 0x0042($sp) -/* 0E3C0 808405D0 0C20F2FC */ jal func_8083CBF0 -/* 0E3C4 808405D4 8FA6004C */ lw $a2, 0x004C($sp) -/* 0E3C8 808405D8 10000078 */ beq $zero, $zero, .L808407BC -/* 0E3CC 808405DC 8FBF0024 */ lw $ra, 0x0024($sp) -.L808405E0: -/* 0E3D0 808405E0 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 -/* 0E3D4 808405E4 C7A60044 */ lwc1 $f6, 0x0044($sp) -/* 0E3D8 808405E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E3DC 808405EC 3C018085 */ lui $at, %hi(D_808553FC) ## $at = 80850000 -/* 0E3E0 808405F0 4606203C */ c.lt.s $f4, $f6 -/* 0E3E4 808405F4 00000000 */ nop -/* 0E3E8 808405F8 45020006 */ bc1fl .L80840614 -/* 0E3EC 808405FC C6080838 */ lwc1 $f8, 0x0838($s0) ## 00000838 -/* 0E3F0 80840600 0C20F327 */ jal func_8083CC9C -/* 0E3F4 80840604 8FA5004C */ lw $a1, 0x004C($sp) -/* 0E3F8 80840608 1000006C */ beq $zero, $zero, .L808407BC -/* 0E3FC 8084060C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0E400 80840610 C6080838 */ lwc1 $f8, 0x0838($s0) ## 00000838 -.L80840614: -/* 0E404 80840614 C42A53FC */ lwc1 $f10, %lo(D_808553FC)($at) -/* 0E408 80840618 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0E40C 8084061C 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 0E410 80840620 460A4402 */ mul.s $f16, $f8, $f10 -/* 0E414 80840624 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E418 80840628 46128100 */ add.s $f4, $f16, $f18 -/* 0E41C 8084062C 44052000 */ mfc1 $a1, $f4 -/* 0E420 80840630 0C2100A7 */ jal func_8084029C -/* 0E424 80840634 00000000 */ nop -/* 0E428 80840638 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E42C 8084063C 8FA50044 */ lw $a1, 0x0044($sp) -/* 0E430 80840640 0C21004E */ jal func_80840138 -/* 0E434 80840644 87A60042 */ lh $a2, 0x0042($sp) -/* 0E438 80840648 4458F800 */ cfc1 $t8, $31 -/* 0E43C 8084064C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0E440 80840650 44C2F800 */ ctc1 $v0, $31 -/* 0E444 80840654 C6060868 */ lwc1 $f6, 0x0868($s0) ## 00000868 -/* 0E448 80840658 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 0E44C 8084065C 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 0E450 80840660 46003224 */ cvt.w.s $f8, $f6 -/* 0E454 80840664 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0E458 80840668 4442F800 */ cfc1 $v0, $31 -/* 0E45C 8084066C 00000000 */ nop -/* 0E460 80840670 30420078 */ andi $v0, $v0, 0x0078 ## $v0 = 00000000 -/* 0E464 80840674 50400013 */ beql $v0, $zero, .L808406C4 -/* 0E468 80840678 44024000 */ mfc1 $v0, $f8 -/* 0E46C 8084067C 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 0E470 80840680 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0E474 80840684 46083201 */ sub.s $f8, $f6, $f8 -/* 0E478 80840688 44C2F800 */ ctc1 $v0, $31 -/* 0E47C 8084068C 00000000 */ nop -/* 0E480 80840690 46004224 */ cvt.w.s $f8, $f8 -/* 0E484 80840694 4442F800 */ cfc1 $v0, $31 -/* 0E488 80840698 00000000 */ nop -/* 0E48C 8084069C 30420078 */ andi $v0, $v0, 0x0078 ## $v0 = 00000000 -/* 0E490 808406A0 14400005 */ bne $v0, $zero, .L808406B8 -/* 0E494 808406A4 00000000 */ nop -/* 0E498 808406A8 44024000 */ mfc1 $v0, $f8 -/* 0E49C 808406AC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0E4A0 808406B0 10000007 */ beq $zero, $zero, .L808406D0 -/* 0E4A4 808406B4 00411025 */ or $v0, $v0, $at ## $v0 = 80000000 -.L808406B8: -/* 0E4A8 808406B8 10000005 */ beq $zero, $zero, .L808406D0 -/* 0E4AC 808406BC 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 0E4B0 808406C0 44024000 */ mfc1 $v0, $f8 -.L808406C4: -/* 0E4B4 808406C4 00000000 */ nop -/* 0E4B8 808406C8 0440FFFB */ bltz $v0, .L808406B8 -/* 0E4BC 808406CC 00000000 */ nop -.L808406D0: -/* 0E4C0 808406D0 44D8F800 */ ctc1 $t8, $31 -/* 0E4C4 808406D4 2C410006 */ sltiu $at, $v0, 0x0006 -/* 0E4C8 808406D8 14200004 */ bne $at, $zero, .L808406EC -/* 0E4CC 808406DC 2459FFF2 */ addiu $t9, $v0, 0xFFF2 ## $t9 = FFFFFFF1 -/* 0E4D0 808406E0 2F210006 */ sltiu $at, $t9, 0x0006 -/* 0E4D4 808406E4 10200005 */ beq $at, $zero, .L808406FC -/* 0E4D8 808406E8 87A80042 */ lh $t0, 0x0042($sp) -.L808406EC: -/* 0E4DC 808406EC 0C01DE80 */ jal Math_ApproxF - -/* 0E4E0 808406F0 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 0E4E4 808406F4 10000031 */ beq $zero, $zero, .L808407BC -/* 0E4E8 808406F8 8FBF0024 */ lw $ra, 0x0024($sp) -.L808406FC: -/* 0E4EC 808406FC 8609083C */ lh $t1, 0x083C($s0) ## 0000083C -/* 0E4F0 80840700 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 0E4F4 80840704 C7AA0044 */ lwc1 $f10, 0x0044($sp) -/* 0E4F8 80840708 01091023 */ subu $v0, $t0, $t1 -/* 0E4FC 8084070C 00021400 */ sll $v0, $v0, 16 -/* 0E500 80840710 00021403 */ sra $v0, $v0, 16 -/* 0E504 80840714 04400003 */ bltz $v0, .L80840724 -/* 0E508 80840718 00021823 */ subu $v1, $zero, $v0 -/* 0E50C 8084071C 10000001 */ beq $zero, $zero, .L80840724 -/* 0E510 80840720 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80840724: -/* 0E514 80840724 28614001 */ slti $at, $v1, 0x4001 -/* 0E518 80840728 14200007 */ bne $at, $zero, .L80840748 -/* 0E51C 8084072C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0E520 80840730 0C01DE80 */ jal Math_ApproxF - -/* 0E524 80840734 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 0E528 80840738 1040001F */ beq $v0, $zero, .L808407B8 -/* 0E52C 8084073C 87AA0042 */ lh $t2, 0x0042($sp) -/* 0E530 80840740 1000001D */ beq $zero, $zero, .L808407B8 -/* 0E534 80840744 A60A083C */ sh $t2, 0x083C($s0) ## 0000083C -.L80840748: -/* 0E538 80840748 3C018085 */ lui $at, %hi(D_80855400) ## $at = 80850000 -/* 0E53C 8084074C C4305400 */ lwc1 $f16, %lo(D_80855400)($at) -/* 0E540 80840750 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 0E544 80840754 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 0E548 80840758 46105482 */ mul.s $f18, $f10, $f16 -/* 0E54C 8084075C 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 0E550 80840760 AFA30030 */ sw $v1, 0x0030($sp) -/* 0E554 80840764 44059000 */ mfc1 $a1, $f18 -/* 0E558 80840768 0C01DF1B */ jal func_80077C6C -/* 0E55C 8084076C 00000000 */ nop -/* 0E560 80840770 920B0692 */ lbu $t3, 0x0692($s0) ## 00000692 -/* 0E564 80840774 8FA30030 */ lw $v1, 0x0030($sp) -/* 0E568 80840778 316C0008 */ andi $t4, $t3, 0x0008 ## $t4 = 00000000 -/* 0E56C 8084077C 5580000F */ bnel $t4, $zero, .L808407BC -/* 0E570 80840780 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0E574 80840784 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 -/* 0E578 80840788 3C018085 */ lui $at, %hi(D_80855404) ## $at = 80850000 -/* 0E57C 8084078C C4285404 */ lwc1 $f8, %lo(D_80855404)($at) -/* 0E580 80840790 468021A0 */ cvt.s.w $f6, $f4 -/* 0E584 80840794 2604083C */ addiu $a0, $s0, 0x083C ## $a0 = 0000083C -/* 0E588 80840798 87A50042 */ lh $a1, 0x0042($sp) -/* 0E58C 8084079C 46083282 */ mul.s $f10, $f6, $f8 -/* 0E590 808407A0 4600540D */ trunc.w.s $f16, $f10 -/* 0E594 808407A4 44068000 */ mfc1 $a2, $f16 -/* 0E598 808407A8 00000000 */ nop -/* 0E59C 808407AC 00063400 */ sll $a2, $a2, 16 -/* 0E5A0 808407B0 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 0E5A4 808407B4 00063403 */ sra $a2, $a2, 16 -.L808407B8: -/* 0E5A8 808407B8 8FBF0024 */ lw $ra, 0x0024($sp) -.L808407BC: -/* 0E5AC 808407BC 8FB00020 */ lw $s0, 0x0020($sp) -/* 0E5B0 808407C0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 0E5B4 808407C4 03E00008 */ jr $ra -/* 0E5B8 808407C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808407CC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808407CC.s deleted file mode 100644 index ae3f171edd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808407CC.s +++ /dev/null @@ -1,145 +0,0 @@ -.late_rodata -glabel D_80855408 - .word 0x409CCCCD - -.text -glabel func_808407CC -/* 0E5BC 808407CC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0E5C0 808407D0 AFB0001C */ sw $s0, 0x001C($sp) -/* 0E5C4 808407D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0E5C8 808407D8 AFB10020 */ sw $s1, 0x0020($sp) -/* 0E5CC 808407DC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0E5D0 808407E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0E5D4 808407E4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0E5D8 808407E8 0C028EF0 */ jal func_800A3BC0 -/* 0E5DC 808407EC 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0E5E0 808407F0 10400009 */ beq $v0, $zero, .L80840818 -/* 0E5E4 808407F4 00000000 */ nop -/* 0E5E8 808407F8 0C20CB6F */ jal func_80832DBC -/* 0E5EC 808407FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E5F0 80840800 0C20CCCE */ jal func_80833338 -/* 0E5F4 80840804 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E5F8 80840808 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0E5FC 8084080C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0E600 80840810 0C20C899 */ jal func_80832264 -/* 0E604 80840814 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -.L80840818: -/* 0E608 80840818 0C20DC87 */ jal func_8083721C -/* 0E60C 8084081C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E610 80840820 3C068085 */ lui $a2, %hi(D_808543E8) ## $a2 = 80850000 -/* 0E614 80840824 24C643E8 */ addiu $a2, $a2, %lo(D_808543E8) ## $a2 = 808543E8 -/* 0E618 80840828 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0E61C 8084082C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0E620 80840830 0C20DCD2 */ jal func_80837348 -/* 0E624 80840834 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0E628 80840838 54400060 */ bnel $v0, $zero, .L808409BC -/* 0E62C 8084083C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0E630 80840840 0C20CED5 */ jal func_80833B54 -/* 0E634 80840844 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E638 80840848 10400005 */ beq $v0, $zero, .L80840860 -/* 0E63C 8084084C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E640 80840850 0C20F3AB */ jal func_8083CEAC -/* 0E644 80840854 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0E648 80840858 10000058 */ beq $zero, $zero, .L808409BC -/* 0E64C 8084085C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80840860: -/* 0E650 80840860 0C20CECB */ jal func_80833B2C -/* 0E654 80840864 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E658 80840868 14400009 */ bne $v0, $zero, .L80840890 -/* 0E65C 8084086C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0E660 80840870 3C068084 */ lui $a2, %hi(func_80840BC8) ## $a2 = 80840000 -/* 0E664 80840874 24C60BC8 */ addiu $a2, $a2, %lo(func_80840BC8) ## $a2 = 80840BC8 -/* 0E668 80840878 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0E66C 8084087C 0C20D76B */ jal func_80835DAC -/* 0E670 80840880 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0E674 80840884 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 0E678 80840888 1000004B */ beq $zero, $zero, .L808409B8 -/* 0E67C 8084088C A60E083C */ sh $t6, 0x083C($s0) ## 0000083C -.L80840890: -/* 0E680 80840890 8E0F082C */ lw $t7, 0x082C($s0) ## 0000082C -/* 0E684 80840894 3C188083 */ lui $t8, %hi(func_80834B5C) ## $t8 = 80830000 -/* 0E688 80840898 27184B5C */ addiu $t8, $t8, %lo(func_80834B5C) ## $t8 = 80834B5C -/* 0E68C 8084089C 15F80006 */ bne $t7, $t8, .L808408B8 -/* 0E690 808408A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E694 808408A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E698 808408A8 0C20F3AB */ jal func_8083CEAC -/* 0E69C 808408AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0E6A0 808408B0 10000042 */ beq $zero, $zero, .L808409BC -/* 0E6A4 808408B4 8FBF0024 */ lw $ra, 0x0024($sp) -.L808408B8: -/* 0E6A8 808408B8 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFFC -/* 0E6AC 808408BC 27A6003A */ addiu $a2, $sp, 0x003A ## $a2 = FFFFFFFA -/* 0E6B0 808408C0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0E6B4 808408C4 0C20DC9A */ jal func_80837268 -/* 0E6B8 808408C8 AFB10010 */ sw $s1, 0x0010($sp) -/* 0E6BC 808408CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E6C0 808408D0 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFFC -/* 0E6C4 808408D4 27A6003A */ addiu $a2, $sp, 0x003A ## $a2 = FFFFFFFA -/* 0E6C8 808408D8 0C20FF5E */ jal func_8083FD78 -/* 0E6CC 808408DC 02203825 */ or $a3, $s1, $zero ## $a3 = 00000000 -/* 0E6D0 808408E0 18400006 */ blez $v0, .L808408FC -/* 0E6D4 808408E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E6D8 808408E8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0E6DC 808408EC 0C20F237 */ jal func_8083C8DC -/* 0E6E0 808408F0 87A6003A */ lh $a2, 0x003A($sp) -/* 0E6E4 808408F4 10000031 */ beq $zero, $zero, .L808409BC -/* 0E6E8 808408F8 8FBF0024 */ lw $ra, 0x0024($sp) -.L808408FC: -/* 0E6EC 808408FC 04410007 */ bgez $v0, .L8084091C -/* 0E6F0 80840900 C7A0003C */ lwc1 $f0, 0x003C($sp) -/* 0E6F4 80840904 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E6F8 80840908 87A5003A */ lh $a1, 0x003A($sp) -/* 0E6FC 8084090C 0C20F2CB */ jal func_8083CB2C -/* 0E700 80840910 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 0E704 80840914 10000029 */ beq $zero, $zero, .L808409BC -/* 0E708 80840918 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084091C: -/* 0E70C 8084091C 3C018085 */ lui $at, %hi(D_80855408) ## $at = 80850000 -/* 0E710 80840920 C4245408 */ lwc1 $f4, %lo(D_80855408)($at) -/* 0E714 80840924 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E718 80840928 4600203C */ c.lt.s $f4, $f0 -/* 0E71C 8084092C 00000000 */ nop -/* 0E720 80840930 45020008 */ bc1fl .L80840954 -/* 0E724 80840934 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0E728 80840938 0C20F327 */ jal func_8083CC9C -/* 0E72C 8084093C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0E730 80840940 0C20CF0F */ jal func_80833C3C -/* 0E734 80840944 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E738 80840948 1000001C */ beq $zero, $zero, .L808409BC -/* 0E73C 8084094C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0E740 80840950 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -.L80840954: -/* 0E744 80840954 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E748 80840958 87B9003A */ lh $t9, 0x003A($sp) -/* 0E74C 8084095C 46060032 */ c.eq.s $f0, $f6 -/* 0E750 80840960 00000000 */ nop -/* 0E754 80840964 45030006 */ bc1tl .L80840980 -/* 0E758 80840968 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 0E75C 8084096C 0C20F2E5 */ jal func_8083CB94 -/* 0E760 80840970 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0E764 80840974 10000011 */ beq $zero, $zero, .L808409BC -/* 0E768 80840978 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0E76C 8084097C 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -.L80840980: -/* 0E770 80840980 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0E774 80840984 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0E778 80840988 03281023 */ subu $v0, $t9, $t0 -/* 0E77C 8084098C 00021400 */ sll $v0, $v0, 16 -/* 0E780 80840990 00021403 */ sra $v0, $v0, 16 -/* 0E784 80840994 04400003 */ bltz $v0, .L808409A4 -/* 0E788 80840998 00021823 */ subu $v1, $zero, $v0 -/* 0E78C 8084099C 10000001 */ beq $zero, $zero, .L808409A4 -/* 0E790 808409A0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L808409A4: -/* 0E794 808409A4 28610321 */ slti $at, $v1, 0x0321 -/* 0E798 808409A8 54200004 */ bnel $at, $zero, .L808409BC -/* 0E79C 808409AC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0E7A0 808409B0 0C20F355 */ jal func_8083CD54 -/* 0E7A4 808409B4 87A6003A */ lh $a2, 0x003A($sp) -.L808409B8: -/* 0E7A8 808409B8 8FBF0024 */ lw $ra, 0x0024($sp) -.L808409BC: -/* 0E7AC 808409BC 8FB0001C */ lw $s0, 0x001C($sp) -/* 0E7B0 808409C0 8FB10020 */ lw $s1, 0x0020($sp) -/* 0E7B4 808409C4 03E00008 */ jr $ra -/* 0E7B8 808409C8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s index fdf1c5c2d0..db560d98bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s @@ -1,6 +1,6 @@ .late_rodata glabel D_8085540C - .word 0x3F2AAAAB + .float 0.666666686535 .text glabel func_808409CC @@ -88,7 +88,7 @@ glabel func_808409CC /* 0E8E0 80840AF0 10410007 */ beq $v0, $at, .L80840B10 /* 0E8E4 80840AF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0E8E8 80840AF8 AFA30034 */ sw $v1, 0x0034($sp) -/* 0E8EC 80840AFC 0C023C60 */ jal func_8008F180 +/* 0E8EC 80840AFC 0C023C60 */ jal Player_GetSwordHeld /* 0E8F0 80840B00 AFA50038 */ sw $a1, 0x0038($sp) /* 0E8F4 80840B04 8FA30034 */ lw $v1, 0x0034($sp) /* 0E8F8 80840B08 10400009 */ beq $v0, $zero, .L80840B30 @@ -96,7 +96,7 @@ glabel func_808409CC .L80840B10: /* 0E900 80840B10 14600006 */ bne $v1, $zero, .L80840B2C /* 0E904 80840B14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E908 80840B18 0C023C68 */ jal func_8008F1A0 +/* 0E908 80840B18 0C023C68 */ jal Player_HoldsTwoHandedWeapon /* 0E90C 80840B1C AFA30034 */ sw $v1, 0x0034($sp) /* 0E910 80840B20 10400002 */ beq $v0, $zero, .L80840B2C /* 0E914 80840B24 8FA30034 */ lw $v1, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840BC8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840BC8.s deleted file mode 100644 index 5ac93c484e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840BC8.s +++ /dev/null @@ -1,150 +0,0 @@ -glabel func_80840BC8 -/* 0E9B8 80840BC8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0E9BC 80840BCC AFBF0024 */ sw $ra, 0x0024($sp) -/* 0E9C0 80840BD0 AFB00020 */ sw $s0, 0x0020($sp) -/* 0E9C4 80840BD4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0E9C8 80840BD8 0C20CCD4 */ jal func_80833350 -/* 0E9CC 80840BDC AFA5004C */ sw $a1, 0x004C($sp) -/* 0E9D0 80840BE0 8FA4004C */ lw $a0, 0x004C($sp) -/* 0E9D4 80840BE4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0E9D8 80840BE8 0C028EF0 */ jal func_800A3BC0 -/* 0E9DC 80840BEC AFA20044 */ sw $v0, 0x0044($sp) -/* 0E9E0 80840BF0 8FA30044 */ lw $v1, 0x0044($sp) -/* 0E9E4 80840BF4 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 0E9E8 80840BF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E9EC 80840BFC 18600004 */ blez $v1, .L80840C10 -/* 0E9F0 80840C00 2465FFFF */ addiu $a1, $v1, 0xFFFF ## $a1 = FFFFFFFF -/* 0E9F4 80840C04 0C20CCFF */ jal func_808333FC -/* 0E9F8 80840C08 AFA20040 */ sw $v0, 0x0040($sp) -/* 0E9FC 80840C0C 8FA60040 */ lw $a2, 0x0040($sp) -.L80840C10: -/* 0EA00 80840C10 10C00021 */ beq $a2, $zero, .L80840C98 -/* 0EA04 80840C14 00000000 */ nop -/* 0EA08 80840C18 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 0EA0C 80840C1C 10600019 */ beq $v1, $zero, .L80840C84 -/* 0EA10 80840C20 00000000 */ nop -/* 0EA14 80840C24 14600003 */ bne $v1, $zero, .L80840C34 -/* 0EA18 80840C28 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 0EA1C 80840C2C 10000004 */ beq $zero, $zero, .L80840C40 -/* 0EA20 80840C30 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80840C34: -/* 0EA24 80840C34 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -/* 0EA28 80840C38 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 0EA2C 80840C3C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80840C40: -/* 0EA30 80840C40 14400006 */ bne $v0, $zero, .L80840C5C -/* 0EA34 80840C44 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0EA38 80840C48 C60401C8 */ lwc1 $f4, 0x01C8($s0) ## 000001C8 -/* 0EA3C 80840C4C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0EA40 80840C50 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 0EA44 80840C54 46062201 */ sub.s $f8, $f4, $f6 -/* 0EA48 80840C58 E60801C4 */ swc1 $f8, 0x01C4($s0) ## 000001C4 -.L80840C5C: -/* 0EA4C 80840C5C 8E0201D4 */ lw $v0, 0x01D4($s0) ## 000001D4 -/* 0EA50 80840C60 30780001 */ andi $t8, $v1, 0x0001 ## $t8 = 00000000 -/* 0EA54 80840C64 0018C880 */ sll $t9, $t8, 2 -/* 0EA58 80840C68 844F0002 */ lh $t7, 0x0002($v0) ## 00000002 -/* 0EA5C 80840C6C 0338C821 */ addu $t9, $t9, $t8 -/* 0EA60 80840C70 0019C900 */ sll $t9, $t9, 4 -/* 0EA64 80840C74 01F94021 */ addu $t0, $t7, $t9 -/* 0EA68 80840C78 2509FFD8 */ addiu $t1, $t0, 0xFFD8 ## $t1 = FFFFFFD8 -/* 0EA6C 80840C7C 10000006 */ beq $zero, $zero, .L80840C98 -/* 0EA70 80840C80 A4490002 */ sh $t1, 0x0002($v0) ## 00000002 -.L80840C84: -/* 0EA74 80840C84 0C20CB6F */ jal func_80832DBC -/* 0EA78 80840C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EA7C 80840C8C 8FA4004C */ lw $a0, 0x004C($sp) -/* 0EA80 80840C90 0C210273 */ jal func_808409CC -/* 0EA84 80840C94 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L80840C98: -/* 0EA88 80840C98 0C20DC87 */ jal func_8083721C -/* 0EA8C 80840C9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EA90 80840CA0 860A0850 */ lh $t2, 0x0850($s0) ## 00000850 -/* 0EA94 80840CA4 8FA4004C */ lw $a0, 0x004C($sp) -/* 0EA98 80840CA8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0EA9C 80840CAC 15400048 */ bne $t2, $zero, .L80840DD0 -/* 0EAA0 80840CB0 3C068085 */ lui $a2, %hi(D_80854418) ## $a2 = 80850000 -/* 0EAA4 80840CB4 24C64418 */ addiu $a2, $a2, %lo(D_80854418) ## $a2 = 80854418 -/* 0EAA8 80840CB8 0C20DCD2 */ jal func_80837348 -/* 0EAAC 80840CBC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0EAB0 80840CC0 54400044 */ bnel $v0, $zero, .L80840DD4 -/* 0EAB4 80840CC4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0EAB8 80840CC8 0C20CED5 */ jal func_80833B54 -/* 0EABC 80840CCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EAC0 80840CD0 10400005 */ beq $v0, $zero, .L80840CE8 -/* 0EAC4 80840CD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EAC8 80840CD8 0C20F3AB */ jal func_8083CEAC -/* 0EACC 80840CDC 8FA5004C */ lw $a1, 0x004C($sp) -/* 0EAD0 80840CE0 1000003C */ beq $zero, $zero, .L80840DD4 -/* 0EAD4 80840CE4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80840CE8: -/* 0EAD8 80840CE8 0C20CECB */ jal func_80833B2C -/* 0EADC 80840CEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EAE0 80840CF0 10400006 */ beq $v0, $zero, .L80840D0C -/* 0EAE4 80840CF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EAE8 80840CF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EAEC 80840CFC 0C20E7CC */ jal func_80839F30 -/* 0EAF0 80840D00 8FA5004C */ lw $a1, 0x004C($sp) -/* 0EAF4 80840D04 10000033 */ beq $zero, $zero, .L80840DD4 -/* 0EAF8 80840D08 8FBF0024 */ lw $ra, 0x0024($sp) -.L80840D0C: -/* 0EAFC 80840D0C 8FAB004C */ lw $t3, 0x004C($sp) -/* 0EB00 80840D10 3C073C93 */ lui $a3, 0x3C93 ## $a3 = 3C930000 -/* 0EB04 80840D14 34E774BC */ ori $a3, $a3, 0x74BC ## $a3 = 3C9374BC -/* 0EB08 80840D18 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFF4 -/* 0EB0C 80840D1C 27A6003A */ addiu $a2, $sp, 0x003A ## $a2 = FFFFFFF2 -/* 0EB10 80840D20 0C20DC9A */ jal func_80837268 -/* 0EB14 80840D24 AFAB0010 */ sw $t3, 0x0010($sp) -/* 0EB18 80840D28 C7AA003C */ lwc1 $f10, 0x003C($sp) -/* 0EB1C 80840D2C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0EB20 80840D30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EB24 80840D34 8FA5004C */ lw $a1, 0x004C($sp) -/* 0EB28 80840D38 46105032 */ c.eq.s $f10, $f16 -/* 0EB2C 80840D3C 87AC003A */ lh $t4, 0x003A($sp) -/* 0EB30 80840D40 45030006 */ bc1tl .L80840D5C -/* 0EB34 80840D44 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 -/* 0EB38 80840D48 0C20F237 */ jal func_8083C8DC -/* 0EB3C 80840D4C 87A6003A */ lh $a2, 0x003A($sp) -/* 0EB40 80840D50 10000020 */ beq $zero, $zero, .L80840DD4 -/* 0EB44 80840D54 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0EB48 80840D58 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 -.L80840D5C: -/* 0EB4C 80840D5C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 0EB50 80840D60 87A5003A */ lh $a1, 0x003A($sp) -/* 0EB54 80840D64 018D1823 */ subu $v1, $t4, $t5 -/* 0EB58 80840D68 00031C00 */ sll $v1, $v1, 16 -/* 0EB5C 80840D6C 00031C03 */ sra $v1, $v1, 16 -/* 0EB60 80840D70 04600003 */ bltz $v1, .L80840D80 -/* 0EB64 80840D74 00031023 */ subu $v0, $zero, $v1 -/* 0EB68 80840D78 10000001 */ beq $zero, $zero, .L80840D80 -/* 0EB6C 80840D7C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80840D80: -/* 0EB70 80840D80 28410321 */ slti $at, $v0, 0x0321 -/* 0EB74 80840D84 14200006 */ bne $at, $zero, .L80840DA0 -/* 0EB78 80840D88 87A6003A */ lh $a2, 0x003A($sp) -/* 0EB7C 80840D8C 8FA4004C */ lw $a0, 0x004C($sp) -/* 0EB80 80840D90 0C20F355 */ jal func_8083CD54 -/* 0EB84 80840D94 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0EB88 80840D98 1000000E */ beq $zero, $zero, .L80840DD4 -/* 0EB8C 80840D9C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80840DA0: -/* 0EB90 80840DA0 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 0EB94 80840DA4 240604B0 */ addiu $a2, $zero, 0x04B0 ## $a2 = 000004B0 -/* 0EB98 80840DA8 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 0EB9C 80840DAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EBA0 80840DB0 0C20CCCE */ jal func_80833338 -/* 0EBA4 80840DB4 A60E083C */ sh $t6, 0x083C($s0) ## 0000083C -/* 0EBA8 80840DB8 8E1801BC */ lw $t8, 0x01BC($s0) ## 000001BC -/* 0EBAC 80840DBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EBB0 80840DC0 54580004 */ bnel $v0, $t8, .L80840DD4 -/* 0EBB4 80840DC4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0EBB8 80840DC8 0C20F715 */ jal func_8083DC54 -/* 0EBBC 80840DCC 8FA5004C */ lw $a1, 0x004C($sp) -.L80840DD0: -/* 0EBC0 80840DD0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80840DD4: -/* 0EBC4 80840DD4 8FB00020 */ lw $s0, 0x0020($sp) -/* 0EBC8 80840DD8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 0EBCC 80840DDC 03E00008 */ jr $ra -/* 0EBD0 80840DE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840DE4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840DE4.s deleted file mode 100644 index 41baaaecaa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80840DE4.s +++ /dev/null @@ -1,242 +0,0 @@ -.late_rodata -glabel D_80855410 - .word 0x409CCCCD -glabel D_80855414 - .float 0.4 - -glabel D_80855418 - .float 0.1 - -.text -glabel func_80840DE4 -/* 0EBD4 80840DE4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0EBD8 80840DE8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0EBDC 80840DEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0EBE0 80840DF0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0EBE4 80840DF4 AFA50054 */ sw $a1, 0x0054($sp) -/* 0EBE8 80840DF8 A08001B5 */ sb $zero, 0x01B5($a0) ## 000001B5 -/* 0EBEC 80840DFC 248401B4 */ addiu $a0, $a0, 0x01B4 ## $a0 = 000001B4 -/* 0EBF0 80840E00 0C028EE3 */ jal func_800A3B8C -/* 0EBF4 80840E04 AFA4002C */ sw $a0, 0x002C($sp) -/* 0EBF8 80840E08 0C20CD5B */ jal func_8083356C -/* 0EBFC 80840E0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EC00 80840E10 3C0E0400 */ lui $t6, 0x0400 ## $t6 = 04000000 -/* 0EC04 80840E14 25CE26E8 */ addiu $t6, $t6, 0x26E8 ## $t6 = 040026E8 -/* 0EC08 80840E18 144E000E */ bne $v0, $t6, .L80840E54 -/* 0EC0C 80840E1C AE0201BC */ sw $v0, 0x01BC($s0) ## 000001BC -/* 0EC10 80840E20 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 0EC14 80840E24 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 0EC18 80840E28 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 -/* 0EC1C 80840E2C 44810000 */ mtc1 $at, $f0 ## $f0 = 24.00 -/* 0EC20 80840E30 85F80492 */ lh $t8, 0x0492($t7) ## 80160492 -/* 0EC24 80840E34 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0EC28 80840E38 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 0EC2C 80840E3C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 0EC30 80840E40 00000000 */ nop -/* 0EC34 80840E44 468021A0 */ cvt.s.w $f6, $f4 -/* 0EC38 80840E48 46083083 */ div.s $f2, $f6, $f8 -/* 0EC3C 80840E4C 1000000C */ beq $zero, $zero, .L80840E80 -/* 0EC40 80840E50 46001087 */ neg.s $f2, $f2 -.L80840E54: -/* 0EC44 80840E54 3C198016 */ lui $t9, %hi(gGameInfo) -/* 0EC48 80840E58 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) -/* 0EC4C 80840E5C 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -/* 0EC50 80840E60 44810000 */ mtc1 $at, $f0 ## $f0 = 29.00 -/* 0EC54 80840E64 87280492 */ lh $t0, 0x0492($t9) ## 80160492 -/* 0EC58 80840E68 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0EC5C 80840E6C 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 0EC60 80840E70 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 0EC64 80840E74 00000000 */ nop -/* 0EC68 80840E78 46805420 */ cvt.s.w $f16, $f10 -/* 0EC6C 80840E7C 46128083 */ div.s $f2, $f16, $f18 -.L80840E80: -/* 0EC70 80840E80 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0EC74 80840E84 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 0EC78 80840E88 8609083C */ lh $t1, 0x083C($s0) ## 0000083C -/* 0EC7C 80840E8C 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 0EC80 80840E90 46040181 */ sub.s $f6, $f0, $f4 -/* 0EC84 80840E94 E60001C8 */ swc1 $f0, 0x01C8($s0) ## 000001C8 -/* 0EC88 80840E98 012A5823 */ subu $t3, $t1, $t2 -/* 0EC8C 80840E9C 000B6400 */ sll $t4, $t3, 16 -/* 0EC90 80840EA0 000C6C03 */ sra $t5, $t4, 16 -/* 0EC94 80840EA4 05A00003 */ bltz $t5, .L80840EB4 -/* 0EC98 80840EA8 E60601C4 */ swc1 $f6, 0x01C4($s0) ## 000001C4 -/* 0EC9C 80840EAC 10000002 */ beq $zero, $zero, .L80840EB8 -/* 0ECA0 80840EB0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80840EB4: -/* 0ECA4 80840EB4 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -.L80840EB8: -/* 0ECA8 80840EB8 C6100838 */ lwc1 $f16, 0x0838($s0) ## 00000838 -/* 0ECAC 80840EBC 44824000 */ mtc1 $v0, $f8 ## $f8 = NaN -/* 0ECB0 80840EC0 46028482 */ mul.s $f18, $f16, $f2 -/* 0ECB4 80840EC4 468042A0 */ cvt.s.w $f10, $f8 -/* 0ECB8 80840EC8 46125102 */ mul.s $f4, $f10, $f18 -/* 0ECBC 80840ECC E60401D0 */ swc1 $f4, 0x01D0($s0) ## 000001D0 -/* 0ECC0 80840ED0 E7A0004C */ swc1 $f0, 0x004C($sp) -/* 0ECC4 80840ED4 8FA5002C */ lw $a1, 0x002C($sp) -/* 0ECC8 80840ED8 0C028EF0 */ jal func_800A3BC0 -/* 0ECCC 80840EDC 8FA40054 */ lw $a0, 0x0054($sp) -/* 0ECD0 80840EE0 8FA4002C */ lw $a0, 0x002C($sp) -/* 0ECD4 80840EE4 0C02914C */ jal func_800A4530 -/* 0ECD8 80840EE8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0ECDC 80840EEC 14400009 */ bne $v0, $zero, .L80840F14 -/* 0ECE0 80840EF0 C7A0004C */ lwc1 $f0, 0x004C($sp) -/* 0ECE4 80840EF4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0ECE8 80840EF8 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 0ECEC 80840EFC 8FA4002C */ lw $a0, 0x002C($sp) -/* 0ECF0 80840F00 46060202 */ mul.s $f8, $f0, $f6 -/* 0ECF4 80840F04 44054000 */ mfc1 $a1, $f8 -/* 0ECF8 80840F08 0C02914C */ jal func_800A4530 -/* 0ECFC 80840F0C 00000000 */ nop -/* 0ED00 80840F10 10400003 */ beq $v0, $zero, .L80840F20 -.L80840F14: -/* 0ED04 80840F14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0ED08 80840F18 0C20C9FE */ jal func_808327F8 -/* 0ED0C 80840F1C 8E050838 */ lw $a1, 0x0838($s0) ## 00000838 -.L80840F20: -/* 0ED10 80840F20 3C068085 */ lui $a2, %hi(D_808543F4) ## $a2 = 80850000 -/* 0ED14 80840F24 24C643F4 */ addiu $a2, $a2, %lo(D_808543F4) ## $a2 = 808543F4 -/* 0ED18 80840F28 8FA40054 */ lw $a0, 0x0054($sp) -/* 0ED1C 80840F2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0ED20 80840F30 0C20DCD2 */ jal func_80837348 -/* 0ED24 80840F34 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0ED28 80840F38 5440007B */ bnel $v0, $zero, .L80841128 -/* 0ED2C 80840F3C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0ED30 80840F40 0C20CED5 */ jal func_80833B54 -/* 0ED34 80840F44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0ED38 80840F48 10400005 */ beq $v0, $zero, .L80840F60 -/* 0ED3C 80840F4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0ED40 80840F50 0C20F3AB */ jal func_8083CEAC -/* 0ED44 80840F54 8FA50054 */ lw $a1, 0x0054($sp) -/* 0ED48 80840F58 10000073 */ beq $zero, $zero, .L80841128 -/* 0ED4C 80840F5C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80840F60: -/* 0ED50 80840F60 0C20CECB */ jal func_80833B2C -/* 0ED54 80840F64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0ED58 80840F68 14400006 */ bne $v0, $zero, .L80840F84 -/* 0ED5C 80840F6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0ED60 80840F70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0ED64 80840F74 0C214C20 */ jal func_80853080 -/* 0ED68 80840F78 8FA50054 */ lw $a1, 0x0054($sp) -/* 0ED6C 80840F7C 1000006A */ beq $zero, $zero, .L80841128 -/* 0ED70 80840F80 8FBF0024 */ lw $ra, 0x0024($sp) -.L80840F84: -/* 0ED74 80840F84 8FAE0054 */ lw $t6, 0x0054($sp) -/* 0ED78 80840F88 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFF4 -/* 0ED7C 80840F8C 27A60042 */ addiu $a2, $sp, 0x0042 ## $a2 = FFFFFFF2 -/* 0ED80 80840F90 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0ED84 80840F94 0C20DC9A */ jal func_80837268 -/* 0ED88 80840F98 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0ED8C 80840F9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0ED90 80840FA0 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFF4 -/* 0ED94 80840FA4 27A60042 */ addiu $a2, $sp, 0x0042 ## $a2 = FFFFFFF2 -/* 0ED98 80840FA8 0C20FF5E */ jal func_8083FD78 -/* 0ED9C 80840FAC 8FA70054 */ lw $a3, 0x0054($sp) -/* 0EDA0 80840FB0 18400006 */ blez $v0, .L80840FCC -/* 0EDA4 80840FB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EDA8 80840FB8 8FA50054 */ lw $a1, 0x0054($sp) -/* 0EDAC 80840FBC 0C20F237 */ jal func_8083C8DC -/* 0EDB0 80840FC0 87A60042 */ lh $a2, 0x0042($sp) -/* 0EDB4 80840FC4 10000058 */ beq $zero, $zero, .L80841128 -/* 0EDB8 80840FC8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80840FCC: -/* 0EDBC 80840FCC 04410007 */ bgez $v0, .L80840FEC -/* 0EDC0 80840FD0 3C018085 */ lui $at, %hi(D_80855410) ## $at = 80850000 -/* 0EDC4 80840FD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EDC8 80840FD8 87A50042 */ lh $a1, 0x0042($sp) -/* 0EDCC 80840FDC 0C20F2CB */ jal func_8083CB2C -/* 0EDD0 80840FE0 8FA60054 */ lw $a2, 0x0054($sp) -/* 0EDD4 80840FE4 10000050 */ beq $zero, $zero, .L80841128 -/* 0EDD8 80840FE8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80840FEC: -/* 0EDDC 80840FEC C4305410 */ lwc1 $f16, %lo(D_80855410)($at) -/* 0EDE0 80840FF0 C7AA0044 */ lwc1 $f10, 0x0044($sp) -/* 0EDE4 80840FF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EDE8 80840FF8 C7B20044 */ lwc1 $f18, 0x0044($sp) -/* 0EDEC 80840FFC 460A803C */ c.lt.s $f16, $f10 -/* 0EDF0 80841000 00000000 */ nop -/* 0EDF4 80841004 45020008 */ bc1fl .L80841028 -/* 0EDF8 80841008 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0EDFC 8084100C 0C20F327 */ jal func_8083CC9C -/* 0EE00 80841010 8FA50054 */ lw $a1, 0x0054($sp) -/* 0EE04 80841014 0C20CF0F */ jal func_80833C3C -/* 0EE08 80841018 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EE0C 8084101C 10000042 */ beq $zero, $zero, .L80841128 -/* 0EE10 80841020 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0EE14 80841024 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -.L80841028: -/* 0EE18 80841028 87AF0042 */ lh $t7, 0x0042($sp) -/* 0EE1C 8084102C 46029032 */ c.eq.s $f18, $f2 -/* 0EE20 80841030 00000000 */ nop -/* 0EE24 80841034 4502000C */ bc1fl .L80841068 -/* 0EE28 80841038 8618083C */ lh $t8, 0x083C($s0) ## 0000083C -/* 0EE2C 8084103C C6040838 */ lwc1 $f4, 0x0838($s0) ## 00000838 -/* 0EE30 80841040 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0EE34 80841044 46041032 */ c.eq.s $f2, $f4 -/* 0EE38 80841048 00000000 */ nop -/* 0EE3C 8084104C 45020006 */ bc1fl .L80841068 -/* 0EE40 80841050 8618083C */ lh $t8, 0x083C($s0) ## 0000083C -/* 0EE44 80841054 0C20E7CC */ jal func_80839F30 -/* 0EE48 80841058 8FA50054 */ lw $a1, 0x0054($sp) -/* 0EE4C 8084105C 10000032 */ beq $zero, $zero, .L80841128 -/* 0EE50 80841060 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0EE54 80841064 8618083C */ lh $t8, 0x083C($s0) ## 0000083C -.L80841068: -/* 0EE58 80841068 C7A60044 */ lwc1 $f6, 0x0044($sp) -/* 0EE5C 8084106C 01F81023 */ subu $v0, $t7, $t8 -/* 0EE60 80841070 00021400 */ sll $v0, $v0, 16 -/* 0EE64 80841074 00021403 */ sra $v0, $v0, 16 -/* 0EE68 80841078 04400003 */ bltz $v0, .L80841088 -/* 0EE6C 8084107C 00021823 */ subu $v1, $zero, $v0 -/* 0EE70 80841080 10000001 */ beq $zero, $zero, .L80841088 -/* 0EE74 80841084 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80841088: -/* 0EE78 80841088 28614001 */ slti $at, $v1, 0x4001 -/* 0EE7C 8084108C 1420000B */ bne $at, $zero, .L808410BC -/* 0EE80 80841090 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 0EE84 80841094 44810000 */ mtc1 $at, $f0 ## $f0 = 1.50 -/* 0EE88 80841098 44051000 */ mfc1 $a1, $f2 -/* 0EE8C 8084109C 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 0EE90 808410A0 44060000 */ mfc1 $a2, $f0 -/* 0EE94 808410A4 0C01DE80 */ jal Math_ApproxF - -/* 0EE98 808410A8 00000000 */ nop -/* 0EE9C 808410AC 1040001D */ beq $v0, $zero, .L80841124 -/* 0EEA0 808410B0 87B90042 */ lh $t9, 0x0042($sp) -/* 0EEA4 808410B4 1000001B */ beq $zero, $zero, .L80841124 -/* 0EEA8 808410B8 A619083C */ sh $t9, 0x083C($s0) ## 0000083C -.L808410BC: -/* 0EEAC 808410BC 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 0EEB0 808410C0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.50 -/* 0EEB4 808410C4 3C018085 */ lui $at, %hi(D_80855414) ## $at = 80850000 -/* 0EEB8 808410C8 C4285414 */ lwc1 $f8, %lo(D_80855414)($at) -/* 0EEBC 808410CC 44060000 */ mfc1 $a2, $f0 -/* 0EEC0 808410D0 44070000 */ mfc1 $a3, $f0 -/* 0EEC4 808410D4 46083402 */ mul.s $f16, $f6, $f8 -/* 0EEC8 808410D8 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 0EECC 808410DC AFA30034 */ sw $v1, 0x0034($sp) -/* 0EED0 808410E0 44058000 */ mfc1 $a1, $f16 -/* 0EED4 808410E4 0C01DF1B */ jal func_80077C6C -/* 0EED8 808410E8 00000000 */ nop -/* 0EEDC 808410EC 8FA30034 */ lw $v1, 0x0034($sp) -/* 0EEE0 808410F0 3C018085 */ lui $at, %hi(D_80855418) ## $at = 80850000 -/* 0EEE4 808410F4 C4245418 */ lwc1 $f4, %lo(D_80855418)($at) -/* 0EEE8 808410F8 44835000 */ mtc1 $v1, $f10 ## $f10 = 0.00 -/* 0EEEC 808410FC 2604083C */ addiu $a0, $s0, 0x083C ## $a0 = 0000083C -/* 0EEF0 80841100 87A50042 */ lh $a1, 0x0042($sp) -/* 0EEF4 80841104 468054A0 */ cvt.s.w $f18, $f10 -/* 0EEF8 80841108 46049182 */ mul.s $f6, $f18, $f4 -/* 0EEFC 8084110C 4600320D */ trunc.w.s $f8, $f6 -/* 0EF00 80841110 44064000 */ mfc1 $a2, $f8 -/* 0EF04 80841114 00000000 */ nop -/* 0EF08 80841118 00063400 */ sll $a2, $a2, 16 -/* 0EF0C 8084111C 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 0EF10 80841120 00063403 */ sra $a2, $a2, 16 -.L80841124: -/* 0EF14 80841124 8FBF0024 */ lw $ra, 0x0024($sp) -.L80841128: -/* 0EF18 80841128 8FB00020 */ lw $s0, 0x0020($sp) -/* 0EF1C 8084112C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 0EF20 80841130 03E00008 */ jr $ra -/* 0EF24 80841134 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841138.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841138.s deleted file mode 100644 index e64013b8f5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841138.s +++ /dev/null @@ -1,198 +0,0 @@ -.late_rodata -glabel D_8085541C - .float 1.2 - -glabel D_80855420 - .word 0x3F0D3DCB - -.text -glabel func_80841138 -/* 0EF28 80841138 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0EF2C 8084113C F7B60018 */ sdc1 $f22, 0x0018($sp) -/* 0EF30 80841140 AFBF002C */ sw $ra, 0x002C($sp) -/* 0EF34 80841144 AFB10028 */ sw $s1, 0x0028($sp) -/* 0EF38 80841148 AFB00024 */ sw $s0, 0x0024($sp) -/* 0EF3C 8084114C F7B40010 */ sdc1 $f20, 0x0010($sp) -/* 0EF40 80841150 AFA50034 */ sw $a1, 0x0034($sp) -/* 0EF44 80841154 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0EF48 80841158 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 -/* 0EF4C 8084115C C4840864 */ lwc1 $f4, 0x0864($a0) ## 00000864 -/* 0EF50 80841160 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0EF54 80841164 3C028016 */ lui $v0, %hi(gGameInfo) -/* 0EF58 80841168 4616203C */ c.lt.s $f4, $f22 -/* 0EF5C 8084116C 00000000 */ nop -/* 0EF60 80841170 4500002B */ bc1f .L80841220 -/* 0EF64 80841174 00000000 */ nop -/* 0EF68 80841178 3C028016 */ lui $v0, %hi(gGameInfo) -/* 0EF6C 8084117C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 0EF70 80841180 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 0EF74 80841184 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 -/* 0EF78 80841188 844F005A */ lh $t7, 0x005A($v0) ## 8016005A -/* 0EF7C 8084118C 844E0110 */ lh $t6, 0x0110($v0) ## 80160110 -/* 0EF80 80841190 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0EF84 80841194 448F8000 */ mtc1 $t7, $f16 ## $f16 = 0.00 -/* 0EF88 80841198 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 0EF8C 8084119C 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 0EF90 808411A0 468084A0 */ cvt.s.w $f18, $f16 -/* 0EF94 808411A4 46803220 */ cvt.s.w $f8, $f6 -/* 0EF98 808411A8 460C9103 */ div.s $f4, $f18, $f12 -/* 0EF9C 808411AC 460A4502 */ mul.s $f20, $f8, $f10 -/* 0EFA0 808411B0 44052000 */ mfc1 $a1, $f4 -/* 0EFA4 808411B4 0C2100A7 */ jal func_8084029C -/* 0EFA8 808411B8 00000000 */ nop -/* 0EFAC 808411BC 9218015B */ lbu $t8, 0x015B($s0) ## 0000015B -/* 0EFB0 808411C0 3C068085 */ lui $a2, %hi(D_80853BFC) ## $a2 = 80850000 -/* 0EFB4 808411C4 261101B4 */ addiu $s1, $s0, 0x01B4 ## $s1 = 000001B4 -/* 0EFB8 808411C8 0018C880 */ sll $t9, $t8, 2 -/* 0EFBC 808411CC 00D93021 */ addu $a2, $a2, $t9 -/* 0EFC0 808411D0 8CC63BFC */ lw $a2, %lo(D_80853BFC)($a2) -/* 0EFC4 808411D4 02202825 */ or $a1, $s1, $zero ## $a1 = 000001B4 -/* 0EFC8 808411D8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0EFCC 808411DC 0C0290A8 */ jal func_800A42A0 -/* 0EFD0 808411E0 8E070868 */ lw $a3, 0x0868($s0) ## 00000868 -/* 0EFD4 808411E4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0EFD8 808411E8 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 0EFDC 808411EC C6060864 */ lwc1 $f6, 0x0864($s0) ## 00000864 -/* 0EFE0 808411F0 46144282 */ mul.s $f10, $f8, $f20 -/* 0EFE4 808411F4 460A3400 */ add.s $f16, $f6, $f10 -/* 0EFE8 808411F8 E6100864 */ swc1 $f16, 0x0864($s0) ## 00000864 -/* 0EFEC 808411FC C6000864 */ lwc1 $f0, 0x0864($s0) ## 00000864 -/* 0EFF0 80841200 4600B03E */ c.le.s $f22, $f0 -/* 0EFF4 80841204 00000000 */ nop -/* 0EFF8 80841208 45000003 */ bc1f .L80841218 -/* 0EFFC 8084120C 00000000 */ nop -/* 0F000 80841210 E6160864 */ swc1 $f22, 0x0864($s0) ## 00000864 -/* 0F004 80841214 C6000864 */ lwc1 $f0, 0x0864($s0) ## 00000864 -.L80841218: -/* 0F008 80841218 1000006B */ beq $zero, $zero, .L808413C8 -/* 0F00C 8084121C 46000506 */ mov.s $f20, $f0 -.L80841220: -/* 0F010 80841220 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 0F014 80841224 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0F018 80841228 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 0F01C 8084122C 84480074 */ lh $t0, 0x0074($v0) ## 00000074 -/* 0F020 80841230 C6020838 */ lwc1 $f2, 0x0838($s0) ## 00000838 -/* 0F024 80841234 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0F028 80841238 44889000 */ mtc1 $t0, $f18 ## $f18 = 0.00 -/* 0F02C 8084123C 00000000 */ nop -/* 0F030 80841240 46809120 */ cvt.s.w $f4, $f18 -/* 0F034 80841244 46082183 */ div.s $f6, $f4, $f8 -/* 0F038 80841248 46061001 */ sub.s $f0, $f2, $f6 -/* 0F03C 8084124C 460A003C */ c.lt.s $f0, $f10 -/* 0F040 80841250 00000000 */ nop -/* 0F044 80841254 4502001F */ bc1fl .L808412D4 -/* 0F048 80841258 844D005E */ lh $t5, 0x005E($v0) ## 0000005E -/* 0F04C 8084125C 8449005C */ lh $t1, 0x005C($v0) ## 0000005C -/* 0F050 80841260 844A005A */ lh $t2, 0x005A($v0) ## 0000005A -/* 0F054 80841264 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 0F058 80841268 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 -/* 0F05C 8084126C 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 -/* 0F060 80841270 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 -/* 0F064 80841274 468084A0 */ cvt.s.w $f18, $f16 -/* 0F068 80841278 4600B506 */ mov.s $f20, $f22 -/* 0F06C 8084127C 468032A0 */ cvt.s.w $f10, $f6 -/* 0F070 80841280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F074 80841284 460C9103 */ div.s $f4, $f18, $f12 -/* 0F078 80841288 460C5403 */ div.s $f16, $f10, $f12 -/* 0F07C 8084128C 46022202 */ mul.s $f8, $f4, $f2 -/* 0F080 80841290 46104480 */ add.s $f18, $f8, $f16 -/* 0F084 80841294 44059000 */ mfc1 $a1, $f18 -/* 0F088 80841298 0C2100A7 */ jal func_8084029C -/* 0F08C 8084129C 00000000 */ nop -/* 0F090 808412A0 920B015B */ lbu $t3, 0x015B($s0) ## 0000015B -/* 0F094 808412A4 3C068085 */ lui $a2, %hi(D_80853BFC) ## $a2 = 80850000 -/* 0F098 808412A8 261101B4 */ addiu $s1, $s0, 0x01B4 ## $s1 = 000001B4 -/* 0F09C 808412AC 000B6080 */ sll $t4, $t3, 2 -/* 0F0A0 808412B0 00CC3021 */ addu $a2, $a2, $t4 -/* 0F0A4 808412B4 8CC63BFC */ lw $a2, %lo(D_80853BFC)($a2) -/* 0F0A8 808412B8 02202825 */ or $a1, $s1, $zero ## $a1 = 000001B4 -/* 0F0AC 808412BC 8FA40034 */ lw $a0, 0x0034($sp) -/* 0F0B0 808412C0 0C0290A8 */ jal func_800A42A0 -/* 0F0B4 808412C4 8E070868 */ lw $a3, 0x0868($s0) ## 00000868 -/* 0F0B8 808412C8 10000040 */ beq $zero, $zero, .L808413CC -/* 0F0BC 808412CC 4616A03C */ c.lt.s $f20, $f22 -/* 0F0C0 808412D0 844D005E */ lh $t5, 0x005E($v0) ## 0000005E -.L808412D4: -/* 0F0C4 808412D4 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 0F0C8 808412D8 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 -/* 0F0CC 808412DC 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 0F0D0 808412E0 00000000 */ nop -/* 0F0D4 808412E4 468021A0 */ cvt.s.w $f6, $f4 -/* 0F0D8 808412E8 460C3283 */ div.s $f10, $f6, $f12 -/* 0F0DC 808412EC 46005502 */ mul.s $f20, $f10, $f0 -/* 0F0E0 808412F0 4616A03C */ c.lt.s $f20, $f22 -/* 0F0E4 808412F4 00000000 */ nop -/* 0F0E8 808412F8 45020012 */ bc1fl .L80841344 -/* 0F0EC 808412FC 84580060 */ lh $t8, 0x0060($v0) ## 00000060 -/* 0F0F0 80841300 844E005C */ lh $t6, 0x005C($v0) ## 0000005C -/* 0F0F4 80841304 844F005A */ lh $t7, 0x005A($v0) ## 0000005A -/* 0F0F8 80841308 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F0FC 8084130C 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 0F100 80841310 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 0F104 80841314 46804420 */ cvt.s.w $f16, $f8 -/* 0F108 80841318 468032A0 */ cvt.s.w $f10, $f6 -/* 0F10C 8084131C 460C8483 */ div.s $f18, $f16, $f12 -/* 0F110 80841320 460C5203 */ div.s $f8, $f10, $f12 -/* 0F114 80841324 46029102 */ mul.s $f4, $f18, $f2 -/* 0F118 80841328 46082400 */ add.s $f16, $f4, $f8 -/* 0F11C 8084132C 44058000 */ mfc1 $a1, $f16 -/* 0F120 80841330 0C2100A7 */ jal func_8084029C -/* 0F124 80841334 00000000 */ nop -/* 0F128 80841338 1000000F */ beq $zero, $zero, .L80841378 -/* 0F12C 8084133C 9219015B */ lbu $t9, 0x015B($s0) ## 0000015B -/* 0F130 80841340 84580060 */ lh $t8, 0x0060($v0) ## 00000060 -.L80841344: -/* 0F134 80841344 3C018085 */ lui $at, %hi(D_8085541C) ## $at = 80850000 -/* 0F138 80841348 C428541C */ lwc1 $f8, %lo(D_8085541C)($at) -/* 0F13C 8084134C 44989000 */ mtc1 $t8, $f18 ## $f18 = 0.00 -/* 0F140 80841350 4600B506 */ mov.s $f20, $f22 -/* 0F144 80841354 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F148 80841358 468091A0 */ cvt.s.w $f6, $f18 -/* 0F14C 8084135C 460C3283 */ div.s $f10, $f6, $f12 -/* 0F150 80841360 46005102 */ mul.s $f4, $f10, $f0 -/* 0F154 80841364 46082400 */ add.s $f16, $f4, $f8 -/* 0F158 80841368 44058000 */ mfc1 $a1, $f16 -/* 0F15C 8084136C 0C2100A7 */ jal func_8084029C -/* 0F160 80841370 00000000 */ nop -/* 0F164 80841374 9219015B */ lbu $t9, 0x015B($s0) ## 0000015B -.L80841378: -/* 0F168 80841378 3C068085 */ lui $a2, %hi(D_80853BFC) ## $a2 = 80850000 -/* 0F16C 8084137C 261101B4 */ addiu $s1, $s0, 0x01B4 ## $s1 = 000001B4 -/* 0F170 80841380 00194080 */ sll $t0, $t9, 2 -/* 0F174 80841384 00C83021 */ addu $a2, $a2, $t0 -/* 0F178 80841388 8CC63BFC */ lw $a2, %lo(D_80853BFC)($a2) -/* 0F17C 8084138C 02202825 */ or $a1, $s1, $zero ## $a1 = 000001B4 -/* 0F180 80841390 8FA40034 */ lw $a0, 0x0034($sp) -/* 0F184 80841394 0C029097 */ jal func_800A425C -/* 0F188 80841398 8E070868 */ lw $a3, 0x0868($s0) ## 00000868 -/* 0F18C 8084139C 3C018085 */ lui $at, %hi(D_80855420) ## $at = 80850000 -/* 0F190 808413A0 C4265420 */ lwc1 $f6, %lo(D_80855420)($at) -/* 0F194 808413A4 C6120868 */ lwc1 $f18, 0x0868($s0) ## 00000868 -/* 0F198 808413A8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0F19C 808413AC 24C62DD0 */ addiu $a2, $a2, 0x2DD0 ## $a2 = 04002DD0 -/* 0F1A0 808413B0 46069282 */ mul.s $f10, $f18, $f6 -/* 0F1A4 808413B4 8FA40034 */ lw $a0, 0x0034($sp) -/* 0F1A8 808413B8 02202825 */ or $a1, $s1, $zero ## $a1 = 000001B4 -/* 0F1AC 808413BC 44075000 */ mfc1 $a3, $f10 -/* 0F1B0 808413C0 0C0290A8 */ jal func_800A42A0 -/* 0F1B4 808413C4 00000000 */ nop -.L808413C8: -/* 0F1B8 808413C8 4616A03C */ c.lt.s $f20, $f22 -.L808413CC: -/* 0F1BC 808413CC 00000000 */ nop -/* 0F1C0 808413D0 45020008 */ bc1fl .L808413F4 -/* 0F1C4 808413D4 8FBF002C */ lw $ra, 0x002C($sp) -/* 0F1C8 808413D8 4614B101 */ sub.s $f4, $f22, $f20 -/* 0F1CC 808413DC 8FA40034 */ lw $a0, 0x0034($sp) -/* 0F1D0 808413E0 02202825 */ or $a1, $s1, $zero ## $a1 = 000001B4 -/* 0F1D4 808413E4 44062000 */ mfc1 $a2, $f4 -/* 0F1D8 808413E8 0C0290B9 */ jal func_800A42E4 -/* 0F1DC 808413EC 00000000 */ nop -/* 0F1E0 808413F0 8FBF002C */ lw $ra, 0x002C($sp) -.L808413F4: -/* 0F1E4 808413F4 D7B40010 */ ldc1 $f20, 0x0010($sp) -/* 0F1E8 808413F8 D7B60018 */ ldc1 $f22, 0x0018($sp) -/* 0F1EC 808413FC 8FB00024 */ lw $s0, 0x0024($sp) -/* 0F1F0 80841400 8FB10028 */ lw $s1, 0x0028($sp) -/* 0F1F4 80841404 03E00008 */ jr $ra -/* 0F1F8 80841408 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084140C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084140C.s deleted file mode 100644 index 43391c04e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084140C.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_8084140C -/* 0F1FC 8084140C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0F200 80841410 AFA40018 */ sw $a0, 0x0018($sp) -/* 0F204 80841414 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0F208 80841418 AFA5001C */ sw $a1, 0x001C($sp) -/* 0F20C 8084141C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0F210 80841420 3C068084 */ lui $a2, %hi(func_8084170C) ## $a2 = 80840000 -/* 0F214 80841424 24C6170C */ addiu $a2, $a2, %lo(func_8084170C) ## $a2 = 8084170C -/* 0F218 80841428 8FA50018 */ lw $a1, 0x0018($sp) -/* 0F21C 8084142C 0C20D716 */ jal func_80835C58 -/* 0F220 80841430 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0F224 80841434 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0F228 80841438 24C62DA0 */ addiu $a2, $a2, 0x2DA0 ## $a2 = 04002DA0 -/* 0F22C 8084143C 8FA4001C */ lw $a0, 0x001C($sp) -/* 0F230 80841440 0C20CAC3 */ jal func_80832B0C -/* 0F234 80841444 8FA50018 */ lw $a1, 0x0018($sp) -/* 0F238 80841448 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0F23C 8084144C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0F240 80841450 03E00008 */ jr $ra -/* 0F244 80841454 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841458.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841458.s deleted file mode 100644 index 3e5bfd3e0b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841458.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80841458 -/* 0F248 80841458 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0F24C 8084145C AFBF0014 */ sw $ra, 0x0014($sp) -/* 0F250 80841460 AFA60020 */ sw $a2, 0x0020($sp) -/* 0F254 80841464 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 0F258 80841468 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 0F25C 8084146C C4860838 */ lwc1 $f6, 0x0838($a0) ## 00000838 -/* 0F260 80841470 4606203C */ c.lt.s $f4, $f6 -/* 0F264 80841474 00000000 */ nop -/* 0F268 80841478 45020006 */ bc1fl .L80841494 -/* 0F26C 8084147C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0F270 80841480 0C210503 */ jal func_8084140C -/* 0F274 80841484 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 0F278 80841488 10000017 */ beq $zero, $zero, .L808414E8 -/* 0F27C 8084148C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0F280 80841490 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -.L80841494: -/* 0F284 80841494 C4AA0000 */ lwc1 $f10, 0x0000($a1) ## 00000000 -/* 0F288 80841498 460A4032 */ c.eq.s $f8, $f10 -/* 0F28C 8084149C 00000000 */ nop -/* 0F290 808414A0 45030011 */ bc1tl .L808414E8 -/* 0F294 808414A4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0F298 808414A8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0F29C 808414AC 0C20DC87 */ jal func_8083721C -/* 0F2A0 808414B0 AFA5001C */ sw $a1, 0x001C($sp) -/* 0F2A4 808414B4 8FA40018 */ lw $a0, 0x0018($sp) -/* 0F2A8 808414B8 10400008 */ beq $v0, $zero, .L808414DC -/* 0F2AC 808414BC 8FA5001C */ lw $a1, 0x001C($sp) -/* 0F2B0 808414C0 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0F2B4 808414C4 00000000 */ nop -/* 0F2B8 808414C8 E4B00000 */ swc1 $f16, 0x0000($a1) ## 00000000 -/* 0F2BC 808414CC 8FAF0020 */ lw $t7, 0x0020($sp) -/* 0F2C0 808414D0 848E083C */ lh $t6, 0x083C($a0) ## 0000083C -/* 0F2C4 808414D4 10000003 */ beq $zero, $zero, .L808414E4 -/* 0F2C8 808414D8 A5EE0000 */ sh $t6, 0x0000($t7) ## 00000000 -.L808414DC: -/* 0F2CC 808414DC 10000002 */ beq $zero, $zero, .L808414E8 -/* 0F2D0 808414E0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808414E4: -/* 0F2D4 808414E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808414E8: -/* 0F2D8 808414E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0F2DC 808414EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0F2E0 808414F0 03E00008 */ jr $ra -/* 0F2E4 808414F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808414F8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808414F8.s deleted file mode 100644 index 0e1f6479e6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808414F8.s +++ /dev/null @@ -1,129 +0,0 @@ -.late_rodata -glabel D_80855424 - .word 0x409CCCCD -glabel D_80855428 - .float 0.1 - -.text -glabel func_808414F8 -/* 0F2E8 808414F8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0F2EC 808414FC AFBF0024 */ sw $ra, 0x0024($sp) -/* 0F2F0 80841500 AFB10020 */ sw $s1, 0x0020($sp) -/* 0F2F4 80841504 AFB0001C */ sw $s0, 0x001C($sp) -/* 0F2F8 80841508 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0F2FC 8084150C 0C21044E */ jal func_80841138 -/* 0F300 80841510 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0F304 80841514 3C068085 */ lui $a2, %hi(D_80854400) ## $a2 = 80850000 -/* 0F308 80841518 24C64400 */ addiu $a2, $a2, %lo(D_80854400) ## $a2 = 80854400 -/* 0F30C 8084151C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0F310 80841520 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0F314 80841524 0C20DCD2 */ jal func_80837348 -/* 0F318 80841528 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0F31C 8084152C 54400060 */ bnel $v0, $zero, .L808416B0 -/* 0F320 80841530 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0F324 80841534 0C20CF01 */ jal func_80833C04 -/* 0F328 80841538 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F32C 8084153C 14400007 */ bne $v0, $zero, .L8084155C -/* 0F330 80841540 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F334 80841544 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F338 80841548 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0F33C 8084154C 0C20F237 */ jal func_8083C8DC -/* 0F340 80841550 8606083C */ lh $a2, 0x083C($s0) ## 0000083C -/* 0F344 80841554 10000056 */ beq $zero, $zero, .L808416B0 -/* 0F348 80841558 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084155C: -/* 0F34C 8084155C 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 0F350 80841560 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 0F354 80841564 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0F358 80841568 0C20DC9A */ jal func_80837268 -/* 0F35C 8084156C AFB10010 */ sw $s1, 0x0010($sp) -/* 0F360 80841570 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F364 80841574 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 0F368 80841578 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 0F36C 8084157C 0C20FF5E */ jal func_8083FD78 -/* 0F370 80841580 02203825 */ or $a3, $s1, $zero ## $a3 = 00000000 -/* 0F374 80841584 04400020 */ bltz $v0, .L80841608 -/* 0F378 80841588 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 0F37C 8084158C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F380 80841590 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 0F384 80841594 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 0F388 80841598 02203825 */ or $a3, $s1, $zero ## $a3 = 00000000 -/* 0F38C 8084159C 0C210516 */ jal func_80841458 -/* 0F390 808415A0 AFA2002C */ sw $v0, 0x002C($sp) -/* 0F394 808415A4 14400041 */ bne $v0, $zero, .L808416AC -/* 0F398 808415A8 8FA3002C */ lw $v1, 0x002C($sp) -/* 0F39C 808415AC 10600006 */ beq $v1, $zero, .L808415C8 -/* 0F3A0 808415B0 3C018085 */ lui $at, %hi(D_80855424) ## $at = 80850000 -/* 0F3A4 808415B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F3A8 808415B8 0C20F216 */ jal func_8083C858 -/* 0F3AC 808415BC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0F3B0 808415C0 1000003B */ beq $zero, $zero, .L808416B0 -/* 0F3B4 808415C4 8FBF0024 */ lw $ra, 0x0024($sp) -.L808415C8: -/* 0F3B8 808415C8 C4245424 */ lwc1 $f4, %lo(D_80855424)($at) -/* 0F3BC 808415CC C7A60034 */ lwc1 $f6, 0x0034($sp) -/* 0F3C0 808415D0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0F3C4 808415D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F3C8 808415D8 4606203C */ c.lt.s $f4, $f6 -/* 0F3CC 808415DC 00000000 */ nop -/* 0F3D0 808415E0 45000005 */ bc1f .L808415F8 -/* 0F3D4 808415E4 00000000 */ nop -/* 0F3D8 808415E8 0C20F327 */ jal func_8083CC9C -/* 0F3DC 808415EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F3E0 808415F0 1000002F */ beq $zero, $zero, .L808416B0 -/* 0F3E4 808415F4 8FBF0024 */ lw $ra, 0x0024($sp) -.L808415F8: -/* 0F3E8 808415F8 0C20F2E5 */ jal func_8083CB94 -/* 0F3EC 808415FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0F3F0 80841600 1000002B */ beq $zero, $zero, .L808416B0 -/* 0F3F4 80841604 8FBF0024 */ lw $ra, 0x0024($sp) -.L80841608: -/* 0F3F8 80841608 44810000 */ mtc1 $at, $f0 ## $f0 = 0.00 -/* 0F3FC 8084160C C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 0F400 80841610 87AE0032 */ lh $t6, 0x0032($sp) -/* 0F404 80841614 860F083C */ lh $t7, 0x083C($s0) ## 0000083C -/* 0F408 80841618 46004282 */ mul.s $f10, $f8, $f0 -/* 0F40C 8084161C 44060000 */ mfc1 $a2, $f0 -/* 0F410 80841620 01CFC023 */ subu $t8, $t6, $t7 -/* 0F414 80841624 A7B8002A */ sh $t8, 0x002A($sp) -/* 0F418 80841628 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 0F41C 8084162C 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 0F420 80841630 44055000 */ mfc1 $a1, $f10 -/* 0F424 80841634 0C01DF1B */ jal func_80077C6C -/* 0F428 80841638 00000000 */ nop -/* 0F42C 8084163C 87B9002A */ lh $t9, 0x002A($sp) -/* 0F430 80841640 3C018085 */ lui $at, %hi(D_80855428) ## $at = 80850000 -/* 0F434 80841644 C4245428 */ lwc1 $f4, %lo(D_80855428)($at) -/* 0F438 80841648 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 0F43C 8084164C 2604083C */ addiu $a0, $s0, 0x083C ## $a0 = 0000083C -/* 0F440 80841650 87A50032 */ lh $a1, 0x0032($sp) -/* 0F444 80841654 468084A0 */ cvt.s.w $f18, $f16 -/* 0F448 80841658 46049182 */ mul.s $f6, $f18, $f4 -/* 0F44C 8084165C 4600320D */ trunc.w.s $f8, $f6 -/* 0F450 80841660 44064000 */ mfc1 $a2, $f8 -/* 0F454 80841664 00000000 */ nop -/* 0F458 80841668 00063400 */ sll $a2, $a2, 16 -/* 0F45C 8084166C 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 0F460 80841670 00063403 */ sra $a2, $a2, 16 -/* 0F464 80841674 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0F468 80841678 C7AA0034 */ lwc1 $f10, 0x0034($sp) -/* 0F46C 8084167C 46005032 */ c.eq.s $f10, $f0 -/* 0F470 80841680 00000000 */ nop -/* 0F474 80841684 4502000A */ bc1fl .L808416B0 -/* 0F478 80841688 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0F47C 8084168C C6100838 */ lwc1 $f16, 0x0838($s0) ## 00000838 -/* 0F480 80841690 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F484 80841694 46100032 */ c.eq.s $f0, $f16 -/* 0F488 80841698 00000000 */ nop -/* 0F48C 8084169C 45020004 */ bc1fl .L808416B0 -/* 0F490 808416A0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0F494 808416A4 0C20E7CC */ jal func_80839F30 -/* 0F498 808416A8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L808416AC: -/* 0F49C 808416AC 8FBF0024 */ lw $ra, 0x0024($sp) -.L808416B0: -/* 0F4A0 808416B0 8FB0001C */ lw $s0, 0x001C($sp) -/* 0F4A4 808416B4 8FB10020 */ lw $s1, 0x0020($sp) -/* 0F4A8 808416B8 03E00008 */ jr $ra -/* 0F4AC 808416BC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808416C0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808416C0.s deleted file mode 100644 index c54183bc25..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808416C0.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_808416C0 -/* 0F4B0 808416C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0F4B4 808416C4 AFA40018 */ sw $a0, 0x0018($sp) -/* 0F4B8 808416C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0F4BC 808416CC AFA5001C */ sw $a1, 0x001C($sp) -/* 0F4C0 808416D0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0F4C4 808416D4 3C068084 */ lui $a2, %hi(func_808417FC) ## $a2 = 80840000 -/* 0F4C8 808416D8 24C617FC */ addiu $a2, $a2, %lo(func_808417FC) ## $a2 = 808417FC -/* 0F4CC 808416DC 8FA50018 */ lw $a1, 0x0018($sp) -/* 0F4D0 808416E0 0C20D716 */ jal func_80835C58 -/* 0F4D4 808416E4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0F4D8 808416E8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0F4DC 808416EC 24C62DA8 */ addiu $a2, $a2, 0x2DA8 ## $a2 = 04002DA8 -/* 0F4E0 808416F0 8FA4001C */ lw $a0, 0x001C($sp) -/* 0F4E4 808416F4 0C20C899 */ jal func_80832264 -/* 0F4E8 808416F8 8FA50018 */ lw $a1, 0x0018($sp) -/* 0F4EC 808416FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0F4F0 80841700 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0F4F4 80841704 03E00008 */ jr $ra -/* 0F4F8 80841708 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084170C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084170C.s deleted file mode 100644 index 21418d26ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084170C.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_8084170C -/* 0F4FC 8084170C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0F500 80841710 AFB0001C */ sw $s0, 0x001C($sp) -/* 0F504 80841714 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0F508 80841718 AFB10020 */ sw $s1, 0x0020($sp) -/* 0F50C 8084171C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0F510 80841720 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0F514 80841724 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0F518 80841728 0C028EF0 */ jal func_800A3BC0 -/* 0F51C 8084172C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0F520 80841730 AFA20034 */ sw $v0, 0x0034($sp) -/* 0F524 80841734 0C20DC87 */ jal func_8083721C -/* 0F528 80841738 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F52C 8084173C 3C068085 */ lui $a2, %hi(D_80854400) ## $a2 = 80850000 -/* 0F530 80841740 24C64400 */ addiu $a2, $a2, %lo(D_80854400) ## $a2 = 80854400 -/* 0F534 80841744 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0F538 80841748 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0F53C 8084174C 0C20DCD2 */ jal func_80837348 -/* 0F540 80841750 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0F544 80841754 14400024 */ bne $v0, $zero, .L808417E8 -/* 0F548 80841758 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F54C 8084175C 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 0F550 80841760 27A6002E */ addiu $a2, $sp, 0x002E ## $a2 = FFFFFFF6 -/* 0F554 80841764 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0F558 80841768 0C20DC9A */ jal func_80837268 -/* 0F55C 8084176C AFB10010 */ sw $s1, 0x0010($sp) -/* 0F560 80841770 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0F564 80841774 C6060838 */ lwc1 $f6, 0x0838($s0) ## 00000838 -/* 0F568 80841778 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F56C 8084177C 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 0F570 80841780 46062032 */ c.eq.s $f4, $f6 -/* 0F574 80841784 27A6002E */ addiu $a2, $sp, 0x002E ## $a2 = FFFFFFF6 -/* 0F578 80841788 45020018 */ bc1fl .L808417EC -/* 0F57C 8084178C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0F580 80841790 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 0F584 80841794 02203825 */ or $a3, $s1, $zero ## $a3 = 00000000 -/* 0F588 80841798 0C20FF5E */ jal func_8083FD78 -/* 0F58C 8084179C A60E083C */ sh $t6, 0x083C($s0) ## 0000083C -/* 0F590 808417A0 18400006 */ blez $v0, .L808417BC -/* 0F594 808417A4 C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 0F598 808417A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F59C 808417AC 0C20F216 */ jal func_8083C858 -/* 0F5A0 808417B0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0F5A4 808417B4 1000000D */ beq $zero, $zero, .L808417EC -/* 0F5A8 808417B8 8FBF0024 */ lw $ra, 0x0024($sp) -.L808417BC: -/* 0F5AC 808417BC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0F5B0 808417C0 8FAF0034 */ lw $t7, 0x0034($sp) -/* 0F5B4 808417C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F5B8 808417C8 460A4032 */ c.eq.s $f8, $f10 -/* 0F5BC 808417CC 00000000 */ nop -/* 0F5C0 808417D0 45000003 */ bc1f .L808417E0 -/* 0F5C4 808417D4 00000000 */ nop -/* 0F5C8 808417D8 51E00004 */ beql $t7, $zero, .L808417EC -/* 0F5CC 808417DC 8FBF0024 */ lw $ra, 0x0024($sp) -.L808417E0: -/* 0F5D0 808417E0 0C2105B0 */ jal func_808416C0 -/* 0F5D4 808417E4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L808417E8: -/* 0F5D8 808417E8 8FBF0024 */ lw $ra, 0x0024($sp) -.L808417EC: -/* 0F5DC 808417EC 8FB0001C */ lw $s0, 0x001C($sp) -/* 0F5E0 808417F0 8FB10020 */ lw $s1, 0x0020($sp) -/* 0F5E4 808417F4 03E00008 */ jr $ra -/* 0F5E8 808417F8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808417FC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808417FC.s deleted file mode 100644 index 4464ef157e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808417FC.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_808417FC -/* 0F5EC 808417FC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0F5F0 80841800 AFA40020 */ sw $a0, 0x0020($sp) -/* 0F5F4 80841804 AFA50024 */ sw $a1, 0x0024($sp) -/* 0F5F8 80841808 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0F5FC 8084180C 8FA50020 */ lw $a1, 0x0020($sp) -/* 0F600 80841810 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0F604 80841814 0C028EF0 */ jal func_800A3BC0 -/* 0F608 80841818 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 0F60C 8084181C 3C068085 */ lui $a2, %hi(D_80854400) ## $a2 = 80850000 -/* 0F610 80841820 AFA2001C */ sw $v0, 0x001C($sp) -/* 0F614 80841824 24C64400 */ addiu $a2, $a2, %lo(D_80854400) ## $a2 = 80854400 -/* 0F618 80841828 8FA40024 */ lw $a0, 0x0024($sp) -/* 0F61C 8084182C 8FA50020 */ lw $a1, 0x0020($sp) -/* 0F620 80841830 0C20DCD2 */ jal func_80837348 -/* 0F624 80841834 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0F628 80841838 14400005 */ bne $v0, $zero, .L80841850 -/* 0F62C 8084183C 8FAE001C */ lw $t6, 0x001C($sp) -/* 0F630 80841840 11C00003 */ beq $t6, $zero, .L80841850 -/* 0F634 80841844 8FA40020 */ lw $a0, 0x0020($sp) -/* 0F638 80841848 0C20E7CC */ jal func_80839F30 -/* 0F63C 8084184C 8FA50024 */ lw $a1, 0x0024($sp) -.L80841850: -/* 0F640 80841850 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0F644 80841854 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0F648 80841858 03E00008 */ jr $ra -/* 0F64C 8084185C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841860.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841860.s deleted file mode 100644 index dc5d147905..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841860.s +++ /dev/null @@ -1,61 +0,0 @@ -.late_rodata -glabel D_8085542C - .word 0x3F0D3DCB - -.text -glabel func_80841860 -/* 0F650 80841860 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0F654 80841864 AFBF002C */ sw $ra, 0x002C($sp) -/* 0F658 80841868 AFB00028 */ sw $s0, 0x0028($sp) -/* 0F65C 8084186C AFA40040 */ sw $a0, 0x0040($sp) -/* 0F660 80841870 90AE015B */ lbu $t6, 0x015B($a1) ## 0000015B -/* 0F664 80841874 3C188085 */ lui $t8, %hi(D_80853914) ## $t8 = 80850000 -/* 0F668 80841878 27183914 */ addiu $t8, $t8, %lo(D_80853914) ## $t8 = 80853914 -/* 0F66C 8084187C 000E7880 */ sll $t7, $t6, 2 -/* 0F670 80841880 01F81021 */ addu $v0, $t7, $t8 -/* 0F674 80841884 8C590258 */ lw $t9, 0x0258($v0) ## 00000258 -/* 0F678 80841888 8C480240 */ lw $t0, 0x0240($v0) ## 00000240 -/* 0F67C 8084188C 3C038016 */ lui $v1, %hi(gGameInfo) -/* 0F680 80841890 AFB90034 */ sw $t9, 0x0034($sp) -/* 0F684 80841894 ACA801BC */ sw $t0, 0x01BC($a1) ## 000001BC -/* 0F688 80841898 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -/* 0F68C 8084189C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 0F690 808418A0 44810000 */ mtc1 $at, $f0 ## $f0 = 1000.00 -/* 0F694 808418A4 84690054 */ lh $t1, 0x0054($v1) ## 80160054 -/* 0F698 808418A8 846A0050 */ lh $t2, 0x0050($v1) ## 80160050 -/* 0F69C 808418AC C4AA0838 */ lwc1 $f10, 0x0838($a1) ## 00000838 -/* 0F6A0 808418B0 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 0F6A4 808418B4 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00 -/* 0F6A8 808418B8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0F6AC 808418BC 468021A0 */ cvt.s.w $f6, $f4 -/* 0F6B0 808418C0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0F6B4 808418C4 AFA80038 */ sw $t0, 0x0038($sp) -/* 0F6B8 808418C8 46809120 */ cvt.s.w $f4, $f18 -/* 0F6BC 808418CC 46003203 */ div.s $f8, $f6, $f0 -/* 0F6C0 808418D0 46002183 */ div.s $f6, $f4, $f0 -/* 0F6C4 808418D4 460A4402 */ mul.s $f16, $f8, $f10 -/* 0F6C8 808418D8 46068200 */ add.s $f8, $f16, $f6 -/* 0F6CC 808418DC 44054000 */ mfc1 $a1, $f8 -/* 0F6D0 808418E0 0C2100A7 */ jal func_8084029C -/* 0F6D4 808418E4 00000000 */ nop -/* 0F6D8 808418E8 3C018085 */ lui $at, %hi(D_8085542C) ## $at = 80850000 -/* 0F6DC 808418EC C432542C */ lwc1 $f18, %lo(D_8085542C)($at) -/* 0F6E0 808418F0 C60A0868 */ lwc1 $f10, 0x0868($s0) ## 00000868 -/* 0F6E4 808418F4 8FA80038 */ lw $t0, 0x0038($sp) -/* 0F6E8 808418F8 260B0318 */ addiu $t3, $s0, 0x0318 ## $t3 = 00000318 -/* 0F6EC 808418FC 46125002 */ mul.s $f0, $f10, $f18 -/* 0F6F0 80841900 AFA80010 */ sw $t0, 0x0010($sp) -/* 0F6F4 80841904 8FA40040 */ lw $a0, 0x0040($sp) -/* 0F6F8 80841908 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0F6FC 8084190C 8FA60034 */ lw $a2, 0x0034($sp) -/* 0F700 80841910 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 0F704 80841914 C6040870 */ lwc1 $f4, 0x0870($s0) ## 00000870 -/* 0F708 80841918 44070000 */ mfc1 $a3, $f0 -/* 0F70C 8084191C AFAB001C */ sw $t3, 0x001C($sp) -/* 0F710 80841920 0C0290C7 */ jal func_800A431C -/* 0F714 80841924 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 0F718 80841928 8FBF002C */ lw $ra, 0x002C($sp) -/* 0F71C 8084192C 8FB00028 */ lw $s0, 0x0028($sp) -/* 0F720 80841930 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0F724 80841934 03E00008 */ jr $ra -/* 0F728 80841938 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084193C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084193C.s deleted file mode 100644 index 0969f49c05..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084193C.s +++ /dev/null @@ -1,181 +0,0 @@ -.late_rodata -glabel D_80855430 - .word 0x40666666 -glabel D_80855434 - .float 0.9 - -glabel D_80855438 - .float 0.1 - -.text -glabel func_8084193C -/* 0F72C 8084193C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0F730 80841940 AFB00020 */ sw $s0, 0x0020($sp) -/* 0F734 80841944 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0F738 80841948 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0F73C 8084194C AFA50044 */ sw $a1, 0x0044($sp) -/* 0F740 80841950 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0F744 80841954 0C210618 */ jal func_80841860 -/* 0F748 80841958 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0F74C 8084195C 3C068085 */ lui $a2, %hi(D_80854408) ## $a2 = 80850000 -/* 0F750 80841960 24C64408 */ addiu $a2, $a2, %lo(D_80854408) ## $a2 = 80854408 -/* 0F754 80841964 8FA40044 */ lw $a0, 0x0044($sp) -/* 0F758 80841968 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0F75C 8084196C 0C20DCD2 */ jal func_80837348 -/* 0F760 80841970 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0F764 80841974 54400088 */ bnel $v0, $zero, .L80841B98 -/* 0F768 80841978 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0F76C 8084197C 0C20CF01 */ jal func_80833C04 -/* 0F770 80841980 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F774 80841984 14400006 */ bne $v0, $zero, .L808419A0 -/* 0F778 80841988 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F77C 8084198C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F780 80841990 0C20F216 */ jal func_8083C858 -/* 0F784 80841994 8FA50044 */ lw $a1, 0x0044($sp) -/* 0F788 80841998 1000007F */ beq $zero, $zero, .L80841B98 -/* 0F78C 8084199C 8FBF0024 */ lw $ra, 0x0024($sp) -.L808419A0: -/* 0F790 808419A0 8FAE0044 */ lw $t6, 0x0044($sp) -/* 0F794 808419A4 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFFC -/* 0F798 808419A8 27A6003A */ addiu $a2, $sp, 0x003A ## $a2 = FFFFFFFA -/* 0F79C 808419AC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0F7A0 808419B0 0C20DC9A */ jal func_80837268 -/* 0F7A4 808419B4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0F7A8 808419B8 0C20CECB */ jal func_80833B2C -/* 0F7AC 808419BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F7B0 808419C0 10400008 */ beq $v0, $zero, .L808419E4 -/* 0F7B4 808419C4 C7A0003C */ lwc1 $f0, 0x003C($sp) -/* 0F7B8 808419C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F7BC 808419CC 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFFC -/* 0F7C0 808419D0 27A6003A */ addiu $a2, $sp, 0x003A ## $a2 = FFFFFFFA -/* 0F7C4 808419D4 0C20FF5E */ jal func_8083FD78 -/* 0F7C8 808419D8 8FA70044 */ lw $a3, 0x0044($sp) -/* 0F7CC 808419DC 10000005 */ beq $zero, $zero, .L808419F4 -/* 0F7D0 808419E0 00000000 */ nop -.L808419E4: -/* 0F7D4 808419E4 44050000 */ mfc1 $a1, $f0 -/* 0F7D8 808419E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F7DC 808419EC 0C20FF1A */ jal func_8083FC68 -/* 0F7E0 808419F0 87A6003A */ lh $a2, 0x003A($sp) -.L808419F4: -/* 0F7E4 808419F4 18400005 */ blez $v0, .L80841A0C -/* 0F7E8 808419F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F7EC 808419FC 0C20F216 */ jal func_8083C858 -/* 0F7F0 80841A00 8FA50044 */ lw $a1, 0x0044($sp) -/* 0F7F4 80841A04 10000064 */ beq $zero, $zero, .L80841B98 -/* 0F7F8 80841A08 8FBF0024 */ lw $ra, 0x0024($sp) -.L80841A0C: -/* 0F7FC 80841A0C 04410010 */ bgez $v0, .L80841A50 -/* 0F800 80841A10 3C018085 */ lui $at, %hi(D_80855430) ## $at = 80850000 -/* 0F804 80841A14 0C20CECB */ jal func_80833B2C -/* 0F808 80841A18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F80C 80841A1C 10400007 */ beq $v0, $zero, .L80841A3C -/* 0F810 80841A20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F814 80841A24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F818 80841A28 87A5003A */ lh $a1, 0x003A($sp) -/* 0F81C 80841A2C 0C20F2CB */ jal func_8083CB2C -/* 0F820 80841A30 8FA60044 */ lw $a2, 0x0044($sp) -/* 0F824 80841A34 10000058 */ beq $zero, $zero, .L80841B98 -/* 0F828 80841A38 8FBF0024 */ lw $ra, 0x0024($sp) -.L80841A3C: -/* 0F82C 80841A3C 87A5003A */ lh $a1, 0x003A($sp) -/* 0F830 80841A40 0C20F2FC */ jal func_8083CBF0 -/* 0F834 80841A44 8FA60044 */ lw $a2, 0x0044($sp) -/* 0F838 80841A48 10000053 */ beq $zero, $zero, .L80841B98 -/* 0F83C 80841A4C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80841A50: -/* 0F840 80841A50 C6040838 */ lwc1 $f4, 0x0838($s0) ## 00000838 -/* 0F844 80841A54 C4265430 */ lwc1 $f6, %lo(D_80855430)($at) -/* 0F848 80841A58 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 0F84C 80841A5C C7A0003C */ lwc1 $f0, 0x003C($sp) -/* 0F850 80841A60 4606203C */ c.lt.s $f4, $f6 -/* 0F854 80841A64 00000000 */ nop -/* 0F858 80841A68 45020019 */ bc1fl .L80841AD0 -/* 0F85C 80841A6C C7A0003C */ lwc1 $f0, 0x003C($sp) -/* 0F860 80841A70 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 0F864 80841A74 00000000 */ nop -/* 0F868 80841A78 4608003C */ c.lt.s $f0, $f8 -/* 0F86C 80841A7C 00000000 */ nop -/* 0F870 80841A80 45020013 */ bc1fl .L80841AD0 -/* 0F874 80841A84 C7A0003C */ lwc1 $f0, 0x003C($sp) -/* 0F878 80841A88 0C023A71 */ jal func_8008E9C4 -/* 0F87C 80841A8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F880 80841A90 5440000A */ bnel $v0, $zero, .L80841ABC -/* 0F884 80841A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F888 80841A98 0C20CECB */ jal func_80833B2C -/* 0F88C 80841A9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F890 80841AA0 10400005 */ beq $v0, $zero, .L80841AB8 -/* 0F894 80841AA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F898 80841AA8 0C20F2E5 */ jal func_8083CB94 -/* 0F89C 80841AAC 8FA50044 */ lw $a1, 0x0044($sp) -/* 0F8A0 80841AB0 10000039 */ beq $zero, $zero, .L80841B98 -/* 0F8A4 80841AB4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80841AB8: -/* 0F8A8 80841AB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80841ABC: -/* 0F8AC 80841ABC 0C20E7E4 */ jal func_80839F90 -/* 0F8B0 80841AC0 8FA50044 */ lw $a1, 0x0044($sp) -/* 0F8B4 80841AC4 10000034 */ beq $zero, $zero, .L80841B98 -/* 0F8B8 80841AC8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0F8BC 80841ACC C7A0003C */ lwc1 $f0, 0x003C($sp) -.L80841AD0: -/* 0F8C0 80841AD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F8C4 80841AD4 87A6003A */ lh $a2, 0x003A($sp) -/* 0F8C8 80841AD8 44050000 */ mfc1 $a1, $f0 -/* 0F8CC 80841ADC 0C21004E */ jal func_80840138 -/* 0F8D0 80841AE0 00000000 */ nop -/* 0F8D4 80841AE4 87AF003A */ lh $t7, 0x003A($sp) -/* 0F8D8 80841AE8 8618083C */ lh $t8, 0x083C($s0) ## 0000083C -/* 0F8DC 80841AEC 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 0F8E0 80841AF0 C7A0003C */ lwc1 $f0, 0x003C($sp) -/* 0F8E4 80841AF4 01F81023 */ subu $v0, $t7, $t8 -/* 0F8E8 80841AF8 00021400 */ sll $v0, $v0, 16 -/* 0F8EC 80841AFC 00021403 */ sra $v0, $v0, 16 -/* 0F8F0 80841B00 04400003 */ bltz $v0, .L80841B10 -/* 0F8F4 80841B04 00021823 */ subu $v1, $zero, $v0 -/* 0F8F8 80841B08 10000001 */ beq $zero, $zero, .L80841B10 -/* 0F8FC 80841B0C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80841B10: -/* 0F900 80841B10 28614001 */ slti $at, $v1, 0x4001 -/* 0F904 80841B14 14200007 */ bne $at, $zero, .L80841B34 -/* 0F908 80841B18 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0F90C 80841B1C 0C01DE80 */ jal Math_ApproxF - -/* 0F910 80841B20 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 0F914 80841B24 1040001B */ beq $v0, $zero, .L80841B94 -/* 0F918 80841B28 87B9003A */ lh $t9, 0x003A($sp) -/* 0F91C 80841B2C 10000019 */ beq $zero, $zero, .L80841B94 -/* 0F920 80841B30 A619083C */ sh $t9, 0x083C($s0) ## 0000083C -.L80841B34: -/* 0F924 80841B34 3C018085 */ lui $at, %hi(D_80855434) ## $at = 80850000 -/* 0F928 80841B38 C42A5434 */ lwc1 $f10, %lo(D_80855434)($at) -/* 0F92C 80841B3C 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 0F930 80841B40 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 0F934 80841B44 460A0002 */ mul.s $f0, $f0, $f10 -/* 0F938 80841B48 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 0F93C 80841B4C AFA3002C */ sw $v1, 0x002C($sp) -/* 0F940 80841B50 44050000 */ mfc1 $a1, $f0 -/* 0F944 80841B54 0C01DF1B */ jal func_80077C6C -/* 0F948 80841B58 E7A0003C */ swc1 $f0, 0x003C($sp) -/* 0F94C 80841B5C 8FA3002C */ lw $v1, 0x002C($sp) -/* 0F950 80841B60 3C018085 */ lui $at, %hi(D_80855438) ## $at = 80850000 -/* 0F954 80841B64 C4245438 */ lwc1 $f4, %lo(D_80855438)($at) -/* 0F958 80841B68 44838000 */ mtc1 $v1, $f16 ## $f16 = 0.00 -/* 0F95C 80841B6C 2604083C */ addiu $a0, $s0, 0x083C ## $a0 = 0000083C -/* 0F960 80841B70 87A5003A */ lh $a1, 0x003A($sp) -/* 0F964 80841B74 468084A0 */ cvt.s.w $f18, $f16 -/* 0F968 80841B78 46049182 */ mul.s $f6, $f18, $f4 -/* 0F96C 80841B7C 4600320D */ trunc.w.s $f8, $f6 -/* 0F970 80841B80 44064000 */ mfc1 $a2, $f8 -/* 0F974 80841B84 00000000 */ nop -/* 0F978 80841B88 00063400 */ sll $a2, $a2, 16 -/* 0F97C 80841B8C 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 0F980 80841B90 00063403 */ sra $a2, $a2, 16 -.L80841B94: -/* 0F984 80841B94 8FBF0024 */ lw $ra, 0x0024($sp) -.L80841B98: -/* 0F988 80841B98 8FB00020 */ lw $s0, 0x0020($sp) -/* 0F98C 80841B9C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0F990 80841BA0 03E00008 */ jr $ra -/* 0F994 80841BA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s deleted file mode 100644 index 0906195ded..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_80841BA8 -/* 0F998 80841BA8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0F99C 80841BAC AFB0001C */ sw $s0, 0x001C($sp) -/* 0F9A0 80841BB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0F9A4 80841BB4 AFB10020 */ sw $s1, 0x0020($sp) -/* 0F9A8 80841BB8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0F9AC 80841BBC AFBF0024 */ sw $ra, 0x0024($sp) -/* 0F9B0 80841BC0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0F9B4 80841BC4 0C028EF0 */ jal func_800A3BC0 -/* 0F9B8 80841BC8 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0F9BC 80841BCC 0C023C68 */ jal func_8008F1A0 -/* 0F9C0 80841BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F9C4 80841BD4 50400013 */ beql $v0, $zero, .L80841C24 -/* 0F9C8 80841BD8 3C073C93 */ lui $a3, 0x3C93 ## $a3 = 3C930000 -/* 0F9CC 80841BDC 0C20CCCE */ jal func_80833338 -/* 0F9D0 80841BE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F9D4 80841BE4 8E0E01D8 */ lw $t6, 0x01D8($s0) ## 000001D8 -/* 0F9D8 80841BE8 920701B4 */ lbu $a3, 0x01B4($s0) ## 000001B4 -/* 0F9DC 80841BEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0F9E0 80841BF0 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0F9E4 80841BF4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0F9E8 80841BF8 0C028CDB */ jal SkelAnime_LoadLinkAnimetion -/* 0F9EC 80841BFC AFAE0010 */ sw $t6, 0x0010($sp) -/* 0F9F0 80841C00 3C0F8085 */ lui $t7, %hi(D_80853410) ## $t7 = 80850000 -/* 0F9F4 80841C04 25EF3410 */ addiu $t7, $t7, %lo(D_80853410) ## $t7 = 80853410 -/* 0F9F8 80841C08 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 -/* 0F9FC 80841C0C 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 -/* 0FA00 80841C10 8E0701D8 */ lw $a3, 0x01D8($s0) ## 000001D8 -/* 0FA04 80841C14 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0FA08 80841C18 0C028D52 */ jal SkelAnime_LoadAnimationType3 -/* 0FA0C 80841C1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0FA10 80841C20 3C073C93 */ lui $a3, 0x3C93 ## $a3 = 3C930000 -.L80841C24: -/* 0FA14 80841C24 34E774BC */ ori $a3, $a3, 0x74BC ## $a3 = 3C9374BC -/* 0FA18 80841C28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FA1C 80841C2C 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 0FA20 80841C30 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 0FA24 80841C34 0C20DC9A */ jal func_80837268 -/* 0FA28 80841C38 AFB10010 */ sw $s1, 0x0010($sp) -/* 0FA2C 80841C3C 3C068085 */ lui $a2, %hi(D_80854414) ## $a2 = 80850000 -/* 0FA30 80841C40 24C64414 */ addiu $a2, $a2, %lo(D_80854414) ## $a2 = 80854414 -/* 0FA34 80841C44 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0FA38 80841C48 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0FA3C 80841C4C 0C20DCD2 */ jal func_80837348 -/* 0FA40 80841C50 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0FA44 80841C54 14400016 */ bne $v0, $zero, .L80841CB0 -/* 0FA48 80841C58 C7A40034 */ lwc1 $f4, 0x0034($sp) -/* 0FA4C 80841C5C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0FA50 80841C60 87B80032 */ lh $t8, 0x0032($sp) -/* 0FA54 80841C64 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 0FA58 80841C68 46062032 */ c.eq.s $f4, $f6 -/* 0FA5C 80841C6C 87A50032 */ lh $a1, 0x0032($sp) -/* 0FA60 80841C70 45010007 */ bc1t .L80841C90 -/* 0FA64 80841C74 00000000 */ nop -/* 0FA68 80841C78 A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -/* 0FA6C 80841C7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FA70 80841C80 0C20F216 */ jal func_8083C858 -/* 0FA74 80841C84 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0FA78 80841C88 10000008 */ beq $zero, $zero, .L80841CAC -/* 0FA7C 80841C8C 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -.L80841C90: -/* 0FA80 80841C90 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 0FA84 80841C94 8606087E */ lh $a2, 0x087E($s0) ## 0000087E -/* 0FA88 80841C98 10400003 */ beq $v0, $zero, .L80841CA8 -/* 0FA8C 80841C9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FA90 80841CA0 0C20F03A */ jal func_8083C0E8 -/* 0FA94 80841CA4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L80841CA8: -/* 0FA98 80841CA8 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -.L80841CAC: -/* 0FA9C 80841CAC A619083C */ sh $t9, 0x083C($s0) ## 0000083C -.L80841CB0: -/* 0FAA0 80841CB0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0FAA4 80841CB4 8FB0001C */ lw $s0, 0x001C($sp) -/* 0FAA8 80841CB8 8FB10020 */ lw $s1, 0x0020($sp) -/* 0FAAC 80841CBC 03E00008 */ jr $ra -/* 0FAB0 80841CC0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841CC4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841CC4.s deleted file mode 100644 index 5f0756279d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841CC4.s +++ /dev/null @@ -1,160 +0,0 @@ -.late_rodata -glabel D_8085543C - .word 0x462AA800 -glabel D_80855440 - .word 0x3A1D4952 - -.text -glabel func_80841CC4 -/* 0FAB4 80841CC4 3C028085 */ lui $v0, %hi(D_80853610) ## $v0 = 80850000 -/* 0FAB8 80841CC8 84423610 */ lh $v0, %lo(D_80853610)($v0) -/* 0FABC 80841CCC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0FAC0 80841CD0 AFB00028 */ sw $s0, 0x0028($sp) -/* 0FAC4 80841CD4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0FAC8 80841CD8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0FACC 80841CDC AFA60038 */ sw $a2, 0x0038($sp) -/* 0FAD0 80841CE0 04400003 */ bltz $v0, .L80841CF0 -/* 0FAD4 80841CE4 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 0FAD8 80841CE8 10000002 */ beq $zero, $zero, .L80841CF4 -/* 0FADC 80841CEC 00401825 */ or $v1, $v0, $zero ## $v1 = 80850000 -.L80841CF0: -/* 0FAE0 80841CF0 00021823 */ subu $v1, $zero, $v0 -.L80841CF4: -/* 0FAE4 80841CF4 28610E38 */ slti $at, $v1, 0x0E38 -/* 0FAE8 80841CF8 10200003 */ beq $at, $zero, .L80841D08 -/* 0FAEC 80841CFC 2604089C */ addiu $a0, $s0, 0x089C ## $a0 = 0000089C -/* 0FAF0 80841D00 1000000D */ beq $zero, $zero, .L80841D38 -/* 0FAF4 80841D04 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -.L80841D08: -/* 0FAF8 80841D08 2841D556 */ slti $at, $v0, 0xD556 -/* 0FAFC 80841D0C 50200004 */ beql $at, $zero, .L80841D20 -/* 0FB00 80841D10 28412AAB */ slti $at, $v0, 0x2AAB -/* 0FB04 80841D14 10000008 */ beq $zero, $zero, .L80841D38 -/* 0FB08 80841D18 2405D556 */ addiu $a1, $zero, 0xD556 ## $a1 = FFFFD556 -/* 0FB0C 80841D1C 28412AAB */ slti $at, $v0, 0x2AAB -.L80841D20: -/* 0FB10 80841D20 14200003 */ bne $at, $zero, .L80841D30 -/* 0FB14 80841D24 00401825 */ or $v1, $v0, $zero ## $v1 = 80850000 -/* 0FB18 80841D28 10000001 */ beq $zero, $zero, .L80841D30 -/* 0FB1C 80841D2C 24032AAA */ addiu $v1, $zero, 0x2AAA ## $v1 = 00002AAA -.L80841D30: -/* 0FB20 80841D30 00032C00 */ sll $a1, $v1, 16 -/* 0FB24 80841D34 00052C03 */ sra $a1, $a1, 16 -.L80841D38: -/* 0FB28 80841D38 24060190 */ addiu $a2, $zero, 0x0190 ## $a2 = 00000190 -/* 0FB2C 80841D3C 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 0FB30 80841D40 AFA70034 */ sw $a3, 0x0034($sp) -/* 0FB34 80841D44 9203015B */ lbu $v1, 0x015B($s0) ## 0000015B -/* 0FB38 80841D48 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0FB3C 80841D4C 8FA40038 */ lw $a0, 0x0038($sp) -/* 0FB40 80841D50 1061000A */ beq $v1, $at, .L80841D7C -/* 0FB44 80841D54 8FA70034 */ lw $a3, 0x0034($sp) -/* 0FB48 80841D58 8602089C */ lh $v0, 0x089C($s0) ## 0000089C -/* 0FB4C 80841D5C 1440001A */ bne $v0, $zero, .L80841DC8 -/* 0FB50 80841D60 00000000 */ nop -/* 0FB54 80841D64 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0FB58 80841D68 C60606C4 */ lwc1 $f6, 0x06C4($s0) ## 000006C4 -/* 0FB5C 80841D6C 4604303E */ c.le.s $f6, $f4 -/* 0FB60 80841D70 00000000 */ nop -/* 0FB64 80841D74 45000014 */ bc1f .L80841DC8 -/* 0FB68 80841D78 00000000 */ nop -.L80841D7C: -/* 0FB6C 80841D7C 14E0000A */ bne $a3, $zero, .L80841DA8 -/* 0FB70 80841D80 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0FB74 80841D84 00037080 */ sll $t6, $v1, 2 -/* 0FB78 80841D88 3C068085 */ lui $a2, %hi(D_8085392C) ## $a2 = 80850000 -/* 0FB7C 80841D8C 00CE3021 */ addu $a2, $a2, $t6 -/* 0FB80 80841D90 8CC6392C */ lw $a2, %lo(D_8085392C)($a2) -/* 0FB84 80841D94 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0FB88 80841D98 0C0290A8 */ jal func_800A42A0 -/* 0FB8C 80841D9C 8E070868 */ lw $a3, 0x0868($s0) ## 00000868 -/* 0FB90 80841DA0 1000004C */ beq $zero, $zero, .L80841ED4 -/* 0FB94 80841DA4 8FBF002C */ lw $ra, 0x002C($sp) -.L80841DA8: -/* 0FB98 80841DA8 00037880 */ sll $t7, $v1, 2 -/* 0FB9C 80841DAC 3C068085 */ lui $a2, %hi(D_8085392C) ## $a2 = 80850000 -/* 0FBA0 80841DB0 00CF3021 */ addu $a2, $a2, $t7 -/* 0FBA4 80841DB4 8CC6392C */ lw $a2, %lo(D_8085392C)($a2) -/* 0FBA8 80841DB8 0C029097 */ jal func_800A425C -/* 0FBAC 80841DBC 8E070868 */ lw $a3, 0x0868($s0) ## 00000868 -/* 0FBB0 80841DC0 10000044 */ beq $zero, $zero, .L80841ED4 -/* 0FBB4 80841DC4 8FBF002C */ lw $ra, 0x002C($sp) -.L80841DC8: -/* 0FBB8 80841DC8 10400007 */ beq $v0, $zero, .L80841DE8 -/* 0FBBC 80841DCC 3C018085 */ lui $at, %hi(D_80855440) ## $at = 80850000 -/* 0FBC0 80841DD0 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 0FBC4 80841DD4 3C018085 */ lui $at, %hi(D_8085543C) ## $at = 80850000 -/* 0FBC8 80841DD8 C430543C */ lwc1 $f16, %lo(D_8085543C)($at) -/* 0FBCC 80841DDC 468042A0 */ cvt.s.w $f10, $f8 -/* 0FBD0 80841DE0 10000005 */ beq $zero, $zero, .L80841DF8 -/* 0FBD4 80841DE4 46105083 */ div.s $f2, $f10, $f16 -.L80841DE8: -/* 0FBD8 80841DE8 C61206C4 */ lwc1 $f18, 0x06C4($s0) ## 000006C4 -/* 0FBDC 80841DEC C4245440 */ lwc1 $f4, %lo(D_80855440)($at) -/* 0FBE0 80841DF0 46049082 */ mul.s $f2, $f18, $f4 -/* 0FBE4 80841DF4 00000000 */ nop -.L80841DF8: -/* 0FBE8 80841DF8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0FBEC 80841DFC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 0FBF0 80841E00 C6000838 */ lwc1 $f0, 0x0838($s0) ## 00000838 -/* 0FBF4 80841E04 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0FBF8 80841E08 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 0FBFC 80841E0C 46000005 */ abs.s $f0, $f0 -/* 0FC00 80841E10 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0FC04 80841E14 46060202 */ mul.s $f8, $f0, $f6 -/* 0FC08 80841E18 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 -/* 0FC0C 80841E1C 00034080 */ sll $t0, $v1, 2 -/* 0FC10 80841E20 3C068085 */ lui $a2, %hi(D_8085392C) ## $a2 = 80850000 -/* 0FC14 80841E24 24422E90 */ addiu $v0, $v0, 0x2E90 ## $v0 = 04002E90 -/* 0FC18 80841E28 0003C080 */ sll $t8, $v1, 2 -/* 0FC1C 80841E2C 26190318 */ addiu $t9, $s0, 0x0318 ## $t9 = 00000318 -/* 0FC20 80841E30 46081082 */ mul.s $f2, $f2, $f8 -/* 0FC24 80841E34 00C83021 */ addu $a2, $a2, $t0 -/* 0FC28 80841E38 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0FC2C 80841E3C 26090318 */ addiu $t1, $s0, 0x0318 ## $t1 = 00000318 -/* 0FC30 80841E40 4602603C */ c.lt.s $f12, $f2 -/* 0FC34 80841E44 00000000 */ nop -/* 0FC38 80841E48 45020003 */ bc1fl .L80841E58 -/* 0FC3C 80841E4C 460A103C */ c.lt.s $f2, $f10 -/* 0FC40 80841E50 46006086 */ mov.s $f2, $f12 -/* 0FC44 80841E54 460A103C */ c.lt.s $f2, $f10 -.L80841E58: -/* 0FC48 80841E58 00000000 */ nop -/* 0FC4C 80841E5C 45000005 */ bc1f .L80841E74 -/* 0FC50 80841E60 00000000 */ nop -/* 0FC54 80841E64 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 -/* 0FC58 80841E68 24422E48 */ addiu $v0, $v0, 0x2E48 ## $v0 = 04002E48 -/* 0FC5C 80841E6C 10000001 */ beq $zero, $zero, .L80841E74 -/* 0FC60 80841E70 46001087 */ neg.s $f2, $f2 -.L80841E74: -/* 0FC64 80841E74 54E0000F */ bnel $a3, $zero, .L80841EB4 -/* 0FC68 80841E78 C6000868 */ lwc1 $f0, 0x0868($s0) ## 00000868 -/* 0FC6C 80841E7C C6000868 */ lwc1 $f0, 0x0868($s0) ## 00000868 -/* 0FC70 80841E80 3C068085 */ lui $a2, %hi(D_8085392C) ## $a2 = 80850000 -/* 0FC74 80841E84 00D83021 */ addu $a2, $a2, $t8 -/* 0FC78 80841E88 44070000 */ mfc1 $a3, $f0 -/* 0FC7C 80841E8C 8CC6392C */ lw $a2, %lo(D_8085392C)($a2) -/* 0FC80 80841E90 AFB9001C */ sw $t9, 0x001C($sp) -/* 0FC84 80841E94 E7A20018 */ swc1 $f2, 0x0018($sp) -/* 0FC88 80841E98 AFA20010 */ sw $v0, 0x0010($sp) -/* 0FC8C 80841E9C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0FC90 80841EA0 0C0290C7 */ jal func_800A431C -/* 0FC94 80841EA4 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 0FC98 80841EA8 1000000A */ beq $zero, $zero, .L80841ED4 -/* 0FC9C 80841EAC 8FBF002C */ lw $ra, 0x002C($sp) -/* 0FCA0 80841EB0 C6000868 */ lwc1 $f0, 0x0868($s0) ## 00000868 -.L80841EB4: -/* 0FCA4 80841EB4 AFA9001C */ sw $t1, 0x001C($sp) -/* 0FCA8 80841EB8 E7A20018 */ swc1 $f2, 0x0018($sp) -/* 0FCAC 80841EBC 44070000 */ mfc1 $a3, $f0 -/* 0FCB0 80841EC0 AFA20010 */ sw $v0, 0x0010($sp) -/* 0FCB4 80841EC4 8CC6392C */ lw $a2, %lo(D_8085392C)($a2) -/* 0FCB8 80841EC8 0C0290EE */ jal func_800A43B8 -/* 0FCBC 80841ECC E7A00014 */ swc1 $f0, 0x0014($sp) -/* 0FCC0 80841ED0 8FBF002C */ lw $ra, 0x002C($sp) -.L80841ED4: -/* 0FCC4 80841ED4 8FB00028 */ lw $s0, 0x0028($sp) -/* 0FCC8 80841ED8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0FCCC 80841EDC 03E00008 */ jr $ra -/* 0FCD0 80841EE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841EE4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841EE4.s deleted file mode 100644 index 79fd6eaf82..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841EE4.s +++ /dev/null @@ -1,184 +0,0 @@ -.late_rodata -glabel D_80855444 - .float 1.2 - -glabel D_80855448 - .word 0x3F308D3E - -.text -glabel func_80841EE4 -/* 0FCD4 80841EE4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0FCD8 80841EE8 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 0FCDC 80841EEC AFBF002C */ sw $ra, 0x002C($sp) -/* 0FCE0 80841EF0 AFB00028 */ sw $s0, 0x0028($sp) -/* 0FCE4 80841EF4 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 0FCE8 80841EF8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0FCEC 80841EFC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0FCF0 80841F00 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 -/* 0FCF4 80841F04 C4840864 */ lwc1 $f4, 0x0864($a0) ## 00000864 -/* 0FCF8 80841F08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0FCFC 80841F0C 3C028016 */ lui $v0, %hi(gGameInfo) -/* 0FD00 80841F10 4616203C */ c.lt.s $f4, $f22 -/* 0FD04 80841F14 00000000 */ nop -/* 0FD08 80841F18 4500002A */ bc1f .L80841FC4 -/* 0FD0C 80841F1C 00000000 */ nop -/* 0FD10 80841F20 3C028016 */ lui $v0, %hi(gGameInfo) -/* 0FD14 80841F24 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 0FD18 80841F28 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 0FD1C 80841F2C 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 -/* 0FD20 80841F30 844F005A */ lh $t7, 0x005A($v0) ## 8016005A -/* 0FD24 80841F34 844E0110 */ lh $t6, 0x0110($v0) ## 80160110 -/* 0FD28 80841F38 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0FD2C 80841F3C 448F8000 */ mtc1 $t7, $f16 ## $f16 = 0.00 -/* 0FD30 80841F40 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 0FD34 80841F44 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 0FD38 80841F48 468084A0 */ cvt.s.w $f18, $f16 -/* 0FD3C 80841F4C 46803220 */ cvt.s.w $f8, $f6 -/* 0FD40 80841F50 460C9103 */ div.s $f4, $f18, $f12 -/* 0FD44 80841F54 460A4502 */ mul.s $f20, $f8, $f10 -/* 0FD48 80841F58 44052000 */ mfc1 $a1, $f4 -/* 0FD4C 80841F5C 0C2100A7 */ jal func_8084029C -/* 0FD50 80841F60 00000000 */ nop -/* 0FD54 80841F64 9218015B */ lbu $t8, 0x015B($s0) ## 0000015B -/* 0FD58 80841F68 3C068085 */ lui $a2, %hi(D_8085392C) ## $a2 = 80850000 -/* 0FD5C 80841F6C 8FA40034 */ lw $a0, 0x0034($sp) -/* 0FD60 80841F70 0018C880 */ sll $t9, $t8, 2 -/* 0FD64 80841F74 00D93021 */ addu $a2, $a2, $t9 -/* 0FD68 80841F78 8CC6392C */ lw $a2, %lo(D_8085392C)($a2) -/* 0FD6C 80841F7C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0FD70 80841F80 0C0290A8 */ jal func_800A42A0 -/* 0FD74 80841F84 8E070868 */ lw $a3, 0x0868($s0) ## 00000868 -/* 0FD78 80841F88 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0FD7C 80841F8C 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 0FD80 80841F90 C6060864 */ lwc1 $f6, 0x0864($s0) ## 00000864 -/* 0FD84 80841F94 46144282 */ mul.s $f10, $f8, $f20 -/* 0FD88 80841F98 460A3400 */ add.s $f16, $f6, $f10 -/* 0FD8C 80841F9C E6100864 */ swc1 $f16, 0x0864($s0) ## 00000864 -/* 0FD90 80841FA0 C6000864 */ lwc1 $f0, 0x0864($s0) ## 00000864 -/* 0FD94 80841FA4 4600B03E */ c.le.s $f22, $f0 -/* 0FD98 80841FA8 00000000 */ nop -/* 0FD9C 80841FAC 45000003 */ bc1f .L80841FBC -/* 0FDA0 80841FB0 00000000 */ nop -/* 0FDA4 80841FB4 E6160864 */ swc1 $f22, 0x0864($s0) ## 00000864 -/* 0FDA8 80841FB8 C6000864 */ lwc1 $f0, 0x0864($s0) ## 00000864 -.L80841FBC: -/* 0FDAC 80841FBC 10000060 */ beq $zero, $zero, .L80842140 -/* 0FDB0 80841FC0 46000506 */ mov.s $f20, $f0 -.L80841FC4: -/* 0FDB4 80841FC4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 0FDB8 80841FC8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0FDBC 80841FCC 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 0FDC0 80841FD0 84480074 */ lh $t0, 0x0074($v0) ## 00000074 -/* 0FDC4 80841FD4 C6020838 */ lwc1 $f2, 0x0838($s0) ## 00000838 -/* 0FDC8 80841FD8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0FDCC 80841FDC 44889000 */ mtc1 $t0, $f18 ## $f18 = 0.00 -/* 0FDD0 80841FE0 00000000 */ nop -/* 0FDD4 80841FE4 46809120 */ cvt.s.w $f4, $f18 -/* 0FDD8 80841FE8 46082183 */ div.s $f6, $f4, $f8 -/* 0FDDC 80841FEC 46061001 */ sub.s $f0, $f2, $f6 -/* 0FDE0 80841FF0 460A003C */ c.lt.s $f0, $f10 -/* 0FDE4 80841FF4 00000000 */ nop -/* 0FDE8 80841FF8 45020019 */ bc1fl .L80842060 -/* 0FDEC 80841FFC 844B005E */ lh $t3, 0x005E($v0) ## 0000005E -/* 0FDF0 80842000 8449005C */ lh $t1, 0x005C($v0) ## 0000005C -/* 0FDF4 80842004 844A005A */ lh $t2, 0x005A($v0) ## 0000005A -/* 0FDF8 80842008 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 0FDFC 8084200C 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 -/* 0FE00 80842010 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 -/* 0FE04 80842014 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 -/* 0FE08 80842018 468084A0 */ cvt.s.w $f18, $f16 -/* 0FE0C 8084201C 4600B506 */ mov.s $f20, $f22 -/* 0FE10 80842020 468032A0 */ cvt.s.w $f10, $f6 -/* 0FE14 80842024 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FE18 80842028 460C9103 */ div.s $f4, $f18, $f12 -/* 0FE1C 8084202C 460C5403 */ div.s $f16, $f10, $f12 -/* 0FE20 80842030 46022202 */ mul.s $f8, $f4, $f2 -/* 0FE24 80842034 46104480 */ add.s $f18, $f8, $f16 -/* 0FE28 80842038 44059000 */ mfc1 $a1, $f18 -/* 0FE2C 8084203C 0C2100A7 */ jal func_8084029C -/* 0FE30 80842040 00000000 */ nop -/* 0FE34 80842044 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FE38 80842048 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0FE3C 8084204C 0C210731 */ jal func_80841CC4 -/* 0FE40 80842050 8FA60034 */ lw $a2, 0x0034($sp) -/* 0FE44 80842054 1000003B */ beq $zero, $zero, .L80842144 -/* 0FE48 80842058 4616A03C */ c.lt.s $f20, $f22 -/* 0FE4C 8084205C 844B005E */ lh $t3, 0x005E($v0) ## 0000005E -.L80842060: -/* 0FE50 80842060 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 0FE54 80842064 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 -/* 0FE58 80842068 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 0FE5C 8084206C 00000000 */ nop -/* 0FE60 80842070 468021A0 */ cvt.s.w $f6, $f4 -/* 0FE64 80842074 460C3283 */ div.s $f10, $f6, $f12 -/* 0FE68 80842078 46005502 */ mul.s $f20, $f10, $f0 -/* 0FE6C 8084207C 4616A03C */ c.lt.s $f20, $f22 -/* 0FE70 80842080 00000000 */ nop -/* 0FE74 80842084 45020012 */ bc1fl .L808420D0 -/* 0FE78 80842088 844E0060 */ lh $t6, 0x0060($v0) ## 00000060 -/* 0FE7C 8084208C 844C005C */ lh $t4, 0x005C($v0) ## 0000005C -/* 0FE80 80842090 844D005A */ lh $t5, 0x005A($v0) ## 0000005A -/* 0FE84 80842094 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FE88 80842098 448C4000 */ mtc1 $t4, $f8 ## $f8 = 0.00 -/* 0FE8C 8084209C 448D3000 */ mtc1 $t5, $f6 ## $f6 = 0.00 -/* 0FE90 808420A0 46804420 */ cvt.s.w $f16, $f8 -/* 0FE94 808420A4 468032A0 */ cvt.s.w $f10, $f6 -/* 0FE98 808420A8 460C8483 */ div.s $f18, $f16, $f12 -/* 0FE9C 808420AC 460C5203 */ div.s $f8, $f10, $f12 -/* 0FEA0 808420B0 46029102 */ mul.s $f4, $f18, $f2 -/* 0FEA4 808420B4 46082400 */ add.s $f16, $f4, $f8 -/* 0FEA8 808420B8 44058000 */ mfc1 $a1, $f16 -/* 0FEAC 808420BC 0C2100A7 */ jal func_8084029C -/* 0FEB0 808420C0 00000000 */ nop -/* 0FEB4 808420C4 1000000F */ beq $zero, $zero, .L80842104 -/* 0FEB8 808420C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FEBC 808420CC 844E0060 */ lh $t6, 0x0060($v0) ## 00000060 -.L808420D0: -/* 0FEC0 808420D0 3C018085 */ lui $at, %hi(D_80855444) ## $at = 80850000 -/* 0FEC4 808420D4 C4285444 */ lwc1 $f8, %lo(D_80855444)($at) -/* 0FEC8 808420D8 448E9000 */ mtc1 $t6, $f18 ## $f18 = 0.00 -/* 0FECC 808420DC 4600B506 */ mov.s $f20, $f22 -/* 0FED0 808420E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FED4 808420E4 468091A0 */ cvt.s.w $f6, $f18 -/* 0FED8 808420E8 460C3283 */ div.s $f10, $f6, $f12 -/* 0FEDC 808420EC 46005102 */ mul.s $f4, $f10, $f0 -/* 0FEE0 808420F0 46082400 */ add.s $f16, $f4, $f8 -/* 0FEE4 808420F4 44058000 */ mfc1 $a1, $f16 -/* 0FEE8 808420F8 0C2100A7 */ jal func_8084029C -/* 0FEEC 808420FC 00000000 */ nop -/* 0FEF0 80842100 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80842104: -/* 0FEF4 80842104 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0FEF8 80842108 0C210731 */ jal func_80841CC4 -/* 0FEFC 8084210C 8FA60034 */ lw $a2, 0x0034($sp) -/* 0FF00 80842110 0C20CD0E */ jal func_80833438 -/* 0FF04 80842114 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FF08 80842118 3C018085 */ lui $at, %hi(D_80855448) ## $at = 80850000 -/* 0FF0C 8084211C C4265448 */ lwc1 $f6, %lo(D_80855448)($at) -/* 0FF10 80842120 C6120868 */ lwc1 $f18, 0x0868($s0) ## 00000868 -/* 0FF14 80842124 8FA40034 */ lw $a0, 0x0034($sp) -/* 0FF18 80842128 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0FF1C 8084212C 46069282 */ mul.s $f10, $f18, $f6 -/* 0FF20 80842130 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 0FF24 80842134 44075000 */ mfc1 $a3, $f10 -/* 0FF28 80842138 0C0290A8 */ jal func_800A42A0 -/* 0FF2C 8084213C 00000000 */ nop -.L80842140: -/* 0FF30 80842140 4616A03C */ c.lt.s $f20, $f22 -.L80842144: -/* 0FF34 80842144 00000000 */ nop -/* 0FF38 80842148 45020008 */ bc1fl .L8084216C -/* 0FF3C 8084214C 8FBF002C */ lw $ra, 0x002C($sp) -/* 0FF40 80842150 4614B101 */ sub.s $f4, $f22, $f20 -/* 0FF44 80842154 8FA40034 */ lw $a0, 0x0034($sp) -/* 0FF48 80842158 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0FF4C 8084215C 44062000 */ mfc1 $a2, $f4 -/* 0FF50 80842160 0C0290B9 */ jal func_800A42E4 -/* 0FF54 80842164 00000000 */ nop -/* 0FF58 80842168 8FBF002C */ lw $ra, 0x002C($sp) -.L8084216C: -/* 0FF5C 8084216C D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 0FF60 80842170 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 0FF64 80842174 8FB00028 */ lw $s0, 0x0028($sp) -/* 0FF68 80842178 03E00008 */ jr $ra -/* 0FF6C 8084217C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842180.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842180.s deleted file mode 100644 index 4f6fd63ef3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842180.s +++ /dev/null @@ -1,67 +0,0 @@ -glabel func_80842180 -/* 0FF70 80842180 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0FF74 80842184 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0FF78 80842188 AFB10020 */ sw $s1, 0x0020($sp) -/* 0FF7C 8084218C AFB0001C */ sw $s0, 0x001C($sp) -/* 0FF80 80842190 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 0FF84 80842194 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0FF88 80842198 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0FF8C 8084219C 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 0FF90 808421A0 0C2107B9 */ jal func_80841EE4 -/* 0FF94 808421A4 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 0FF98 808421A8 3C068085 */ lui $a2, %hi(D_80854424) ## $a2 = 80850000 -/* 0FF9C 808421AC 24C64424 */ addiu $a2, $a2, %lo(D_80854424) ## $a2 = 80854424 -/* 0FFA0 808421B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0FFA4 808421B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0FFA8 808421B8 0C20DCD2 */ jal func_80837348 -/* 0FFAC 808421BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0FFB0 808421C0 5440002A */ bnel $v0, $zero, .L8084226C -/* 0FFB4 808421C4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0FFB8 808421C8 0C20CF01 */ jal func_80833C04 -/* 0FFBC 808421CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FFC0 808421D0 10400006 */ beq $v0, $zero, .L808421EC -/* 0FFC4 808421D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FFC8 808421D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FFCC 808421DC 0C20F216 */ jal func_8083C858 -/* 0FFD0 808421E0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0FFD4 808421E4 10000021 */ beq $zero, $zero, .L8084226C -/* 0FFD8 808421E8 8FBF0024 */ lw $ra, 0x0024($sp) -.L808421EC: -/* 0FFDC 808421EC 3C073C93 */ lui $a3, 0x3C93 ## $a3 = 3C930000 -/* 0FFE0 808421F0 34E774BC */ ori $a3, $a3, 0x74BC ## $a3 = 3C9374BC -/* 0FFE4 808421F4 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFFC -/* 0FFE8 808421F8 27A6002A */ addiu $a2, $sp, 0x002A ## $a2 = FFFFFFFA -/* 0FFEC 808421FC 0C20DC9A */ jal func_80837268 -/* 0FFF0 80842200 AFB10010 */ sw $s1, 0x0010($sp) -/* 0FFF4 80842204 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FFF8 80842208 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFFC -/* 0FFFC 8084220C 0C20F121 */ jal func_8083C484 -/* 10000 80842210 27A6002A */ addiu $a2, $sp, 0x002A ## $a2 = FFFFFFFA -/* 10004 80842214 14400014 */ bne $v0, $zero, .L80842268 -/* 10008 80842218 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1000C 8084221C 8FA5002C */ lw $a1, 0x002C($sp) -/* 10010 80842220 0C20F7DA */ jal func_8083DF68 -/* 10014 80842224 87A6002A */ lh $a2, 0x002A($sp) -/* 10018 80842228 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1001C 8084222C 0C20F772 */ jal func_8083DDC8 -/* 10020 80842230 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 10024 80842234 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 10028 80842238 C6040838 */ lwc1 $f4, 0x0838($s0) ## 00000838 -/* 1002C 8084223C C7A6002C */ lwc1 $f6, 0x002C($sp) -/* 10030 80842240 46040032 */ c.eq.s $f0, $f4 -/* 10034 80842244 00000000 */ nop -/* 10038 80842248 45020008 */ bc1fl .L8084226C -/* 1003C 8084224C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 10040 80842250 46003032 */ c.eq.s $f6, $f0 -/* 10044 80842254 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10048 80842258 45020004 */ bc1fl .L8084226C -/* 1004C 8084225C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 10050 80842260 0C20F02E */ jal func_8083C0B8 -/* 10054 80842264 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L80842268: -/* 10058 80842268 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084226C: -/* 1005C 8084226C 8FB0001C */ lw $s0, 0x001C($sp) -/* 10060 80842270 8FB10020 */ lw $s1, 0x0020($sp) -/* 10064 80842274 03E00008 */ jr $ra -/* 10068 80842278 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084227C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084227C.s deleted file mode 100644 index 1504d59d19..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084227C.s +++ /dev/null @@ -1,98 +0,0 @@ -glabel func_8084227C -/* 1006C 8084227C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 10070 80842280 AFBF0024 */ sw $ra, 0x0024($sp) -/* 10074 80842284 AFB00020 */ sw $s0, 0x0020($sp) -/* 10078 80842288 AFA50034 */ sw $a1, 0x0034($sp) -/* 1007C 8084228C 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 10080 80842290 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 10084 80842294 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 10088 80842298 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1008C 8084229C 0C2107B9 */ jal func_80841EE4 -/* 10090 808422A0 8FA50034 */ lw $a1, 0x0034($sp) -/* 10094 808422A4 3C068085 */ lui $a2, %hi(D_80854430) ## $a2 = 80850000 -/* 10098 808422A8 24C64430 */ addiu $a2, $a2, %lo(D_80854430) ## $a2 = 80854430 -/* 1009C 808422AC 8FA40034 */ lw $a0, 0x0034($sp) -/* 100A0 808422B0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 100A4 808422B4 0C20DCD2 */ jal func_80837348 -/* 100A8 808422B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 100AC 808422BC 54400047 */ bnel $v0, $zero, .L808423DC -/* 100B0 808422C0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 100B4 808422C4 0C20CF01 */ jal func_80833C04 -/* 100B8 808422C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 100BC 808422CC 14400006 */ bne $v0, $zero, .L808422E8 -/* 100C0 808422D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 100C4 808422D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 100C8 808422D8 0C20F216 */ jal func_8083C858 -/* 100CC 808422DC 8FA50034 */ lw $a1, 0x0034($sp) -/* 100D0 808422E0 1000003E */ beq $zero, $zero, .L808423DC -/* 100D4 808422E4 8FBF0024 */ lw $ra, 0x0024($sp) -.L808422E8: -/* 100D8 808422E8 8FB80034 */ lw $t8, 0x0034($sp) -/* 100DC 808422EC 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFFC -/* 100E0 808422F0 27A6002A */ addiu $a2, $sp, 0x002A ## $a2 = FFFFFFFA -/* 100E4 808422F4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 100E8 808422F8 0C20DC9A */ jal func_80837268 -/* 100EC 808422FC AFB80010 */ sw $t8, 0x0010($sp) -/* 100F0 80842300 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 100F4 80842304 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFFC -/* 100F8 80842308 0C20F121 */ jal func_8083C484 -/* 100FC 8084230C 27A6002A */ addiu $a2, $sp, 0x002A ## $a2 = FFFFFFFA -/* 10100 80842310 54400032 */ bnel $v0, $zero, .L808423DC -/* 10104 80842314 8FBF0024 */ lw $ra, 0x0024($sp) -/* 10108 80842318 0C20CECB */ jal func_80833B2C -/* 1010C 8084231C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10110 80842320 1040000C */ beq $v0, $zero, .L80842354 -/* 10114 80842324 C7A4002C */ lwc1 $f4, 0x002C($sp) -/* 10118 80842328 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 1011C 8084232C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10120 80842330 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFFC -/* 10124 80842334 46062032 */ c.eq.s $f4, $f6 -/* 10128 80842338 27A6002A */ addiu $a2, $sp, 0x002A ## $a2 = FFFFFFFA -/* 1012C 8084233C 45010005 */ bc1t .L80842354 -/* 10130 80842340 00000000 */ nop -/* 10134 80842344 0C20FF5E */ jal func_8083FD78 -/* 10138 80842348 8FA70034 */ lw $a3, 0x0034($sp) -/* 1013C 8084234C 5840000A */ blezl $v0, .L80842378 -/* 10140 80842350 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80842354: -/* 10144 80842354 0C20CECB */ jal func_80833B2C -/* 10148 80842358 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1014C 8084235C 1440000A */ bne $v0, $zero, .L80842388 -/* 10150 80842360 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10154 80842364 8FA5002C */ lw $a1, 0x002C($sp) -/* 10158 80842368 0C20FF1A */ jal func_8083FC68 -/* 1015C 8084236C 87A6002A */ lh $a2, 0x002A($sp) -/* 10160 80842370 1C400005 */ bgtz $v0, .L80842388 -/* 10164 80842374 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80842378: -/* 10168 80842378 0C20E7E4 */ jal func_80839F90 -/* 1016C 8084237C 8FA50034 */ lw $a1, 0x0034($sp) -/* 10170 80842380 10000016 */ beq $zero, $zero, .L808423DC -/* 10174 80842384 8FBF0024 */ lw $ra, 0x0024($sp) -.L80842388: -/* 10178 80842388 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1017C 8084238C 8FA5002C */ lw $a1, 0x002C($sp) -/* 10180 80842390 0C20F7DA */ jal func_8083DF68 -/* 10184 80842394 87A6002A */ lh $a2, 0x002A($sp) -/* 10188 80842398 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1018C 8084239C 0C20F772 */ jal func_8083DDC8 -/* 10190 808423A0 8FA50034 */ lw $a1, 0x0034($sp) -/* 10194 808423A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 10198 808423A8 C6080838 */ lwc1 $f8, 0x0838($s0) ## 00000838 -/* 1019C 808423AC C7AA002C */ lwc1 $f10, 0x002C($sp) -/* 101A0 808423B0 46080032 */ c.eq.s $f0, $f8 -/* 101A4 808423B4 00000000 */ nop -/* 101A8 808423B8 45020008 */ bc1fl .L808423DC -/* 101AC 808423BC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 101B0 808423C0 46005032 */ c.eq.s $f10, $f0 -/* 101B4 808423C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 101B8 808423C8 45020004 */ bc1fl .L808423DC -/* 101BC 808423CC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 101C0 808423D0 0C20E7E4 */ jal func_80839F90 -/* 101C4 808423D4 8FA50034 */ lw $a1, 0x0034($sp) -/* 101C8 808423D8 8FBF0024 */ lw $ra, 0x0024($sp) -.L808423DC: -/* 101CC 808423DC 8FB00020 */ lw $s0, 0x0020($sp) -/* 101D0 808423E0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 101D4 808423E4 03E00008 */ jr $ra -/* 101D8 808423E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808423EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808423EC.s deleted file mode 100644 index 2fc748b481..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808423EC.s +++ /dev/null @@ -1,81 +0,0 @@ -glabel func_808423EC -/* 101DC 808423EC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 101E0 808423F0 AFB0001C */ sw $s0, 0x001C($sp) -/* 101E4 808423F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 101E8 808423F8 AFB10020 */ sw $s1, 0x0020($sp) -/* 101EC 808423FC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 101F0 80842400 AFBF0024 */ sw $ra, 0x0024($sp) -/* 101F4 80842404 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 101F8 80842408 0C028EF0 */ jal func_800A3BC0 -/* 101FC 8084240C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 10200 80842410 3C068085 */ lui $a2, %hi(D_80854408) ## $a2 = 80850000 -/* 10204 80842414 AFA20034 */ sw $v0, 0x0034($sp) -/* 10208 80842418 24C64408 */ addiu $a2, $a2, %lo(D_80854408) ## $a2 = 80854408 -/* 1020C 8084241C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 10210 80842420 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10214 80842424 0C20DCD2 */ jal func_80837348 -/* 10218 80842428 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 1021C 8084242C 54400037 */ bnel $v0, $zero, .L8084250C -/* 10220 80842430 8FBF0024 */ lw $ra, 0x0024($sp) -/* 10224 80842434 0C20CF01 */ jal func_80833C04 -/* 10228 80842438 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1022C 8084243C 14400006 */ bne $v0, $zero, .L80842458 -/* 10230 80842440 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10234 80842444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10238 80842448 0C20F216 */ jal func_8083C858 -/* 1023C 8084244C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 10240 80842450 1000002E */ beq $zero, $zero, .L8084250C -/* 10244 80842454 8FBF0024 */ lw $ra, 0x0024($sp) -.L80842458: -/* 10248 80842458 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 1024C 8084245C 27A6002E */ addiu $a2, $sp, 0x002E ## $a2 = FFFFFFF6 -/* 10250 80842460 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 10254 80842464 0C20DC9A */ jal func_80837268 -/* 10258 80842468 AFB10010 */ sw $s1, 0x0010($sp) -/* 1025C 8084246C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 10260 80842470 C60601DC */ lwc1 $f6, 0x01DC($s0) ## 000001DC -/* 10264 80842474 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 10268 80842478 46062032 */ c.eq.s $f4, $f6 -/* 1026C 8084247C 00000000 */ nop -/* 10270 80842480 45020022 */ bc1fl .L8084250C -/* 10274 80842484 8FBF0024 */ lw $ra, 0x0024($sp) -/* 10278 80842488 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 1027C 8084248C C60A01CC */ lwc1 $f10, 0x01CC($s0) ## 000001CC -/* 10280 80842490 460A403C */ c.lt.s $f8, $f10 -/* 10284 80842494 00000000 */ nop -/* 10288 80842498 4502001C */ bc1fl .L8084250C -/* 1028C 8084249C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 10290 808424A0 0C20DC87 */ jal func_8083721C -/* 10294 808424A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10298 808424A8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 1029C 808424AC 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 102A0 808424B0 C61201CC */ lwc1 $f18, 0x01CC($s0) ## 000001CC -/* 102A4 808424B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 102A8 808424B8 8FA50030 */ lw $a1, 0x0030($sp) -/* 102AC 808424BC 4612803C */ c.lt.s $f16, $f18 -/* 102B0 808424C0 00000000 */ nop -/* 102B4 808424C4 4502000B */ bc1fl .L808424F4 -/* 102B8 808424C8 8FAE0034 */ lw $t6, 0x0034($sp) -/* 102BC 808424CC 0C20FF1A */ jal func_8083FC68 -/* 102C0 808424D0 87A6002E */ lh $a2, 0x002E($sp) -/* 102C4 808424D4 04410006 */ bgez $v0, .L808424F0 -/* 102C8 808424D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 102CC 808424DC 87A5002E */ lh $a1, 0x002E($sp) -/* 102D0 808424E0 0C20F2FC */ jal func_8083CBF0 -/* 102D4 808424E4 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 102D8 808424E8 10000008 */ beq $zero, $zero, .L8084250C -/* 102DC 808424EC 8FBF0024 */ lw $ra, 0x0024($sp) -.L808424F0: -/* 102E0 808424F0 8FAE0034 */ lw $t6, 0x0034($sp) -.L808424F4: -/* 102E4 808424F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 102E8 808424F8 51C00004 */ beql $t6, $zero, .L8084250C -/* 102EC 808424FC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 102F0 80842500 0C20F340 */ jal func_8083CD00 -/* 102F4 80842504 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 102F8 80842508 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084250C: -/* 102FC 8084250C 8FB0001C */ lw $s0, 0x001C($sp) -/* 10300 80842510 8FB10020 */ lw $s1, 0x0020($sp) -/* 10304 80842514 03E00008 */ jr $ra -/* 10308 80842518 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084251C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084251C.s deleted file mode 100644 index 5e100414e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084251C.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_8084251C -/* 1030C 8084251C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 10310 80842520 AFB0001C */ sw $s0, 0x001C($sp) -/* 10314 80842524 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 10318 80842528 AFB10020 */ sw $s1, 0x0020($sp) -/* 1031C 8084252C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 10320 80842530 AFBF0024 */ sw $ra, 0x0024($sp) -/* 10324 80842534 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 10328 80842538 0C028EF0 */ jal func_800A3BC0 -/* 1032C 8084253C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 10330 80842540 AFA20034 */ sw $v0, 0x0034($sp) -/* 10334 80842544 0C20DC87 */ jal func_8083721C -/* 10338 80842548 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1033C 8084254C 3C068085 */ lui $a2, %hi(D_80854440) ## $a2 = 80850000 -/* 10340 80842550 24C64440 */ addiu $a2, $a2, %lo(D_80854440) ## $a2 = 80854440 -/* 10344 80842554 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 10348 80842558 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1034C 8084255C 0C20DCD2 */ jal func_80837348 -/* 10350 80842560 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 10354 80842564 14400024 */ bne $v0, $zero, .L808425F8 -/* 10358 80842568 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1035C 8084256C 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 10360 80842570 27A6002E */ addiu $a2, $sp, 0x002E ## $a2 = FFFFFFF6 -/* 10364 80842574 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 10368 80842578 0C20DC9A */ jal func_80837268 -/* 1036C 8084257C AFB10010 */ sw $s1, 0x0010($sp) -/* 10370 80842580 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 10374 80842584 C6060838 */ lwc1 $f6, 0x0838($s0) ## 00000838 -/* 10378 80842588 46062032 */ c.eq.s $f4, $f6 -/* 1037C 8084258C 00000000 */ nop -/* 10380 80842590 4502001A */ bc1fl .L808425FC -/* 10384 80842594 8FBF0024 */ lw $ra, 0x0024($sp) -/* 10388 80842598 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 1038C 8084259C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10390 808425A0 A60E083C */ sh $t6, 0x083C($s0) ## 0000083C -/* 10394 808425A4 87A6002E */ lh $a2, 0x002E($sp) -/* 10398 808425A8 0C20FF1A */ jal func_8083FC68 -/* 1039C 808425AC 8FA50030 */ lw $a1, 0x0030($sp) -/* 103A0 808425B0 18400006 */ blez $v0, .L808425CC -/* 103A4 808425B4 C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 103A8 808425B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 103AC 808425BC 0C20F216 */ jal func_8083C858 -/* 103B0 808425C0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 103B4 808425C4 1000000D */ beq $zero, $zero, .L808425FC -/* 103B8 808425C8 8FBF0024 */ lw $ra, 0x0024($sp) -.L808425CC: -/* 103BC 808425CC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 103C0 808425D0 8FAF0034 */ lw $t7, 0x0034($sp) -/* 103C4 808425D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 103C8 808425D8 460A4032 */ c.eq.s $f8, $f10 -/* 103CC 808425DC 00000000 */ nop -/* 103D0 808425E0 45000003 */ bc1f .L808425F0 -/* 103D4 808425E4 00000000 */ nop -/* 103D8 808425E8 51E00004 */ beql $t7, $zero, .L808425FC -/* 103DC 808425EC 8FBF0024 */ lw $ra, 0x0024($sp) -.L808425F0: -/* 103E0 808425F0 0C20E7E4 */ jal func_80839F90 -/* 103E4 808425F4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L808425F8: -/* 103E8 808425F8 8FBF0024 */ lw $ra, 0x0024($sp) -.L808425FC: -/* 103EC 808425FC 8FB0001C */ lw $s0, 0x001C($sp) -/* 103F0 80842600 8FB10020 */ lw $s1, 0x0020($sp) -/* 103F4 80842604 03E00008 */ jr $ra -/* 103F8 80842608 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084260C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084260C.s deleted file mode 100644 index e910459969..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084260C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8084260C -/* 103FC 8084260C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 10400 80842610 AFBF0014 */ sw $ra, 0x0014($sp) -/* 10404 80842614 AFA40018 */ sw $a0, 0x0018($sp) -/* 10408 80842618 AFA5001C */ sw $a1, 0x001C($sp) -/* 1040C 8084261C AFA60020 */ sw $a2, 0x0020($sp) -/* 10410 80842620 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 10414 80842624 AFA70024 */ sw $a3, 0x0024($sp) -/* 10418 80842628 C7A40024 */ lwc1 $f4, 0x0024($sp) -/* 1041C 8084262C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 10420 80842630 8FAF001C */ lw $t7, 0x001C($sp) -/* 10424 80842634 46040182 */ mul.s $f6, $f0, $f4 -/* 10428 80842638 C5C80000 */ lwc1 $f8, 0x0000($t6) ## 00000000 -/* 1042C 8084263C 46083280 */ add.s $f10, $f6, $f8 -/* 10430 80842640 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 10434 80842644 E5EA0000 */ swc1 $f10, 0x0000($t7) ## 00000000 -/* 10438 80842648 8FB80018 */ lw $t8, 0x0018($sp) -/* 1043C 8084264C C7A60028 */ lwc1 $f6, 0x0028($sp) -/* 10440 80842650 C7B20020 */ lwc1 $f18, 0x0020($sp) -/* 10444 80842654 C7100004 */ lwc1 $f16, 0x0004($t8) ## 00000004 -/* 10448 80842658 46060202 */ mul.s $f8, $f0, $f6 -/* 1044C 8084265C 8FB9001C */ lw $t9, 0x001C($sp) -/* 10450 80842660 46128100 */ add.s $f4, $f16, $f18 -/* 10454 80842664 46044280 */ add.s $f10, $f8, $f4 -/* 10458 80842668 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 1045C 8084266C E72A0004 */ swc1 $f10, 0x0004($t9) ## 00000004 -/* 10460 80842670 C7B00024 */ lwc1 $f16, 0x0024($sp) -/* 10464 80842674 8FA80018 */ lw $t0, 0x0018($sp) -/* 10468 80842678 8FA9001C */ lw $t1, 0x001C($sp) -/* 1046C 8084267C 46100482 */ mul.s $f18, $f0, $f16 -/* 10470 80842680 C5060008 */ lwc1 $f6, 0x0008($t0) ## 00000008 -/* 10474 80842684 46069200 */ add.s $f8, $f18, $f6 -/* 10478 80842688 E5280008 */ swc1 $f8, 0x0008($t1) ## 00000008 -/* 1047C 8084268C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 10480 80842690 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 10484 80842694 03E00008 */ jr $ra -/* 10488 80842698 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084269C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084269C.s deleted file mode 100644 index 828466719b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084269C.s +++ /dev/null @@ -1,67 +0,0 @@ -glabel func_8084269C -/* 1048C 8084269C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 10490 808426A0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 10494 808426A4 AFB00020 */ sw $s0, 0x0020($sp) -/* 10498 808426A8 AFA40038 */ sw $a0, 0x0038($sp) -/* 1049C 808426AC 94A2089E */ lhu $v0, 0x089E($a1) ## 0000089E -/* 104A0 808426B0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 104A4 808426B4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 104A8 808426B8 50400004 */ beql $v0, $zero, .L808426CC -/* 104AC 808426BC C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 -/* 104B0 808426C0 54410031 */ bnel $v0, $at, .L80842788 -/* 104B4 808426C4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 104B8 808426C8 C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 -.L808426CC: -/* 104BC 808426CC C60600D0 */ lwc1 $f6, 0x00D0($s0) ## 000000D0 -/* 104C0 808426D0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 104C4 808426D4 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 104C8 808426D8 46062201 */ sub.s $f8, $f4, $f6 -/* 104CC 808426DC 260400CC */ addiu $a0, $s0, 0x00CC ## $a0 = 000000CC -/* 104D0 808426E0 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 104D4 808426E4 3C0740E0 */ lui $a3, 0x40E0 ## $a3 = 40E00000 -/* 104D8 808426E8 44064000 */ mfc1 $a2, $f8 -/* 104DC 808426EC 0C210983 */ jal func_8084260C -/* 104E0 808426F0 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 104E4 808426F4 3C068085 */ lui $a2, %hi(D_808545B4) ## $a2 = 80850000 -/* 104E8 808426F8 3C078085 */ lui $a3, %hi(D_808545C0) ## $a3 = 80850000 -/* 104EC 808426FC 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 -/* 104F0 80842700 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E -/* 104F4 80842704 AFAF0014 */ sw $t7, 0x0014($sp) -/* 104F8 80842708 AFAE0010 */ sw $t6, 0x0010($sp) -/* 104FC 8084270C 24E745C0 */ addiu $a3, $a3, %lo(D_808545C0) ## $a3 = 808545C0 -/* 10500 80842710 24C645B4 */ addiu $a2, $a2, %lo(D_808545B4) ## $a2 = 808545B4 -/* 10504 80842714 8FA40038 */ lw $a0, 0x0038($sp) -/* 10508 80842718 0C00A1B3 */ jal func_800286CC -/* 1050C 8084271C 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 10510 80842720 C6100080 */ lwc1 $f16, 0x0080($s0) ## 00000080 -/* 10514 80842724 C61200DC */ lwc1 $f18, 0x00DC($s0) ## 000000DC -/* 10518 80842728 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 1051C 8084272C 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 10520 80842730 46128101 */ sub.s $f4, $f16, $f18 -/* 10524 80842734 260400D8 */ addiu $a0, $s0, 0x00D8 ## $a0 = 000000D8 -/* 10528 80842738 AFA40028 */ sw $a0, 0x0028($sp) -/* 1052C 8084273C 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 10530 80842740 44062000 */ mfc1 $a2, $f4 -/* 10534 80842744 3C0740E0 */ lui $a3, 0x40E0 ## $a3 = 40E00000 -/* 10538 80842748 0C210983 */ jal func_8084260C -/* 1053C 8084274C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 10540 80842750 3C068085 */ lui $a2, %hi(D_808545B4) ## $a2 = 80850000 -/* 10544 80842754 3C078085 */ lui $a3, %hi(D_808545C0) ## $a3 = 80850000 -/* 10548 80842758 24180032 */ addiu $t8, $zero, 0x0032 ## $t8 = 00000032 -/* 1054C 8084275C 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E -/* 10550 80842760 AFB90014 */ sw $t9, 0x0014($sp) -/* 10554 80842764 AFB80010 */ sw $t8, 0x0010($sp) -/* 10558 80842768 24E745C0 */ addiu $a3, $a3, %lo(D_808545C0) ## $a3 = 808545C0 -/* 1055C 8084276C 24C645B4 */ addiu $a2, $a2, %lo(D_808545B4) ## $a2 = 808545B4 -/* 10560 80842770 8FA40038 */ lw $a0, 0x0038($sp) -/* 10564 80842774 0C00A1B3 */ jal func_800286CC -/* 10568 80842778 8FA50028 */ lw $a1, 0x0028($sp) -/* 1056C 8084277C 10000002 */ beq $zero, $zero, .L80842788 -/* 10570 80842780 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 10574 80842784 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80842788: -/* 10578 80842788 8FBF0024 */ lw $ra, 0x0024($sp) -/* 1057C 8084278C 8FB00020 */ lw $s0, 0x0020($sp) -/* 10580 80842790 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 10584 80842794 03E00008 */ jr $ra -/* 10588 80842798 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084279C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084279C.s deleted file mode 100644 index ddd810b0d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084279C.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_8084279C -/* 1058C 8084279C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 10590 808427A0 AFB00018 */ sw $s0, 0x0018($sp) -/* 10594 808427A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 10598 808427A8 AFBF001C */ sw $ra, 0x001C($sp) -/* 1059C 808427AC AFA50024 */ sw $a1, 0x0024($sp) -/* 105A0 808427B0 920E015B */ lbu $t6, 0x015B($s0) ## 0000015B -/* 105A4 808427B4 3C068085 */ lui $a2, %hi(D_80853C2C) ## $a2 = 80850000 -/* 105A8 808427B8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 105AC 808427BC 000E7880 */ sll $t7, $t6, 2 -/* 105B0 808427C0 00CF3021 */ addu $a2, $a2, $t7 -/* 105B4 808427C4 8CC63C2C */ lw $a2, %lo(D_80853C2C)($a2) -/* 105B8 808427C8 0C20CB2C */ jal func_80832CB0 -/* 105BC 808427CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 105C0 808427D0 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 105C4 808427D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 105C8 808427D8 14600003 */ bne $v1, $zero, .L808427E8 -/* 105CC 808427DC 2478FFFF */ addiu $t8, $v1, 0xFFFF ## $t8 = FFFFFFFF -/* 105D0 808427E0 10000003 */ beq $zero, $zero, .L808427F0 -/* 105D4 808427E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808427E8: -/* 105D8 808427E8 A6180850 */ sh $t8, 0x0850($s0) ## 00000850 -/* 105DC 808427EC 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -.L808427F0: -/* 105E0 808427F0 54400016 */ bnel $v0, $zero, .L8084284C -/* 105E4 808427F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 105E8 808427F8 0C20EC10 */ jal func_8083B040 -/* 105EC 808427FC 8FA50024 */ lw $a1, 0x0024($sp) -/* 105F0 80842800 14400008 */ bne $v0, $zero, .L80842824 -/* 105F4 80842804 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 105F8 80842808 9219015B */ lbu $t9, 0x015B($s0) ## 0000015B -/* 105FC 8084280C 3C058085 */ lui $a1, %hi(D_80853C44) ## $a1 = 80850000 -/* 10600 80842810 8FA60024 */ lw $a2, 0x0024($sp) -/* 10604 80842814 00194080 */ sll $t0, $t9, 2 -/* 10608 80842818 00A82821 */ addu $a1, $a1, $t0 -/* 1060C 8084281C 0C20E826 */ jal func_8083A098 -/* 10610 80842820 8CA53C44 */ lw $a1, %lo(D_80853C44)($a1) -.L80842824: -/* 10614 80842824 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -/* 10618 80842828 2401FEFF */ addiu $at, $zero, 0xFEFF ## $at = FFFFFEFF -/* 1061C 8084282C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 10620 80842830 01215024 */ and $t2, $t1, $at -/* 10624 80842834 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 10628 80842838 0C030129 */ jal Gameplay_GetCamera -/* 1062C 8084283C 8FA40024 */ lw $a0, 0x0024($sp) -/* 10630 80842840 0C016C69 */ jal func_8005B1A4 -/* 10634 80842844 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 10638 80842848 8FBF001C */ lw $ra, 0x001C($sp) -.L8084284C: -/* 1063C 8084284C 8FB00018 */ lw $s0, 0x0018($sp) -/* 10640 80842850 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 10644 80842854 03E00008 */ jr $ra -/* 10648 80842858 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084285C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084285C.s deleted file mode 100644 index dd36827b7f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084285C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_8084285C -/* 1064C 8084285C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 10650 80842860 AFBF0014 */ sw $ra, 0x0014($sp) -/* 10654 80842864 AFA60020 */ sw $a2, 0x0020($sp) -/* 10658 80842868 44856000 */ mtc1 $a1, $f12 ## $f12 = 0.00 -/* 1065C 8084286C C48001CC */ lwc1 $f0, 0x01CC($a0) ## 000001CC -/* 10660 80842870 44877000 */ mtc1 $a3, $f14 ## $f14 = 0.00 -/* 10664 80842874 4600603E */ c.le.s $f12, $f0 -/* 10668 80842878 00000000 */ nop -/* 1066C 8084287C 4500000F */ bc1f .L808428BC -/* 10670 80842880 00000000 */ nop -/* 10674 80842884 460E003E */ c.le.s $f0, $f14 -/* 10678 80842888 C7A40020 */ lwc1 $f4, 0x0020($sp) -/* 1067C 8084288C 4500000B */ bc1f .L808428BC -/* 10680 80842890 00000000 */ nop -/* 10684 80842894 4600203E */ c.le.s $f4, $f0 -/* 10688 80842898 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -/* 1068C 8084289C 45000003 */ bc1f .L808428AC -/* 10690 808428A0 00000000 */ nop -/* 10694 808428A4 10000001 */ beq $zero, $zero, .L808428AC -/* 10698 808428A8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -.L808428AC: -/* 1069C 808428AC 0C20CE88 */ jal func_80833A20 -/* 106A0 808428B0 00000000 */ nop -/* 106A4 808428B4 10000004 */ beq $zero, $zero, .L808428C8 -/* 106A8 808428B8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808428BC: -/* 106AC 808428BC 0C20C8C6 */ jal func_80832318 -/* 106B0 808428C0 00000000 */ nop -/* 106B4 808428C4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808428C8: -/* 106B8 808428C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 106BC 808428CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 106C0 808428D0 03E00008 */ jr $ra -/* 106C4 808428D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808428D8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808428D8.s deleted file mode 100644 index 98766c506a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808428D8.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_808428D8 -/* 106C8 808428D8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 106CC 808428DC AFBF001C */ sw $ra, 0x001C($sp) -/* 106D0 808428E0 AFB00018 */ sw $s0, 0x0018($sp) -/* 106D4 808428E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 106D8 808428E8 0C023A74 */ jal func_8008E9D0 -/* 106DC 808428EC AFA50024 */ sw $a1, 0x0024($sp) -/* 106E0 808428F0 54400017 */ bnel $v0, $zero, .L80842950 -/* 106E4 808428F4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 106E8 808428F8 0C023C60 */ jal func_8008F180 -/* 106EC 808428FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 106F0 80842900 10400012 */ beq $v0, $zero, .L8084294C -/* 106F4 80842904 3C0E8085 */ lui $t6, %hi(D_80853614) ## $t6 = 80850000 -/* 106F8 80842908 8DCE3614 */ lw $t6, %lo(D_80853614)($t6) -/* 106FC 8084290C 8FA40024 */ lw $a0, 0x0024($sp) -/* 10700 80842910 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10704 80842914 11C0000D */ beq $t6, $zero, .L8084294C -/* 10708 80842918 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1070C 8084291C 0C20C899 */ jal func_80832264 -/* 10710 80842920 24C62EC8 */ addiu $a2, $a2, 0x2EC8 ## $a2 = 04002EC8 -/* 10714 80842924 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 10718 80842928 860806BE */ lh $t0, 0x06BE($s0) ## 000006BE -/* 1071C 8084292C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 10720 80842930 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C -/* 10724 80842934 03284821 */ addu $t1, $t9, $t0 -/* 10728 80842938 A20F084F */ sb $t7, 0x084F($s0) ## 0000084F -/* 1072C 8084293C A2180842 */ sb $t8, 0x0842($s0) ## 00000842 -/* 10730 80842940 A609083C */ sh $t1, 0x083C($s0) ## 0000083C -/* 10734 80842944 10000002 */ beq $zero, $zero, .L80842950 -/* 10738 80842948 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8084294C: -/* 1073C 8084294C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80842950: -/* 10740 80842950 8FBF001C */ lw $ra, 0x001C($sp) -/* 10744 80842954 8FB00018 */ lw $s0, 0x0018($sp) -/* 10748 80842958 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1074C 8084295C 03E00008 */ jr $ra -/* 10750 80842960 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842964.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842964.s deleted file mode 100644 index 87ed120107..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842964.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80842964 -/* 10754 80842964 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 10758 80842968 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1075C 8084296C AFA40018 */ sw $a0, 0x0018($sp) -/* 10760 80842970 0C20EC10 */ jal func_8083B040 -/* 10764 80842974 AFA5001C */ sw $a1, 0x001C($sp) -/* 10768 80842978 0002102B */ sltu $v0, $zero, $v0 -/* 1076C 8084297C 14400009 */ bne $v0, $zero, .L808429A4 -/* 10770 80842980 8FA40018 */ lw $a0, 0x0018($sp) -/* 10774 80842984 0C20ED91 */ jal func_8083B644 -/* 10778 80842988 8FA5001C */ lw $a1, 0x001C($sp) -/* 1077C 8084298C 0002102B */ sltu $v0, $zero, $v0 -/* 10780 80842990 14400004 */ bne $v0, $zero, .L808429A4 -/* 10784 80842994 8FA40018 */ lw $a0, 0x0018($sp) -/* 10788 80842998 0C20F96A */ jal func_8083E5A8 -/* 1078C 8084299C 8FA5001C */ lw $a1, 0x001C($sp) -/* 10790 808429A0 0002102B */ sltu $v0, $zero, $v0 -.L808429A4: -/* 10794 808429A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 10798 808429A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1079C 808429AC 03E00008 */ jr $ra -/* 107A0 808429B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s deleted file mode 100644 index 249b465a03..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_808429B4 -/* 107A4 808429B4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 107A8 808429B8 AFBF001C */ sw $ra, 0x001C($sp) -/* 107AC 808429BC AFA50034 */ sw $a1, 0x0034($sp) -/* 107B0 808429C0 AFA60038 */ sw $a2, 0x0038($sp) -/* 107B4 808429C4 AFA7003C */ sw $a3, 0x003C($sp) -/* 107B8 808429C8 0C030129 */ jal Gameplay_GetCamera -/* 107BC 808429CC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 107C0 808429D0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 107C4 808429D4 0C024BE2 */ jal Quake_Add -/* 107C8 808429D8 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 107CC 808429DC 00022400 */ sll $a0, $v0, 16 -/* 107D0 808429E0 AFA2002C */ sw $v0, 0x002C($sp) -/* 107D4 808429E4 00042403 */ sra $a0, $a0, 16 -/* 107D8 808429E8 0C024B6B */ jal Quake_SetSpeed -/* 107DC 808429EC 87A50036 */ lh $a1, 0x0036($sp) -/* 107E0 808429F0 87A4002E */ lh $a0, 0x002E($sp) -/* 107E4 808429F4 87A5003A */ lh $a1, 0x003A($sp) -/* 107E8 808429F8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 107EC 808429FC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 107F0 80842A00 AFA00010 */ sw $zero, 0x0010($sp) -/* 107F4 80842A04 0C024B9C */ jal Quake_SetQuakeValues -/* 107F8 80842A08 AFA40024 */ sw $a0, 0x0024($sp) -/* 107FC 80842A0C 8FA40024 */ lw $a0, 0x0024($sp) -/* 10800 80842A10 0C024B7C */ jal Quake_SetCountdown -/* 10804 80842A14 87A5003E */ lh $a1, 0x003E($sp) -/* 10808 80842A18 8FBF001C */ lw $ra, 0x001C($sp) -/* 1080C 80842A1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 10810 80842A20 03E00008 */ jr $ra -/* 10814 80842A24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A28.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A28.s deleted file mode 100644 index 1b37195823..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A28.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80842A28 -/* 10818 80842A28 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1081C 80842A2C AFBF001C */ sw $ra, 0x001C($sp) -/* 10820 80842A30 AFA50024 */ sw $a1, 0x0024($sp) -/* 10824 80842A34 AFA40020 */ sw $a0, 0x0020($sp) -/* 10828 80842A38 24056C77 */ addiu $a1, $zero, 0x6C77 ## $a1 = 00006C77 -/* 1082C 80842A3C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 10830 80842A40 0C210A6D */ jal func_808429B4 -/* 10834 80842A44 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 -/* 10838 80842A48 8FAF0020 */ lw $t7, 0x0020($sp) -/* 1083C 80842A4C 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 10840 80842A50 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 10844 80842A54 A1EE1C26 */ sb $t6, 0x1C26($t7) ## 00001C26 -/* 10848 80842A58 AFA00010 */ sw $zero, 0x0010($sp) -/* 1084C 80842A5C 8FA40024 */ lw $a0, 0x0024($sp) -/* 10850 80842A60 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 10854 80842A64 0C20C993 */ jal func_8083264C -/* 10858 80842A68 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 1085C 80842A6C 8FA40024 */ lw $a0, 0x0024($sp) -/* 10860 80842A70 0C00BDF7 */ jal func_8002F7DC -/* 10864 80842A74 2405180A */ addiu $a1, $zero, 0x180A ## $a1 = 0000180A -/* 10868 80842A78 8FBF001C */ lw $ra, 0x001C($sp) -/* 1086C 80842A7C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 10870 80842A80 03E00008 */ jr $ra -/* 10874 80842A84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A88.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A88.s deleted file mode 100644 index 2b323d0423..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A88.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80842A88 -/* 10878 80842A88 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1087C 80842A8C AFBF0014 */ sw $ra, 0x0014($sp) -/* 10880 80842A90 AFA40018 */ sw $a0, 0x0018($sp) -/* 10884 80842A94 AFA5001C */ sw $a1, 0x001C($sp) -/* 10888 80842A98 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -/* 1088C 80842A9C 0C021CCC */ jal Inventory_ChangeAmmo -/* 10890 80842AA0 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 10894 80842AA4 8FA40018 */ lw $a0, 0x0018($sp) -/* 10898 80842AA8 8FA5001C */ lw $a1, 0x001C($sp) -/* 1089C 80842AAC 0C20D7D1 */ jal func_80835F44 -/* 108A0 80842AB0 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 108A4 80842AB4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 108A8 80842AB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 108AC 80842ABC 03E00008 */ jr $ra -/* 108B0 80842AC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842AC4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842AC4.s deleted file mode 100644 index bc18eba413..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842AC4.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80842AC4 -/* 108B4 80842AC4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 108B8 80842AC8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 108BC 80842ACC AFA40018 */ sw $a0, 0x0018($sp) -/* 108C0 80842AD0 80AE0151 */ lb $t6, 0x0151($a1) ## 00000151 -/* 108C4 80842AD4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 108C8 80842AD8 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 108CC 80842ADC 15C10023 */ bne $t6, $at, .L80842B6C -/* 108D0 80842AE0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 108D4 80842AE4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 108D8 80842AE8 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 108DC 80842AEC C4A6085C */ lwc1 $f6, 0x085C($a1) ## 0000085C -/* 108E0 80842AF0 3C0F8012 */ lui $t7, %hi(gItemSlots) -/* 108E4 80842AF4 4606203C */ c.lt.s $f4, $f6 -/* 108E8 80842AF8 00000000 */ nop -/* 108EC 80842AFC 4500001B */ bc1f .L80842B6C -/* 108F0 80842B00 00000000 */ nop -/* 108F4 80842B04 91EF7464 */ lbu $t7, %lo(gItemSlots)($t7) -/* 108F8 80842B08 3C188016 */ lui $t8, %hi(gSaveContext+0x8c) -/* 108FC 80842B0C 24A509BC */ addiu $a1, $a1, 0x09BC ## $a1 = 000009BC -/* 10900 80842B10 030FC021 */ addu $t8, $t8, $t7 -/* 10904 80842B14 8318E6EC */ lb $t8, %lo(gSaveContext+0x8c)($t8) -/* 10908 80842B18 13000012 */ beq $t8, $zero, .L80842B64 -/* 1090C 80842B1C 00000000 */ nop -/* 10910 80842B20 84E600B6 */ lh $a2, 0x00B6($a3) ## 000000B6 -/* 10914 80842B24 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 10918 80842B28 AFA7001C */ sw $a3, 0x001C($sp) -/* 1091C 80842B2C 00C13021 */ addu $a2, $a2, $at -/* 10920 80842B30 00063400 */ sll $a2, $a2, 16 -/* 10924 80842B34 0C00A63B */ jal func_800298EC -/* 10928 80842B38 00063403 */ sra $a2, $a2, 16 -/* 1092C 80842B3C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 10930 80842B40 8FA5001C */ lw $a1, 0x001C($sp) -/* 10934 80842B44 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 10938 80842B48 00000000 */ nop -/* 1093C 80842B4C E4A8085C */ swc1 $f8, 0x085C($a1) ## 0000085C -/* 10940 80842B50 0C210AA2 */ jal func_80842A88 -/* 10944 80842B54 8FA40018 */ lw $a0, 0x0018($sp) -/* 10948 80842B58 8FA4001C */ lw $a0, 0x001C($sp) -/* 1094C 80842B5C 0C00BDF7 */ jal func_8002F7DC -/* 10950 80842B60 2405181D */ addiu $a1, $zero, 0x181D ## $a1 = 0000181D -.L80842B64: -/* 10954 80842B64 10000001 */ beq $zero, $zero, .L80842B6C -/* 10958 80842B68 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80842B6C: -/* 1095C 80842B6C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 10960 80842B70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 10964 80842B74 03E00008 */ jr $ra -/* 10968 80842B78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842B7C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842B7C.s deleted file mode 100644 index 5e49defc81..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842B7C.s +++ /dev/null @@ -1,101 +0,0 @@ -glabel func_80842B7C -/* 1096C 80842B7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 10970 80842B80 AFBF0014 */ sw $ra, 0x0014($sp) -/* 10974 80842B84 AFA40018 */ sw $a0, 0x0018($sp) -/* 10978 80842B88 80AE0151 */ lb $t6, 0x0151($a1) ## 00000151 -/* 1097C 80842B8C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 10980 80842B90 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 10984 80842B94 15C10052 */ bne $t6, $at, .L80842CE0 -/* 10988 80842B98 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1098C 80842B9C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 10990 80842BA0 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 10994 80842BA4 904F003E */ lbu $t7, 0x003E($v0) ## 8015E69E -/* 10998 80842BA8 15E0004B */ bne $t7, $zero, .L80842CD8 -/* 1099C 80842BAC 00000000 */ nop -/* 109A0 80842BB0 94580036 */ lhu $t8, 0x0036($v0) ## 8015E696 -/* 109A4 80842BB4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 109A8 80842BB8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 109AC 80842BBC 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 109B0 80842BC0 07010004 */ bgez $t8, .L80842BD4 -/* 109B4 80842BC4 46802020 */ cvt.s.w $f0, $f4 -/* 109B8 80842BC8 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 109BC 80842BCC 00000000 */ nop -/* 109C0 80842BD0 46060000 */ add.s $f0, $f0, $f6 -.L80842BD4: -/* 109C4 80842BD4 4600103C */ c.lt.s $f2, $f0 -/* 109C8 80842BD8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 109CC 80842BDC 4500003E */ bc1f .L80842CD8 -/* 109D0 80842BE0 00000000 */ nop -/* 109D4 80842BE4 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 109D8 80842BE8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 109DC 80842BEC 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 109E0 80842BF0 46080281 */ sub.s $f10, $f0, $f8 -/* 109E4 80842BF4 24E509BC */ addiu $a1, $a3, 0x09BC ## $a1 = 000009BC -/* 109E8 80842BF8 4459F800 */ cfc1 $t9, $31 -/* 109EC 80842BFC 44C8F800 */ ctc1 $t0, $31 -/* 109F0 80842C00 00000000 */ nop -/* 109F4 80842C04 46005424 */ cvt.w.s $f16, $f10 -/* 109F8 80842C08 4448F800 */ cfc1 $t0, $31 -/* 109FC 80842C0C 00000000 */ nop -/* 10A00 80842C10 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 10A04 80842C14 51000013 */ beql $t0, $zero, .L80842C64 -/* 10A08 80842C18 44088000 */ mfc1 $t0, $f16 -/* 10A0C 80842C1C 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 10A10 80842C20 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 10A14 80842C24 46105401 */ sub.s $f16, $f10, $f16 -/* 10A18 80842C28 44C8F800 */ ctc1 $t0, $31 -/* 10A1C 80842C2C 00000000 */ nop -/* 10A20 80842C30 46008424 */ cvt.w.s $f16, $f16 -/* 10A24 80842C34 4448F800 */ cfc1 $t0, $31 -/* 10A28 80842C38 00000000 */ nop -/* 10A2C 80842C3C 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 10A30 80842C40 15000005 */ bne $t0, $zero, .L80842C58 -/* 10A34 80842C44 00000000 */ nop -/* 10A38 80842C48 44088000 */ mfc1 $t0, $f16 -/* 10A3C 80842C4C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 10A40 80842C50 10000007 */ beq $zero, $zero, .L80842C70 -/* 10A44 80842C54 01014025 */ or $t0, $t0, $at ## $t0 = 80000000 -.L80842C58: -/* 10A48 80842C58 10000005 */ beq $zero, $zero, .L80842C70 -/* 10A4C 80842C5C 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 10A50 80842C60 44088000 */ mfc1 $t0, $f16 -.L80842C64: -/* 10A54 80842C64 00000000 */ nop -/* 10A58 80842C68 0500FFFB */ bltz $t0, .L80842C58 -/* 10A5C 80842C6C 00000000 */ nop -.L80842C70: -/* 10A60 80842C70 3109FFFF */ andi $t1, $t0, 0xFFFF ## $t1 = 0000FFFF -/* 10A64 80842C74 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 10A68 80842C78 44D9F800 */ ctc1 $t9, $31 -/* 10A6C 80842C7C A4480036 */ sh $t0, 0x0036($v0) ## 8015E696 -/* 10A70 80842C80 05210005 */ bgez $t1, .L80842C98 -/* 10A74 80842C84 46809120 */ cvt.s.w $f4, $f18 -/* 10A78 80842C88 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 10A7C 80842C8C 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 10A80 80842C90 00000000 */ nop -/* 10A84 80842C94 46062100 */ add.s $f4, $f4, $f6 -.L80842C98: -/* 10A88 80842C98 4602203E */ c.le.s $f4, $f2 -/* 10A8C 80842C9C 8FA40018 */ lw $a0, 0x0018($sp) -/* 10A90 80842CA0 4500000D */ bc1f .L80842CD8 -/* 10A94 80842CA4 00000000 */ nop -/* 10A98 80842CA8 84E600B6 */ lh $a2, 0x00B6($a3) ## 000000B6 -/* 10A9C 80842CAC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 10AA0 80842CB0 AFA7001C */ sw $a3, 0x001C($sp) -/* 10AA4 80842CB4 00C13021 */ addu $a2, $a2, $at -/* 10AA8 80842CB8 00063400 */ sll $a2, $a2, 16 -/* 10AAC 80842CBC 0C00A63B */ jal func_800298EC -/* 10AB0 80842CC0 00063403 */ sra $a2, $a2, 16 -/* 10AB4 80842CC4 0C02127B */ jal func_800849EC -/* 10AB8 80842CC8 8FA40018 */ lw $a0, 0x0018($sp) -/* 10ABC 80842CCC 8FA4001C */ lw $a0, 0x001C($sp) -/* 10AC0 80842CD0 0C00BDF7 */ jal func_8002F7DC -/* 10AC4 80842CD4 2405184C */ addiu $a1, $zero, 0x184C ## $a1 = 0000184C -.L80842CD8: -/* 10AC8 80842CD8 10000001 */ beq $zero, $zero, .L80842CE0 -/* 10ACC 80842CDC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80842CE0: -/* 10AD0 80842CE0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 10AD4 80842CE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 10AD8 80842CE8 03E00008 */ jr $ra -/* 10ADC 80842CEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842CF0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842CF0.s deleted file mode 100644 index 76bd7b1605..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842CF0.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80842CF0 -/* 10AE0 80842CF0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 10AE4 80842CF4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 10AE8 80842CF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 10AEC 80842CFC 0C210AB1 */ jal func_80842AC4 -/* 10AF0 80842D00 AFA5001C */ sw $a1, 0x001C($sp) -/* 10AF4 80842D04 8FA40018 */ lw $a0, 0x0018($sp) -/* 10AF8 80842D08 0C210ADF */ jal func_80842B7C -/* 10AFC 80842D0C 8FA5001C */ lw $a1, 0x001C($sp) -/* 10B00 80842D10 8FBF0014 */ lw $ra, 0x0014($sp) -/* 10B04 80842D14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 10B08 80842D18 03E00008 */ jr $ra -/* 10B0C 80842D1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842D20.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842D20.s deleted file mode 100644 index a1a747069b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842D20.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80842D20 -/* 10B10 80842D20 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 10B14 80842D24 AFBF0024 */ sw $ra, 0x0024($sp) -/* 10B18 80842D28 AFB00020 */ sw $s0, 0x0020($sp) -/* 10B1C 80842D2C AFA40030 */ sw $a0, 0x0030($sp) -/* 10B20 80842D30 8CAE0674 */ lw $t6, 0x0674($a1) ## 00000674 -/* 10B24 80842D34 3C0F8084 */ lui $t7, %hi(func_80843188) ## $t7 = 80840000 -/* 10B28 80842D38 25EF3188 */ addiu $t7, $t7, %lo(func_80843188) ## $t7 = 80843188 -/* 10B2C 80842D3C 11CF001C */ beq $t6, $t7, .L80842DB0 -/* 10B30 80842D40 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 10B34 80842D44 0C20C910 */ jal func_80832440 -/* 10B38 80842D48 00000000 */ nop -/* 10B3C 80842D4C 3C068085 */ lui $a2, %hi(func_808505DC) ## $a2 = 80850000 -/* 10B40 80842D50 24C605DC */ addiu $a2, $a2, %lo(func_808505DC) ## $a2 = 808505DC -/* 10B44 80842D54 8FA40030 */ lw $a0, 0x0030($sp) -/* 10B48 80842D58 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10B4C 80842D5C 0C20D716 */ jal func_80835C58 -/* 10B50 80842D60 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 10B54 80842D64 0C023A71 */ jal func_8008E9C4 -/* 10B58 80842D68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10B5C 80842D6C 10400003 */ beq $v0, $zero, .L80842D7C -/* 10B60 80842D70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10B64 80842D74 10000002 */ beq $zero, $zero, .L80842D80 -/* 10B68 80842D78 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -.L80842D7C: -/* 10B6C 80842D7C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80842D80: -/* 10B70 80842D80 0C023C68 */ jal func_8008F1A0 -/* 10B74 80842D84 AFA30028 */ sw $v1, 0x0028($sp) -/* 10B78 80842D88 8FA30028 */ lw $v1, 0x0028($sp) -/* 10B7C 80842D8C 0002C080 */ sll $t8, $v0, 2 -/* 10B80 80842D90 3C068085 */ lui $a2, %hi(D_808545CC) ## $a2 = 80850000 -/* 10B84 80842D94 0003C880 */ sll $t9, $v1, 2 -/* 10B88 80842D98 03194021 */ addu $t0, $t8, $t9 -/* 10B8C 80842D9C 00C83021 */ addu $a2, $a2, $t0 -/* 10B90 80842DA0 8CC645CC */ lw $a2, %lo(D_808545CC)($a2) -/* 10B94 80842DA4 8FA40030 */ lw $a0, 0x0030($sp) -/* 10B98 80842DA8 0C20C8B4 */ jal func_808322D0 -/* 10B9C 80842DAC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L80842DB0: -/* 10BA0 80842DB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10BA4 80842DB4 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 10BA8 80842DB8 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 10BAC 80842DBC 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 10BB0 80842DC0 0C20C993 */ jal func_8083264C -/* 10BB4 80842DC4 AFA00010 */ sw $zero, 0x0010($sp) -/* 10BB8 80842DC8 3C01C190 */ lui $at, 0xC190 ## $at = C1900000 -/* 10BBC 80842DCC 44812000 */ mtc1 $at, $f4 ## $f4 = -18.00 -/* 10BC0 80842DD0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10BC4 80842DD4 E6040838 */ swc1 $f4, 0x0838($s0) ## 00000838 -/* 10BC8 80842DD8 0C210B3C */ jal func_80842CF0 -/* 10BCC 80842DDC 8FA40030 */ lw $a0, 0x0030($sp) -/* 10BD0 80842DE0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 10BD4 80842DE4 8FB00020 */ lw $s0, 0x0020($sp) -/* 10BD8 80842DE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 10BDC 80842DEC 03E00008 */ jr $ra -/* 10BE0 80842DF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842DF4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842DF4.s deleted file mode 100644 index 94a957f908..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80842DF4.s +++ /dev/null @@ -1,244 +0,0 @@ -glabel func_80842DF4 -/* 10BE4 80842DF4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 10BE8 80842DF8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 10BEC 80842DFC AFB00030 */ sw $s0, 0x0030($sp) -/* 10BF0 80842E00 AFA40080 */ sw $a0, 0x0080($sp) -/* 10BF4 80842E04 80AE0843 */ lb $t6, 0x0843($a1) ## 00000843 -/* 10BF8 80842E08 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 10BFC 80842E0C 59C000D9 */ blezl $t6, .L80843174 -/* 10C00 80842E10 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 10C04 80842E14 80AF0842 */ lb $t7, 0x0842($a1) ## 00000842 -/* 10C08 80842E18 29E10018 */ slti $at, $t7, 0x0018 -/* 10C0C 80842E1C 50200099 */ beql $at, $zero, .L80843084 -/* 10C10 80842E20 920204F4 */ lbu $v0, 0x04F4($s0) ## 000004F4 -/* 10C14 80842E24 90B804F4 */ lbu $t8, 0x04F4($a1) ## 000004F4 -/* 10C18 80842E28 8FA40080 */ lw $a0, 0x0080($sp) -/* 10C1C 80842E2C 33190004 */ andi $t9, $t8, 0x0004 ## $t9 = 00000000 -/* 10C20 80842E30 1720008D */ bne $t9, $zero, .L80843068 -/* 10C24 80842E34 00000000 */ nop -/* 10C28 80842E38 90A80574 */ lbu $t0, 0x0574($a1) ## 00000574 -/* 10C2C 80842E3C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 10C30 80842E40 31090004 */ andi $t1, $t0, 0x0004 ## $t1 = 00000000 -/* 10C34 80842E44 15200088 */ bne $t1, $zero, .L80843068 -/* 10C38 80842E48 00000000 */ nop -/* 10C3C 80842E4C C4A401CC */ lwc1 $f4, 0x01CC($a1) ## 000001CC -/* 10C40 80842E50 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 10C44 80842E54 24A408B8 */ addiu $a0, $a1, 0x08B8 ## $a0 = 000008B8 -/* 10C48 80842E58 24A508C4 */ addiu $a1, $a1, 0x08C4 ## $a1 = 000008C4 -/* 10C4C 80842E5C 4604303E */ c.le.s $f6, $f4 -/* 10C50 80842E60 27A60050 */ addiu $a2, $sp, 0x0050 ## $a2 = FFFFFFD0 -/* 10C54 80842E64 45020087 */ bc1fl .L80843084 -/* 10C58 80842E68 920204F4 */ lbu $v0, 0x04F4($s0) ## 000004F4 -/* 10C5C 80842E6C 0C01DFF4 */ jal Math_Vec3f_DistXYZAndStoreDiff - -/* 10C60 80842E70 AFA4003C */ sw $a0, 0x003C($sp) -/* 10C64 80842E74 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 10C68 80842E78 46000086 */ mov.s $f2, $f0 -/* 10C6C 80842E7C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 10C70 80842E80 46080032 */ c.eq.s $f0, $f8 -/* 10C74 80842E84 C7A40050 */ lwc1 $f4, 0x0050($sp) -/* 10C78 80842E88 45010005 */ bc1t .L80842EA0 -/* 10C7C 80842E8C 00000000 */ nop -/* 10C80 80842E90 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 10C84 80842E94 00000000 */ nop -/* 10C88 80842E98 460A0400 */ add.s $f16, $f0, $f10 -/* 10C8C 80842E9C 46008083 */ div.s $f2, $f16, $f0 -.L80842EA0: -/* 10C90 80842EA0 46022182 */ mul.s $f6, $f4, $f2 -/* 10C94 80842EA4 C61208B8 */ lwc1 $f18, 0x08B8($s0) ## 000008B8 -/* 10C98 80842EA8 C7B00054 */ lwc1 $f16, 0x0054($sp) -/* 10C9C 80842EAC 8FA40080 */ lw $a0, 0x0080($sp) -/* 10CA0 80842EB0 27AA0078 */ addiu $t2, $sp, 0x0078 ## $t2 = FFFFFFF8 -/* 10CA4 80842EB4 46028102 */ mul.s $f4, $f16, $f2 -/* 10CA8 80842EB8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 10CAC 80842EBC 46069200 */ add.s $f8, $f18, $f6 -/* 10CB0 80842EC0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 10CB4 80842EC4 27AD0074 */ addiu $t5, $sp, 0x0074 ## $t5 = FFFFFFF4 -/* 10CB8 80842EC8 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 10CBC 80842ECC E7A80068 */ swc1 $f8, 0x0068($sp) -/* 10CC0 80842ED0 C60A08BC */ lwc1 $f10, 0x08BC($s0) ## 000008BC -/* 10CC4 80842ED4 C7A80058 */ lwc1 $f8, 0x0058($sp) -/* 10CC8 80842ED8 27A50068 */ addiu $a1, $sp, 0x0068 ## $a1 = FFFFFFE8 -/* 10CCC 80842EDC 46045480 */ add.s $f18, $f10, $f4 -/* 10CD0 80842EE0 46024402 */ mul.s $f16, $f8, $f2 -/* 10CD4 80842EE4 8FA6003C */ lw $a2, 0x003C($sp) -/* 10CD8 80842EE8 27A7005C */ addiu $a3, $sp, 0x005C ## $a3 = FFFFFFDC -/* 10CDC 80842EEC E7B2006C */ swc1 $f18, 0x006C($sp) -/* 10CE0 80842EF0 C60608C0 */ lwc1 $f6, 0x08C0($s0) ## 000008C0 -/* 10CE4 80842EF4 AFA40038 */ sw $a0, 0x0038($sp) -/* 10CE8 80842EF8 AFAD0024 */ sw $t5, 0x0024($sp) -/* 10CEC 80842EFC 46103280 */ add.s $f10, $f6, $f16 -/* 10CF0 80842F00 AFAC0020 */ sw $t4, 0x0020($sp) -/* 10CF4 80842F04 AFA0001C */ sw $zero, 0x001C($sp) -/* 10CF8 80842F08 AFA00018 */ sw $zero, 0x0018($sp) -/* 10CFC 80842F0C E7AA0070 */ swc1 $f10, 0x0070($sp) -/* 10D00 80842F10 AFAB0014 */ sw $t3, 0x0014($sp) -/* 10D04 80842F14 0C00F7A1 */ jal func_8003DE84 -/* 10D08 80842F18 AFAA0010 */ sw $t2, 0x0010($sp) -/* 10D0C 80842F1C 10400058 */ beq $v0, $zero, .L80843080 -/* 10D10 80842F20 8FA40038 */ lw $a0, 0x0038($sp) -/* 10D14 80842F24 8FA50078 */ lw $a1, 0x0078($sp) -/* 10D18 80842F28 0C010803 */ jal func_8004200C -/* 10D1C 80842F2C 8FA60074 */ lw $a2, 0x0074($sp) -/* 10D20 80842F30 14400053 */ bne $v0, $zero, .L80843080 -/* 10D24 80842F34 8FA40038 */ lw $a0, 0x0038($sp) -/* 10D28 80842F38 8FA50078 */ lw $a1, 0x0078($sp) -/* 10D2C 80842F3C 0C010753 */ jal func_80041D4C -/* 10D30 80842F40 8FA60074 */ lw $a2, 0x0074($sp) -/* 10D34 80842F44 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 10D38 80842F48 1041004D */ beq $v0, $at, .L80843080 -/* 10D3C 80842F4C 8FA40080 */ lw $a0, 0x0080($sp) -/* 10D40 80842F50 27AE005C */ addiu $t6, $sp, 0x005C ## $t6 = FFFFFFDC -/* 10D44 80842F54 AFAE0010 */ sw $t6, 0x0010($sp) -/* 10D48 80842F58 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10D4C 80842F5C 8FA60078 */ lw $a2, 0x0078($sp) -/* 10D50 80842F60 0C00BE7B */ jal func_8002F9EC -/* 10D54 80842F64 8FA70074 */ lw $a3, 0x0074($sp) -/* 10D58 80842F68 54400046 */ bnel $v0, $zero, .L80843084 -/* 10D5C 80842F6C 920204F4 */ lbu $v0, 0x04F4($s0) ## 000004F4 -/* 10D60 80842F70 820F0151 */ lb $t7, 0x0151($s0) ## 00000151 -/* 10D64 80842F74 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 10D68 80842F78 55E1000C */ bnel $t7, $at, .L80842FAC -/* 10D6C 80842F7C C6040838 */ lwc1 $f4, 0x0838($s0) ## 00000838 -/* 10D70 80842F80 0C20C98C */ jal func_80832630 -/* 10D74 80842F84 8FA40080 */ lw $a0, 0x0080($sp) -/* 10D78 80842F88 8FA40080 */ lw $a0, 0x0080($sp) -/* 10D7C 80842F8C 0C210A8A */ jal func_80842A28 -/* 10D80 80842F90 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10D84 80842F94 8FA40080 */ lw $a0, 0x0080($sp) -/* 10D88 80842F98 0C210B48 */ jal func_80842D20 -/* 10D8C 80842F9C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10D90 80842FA0 10000074 */ beq $zero, $zero, .L80843174 -/* 10D94 80842FA4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 10D98 80842FA8 C6040838 */ lwc1 $f4, 0x0838($s0) ## 00000838 -.L80842FAC: -/* 10D9C 80842FAC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 10DA0 80842FB0 8FA40038 */ lw $a0, 0x0038($sp) -/* 10DA4 80842FB4 8FA50078 */ lw $a1, 0x0078($sp) -/* 10DA8 80842FB8 4604903E */ c.le.s $f18, $f4 -/* 10DAC 80842FBC 00000000 */ nop -/* 10DB0 80842FC0 45020030 */ bc1fl .L80843084 -/* 10DB4 80842FC4 920204F4 */ lbu $v0, 0x04F4($s0) ## 000004F4 -/* 10DB8 80842FC8 0C0107C4 */ jal func_80041F10 -/* 10DBC 80842FCC 8FA60074 */ lw $a2, 0x0074($sp) -/* 10DC0 80842FD0 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 10DC4 80842FD4 14410007 */ bne $v0, $at, .L80842FF4 -/* 10DC8 80842FD8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 10DCC 80842FDC 8FA40080 */ lw $a0, 0x0080($sp) -/* 10DD0 80842FE0 27A5005C */ addiu $a1, $sp, 0x005C ## $a1 = FFFFFFDC -/* 10DD4 80842FE4 0C018B85 */ jal func_80062E14 -/* 10DD8 80842FE8 260600E4 */ addiu $a2, $s0, 0x00E4 ## $a2 = 000000E4 -/* 10DDC 80842FEC 10000011 */ beq $zero, $zero, .L80843034 -/* 10DE0 80842FF0 8FA40080 */ lw $a0, 0x0080($sp) -.L80842FF4: -/* 10DE4 80842FF4 8FA40080 */ lw $a0, 0x0080($sp) -/* 10DE8 80842FF8 27A5005C */ addiu $a1, $sp, 0x005C ## $a1 = FFFFFFDC -/* 10DEC 80842FFC 0C018B35 */ jal func_80062CD4 -/* 10DF0 80843000 AFA30048 */ sw $v1, 0x0048($sp) -/* 10DF4 80843004 8FA30048 */ lw $v1, 0x0048($sp) -/* 10DF8 80843008 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 10DFC 8084300C 2405181B */ addiu $a1, $zero, 0x181B ## $a1 = 0000181B -/* 10E00 80843010 14610005 */ bne $v1, $at, .L80843028 -/* 10E04 80843014 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10E08 80843018 0C00BDF7 */ jal func_8002F7DC -/* 10E0C 8084301C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10E10 80843020 10000004 */ beq $zero, $zero, .L80843034 -/* 10E14 80843024 8FA40080 */ lw $a0, 0x0080($sp) -.L80843028: -/* 10E18 80843028 0C00BDF7 */ jal func_8002F7DC -/* 10E1C 8084302C 2405181A */ addiu $a1, $zero, 0x181A ## $a1 = 0000181A -/* 10E20 80843030 8FA40080 */ lw $a0, 0x0080($sp) -.L80843034: -/* 10E24 80843034 0C210B3C */ jal func_80842CF0 -/* 10E28 80843038 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10E2C 8084303C 3C01C160 */ lui $at, 0xC160 ## $at = C1600000 -/* 10E30 80843040 44814000 */ mtc1 $at, $f8 ## $f8 = -14.00 -/* 10E34 80843044 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10E38 80843048 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 10E3C 8084304C E6080838 */ swc1 $f8, 0x0838($s0) ## 00000838 -/* 10E40 80843050 AFA00010 */ sw $zero, 0x0010($sp) -/* 10E44 80843054 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 10E48 80843058 0C20C993 */ jal func_8083264C -/* 10E4C 8084305C 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 10E50 80843060 10000008 */ beq $zero, $zero, .L80843084 -/* 10E54 80843064 920204F4 */ lbu $v0, 0x04F4($s0) ## 000004F4 -.L80843068: -/* 10E58 80843068 0C210B48 */ jal func_80842D20 -/* 10E5C 8084306C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10E60 80843070 0C20C98C */ jal func_80832630 -/* 10E64 80843074 8FA40080 */ lw $a0, 0x0080($sp) -/* 10E68 80843078 1000003E */ beq $zero, $zero, .L80843174 -/* 10E6C 8084307C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80843080: -/* 10E70 80843080 920204F4 */ lbu $v0, 0x04F4($s0) ## 000004F4 -.L80843084: -/* 10E74 80843084 30420002 */ andi $v0, $v0, 0x0002 ## $v0 = 00000000 -/* 10E78 80843088 0002102B */ sltu $v0, $zero, $v0 -/* 10E7C 8084308C 14400004 */ bne $v0, $zero, .L808430A0 -/* 10E80 80843090 00000000 */ nop -/* 10E84 80843094 92020574 */ lbu $v0, 0x0574($s0) ## 00000574 -/* 10E88 80843098 30420002 */ andi $v0, $v0, 0x0002 ## $v0 = 00000000 -/* 10E8C 8084309C 0002102B */ sltu $v0, $zero, $v0 -.L808430A0: -/* 10E90 808430A0 50400034 */ beql $v0, $zero, .L80843174 -/* 10E94 808430A4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 10E98 808430A8 82180842 */ lb $t8, 0x0842($s0) ## 00000842 -/* 10E9C 808430AC 2B010018 */ slti $at, $t8, 0x0018 -/* 10EA0 808430B0 50200012 */ beql $at, $zero, .L808430FC -/* 10EA4 808430B4 8FA40080 */ lw $a0, 0x0080($sp) -/* 10EA8 808430B8 50400004 */ beql $v0, $zero, .L808430CC -/* 10EAC 808430BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 10EB0 808430C0 10000002 */ beq $zero, $zero, .L808430CC -/* 10EB4 808430C4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 10EB8 808430C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808430CC: -/* 10EBC 808430CC 0002C9C0 */ sll $t9, $v0, 7 -/* 10EC0 808430D0 02194021 */ addu $t0, $s0, $t9 -/* 10EC4 808430D4 8D0304E8 */ lw $v1, 0x04E8($t0) ## 000004E8 -/* 10EC8 808430D8 50600008 */ beql $v1, $zero, .L808430FC -/* 10ECC 808430DC 8FA40080 */ lw $a0, 0x0080($sp) -/* 10ED0 808430E0 84690000 */ lh $t1, 0x0000($v1) ## 00000000 -/* 10ED4 808430E4 24010141 */ addiu $at, $zero, 0x0141 ## $at = 00000141 -/* 10ED8 808430E8 51210004 */ beql $t1, $at, .L808430FC -/* 10EDC 808430EC 8FA40080 */ lw $a0, 0x0080($sp) -/* 10EE0 808430F0 0C20C98C */ jal func_80832630 -/* 10EE4 808430F4 8FA40080 */ lw $a0, 0x0080($sp) -/* 10EE8 808430F8 8FA40080 */ lw $a0, 0x0080($sp) -.L808430FC: -/* 10EEC 808430FC 0C210AB1 */ jal func_80842AC4 -/* 10EF0 80843100 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10EF4 80843104 5440001B */ bnel $v0, $zero, .L80843174 -/* 10EF8 80843108 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 10EFC 8084310C 820A0151 */ lb $t2, 0x0151($s0) ## 00000151 -/* 10F00 80843110 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 10F04 80843114 8FA40080 */ lw $a0, 0x0080($sp) -/* 10F08 80843118 51410016 */ beql $t2, $at, .L80843174 -/* 10F0C 8084311C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 10F10 80843120 0C210ADF */ jal func_80842B7C -/* 10F14 80843124 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10F18 80843128 920B00B2 */ lbu $t3, 0x00B2($s0) ## 000000B2 -/* 10F1C 8084312C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 10F20 80843130 240C0008 */ addiu $t4, $zero, 0x0008 ## $t4 = 00000008 -/* 10F24 80843134 1561000E */ bne $t3, $at, .L80843170 -/* 10F28 80843138 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10F2C 8084313C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 10F30 80843140 A20C00B0 */ sb $t4, 0x00B0($s0) ## 000000B0 -/* 10F34 80843144 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 10F38 80843148 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 10F3C 8084314C 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 -/* 10F40 80843150 AFAE0018 */ sw $t6, 0x0018($sp) -/* 10F44 80843154 8FA40080 */ lw $a0, 0x0080($sp) -/* 10F48 80843158 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 10F4C 8084315C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 10F50 80843160 0C20DF03 */ jal func_80837C0C -/* 10F54 80843164 AFAD0014 */ sw $t5, 0x0014($sp) -/* 10F58 80843168 10000002 */ beq $zero, $zero, .L80843174 -/* 10F5C 8084316C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80843170: -/* 10F60 80843170 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80843174: -/* 10F64 80843174 8FBF0034 */ lw $ra, 0x0034($sp) -/* 10F68 80843178 8FB00030 */ lw $s0, 0x0030($sp) -/* 10F6C 8084317C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 10F70 80843180 03E00008 */ jr $ra -/* 10F74 80843184 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s deleted file mode 100644 index 286544a952..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s +++ /dev/null @@ -1,298 +0,0 @@ -glabel func_80843188 -/* 10F78 80843188 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 10F7C 8084318C AFB00028 */ sw $s0, 0x0028($sp) -/* 10F80 80843190 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 10F84 80843194 AFA5005C */ sw $a1, 0x005C($sp) -/* 10F88 80843198 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 10F8C 8084319C AFBF002C */ sw $ra, 0x002C($sp) -/* 10F90 808431A0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 10F94 808431A4 0C028EF0 */ jal func_800A3BC0 -/* 10F98 808431A8 AFA50034 */ sw $a1, 0x0034($sp) -/* 10F9C 808431AC 1040000F */ beq $v0, $zero, .L808431EC -/* 10FA0 808431B0 00000000 */ nop -/* 10FA4 808431B4 0C023A74 */ jal func_8008E9D0 -/* 10FA8 808431B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10FAC 808431BC 14400008 */ bne $v0, $zero, .L808431E0 -/* 10FB0 808431C0 8FA4005C */ lw $a0, 0x005C($sp) -/* 10FB4 808431C4 920E015B */ lbu $t6, 0x015B($s0) ## 0000015B -/* 10FB8 808431C8 3C068085 */ lui $a2, %hi(D_80853B0C) ## $a2 = 80850000 -/* 10FBC 808431CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10FC0 808431D0 000E7880 */ sll $t7, $t6, 2 -/* 10FC4 808431D4 00CF3021 */ addu $a2, $a2, $t7 -/* 10FC8 808431D8 0C20C8A1 */ jal func_80832284 -/* 10FCC 808431DC 8CC63B0C */ lw $a2, %lo(D_80853B0C)($a2) -.L808431E0: -/* 10FD0 808431E0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 10FD4 808431E4 A6180850 */ sh $t8, 0x0850($s0) ## 00000850 -/* 10FD8 808431E8 A200084F */ sb $zero, 0x084F($s0) ## 0000084F -.L808431EC: -/* 10FDC 808431EC 0C023A74 */ jal func_8008E9D0 -/* 10FE0 808431F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10FE4 808431F4 1440000D */ bne $v0, $zero, .L8084322C -/* 10FE8 808431F8 00000000 */ nop -/* 10FEC 808431FC 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 10FF0 80843200 3C010040 */ lui $at, 0x0040 ## $at = 00400000 -/* 10FF4 80843204 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10FF8 80843208 03214025 */ or $t0, $t9, $at ## $t0 = 00400000 -/* 10FFC 8084320C AE08067C */ sw $t0, 0x067C($s0) ## 0000067C -/* 11000 80843210 0C20D99C */ jal func_80836670 -/* 11004 80843214 8FA5005C */ lw $a1, 0x005C($sp) -/* 11008 80843218 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 1100C 8084321C 3C01FFBF */ lui $at, 0xFFBF ## $at = FFBF0000 -/* 11010 80843220 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFBFFFFF -/* 11014 80843224 01215024 */ and $t2, $t1, $at -/* 11018 80843228 AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C -.L8084322C: -/* 1101C 8084322C 0C20DC87 */ jal func_8083721C -/* 11020 80843230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11024 80843234 860B0850 */ lh $t3, 0x0850($s0) ## 00000850 -/* 11028 80843238 3C028086 */ lui $v0, %hi(D_80858AB4) ## $v0 = 80860000 -/* 1102C 8084323C 516000D4 */ beql $t3, $zero, .L80843590 -/* 11030 80843240 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 11034 80843244 8C428AB4 */ lw $v0, %lo(D_80858AB4)($v0) -/* 11038 80843248 8FA3005C */ lw $v1, 0x005C($sp) -/* 1103C 8084324C 804C0015 */ lb $t4, 0x0015($v0) ## 80860015 -/* 11040 80843250 000C6880 */ sll $t5, $t4, 2 -/* 11044 80843254 01AC6823 */ subu $t5, $t5, $t4 -/* 11048 80843258 000D68C0 */ sll $t5, $t5, 3 -/* 1104C 8084325C 01AC6821 */ addu $t5, $t5, $t4 -/* 11050 80843260 000D6880 */ sll $t5, $t5, 2 -/* 11054 80843264 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 11058 80843268 00000000 */ nop -/* 1105C 8084326C 468021A0 */ cvt.s.w $f6, $f4 -/* 11060 80843270 E7A60054 */ swc1 $f6, 0x0054($sp) -/* 11064 80843274 804E0014 */ lb $t6, 0x0014($v0) ## 80860014 -/* 11068 80843278 000E0823 */ subu $at, $zero, $t6 -/* 1106C 8084327C 00017900 */ sll $t7, $at, 4 -/* 11070 80843280 01E17823 */ subu $t7, $t7, $at -/* 11074 80843284 000F78C0 */ sll $t7, $t7, 3 -/* 11078 80843288 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 1107C 8084328C 00000000 */ nop -/* 11080 80843290 468042A0 */ cvt.s.w $f10, $f8 -/* 11084 80843294 E7AA0050 */ swc1 $f10, 0x0050($sp) -/* 11088 80843298 847807A0 */ lh $t8, 0x07A0($v1) ## 000007A0 -/* 1108C 8084329C 0018C880 */ sll $t9, $t8, 2 -/* 11090 808432A0 00794021 */ addu $t0, $v1, $t9 -/* 11094 808432A4 0C016A52 */ jal func_8005A948 -/* 11098 808432A8 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 1109C 808432AC 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 110A0 808432B0 01222023 */ subu $a0, $t1, $v0 -/* 110A4 808432B4 00042400 */ sll $a0, $a0, 16 -/* 110A8 808432B8 00042403 */ sra $a0, $a0, 16 -/* 110AC 808432BC 0C01DE0D */ jal Math_Coss - ## coss? -/* 110B0 808432C0 A7A4004E */ sh $a0, 0x004E($sp) -/* 110B4 808432C4 E7A00040 */ swc1 $f0, 0x0040($sp) -/* 110B8 808432C8 0C01DE1C */ jal Math_Sins - ## sins? -/* 110BC 808432CC 87A4004E */ lh $a0, 0x004E($sp) -/* 110C0 808432D0 C7B00054 */ lwc1 $f16, 0x0054($sp) -/* 110C4 808432D4 C7B20040 */ lwc1 $f18, 0x0040($sp) -/* 110C8 808432D8 C7A60050 */ lwc1 $f6, 0x0050($sp) -/* 110CC 808432DC 87A4004E */ lh $a0, 0x004E($sp) -/* 110D0 808432E0 46128102 */ mul.s $f4, $f16, $f18 -/* 110D4 808432E4 00000000 */ nop -/* 110D8 808432E8 46060202 */ mul.s $f8, $f0, $f6 -/* 110DC 808432EC 46044280 */ add.s $f10, $f8, $f4 -/* 110E0 808432F0 4600540D */ trunc.w.s $f16, $f10 -/* 110E4 808432F4 44058000 */ mfc1 $a1, $f16 -/* 110E8 808432F8 00000000 */ nop -/* 110EC 808432FC 00052C00 */ sll $a1, $a1, 16 -/* 110F0 80843300 00052C03 */ sra $a1, $a1, 16 -/* 110F4 80843304 0C01DE0D */ jal Math_Coss - ## coss? -/* 110F8 80843308 A7A5004C */ sh $a1, 0x004C($sp) -/* 110FC 8084330C E7A00040 */ swc1 $f0, 0x0040($sp) -/* 11100 80843310 0C01DE1C */ jal Math_Sins - ## sins? -/* 11104 80843314 87A4004E */ lh $a0, 0x004E($sp) -/* 11108 80843318 C7B20050 */ lwc1 $f18, 0x0050($sp) -/* 1110C 8084331C C7A60040 */ lwc1 $f6, 0x0040($sp) -/* 11110 80843320 C7A40054 */ lwc1 $f4, 0x0054($sp) -/* 11114 80843324 87A5004C */ lh $a1, 0x004C($sp) -/* 11118 80843328 46069202 */ mul.s $f8, $f18, $f6 -/* 1111C 8084332C 28A10DAD */ slti $at, $a1, 0x0DAD -/* 11120 80843330 46040282 */ mul.s $f10, $f0, $f4 -/* 11124 80843334 460A4401 */ sub.s $f16, $f8, $f10 -/* 11128 80843338 4600848D */ trunc.w.s $f18, $f16 -/* 1112C 8084333C 44049000 */ mfc1 $a0, $f18 -/* 11130 80843340 14200002 */ bne $at, $zero, .L8084334C -/* 11134 80843344 A7A4004A */ sh $a0, 0x004A($sp) -/* 11138 80843348 24050DAC */ addiu $a1, $zero, 0x0DAC ## $a1 = 00000DAC -.L8084334C: -/* 1113C 8084334C 860C0044 */ lh $t4, 0x0044($s0) ## 00000044 -/* 11140 80843350 00AC1023 */ subu $v0, $a1, $t4 -/* 11144 80843354 04400003 */ bltz $v0, .L80843364 -/* 11148 80843358 00021823 */ subu $v1, $zero, $v0 -/* 1114C 8084335C 10000001 */ beq $zero, $zero, .L80843364 -/* 11150 80843360 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80843364: -/* 11154 80843364 44833000 */ mtc1 $v1, $f6 ## $f6 = 0.00 -/* 11158 80843368 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 1115C 8084336C 44810000 */ mtc1 $at, $f0 ## $f0 = 0.25 -/* 11160 80843370 46803120 */ cvt.s.w $f4, $f6 -/* 11164 80843374 46002202 */ mul.s $f8, $f4, $f0 -/* 11168 80843378 4600428D */ trunc.w.s $f10, $f8 -/* 1116C 8084337C 44025000 */ mfc1 $v0, $f10 -/* 11170 80843380 00000000 */ nop -/* 11174 80843384 00027400 */ sll $t6, $v0, 16 -/* 11178 80843388 000E7C03 */ sra $t7, $t6, 16 -/* 1117C 8084338C 29E10064 */ slti $at, $t7, 0x0064 -/* 11180 80843390 00023400 */ sll $a2, $v0, 16 -/* 11184 80843394 10200002 */ beq $at, $zero, .L808433A0 -/* 11188 80843398 00063403 */ sra $a2, $a2, 16 -/* 1118C 8084339C 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -.L808433A0: -/* 11190 808433A0 860806BE */ lh $t0, 0x06BE($s0) ## 000006BE -/* 11194 808433A4 0004C400 */ sll $t8, $a0, 16 -/* 11198 808433A8 0018CC03 */ sra $t9, $t8, 16 -/* 1119C 808433AC 03281023 */ subu $v0, $t9, $t0 -/* 111A0 808433B0 04400003 */ bltz $v0, .L808433C0 -/* 111A4 808433B4 26040044 */ addiu $a0, $s0, 0x0044 ## $a0 = 00000044 -/* 111A8 808433B8 10000002 */ beq $zero, $zero, .L808433C4 -/* 111AC 808433BC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L808433C0: -/* 111B0 808433C0 00021823 */ subu $v1, $zero, $v0 -.L808433C4: -/* 111B4 808433C4 44838000 */ mtc1 $v1, $f16 ## $f16 = 0.00 -/* 111B8 808433C8 00000000 */ nop -/* 111BC 808433CC 468084A0 */ cvt.s.w $f18, $f16 -/* 111C0 808433D0 46009182 */ mul.s $f6, $f18, $f0 -/* 111C4 808433D4 4600310D */ trunc.w.s $f4, $f6 -/* 111C8 808433D8 44022000 */ mfc1 $v0, $f4 -/* 111CC 808433DC 00000000 */ nop -/* 111D0 808433E0 00025400 */ sll $t2, $v0, 16 -/* 111D4 808433E4 000A5C03 */ sra $t3, $t2, 16 -/* 111D8 808433E8 29610032 */ slti $at, $t3, 0x0032 -/* 111DC 808433EC 00023C00 */ sll $a3, $v0, 16 -/* 111E0 808433F0 10200002 */ beq $at, $zero, .L808433FC -/* 111E4 808433F4 00073C03 */ sra $a3, $a3, 16 -/* 111E8 808433F8 24070032 */ addiu $a3, $zero, 0x0032 ## $a3 = 00000032 -.L808433FC: -/* 111EC 808433FC 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 111F0 80843400 A7A70046 */ sh $a3, 0x0046($sp) -/* 111F4 80843404 87A70046 */ lh $a3, 0x0046($sp) -/* 111F8 80843408 860C0044 */ lh $t4, 0x0044($s0) ## 00000044 -/* 111FC 8084340C 260406BE */ addiu $a0, $s0, 0x06BE ## $a0 = 000006BE -/* 11200 80843410 00073400 */ sll $a2, $a3, 16 -/* 11204 80843414 A60C06BC */ sh $t4, 0x06BC($s0) ## 000006BC -/* 11208 80843418 87A5004A */ lh $a1, 0x004A($sp) -/* 1120C 8084341C 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 11210 80843420 00063403 */ sra $a2, $a2, 16 -/* 11214 80843424 820D084F */ lb $t5, 0x084F($s0) ## 0000084F -/* 11218 80843428 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1121C 8084342C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11220 80843430 11A00014 */ beq $t5, $zero, .L80843484 -/* 11224 80843434 00000000 */ nop -/* 11228 80843438 0C210B7D */ jal func_80842DF4 -/* 1122C 8084343C 8FA4005C */ lw $a0, 0x005C($sp) -/* 11230 80843440 1440000D */ bne $v0, $zero, .L80843478 -/* 11234 80843444 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 11238 80843448 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 1123C 8084344C 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 -/* 11240 80843450 C60801CC */ lwc1 $f8, 0x01CC($s0) ## 000001CC -/* 11244 80843454 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11248 80843458 460A403C */ c.lt.s $f8, $f10 -/* 1124C 8084345C 00000000 */ nop -/* 11250 80843460 4502004B */ bc1fl .L80843590 -/* 11254 80843464 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 11258 80843468 0C20CE88 */ jal func_80833A20 -/* 1125C 8084346C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 11260 80843470 10000047 */ beq $zero, $zero, .L80843590 -/* 11264 80843474 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -.L80843478: -/* 11268 80843478 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -/* 1126C 8084347C 10000043 */ beq $zero, $zero, .L8084358C -/* 11270 80843480 A200084F */ sb $zero, 0x084F($s0) ## 0000084F -.L80843484: -/* 11274 80843484 0C210A59 */ jal func_80842964 -/* 11278 80843488 8FA5005C */ lw $a1, 0x005C($sp) -/* 1127C 8084348C 14400048 */ bne $v0, $zero, .L808435B0 -/* 11280 80843490 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11284 80843494 0C20F0AC */ jal func_8083C2B0 -/* 11288 80843498 8FA5005C */ lw $a1, 0x005C($sp) -/* 1128C 8084349C 10400006 */ beq $v0, $zero, .L808434B8 -/* 11290 808434A0 3C01FFBF */ lui $at, 0xFFBF ## $at = FFBF0000 -/* 11294 808434A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11298 808434A8 0C210A36 */ jal func_808428D8 -/* 1129C 808434AC 8FA5005C */ lw $a1, 0x005C($sp) -/* 112A0 808434B0 10000037 */ beq $zero, $zero, .L80843590 -/* 112A4 808434B4 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -.L808434B8: -/* 112A8 808434B8 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 112AC 808434BC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 0000FFFF -/* 112B0 808434C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 112B4 808434C4 01E1C024 */ and $t8, $t7, $at -/* 112B8 808434C8 0C20C8C6 */ jal func_80832318 -/* 112BC 808434CC AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 112C0 808434D0 0C023A74 */ jal func_8008E9D0 -/* 112C4 808434D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 112C8 808434D8 1040001A */ beq $v0, $zero, .L80843544 -/* 112CC 808434DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 112D0 808434E0 0C20E818 */ jal func_8083A060 -/* 112D4 808434E4 8FA5005C */ lw $a1, 0x005C($sp) -/* 112D8 808434E8 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 -/* 112DC 808434EC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 112E0 808434F0 24842400 */ addiu $a0, $a0, 0x2400 ## $a0 = 04002400 -/* 112E4 808434F4 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 112E8 808434F8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 112EC 808434FC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 112F0 80843500 468084A0 */ cvt.s.w $f18, $f16 -/* 112F4 80843504 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 112F8 80843508 AFB90018 */ sw $t9, 0x0018($sp) -/* 112FC 8084350C 24C62400 */ addiu $a2, $a2, 0x2400 ## $a2 = 04002400 -/* 11300 80843510 8FA4005C */ lw $a0, 0x005C($sp) -/* 11304 80843514 8FA50034 */ lw $a1, 0x0034($sp) -/* 11308 80843518 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 1130C 8084351C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 11310 80843520 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 11314 80843524 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 11318 80843528 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 1131C 8084352C 8FA4005C */ lw $a0, 0x005C($sp) -/* 11320 80843530 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11324 80843534 0C20CBD5 */ jal func_80832F54 -/* 11328 80843538 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 1132C 8084353C 1000000F */ beq $zero, $zero, .L8084357C -/* 11330 80843540 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80843544: -/* 11334 80843544 82080154 */ lb $t0, 0x0154($s0) ## 00000154 -/* 11338 80843548 05030004 */ bgezl $t0, .L8084355C -/* 1133C 8084354C 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B -/* 11340 80843550 0C023B1C */ jal func_8008EC70 -/* 11344 80843554 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11348 80843558 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B -.L8084355C: -/* 1134C 8084355C 3C058085 */ lui $a1, %hi(D_80853B24) ## $a1 = 80850000 -/* 11350 80843560 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11354 80843564 00095080 */ sll $t2, $t1, 2 -/* 11358 80843568 00AA2821 */ addu $a1, $a1, $t2 -/* 1135C 8084356C 8CA53B24 */ lw $a1, %lo(D_80853B24)($a1) -/* 11360 80843570 0C20E826 */ jal func_8083A098 -/* 11364 80843574 8FA6005C */ lw $a2, 0x005C($sp) -/* 11368 80843578 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084357C: -/* 1136C 8084357C 0C00BDF7 */ jal func_8002F7DC -/* 11370 80843580 24051826 */ addiu $a1, $zero, 0x1826 ## $a1 = 00001826 -/* 11374 80843584 1000000B */ beq $zero, $zero, .L808435B4 -/* 11378 80843588 8FBF002C */ lw $ra, 0x002C($sp) -.L8084358C: -/* 1137C 8084358C 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -.L80843590: -/* 11380 80843590 3C010040 */ lui $at, 0x0040 ## $at = 00400000 -/* 11384 80843594 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11388 80843598 01616025 */ or $t4, $t3, $at ## $t4 = 00400000 -/* 1138C 8084359C 0C023A90 */ jal func_8008EA40 -/* 11390 808435A0 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -/* 11394 808435A4 960D06AE */ lhu $t5, 0x06AE($s0) ## 000006AE -/* 11398 808435A8 35AE00C1 */ ori $t6, $t5, 0x00C1 ## $t6 = 000000C1 -/* 1139C 808435AC A60E06AE */ sh $t6, 0x06AE($s0) ## 000006AE -.L808435B0: -/* 113A0 808435B0 8FBF002C */ lw $ra, 0x002C($sp) -.L808435B4: -/* 113A4 808435B4 8FB00028 */ lw $s0, 0x0028($sp) -/* 113A8 808435B8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 113AC 808435BC 03E00008 */ jr $ra -/* 113B0 808435C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s deleted file mode 100644 index a70f507170..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_808435C4 -/* 113B4 808435C4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 113B8 808435C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 113BC 808435CC AFB10028 */ sw $s1, 0x0028($sp) -/* 113C0 808435D0 AFB00024 */ sw $s0, 0x0024($sp) -/* 113C4 808435D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 113C8 808435D8 0C20DC87 */ jal func_8083721C -/* 113CC 808435DC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 113D0 808435E0 820E084F */ lb $t6, 0x084F($s0) ## 0000084F -/* 113D4 808435E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 113D8 808435E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 113DC 808435EC 15C00018 */ bne $t6, $zero, .L80843650 -/* 113E0 808435F0 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 -/* 113E4 808435F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 113E8 808435F8 0C20D99C */ jal func_80836670 -/* 113EC 808435FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 113F0 80843600 3C018085 */ lui $at, %hi(D_808535E0) ## $at = 80850000 -/* 113F4 80843604 AC2235E0 */ sw $v0, %lo(D_808535E0)($at) -/* 113F8 80843608 8E0F082C */ lw $t7, 0x082C($s0) ## 0000082C -/* 113FC 8084360C 3C188083 */ lui $t8, %hi(func_80834B5C) ## $t8 = 80830000 -/* 11400 80843610 27184B5C */ addiu $t8, $t8, %lo(func_80834B5C) ## $t8 = 80834B5C -/* 11404 80843614 11F80006 */ beq $t7, $t8, .L80843630 -/* 11408 80843618 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1140C 8084361C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11410 80843620 260606C8 */ addiu $a2, $s0, 0x06C8 ## $a2 = 000006C8 -/* 11414 80843624 0C20DD28 */ jal func_808374A0 -/* 11418 80843628 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 1141C 8084362C 18400032 */ blez $v0, .L808436F8 -.L80843630: -/* 11420 80843630 3C068084 */ lui $a2, %hi(func_80840450) ## $a2 = 80840000 -/* 11424 80843634 24C60450 */ addiu $a2, $a2, %lo(func_80840450) ## $a2 = 80840450 -/* 11428 80843638 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1142C 8084363C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11430 80843640 0C20D716 */ jal func_80835C58 -/* 11434 80843644 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 11438 80843648 1000002C */ beq $zero, $zero, .L808436FC -/* 1143C 8084364C 8FBF002C */ lw $ra, 0x002C($sp) -.L80843650: -/* 11440 80843650 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 11444 80843654 0C20DD28 */ jal func_808374A0 -/* 11448 80843658 AFA60030 */ sw $a2, 0x0030($sp) -/* 1144C 8084365C 50400027 */ beql $v0, $zero, .L808436FC -/* 11450 80843660 8FBF002C */ lw $ra, 0x002C($sp) -/* 11454 80843664 1C400004 */ bgtz $v0, .L80843678 -/* 11458 80843668 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1145C 8084366C 0C028EF0 */ jal func_800A3BC0 -/* 11460 80843670 8FA50030 */ lw $a1, 0x0030($sp) -/* 11464 80843674 10400020 */ beq $v0, $zero, .L808436F8 -.L80843678: -/* 11468 80843678 3C068084 */ lui $a2, %hi(func_80843188) ## $a2 = 80840000 -/* 1146C 8084367C 24C63188 */ addiu $a2, $a2, %lo(func_80843188) ## $a2 = 80843188 -/* 11470 80843680 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 11474 80843684 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11478 80843688 0C20D716 */ jal func_80835C58 -/* 1147C 8084368C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 11480 80843690 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 11484 80843694 3C010040 */ lui $at, 0x0040 ## $at = 00400000 -/* 11488 80843698 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1148C 8084369C 03214025 */ or $t0, $t9, $at ## $t0 = 00400000 -/* 11490 808436A0 0C023A90 */ jal func_8008EA40 -/* 11494 808436A4 AE08067C */ sw $t0, 0x067C($s0) ## 0000067C -/* 11498 808436A8 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B -/* 1149C 808436AC 3C068085 */ lui $a2, %hi(D_80853AF4) ## $a2 = 80850000 -/* 114A0 808436B0 00095080 */ sll $t2, $t1, 2 -/* 114A4 808436B4 00CA3021 */ addu $a2, $a2, $t2 -/* 114A8 808436B8 8CC43AF4 */ lw $a0, %lo(D_80853AF4)($a2) -/* 114AC 808436BC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 114B0 808436C0 AFA40038 */ sw $a0, 0x0038($sp) -/* 114B4 808436C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 114B8 808436C8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 114BC 808436CC 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 114C0 808436D0 46802020 */ cvt.s.w $f0, $f4 -/* 114C4 808436D4 8FA60038 */ lw $a2, 0x0038($sp) -/* 114C8 808436D8 AFAB0018 */ sw $t3, 0x0018($sp) -/* 114CC 808436DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 114D0 808436E0 8FA50030 */ lw $a1, 0x0030($sp) -/* 114D4 808436E4 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 114D8 808436E8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 114DC 808436EC E7A00014 */ swc1 $f0, 0x0014($sp) -/* 114E0 808436F0 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 114E4 808436F4 E7A6001C */ swc1 $f6, 0x001C($sp) -.L808436F8: -/* 114E8 808436F8 8FBF002C */ lw $ra, 0x002C($sp) -.L808436FC: -/* 114EC 808436FC 8FB00024 */ lw $s0, 0x0024($sp) -/* 114F0 80843700 8FB10028 */ lw $s1, 0x0028($sp) -/* 114F4 80843704 03E00008 */ jr $ra -/* 114F8 80843708 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084370C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084370C.s deleted file mode 100644 index f685ff73ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084370C.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_8084370C -/* 114FC 8084370C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 11500 80843710 AFBF0014 */ sw $ra, 0x0014($sp) -/* 11504 80843714 AFA40020 */ sw $a0, 0x0020($sp) -/* 11508 80843718 0C20DC87 */ jal func_8083721C -/* 1150C 8084371C AFA50024 */ sw $a1, 0x0024($sp) -/* 11510 80843720 8FA50020 */ lw $a1, 0x0020($sp) -/* 11514 80843724 8FA40024 */ lw $a0, 0x0024($sp) -/* 11518 80843728 3C074180 */ lui $a3, 0x4180 ## $a3 = 41800000 -/* 1151C 8084372C 24A601B4 */ addiu $a2, $a1, 0x01B4 ## $a2 = 000001B4 -/* 11520 80843730 0C20DD28 */ jal func_808374A0 -/* 11524 80843734 AFA60018 */ sw $a2, 0x0018($sp) -/* 11528 80843738 1040000C */ beq $v0, $zero, .L8084376C -/* 1152C 8084373C 8FA60018 */ lw $a2, 0x0018($sp) -/* 11530 80843740 8FA40024 */ lw $a0, 0x0024($sp) -/* 11534 80843744 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 11538 80843748 0C028EF0 */ jal func_800A3BC0 -/* 1153C 8084374C AFA2001C */ sw $v0, 0x001C($sp) -/* 11540 80843750 14400003 */ bne $v0, $zero, .L80843760 -/* 11544 80843754 8FA3001C */ lw $v1, 0x001C($sp) -/* 11548 80843758 58600005 */ blezl $v1, .L80843770 -/* 1154C 8084375C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80843760: -/* 11550 80843760 8FA40020 */ lw $a0, 0x0020($sp) -/* 11554 80843764 0C20E7E4 */ jal func_80839F90 -/* 11558 80843768 8FA50024 */ lw $a1, 0x0024($sp) -.L8084376C: -/* 1155C 8084376C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80843770: -/* 11560 80843770 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 11564 80843774 03E00008 */ jr $ra -/* 11568 80843778 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084377C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084377C.s deleted file mode 100644 index 7124667b1c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084377C.s +++ /dev/null @@ -1,130 +0,0 @@ -glabel func_8084377C -/* 1156C 8084377C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 11570 80843780 AFBF001C */ sw $ra, 0x001C($sp) -/* 11574 80843784 AFB00018 */ sw $s0, 0x0018($sp) -/* 11578 80843788 AFA50024 */ sw $a1, 0x0024($sp) -/* 1157C 8084378C 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 11580 80843790 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 11584 80843794 35CF0060 */ ori $t7, $t6, 0x0060 ## $t7 = 00000060 -/* 11588 80843798 0C20E0AF */ jal func_808382BC -/* 1158C 8084379C AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 11590 808437A0 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 11594 808437A4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 11598 808437A8 0018C880 */ sll $t9, $t8, 2 -/* 1159C 808437AC 07200021 */ bltz $t9, .L80843834 -/* 115A0 808437B0 00000000 */ nop -/* 115A4 808437B4 86080850 */ lh $t0, 0x0850($s0) ## 00000850 -/* 115A8 808437B8 1500001E */ bne $t0, $zero, .L80843834 -/* 115AC 808437BC 00000000 */ nop -/* 115B0 808437C0 920908A1 */ lbu $t1, 0x08A1($s0) ## 000008A1 -/* 115B4 808437C4 1120001B */ beq $t1, $zero, .L80843834 -/* 115B8 808437C8 00000000 */ nop -/* 115BC 808437CC 860208A2 */ lh $v0, 0x08A2($s0) ## 000008A2 -/* 115C0 808437D0 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 115C4 808437D4 C60408A4 */ lwc1 $f4, 0x08A4($s0) ## 000008A4 -/* 115C8 808437D8 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 115CC 808437DC 01421823 */ subu $v1, $t2, $v0 -/* 115D0 808437E0 00031C00 */ sll $v1, $v1, 16 -/* 115D4 808437E4 00031C03 */ sra $v1, $v1, 16 -/* 115D8 808437E8 A602083C */ sh $v0, 0x083C($s0) ## 0000083C -/* 115DC 808437EC 04600003 */ bltz $v1, .L808437FC -/* 115E0 808437F0 E6040838 */ swc1 $f4, 0x0838($s0) ## 00000838 -/* 115E4 808437F4 10000002 */ beq $zero, $zero, .L80843800 -/* 115E8 808437F8 00603025 */ or $a2, $v1, $zero ## $a2 = 00000000 -.L808437FC: -/* 115EC 808437FC 00033023 */ subu $a2, $zero, $v1 -.L80843800: -/* 115F0 80843800 28C14001 */ slti $at, $a2, 0x4001 -/* 115F4 80843804 14200003 */ bne $at, $zero, .L80843814 -/* 115F8 80843808 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 115FC 8084380C 00415821 */ addu $t3, $v0, $at -/* 11600 80843810 A60B00B6 */ sh $t3, 0x00B6($s0) ## 000000B6 -.L80843814: -/* 11604 80843814 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 11608 80843818 C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 -/* 1160C 8084381C 4600303C */ c.lt.s $f6, $f0 -/* 11610 80843820 00000000 */ nop -/* 11614 80843824 45000003 */ bc1f .L80843834 -/* 11618 80843828 00000000 */ nop -/* 1161C 8084382C E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 11620 80843830 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -.L80843834: -/* 11624 80843834 0C028EF0 */ jal func_800A3BC0 -/* 11628 80843838 8FA40024 */ lw $a0, 0x0024($sp) -/* 1162C 8084383C 5040003A */ beql $v0, $zero, .L80843928 -/* 11630 80843840 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 11634 80843844 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -/* 11638 80843848 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 1163C 8084384C 51A00036 */ beql $t5, $zero, .L80843928 -/* 11640 80843850 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 11644 80843854 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 11648 80843858 1060000A */ beq $v1, $zero, .L80843884 -/* 1164C 8084385C 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 11650 80843860 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -/* 11654 80843864 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 -/* 11658 80843868 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1165C 8084386C 55E0002E */ bnel $t7, $zero, .L80843928 -/* 11660 80843870 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 11664 80843874 0C214C20 */ jal func_80853080 -/* 11668 80843878 8FA50024 */ lw $a1, 0x0024($sp) -/* 1166C 8084387C 1000002A */ beq $zero, $zero, .L80843928 -/* 11670 80843880 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -.L80843884: -/* 11674 80843884 8E02067C */ lw $v0, 0x067C($s0) ## 0000067C -/* 11678 80843888 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 1167C 8084388C 00411024 */ and $v0, $v0, $at -/* 11680 80843890 14400008 */ bne $v0, $zero, .L808438B4 -/* 11684 80843894 00000000 */ nop -/* 11688 80843898 921804A9 */ lbu $t8, 0x04A9($s0) ## 000004A9 -/* 1168C 8084389C 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 -/* 11690 808438A0 57200021 */ bnel $t9, $zero, .L80843928 -/* 11694 808438A4 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 11698 808438A8 920808A1 */ lbu $t0, 0x08A1($s0) ## 000008A1 -/* 1169C 808438AC 5500001E */ bnel $t0, $zero, .L80843928 -/* 116A0 808438B0 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -.L808438B4: -/* 116A4 808438B4 10400004 */ beq $v0, $zero, .L808438C8 -/* 116A8 808438B8 8FA40024 */ lw $a0, 0x0024($sp) -/* 116AC 808438BC 24690001 */ addiu $t1, $v1, 0x0001 ## $t1 = 00000001 -/* 116B0 808438C0 1000000A */ beq $zero, $zero, .L808438EC -/* 116B4 808438C4 A6090850 */ sh $t1, 0x0850($s0) ## 00000850 -.L808438C8: -/* 116B8 808438C8 3C068084 */ lui $a2, %hi(func_80843954) ## $a2 = 80840000 -/* 116BC 808438CC 24C63954 */ addiu $a2, $a2, %lo(func_80843954) ## $a2 = 80843954 -/* 116C0 808438D0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 116C4 808438D4 0C20D716 */ jal func_80835C58 -/* 116C8 808438D8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 116CC 808438DC 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C -/* 116D0 808438E0 3C010400 */ lui $at, 0x0400 ## $at = 04000000 -/* 116D4 808438E4 01415825 */ or $t3, $t2, $at ## $t3 = 04000000 -/* 116D8 808438E8 AE0B067C */ sw $t3, 0x067C($s0) ## 0000067C -.L808438EC: -/* 116DC 808438EC 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 116E0 808438F0 860D083C */ lh $t5, 0x083C($s0) ## 0000083C -/* 116E4 808438F4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 116E8 808438F8 24C62DB8 */ addiu $a2, $a2, 0x2DB8 ## $a2 = 04002DB8 -/* 116EC 808438FC 118D0004 */ beq $t4, $t5, .L80843910 -/* 116F0 80843900 8FA40024 */ lw $a0, 0x0024($sp) -/* 116F4 80843904 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 116F8 80843908 10000001 */ beq $zero, $zero, .L80843910 -/* 116FC 8084390C 24C62F60 */ addiu $a2, $a2, 0x2F60 ## $a2 = 04002F60 -.L80843910: -/* 11700 80843910 0C20C899 */ jal func_80832264 -/* 11704 80843914 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11708 80843918 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1170C 8084391C 0C20C9A6 */ jal func_80832698 -/* 11710 80843920 24056806 */ addiu $a1, $zero, 0x6806 ## $a1 = 00006806 -/* 11714 80843924 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -.L80843928: -/* 11718 80843928 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1171C 8084392C 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 11720 80843930 51E00004 */ beql $t7, $zero, .L80843944 -/* 11724 80843934 8FBF001C */ lw $ra, 0x001C($sp) -/* 11728 80843938 0C20C9DC */ jal func_80832770 -/* 1172C 8084393C 24050850 */ addiu $a1, $zero, 0x0850 ## $a1 = 00000850 -/* 11730 80843940 8FBF001C */ lw $ra, 0x001C($sp) -.L80843944: -/* 11734 80843944 8FB00018 */ lw $s0, 0x0018($sp) -/* 11738 80843948 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1173C 8084394C 03E00008 */ jr $ra -/* 11740 80843950 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843954.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843954.s deleted file mode 100644 index e3727c0d14..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843954.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_80843954 -/* 11744 80843954 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 11748 80843958 AFBF001C */ sw $ra, 0x001C($sp) -/* 1174C 8084395C AFB00018 */ sw $s0, 0x0018($sp) -/* 11750 80843960 AFA50024 */ sw $a1, 0x0024($sp) -/* 11754 80843964 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 11758 80843968 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1175C 8084396C 35CF0060 */ ori $t7, $t6, 0x0060 ## $t7 = 00000060 -/* 11760 80843970 0C20E0AF */ jal func_808382BC -/* 11764 80843974 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 11768 80843978 0C20DC87 */ jal func_8083721C -/* 1176C 8084397C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11770 80843980 8FA40024 */ lw $a0, 0x0024($sp) -/* 11774 80843984 0C028EF0 */ jal func_800A3BC0 -/* 11778 80843988 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1177C 8084398C 50400026 */ beql $v0, $zero, .L80843A28 -/* 11780 80843990 8FBF001C */ lw $ra, 0x001C($sp) -/* 11784 80843994 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 11788 80843998 C6060838 */ lwc1 $f6, 0x0838($s0) ## 00000838 -/* 1178C 8084399C 46062032 */ c.eq.s $f4, $f6 -/* 11790 808439A0 00000000 */ nop -/* 11794 808439A4 45020020 */ bc1fl .L80843A28 -/* 11798 808439A8 8FBF001C */ lw $ra, 0x001C($sp) -/* 1179C 808439AC 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 117A0 808439B0 8FA40024 */ lw $a0, 0x0024($sp) -/* 117A4 808439B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 117A8 808439B8 0018C880 */ sll $t9, $t8, 2 -/* 117AC 808439BC 07210005 */ bgez $t9, .L808439D4 -/* 117B0 808439C0 3C068084 */ lui $a2, %hi(func_80843A38) ## $a2 = 80840000 -/* 117B4 808439C4 86080850 */ lh $t0, 0x0850($s0) ## 00000850 -/* 117B8 808439C8 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 117BC 808439CC 10000008 */ beq $zero, $zero, .L808439F0 -/* 117C0 808439D0 A6090850 */ sh $t1, 0x0850($s0) ## 00000850 -.L808439D4: -/* 117C4 808439D4 24C63A38 */ addiu $a2, $a2, %lo(func_80843A38) ## $a2 = 80843A38 -/* 117C8 808439D8 0C20D716 */ jal func_80835C58 -/* 117CC 808439DC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 117D0 808439E0 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C -/* 117D4 808439E4 3C010400 */ lui $at, 0x0400 ## $at = 04000000 -/* 117D8 808439E8 01415825 */ or $t3, $t2, $at ## $t3 = 04000000 -/* 117DC 808439EC AE0B067C */ sw $t3, 0x067C($s0) ## 0000067C -.L808439F0: -/* 117E0 808439F0 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 117E4 808439F4 860D083C */ lh $t5, 0x083C($s0) ## 0000083C -/* 117E8 808439F8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 117EC 808439FC 24C62DC0 */ addiu $a2, $a2, 0x2DC0 ## $a2 = 04002DC0 -/* 117F0 80843A00 118D0004 */ beq $t4, $t5, .L80843A14 -/* 117F4 80843A04 8FA40024 */ lw $a0, 0x0024($sp) -/* 117F8 80843A08 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 117FC 80843A0C 10000001 */ beq $zero, $zero, .L80843A14 -/* 11800 80843A10 24C62F68 */ addiu $a2, $a2, 0x2F68 ## $a2 = 04002F68 -.L80843A14: -/* 11804 80843A14 0C20C8B4 */ jal func_808322D0 -/* 11808 80843A18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1180C 80843A1C 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 11810 80843A20 A60E083C */ sh $t6, 0x083C($s0) ## 0000083C -/* 11814 80843A24 8FBF001C */ lw $ra, 0x001C($sp) -.L80843A28: -/* 11818 80843A28 8FB00018 */ lw $s0, 0x0018($sp) -/* 1181C 80843A2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 11820 80843A30 03E00008 */ jr $ra -/* 11824 80843A34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843A38.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843A38.s deleted file mode 100644 index 648c756515..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843A38.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80843A38 -/* 11828 80843A38 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1182C 80843A3C AFBF001C */ sw $ra, 0x001C($sp) -/* 11830 80843A40 AFB00018 */ sw $s0, 0x0018($sp) -/* 11834 80843A44 AFA5002C */ sw $a1, 0x002C($sp) -/* 11838 80843A48 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1183C 80843A4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 11840 80843A50 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 11844 80843A54 0C20E0AF */ jal func_808382BC -/* 11848 80843A58 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1184C 80843A5C 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 11850 80843A60 8FA4002C */ lw $a0, 0x002C($sp) -/* 11854 80843A64 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11858 80843A68 0018C880 */ sll $t9, $t8, 2 -/* 1185C 80843A6C 07210006 */ bgez $t9, .L80843A88 -/* 11860 80843A70 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 -/* 11864 80843A74 8FA4002C */ lw $a0, 0x002C($sp) -/* 11868 80843A78 0C028EF0 */ jal func_800A3BC0 -/* 1186C 80843A7C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 11870 80843A80 10000010 */ beq $zero, $zero, .L80843AC4 -/* 11874 80843A84 00000000 */ nop -.L80843A88: -/* 11878 80843A88 3C074180 */ lui $a3, 0x4180 ## $a3 = 41800000 -/* 1187C 80843A8C 0C20DD28 */ jal func_808374A0 -/* 11880 80843A90 AFA60020 */ sw $a2, 0x0020($sp) -/* 11884 80843A94 1040000B */ beq $v0, $zero, .L80843AC4 -/* 11888 80843A98 8FA60020 */ lw $a2, 0x0020($sp) -/* 1188C 80843A9C 8FA4002C */ lw $a0, 0x002C($sp) -/* 11890 80843AA0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 11894 80843AA4 0C028EF0 */ jal func_800A3BC0 -/* 11898 80843AA8 AFA20024 */ sw $v0, 0x0024($sp) -/* 1189C 80843AAC 14400002 */ bne $v0, $zero, .L80843AB8 -/* 118A0 80843AB0 8FA30024 */ lw $v1, 0x0024($sp) -/* 118A4 80843AB4 18600003 */ blez $v1, .L80843AC4 -.L80843AB8: -/* 118A8 80843AB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 118AC 80843ABC 0C20E7E4 */ jal func_80839F90 -/* 118B0 80843AC0 8FA5002C */ lw $a1, 0x002C($sp) -.L80843AC4: -/* 118B4 80843AC4 3C058085 */ lui $a1, %hi(D_808545DC) ## $a1 = 80850000 -/* 118B8 80843AC8 24A545DC */ addiu $a1, $a1, %lo(D_808545DC) ## $a1 = 808545DC -/* 118BC 80843ACC 0C20CA49 */ jal func_80832924 -/* 118C0 80843AD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 118C4 80843AD4 8FBF001C */ lw $ra, 0x001C($sp) -/* 118C8 80843AD8 8FB00018 */ lw $s0, 0x0018($sp) -/* 118CC 80843ADC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 118D0 80843AE0 03E00008 */ jr $ra -/* 118D4 80843AE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s deleted file mode 100644 index 5f4b96d94c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s +++ /dev/null @@ -1,141 +0,0 @@ -glabel func_80843AE8 -/* 118D8 80843AE8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 118DC 80843AEC AFBF002C */ sw $ra, 0x002C($sp) -/* 118E0 80843AF0 AFB00028 */ sw $s0, 0x0028($sp) -/* 118E4 80843AF4 AFA40030 */ sw $a0, 0x0030($sp) -/* 118E8 80843AF8 84A20850 */ lh $v0, 0x0850($a1) ## 00000850 -/* 118EC 80843AFC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 118F0 80843B00 50400055 */ beql $v0, $zero, .L80843C58 -/* 118F4 80843B04 8208084F */ lb $t0, 0x084F($s0) ## 0000084F -/* 118F8 80843B08 18400038 */ blez $v0, .L80843BEC -/* 118FC 80843B0C 3C0C8016 */ lui $t4, %hi(gSaveContext+0x1424) -/* 11900 80843B10 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 11904 80843B14 A4AE0850 */ sh $t6, 0x0850($a1) ## 00000850 -/* 11908 80843B18 84AF0850 */ lh $t7, 0x0850($a1) ## 00000850 -/* 1190C 80843B1C 55E0006F */ bnel $t7, $zero, .L80843CDC -/* 11910 80843B20 8FBF002C */ lw $ra, 0x002C($sp) -/* 11914 80843B24 8CB8067C */ lw $t8, 0x067C($a1) ## 0000067C -/* 11918 80843B28 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 -/* 1191C 80843B2C 0018C900 */ sll $t9, $t8, 4 -/* 11920 80843B30 07210016 */ bgez $t9, .L80843B8C -/* 11924 80843B34 00000000 */ nop -/* 11928 80843B38 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 -/* 1192C 80843B3C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 11930 80843B40 24843328 */ addiu $a0, $a0, 0x3328 ## $a0 = 04003328 -/* 11934 80843B44 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 11938 80843B48 3C01C180 */ lui $at, 0xC180 ## $at = C1800000 -/* 1193C 80843B4C 44815000 */ mtc1 $at, $f10 ## $f10 = -16.00 -/* 11940 80843B50 46803220 */ cvt.s.w $f8, $f6 -/* 11944 80843B54 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 11948 80843B58 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1194C 80843B5C 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 11950 80843B60 AFA80018 */ sw $t0, 0x0018($sp) -/* 11954 80843B64 24C63328 */ addiu $a2, $a2, 0x3328 ## $a2 = 04003328 -/* 11958 80843B68 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 1195C 80843B6C 8FA40030 */ lw $a0, 0x0030($sp) -/* 11960 80843B70 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 11964 80843B74 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 11968 80843B78 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 1196C 80843B7C 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 11970 80843B80 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 11974 80843B84 10000014 */ beq $zero, $zero, .L80843BD8 -/* 11978 80843B88 240A0140 */ addiu $t2, $zero, 0x0140 ## $t2 = 00000140 -.L80843B8C: -/* 1197C 80843B8C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 11980 80843B90 24842878 */ addiu $a0, $a0, 0x2878 ## $a0 = 00002878 -/* 11984 80843B94 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 11988 80843B98 3C0142C6 */ lui $at, 0x42C6 ## $at = 42C60000 -/* 1198C 80843B9C 44818000 */ mtc1 $at, $f16 ## $f16 = 99.00 -/* 11990 80843BA0 46809120 */ cvt.s.w $f4, $f18 -/* 11994 80843BA4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 11998 80843BA8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1199C 80843BAC 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 119A0 80843BB0 AFA90018 */ sw $t1, 0x0018($sp) -/* 119A4 80843BB4 24C62878 */ addiu $a2, $a2, 0x2878 ## $a2 = 04002878 -/* 119A8 80843BB8 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 119AC 80843BBC 8FA40030 */ lw $a0, 0x0030($sp) -/* 119B0 80843BC0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 119B4 80843BC4 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 119B8 80843BC8 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 119BC 80843BCC 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 119C0 80843BD0 E7A6001C */ swc1 $f6, 0x001C($sp) -/* 119C4 80843BD4 240A0140 */ addiu $t2, $zero, 0x0140 ## $t2 = 00000140 -.L80843BD8: -/* 119C8 80843BD8 3C018016 */ lui $at, %hi(gSaveContext+0x1424) -/* 119CC 80843BDC A42AFA84 */ sh $t2, %lo(gSaveContext+0x1424)($at) -/* 119D0 80843BE0 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 119D4 80843BE4 1000003C */ beq $zero, $zero, .L80843CD8 -/* 119D8 80843BE8 A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 -.L80843BEC: -/* 119DC 80843BEC 858CFA84 */ lh $t4, %lo(gSaveContext+0x1424)($t4) -/* 119E0 80843BF0 5580003A */ bnel $t4, $zero, .L80843CDC -/* 119E4 80843BF4 8FBF002C */ lw $ra, 0x002C($sp) -/* 119E8 80843BF8 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C -/* 119EC 80843BFC 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 119F0 80843C00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 119F4 80843C04 01A17024 */ and $t6, $t5, $at -/* 119F8 80843C08 000EC100 */ sll $t8, $t6, 4 -/* 119FC 80843C0C 07010006 */ bgez $t8, .L80843C28 -/* 11A00 80843C10 AE0E067C */ sw $t6, 0x067C($s0) ## 0000067C -/* 11A04 80843C14 8FA40030 */ lw $a0, 0x0030($sp) -/* 11A08 80843C18 0C20E3C6 */ jal func_80838F18 -/* 11A0C 80843C1C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11A10 80843C20 10000004 */ beq $zero, $zero, .L80843C34 -/* 11A14 80843C24 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -.L80843C28: -/* 11A18 80843C28 0C214C20 */ jal func_80853080 -/* 11A1C 80843C2C 8FA50030 */ lw $a1, 0x0030($sp) -/* 11A20 80843C30 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -.L80843C34: -/* 11A24 80843C34 A2190A87 */ sb $t9, 0x0A87($s0) ## 00000A87 -/* 11A28 80843C38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11A2C 80843C3C 0C20DEBF */ jal func_80837AFC -/* 11A30 80843C40 2405FFEC */ addiu $a1, $zero, 0xFFEC ## $a1 = FFFFFFEC -/* 11A34 80843C44 0C03D1FF */ jal func_800F47FC -/* 11A38 80843C48 00000000 */ nop -/* 11A3C 80843C4C 10000023 */ beq $zero, $zero, .L80843CDC -/* 11A40 80843C50 8FBF002C */ lw $ra, 0x002C($sp) -/* 11A44 80843C54 8208084F */ lb $t0, 0x084F($s0) ## 0000084F -.L80843C58: -/* 11A48 80843C58 8FAB0030 */ lw $t3, 0x0030($sp) -/* 11A4C 80843C5C 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -/* 11A50 80843C60 11000016 */ beq $t0, $zero, .L80843CBC -/* 11A54 80843C64 018B6021 */ addu $t4, $t4, $t3 -/* 11A58 80843C68 2409003C */ addiu $t1, $zero, 0x003C ## $t1 = 0000003C -/* 11A5C 80843C6C A6090850 */ sh $t1, 0x0850($s0) ## 00000850 -/* 11A60 80843C70 3C078085 */ lui $a3, %hi(D_808545E4) ## $a3 = 80850000 -/* 11A64 80843C74 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 -/* 11A68 80843C78 AFAA0010 */ sw $t2, 0x0010($sp) -/* 11A6C 80843C7C 24E745E4 */ addiu $a3, $a3, %lo(D_808545E4) ## $a3 = 808545E4 -/* 11A70 80843C80 8FA40030 */ lw $a0, 0x0030($sp) -/* 11A74 80843C84 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11A78 80843C88 0C20E5A0 */ jal func_80839680 -/* 11A7C 80843C8C 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 11A80 80843C90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11A84 80843C94 0C00BDF7 */ jal func_8002F7DC -/* 11A88 80843C98 240520A8 */ addiu $a1, $zero, 0x20A8 ## $a1 = 000020A8 -/* 11A8C 80843C9C 8FA40030 */ lw $a0, 0x0030($sp) -/* 11A90 80843CA0 240526B4 */ addiu $a1, $zero, 0x26B4 ## $a1 = 000026B4 -/* 11A94 80843CA4 2406007D */ addiu $a2, $zero, 0x007D ## $a2 = 0000007D -/* 11A98 80843CA8 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 11A9C 80843CAC 0C02003E */ jal func_800800F8 -/* 11AA0 80843CB0 AFA00010 */ sw $zero, 0x0010($sp) -/* 11AA4 80843CB4 10000009 */ beq $zero, $zero, .L80843CDC -/* 11AA8 80843CB8 8FBF002C */ lw $ra, 0x002C($sp) -.L80843CBC: -/* 11AAC 80843CBC 958C0A20 */ lhu $t4, 0x0A20($t4) ## 00000A20 -/* 11AB0 80843CC0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 11AB4 80843CC4 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 11AB8 80843CC8 15810003 */ bne $t4, $at, .L80843CD8 -/* 11ABC 80843CCC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 11AC0 80843CD0 002B0821 */ addu $at, $at, $t3 -/* 11AC4 80843CD4 A42D0A20 */ sh $t5, 0x0A20($at) ## 00010A20 -.L80843CD8: -/* 11AC8 80843CD8 8FBF002C */ lw $ra, 0x002C($sp) -.L80843CDC: -/* 11ACC 80843CDC 8FB00028 */ lw $s0, 0x0028($sp) -/* 11AD0 80843CE0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 11AD4 80843CE4 03E00008 */ jr $ra -/* 11AD8 80843CE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843CEC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843CEC.s deleted file mode 100644 index d8eed99072..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843CEC.s +++ /dev/null @@ -1,81 +0,0 @@ -glabel func_80843CEC -/* 11ADC 80843CEC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 11AE0 80843CF0 AFBF001C */ sw $ra, 0x001C($sp) -/* 11AE4 80843CF4 AFB00018 */ sw $s0, 0x0018($sp) -/* 11AE8 80843CF8 AFA5002C */ sw $a1, 0x002C($sp) -/* 11AEC 80843CFC 808E014C */ lb $t6, 0x014C($a0) ## 0000014C -/* 11AF0 80843D00 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 11AF4 80843D04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 11AF8 80843D08 11C10017 */ beq $t6, $at, .L80843D68 -/* 11AFC 80843D0C 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 11B00 80843D10 0305C021 */ addu $t8, $t8, $a1 -/* 11B04 80843D14 93181CBE */ lbu $t8, 0x1CBE($t8) ## 00011CBE -/* 11B08 80843D18 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 11B0C 80843D1C 3C048085 */ lui $a0, %hi(D_808535E4) ## $a0 = 80850000 -/* 11B10 80843D20 1301000F */ beq $t8, $at, .L80843D60 -/* 11B14 80843D24 00000000 */ nop -/* 11B18 80843D28 8C8435E4 */ lw $a0, %lo(D_808535E4)($a0) -/* 11B1C 80843D2C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 11B20 80843D30 1081000B */ beq $a0, $at, .L80843D60 -/* 11B24 80843D34 00000000 */ nop -/* 11B28 80843D38 0C20E051 */ jal func_80838144 -/* 11B2C 80843D3C 00000000 */ nop -/* 11B30 80843D40 04400009 */ bltz $v0, .L80843D68 -/* 11B34 80843D44 8FA4002C */ lw $a0, 0x002C($sp) -/* 11B38 80843D48 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 11B3C 80843D4C 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 11B40 80843D50 0C010842 */ jal func_80042108 -/* 11B44 80843D54 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 11B48 80843D58 14400003 */ bne $v0, $zero, .L80843D68 -/* 11B4C 80843D5C 00000000 */ nop -.L80843D60: -/* 11B50 80843D60 0C20E087 */ jal func_8083821C -/* 11B54 80843D64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80843D68: -/* 11B58 80843D68 0C20DC87 */ jal func_8083721C -/* 11B5C 80843D6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11B60 80843D70 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 -/* 11B64 80843D74 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001B4 -/* 11B68 80843D78 AFA60024 */ sw $a2, 0x0024($sp) -/* 11B6C 80843D7C 0C028EF0 */ jal func_800A3BC0 -/* 11B70 80843D80 8FA4002C */ lw $a0, 0x002C($sp) -/* 11B74 80843D84 1040000A */ beq $v0, $zero, .L80843DB0 -/* 11B78 80843D88 8FA60024 */ lw $a2, 0x0024($sp) -/* 11B7C 80843D8C 92190002 */ lbu $t9, 0x0002($s0) ## 00000002 -/* 11B80 80843D90 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 11B84 80843D94 8FA4002C */ lw $a0, 0x002C($sp) -/* 11B88 80843D98 5721001A */ bnel $t9, $at, .L80843E04 -/* 11B8C 80843D9C 8FBF001C */ lw $ra, 0x001C($sp) -/* 11B90 80843DA0 0C210EBA */ jal func_80843AE8 -/* 11B94 80843DA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11B98 80843DA8 10000016 */ beq $zero, $zero, .L80843E04 -/* 11B9C 80843DAC 8FBF001C */ lw $ra, 0x001C($sp) -.L80843DB0: -/* 11BA0 80843DB0 8E0201BC */ lw $v0, 0x01BC($s0) ## 000001BC -/* 11BA4 80843DB4 3C080400 */ lui $t0, 0x0400 ## $t0 = 04000000 -/* 11BA8 80843DB8 25082878 */ addiu $t0, $t0, 0x2878 ## $t0 = 04002878 -/* 11BAC 80843DBC 15020007 */ bne $t0, $v0, .L80843DDC -/* 11BB0 80843DC0 3C090400 */ lui $t1, 0x0400 ## $t1 = 04000000 -/* 11BB4 80843DC4 3C058085 */ lui $a1, %hi(D_808545F0) ## $a1 = 80850000 -/* 11BB8 80843DC8 24A545F0 */ addiu $a1, $a1, %lo(D_808545F0) ## $a1 = 808545F0 -/* 11BBC 80843DCC 0C20CA49 */ jal func_80832924 -/* 11BC0 80843DD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11BC4 80843DD4 1000000B */ beq $zero, $zero, .L80843E04 -/* 11BC8 80843DD8 8FBF001C */ lw $ra, 0x001C($sp) -.L80843DDC: -/* 11BCC 80843DDC 25292F08 */ addiu $t1, $t1, 0x2F08 ## $t1 = 00002F08 -/* 11BD0 80843DE0 15220007 */ bne $t1, $v0, .L80843E00 -/* 11BD4 80843DE4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 11BD8 80843DE8 0C02914C */ jal func_800A4530 -/* 11BDC 80843DEC 3C0542B0 */ lui $a1, 0x42B0 ## $a1 = 42B00000 -/* 11BE0 80843DF0 10400003 */ beq $v0, $zero, .L80843E00 -/* 11BE4 80843DF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11BE8 80843DF8 0C20C9DC */ jal func_80832770 -/* 11BEC 80843DFC 24050850 */ addiu $a1, $zero, 0x0850 ## $a1 = 00000850 -.L80843E00: -/* 11BF0 80843E00 8FBF001C */ lw $ra, 0x001C($sp) -.L80843E04: -/* 11BF4 80843E04 8FB00018 */ lw $s0, 0x0018($sp) -/* 11BF8 80843E08 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 11BFC 80843E0C 03E00008 */ jr $ra -/* 11C00 80843E10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E14.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E14.s deleted file mode 100644 index ab266b8e1c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E14.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80843E14 -/* 11C04 80843E14 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 11C08 80843E18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 11C0C 80843E1C AFA5001C */ sw $a1, 0x001C($sp) -/* 11C10 80843E20 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00000000 -/* 11C14 80843E24 0C20C9A6 */ jal func_80832698 -/* 11C18 80843E28 AFA40018 */ sw $a0, 0x0018($sp) -/* 11C1C 80843E2C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 11C20 80843E30 8DC403AC */ lw $a0, 0x03AC($t6) ## 000003AC -/* 11C24 80843E34 50800008 */ beql $a0, $zero, .L80843E58 -/* 11C28 80843E38 8FBF0014 */ lw $ra, 0x0014($sp) -/* 11C2C 80843E3C 848F0000 */ lh $t7, 0x0000($a0) ## 00000000 -/* 11C30 80843E40 240100A1 */ addiu $at, $zero, 0x00A1 ## $at = 000000A1 -/* 11C34 80843E44 55E10004 */ bnel $t7, $at, .L80843E58 -/* 11C38 80843E48 8FBF0014 */ lw $ra, 0x0014($sp) -/* 11C3C 80843E4C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 11C40 80843E50 24056862 */ addiu $a1, $zero, 0x6862 ## $a1 = 00006862 -/* 11C44 80843E54 8FBF0014 */ lw $ra, 0x0014($sp) -.L80843E58: -/* 11C48 80843E58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 11C4C 80843E5C 03E00008 */ jr $ra -/* 11C50 80843E60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E64.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E64.s deleted file mode 100644 index 302e5adc1c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E64.s +++ /dev/null @@ -1,160 +0,0 @@ -.late_rodata -glabel D_8085544C - .float 0.1 - -.text -glabel func_80843E64 -/* 11C54 80843E64 3C028085 */ lui $v0, %hi(D_808535E4) ## $v0 = 80850000 -/* 11C58 80843E68 8C4235E4 */ lw $v0, %lo(D_808535E4)($v0) -/* 11C5C 80843E6C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 11C60 80843E70 AFB00020 */ sw $s0, 0x0020($sp) -/* 11C64 80843E74 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 11C68 80843E78 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 11C6C 80843E7C AFBF0024 */ sw $ra, 0x0024($sp) -/* 11C70 80843E80 10410004 */ beq $v0, $at, .L80843E94 -/* 11C74 80843E84 AFA40038 */ sw $a0, 0x0038($sp) -/* 11C78 80843E88 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 11C7C 80843E8C 54410004 */ bnel $v0, $at, .L80843EA0 -/* 11C80 80843E90 86030896 */ lh $v1, 0x0896($s0) ## 00000896 -.L80843E94: -/* 11C84 80843E94 10000002 */ beq $zero, $zero, .L80843EA0 -/* 11C88 80843E98 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 11C8C 80843E9C 86030896 */ lh $v1, 0x0896($s0) ## 00000896 -.L80843EA0: -/* 11C90 80843EA0 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 11C94 80843EA4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 11C98 80843EA8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 11C9C 80843EAC 0C01DE80 */ jal Math_ApproxF - -/* 11CA0 80843EB0 AFA30034 */ sw $v1, 0x0034($sp) -/* 11CA4 80843EB4 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 11CA8 80843EB8 8FA30034 */ lw $v1, 0x0034($sp) -/* 11CAC 80843EBC 3C01FFF3 */ lui $at, 0xFFF3 ## $at = FFF30000 -/* 11CB0 80843EC0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFF3FFFF -/* 11CB4 80843EC4 01C17824 */ and $t7, $t6, $at -/* 11CB8 80843EC8 28610190 */ slti $at, $v1, 0x0190 -/* 11CBC 80843ECC 14200030 */ bne $at, $zero, .L80843F90 -/* 11CC0 80843ED0 AE0F067C */ sw $t7, 0x067C($s0) ## 0000067C -/* 11CC4 80843ED4 86180896 */ lh $t8, 0x0896($s0) ## 00000896 -/* 11CC8 80843ED8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 11CCC 80843EDC 3C0A8085 */ lui $t2, %hi(D_80854600) ## $t2 = 80850000 -/* 11CD0 80843EE0 2B010320 */ slti $at, $t8, 0x0320 -/* 11CD4 80843EE4 50200004 */ beql $at, $zero, .L80843EF8 -/* 11CD8 80843EE8 AFB90030 */ sw $t9, 0x0030($sp) -/* 11CDC 80843EEC 10000002 */ beq $zero, $zero, .L80843EF8 -/* 11CE0 80843EF0 AFA00030 */ sw $zero, 0x0030($sp) -/* 11CE4 80843EF4 AFB90030 */ sw $t9, 0x0030($sp) -.L80843EF8: -/* 11CE8 80843EF8 8FA80030 */ lw $t0, 0x0030($sp) -/* 11CEC 80843EFC 254A4600 */ addiu $t2, $t2, %lo(D_80854600) ## $t2 = 80854600 -/* 11CF0 80843F00 8FA40038 */ lw $a0, 0x0038($sp) -/* 11CF4 80843F04 00084880 */ sll $t1, $t0, 2 -/* 11CF8 80843F08 01284823 */ subu $t1, $t1, $t0 -/* 11CFC 80843F0C 00094840 */ sll $t1, $t1, 1 -/* 11D00 80843F10 012A1021 */ addu $v0, $t1, $t2 -/* 11D04 80843F14 80450000 */ lb $a1, 0x0000($v0) ## 00000000 -/* 11D08 80843F18 0C214C38 */ jal func_808530E0 -/* 11D0C 80843F1C AFA20028 */ sw $v0, 0x0028($sp) -/* 11D10 80843F20 10400003 */ beq $v0, $zero, .L80843F30 -/* 11D14 80843F24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11D18 80843F28 10000057 */ beq $zero, $zero, .L80844088 -/* 11D1C 80843F2C 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -.L80843F30: -/* 11D20 80843F30 0C20DEB8 */ jal func_80837AE0 -/* 11D24 80843F34 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 -/* 11D28 80843F38 8FA40038 */ lw $a0, 0x0038($sp) -/* 11D2C 80843F3C 340580C7 */ ori $a1, $zero, 0x80C7 ## $a1 = 000080C7 -/* 11D30 80843F40 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 11D34 80843F44 0C210A6D */ jal func_808429B4 -/* 11D38 80843F48 2407001E */ addiu $a3, $zero, 0x001E ## $a3 = 0000001E -/* 11D3C 80843F4C 8FA20028 */ lw $v0, 0x0028($sp) -/* 11D40 80843F50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11D44 80843F54 90450001 */ lbu $a1, 0x0001($v0) ## 00000001 -/* 11D48 80843F58 90460002 */ lbu $a2, 0x0002($v0) ## 00000002 -/* 11D4C 80843F5C 90470003 */ lbu $a3, 0x0003($v0) ## 00000003 -/* 11D50 80843F60 0C20C993 */ jal func_8083264C -/* 11D54 80843F64 AFA00010 */ sw $zero, 0x0010($sp) -/* 11D58 80843F68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11D5C 80843F6C 0C00BDF7 */ jal func_8002F7DC -/* 11D60 80843F70 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E -/* 11D64 80843F74 8FAB0028 */ lw $t3, 0x0028($sp) -/* 11D68 80843F78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11D6C 80843F7C 0C20C9A6 */ jal func_80832698 -/* 11D70 80843F80 95650004 */ lhu $a1, 0x0004($t3) ## 00000004 -/* 11D74 80843F84 8FA20030 */ lw $v0, 0x0030($sp) -/* 11D78 80843F88 1000003F */ beq $zero, $zero, .L80844088 -/* 11D7C 80843F8C 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -.L80843F90: -/* 11D80 80843F90 286100C9 */ slti $at, $v1, 0x00C9 -/* 11D84 80843F94 14200039 */ bne $at, $zero, .L8084407C -/* 11D88 80843F98 00031840 */ sll $v1, $v1, 1 -/* 11D8C 80843F9C 28610100 */ slti $at, $v1, 0x0100 -/* 11D90 80843FA0 54200003 */ bnel $at, $zero, .L80843FB0 -/* 11D94 80843FA4 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 -/* 11D98 80843FA8 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 11D9C 80843FAC 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 -.L80843FB0: -/* 11DA0 80843FB0 3C018085 */ lui $at, %hi(D_8085544C) ## $at = 80850000 -/* 11DA4 80843FB4 C428544C */ lwc1 $f8, %lo(D_8085544C)($at) -/* 11DA8 80843FB8 468021A0 */ cvt.s.w $f6, $f4 -/* 11DAC 80843FBC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 11DB0 80843FC0 306500FF */ andi $a1, $v1, 0x00FF ## $a1 = 000000FF -/* 11DB4 80843FC4 00A03825 */ or $a3, $a1, $zero ## $a3 = 000000FF -/* 11DB8 80843FC8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 11DBC 80843FCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11DC0 80843FD0 46083282 */ mul.s $f10, $f6, $f8 -/* 11DC4 80843FD4 444CF800 */ cfc1 $t4, $31 -/* 11DC8 80843FD8 44C6F800 */ ctc1 $a2, $31 -/* 11DCC 80843FDC 00000000 */ nop -/* 11DD0 80843FE0 46005424 */ cvt.w.s $f16, $f10 -/* 11DD4 80843FE4 4446F800 */ cfc1 $a2, $31 -/* 11DD8 80843FE8 00000000 */ nop -/* 11DDC 80843FEC 30C60078 */ andi $a2, $a2, 0x0078 ## $a2 = 00000000 -/* 11DE0 80843FF0 50C00013 */ beql $a2, $zero, .L80844040 -/* 11DE4 80843FF4 44068000 */ mfc1 $a2, $f16 -/* 11DE8 80843FF8 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 11DEC 80843FFC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 11DF0 80844000 46105401 */ sub.s $f16, $f10, $f16 -/* 11DF4 80844004 44C6F800 */ ctc1 $a2, $31 -/* 11DF8 80844008 00000000 */ nop -/* 11DFC 8084400C 46008424 */ cvt.w.s $f16, $f16 -/* 11E00 80844010 4446F800 */ cfc1 $a2, $31 -/* 11E04 80844014 00000000 */ nop -/* 11E08 80844018 30C60078 */ andi $a2, $a2, 0x0078 ## $a2 = 00000000 -/* 11E0C 8084401C 14C00005 */ bne $a2, $zero, .L80844034 -/* 11E10 80844020 00000000 */ nop -/* 11E14 80844024 44068000 */ mfc1 $a2, $f16 -/* 11E18 80844028 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 11E1C 8084402C 10000007 */ beq $zero, $zero, .L8084404C -/* 11E20 80844030 00C13025 */ or $a2, $a2, $at ## $a2 = 80000000 -.L80844034: -/* 11E24 80844034 10000005 */ beq $zero, $zero, .L8084404C -/* 11E28 80844038 2406FFFF */ addiu $a2, $zero, 0xFFFF ## $a2 = FFFFFFFF -/* 11E2C 8084403C 44068000 */ mfc1 $a2, $f16 -.L80844040: -/* 11E30 80844040 00000000 */ nop -/* 11E34 80844044 04C0FFFB */ bltz $a2, .L80844034 -/* 11E38 80844048 00000000 */ nop -.L8084404C: -/* 11E3C 8084404C 44CCF800 */ ctc1 $t4, $31 -/* 11E40 80844050 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 000000FF -/* 11E44 80844054 0C20C993 */ jal func_8083264C -/* 11E48 80844058 AFA00010 */ sw $zero, 0x0010($sp) -/* 11E4C 8084405C 3C0D8085 */ lui $t5, %hi(D_808535E4) ## $t5 = 80850000 -/* 11E50 80844060 8DAD35E4 */ lw $t5, %lo(D_808535E4)($t5) -/* 11E54 80844064 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 11E58 80844068 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11E5C 8084406C 15A10003 */ bne $t5, $at, .L8084407C -/* 11E60 80844070 00000000 */ nop -/* 11E64 80844074 0C20C9A6 */ jal func_80832698 -/* 11E68 80844078 24056804 */ addiu $a1, $zero, 0x6804 ## $a1 = 00006804 -.L8084407C: -/* 11E6C 8084407C 0C20CA28 */ jal func_808328A0 -/* 11E70 80844080 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11E74 80844084 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80844088: -/* 11E78 80844088 8FBF0024 */ lw $ra, 0x0024($sp) -/* 11E7C 8084408C 8FB00020 */ lw $s0, 0x0020($sp) -/* 11E80 80844090 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 11E84 80844094 03E00008 */ jr $ra -/* 11E88 80844098 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084409C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084409C.s deleted file mode 100644 index 8dbeabbd69..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084409C.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8084409C -/* 11E8C 8084409C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 11E90 808440A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 11E94 808440A4 AFB00018 */ sw $s0, 0x0018($sp) -/* 11E98 808440A8 AFA40028 */ sw $a0, 0x0028($sp) -/* 11E9C 808440AC AFA60030 */ sw $a2, 0x0030($sp) -/* 11EA0 808440B0 AFA70034 */ sw $a3, 0x0034($sp) -/* 11EA4 808440B4 8CA603AC */ lw $a2, 0x03AC($a1) ## 000003AC -/* 11EA8 808440B8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 11EAC 808440BC 0C20D591 */ jal func_80835644 -/* 11EB0 808440C0 AFA60024 */ sw $a2, 0x0024($sp) -/* 11EB4 808440C4 14400010 */ bne $v0, $zero, .L80844108 -/* 11EB8 808440C8 8FA60024 */ lw $a2, 0x0024($sp) -/* 11EBC 808440CC 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 11EC0 808440D0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11EC4 808440D4 A4CE0032 */ sh $t6, 0x0032($a2) ## 00000032 -/* 11EC8 808440D8 C7A40030 */ lwc1 $f4, 0x0030($sp) -/* 11ECC 808440DC E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 11ED0 808440E0 C7A60034 */ lwc1 $f6, 0x0034($sp) -/* 11ED4 808440E4 E4C60060 */ swc1 $f6, 0x0060($a2) ## 00000060 -/* 11ED8 808440E8 0C20D191 */ jal func_80834644 -/* 11EDC 808440EC 8FA40028 */ lw $a0, 0x0028($sp) -/* 11EE0 808440F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11EE4 808440F4 0C00BDF7 */ jal func_8002F7DC -/* 11EE8 808440F8 2405083A */ addiu $a1, $zero, 0x083A ## $a1 = 0000083A -/* 11EEC 808440FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11EF0 80844100 0C20C9A6 */ jal func_80832698 -/* 11EF4 80844104 24056800 */ addiu $a1, $zero, 0x6800 ## $a1 = 00006800 -.L80844108: -/* 11EF8 80844108 8FBF001C */ lw $ra, 0x001C($sp) -/* 11EFC 8084410C 8FB00018 */ lw $s0, 0x0018($sp) -/* 11F00 80844110 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 11F04 80844114 03E00008 */ jr $ra -/* 11F08 80844118 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s deleted file mode 100644 index 2ebd7baef7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s +++ /dev/null @@ -1,412 +0,0 @@ -.late_rodata -glabel D_80855450 - .float -1.2 - -.text -glabel func_8084411C -/* 11F0C 8084411C 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13b3) -/* 11F10 80844120 81CEFA13 */ lb $t6, %lo(gSaveContext+0x13b3)($t6) -/* 11F14 80844124 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 11F18 80844128 AFB00028 */ sw $s0, 0x0028($sp) -/* 11F1C 8084412C 29C10029 */ slti $at, $t6, 0x0029 -/* 11F20 80844130 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 11F24 80844134 AFBF002C */ sw $ra, 0x002C($sp) -/* 11F28 80844138 14200004 */ bne $at, $zero, .L8084414C -/* 11F2C 8084413C AFA50054 */ sw $a1, 0x0054($sp) -/* 11F30 80844140 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 11F34 80844144 10000007 */ beq $zero, $zero, .L80844164 -/* 11F38 80844148 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -.L8084414C: -/* 11F3C 8084414C 0C023A71 */ jal func_8008E9C4 -/* 11F40 80844150 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11F44 80844154 10400003 */ beq $v0, $zero, .L80844164 -/* 11F48 80844158 3C018085 */ lui $at, %hi(D_80855450) ## $at = 80850000 -/* 11F4C 8084415C C4265450 */ lwc1 $f6, %lo(D_80855450)($at) -/* 11F50 80844160 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -.L80844164: -/* 11F54 80844164 8FAF0054 */ lw $t7, 0x0054($sp) -/* 11F58 80844168 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11F5C 8084416C 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFFC -/* 11F60 80844170 27A6004A */ addiu $a2, $sp, 0x004A ## $a2 = FFFFFFFA -/* 11F64 80844174 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 11F68 80844178 0C20DC9A */ jal func_80837268 -/* 11F6C 8084417C AFAF0010 */ sw $t7, 0x0010($sp) -/* 11F70 80844180 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -/* 11F74 80844184 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 11F78 80844188 572000F0 */ bnel $t9, $zero, .L8084454C -/* 11F7C 8084418C 920B015B */ lbu $t3, 0x015B($s0) ## 0000015B -/* 11F80 80844190 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 11F84 80844194 8FA40054 */ lw $a0, 0x0054($sp) -/* 11F88 80844198 31090800 */ andi $t1, $t0, 0x0800 ## $t1 = 00000000 -/* 11F8C 8084419C 5120001E */ beql $t1, $zero, .L80844218 -/* 11F90 808441A0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 11F94 808441A4 8E0603AC */ lw $a2, 0x03AC($s0) ## 000003AC -/* 11F98 808441A8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11F9C 808441AC 0C20D591 */ jal func_80835644 -/* 11FA0 808441B0 AFA60044 */ sw $a2, 0x0044($sp) -/* 11FA4 808441B4 14400017 */ bne $v0, $zero, .L80844214 -/* 11FA8 808441B8 8FA60044 */ lw $a2, 0x0044($sp) -/* 11FAC 808441BC 84CA0000 */ lh $t2, 0x0000($a2) ## 00000000 -/* 11FB0 808441C0 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 11FB4 808441C4 3C0B8086 */ lui $t3, %hi(D_80858AB4) ## $t3 = 80860000 -/* 11FB8 808441C8 55410013 */ bnel $t2, $at, .L80844218 -/* 11FBC 808441CC 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 11FC0 808441D0 8D6B8AB4 */ lw $t3, %lo(D_80858AB4)($t3) -/* 11FC4 808441D4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 11FC8 808441D8 956C000C */ lhu $t4, 0x000C($t3) ## 8086000C -/* 11FCC 808441DC 318DC007 */ andi $t5, $t4, 0xC007 ## $t5 = 00000000 -/* 11FD0 808441E0 51A0000D */ beql $t5, $zero, .L80844218 -/* 11FD4 808441E4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 11FD8 808441E8 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 -/* 11FDC 808441EC C6080838 */ lwc1 $f8, 0x0838($s0) ## 00000838 -/* 11FE0 808441F0 C6100060 */ lwc1 $f16, 0x0060($s0) ## 00000060 -/* 11FE4 808441F4 8FA40054 */ lw $a0, 0x0054($sp) -/* 11FE8 808441F8 46004280 */ add.s $f10, $f8, $f0 -/* 11FEC 808441FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11FF0 80844200 46008480 */ add.s $f18, $f16, $f0 -/* 11FF4 80844204 44065000 */ mfc1 $a2, $f10 -/* 11FF8 80844208 44079000 */ mfc1 $a3, $f18 -/* 11FFC 8084420C 0C211027 */ jal func_8084409C -/* 12000 80844210 00000000 */ nop -.L80844214: -/* 12004 80844214 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -.L80844218: -/* 12008 80844218 AFA50038 */ sw $a1, 0x0038($sp) -/* 1200C 8084421C 0C028EF0 */ jal func_800A3BC0 -/* 12010 80844220 8FA40054 */ lw $a0, 0x0054($sp) -/* 12014 80844224 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 -/* 12018 80844228 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1201C 8084422C 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFFC -/* 12020 80844230 000E7B00 */ sll $t7, $t6, 12 -/* 12024 80844234 05E20004 */ bltzl $t7, .L80844248 -/* 12028 80844238 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1202C 8084423C 0C20F7F8 */ jal func_8083DFE0 -/* 12030 80844240 27A6004A */ addiu $a2, $sp, 0x004A ## $a2 = FFFFFFFA -/* 12034 80844244 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80844248: -/* 12038 80844248 0C20D99C */ jal func_80836670 -/* 1203C 8084424C 8FA50054 */ lw $a1, 0x0054($sp) -/* 12040 80844250 8E180680 */ lw $t8, 0x0680($s0) ## 00000680 -/* 12044 80844254 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12048 80844258 0018CB00 */ sll $t9, $t8, 12 -/* 1204C 8084425C 07210005 */ bgez $t9, .L80844274 -/* 12050 80844260 00000000 */ nop -/* 12054 80844264 8208084F */ lb $t0, 0x084F($s0) ## 0000084F -/* 12058 80844268 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1205C 8084426C 51010006 */ beql $t0, $at, .L80844288 -/* 12060 80844270 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L80844274: -/* 12064 80844274 0C20EEE8 */ jal func_8083BBA0 -/* 12068 80844278 8FA50054 */ lw $a1, 0x0054($sp) -/* 1206C 8084427C 5440011E */ bnel $v0, $zero, .L808446F8 -/* 12070 80844280 8FBF002C */ lw $ra, 0x002C($sp) -/* 12074 80844284 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L80844288: -/* 12078 80844288 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 1207C 8084428C 4600203C */ c.lt.s $f4, $f0 -/* 12080 80844290 00000000 */ nop -/* 12084 80844294 45020118 */ bc1fl .L808446F8 -/* 12088 80844298 8FBF002C */ lw $ra, 0x002C($sp) -/* 1208C 8084429C 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 12090 808442A0 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 12094 808442A4 0440002E */ bltz $v0, .L80844360 -/* 12098 808442A8 00000000 */ nop -/* 1209C 808442AC 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -/* 120A0 808442B0 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 120A4 808442B4 312A0008 */ andi $t2, $t1, 0x0008 ## $t2 = 00000000 -/* 120A8 808442B8 55400007 */ bnel $t2, $zero, .L808442D8 -/* 120AC 808442BC 44813000 */ mtc1 $at, $f6 ## $f6 = 800.00 -/* 120B0 808442C0 50400005 */ beql $v0, $zero, .L808442D8 -/* 120B4 808442C4 44813000 */ mtc1 $at, $f6 ## $f6 = 800.00 -/* 120B8 808442C8 860B0896 */ lh $t3, 0x0896($s0) ## 00000896 -/* 120BC 808442CC 5960010A */ blezl $t3, .L808446F8 -/* 120C0 808442D0 8FBF002C */ lw $ra, 0x002C($sp) -/* 120C4 808442D4 44813000 */ mtc1 $at, $f6 ## $f6 = 800.00 -.L808442D8: -/* 120C8 808442D8 3C018085 */ lui $at, %hi(D_80853600) ## $at = 80850000 -/* 120CC 808442DC C4283600 */ lwc1 $f8, %lo(D_80853600)($at) -/* 120D0 808442E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 120D4 808442E4 4608303C */ c.lt.s $f6, $f8 -/* 120D8 808442E8 00000000 */ nop -/* 120DC 808442EC 45010005 */ bc1t .L80844304 -/* 120E0 808442F0 00000000 */ nop -/* 120E4 808442F4 8E0C067C */ lw $t4, 0x067C($s0) ## 0000067C -/* 120E8 808442F8 318D0004 */ andi $t5, $t4, 0x0004 ## $t5 = 00000000 -/* 120EC 808442FC 51A00009 */ beql $t5, $zero, .L80844324 -/* 120F0 80844300 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -.L80844304: -/* 120F4 80844304 0C210F85 */ jal func_80843E14 -/* 120F8 80844308 24056807 */ addiu $a1, $zero, 0x6807 ## $a1 = 00006807 -/* 120FC 8084430C 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 12100 80844310 2401FFFB */ addiu $at, $zero, 0xFFFB ## $at = FFFFFFFB -/* 12104 80844314 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 12108 80844318 01C17824 */ and $t7, $t6, $at -/* 1210C 8084431C AE0F067C */ sw $t7, 0x067C($s0) ## 0000067C -/* 12110 80844320 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -.L80844324: -/* 12114 80844324 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 12118 80844328 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1211C 8084432C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 12120 80844330 AFB80018 */ sw $t8, 0x0018($sp) -/* 12124 80844334 24C63020 */ addiu $a2, $a2, 0x3020 ## $a2 = 04003020 -/* 12128 80844338 8FA40054 */ lw $a0, 0x0054($sp) -/* 1212C 8084433C 8FA50038 */ lw $a1, 0x0038($sp) -/* 12130 80844340 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 12134 80844344 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 12138 80844348 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 1213C 8084434C 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 12140 80844350 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 12144 80844354 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 12148 80844358 100000E6 */ beq $zero, $zero, .L808446F4 -/* 1214C 8084435C A6190850 */ sh $t9, 0x0850($s0) ## 00000850 -.L80844360: -/* 12150 80844360 54410019 */ bnel $v0, $at, .L808443C8 -/* 12154 80844364 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 -/* 12158 80844368 86080896 */ lh $t0, 0x0896($s0) ## 00000896 -/* 1215C 8084436C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 12160 80844370 44818000 */ mtc1 $at, $f16 ## $f16 = 120.00 -/* 12164 80844374 44889000 */ mtc1 $t0, $f18 ## $f18 = 0.00 -/* 12168 80844378 3C01438C */ lui $at, 0x438C ## $at = 438C0000 -/* 1216C 8084437C 46809120 */ cvt.s.w $f4, $f18 -/* 12170 80844380 4604803C */ c.lt.s $f16, $f4 -/* 12174 80844384 00000000 */ nop -/* 12178 80844388 4502000F */ bc1fl .L808443C8 -/* 1217C 8084438C 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 -/* 12180 80844390 44813000 */ mtc1 $at, $f6 ## $f6 = 280.00 -/* 12184 80844394 3C018085 */ lui $at, %hi(D_80853600) ## $at = 80850000 -/* 12188 80844398 C4283600 */ lwc1 $f8, %lo(D_80853600)($at) -/* 1218C 8084439C 2409FFFE */ addiu $t1, $zero, 0xFFFE ## $t1 = FFFFFFFE -/* 12190 808443A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12194 808443A4 4608303C */ c.lt.s $f6, $f8 -/* 12198 808443A8 24056808 */ addiu $a1, $zero, 0x6808 ## $a1 = 00006808 -/* 1219C 808443AC 45020006 */ bc1fl .L808443C8 -/* 121A0 808443B0 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 -/* 121A4 808443B4 0C210F85 */ jal func_80843E14 -/* 121A8 808443B8 A6090850 */ sh $t1, 0x0850($s0) ## 00000850 -/* 121AC 808443BC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 121B0 808443C0 00000000 */ nop -/* 121B4 808443C4 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 -.L808443C8: -/* 121B8 808443C8 314B0200 */ andi $t3, $t2, 0x0200 ## $t3 = 00000000 -/* 121BC 808443CC 516000CA */ beql $t3, $zero, .L808446F8 -/* 121C0 808443D0 8FBF002C */ lw $ra, 0x002C($sp) -/* 121C4 808443D4 8E0C0680 */ lw $t4, 0x0680($s0) ## 00000680 -/* 121C8 808443D8 000C6B00 */ sll $t5, $t4, 12 -/* 121CC 808443DC 05A200C6 */ bltzl $t5, .L808446F8 -/* 121D0 808443E0 8FBF002C */ lw $ra, 0x002C($sp) -/* 121D4 808443E4 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 121D8 808443E8 3C010800 */ lui $at, 0x0800 ## $at = 08000000 -/* 121DC 808443EC 34210800 */ ori $at, $at, 0x0800 ## $at = 08000800 -/* 121E0 808443F0 01C17824 */ and $t7, $t6, $at -/* 121E4 808443F4 55E000C0 */ bnel $t7, $zero, .L808446F8 -/* 121E8 808443F8 8FBF002C */ lw $ra, 0x002C($sp) -/* 121EC 808443FC C60A0838 */ lwc1 $f10, 0x0838($s0) ## 00000838 -/* 121F0 80844400 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 121F4 80844404 460A003C */ c.lt.s $f0, $f10 -/* 121F8 80844408 00000000 */ nop -/* 121FC 8084440C 450200BA */ bc1fl .L808446F8 -/* 12200 80844410 8FBF002C */ lw $ra, 0x002C($sp) -/* 12204 80844414 44811000 */ mtc1 $at, $f2 ## $f2 = 150.00 -/* 12208 80844418 C6000884 */ lwc1 $f0, 0x0884($s0) ## 00000884 -/* 1220C 8084441C 4600103E */ c.le.s $f2, $f0 -/* 12210 80844420 00000000 */ nop -/* 12214 80844424 4502000E */ bc1fl .L80844460 -/* 12218 80844428 9209088C */ lbu $t1, 0x088C($s0) ## 0000088C -/* 1221C 8084442C 92180846 */ lbu $t8, 0x0846($s0) ## 00000846 -/* 12220 80844430 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12224 80844434 8FA50054 */ lw $a1, 0x0054($sp) -/* 12228 80844438 0218C821 */ addu $t9, $s0, $t8 -/* 1222C 8084443C 8328084B */ lb $t0, 0x084B($t9) ## 0000084B -/* 12230 80844440 3C068085 */ lui $a2, %hi(D_808535F0) ## $a2 = 80850000 -/* 12234 80844444 55000006 */ bnel $t0, $zero, .L80844460 -/* 12238 80844448 9209088C */ lbu $t1, 0x088C($s0) ## 0000088C -/* 1223C 8084444C 0C20FB06 */ jal func_8083EC18 -/* 12240 80844450 8CC635F0 */ lw $a2, %lo(D_808535F0)($a2) -/* 12244 80844454 100000A8 */ beq $zero, $zero, .L808446F8 -/* 12248 80844458 8FBF002C */ lw $ra, 0x002C($sp) -/* 1224C 8084445C 9209088C */ lbu $t1, 0x088C($s0) ## 0000088C -.L80844460: -/* 12250 80844460 29210002 */ slti $at, $t1, 0x0002 -/* 12254 80844464 542000A4 */ bnel $at, $zero, .L808446F8 -/* 12258 80844468 8FBF002C */ lw $ra, 0x002C($sp) -/* 1225C 8084446C 4602003C */ c.lt.s $f0, $f2 -/* 12260 80844470 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 12264 80844474 450200A0 */ bc1fl .L808446F8 -/* 12268 80844478 8FBF002C */ lw $ra, 0x002C($sp) -/* 1226C 8084447C 8E0A0678 */ lw $t2, 0x0678($s0) ## 00000678 -/* 12270 80844480 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 12274 80844484 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 -/* 12278 80844488 44819000 */ mtc1 $at, $f18 ## $f18 = 70.00 -/* 1227C 8084448C C5500008 */ lwc1 $f16, 0x0008($t2) ## 00000008 -/* 12280 80844490 46083281 */ sub.s $f10, $f6, $f8 -/* 12284 80844494 46109102 */ mul.s $f4, $f18, $f16 -/* 12288 80844498 46005480 */ add.s $f18, $f10, $f0 -/* 1228C 8084449C 4612203C */ c.lt.s $f4, $f18 -/* 12290 808444A0 00000000 */ nop -/* 12294 808444A4 45020094 */ bc1fl .L808446F8 -/* 12298 808444A8 8FBF002C */ lw $ra, 0x002C($sp) -/* 1229C 808444AC 0C028CC4 */ jal func_800A3310 -/* 122A0 808444B0 8FA40054 */ lw $a0, 0x0054($sp) -/* 122A4 808444B4 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 122A8 808444B8 24056819 */ addiu $a1, $zero, 0x6819 ## $a1 = 00006819 -/* 122AC 808444BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 122B0 808444C0 316C0004 */ andi $t4, $t3, 0x0004 ## $t4 = 00000000 -/* 122B4 808444C4 11800005 */ beq $t4, $zero, .L808444DC -/* 122B8 808444C8 00000000 */ nop -/* 122BC 808444CC 0C20C9A6 */ jal func_80832698 -/* 122C0 808444D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 122C4 808444D4 10000004 */ beq $zero, $zero, .L808444E8 -/* 122C8 808444D8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -.L808444DC: -/* 122CC 808444DC 0C20C9A6 */ jal func_80832698 -/* 122D0 808444E0 24056803 */ addiu $a1, $zero, 0x6803 ## $a1 = 00006803 -/* 122D4 808444E4 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -.L808444E8: -/* 122D8 808444E8 C6060884 */ lwc1 $f6, 0x0884($s0) ## 00000884 -/* 122DC 808444EC 920D015B */ lbu $t5, 0x015B($s0) ## 0000015B -/* 122E0 808444F0 3C0F8085 */ lui $t7, %hi(D_80853CBC) ## $t7 = 80850000 -/* 122E4 808444F4 46068200 */ add.s $f8, $f16, $f6 -/* 122E8 808444F8 000D7080 */ sll $t6, $t5, 2 -/* 122EC 808444FC 01EE7821 */ addu $t7, $t7, $t6 -/* 122F0 80844500 8E060074 */ lw $a2, 0x0074($s0) ## 00000074 -/* 122F4 80844504 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 122F8 80844508 8DEF3CBC */ lw $t7, %lo(D_80853CBC)($t7) -/* 122FC 8084450C 8E070888 */ lw $a3, 0x0888($s0) ## 00000888 -/* 12300 80844510 8FA40054 */ lw $a0, 0x0054($sp) -/* 12304 80844514 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 12308 80844518 0C20E971 */ jal func_8083A5C4 -/* 1230C 8084451C AFAF0010 */ sw $t7, 0x0010($sp) -/* 12310 80844520 8618083C */ lh $t8, 0x083C($s0) ## 0000083C -/* 12314 80844524 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 12318 80844528 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 1231C 8084452C 0301C821 */ addu $t9, $t8, $at -/* 12320 80844530 A619083C */ sh $t9, 0x083C($s0) ## 0000083C -/* 12324 80844534 8608083C */ lh $t0, 0x083C($s0) ## 0000083C -/* 12328 80844538 352A2000 */ ori $t2, $t1, 0x2000 ## $t2 = 00002000 -/* 1232C 8084453C AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C -/* 12330 80844540 1000006C */ beq $zero, $zero, .L808446F4 -/* 12334 80844544 A60800B6 */ sh $t0, 0x00B6($s0) ## 000000B6 -/* 12338 80844548 920B015B */ lbu $t3, 0x015B($s0) ## 0000015B -.L8084454C: -/* 1233C 8084454C 8E0D0680 */ lw $t5, 0x0680($s0) ## 00000680 -/* 12340 80844550 3C078085 */ lui $a3, %hi(D_80853A64) ## $a3 = 80850000 -/* 12344 80844554 000B6080 */ sll $t4, $t3, 2 -/* 12348 80844558 00EC3821 */ addu $a3, $a3, $t4 -/* 1234C 8084455C 000D7300 */ sll $t6, $t5, 12 -/* 12350 80844560 05C10015 */ bgez $t6, .L808445B8 -/* 12354 80844564 8CE73A64 */ lw $a3, %lo(D_80853A64)($a3) -/* 12358 80844568 0C023A71 */ jal func_8008E9C4 -/* 1235C 8084456C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12360 80844570 5040000A */ beql $v0, $zero, .L8084459C -/* 12364 80844574 8219084F */ lb $t9, 0x084F($s0) ## 0000084F -/* 12368 80844578 820F084F */ lb $t7, 0x084F($s0) ## 0000084F -/* 1236C 8084457C 3C078085 */ lui $a3, %hi(D_80853D54) ## $a3 = 80850000 -/* 12370 80844580 000FC080 */ sll $t8, $t7, 2 -/* 12374 80844584 030FC023 */ subu $t8, $t8, $t7 -/* 12378 80844588 0018C080 */ sll $t8, $t8, 2 -/* 1237C 8084458C 00F83821 */ addu $a3, $a3, $t8 -/* 12380 80844590 10000037 */ beq $zero, $zero, .L80844670 -/* 12384 80844594 8CE73D54 */ lw $a3, %lo(D_80853D54)($a3) -/* 12388 80844598 8219084F */ lb $t9, 0x084F($s0) ## 0000084F -.L8084459C: -/* 1238C 8084459C 3C078085 */ lui $a3, %hi(D_80853D50) ## $a3 = 80850000 -/* 12390 808445A0 00194080 */ sll $t0, $t9, 2 -/* 12394 808445A4 01194023 */ subu $t0, $t0, $t9 -/* 12398 808445A8 00084080 */ sll $t0, $t0, 2 -/* 1239C 808445AC 00E83821 */ addu $a3, $a3, $t0 -/* 123A0 808445B0 1000002F */ beq $zero, $zero, .L80844670 -/* 123A4 808445B4 8CE73D50 */ lw $a3, %lo(D_80853D50)($a3) -.L808445B8: -/* 123A8 808445B8 8E0A01BC */ lw $t2, 0x01BC($s0) ## 000001BC -/* 123AC 808445BC 3C090400 */ lui $t1, 0x0400 ## $t1 = 04000000 -/* 123B0 808445C0 25293148 */ addiu $t1, $t1, 0x3148 ## $t1 = 04003148 -/* 123B4 808445C4 152A0004 */ bne $t1, $t2, .L808445D8 -/* 123B8 808445C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 123BC 808445CC 3C070400 */ lui $a3, 0x0400 ## $a3 = 04000000 -/* 123C0 808445D0 10000027 */ beq $zero, $zero, .L80844670 -/* 123C4 808445D4 24E73150 */ addiu $a3, $a3, 0x3150 ## $a3 = 04003150 -.L808445D8: -/* 123C8 808445D8 0C023A71 */ jal func_8008E9C4 -/* 123CC 808445DC AFA70040 */ sw $a3, 0x0040($sp) -/* 123D0 808445E0 10400008 */ beq $v0, $zero, .L80844604 -/* 123D4 808445E4 8FA70040 */ lw $a3, 0x0040($sp) -/* 123D8 808445E8 3C070400 */ lui $a3, 0x0400 ## $a3 = 04000000 -/* 123DC 808445EC 24E72538 */ addiu $a3, $a3, 0x2538 ## $a3 = 04002538 -/* 123E0 808445F0 AFA70040 */ sw $a3, 0x0040($sp) -/* 123E4 808445F4 0C20CF0F */ jal func_80833C3C -/* 123E8 808445F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 123EC 808445FC 1000001C */ beq $zero, $zero, .L80844670 -/* 123F0 80844600 8FA70040 */ lw $a3, 0x0040($sp) -.L80844604: -/* 123F4 80844604 86020896 */ lh $v0, 0x0896($s0) ## 00000896 -/* 123F8 80844608 28410051 */ slti $at, $v0, 0x0051 -/* 123FC 8084460C 50200008 */ beql $at, $zero, .L80844630 -/* 12400 80844610 28410320 */ slti $at, $v0, 0x0320 -/* 12404 80844614 920B015B */ lbu $t3, 0x015B($s0) ## 0000015B -/* 12408 80844618 3C078085 */ lui $a3, %hi(D_80853A7C) ## $a3 = 80850000 -/* 1240C 8084461C 000B6080 */ sll $t4, $t3, 2 -/* 12410 80844620 00EC3821 */ addu $a3, $a3, $t4 -/* 12414 80844624 10000012 */ beq $zero, $zero, .L80844670 -/* 12418 80844628 8CE73A7C */ lw $a3, %lo(D_80853A7C)($a3) -/* 1241C 8084462C 28410320 */ slti $at, $v0, 0x0320 -.L80844630: -/* 12420 80844630 50200010 */ beql $at, $zero, .L80844674 -/* 12424 80844634 8FA40054 */ lw $a0, 0x0054($sp) -/* 12428 80844638 920D0846 */ lbu $t5, 0x0846($s0) ## 00000846 -/* 1242C 8084463C 020D7021 */ addu $t6, $s0, $t5 -/* 12430 80844640 81CF084B */ lb $t7, 0x084B($t6) ## 0000084B -/* 12434 80844644 55E0000B */ bnel $t7, $zero, .L80844674 -/* 12438 80844648 8FA40054 */ lw $a0, 0x0054($sp) -/* 1243C 8084464C 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 12440 80844650 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12444 80844654 33190800 */ andi $t9, $t8, 0x0800 ## $t9 = 00000000 -/* 12448 80844658 57200006 */ bnel $t9, $zero, .L80844674 -/* 1244C 8084465C 8FA40054 */ lw $a0, 0x0054($sp) -/* 12450 80844660 0C20EF01 */ jal func_8083BC04 -/* 12454 80844664 8FA50054 */ lw $a1, 0x0054($sp) -/* 12458 80844668 10000023 */ beq $zero, $zero, .L808446F8 -/* 1245C 8084466C 8FBF002C */ lw $ra, 0x002C($sp) -.L80844670: -/* 12460 80844670 8FA40054 */ lw $a0, 0x0054($sp) -.L80844674: -/* 12464 80844674 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 12468 80844678 0C210F99 */ jal func_80843E64 -/* 1246C 8084467C AFA70040 */ sw $a3, 0x0040($sp) -/* 12470 80844680 8FA70040 */ lw $a3, 0x0040($sp) -/* 12474 80844684 18400016 */ blez $v0, .L808446E0 -/* 12478 80844688 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 1247C 8084468C 9208015B */ lbu $t0, 0x015B($s0) ## 0000015B -/* 12480 80844690 3C058085 */ lui $a1, %hi(D_80853A64) ## $a1 = 80850000 -/* 12484 80844694 AFA3003C */ sw $v1, 0x003C($sp) -/* 12488 80844698 00084880 */ sll $t1, $t0, 2 -/* 1248C 8084469C 00A92821 */ addu $a1, $a1, $t1 -/* 12490 808446A0 8CA53A64 */ lw $a1, %lo(D_80853A64)($a1) -/* 12494 808446A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12498 808446A8 0C20E826 */ jal func_8083A098 -/* 1249C 808446AC 8FA60054 */ lw $a2, 0x0054($sp) -/* 124A0 808446B0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 124A4 808446B4 8FA3003C */ lw $v1, 0x003C($sp) -/* 124A8 808446B8 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 124AC 808446BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 124B0 808446C0 14610004 */ bne $v1, $at, .L808446D4 -/* 124B4 808446C4 E60A01C4 */ swc1 $f10, 0x01C4($s0) ## 000001C4 -/* 124B8 808446C8 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 124BC 808446CC 10000009 */ beq $zero, $zero, .L808446F4 -/* 124C0 808446D0 A60A0850 */ sh $t2, 0x0850($s0) ## 00000850 -.L808446D4: -/* 124C4 808446D4 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 124C8 808446D8 10000006 */ beq $zero, $zero, .L808446F4 -/* 124CC 808446DC A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 -.L808446E0: -/* 124D0 808446E0 14400004 */ bne $v0, $zero, .L808446F4 -/* 124D4 808446E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 124D8 808446E8 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 124DC 808446EC 0C20E826 */ jal func_8083A098 -/* 124E0 808446F0 8FA60054 */ lw $a2, 0x0054($sp) -.L808446F4: -/* 124E4 808446F4 8FBF002C */ lw $ra, 0x002C($sp) -.L808446F8: -/* 124E8 808446F8 8FB00028 */ lw $s0, 0x0028($sp) -/* 124EC 808446FC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 124F0 80844700 03E00008 */ jr $ra -/* 124F4 80844704 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844708.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844708.s deleted file mode 100644 index 1d2fbe2215..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844708.s +++ /dev/null @@ -1,227 +0,0 @@ -glabel func_80844708 -/* 124F8 80844708 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 124FC 8084470C AFBF0024 */ sw $ra, 0x0024($sp) -/* 12500 80844710 AFB00020 */ sw $s0, 0x0020($sp) -/* 12504 80844714 AFA50054 */ sw $a1, 0x0054($sp) -/* 12508 80844718 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1250C 8084471C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 12510 80844720 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 12514 80844724 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 12518 80844728 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1251C 8084472C AFA0004C */ sw $zero, 0x004C($sp) -/* 12520 80844730 AFA5002C */ sw $a1, 0x002C($sp) -/* 12524 80844734 0C028EF0 */ jal func_800A3BC0 -/* 12528 80844738 8FA40054 */ lw $a0, 0x0054($sp) -/* 1252C 8084473C AFA20044 */ sw $v0, 0x0044($sp) -/* 12530 80844740 8FA4002C */ lw $a0, 0x002C($sp) -/* 12534 80844744 0C02914C */ jal func_800A4530 -/* 12538 80844748 3C054100 */ lui $a1, 0x4100 ## $a1 = 41000000 -/* 1253C 8084474C 10400006 */ beq $v0, $zero, .L80844768 -/* 12540 80844750 8FA6004C */ lw $a2, 0x004C($sp) -/* 12544 80844754 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12548 80844758 2405FFF6 */ addiu $a1, $zero, 0xFFF6 ## $a1 = FFFFFFF6 -/* 1254C 8084475C 0C20DEBF */ jal func_80837AFC -/* 12550 80844760 AFA6004C */ sw $a2, 0x004C($sp) -/* 12554 80844764 8FA6004C */ lw $a2, 0x004C($sp) -.L80844768: -/* 12558 80844768 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1255C 8084476C 8FA50054 */ lw $a1, 0x0054($sp) -/* 12560 80844770 0C210A59 */ jal func_80842964 -/* 12564 80844774 AFA6004C */ sw $a2, 0x004C($sp) -/* 12568 80844778 144000AD */ bne $v0, $zero, .L80844A30 -/* 1256C 8084477C 8FA6004C */ lw $a2, 0x004C($sp) -/* 12570 80844780 86180850 */ lh $t8, 0x0850($s0) ## 00000850 -/* 12574 80844784 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 12578 80844788 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 1257C 8084478C 13000012 */ beq $t8, $zero, .L808447D8 -/* 12580 80844790 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 12584 80844794 0C01DE80 */ jal Math_ApproxF - -/* 12588 80844798 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 1258C 8084479C 8FA40054 */ lw $a0, 0x0054($sp) -/* 12590 808447A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 12594 808447A4 8FA6002C */ lw $a2, 0x002C($sp) -/* 12598 808447A8 0C20DD28 */ jal func_808374A0 -/* 1259C 808447AC 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 125A0 808447B0 504000A0 */ beql $v0, $zero, .L80844A34 -/* 125A4 808447B4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 125A8 808447B8 1C400002 */ bgtz $v0, .L808447C4 -/* 125AC 808447BC 8FB90044 */ lw $t9, 0x0044($sp) -/* 125B0 808447C0 1320009B */ beq $t9, $zero, .L80844A30 -.L808447C4: -/* 125B4 808447C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 125B8 808447C8 0C20E818 */ jal func_8083A060 -/* 125BC 808447CC 8FA50054 */ lw $a1, 0x0054($sp) -/* 125C0 808447D0 10000098 */ beq $zero, $zero, .L80844A34 -/* 125C4 808447D4 8FBF0024 */ lw $ra, 0x0024($sp) -.L808447D8: -/* 125C8 808447D8 C6040838 */ lwc1 $f4, 0x0838($s0) ## 00000838 -/* 125CC 808447DC 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 -/* 125D0 808447E0 00000000 */ nop -/* 125D4 808447E4 4604303E */ c.le.s $f6, $f4 -/* 125D8 808447E8 00000000 */ nop -/* 125DC 808447EC 45020052 */ bc1fl .L80844938 -/* 125E0 808447F0 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 125E4 808447F4 96080088 */ lhu $t0, 0x0088($s0) ## 00000088 -/* 125E8 808447F8 3C0A8085 */ lui $t2, %hi(D_8085360C) ## $t2 = 80850000 -/* 125EC 808447FC 31090200 */ andi $t1, $t0, 0x0200 ## $t1 = 00000000 -/* 125F0 80844800 51200006 */ beql $t1, $zero, .L8084481C -/* 125F4 80844804 920B04AA */ lbu $t3, 0x04AA($s0) ## 000004AA -/* 125F8 80844808 8D4A360C */ lw $t2, %lo(D_8085360C)($t2) -/* 125FC 8084480C 29412000 */ slti $at, $t2, 0x2000 -/* 12600 80844810 14200016 */ bne $at, $zero, .L8084486C -/* 12604 80844814 00000000 */ nop -/* 12608 80844818 920B04AA */ lbu $t3, 0x04AA($s0) ## 000004AA -.L8084481C: -/* 1260C 8084481C 316C0002 */ andi $t4, $t3, 0x0002 ## $t4 = 00000000 -/* 12610 80844820 51800045 */ beql $t4, $zero, .L80844938 -/* 12614 80844824 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 12618 80844828 8E0604A4 */ lw $a2, 0x04A4($s0) ## 000004A4 -/* 1261C 8084482C 24010077 */ addiu $at, $zero, 0x0077 ## $at = 00000077 -/* 12620 80844830 84CD0000 */ lh $t5, 0x0000($a2) ## 00000000 -/* 12624 80844834 55A10040 */ bnel $t5, $at, .L80844938 -/* 12628 80844838 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 1262C 8084483C 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 12630 80844840 84CF008A */ lh $t7, 0x008A($a2) ## 0000008A -/* 12634 80844844 01CF1023 */ subu $v0, $t6, $t7 -/* 12638 80844848 00021400 */ sll $v0, $v0, 16 -/* 1263C 8084484C 00021403 */ sra $v0, $v0, 16 -/* 12640 80844850 04400003 */ bltz $v0, .L80844860 -/* 12644 80844854 00021823 */ subu $v1, $zero, $v0 -/* 12648 80844858 10000001 */ beq $zero, $zero, .L80844860 -/* 1264C 8084485C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80844860: -/* 12650 80844860 28616001 */ slti $at, $v1, 0x6001 -/* 12654 80844864 54200034 */ bnel $at, $zero, .L80844938 -/* 12658 80844868 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -.L8084486C: -/* 1265C 8084486C 10C00003 */ beq $a2, $zero, .L8084487C -/* 12660 80844870 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 12664 80844874 10000010 */ beq $zero, $zero, .L808448B8 -/* 12668 80844878 A4D80016 */ sh $t8, 0x0016($a2) ## 00000016 -.L8084487C: -/* 1266C 8084487C 9205007C */ lbu $a1, 0x007C($s0) ## 0000007C -/* 12670 80844880 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 12674 80844884 8FA40054 */ lw $a0, 0x0054($sp) -/* 12678 80844888 50A1000C */ beql $a1, $at, .L808448BC -/* 1267C 8084488C 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B -/* 12680 80844890 0C00FAE1 */ jal DynaPolyInfo_GetActor - ## DynaPolyInfo_getActor -/* 12684 80844894 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 12688 80844898 50400008 */ beql $v0, $zero, .L808448BC -/* 1268C 8084489C 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B -/* 12690 808448A0 84590000 */ lh $t9, 0x0000($v0) ## 00000000 -/* 12694 808448A4 240101A0 */ addiu $at, $zero, 0x01A0 ## $at = 000001A0 -/* 12698 808448A8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 1269C 808448AC 57210003 */ bnel $t9, $at, .L808448BC -/* 126A0 808448B0 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B -/* 126A4 808448B4 A4480018 */ sh $t0, 0x0018($v0) ## 00000018 -.L808448B8: -/* 126A8 808448B8 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B -.L808448BC: -/* 126AC 808448BC 3C068085 */ lui $a2, %hi(D_80853AAC) ## $a2 = 80850000 -/* 126B0 808448C0 8FA40054 */ lw $a0, 0x0054($sp) -/* 126B4 808448C4 00095080 */ sll $t2, $t1, 2 -/* 126B8 808448C8 00CA3021 */ addu $a2, $a2, $t2 -/* 126BC 808448CC 8CC63AAC */ lw $a2, %lo(D_80853AAC)($a2) -/* 126C0 808448D0 0C20C899 */ jal func_80832264 -/* 126C4 808448D4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 126C8 808448D8 C6080838 */ lwc1 $f8, 0x0838($s0) ## 00000838 -/* 126CC 808448DC 340581F3 */ ori $a1, $zero, 0x81F3 ## $a1 = 000081F3 -/* 126D0 808448E0 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 126D4 808448E4 46004287 */ neg.s $f10, $f8 -/* 126D8 808448E8 2407000C */ addiu $a3, $zero, 0x000C ## $a3 = 0000000C -/* 126DC 808448EC E60A0838 */ swc1 $f10, 0x0838($s0) ## 00000838 -/* 126E0 808448F0 0C210A6D */ jal func_808429B4 -/* 126E4 808448F4 8FA40054 */ lw $a0, 0x0054($sp) -/* 126E8 808448F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 126EC 808448FC 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 126F0 80844900 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 126F4 80844904 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 126F8 80844908 0C20C993 */ jal func_8083264C -/* 126FC 8084490C AFA00010 */ sw $zero, 0x0010($sp) -/* 12700 80844910 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12704 80844914 0C00BDF7 */ jal func_8002F7DC -/* 12708 80844918 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E -/* 1270C 8084491C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12710 80844920 0C20C9A6 */ jal func_80832698 -/* 12714 80844924 24056804 */ addiu $a1, $zero, 0x6804 ## $a1 = 00006804 -/* 12718 80844928 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 1271C 8084492C 10000040 */ beq $zero, $zero, .L80844A30 -/* 12720 80844930 A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 -/* 12724 80844934 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -.L80844938: -/* 12728 80844938 44818000 */ mtc1 $at, $f16 ## $f16 = 15.00 -/* 1272C 8084493C C60001CC */ lwc1 $f0, 0x01CC($s0) ## 000001CC -/* 12730 80844940 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12734 80844944 4610003C */ c.lt.s $f0, $f16 -/* 12738 80844948 00000000 */ nop -/* 1273C 8084494C 45030007 */ bc1tl .L8084496C -/* 12740 80844950 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 12744 80844954 0C214089 */ jal func_80850224 -/* 12748 80844958 8FA50054 */ lw $a1, 0x0054($sp) -/* 1274C 8084495C 54400035 */ bnel $v0, $zero, .L80844A34 -/* 12750 80844960 8FBF0024 */ lw $ra, 0x0024($sp) -/* 12754 80844964 C60001CC */ lwc1 $f0, 0x01CC($s0) ## 000001CC -/* 12758 80844968 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -.L8084496C: -/* 1275C 8084496C 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 -/* 12760 80844970 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12764 80844974 27A50038 */ addiu $a1, $sp, 0x0038 ## $a1 = FFFFFFE8 -/* 12768 80844978 4600903E */ c.le.s $f18, $f0 -/* 1276C 8084497C 27A60036 */ addiu $a2, $sp, 0x0036 ## $a2 = FFFFFFE6 -/* 12770 80844980 3C073C93 */ lui $a3, 0x3C93 ## $a3 = 3C930000 -/* 12774 80844984 8FAC0054 */ lw $t4, 0x0054($sp) -/* 12778 80844988 45020007 */ bc1fl .L808449A8 -/* 1277C 8084498C 34E774BC */ ori $a3, $a3, 0x74BC ## $a3 = 3C9374BC -/* 12780 80844990 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12784 80844994 0C20E818 */ jal func_8083A060 -/* 12788 80844998 8FA50054 */ lw $a1, 0x0054($sp) -/* 1278C 8084499C 10000025 */ beq $zero, $zero, .L80844A34 -/* 12790 808449A0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 12794 808449A4 34E774BC */ ori $a3, $a3, 0x74BC ## $a3 = 000074BC -.L808449A8: -/* 12798 808449A8 0C20DC9A */ jal func_80837268 -/* 1279C 808449AC AFAC0010 */ sw $t4, 0x0010($sp) -/* 127A0 808449B0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 127A4 808449B4 44811000 */ mtc1 $at, $f2 ## $f2 = 3.00 -/* 127A8 808449B8 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 127AC 808449BC C7A00038 */ lwc1 $f0, 0x0038($sp) -/* 127B0 808449C0 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 127B4 808449C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 127B8 808449C8 46040002 */ mul.s $f0, $f0, $f4 -/* 127BC 808449CC 4602003C */ c.lt.s $f0, $f2 -/* 127C0 808449D0 00000000 */ nop -/* 127C4 808449D4 45030008 */ bc1tl .L808449F8 -/* 127C8 808449D8 E7A20038 */ swc1 $f2, 0x0038($sp) -/* 127CC 808449DC E7A00038 */ swc1 $f0, 0x0038($sp) -/* 127D0 808449E0 920D0846 */ lbu $t5, 0x0846($s0) ## 00000846 -/* 127D4 808449E4 020D7021 */ addu $t6, $s0, $t5 -/* 127D8 808449E8 81CF084B */ lb $t7, 0x084B($t6) ## 0000084B -/* 127DC 808449EC 51E00003 */ beql $t7, $zero, .L808449FC -/* 127E0 808449F0 8FA50038 */ lw $a1, 0x0038($sp) -/* 127E4 808449F4 E7A20038 */ swc1 $f2, 0x0038($sp) -.L808449F8: -/* 127E8 808449F8 8FA50038 */ lw $a1, 0x0038($sp) -.L808449FC: -/* 127EC 808449FC 0C20F7DA */ jal func_8083DF68 -/* 127F0 80844A00 860600B6 */ lh $a2, 0x00B6($s0) ## 000000B6 -/* 127F4 80844A04 8FA40054 */ lw $a0, 0x0054($sp) -/* 127F8 80844A08 0C2109A7 */ jal func_8084269C -/* 127FC 80844A0C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 12800 80844A10 10400003 */ beq $v0, $zero, .L80844A20 -/* 12804 80844A14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12808 80844A18 0C00BE3C */ jal func_8002F8F0 -/* 1280C 80844A1C 240500C1 */ addiu $a1, $zero, 0x00C1 ## $a1 = 000000C1 -.L80844A20: -/* 12810 80844A20 3C058085 */ lui $a1, %hi(D_8085460C) ## $a1 = 80850000 -/* 12814 80844A24 24A5460C */ addiu $a1, $a1, %lo(D_8085460C) ## $a1 = 8085460C -/* 12818 80844A28 0C20CA49 */ jal func_80832924 -/* 1281C 80844A2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80844A30: -/* 12820 80844A30 8FBF0024 */ lw $ra, 0x0024($sp) -.L80844A34: -/* 12824 80844A34 8FB00020 */ lw $s0, 0x0020($sp) -/* 12828 80844A38 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 1282C 80844A3C 03E00008 */ jr $ra -/* 12830 80844A40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844A44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844A44.s deleted file mode 100644 index cfa4e0a727..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844A44.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80844A44 -/* 12834 80844A44 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 12838 80844A48 AFBF002C */ sw $ra, 0x002C($sp) -/* 1283C 80844A4C AFB00028 */ sw $s0, 0x0028($sp) -/* 12840 80844A50 AFA50034 */ sw $a1, 0x0034($sp) -/* 12844 80844A54 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 12848 80844A58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1284C 80844A5C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 12850 80844A60 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 12854 80844A64 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 12858 80844A68 0C028EF0 */ jal func_800A3BC0 -/* 1285C 80844A6C 8FA40034 */ lw $a0, 0x0034($sp) -/* 12860 80844A70 10400005 */ beq $v0, $zero, .L80844A88 -/* 12864 80844A74 8FA40034 */ lw $a0, 0x0034($sp) -/* 12868 80844A78 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1286C 80844A7C 24C63160 */ addiu $a2, $a2, 0x3160 ## $a2 = 04003160 -/* 12870 80844A80 0C20C8A1 */ jal func_80832284 -/* 12874 80844A84 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L80844A88: -/* 12878 80844A88 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 1287C 80844A8C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 12880 80844A90 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 12884 80844A94 0C01DE80 */ jal Math_ApproxF - -/* 12888 80844A98 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 1288C 80844A9C 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -/* 12890 80844AA0 24080010 */ addiu $t0, $zero, 0x0010 ## $t0 = 00000010 -/* 12894 80844AA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 12898 80844AA8 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 1289C 80844AAC 1320000C */ beq $t9, $zero, .L80844AE0 -/* 128A0 80844AB0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 128A4 80844AB4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 128A8 80844AB8 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 128AC 80844ABC A20800B0 */ sb $t0, 0x00B0($s0) ## 000000B0 -/* 128B0 80844AC0 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 128B4 80844AC4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 128B8 80844AC8 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 128BC 80844ACC AFAA0018 */ sw $t2, 0x0018($sp) -/* 128C0 80844AD0 8FA40034 */ lw $a0, 0x0034($sp) -/* 128C4 80844AD4 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 128C8 80844AD8 0C20DF03 */ jal func_80837C0C -/* 128CC 80844ADC AFA90014 */ sw $t1, 0x0014($sp) -.L80844AE0: -/* 128D0 80844AE0 8FBF002C */ lw $ra, 0x002C($sp) -/* 128D4 80844AE4 8FB00028 */ lw $s0, 0x0028($sp) -/* 128D8 80844AE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 128DC 80844AEC 03E00008 */ jr $ra -/* 128E0 80844AF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844AF4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844AF4.s deleted file mode 100644 index 05a17827a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844AF4.s +++ /dev/null @@ -1,69 +0,0 @@ -.late_rodata -glabel D_80855454 - .float -1.2 - -.text -glabel func_80844AF4 -/* 128E4 80844AF4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 128E8 80844AF8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 128EC 80844AFC AFB10020 */ sw $s1, 0x0020($sp) -/* 128F0 80844B00 AFB0001C */ sw $s0, 0x001C($sp) -/* 128F4 80844B04 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 128F8 80844B08 3C018085 */ lui $at, %hi(D_80855454) ## $at = 80850000 -/* 128FC 80844B0C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 12900 80844B10 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 12904 80844B14 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 12908 80844B18 C4245454 */ lwc1 $f4, %lo(D_80855454)($at) -/* 1290C 80844B1C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 12910 80844B20 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -/* 12914 80844B24 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 12918 80844B28 0C028EF0 */ jal func_800A3BC0 -/* 1291C 80844B2C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 12920 80844B30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 12924 80844B34 0C210B7D */ jal func_80842DF4 -/* 12928 80844B38 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1292C 80844B3C 14400024 */ bne $v0, $zero, .L80844BD0 -/* 12930 80844B40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12934 80844B44 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 12938 80844B48 3C0640E0 */ lui $a2, 0x40E0 ## $a2 = 40E00000 -/* 1293C 80844B4C 0C210A17 */ jal func_8084285C -/* 12940 80844B50 3C0742C6 */ lui $a3, 0x42C6 ## $a3 = 42C60000 -/* 12944 80844B54 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -/* 12948 80844B58 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFFC -/* 1294C 80844B5C 27A6002A */ addiu $a2, $sp, 0x002A ## $a2 = FFFFFFFA -/* 12950 80844B60 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 12954 80844B64 1720000B */ bne $t9, $zero, .L80844B94 -/* 12958 80844B68 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1295C 80844B6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12960 80844B70 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 12964 80844B74 0C20DC9A */ jal func_80837268 -/* 12968 80844B78 AFB10010 */ sw $s1, 0x0010($sp) -/* 1296C 80844B7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12970 80844B80 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFFC -/* 12974 80844B84 0C20F7F8 */ jal func_8083DFE0 -/* 12978 80844B88 2606083C */ addiu $a2, $s0, 0x083C ## $a2 = 0000083C -/* 1297C 80844B8C 10000011 */ beq $zero, $zero, .L80844BD4 -/* 12980 80844B90 8FBF0024 */ lw $ra, 0x0024($sp) -.L80844B94: -/* 12984 80844B94 0C210F99 */ jal func_80843E64 -/* 12988 80844B98 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1298C 80844B9C 0442000D */ bltzl $v0, .L80844BD4 -/* 12990 80844BA0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 12994 80844BA4 82080842 */ lb $t0, 0x0842($s0) ## 00000842 -/* 12998 80844BA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1299C 80844BAC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 129A0 80844BB0 25090002 */ addiu $t1, $t0, 0x0002 ## $t1 = 00000002 -/* 129A4 80844BB4 A2090842 */ sb $t1, 0x0842($s0) ## 00000842 -/* 129A8 80844BB8 0C20DE52 */ jal func_80837948 -/* 129AC 80844BBC 82060842 */ lb $a2, 0x0842($s0) ## 00000842 -/* 129B0 80844BC0 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 129B4 80844BC4 A20A0845 */ sb $t2, 0x0845($s0) ## 00000845 -/* 129B8 80844BC8 0C20CA28 */ jal func_808328A0 -/* 129BC 80844BCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80844BD0: -/* 129C0 80844BD0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80844BD4: -/* 129C4 80844BD4 8FB0001C */ lw $s0, 0x001C($sp) -/* 129C8 80844BD8 8FB10020 */ lw $s1, 0x0020($sp) -/* 129CC 80844BDC 03E00008 */ jr $ra -/* 129D0 80844BE0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844BE4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844BE4.s deleted file mode 100644 index e701ef14aa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844BE4.s +++ /dev/null @@ -1,82 +0,0 @@ -.late_rodata -glabel D_80855458 - .float 0.85 - -.text -glabel func_80844BE4 -/* 129D4 80844BE4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 129D8 80844BE8 AFB00018 */ sw $s0, 0x0018($sp) -/* 129DC 80844BEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 129E0 80844BF0 AFBF001C */ sw $ra, 0x001C($sp) -/* 129E4 80844BF4 AFA50024 */ sw $a1, 0x0024($sp) -/* 129E8 80844BF8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 129EC 80844BFC 0C20EB75 */ jal func_8083ADD4 -/* 129F0 80844C00 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 129F4 80844C04 10400006 */ beq $v0, $zero, .L80844C20 -/* 129F8 80844C08 3C188086 */ lui $t8, %hi(D_80858AB4) ## $t8 = 80860000 -/* 129FC 80844C0C 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 -/* 12A00 80844C10 3C010002 */ lui $at, 0x0002 ## $at = 00020000 -/* 12A04 80844C14 01C17825 */ or $t7, $t6, $at ## $t7 = 00020000 -/* 12A08 80844C18 10000031 */ beq $zero, $zero, .L80844CE0 -/* 12A0C 80844C1C AE0F0680 */ sw $t7, 0x0680($s0) ## 00000680 -.L80844C20: -/* 12A10 80844C20 8F188AB4 */ lw $t8, %lo(D_80858AB4)($t8) -/* 12A14 80844C24 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 12A18 80844C28 97190000 */ lhu $t9, 0x0000($t8) ## 80860000 -/* 12A1C 80844C2C 03214027 */ nor $t0, $t9, $at -/* 12A20 80844C30 11000029 */ beq $t0, $zero, .L80844CD8 -/* 12A24 80844C34 3C018085 */ lui $at, %hi(D_80855458) ## $at = 80850000 -/* 12A28 80844C38 C6040858 */ lwc1 $f4, 0x0858($s0) ## 00000858 -/* 12A2C 80844C3C C4265458 */ lwc1 $f6, %lo(D_80855458)($at) -/* 12A30 80844C40 4604303E */ c.le.s $f6, $f4 -/* 12A34 80844C44 00000000 */ nop -/* 12A38 80844C48 45010005 */ bc1t .L80844C60 -/* 12A3C 80844C4C 00000000 */ nop -/* 12A40 80844C50 0C20DD76 */ jal func_808375D8 -/* 12A44 80844C54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12A48 80844C58 10400007 */ beq $v0, $zero, .L80844C78 -/* 12A4C 80844C5C 00000000 */ nop -.L80844C60: -/* 12A50 80844C60 0C023C68 */ jal func_8008F1A0 -/* 12A54 80844C64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12A58 80844C68 3C068085 */ lui $a2, %hi(D_80854384) ## $a2 = 80850000 -/* 12A5C 80844C6C 00C23021 */ addu $a2, $a2, $v0 -/* 12A60 80844C70 10000006 */ beq $zero, $zero, .L80844C8C -/* 12A64 80844C74 90C64384 */ lbu $a2, %lo(D_80854384)($a2) -.L80844C78: -/* 12A68 80844C78 0C023C68 */ jal func_8008F1A0 -/* 12A6C 80844C7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12A70 80844C80 3C068085 */ lui $a2, %hi(D_80854380) ## $a2 = 80850000 -/* 12A74 80844C84 00C23021 */ addu $a2, $a2, $v0 -/* 12A78 80844C88 90C64380 */ lbu $a2, %lo(D_80854380)($a2) -.L80844C8C: -/* 12A7C 80844C8C 8FA40024 */ lw $a0, 0x0024($sp) -/* 12A80 80844C90 0C20DE52 */ jal func_80837948 -/* 12A84 80844C94 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 12A88 80844C98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12A8C 80844C9C 0C20DEBF */ jal func_80837AFC -/* 12A90 80844CA0 2405FFF8 */ addiu $a1, $zero, 0xFFF8 ## $a1 = FFFFFFF8 -/* 12A94 80844CA4 8E090680 */ lw $t1, 0x0680($s0) ## 00000680 -/* 12A98 80844CA8 920B0846 */ lbu $t3, 0x0846($s0) ## 00000846 -/* 12A9C 80844CAC 3C010002 */ lui $at, 0x0002 ## $at = 00020000 -/* 12AA0 80844CB0 01215025 */ or $t2, $t1, $at ## $t2 = 00020000 -/* 12AA4 80844CB4 AE0A0680 */ sw $t2, 0x0680($s0) ## 00000680 -/* 12AA8 80844CB8 020B6021 */ addu $t4, $s0, $t3 -/* 12AAC 80844CBC 818D084B */ lb $t5, 0x084B($t4) ## 0000084B -/* 12AB0 80844CC0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 12AB4 80844CC4 01417825 */ or $t7, $t2, $at ## $t7 = 40020000 -/* 12AB8 80844CC8 55A00006 */ bnel $t5, $zero, .L80844CE4 -/* 12ABC 80844CCC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 12AC0 80844CD0 10000003 */ beq $zero, $zero, .L80844CE0 -/* 12AC4 80844CD4 AE0F0680 */ sw $t7, 0x0680($s0) ## 00000680 -.L80844CD8: -/* 12AC8 80844CD8 10000002 */ beq $zero, $zero, .L80844CE4 -/* 12ACC 80844CDC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80844CE0: -/* 12AD0 80844CE0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80844CE4: -/* 12AD4 80844CE4 8FBF001C */ lw $ra, 0x001C($sp) -/* 12AD8 80844CE8 8FB00018 */ lw $s0, 0x0018($sp) -/* 12ADC 80844CEC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 12AE0 80844CF0 03E00008 */ jr $ra -/* 12AE4 80844CF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844CF8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844CF8.s deleted file mode 100644 index 3d2f6e9ef0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844CF8.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80844CF8 -/* 12AE8 80844CF8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 12AEC 80844CFC AFA5001C */ sw $a1, 0x001C($sp) -/* 12AF0 80844D00 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 12AF4 80844D04 AFBF0014 */ sw $ra, 0x0014($sp) -/* 12AF8 80844D08 AFA40018 */ sw $a0, 0x0018($sp) -/* 12AFC 80844D0C 3C068084 */ lui $a2, %hi(func_80845000) ## $a2 = 80840000 -/* 12B00 80844D10 24C65000 */ addiu $a2, $a2, %lo(func_80845000) ## $a2 = 80845000 -/* 12B04 80844D14 8FA4001C */ lw $a0, 0x001C($sp) -/* 12B08 80844D18 0C20D716 */ jal func_80835C58 -/* 12B0C 80844D1C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 12B10 80844D20 8FBF0014 */ lw $ra, 0x0014($sp) -/* 12B14 80844D24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 12B18 80844D28 03E00008 */ jr $ra -/* 12B1C 80844D2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D30.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D30.s deleted file mode 100644 index b9a6e33bc7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D30.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80844D30 -/* 12B20 80844D30 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 12B24 80844D34 AFA5001C */ sw $a1, 0x001C($sp) -/* 12B28 80844D38 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 12B2C 80844D3C AFBF0014 */ sw $ra, 0x0014($sp) -/* 12B30 80844D40 AFA40018 */ sw $a0, 0x0018($sp) -/* 12B34 80844D44 3C068084 */ lui $a2, %hi(func_80845308) ## $a2 = 80840000 -/* 12B38 80844D48 24C65308 */ addiu $a2, $a2, %lo(func_80845308) ## $a2 = 80845308 -/* 12B3C 80844D4C 8FA4001C */ lw $a0, 0x001C($sp) -/* 12B40 80844D50 0C20D716 */ jal func_80835C58 -/* 12B44 80844D54 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 12B48 80844D58 8FBF0014 */ lw $ra, 0x0014($sp) -/* 12B4C 80844D5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 12B50 80844D60 03E00008 */ jr $ra -/* 12B54 80844D64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D68.s deleted file mode 100644 index 7dd3b084c4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D68.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80844D68 -/* 12B58 80844D68 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 12B5C 80844D6C AFBF001C */ sw $ra, 0x001C($sp) -/* 12B60 80844D70 AFB00018 */ sw $s0, 0x0018($sp) -/* 12B64 80844D74 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 12B68 80844D78 0C20E7FF */ jal func_80839FFC -/* 12B6C 80844D7C AFA50024 */ sw $a1, 0x0024($sp) -/* 12B70 80844D80 0C20C8C6 */ jal func_80832318 -/* 12B74 80844D84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12B78 80844D88 0C023C68 */ jal func_8008F1A0 -/* 12B7C 80844D8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12B80 80844D90 00027080 */ sll $t6, $v0, 2 -/* 12B84 80844D94 3C068085 */ lui $a2, %hi(D_80854368) ## $a2 = 80850000 -/* 12B88 80844D98 00CE3021 */ addu $a2, $a2, $t6 -/* 12B8C 80844D9C 8CC64368 */ lw $a2, %lo(D_80854368)($a2) -/* 12B90 80844DA0 8FA40024 */ lw $a0, 0x0024($sp) -/* 12B94 80844DA4 0C20CAC3 */ jal func_80832B0C -/* 12B98 80844DA8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 12B9C 80844DAC 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 12BA0 80844DB0 A60F083C */ sh $t7, 0x083C($s0) ## 0000083C -/* 12BA4 80844DB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 12BA8 80844DB8 8FB00018 */ lw $s0, 0x0018($sp) -/* 12BAC 80844DBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 12BB0 80844DC0 03E00008 */ jr $ra -/* 12BB4 80844DC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844DC8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844DC8.s deleted file mode 100644 index c5c362ebaf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844DC8.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80844DC8 -/* 12BB8 80844DC8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 12BBC 80844DCC AFB00018 */ sw $s0, 0x0018($sp) -/* 12BC0 80844DD0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 12BC4 80844DD4 AFBF001C */ sw $ra, 0x001C($sp) -/* 12BC8 80844DD8 AFA50024 */ sw $a1, 0x0024($sp) -/* 12BCC 80844DDC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 12BD0 80844DE0 3C068084 */ lui $a2, %hi(func_80844E68) ## $a2 = 80840000 -/* 12BD4 80844DE4 24C64E68 */ addiu $a2, $a2, %lo(func_80844E68) ## $a2 = 80844E68 -/* 12BD8 80844DE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 12BDC 80844DEC 0C20D716 */ jal func_80835C58 -/* 12BE0 80844DF0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 12BE4 80844DF4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 12BE8 80844DF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12BEC 80844DFC 0C023C68 */ jal func_8008F1A0 -/* 12BF0 80844E00 E6040868 */ swc1 $f4, 0x0868($s0) ## 00000868 -/* 12BF4 80844E04 00027080 */ sll $t6, $v0, 2 -/* 12BF8 80844E08 3C068085 */ lui $a2, %hi(D_80854360) ## $a2 = 80850000 -/* 12BFC 80844E0C 00CE3021 */ addu $a2, $a2, $t6 -/* 12C00 80844E10 8CC64360 */ lw $a2, %lo(D_80854360)($a2) -/* 12C04 80844E14 8FA40024 */ lw $a0, 0x0024($sp) -/* 12C08 80844E18 0C20C8A1 */ jal func_80832284 -/* 12C0C 80844E1C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 12C10 80844E20 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 12C14 80844E24 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 -/* 12C18 80844E28 8FBF001C */ lw $ra, 0x001C($sp) -/* 12C1C 80844E2C 8FB00018 */ lw $s0, 0x0018($sp) -/* 12C20 80844E30 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 12C24 80844E34 03E00008 */ jr $ra -/* 12C28 80844E38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E3C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E3C.s deleted file mode 100644 index ae635b003f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E3C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80844E3C -/* 12C2C 80844E3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 12C30 80844E40 AFBF0014 */ sw $ra, 0x0014($sp) -/* 12C34 80844E44 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 -/* 12C38 80844E48 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A -/* 12C3C 80844E4C 24840858 */ addiu $a0, $a0, 0x0858 ## $a0 = 00000858 -/* 12C40 80844E50 0C01DE80 */ jal Math_ApproxF - -/* 12C44 80844E54 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 12C48 80844E58 8FBF0014 */ lw $ra, 0x0014($sp) -/* 12C4C 80844E5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 12C50 80844E60 03E00008 */ jr $ra -/* 12C54 80844E64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E68.s deleted file mode 100644 index 2cc74e2c19..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E68.s +++ /dev/null @@ -1,114 +0,0 @@ -.late_rodata -glabel D_8085545C - .float 0.1 - -.text -glabel func_80844E68 -/* 12C58 80844E68 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 12C5C 80844E6C AFBF0024 */ sw $ra, 0x0024($sp) -/* 12C60 80844E70 AFB10020 */ sw $s1, 0x0020($sp) -/* 12C64 80844E74 AFB0001C */ sw $s0, 0x001C($sp) -/* 12C68 80844E78 8C8E067C */ lw $t6, 0x067C($a0) ## 0000067C -/* 12C6C 80844E7C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 12C70 80844E80 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 12C74 80844E84 35CF1000 */ ori $t7, $t6, 0x1000 ## $t7 = 00001000 -/* 12C78 80844E88 AC8F067C */ sw $t7, 0x067C($a0) ## 0000067C -/* 12C7C 80844E8C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 12C80 80844E90 0C028EF0 */ jal func_800A3BC0 -/* 12C84 80844E94 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 12C88 80844E98 10400015 */ beq $v0, $zero, .L80844EF0 -/* 12C8C 80844E9C 00000000 */ nop -/* 12C90 80844EA0 0C20CB6F */ jal func_80832DBC -/* 12C94 80844EA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12C98 80844EA8 0C20D577 */ jal func_808355DC -/* 12C9C 80844EAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12CA0 80844EB0 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 12CA4 80844EB4 3C01FFFD */ lui $at, 0xFFFD ## $at = FFFD0000 -/* 12CA8 80844EB8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFDFFFF -/* 12CAC 80844EBC 0301C824 */ and $t9, $t8, $at -/* 12CB0 80844EC0 AE19067C */ sw $t9, 0x067C($s0) ## 0000067C -/* 12CB4 80844EC4 0C023C68 */ jal func_8008F1A0 -/* 12CB8 80844EC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12CBC 80844ECC 00024080 */ sll $t0, $v0, 2 -/* 12CC0 80844ED0 3C068085 */ lui $a2, %hi(D_80854360) ## $a2 = 80850000 -/* 12CC4 80844ED4 00C83021 */ addu $a2, $a2, $t0 -/* 12CC8 80844ED8 8CC64360 */ lw $a2, %lo(D_80854360)($a2) -/* 12CCC 80844EDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 12CD0 80844EE0 0C20C8A1 */ jal func_80832284 -/* 12CD4 80844EE4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 12CD8 80844EE8 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 12CDC 80844EEC A6090850 */ sh $t1, 0x0850($s0) ## 00000850 -.L80844EF0: -/* 12CE0 80844EF0 0C20DC87 */ jal func_8083721C -/* 12CE4 80844EF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12CE8 80844EF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12CEC 80844EFC 0C210A59 */ jal func_80842964 -/* 12CF0 80844F00 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 12CF4 80844F04 5440003A */ bnel $v0, $zero, .L80844FF0 -/* 12CF8 80844F08 8FBF0024 */ lw $ra, 0x0024($sp) -/* 12CFC 80844F0C 860A0850 */ lh $t2, 0x0850($s0) ## 00000850 -/* 12D00 80844F10 51400037 */ beql $t2, $zero, .L80844FF0 -/* 12D04 80844F14 8FBF0024 */ lw $ra, 0x0024($sp) -/* 12D08 80844F18 0C21138F */ jal func_80844E3C -/* 12D0C 80844F1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12D10 80844F20 860B0850 */ lh $t3, 0x0850($s0) ## 00000850 -/* 12D14 80844F24 3C018085 */ lui $at, %hi(D_8085545C) ## $at = 80850000 -/* 12D18 80844F28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12D1C 80844F2C 05610017 */ bgez $t3, .L80844F8C -/* 12D20 80844F30 00000000 */ nop -/* 12D24 80844F34 C6040858 */ lwc1 $f4, 0x0858($s0) ## 00000858 -/* 12D28 80844F38 C426545C */ lwc1 $f6, %lo(D_8085545C)($at) -/* 12D2C 80844F3C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 12D30 80844F40 3C0D8086 */ lui $t5, %hi(D_80858AB4) ## $t5 = 80860000 -/* 12D34 80844F44 4604303E */ c.le.s $f6, $f4 -/* 12D38 80844F48 00000000 */ nop -/* 12D3C 80844F4C 45000004 */ bc1f .L80844F60 -/* 12D40 80844F50 00000000 */ nop -/* 12D44 80844F54 A2000845 */ sb $zero, 0x0845($s0) ## 00000845 -/* 12D48 80844F58 10000024 */ beq $zero, $zero, .L80844FEC -/* 12D4C 80844F5C A60C0850 */ sh $t4, 0x0850($s0) ## 00000850 -.L80844F60: -/* 12D50 80844F60 8DAD8AB4 */ lw $t5, %lo(D_80858AB4)($t5) -/* 12D54 80844F64 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 12D58 80844F68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12D5C 80844F6C 95AE0000 */ lhu $t6, 0x0000($t5) ## 80860000 -/* 12D60 80844F70 01C17827 */ nor $t7, $t6, $at -/* 12D64 80844F74 51E0001E */ beql $t7, $zero, .L80844FF0 -/* 12D68 80844F78 8FBF0024 */ lw $ra, 0x0024($sp) -/* 12D6C 80844F7C 0C21135A */ jal func_80844D68 -/* 12D70 80844F80 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 12D74 80844F84 1000001A */ beq $zero, $zero, .L80844FF0 -/* 12D78 80844F88 8FBF0024 */ lw $ra, 0x0024($sp) -.L80844F8C: -/* 12D7C 80844F8C 0C2112F9 */ jal func_80844BE4 -/* 12D80 80844F90 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 12D84 80844F94 14400015 */ bne $v0, $zero, .L80844FEC -/* 12D88 80844F98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12D8C 80844F9C 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 12D90 80844FA0 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 12D94 80844FA4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 12D98 80844FA8 0C20DC9A */ jal func_80837268 -/* 12D9C 80844FAC AFB10010 */ sw $s1, 0x0010($sp) -/* 12DA0 80844FB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12DA4 80844FB4 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 12DA8 80844FB8 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 12DAC 80844FBC 0C210016 */ jal func_80840058 -/* 12DB0 80844FC0 02203825 */ or $a3, $s1, $zero ## $a3 = 00000000 -/* 12DB4 80844FC4 18400005 */ blez $v0, .L80844FDC -/* 12DB8 80844FC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12DBC 80844FCC 0C21133E */ jal func_80844CF8 -/* 12DC0 80844FD0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 12DC4 80844FD4 10000006 */ beq $zero, $zero, .L80844FF0 -/* 12DC8 80844FD8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80844FDC: -/* 12DCC 80844FDC 04410003 */ bgez $v0, .L80844FEC -/* 12DD0 80844FE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12DD4 80844FE4 0C21134C */ jal func_80844D30 -/* 12DD8 80844FE8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L80844FEC: -/* 12DDC 80844FEC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80844FF0: -/* 12DE0 80844FF0 8FB0001C */ lw $s0, 0x001C($sp) -/* 12DE4 80844FF4 8FB10020 */ lw $s1, 0x0020($sp) -/* 12DE8 80844FF8 03E00008 */ jr $ra -/* 12DEC 80844FFC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845000.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845000.s deleted file mode 100644 index 58bc396565..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845000.s +++ /dev/null @@ -1,220 +0,0 @@ -.late_rodata -glabel D_80855460 - .word 0x3F39611A -glabel D_80855464 - .float 0.2 - -glabel D_80855468 - .float 0.1 - -.text -glabel func_80845000 -/* 12DF0 80845000 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 12DF4 80845004 AFBF002C */ sw $ra, 0x002C($sp) -/* 12DF8 80845008 AFB00028 */ sw $s0, 0x0028($sp) -/* 12DFC 8084500C AFA5006C */ sw $a1, 0x006C($sp) -/* 12E00 80845010 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 12E04 80845014 848E083C */ lh $t6, 0x083C($a0) ## 0000083C -/* 12E08 80845018 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 12E0C 8084501C 01CF1023 */ subu $v0, $t6, $t7 -/* 12E10 80845020 00021400 */ sll $v0, $v0, 16 -/* 12E14 80845024 00021403 */ sra $v0, $v0, 16 -/* 12E18 80845028 04400003 */ bltz $v0, .L80845038 -/* 12E1C 8084502C 00021823 */ subu $v1, $zero, $v0 -/* 12E20 80845030 10000001 */ beq $zero, $zero, .L80845038 -/* 12E24 80845034 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80845038: -/* 12E28 80845038 C6000838 */ lwc1 $f0, 0x0838($s0) ## 00000838 -/* 12E2C 8084503C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 12E30 80845040 44817000 */ mtc1 $at, $f14 ## $f14 = 1.50 -/* 12E34 80845044 46000405 */ abs.s $f16, $f0 -/* 12E38 80845048 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 12E3C 8084504C 460E8302 */ mul.s $f12, $f16, $f14 -/* 12E40 80845050 28614000 */ slti $at, $v1, 0x4000 -/* 12E44 80845054 37191000 */ ori $t9, $t8, 0x1000 ## $t9 = 00001000 -/* 12E48 80845058 AE19067C */ sw $t9, 0x067C($s0) ## 0000067C -/* 12E4C 8084505C 460E603C */ c.lt.s $f12, $f14 -/* 12E50 80845060 00000000 */ nop -/* 12E54 80845064 45000002 */ bc1f .L80845070 -/* 12E58 80845068 00000000 */ nop -/* 12E5C 8084506C 46007306 */ mov.s $f12, $f14 -.L80845070: -/* 12E60 80845070 10200004 */ beq $at, $zero, .L80845084 -/* 12E64 80845074 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 12E68 80845078 44810000 */ mtc1 $at, $f0 ## $f0 = -1.00 -/* 12E6C 8084507C 10000004 */ beq $zero, $zero, .L80845090 -/* 12E70 80845080 00000000 */ nop -.L80845084: -/* 12E74 80845084 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 12E78 80845088 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 12E7C 8084508C 00000000 */ nop -.L80845090: -/* 12E80 80845090 460C0302 */ mul.s $f12, $f0, $f12 -/* 12E84 80845094 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12E88 80845098 E7B0005C */ swc1 $f16, 0x005C($sp) -/* 12E8C 8084509C 44056000 */ mfc1 $a1, $f12 -/* 12E90 808450A0 0C2100A7 */ jal func_8084029C -/* 12E94 808450A4 00000000 */ nop -/* 12E98 808450A8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 12E9C 808450AC 44817000 */ mtc1 $at, $f14 ## $f14 = 0.50 -/* 12EA0 808450B0 C7B0005C */ lwc1 $f16, 0x005C($sp) -/* 12EA4 808450B4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 12EA8 808450B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12EAC 808450BC 460E8082 */ mul.s $f2, $f16, $f14 -/* 12EB0 808450C0 460E103C */ c.lt.s $f2, $f14 -/* 12EB4 808450C4 00000000 */ nop -/* 12EB8 808450C8 45020004 */ bc1fl .L808450DC -/* 12EBC 808450CC 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 12EC0 808450D0 1000000C */ beq $zero, $zero, .L80845104 -/* 12EC4 808450D4 46007306 */ mov.s $f12, $f14 -/* 12EC8 808450D8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -.L808450DC: -/* 12ECC 808450DC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 12ED0 808450E0 4602203C */ c.lt.s $f4, $f2 -/* 12ED4 808450E4 00000000 */ nop -/* 12ED8 808450E8 45020005 */ bc1fl .L80845100 -/* 12EDC 808450EC 46001006 */ mov.s $f0, $f2 -/* 12EE0 808450F0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 12EE4 808450F4 10000003 */ beq $zero, $zero, .L80845104 -/* 12EE8 808450F8 46000306 */ mov.s $f12, $f0 -/* 12EEC 808450FC 46001006 */ mov.s $f0, $f2 -.L80845100: -/* 12EF0 80845100 46000306 */ mov.s $f12, $f0 -.L80845104: -/* 12EF4 80845104 0C023C68 */ jal func_8008F1A0 -/* 12EF8 80845108 E7AC0058 */ swc1 $f12, 0x0058($sp) -/* 12EFC 8084510C AFA20038 */ sw $v0, 0x0038($sp) -/* 12F00 80845110 0C023C68 */ jal func_8008F1A0 -/* 12F04 80845114 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12F08 80845118 00025080 */ sll $t2, $v0, 2 -/* 12F0C 8084511C 3C0B8085 */ lui $t3, %hi(D_80854370) ## $t3 = 80850000 -/* 12F10 80845120 016A5821 */ addu $t3, $t3, $t2 -/* 12F14 80845124 8D6B4370 */ lw $t3, %lo(D_80854370)($t3) -/* 12F18 80845128 3C018085 */ lui $at, %hi(D_80855460) ## $at = 80850000 -/* 12F1C 8084512C C4285460 */ lwc1 $f8, %lo(D_80855460)($at) -/* 12F20 80845130 AFAB0010 */ sw $t3, 0x0010($sp) -/* 12F24 80845134 C6060868 */ lwc1 $f6, 0x0868($s0) ## 00000868 -/* 12F28 80845138 8FA80038 */ lw $t0, 0x0038($sp) -/* 12F2C 8084513C C7AC0058 */ lwc1 $f12, 0x0058($sp) -/* 12F30 80845140 46083282 */ mul.s $f10, $f6, $f8 -/* 12F34 80845144 3C068085 */ lui $a2, %hi(D_80854360) ## $a2 = 80850000 -/* 12F38 80845148 00084880 */ sll $t1, $t0, 2 -/* 12F3C 8084514C 00C93021 */ addu $a2, $a2, $t1 -/* 12F40 80845150 260C0318 */ addiu $t4, $s0, 0x0318 ## $t4 = 00000318 -/* 12F44 80845154 AFAC001C */ sw $t4, 0x001C($sp) -/* 12F48 80845158 8CC64360 */ lw $a2, %lo(D_80854360)($a2) -/* 12F4C 8084515C E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 12F50 80845160 8FA4006C */ lw $a0, 0x006C($sp) -/* 12F54 80845164 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 12F58 80845168 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 12F5C 8084516C 0C0290C7 */ jal func_800A431C -/* 12F60 80845170 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 12F64 80845174 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12F68 80845178 0C210A59 */ jal func_80842964 -/* 12F6C 8084517C 8FA5006C */ lw $a1, 0x006C($sp) -/* 12F70 80845180 1440005C */ bne $v0, $zero, .L808452F4 -/* 12F74 80845184 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12F78 80845188 0C2112F9 */ jal func_80844BE4 -/* 12F7C 8084518C 8FA5006C */ lw $a1, 0x006C($sp) -/* 12F80 80845190 54400059 */ bnel $v0, $zero, .L808452F8 -/* 12F84 80845194 8FBF002C */ lw $ra, 0x002C($sp) -/* 12F88 80845198 0C21138F */ jal func_80844E3C -/* 12F8C 8084519C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12F90 808451A0 8FAD006C */ lw $t5, 0x006C($sp) -/* 12F94 808451A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12F98 808451A8 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFEC -/* 12F9C 808451AC 27A60052 */ addiu $a2, $sp, 0x0052 ## $a2 = FFFFFFEA -/* 12FA0 808451B0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 12FA4 808451B4 0C20DC9A */ jal func_80837268 -/* 12FA8 808451B8 AFAD0010 */ sw $t5, 0x0010($sp) -/* 12FAC 808451BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12FB0 808451C0 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFEC -/* 12FB4 808451C4 27A60052 */ addiu $a2, $sp, 0x0052 ## $a2 = FFFFFFEA -/* 12FB8 808451C8 0C210016 */ jal func_80840058 -/* 12FBC 808451CC 8FA7006C */ lw $a3, 0x006C($sp) -/* 12FC0 808451D0 04410005 */ bgez $v0, .L808451E8 -/* 12FC4 808451D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12FC8 808451D8 0C21134C */ jal func_80844D30 -/* 12FCC 808451DC 8FA5006C */ lw $a1, 0x006C($sp) -/* 12FD0 808451E0 10000045 */ beq $zero, $zero, .L808452F8 -/* 12FD4 808451E4 8FBF002C */ lw $ra, 0x002C($sp) -.L808451E8: -/* 12FD8 808451E8 14400006 */ bne $v0, $zero, .L80845204 -/* 12FDC 808451EC 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 12FE0 808451F0 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 12FE4 808451F4 00000000 */ nop -/* 12FE8 808451F8 E7B20054 */ swc1 $f18, 0x0054($sp) -/* 12FEC 808451FC 860E083C */ lh $t6, 0x083C($s0) ## 0000083C -/* 12FF0 80845200 A7AE0052 */ sh $t6, 0x0052($sp) -.L80845204: -/* 12FF4 80845204 87AF0052 */ lh $t7, 0x0052($sp) -/* 12FF8 80845208 8618083C */ lh $t8, 0x083C($s0) ## 0000083C -/* 12FFC 8084520C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 13000 80845210 C7A40054 */ lwc1 $f4, 0x0054($sp) -/* 13004 80845214 01F81023 */ subu $v0, $t7, $t8 -/* 13008 80845218 00021400 */ sll $v0, $v0, 16 -/* 1300C 8084521C 00021403 */ sra $v0, $v0, 16 -/* 13010 80845220 04400003 */ bltz $v0, .L80845230 -/* 13014 80845224 00021823 */ subu $v1, $zero, $v0 -/* 13018 80845228 10000001 */ beq $zero, $zero, .L80845230 -/* 1301C 8084522C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80845230: -/* 13020 80845230 28614001 */ slti $at, $v1, 0x4001 -/* 13024 80845234 14200007 */ bne $at, $zero, .L80845254 -/* 13028 80845238 00000000 */ nop -/* 1302C 8084523C 0C01DE80 */ jal Math_ApproxF - -/* 13030 80845240 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 13034 80845244 1040002B */ beq $v0, $zero, .L808452F4 -/* 13038 80845248 87B90052 */ lh $t9, 0x0052($sp) -/* 1303C 8084524C 10000029 */ beq $zero, $zero, .L808452F4 -/* 13040 80845250 A619083C */ sh $t9, 0x083C($s0) ## 0000083C -.L80845254: -/* 13044 80845254 3C018085 */ lui $at, %hi(D_80855464) ## $at = 80850000 -/* 13048 80845258 C4265464 */ lwc1 $f6, %lo(D_80855464)($at) -/* 1304C 8084525C 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 13050 80845260 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 13054 80845264 46062202 */ mul.s $f8, $f4, $f6 -/* 13058 80845268 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 1305C 8084526C AFA30044 */ sw $v1, 0x0044($sp) -/* 13060 80845270 44054000 */ mfc1 $a1, $f8 -/* 13064 80845274 0C01DF1B */ jal func_80077C6C -/* 13068 80845278 00000000 */ nop -/* 1306C 8084527C 8FA30044 */ lw $v1, 0x0044($sp) -/* 13070 80845280 3C018085 */ lui $at, %hi(D_80855468) ## $at = 80850000 -/* 13074 80845284 C4245468 */ lwc1 $f4, %lo(D_80855468)($at) -/* 13078 80845288 44835000 */ mtc1 $v1, $f10 ## $f10 = 0.00 -/* 1307C 8084528C 2604083C */ addiu $a0, $s0, 0x083C ## $a0 = 0000083C -/* 13080 80845290 87A50052 */ lh $a1, 0x0052($sp) -/* 13084 80845294 468054A0 */ cvt.s.w $f18, $f10 -/* 13088 80845298 46049182 */ mul.s $f6, $f18, $f4 -/* 1308C 8084529C 4600320D */ trunc.w.s $f8, $f6 -/* 13090 808452A0 44064000 */ mfc1 $a2, $f8 -/* 13094 808452A4 00000000 */ nop -/* 13098 808452A8 00063400 */ sll $a2, $a2, 16 -/* 1309C 808452AC 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 130A0 808452B0 00063403 */ sra $a2, $a2, 16 -/* 130A4 808452B4 C7AA0054 */ lwc1 $f10, 0x0054($sp) -/* 130A8 808452B8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 130AC 808452BC 00000000 */ nop -/* 130B0 808452C0 46125032 */ c.eq.s $f10, $f18 -/* 130B4 808452C4 00000000 */ nop -/* 130B8 808452C8 4502000B */ bc1fl .L808452F8 -/* 130BC 808452CC 8FBF002C */ lw $ra, 0x002C($sp) -/* 130C0 808452D0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 130C4 808452D4 C6060838 */ lwc1 $f6, 0x0838($s0) ## 00000838 -/* 130C8 808452D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 130CC 808452DC 46062032 */ c.eq.s $f4, $f6 -/* 130D0 808452E0 00000000 */ nop -/* 130D4 808452E4 45020004 */ bc1fl .L808452F8 -/* 130D8 808452E8 8FBF002C */ lw $ra, 0x002C($sp) -/* 130DC 808452EC 0C211372 */ jal func_80844DC8 -/* 130E0 808452F0 8FA5006C */ lw $a1, 0x006C($sp) -.L808452F4: -/* 130E4 808452F4 8FBF002C */ lw $ra, 0x002C($sp) -.L808452F8: -/* 130E8 808452F8 8FB00028 */ lw $s0, 0x0028($sp) -/* 130EC 808452FC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 130F0 80845300 03E00008 */ jr $ra -/* 130F4 80845304 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845308.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845308.s deleted file mode 100644 index 5b37fbb437..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845308.s +++ /dev/null @@ -1,247 +0,0 @@ -.late_rodata -glabel D_8085546C - .float 0.0015 - -glabel D_80855470 - .word 0x3F39611A -glabel D_80855474 - .float 0.2 - -glabel D_80855478 - .float 0.1 - -.text -glabel func_80845308 -/* 130F8 80845308 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 130FC 8084530C AFBF002C */ sw $ra, 0x002C($sp) -/* 13100 80845310 AFB00028 */ sw $s0, 0x0028($sp) -/* 13104 80845314 AFA50064 */ sw $a1, 0x0064($sp) -/* 13108 80845318 C4800838 */ lwc1 $f0, 0x0838($a0) ## 00000838 -/* 1310C 8084531C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 13110 80845320 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 13114 80845324 46000005 */ abs.s $f0, $f0 -/* 13118 80845328 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 1311C 8084532C E7A0005C */ swc1 $f0, 0x005C($sp) -/* 13120 80845330 46100032 */ c.eq.s $f0, $f16 -/* 13124 80845334 8C8E067C */ lw $t6, 0x067C($a0) ## 0000067C -/* 13128 80845338 35CF1000 */ ori $t7, $t6, 0x1000 ## $t7 = 00001000 -/* 1312C 8084533C 45000021 */ bc1f .L808453C4 -/* 13130 80845340 AC8F067C */ sw $t7, 0x067C($a0) ## 0000067C -/* 13134 80845344 8483087C */ lh $v1, 0x087C($a0) ## 0000087C -/* 13138 80845348 04600003 */ bltz $v1, .L80845358 -/* 1313C 8084534C 00031023 */ subu $v0, $zero, $v1 -/* 13140 80845350 10000001 */ beq $zero, $zero, .L80845358 -/* 13144 80845354 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80845358: -/* 13148 80845358 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 1314C 8084535C 3C018085 */ lui $at, %hi(D_8085546C) ## $at = 80850000 -/* 13150 80845360 C428546C */ lwc1 $f8, %lo(D_8085546C)($at) -/* 13154 80845364 468021A0 */ cvt.s.w $f6, $f4 -/* 13158 80845368 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 1315C 8084536C 44815000 */ mtc1 $at, $f10 ## $f10 = 400.00 -/* 13160 80845370 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 13164 80845374 46083082 */ mul.s $f2, $f6, $f8 -/* 13168 80845378 460A103C */ c.lt.s $f2, $f10 -/* 1316C 8084537C 00000000 */ nop -/* 13170 80845380 45000002 */ bc1f .L8084538C -/* 13174 80845384 00000000 */ nop -/* 13178 80845388 46008086 */ mov.s $f2, $f16 -.L8084538C: -/* 1317C 8084538C 04600003 */ bltz $v1, .L8084539C -/* 13180 80845390 00000000 */ nop -/* 13184 80845394 10000001 */ beq $zero, $zero, .L8084539C -/* 13188 80845398 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8084539C: -/* 1318C 8084539C 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 13190 808453A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13194 808453A4 E7A2005C */ swc1 $f2, 0x005C($sp) -/* 13198 808453A8 46809120 */ cvt.s.w $f4, $f18 -/* 1319C 808453AC 46022182 */ mul.s $f6, $f4, $f2 -/* 131A0 808453B0 44053000 */ mfc1 $a1, $f6 -/* 131A4 808453B4 0C2100A7 */ jal func_8084029C -/* 131A8 808453B8 00000000 */ nop -/* 131AC 808453BC 1000000D */ beq $zero, $zero, .L808453F4 -/* 131B0 808453C0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -.L808453C4: -/* 131B4 808453C4 44817000 */ mtc1 $at, $f14 ## $f14 = 0.50 -/* 131B8 808453C8 00000000 */ nop -/* 131BC 808453CC 460E0302 */ mul.s $f12, $f0, $f14 -/* 131C0 808453D0 460E603C */ c.lt.s $f12, $f14 -/* 131C4 808453D4 00000000 */ nop -/* 131C8 808453D8 45020003 */ bc1fl .L808453E8 -/* 131CC 808453DC 44056000 */ mfc1 $a1, $f12 -/* 131D0 808453E0 46007306 */ mov.s $f12, $f14 -/* 131D4 808453E4 44056000 */ mfc1 $a1, $f12 -.L808453E8: -/* 131D8 808453E8 0C2100A7 */ jal func_8084029C -/* 131DC 808453EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 131E0 808453F0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -.L808453F4: -/* 131E4 808453F4 44817000 */ mtc1 $at, $f14 ## $f14 = 0.50 -/* 131E8 808453F8 C7A8005C */ lwc1 $f8, 0x005C($sp) -/* 131EC 808453FC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 131F0 80845400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 131F4 80845404 460E4002 */ mul.s $f0, $f8, $f14 -/* 131F8 80845408 460E003C */ c.lt.s $f0, $f14 -/* 131FC 8084540C 00000000 */ nop -/* 13200 80845410 45020004 */ bc1fl .L80845424 -/* 13204 80845414 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 13208 80845418 1000000C */ beq $zero, $zero, .L8084544C -/* 1320C 8084541C 46007306 */ mov.s $f12, $f14 -/* 13210 80845420 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -.L80845424: -/* 13214 80845424 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 13218 80845428 4600503C */ c.lt.s $f10, $f0 -/* 1321C 8084542C 00000000 */ nop -/* 13220 80845430 45020005 */ bc1fl .L80845448 -/* 13224 80845434 46000086 */ mov.s $f2, $f0 -/* 13228 80845438 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 1322C 8084543C 10000003 */ beq $zero, $zero, .L8084544C -/* 13230 80845440 46001306 */ mov.s $f12, $f2 -/* 13234 80845444 46000086 */ mov.s $f2, $f0 -.L80845448: -/* 13238 80845448 46001306 */ mov.s $f12, $f2 -.L8084544C: -/* 1323C 8084544C 0C023C68 */ jal func_8008F1A0 -/* 13240 80845450 E7AC0058 */ swc1 $f12, 0x0058($sp) -/* 13244 80845454 AFA20038 */ sw $v0, 0x0038($sp) -/* 13248 80845458 0C023C68 */ jal func_8008F1A0 -/* 1324C 8084545C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13250 80845460 00024080 */ sll $t0, $v0, 2 -/* 13254 80845464 3C098085 */ lui $t1, %hi(D_80854378) ## $t1 = 80850000 -/* 13258 80845468 01284821 */ addu $t1, $t1, $t0 -/* 1325C 8084546C 8D294378 */ lw $t1, %lo(D_80854378)($t1) -/* 13260 80845470 3C018085 */ lui $at, %hi(D_80855470) ## $at = 80850000 -/* 13264 80845474 C4245470 */ lwc1 $f4, %lo(D_80855470)($at) -/* 13268 80845478 AFA90010 */ sw $t1, 0x0010($sp) -/* 1326C 8084547C C6120868 */ lwc1 $f18, 0x0868($s0) ## 00000868 -/* 13270 80845480 8FB80038 */ lw $t8, 0x0038($sp) -/* 13274 80845484 C7AC0058 */ lwc1 $f12, 0x0058($sp) -/* 13278 80845488 46049182 */ mul.s $f6, $f18, $f4 -/* 1327C 8084548C 3C068085 */ lui $a2, %hi(D_80854360) ## $a2 = 80850000 -/* 13280 80845490 0018C880 */ sll $t9, $t8, 2 -/* 13284 80845494 00D93021 */ addu $a2, $a2, $t9 -/* 13288 80845498 260A0318 */ addiu $t2, $s0, 0x0318 ## $t2 = 00000318 -/* 1328C 8084549C AFAA001C */ sw $t2, 0x001C($sp) -/* 13290 808454A0 8CC64360 */ lw $a2, %lo(D_80854360)($a2) -/* 13294 808454A4 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 13298 808454A8 8FA40064 */ lw $a0, 0x0064($sp) -/* 1329C 808454AC 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 132A0 808454B0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 132A4 808454B4 0C0290C7 */ jal func_800A431C -/* 132A8 808454B8 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 132AC 808454BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 132B0 808454C0 0C210A59 */ jal func_80842964 -/* 132B4 808454C4 8FA50064 */ lw $a1, 0x0064($sp) -/* 132B8 808454C8 14400062 */ bne $v0, $zero, .L80845654 -/* 132BC 808454CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 132C0 808454D0 0C2112F9 */ jal func_80844BE4 -/* 132C4 808454D4 8FA50064 */ lw $a1, 0x0064($sp) -/* 132C8 808454D8 5440005F */ bnel $v0, $zero, .L80845658 -/* 132CC 808454DC 8FBF002C */ lw $ra, 0x002C($sp) -/* 132D0 808454E0 0C21138F */ jal func_80844E3C -/* 132D4 808454E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 132D8 808454E8 8FAB0064 */ lw $t3, 0x0064($sp) -/* 132DC 808454EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 132E0 808454F0 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFF4 -/* 132E4 808454F4 27A60052 */ addiu $a2, $sp, 0x0052 ## $a2 = FFFFFFF2 -/* 132E8 808454F8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 132EC 808454FC 0C20DC9A */ jal func_80837268 -/* 132F0 80845500 AFAB0010 */ sw $t3, 0x0010($sp) -/* 132F4 80845504 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 132F8 80845508 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFF4 -/* 132FC 8084550C 27A60052 */ addiu $a2, $sp, 0x0052 ## $a2 = FFFFFFF2 -/* 13300 80845510 0C210016 */ jal func_80840058 -/* 13304 80845514 8FA70064 */ lw $a3, 0x0064($sp) -/* 13308 80845518 18400005 */ blez $v0, .L80845530 -/* 1330C 8084551C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13310 80845520 0C21133E */ jal func_80844CF8 -/* 13314 80845524 8FA50064 */ lw $a1, 0x0064($sp) -/* 13318 80845528 1000004B */ beq $zero, $zero, .L80845658 -/* 1331C 8084552C 8FBF002C */ lw $ra, 0x002C($sp) -.L80845530: -/* 13320 80845530 14400006 */ bne $v0, $zero, .L8084554C -/* 13324 80845534 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 13328 80845538 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 1332C 8084553C 00000000 */ nop -/* 13330 80845540 E7A80054 */ swc1 $f8, 0x0054($sp) -/* 13334 80845544 860C083C */ lh $t4, 0x083C($s0) ## 0000083C -/* 13338 80845548 A7AC0052 */ sh $t4, 0x0052($sp) -.L8084554C: -/* 1333C 8084554C 87AD0052 */ lh $t5, 0x0052($sp) -/* 13340 80845550 860E083C */ lh $t6, 0x083C($s0) ## 0000083C -/* 13344 80845554 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 13348 80845558 C7AA0054 */ lwc1 $f10, 0x0054($sp) -/* 1334C 8084555C 01AE1023 */ subu $v0, $t5, $t6 -/* 13350 80845560 00021400 */ sll $v0, $v0, 16 -/* 13354 80845564 00021403 */ sra $v0, $v0, 16 -/* 13358 80845568 04400003 */ bltz $v0, .L80845578 -/* 1335C 8084556C 00021823 */ subu $v1, $zero, $v0 -/* 13360 80845570 10000001 */ beq $zero, $zero, .L80845578 -/* 13364 80845574 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80845578: -/* 13368 80845578 28614001 */ slti $at, $v1, 0x4001 -/* 1336C 8084557C 14200007 */ bne $at, $zero, .L8084559C -/* 13370 80845580 00000000 */ nop -/* 13374 80845584 0C01DE80 */ jal Math_ApproxF - -/* 13378 80845588 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 1337C 8084558C 10400031 */ beq $v0, $zero, .L80845654 -/* 13380 80845590 87AF0052 */ lh $t7, 0x0052($sp) -/* 13384 80845594 1000002F */ beq $zero, $zero, .L80845654 -/* 13388 80845598 A60F083C */ sh $t7, 0x083C($s0) ## 0000083C -.L8084559C: -/* 1338C 8084559C 3C018085 */ lui $at, %hi(D_80855474) ## $at = 80850000 -/* 13390 808455A0 C4325474 */ lwc1 $f18, %lo(D_80855474)($at) -/* 13394 808455A4 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 13398 808455A8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 1339C 808455AC 46125102 */ mul.s $f4, $f10, $f18 -/* 133A0 808455B0 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 133A4 808455B4 AFA30044 */ sw $v1, 0x0044($sp) -/* 133A8 808455B8 44052000 */ mfc1 $a1, $f4 -/* 133AC 808455BC 0C01DF1B */ jal func_80077C6C -/* 133B0 808455C0 00000000 */ nop -/* 133B4 808455C4 8FA30044 */ lw $v1, 0x0044($sp) -/* 133B8 808455C8 3C018085 */ lui $at, %hi(D_80855478) ## $at = 80850000 -/* 133BC 808455CC C42A5478 */ lwc1 $f10, %lo(D_80855478)($at) -/* 133C0 808455D0 44833000 */ mtc1 $v1, $f6 ## $f6 = 0.00 -/* 133C4 808455D4 2604083C */ addiu $a0, $s0, 0x083C ## $a0 = 0000083C -/* 133C8 808455D8 87A50052 */ lh $a1, 0x0052($sp) -/* 133CC 808455DC 46803220 */ cvt.s.w $f8, $f6 -/* 133D0 808455E0 460A4482 */ mul.s $f18, $f8, $f10 -/* 133D4 808455E4 4600910D */ trunc.w.s $f4, $f18 -/* 133D8 808455E8 44062000 */ mfc1 $a2, $f4 -/* 133DC 808455EC 00000000 */ nop -/* 133E0 808455F0 00063400 */ sll $a2, $a2, 16 -/* 133E4 808455F4 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 133E8 808455F8 00063403 */ sra $a2, $a2, 16 -/* 133EC 808455FC C7A60054 */ lwc1 $f6, 0x0054($sp) -/* 133F0 80845600 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 133F4 80845604 00000000 */ nop -/* 133F8 80845608 46083032 */ c.eq.s $f6, $f8 -/* 133FC 8084560C 00000000 */ nop -/* 13400 80845610 45020011 */ bc1fl .L80845658 -/* 13404 80845614 8FBF002C */ lw $ra, 0x002C($sp) -/* 13408 80845618 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 1340C 8084561C C6120838 */ lwc1 $f18, 0x0838($s0) ## 00000838 -/* 13410 80845620 C7A4005C */ lwc1 $f4, 0x005C($sp) -/* 13414 80845624 46125032 */ c.eq.s $f10, $f18 -/* 13418 80845628 00000000 */ nop -/* 1341C 8084562C 4502000A */ bc1fl .L80845658 -/* 13420 80845630 8FBF002C */ lw $ra, 0x002C($sp) -/* 13424 80845634 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 13428 80845638 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1342C 8084563C 46062032 */ c.eq.s $f4, $f6 -/* 13430 80845640 00000000 */ nop -/* 13434 80845644 45020004 */ bc1fl .L80845658 -/* 13438 80845648 8FBF002C */ lw $ra, 0x002C($sp) -/* 1343C 8084564C 0C211372 */ jal func_80844DC8 -/* 13440 80845650 8FA50064 */ lw $a1, 0x0064($sp) -.L80845654: -/* 13444 80845654 8FBF002C */ lw $ra, 0x002C($sp) -.L80845658: -/* 13448 80845658 8FB00028 */ lw $s0, 0x0028($sp) -/* 1344C 8084565C 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 13450 80845660 03E00008 */ jr $ra -/* 13454 80845664 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845668.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845668.s deleted file mode 100644 index 361a58c751..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845668.s +++ /dev/null @@ -1,181 +0,0 @@ -.late_rodata -glabel D_8085547C - .word 0x3DAE147B -glabel D_80855480 - .word 0x3D9374BC - -.text -glabel func_80845668 -/* 13458 80845668 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 1345C 8084566C AFBF0024 */ sw $ra, 0x0024($sp) -/* 13460 80845670 AFB00020 */ sw $s0, 0x0020($sp) -/* 13464 80845674 AFA50044 */ sw $a1, 0x0044($sp) -/* 13468 80845678 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1346C 8084567C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 13470 80845680 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 13474 80845684 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 13478 80845688 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1347C 8084568C AFA5002C */ sw $a1, 0x002C($sp) -/* 13480 80845690 0C028EF0 */ jal func_800A3BC0 -/* 13484 80845694 8FA40044 */ lw $a0, 0x0044($sp) -/* 13488 80845698 8E1901BC */ lw $t9, 0x01BC($s0) ## 000001BC -/* 1348C 8084569C 3C180400 */ lui $t8, 0x0400 ## $t8 = 04000000 -/* 13490 808456A0 27182D48 */ addiu $t8, $t8, 0x2D48 ## $t8 = 04002D48 -/* 13494 808456A4 1719002E */ bne $t8, $t9, .L80845760 -/* 13498 808456A8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 1349C 808456AC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 134A0 808456B0 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 134A4 808456B4 3C054100 */ lui $a1, 0x4100 ## $a1 = 41000000 -/* 134A8 808456B8 E6040838 */ swc1 $f4, 0x0838($s0) ## 00000838 -/* 134AC 808456BC 0C02914C */ jal func_800A4530 -/* 134B0 808456C0 8FA4002C */ lw $a0, 0x002C($sp) -/* 134B4 808456C4 1040007D */ beq $v0, $zero, .L808458BC -/* 134B8 808456C8 3C0B8016 */ lui $t3, %hi(gSaveContext+4) -/* 134BC 808456CC 8E080678 */ lw $t0, 0x0678($s0) ## 00000678 -/* 134C0 808456D0 C6000884 */ lwc1 $f0, 0x0884($s0) ## 00000884 -/* 134C4 808456D4 3C018085 */ lui $at, %hi(D_80855480) ## $at = 80850000 -/* 134C8 808456D8 C502000C */ lwc1 $f2, 0x000C($t0) ## 0000000C -/* 134CC 808456DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 134D0 808456E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 134D4 808456E4 4600103C */ c.lt.s $f2, $f0 -/* 134D8 808456E8 8FA70044 */ lw $a3, 0x0044($sp) -/* 134DC 808456EC 240C6814 */ addiu $t4, $zero, 0x6814 ## $t4 = 00006814 -/* 134E0 808456F0 45020003 */ bc1fl .L80845700 -/* 134E4 808456F4 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 134E8 808456F8 46001006 */ mov.s $f0, $f2 -/* 134EC 808456FC 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -.L80845700: -/* 134F0 80845700 00095100 */ sll $t2, $t1, 4 -/* 134F4 80845704 05410006 */ bgez $t2, .L80845720 -/* 134F8 80845708 00000000 */ nop -/* 134FC 8084570C 3C018085 */ lui $at, %hi(D_8085547C) ## $at = 80850000 -/* 13500 80845710 C426547C */ lwc1 $f6, %lo(D_8085547C)($at) -/* 13504 80845714 46060002 */ mul.s $f0, $f0, $f6 -/* 13508 80845718 10000004 */ beq $zero, $zero, .L8084572C -/* 1350C 8084571C 00000000 */ nop -.L80845720: -/* 13510 80845720 C4285480 */ lwc1 $f8, %lo(D_80855480)($at) -/* 13514 80845724 46080002 */ mul.s $f0, $f0, $f8 -/* 13518 80845728 00000000 */ nop -.L8084572C: -/* 1351C 8084572C 8D6BE664 */ lw $t3, %lo(gSaveContext+4)($t3) -/* 13520 80845730 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 13524 80845734 51600005 */ beql $t3, $zero, .L8084574C -/* 13528 80845738 44060000 */ mfc1 $a2, $f0 -/* 1352C 8084573C 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 13530 80845740 00000000 */ nop -/* 13534 80845744 460A0000 */ add.s $f0, $f0, $f10 -/* 13538 80845748 44060000 */ mfc1 $a2, $f0 -.L8084574C: -/* 1353C 8084574C 0C20E250 */ jal func_80838940 -/* 13540 80845750 AFAC0010 */ sw $t4, 0x0010($sp) -/* 13544 80845754 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 13548 80845758 10000058 */ beq $zero, $zero, .L808458BC -/* 1354C 8084575C A60D0850 */ sh $t5, 0x0850($s0) ## 00000850 -.L80845760: -/* 13550 80845760 8FA40044 */ lw $a0, 0x0044($sp) -/* 13554 80845764 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 13558 80845768 8FA6002C */ lw $a2, 0x002C($sp) -/* 1355C 8084576C 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 13560 80845770 0C20DD28 */ jal func_808374A0 -/* 13564 80845774 AFA3003C */ sw $v1, 0x003C($sp) -/* 13568 80845778 14400007 */ bne $v0, $zero, .L80845798 -/* 1356C 8084577C 8FA3003C */ lw $v1, 0x003C($sp) -/* 13570 80845780 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 13574 80845784 3C01FFFB */ lui $at, 0xFFFB ## $at = FFFB0000 -/* 13578 80845788 3421BFFF */ ori $at, $at, 0xBFFF ## $at = FFFBBFFF -/* 1357C 8084578C 01C17824 */ and $t7, $t6, $at -/* 13580 80845790 1000004A */ beq $zero, $zero, .L808458BC -/* 13584 80845794 AE0F067C */ sw $t7, 0x067C($s0) ## 0000067C -.L80845798: -/* 13588 80845798 14600003 */ bne $v1, $zero, .L808457A8 -/* 1358C 8084579C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13590 808457A0 18400009 */ blez $v0, .L808457C8 -/* 13594 808457A4 3C080400 */ lui $t0, 0x0400 ## $t0 = 04000000 -.L808457A8: -/* 13598 808457A8 0C20F03A */ jal func_8083C0E8 -/* 1359C 808457AC 8FA50044 */ lw $a1, 0x0044($sp) -/* 135A0 808457B0 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 135A4 808457B4 3C01FFFB */ lui $at, 0xFFFB ## $at = FFFB0000 -/* 135A8 808457B8 3421BFFF */ ori $at, $at, 0xBFFF ## $at = FFFBBFFF -/* 135AC 808457BC 0301C824 */ and $t9, $t8, $at -/* 135B0 808457C0 1000003E */ beq $zero, $zero, .L808458BC -/* 135B4 808457C4 AE19067C */ sw $t9, 0x067C($s0) ## 0000067C -.L808457C8: -/* 135B8 808457C8 8E0201BC */ lw $v0, 0x01BC($s0) ## 000001BC -/* 135BC 808457CC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 135C0 808457D0 250832E8 */ addiu $t0, $t0, 0x32E8 ## $t0 = 000032E8 -/* 135C4 808457D4 1502000D */ bne $t0, $v0, .L8084580C -/* 135C8 808457D8 3C090400 */ lui $t1, 0x0400 ## $t1 = 04000000 -/* 135CC 808457DC 8FA4002C */ lw $a0, 0x002C($sp) -/* 135D0 808457E0 0C02914C */ jal func_800A4530 -/* 135D4 808457E4 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 -/* 135D8 808457E8 10400004 */ beq $v0, $zero, .L808457FC -/* 135DC 808457EC 8FA40044 */ lw $a0, 0x0044($sp) -/* 135E0 808457F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 135E4 808457F4 0C20F42A */ jal func_8083D0A8 -/* 135E8 808457F8 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -.L808457FC: -/* 135EC 808457FC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 135F0 80845800 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 -/* 135F4 80845804 1000000E */ beq $zero, $zero, .L80845840 -/* 135F8 80845808 44050000 */ mfc1 $a1, $f0 -.L8084580C: -/* 135FC 8084580C 25292D40 */ addiu $t1, $t1, 0x2D40 ## $t1 = 00002D40 -/* 13600 80845810 15220005 */ bne $t1, $v0, .L80845828 -/* 13604 80845814 3C0A0400 */ lui $t2, 0x0400 ## $t2 = 04000000 -/* 13608 80845818 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 1360C 8084581C 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 13610 80845820 10000007 */ beq $zero, $zero, .L80845840 -/* 13614 80845824 44050000 */ mfc1 $a1, $f0 -.L80845828: -/* 13618 80845828 254A2D38 */ addiu $t2, $t2, 0x2D38 ## $t2 = 04002D38 -/* 1361C 8084582C 15420003 */ bne $t2, $v0, .L8084583C -/* 13620 80845830 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 13624 80845834 44810000 */ mtc1 $at, $f0 ## $f0 = 16.00 -/* 13628 80845838 00000000 */ nop -.L8084583C: -/* 1362C 8084583C 44050000 */ mfc1 $a1, $f0 -.L80845840: -/* 13630 80845840 0C02914C */ jal func_800A4530 -/* 13634 80845844 8FA4002C */ lw $a0, 0x002C($sp) -/* 13638 80845848 50400007 */ beql $v0, $zero, .L80845868 -/* 1363C 8084584C 8E0C01BC */ lw $t4, 0x01BC($s0) ## 000001BC -/* 13640 80845850 0C20CA28 */ jal func_808328A0 -/* 13644 80845854 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13648 80845858 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1364C 8084585C 0C20C9A6 */ jal func_80832698 -/* 13650 80845860 24056804 */ addiu $a1, $zero, 0x6804 ## $a1 = 00006804 -/* 13654 80845864 8E0C01BC */ lw $t4, 0x01BC($s0) ## 000001BC -.L80845868: -/* 13658 80845868 3C0B0400 */ lui $t3, 0x0400 ## $t3 = 04000000 -/* 1365C 8084586C 256B2D38 */ addiu $t3, $t3, 0x2D38 ## $t3 = 04002D38 -/* 13660 80845870 116C0007 */ beq $t3, $t4, .L80845890 -/* 13664 80845874 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 13668 80845878 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 1366C 8084587C C61201CC */ lwc1 $f18, 0x01CC($s0) ## 000001CC -/* 13670 80845880 4612803C */ c.lt.s $f16, $f18 -/* 13674 80845884 00000000 */ nop -/* 13678 80845888 4502000D */ bc1fl .L808458C0 -/* 1367C 8084588C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80845890: -/* 13680 80845890 860D0850 */ lh $t5, 0x0850($s0) ## 00000850 -/* 13684 80845894 55A00006 */ bnel $t5, $zero, .L808458B0 -/* 13688 80845898 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -/* 1368C 8084589C 0C20CA15 */ jal func_80832854 -/* 13690 808458A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13694 808458A4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 13698 808458A8 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -/* 1369C 808458AC 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -.L808458B0: -/* 136A0 808458B0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 136A4 808458B4 0C01DE80 */ jal Math_ApproxF - -/* 136A8 808458B8 3C064316 */ lui $a2, 0x4316 ## $a2 = 43160000 -.L808458BC: -/* 136AC 808458BC 8FBF0024 */ lw $ra, 0x0024($sp) -.L808458C0: -/* 136B0 808458C0 8FB00020 */ lw $s0, 0x0020($sp) -/* 136B4 808458C4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 136B8 808458C8 03E00008 */ jr $ra -/* 136BC 808458CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808458D0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808458D0.s deleted file mode 100644 index 736e93772e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808458D0.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_808458D0 -/* 136C0 808458D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 136C4 808458D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 136C8 808458D8 AFA5001C */ sw $a1, 0x001C($sp) -/* 136CC 808458DC 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 136D0 808458E0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 136D4 808458E4 24C501B4 */ addiu $a1, $a2, 0x01B4 ## $a1 = 000001B4 -/* 136D8 808458E8 35CF0060 */ ori $t7, $t6, 0x0060 ## $t7 = 00000060 -/* 136DC 808458EC AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 136E0 808458F0 AFA60018 */ sw $a2, 0x0018($sp) -/* 136E4 808458F4 0C028EF0 */ jal func_800A3BC0 -/* 136E8 808458F8 8FA4001C */ lw $a0, 0x001C($sp) -/* 136EC 808458FC 8FA60018 */ lw $a2, 0x0018($sp) -/* 136F0 80845900 8FA5001C */ lw $a1, 0x001C($sp) -/* 136F4 80845904 8CD8067C */ lw $t8, 0x067C($a2) ## 0000067C -/* 136F8 80845908 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 136FC 8084590C 33190800 */ andi $t9, $t8, 0x0800 ## $t9 = 00000000 -/* 13700 80845910 13200007 */ beq $t9, $zero, .L80845930 -/* 13704 80845914 00000000 */ nop -/* 13708 80845918 8CC803AC */ lw $t0, 0x03AC($a2) ## 000003AC -/* 1370C 8084591C 11000004 */ beq $t0, $zero, .L80845930 -/* 13710 80845920 00000000 */ nop -/* 13714 80845924 80C90434 */ lb $t1, 0x0434($a2) ## 00000434 -/* 13718 80845928 51200006 */ beql $t1, $zero, .L80845944 -/* 1371C 8084592C 8CD90A74 */ lw $t9, 0x0A74($a2) ## 00000A74 -.L80845930: -/* 13720 80845930 0C20D99C */ jal func_80836670 -/* 13724 80845934 AFA60018 */ sw $a2, 0x0018($sp) -/* 13728 80845938 14400006 */ bne $v0, $zero, .L80845954 -/* 1372C 8084593C 8FA60018 */ lw $a2, 0x0018($sp) -/* 13730 80845940 8CD90A74 */ lw $t9, 0x0A74($a2) ## 00000A74 -.L80845944: -/* 13734 80845944 8FA4001C */ lw $a0, 0x001C($sp) -/* 13738 80845948 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 1373C 8084594C 0320F809 */ jalr $ra, $t9 -/* 13740 80845950 00000000 */ nop -.L80845954: -/* 13744 80845954 8FBF0014 */ lw $ra, 0x0014($sp) -/* 13748 80845958 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1374C 8084595C 03E00008 */ jr $ra -/* 13750 80845960 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845BA0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845BA0.s deleted file mode 100644 index 19b12a399e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845BA0.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80845BA0 -/* 13990 80845BA0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 13994 80845BA4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 13998 80845BA8 AFB00020 */ sw $s0, 0x0020($sp) -/* 1399C 80845BAC AFA40038 */ sw $a0, 0x0038($sp) -/* 139A0 80845BB0 AFA60040 */ sw $a2, 0x0040($sp) -/* 139A4 80845BB4 AFA70044 */ sw $a3, 0x0044($sp) -/* 139A8 80845BB8 C4A60024 */ lwc1 $f6, 0x0024($a1) ## 00000024 -/* 139AC 80845BBC C4A40450 */ lwc1 $f4, 0x0450($a1) ## 00000450 -/* 139B0 80845BC0 C4AA002C */ lwc1 $f10, 0x002C($a1) ## 0000002C -/* 139B4 80845BC4 C4A80458 */ lwc1 $f8, 0x0458($a1) ## 00000458 -/* 139B8 80845BC8 46062081 */ sub.s $f2, $f4, $f6 -/* 139BC 80845BCC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 139C0 80845BD0 24A40024 */ addiu $a0, $a1, 0x0024 ## $a0 = 00000024 -/* 139C4 80845BD4 460A4301 */ sub.s $f12, $f8, $f10 -/* 139C8 80845BD8 46021402 */ mul.s $f16, $f2, $f2 -/* 139CC 80845BDC 24A50450 */ addiu $a1, $a1, 0x0450 ## $a1 = 00000450 -/* 139D0 80845BE0 460C6482 */ mul.s $f18, $f12, $f12 -/* 139D4 80845BE4 46128000 */ add.s $f0, $f16, $f18 -/* 139D8 80845BE8 46000004 */ sqrt.s $f0, $f0 -/* 139DC 80845BEC 4600010D */ trunc.w.s $f4, $f0 -/* 139E0 80845BF0 440F2000 */ mfc1 $t7, $f4 -/* 139E4 80845BF4 0C01E01A */ jal Math_Vec3f_Yaw - -/* 139E8 80845BF8 AFAF002C */ sw $t7, 0x002C($sp) -/* 139EC 80845BFC 8FB8002C */ lw $t8, 0x002C($sp) -/* 139F0 80845C00 8FB90044 */ lw $t9, 0x0044($sp) -/* 139F4 80845C04 00021C00 */ sll $v1, $v0, 16 -/* 139F8 80845C08 00031C03 */ sra $v1, $v1, 16 -/* 139FC 80845C0C 0319082A */ slt $at, $t8, $t9 -/* 13A00 80845C10 10200005 */ beq $at, $zero, .L80845C28 -/* 13A04 80845C14 8FA80040 */ lw $t0, 0x0040($sp) -/* 13A08 80845C18 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 13A0C 80845C1C 00000000 */ nop -/* 13A10 80845C20 E5060000 */ swc1 $f6, 0x0000($t0) ## 00000000 -/* 13A14 80845C24 860300B6 */ lh $v1, 0x00B6($s0) ## 000000B6 -.L80845C28: -/* 13A18 80845C28 8D070000 */ lw $a3, 0x0000($t0) ## 00000000 -/* 13A1C 80845C2C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 13A20 80845C30 AFA90014 */ sw $t1, 0x0014($sp) -/* 13A24 80845C34 AFA30010 */ sw $v1, 0x0010($sp) -/* 13A28 80845C38 8FA40038 */ lw $a0, 0x0038($sp) -/* 13A2C 80845C3C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 13A30 80845C40 0C211659 */ jal func_80845964 -/* 13A34 80845C44 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 13A38 80845C48 10400003 */ beq $v0, $zero, .L80845C58 -/* 13A3C 80845C4C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 13A40 80845C50 10000002 */ beq $zero, $zero, .L80845C5C -/* 13A44 80845C54 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80845C58: -/* 13A48 80845C58 8FA2002C */ lw $v0, 0x002C($sp) -.L80845C5C: -/* 13A4C 80845C5C 8FB00020 */ lw $s0, 0x0020($sp) -/* 13A50 80845C60 03E00008 */ jr $ra -/* 13A54 80845C64 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s deleted file mode 100644 index 098f328b0d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80845C68 -/* 13A58 80845C68 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 13A5C 80845C6C AFBF0014 */ sw $ra, 0x0014($sp) -/* 13A60 80845C70 14A00006 */ bne $a1, $zero, .L80845C8C -/* 13A64 80845C74 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 13A68 80845C78 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 13A6C 80845C7C 24060DFF */ addiu $a2, $zero, 0x0DFF ## $a2 = 00000DFF -/* 13A70 80845C80 0C0302BD */ jal Gameplay_SetupRespawnPoint -/* 13A74 80845C84 AFA7001C */ sw $a3, 0x001C($sp) -/* 13A78 80845C88 8FA7001C */ lw $a3, 0x001C($sp) -.L80845C8C: -/* 13A7C 80845C8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 13A80 80845C90 3C018016 */ lui $at, %hi(gSaveContext+0x137b) -/* 13A84 80845C94 A020F9DB */ sb $zero, %lo(gSaveContext+0x137b)($at) -/* 13A88 80845C98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 13A8C 80845C9C 03E00008 */ jr $ra -/* 13A90 80845CA0 00E01025 */ or $v0, $a3, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s deleted file mode 100644 index 41fe496fec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s +++ /dev/null @@ -1,167 +0,0 @@ -.late_rodata -glabel D_80855484 - .float 0.1 - -.text -glabel func_80845CA4 -/* 13A94 80845CA4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 13A98 80845CA8 AFBF001C */ sw $ra, 0x001C($sp) -/* 13A9C 80845CAC AFB00018 */ sw $s0, 0x0018($sp) -/* 13AA0 80845CB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 13AA4 80845CB4 0C20EC10 */ jal func_8083B040 -/* 13AA8 80845CB8 AFA50044 */ sw $a1, 0x0044($sp) -/* 13AAC 80845CBC 54400083 */ bnel $v0, $zero, .L80845ECC -/* 13AB0 80845CC0 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 13AB4 80845CC4 860E0850 */ lh $t6, 0x0850($s0) ## 00000850 -/* 13AB8 80845CC8 8FA40044 */ lw $a0, 0x0044($sp) -/* 13ABC 80845CCC 55C00013 */ bnel $t6, $zero, .L80845D1C -/* 13AC0 80845CD0 8219084F */ lb $t9, 0x084F($s0) ## 0000084F -/* 13AC4 80845CD4 0C028EF0 */ jal func_800A3BC0 -/* 13AC8 80845CD8 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 13ACC 80845CDC 8603042E */ lh $v1, 0x042E($s0) ## 0000042E -/* 13AD0 80845CE0 3C018085 */ lui $at, %hi(D_80855484) ## $at = 80850000 -/* 13AD4 80845CE4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 13AD8 80845CE8 14600003 */ bne $v1, $zero, .L80845CF8 -/* 13ADC 80845CEC 246FFFFF */ addiu $t7, $v1, 0xFFFF ## $t7 = FFFFFFFF -/* 13AE0 80845CF0 10000003 */ beq $zero, $zero, .L80845D00 -/* 13AE4 80845CF4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80845CF8: -/* 13AE8 80845CF8 A60F042E */ sh $t7, 0x042E($s0) ## 0000042E -/* 13AEC 80845CFC 8602042E */ lh $v0, 0x042E($s0) ## 0000042E -.L80845D00: -/* 13AF0 80845D00 54400072 */ bnel $v0, $zero, .L80845ECC -/* 13AF4 80845D04 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 13AF8 80845D08 C4245484 */ lwc1 $f4, %lo(D_80855484)($at) -/* 13AFC 80845D0C A6180850 */ sh $t8, 0x0850($s0) ## 00000850 -/* 13B00 80845D10 1000006D */ beq $zero, $zero, .L80845EC8 -/* 13B04 80845D14 E6040838 */ swc1 $f4, 0x0838($s0) ## 00000838 -/* 13B08 80845D18 8219084F */ lb $t9, 0x084F($s0) ## 0000084F -.L80845D1C: -/* 13B0C 80845D1C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 13B10 80845D20 5720001A */ bnel $t9, $zero, .L80845D8C -/* 13B14 80845D24 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 13B18 80845D28 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 13B1C 80845D2C 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 13B20 80845D30 3C018085 */ lui $at, %hi(D_808535E8) ## $at = 80850000 -/* 13B24 80845D34 C42835E8 */ lwc1 $f8, %lo(D_808535E8)($at) -/* 13B28 80845D38 8FA40044 */ lw $a0, 0x0044($sp) -/* 13B2C 80845D3C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 13B30 80845D40 46083282 */ mul.s $f10, $f6, $f8 -/* 13B34 80845D44 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFFC -/* 13B38 80845D48 2407FFFF */ addiu $a3, $zero, 0xFFFF ## $a3 = FFFFFFFF -/* 13B3C 80845D4C 0C2116E8 */ jal func_80845BA0 -/* 13B40 80845D50 E7AA003C */ swc1 $f10, 0x003C($sp) -/* 13B44 80845D54 2841001E */ slti $at, $v0, 0x001E -/* 13B48 80845D58 1020005B */ beq $at, $zero, .L80845EC8 -/* 13B4C 80845D5C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 13B50 80845D60 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 13B54 80845D64 C610045C */ lwc1 $f16, 0x045C($s0) ## 0000045C -/* 13B58 80845D68 C6120464 */ lwc1 $f18, 0x0464($s0) ## 00000464 -/* 13B5C 80845D6C 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 13B60 80845D70 01215025 */ or $t2, $t1, $at ## $t2 = 20000000 -/* 13B64 80845D74 A208084F */ sb $t0, 0x084F($s0) ## 0000084F -/* 13B68 80845D78 AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C -/* 13B6C 80845D7C E6100450 */ swc1 $f16, 0x0450($s0) ## 00000450 -/* 13B70 80845D80 10000051 */ beq $zero, $zero, .L80845EC8 -/* 13B74 80845D84 E6120458 */ swc1 $f18, 0x0458($s0) ## 00000458 -/* 13B78 80845D88 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 -.L80845D8C: -/* 13B7C 80845D8C 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 -/* 13B80 80845D90 3C018016 */ lui $at, %hi(gSaveContext+0x13bc) -/* 13B84 80845D94 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 13B88 80845D98 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 13B8C 80845D9C 3C0D8085 */ lui $t5, %hi(D_808535F4) ## $t5 = 80850000 -/* 13B90 80845DA0 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 13B94 80845DA4 5180001B */ beql $t4, $zero, .L80845E14 -/* 13B98 80845DA8 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 13B9C 80845DAC 8DAD35F4 */ lw $t5, %lo(D_808535F4)($t5) -/* 13BA0 80845DB0 C426FA1C */ lwc1 $f6, %lo(gSaveContext+0x13bc)($at) -/* 13BA4 80845DB4 3C048085 */ lui $a0, %hi(D_808535FC) ## $a0 = 80850000 -/* 13BA8 80845DB8 11A0001D */ beq $t5, $zero, .L80845E30 -/* 13BAC 80845DBC E7A60034 */ swc1 $f6, 0x0034($sp) -/* 13BB0 80845DC0 848435FC */ lh $a0, %lo(D_808535FC)($a0) -/* 13BB4 80845DC4 0C01DE1C */ jal Math_Sins - ## sins? -/* 13BB8 80845DC8 AFA70030 */ sw $a3, 0x0030($sp) -/* 13BBC 80845DCC 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 13BC0 80845DD0 44814000 */ mtc1 $at, $f8 ## $f8 = 400.00 -/* 13BC4 80845DD4 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 13BC8 80845DD8 3C048085 */ lui $a0, %hi(D_808535FC) ## $a0 = 80850000 -/* 13BCC 80845DDC 46080282 */ mul.s $f10, $f0, $f8 -/* 13BD0 80845DE0 46105480 */ add.s $f18, $f10, $f16 -/* 13BD4 80845DE4 E6120450 */ swc1 $f18, 0x0450($s0) ## 00000450 -/* 13BD8 80845DE8 0C01DE0D */ jal Math_Coss - ## coss? -/* 13BDC 80845DEC 848435FC */ lh $a0, %lo(D_808535FC)($a0) -/* 13BE0 80845DF0 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 13BE4 80845DF4 44812000 */ mtc1 $at, $f4 ## $f4 = 400.00 -/* 13BE8 80845DF8 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 13BEC 80845DFC 8FA70030 */ lw $a3, 0x0030($sp) -/* 13BF0 80845E00 46040182 */ mul.s $f6, $f0, $f4 -/* 13BF4 80845E04 46083280 */ add.s $f10, $f6, $f8 -/* 13BF8 80845E08 10000009 */ beq $zero, $zero, .L80845E30 -/* 13BFC 80845E0C E60A0458 */ swc1 $f10, 0x0458($s0) ## 00000458 -/* 13C00 80845E10 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -.L80845E14: -/* 13C04 80845E14 3C018016 */ lui $at, %hi(gSaveContext+0x13bc) -/* 13C08 80845E18 04410005 */ bgez $v0, .L80845E30 -/* 13C0C 80845E1C 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 -/* 13C10 80845E20 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -/* 13C14 80845E24 C430FA1C */ lwc1 $f16, %lo(gSaveContext+0x13bc)($at) -/* 13C18 80845E28 2407FFFF */ addiu $a3, $zero, 0xFFFF ## $a3 = FFFFFFFF -/* 13C1C 80845E2C E7B00034 */ swc1 $f16, 0x0034($sp) -.L80845E30: -/* 13C20 80845E30 8FA40044 */ lw $a0, 0x0044($sp) -/* 13C24 80845E34 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 13C28 80845E38 0C2116E8 */ jal func_80845BA0 -/* 13C2C 80845E3C 27A60034 */ addiu $a2, $sp, 0x0034 ## $a2 = FFFFFFF4 -/* 13C30 80845E40 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 -/* 13C34 80845E44 51E00011 */ beql $t7, $zero, .L80845E8C -/* 13C38 80845E48 8FA40044 */ lw $a0, 0x0044($sp) -/* 13C3C 80845E4C 5440001F */ bnel $v0, $zero, .L80845ECC -/* 13C40 80845E50 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 13C44 80845E54 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 13C48 80845E58 C6040838 */ lwc1 $f4, 0x0838($s0) ## 00000838 -/* 13C4C 80845E5C 8FA40044 */ lw $a0, 0x0044($sp) -/* 13C50 80845E60 46049032 */ c.eq.s $f18, $f4 -/* 13C54 80845E64 00000000 */ nop -/* 13C58 80845E68 45020018 */ bc1fl .L80845ECC -/* 13C5C 80845E6C 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 13C60 80845E70 0C030129 */ jal Gameplay_GetCamera -/* 13C64 80845E74 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 13C68 80845E78 8458014C */ lh $t8, 0x014C($v0) ## 0000014C -/* 13C6C 80845E7C 33190010 */ andi $t9, $t8, 0x0010 ## $t9 = 00000000 -/* 13C70 80845E80 53200012 */ beql $t9, $zero, .L80845ECC -/* 13C74 80845E84 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 13C78 80845E88 8FA40044 */ lw $a0, 0x0044($sp) -.L80845E8C: -/* 13C7C 80845E8C 0C030129 */ jal Gameplay_GetCamera -/* 13C80 80845E90 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 13C84 80845E94 0C016C69 */ jal func_8005B1A4 -/* 13C88 80845E98 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 13C8C 80845E9C 3C058016 */ lui $a1, %hi(gSaveContext+0x137b) -/* 13C90 80845EA0 80A5F9DB */ lb $a1, %lo(gSaveContext+0x137b)($a1) -/* 13C94 80845EA4 0C21171A */ jal func_80845C68 -/* 13C98 80845EA8 8FA40044 */ lw $a0, 0x0044($sp) -/* 13C9C 80845EAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13CA0 80845EB0 0C20ED91 */ jal func_8083B644 -/* 13CA4 80845EB4 8FA50044 */ lw $a1, 0x0044($sp) -/* 13CA8 80845EB8 14400003 */ bne $v0, $zero, .L80845EC8 -/* 13CAC 80845EBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13CB0 80845EC0 0C20F3D7 */ jal func_8083CF5C -/* 13CB4 80845EC4 8FA50044 */ lw $a1, 0x0044($sp) -.L80845EC8: -/* 13CB8 80845EC8 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -.L80845ECC: -/* 13CBC 80845ECC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13CC0 80845ED0 31090800 */ andi $t1, $t0, 0x0800 ## $t1 = 00000000 -/* 13CC4 80845ED4 51200004 */ beql $t1, $zero, .L80845EE8 -/* 13CC8 80845ED8 8FBF001C */ lw $ra, 0x001C($sp) -/* 13CCC 80845EDC 0C20D99C */ jal func_80836670 -/* 13CD0 80845EE0 8FA50044 */ lw $a1, 0x0044($sp) -/* 13CD4 80845EE4 8FBF001C */ lw $ra, 0x001C($sp) -.L80845EE8: -/* 13CD8 80845EE8 8FB00018 */ lw $s0, 0x0018($sp) -/* 13CDC 80845EEC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 13CE0 80845EF0 03E00008 */ jr $ra -/* 13CE4 80845EF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845EF8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845EF8.s deleted file mode 100644 index 65bfa1143c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80845EF8.s +++ /dev/null @@ -1,94 +0,0 @@ -glabel func_80845EF8 -/* 13CE8 80845EF8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 13CEC 80845EFC AFBF001C */ sw $ra, 0x001C($sp) -/* 13CF0 80845F00 AFB00018 */ sw $s0, 0x0018($sp) -/* 13CF4 80845F04 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 13CF8 80845F08 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 13CFC 80845F0C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 13D00 80845F10 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 13D04 80845F14 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 13D08 80845F18 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 13D0C 80845F1C 24C501B4 */ addiu $a1, $a2, 0x01B4 ## $a1 = 000001B4 -/* 13D10 80845F20 AFA50024 */ sw $a1, 0x0024($sp) -/* 13D14 80845F24 0C028EF0 */ jal func_800A3BC0 -/* 13D18 80845F28 AFA60030 */ sw $a2, 0x0030($sp) -/* 13D1C 80845F2C 8FA40030 */ lw $a0, 0x0030($sp) -/* 13D20 80845F30 AFA2002C */ sw $v0, 0x002C($sp) -/* 13D24 80845F34 0C20D99C */ jal func_80836670 -/* 13D28 80845F38 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 13D2C 80845F3C 8FB8002C */ lw $t8, 0x002C($sp) -/* 13D30 80845F40 8FA60030 */ lw $a2, 0x0030($sp) -/* 13D34 80845F44 5300002D */ beql $t8, $zero, .L80845FFC -/* 13D38 80845F48 8CCB067C */ lw $t3, 0x067C($a2) ## 0000067C -/* 13D3C 80845F4C 84D90850 */ lh $t9, 0x0850($a2) ## 00000850 -/* 13D40 80845F50 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 13D44 80845F54 17200012 */ bne $t9, $zero, .L80845FA0 -/* 13D48 80845F58 00000000 */ nop -/* 13D4C 80845F5C 84C2042E */ lh $v0, 0x042E($a2) ## 0000042E -/* 13D50 80845F60 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 13D54 80845F64 14400003 */ bne $v0, $zero, .L80845F74 -/* 13D58 80845F68 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 13D5C 80845F6C 10000003 */ beq $zero, $zero, .L80845F7C -/* 13D60 80845F70 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80845F74: -/* 13D64 80845F74 A4C8042E */ sh $t0, 0x042E($a2) ## 0000042E -/* 13D68 80845F78 84C3042E */ lh $v1, 0x042E($a2) ## 0000042E -.L80845F7C: -/* 13D6C 80845F7C 54600030 */ bnel $v1, $zero, .L80846040 -/* 13D70 80845F80 8FBF001C */ lw $ra, 0x001C($sp) -/* 13D74 80845F84 C4C401C8 */ lwc1 $f4, 0x01C8($a2) ## 000001C8 -/* 13D78 80845F88 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 13D7C 80845F8C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 13D80 80845F90 A4C90850 */ sh $t1, 0x0850($a2) ## 00000850 -/* 13D84 80845F94 46062201 */ sub.s $f8, $f4, $f6 -/* 13D88 80845F98 10000028 */ beq $zero, $zero, .L8084603C -/* 13D8C 80845F9C E4C801C4 */ swc1 $f8, 0x01C4($a2) ## 000001C4 -.L80845FA0: -/* 13D90 80845FA0 0C20F03A */ jal func_8083C0E8 -/* 13D94 80845FA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 13D98 80845FA8 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 13D9C 80845FAC 01505021 */ addu $t2, $t2, $s0 -/* 13DA0 80845FB0 814A1CD0 */ lb $t2, 0x1CD0($t2) ## 00011CD0 -/* 13DA4 80845FB4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 13DA8 80845FB8 34211CBC */ ori $at, $at, 0x1CBC ## $at = 00011CBC -/* 13DAC 80845FBC 05400003 */ bltz $t2, .L80845FCC -/* 13DB0 80845FC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13DB4 80845FC4 0C025D4D */ jal func_80097534 -/* 13DB8 80845FC8 02012821 */ addu $a1, $s0, $at -.L80845FCC: -/* 13DBC 80845FCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13DC0 80845FD0 0C030129 */ jal Gameplay_GetCamera -/* 13DC4 80845FD4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 13DC8 80845FD8 0C016C69 */ jal func_8005B1A4 -/* 13DCC 80845FDC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 13DD0 80845FE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13DD4 80845FE4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 13DD8 80845FE8 0C0302BD */ jal Gameplay_SetupRespawnPoint -/* 13DDC 80845FEC 24060DFF */ addiu $a2, $zero, 0x0DFF ## $a2 = 00000DFF -/* 13DE0 80845FF0 10000013 */ beq $zero, $zero, .L80846040 -/* 13DE4 80845FF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 13DE8 80845FF8 8CCB067C */ lw $t3, 0x067C($a2) ## 0000067C -.L80845FFC: -/* 13DEC 80845FFC 8FA40024 */ lw $a0, 0x0024($sp) -/* 13DF0 80846000 3C054170 */ lui $a1, 0x4170 ## $a1 = 41700000 -/* 13DF4 80846004 000B6080 */ sll $t4, $t3, 2 -/* 13DF8 80846008 0582000D */ bltzl $t4, .L80846040 -/* 13DFC 8084600C 8FBF001C */ lw $ra, 0x001C($sp) -/* 13E00 80846010 0C02914C */ jal func_800A4530 -/* 13E04 80846014 AFA60030 */ sw $a2, 0x0030($sp) -/* 13E08 80846018 10400008 */ beq $v0, $zero, .L8084603C -/* 13E0C 8084601C 8FA60030 */ lw $a2, 0x0030($sp) -/* 13E10 80846020 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 13E14 80846024 0330C821 */ addu $t9, $t9, $s0 -/* 13E18 80846028 8F391D54 */ lw $t9, 0x1D54($t9) ## 00011D54 -/* 13E1C 8084602C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 13E20 80846030 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 13E24 80846034 0320F809 */ jalr $ra, $t9 -/* 13E28 80846038 00000000 */ nop -.L8084603C: -/* 13E2C 8084603C 8FBF001C */ lw $ra, 0x001C($sp) -.L80846040: -/* 13E30 80846040 8FB00018 */ lw $s0, 0x0018($sp) -/* 13E34 80846044 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 13E38 80846048 03E00008 */ jr $ra -/* 13E3C 8084604C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846050.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846050.s deleted file mode 100644 index 00ff96d08a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846050.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80846050 -/* 13E40 80846050 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 13E44 80846054 AFBF001C */ sw $ra, 0x001C($sp) -/* 13E48 80846058 AFB00018 */ sw $s0, 0x0018($sp) -/* 13E4C 8084605C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 13E50 80846060 0C20DC87 */ jal func_8083721C -/* 13E54 80846064 AFA5002C */ sw $a1, 0x002C($sp) -/* 13E58 80846068 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 -/* 13E5C 8084606C 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001B4 -/* 13E60 80846070 AFA60020 */ sw $a2, 0x0020($sp) -/* 13E64 80846074 0C028EF0 */ jal func_800A3BC0 -/* 13E68 80846078 8FA4002C */ lw $a0, 0x002C($sp) -/* 13E6C 8084607C 10400009 */ beq $v0, $zero, .L808460A4 -/* 13E70 80846080 8FA60020 */ lw $a2, 0x0020($sp) -/* 13E74 80846084 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13E78 80846088 0C20E7E4 */ jal func_80839F90 -/* 13E7C 8084608C 8FA5002C */ lw $a1, 0x002C($sp) -/* 13E80 80846090 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13E84 80846094 0C20D5A2 */ jal func_80835688 -/* 13E88 80846098 8FA5002C */ lw $a1, 0x002C($sp) -/* 13E8C 8084609C 1000001C */ beq $zero, $zero, .L80846110 -/* 13E90 808460A0 8FBF001C */ lw $ra, 0x001C($sp) -.L808460A4: -/* 13E94 808460A4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 13E98 808460A8 0C02914C */ jal func_800A4530 -/* 13E9C 808460AC 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 -/* 13EA0 808460B0 10400013 */ beq $v0, $zero, .L80846100 -/* 13EA4 808460B4 260403BE */ addiu $a0, $s0, 0x03BE ## $a0 = 000003BE -/* 13EA8 808460B8 8E060438 */ lw $a2, 0x0438($s0) ## 00000438 -/* 13EAC 808460BC 8FA4002C */ lw $a0, 0x002C($sp) -/* 13EB0 808460C0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 13EB4 808460C4 0C20D591 */ jal func_80835644 -/* 13EB8 808460C8 AFA60024 */ sw $a2, 0x0024($sp) -/* 13EBC 808460CC 1440000F */ bne $v0, $zero, .L8084610C -/* 13EC0 808460D0 8FA60024 */ lw $a2, 0x0024($sp) -/* 13EC4 808460D4 AE0603AC */ sw $a2, 0x03AC($s0) ## 000003AC -/* 13EC8 808460D8 AE06011C */ sw $a2, 0x011C($s0) ## 0000011C -/* 13ECC 808460DC 94CE0088 */ lhu $t6, 0x0088($a2) ## 00000088 -/* 13ED0 808460E0 ACD00118 */ sw $s0, 0x0118($a2) ## 00000118 -/* 13ED4 808460E4 84D800B6 */ lh $t8, 0x00B6($a2) ## 000000B6 -/* 13ED8 808460E8 31CFFF00 */ andi $t7, $t6, 0xFF00 ## $t7 = 00000000 -/* 13EDC 808460EC A4CF0088 */ sh $t7, 0x0088($a2) ## 00000088 -/* 13EE0 808460F0 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 13EE4 808460F4 03194023 */ subu $t0, $t8, $t9 -/* 13EE8 808460F8 10000004 */ beq $zero, $zero, .L8084610C -/* 13EEC 808460FC A60803BE */ sh $t0, 0x03BE($s0) ## 000003BE -.L80846100: -/* 13EF0 80846100 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 13EF4 80846104 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 13EF8 80846108 24060FA0 */ addiu $a2, $zero, 0x0FA0 ## $a2 = 00000FA0 -.L8084610C: -/* 13EFC 8084610C 8FBF001C */ lw $ra, 0x001C($sp) -.L80846110: -/* 13F00 80846110 8FB00018 */ lw $s0, 0x0018($sp) -/* 13F04 80846114 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 13F08 80846118 03E00008 */ jr $ra -/* 13F0C 8084611C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846120.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846120.s deleted file mode 100644 index 044c84a157..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846120.s +++ /dev/null @@ -1,88 +0,0 @@ -glabel func_80846120 -/* 13F10 80846120 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 13F14 80846124 AFB00018 */ sw $s0, 0x0018($sp) -/* 13F18 80846128 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 13F1C 8084612C AFA50034 */ sw $a1, 0x0034($sp) -/* 13F20 80846130 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 13F24 80846134 AFBF001C */ sw $ra, 0x001C($sp) -/* 13F28 80846138 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 13F2C 8084613C 0C028EF0 */ jal func_800A3BC0 -/* 13F30 80846140 AFA50020 */ sw $a1, 0x0020($sp) -/* 13F34 80846144 10400012 */ beq $v0, $zero, .L80846190 -/* 13F38 80846148 3C054224 */ lui $a1, 0x4224 ## $a1 = 42240000 -/* 13F3C 8084614C 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 13F40 80846150 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13F44 80846154 28430015 */ slti $v1, $v0, 0x0015 -/* 13F48 80846158 38630001 */ xori $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 13F4C 8084615C 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 -/* 13F50 80846160 1060000B */ beq $v1, $zero, .L80846190 -/* 13F54 80846164 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -/* 13F58 80846168 0C20EC10 */ jal func_8083B040 -/* 13F5C 8084616C 8FA50034 */ lw $a1, 0x0034($sp) -/* 13F60 80846170 14400036 */ bne $v0, $zero, .L8084624C -/* 13F64 80846174 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13F68 80846178 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 13F6C 8084617C 24A52FA0 */ addiu $a1, $a1, 0x2FA0 ## $a1 = 04002FA0 -/* 13F70 80846180 0C20E826 */ jal func_8083A098 -/* 13F74 80846184 8FA60034 */ lw $a2, 0x0034($sp) -/* 13F78 80846188 10000031 */ beq $zero, $zero, .L80846250 -/* 13F7C 8084618C 8FBF001C */ lw $ra, 0x001C($sp) -.L80846190: -/* 13F80 80846190 0C02914C */ jal func_800A4530 -/* 13F84 80846194 8FA40020 */ lw $a0, 0x0020($sp) -/* 13F88 80846198 1040000A */ beq $v0, $zero, .L808461C4 -/* 13F8C 8084619C 8FA40020 */ lw $a0, 0x0020($sp) -/* 13F90 808461A0 8E040438 */ lw $a0, 0x0438($s0) ## 00000438 -/* 13F94 808461A4 260603B0 */ addiu $a2, $s0, 0x03B0 ## $a2 = 000003B0 -/* 13F98 808461A8 AE0403AC */ sw $a0, 0x03AC($s0) ## 000003AC -/* 13F9C 808461AC AE04011C */ sw $a0, 0x011C($s0) ## 0000011C -/* 13FA0 808461B0 AC900118 */ sw $s0, 0x0118($a0) ## 00000118 -/* 13FA4 808461B4 0C00B6F4 */ jal func_8002DBD0 -/* 13FA8 808461B8 24850164 */ addiu $a1, $a0, 0x0164 ## $a1 = 00000164 -/* 13FAC 808461BC 10000024 */ beq $zero, $zero, .L80846250 -/* 13FB0 808461C0 8FBF001C */ lw $ra, 0x001C($sp) -.L808461C4: -/* 13FB4 808461C4 0C02914C */ jal func_800A4530 -/* 13FB8 808461C8 3C054365 */ lui $a1, 0x4365 ## $a1 = 43650000 -/* 13FBC 808461CC 1040001C */ beq $v0, $zero, .L80846240 -/* 13FC0 808461D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 13FC4 808461D4 8E0203AC */ lw $v0, 0x03AC($s0) ## 000003AC -/* 13FC8 808461D8 844400B4 */ lh $a0, 0x00B4($v0) ## 000000B4 -/* 13FCC 808461DC 0C01DE1C */ jal Math_Sins - ## sins? -/* 13FD0 808461E0 AFA20028 */ sw $v0, 0x0028($sp) -/* 13FD4 808461E4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 13FD8 808461E8 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 -/* 13FDC 808461EC 8FA20028 */ lw $v0, 0x0028($sp) -/* 13FE0 808461F0 46040182 */ mul.s $f6, $f0, $f4 -/* 13FE4 808461F4 844400B4 */ lh $a0, 0x00B4($v0) ## 000000B4 -/* 13FE8 808461F8 0C01DE0D */ jal Math_Coss - ## coss? -/* 13FEC 808461FC E4460068 */ swc1 $f6, 0x0068($v0) ## 00000068 -/* 13FF0 80846200 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 13FF4 80846204 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 13FF8 80846208 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 13FFC 8084620C 8FA20028 */ lw $v0, 0x0028($sp) -/* 14000 80846210 46080282 */ mul.s $f10, $f0, $f8 -/* 14004 80846214 44818000 */ mtc1 $at, $f16 ## $f16 = -2.00 -/* 14008 80846218 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 -/* 1400C 8084621C 44819000 */ mtc1 $at, $f18 ## $f18 = -30.00 -/* 14010 80846220 E450006C */ swc1 $f16, 0x006C($v0) ## 0000006C -/* 14014 80846224 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 14018 80846228 E4520070 */ swc1 $f18, 0x0070($v0) ## 00000070 -/* 1401C 8084622C E44A0060 */ swc1 $f10, 0x0060($v0) ## 00000060 -/* 14020 80846230 0C20C8ED */ jal func_808323B4 -/* 14024 80846234 8FA40034 */ lw $a0, 0x0034($sp) -/* 14028 80846238 10000005 */ beq $zero, $zero, .L80846250 -/* 1402C 8084623C 8FBF001C */ lw $ra, 0x001C($sp) -.L80846240: -/* 14030 80846240 3C058085 */ lui $a1, %hi(D_8085461C) ## $a1 = 80850000 -/* 14034 80846244 0C20CA49 */ jal func_80832924 -/* 14038 80846248 24A5461C */ addiu $a1, $a1, %lo(D_8085461C) ## $a1 = 8085461C -.L8084624C: -/* 1403C 8084624C 8FBF001C */ lw $ra, 0x001C($sp) -.L80846250: -/* 14040 80846250 8FB00018 */ lw $s0, 0x0018($sp) -/* 14044 80846254 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 14048 80846258 03E00008 */ jr $ra -/* 1404C 8084625C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846260.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846260.s deleted file mode 100644 index fad64adf1b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846260.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80846260 -/* 14050 80846260 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 14054 80846264 AFBF001C */ sw $ra, 0x001C($sp) -/* 14058 80846268 AFB00018 */ sw $s0, 0x0018($sp) -/* 1405C 8084626C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 14060 80846270 0C20DC87 */ jal func_8083721C -/* 14064 80846274 AFA5002C */ sw $a1, 0x002C($sp) -/* 14068 80846278 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1406C 8084627C AFA50020 */ sw $a1, 0x0020($sp) -/* 14070 80846280 0C028EF0 */ jal func_800A3BC0 -/* 14074 80846284 8FA4002C */ lw $a0, 0x002C($sp) -/* 14078 80846288 10400008 */ beq $v0, $zero, .L808462AC -/* 1407C 8084628C 8FA4002C */ lw $a0, 0x002C($sp) -/* 14080 80846290 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 14084 80846294 24C632C0 */ addiu $a2, $a2, 0x32C0 ## $a2 = 040032C0 -/* 14088 80846298 0C20C8A1 */ jal func_80832284 -/* 1408C 8084629C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 14090 808462A0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 14094 808462A4 10000027 */ beq $zero, $zero, .L80846344 -/* 14098 808462A8 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -.L808462AC: -/* 1409C 808462AC 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 -/* 140A0 808462B0 8FA40020 */ lw $a0, 0x0020($sp) -/* 140A4 808462B4 3C188086 */ lui $t8, %hi(D_80858AB4) ## $t8 = 80860000 -/* 140A8 808462B8 15E00012 */ bne $t7, $zero, .L80846304 -/* 140AC 808462BC 00000000 */ nop -/* 140B0 808462C0 0C02914C */ jal func_800A4530 -/* 140B4 808462C4 3C0541D8 */ lui $a1, 0x41D8 ## $a1 = 41D80000 -/* 140B8 808462C8 10400006 */ beq $v0, $zero, .L808462E4 -/* 140BC 808462CC 8FA40020 */ lw $a0, 0x0020($sp) -/* 140C0 808462D0 8E020438 */ lw $v0, 0x0438($s0) ## 00000438 -/* 140C4 808462D4 AE0203AC */ sw $v0, 0x03AC($s0) ## 000003AC -/* 140C8 808462D8 AE02011C */ sw $v0, 0x011C($s0) ## 0000011C -/* 140CC 808462DC 10000019 */ beq $zero, $zero, .L80846344 -/* 140D0 808462E0 AC500118 */ sw $s0, 0x0118($v0) ## 00000118 -.L808462E4: -/* 140D4 808462E4 0C02914C */ jal func_800A4530 -/* 140D8 808462E8 3C0541C8 */ lui $a1, 0x41C8 ## $a1 = 41C80000 -/* 140DC 808462EC 10400015 */ beq $v0, $zero, .L80846344 -/* 140E0 808462F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 140E4 808462F4 0C20C9A6 */ jal func_80832698 -/* 140E8 808462F8 24056801 */ addiu $a1, $zero, 0x6801 ## $a1 = 00006801 -/* 140EC 808462FC 10000012 */ beq $zero, $zero, .L80846348 -/* 140F0 80846300 8FBF001C */ lw $ra, 0x001C($sp) -.L80846304: -/* 140F4 80846304 8F188AB4 */ lw $t8, %lo(D_80858AB4)($t8) -/* 140F8 80846308 3C068084 */ lui $a2, %hi(func_80846358) ## $a2 = 80840000 -/* 140FC 8084630C 24C66358 */ addiu $a2, $a2, %lo(func_80846358) ## $a2 = 80846358 -/* 14100 80846310 9719000C */ lhu $t9, 0x000C($t8) ## 0000000C -/* 14104 80846314 8FA4002C */ lw $a0, 0x002C($sp) -/* 14108 80846318 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1410C 8084631C 3328C007 */ andi $t0, $t9, 0xC007 ## $t0 = 00000000 -/* 14110 80846320 51000009 */ beql $t0, $zero, .L80846348 -/* 14114 80846324 8FBF001C */ lw $ra, 0x001C($sp) -/* 14118 80846328 0C20D716 */ jal func_80835C58 -/* 1411C 8084632C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 14120 80846330 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 14124 80846334 24C632B8 */ addiu $a2, $a2, 0x32B8 ## $a2 = 040032B8 -/* 14128 80846338 8FA4002C */ lw $a0, 0x002C($sp) -/* 1412C 8084633C 0C20C899 */ jal func_80832264 -/* 14130 80846340 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L80846344: -/* 14134 80846344 8FBF001C */ lw $ra, 0x001C($sp) -.L80846348: -/* 14138 80846348 8FB00018 */ lw $s0, 0x0018($sp) -/* 1413C 8084634C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 14140 80846350 03E00008 */ jr $ra -/* 14144 80846354 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846358.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846358.s deleted file mode 100644 index d5859a4e6b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846358.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80846358 -/* 14148 80846358 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1414C 8084635C AFB00018 */ sw $s0, 0x0018($sp) -/* 14150 80846360 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 14154 80846364 AFBF001C */ sw $ra, 0x001C($sp) -/* 14158 80846368 AFA5002C */ sw $a1, 0x002C($sp) -/* 1415C 8084636C 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 -/* 14160 80846370 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 14164 80846374 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001B4 -/* 14168 80846378 0C028EF0 */ jal func_800A3BC0 -/* 1416C 8084637C AFA60020 */ sw $a2, 0x0020($sp) -/* 14170 80846380 10400006 */ beq $v0, $zero, .L8084639C -/* 14174 80846384 8FA60020 */ lw $a2, 0x0020($sp) -/* 14178 80846388 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1417C 8084638C 0C20E7E4 */ jal func_80839F90 -/* 14180 80846390 8FA5002C */ lw $a1, 0x002C($sp) -/* 14184 80846394 10000018 */ beq $zero, $zero, .L808463F8 -/* 14188 80846398 8FBF001C */ lw $ra, 0x001C($sp) -.L8084639C: -/* 1418C 8084639C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 14190 808463A0 0C02914C */ jal func_800A4530 -/* 14194 808463A4 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 14198 808463A8 10400012 */ beq $v0, $zero, .L808463F4 -/* 1419C 808463AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 141A0 808463B0 8E0203AC */ lw $v0, 0x03AC($s0) ## 000003AC -/* 141A4 808463B4 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 141A8 808463B8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 141AC 808463BC 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 141B0 808463C0 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 141B4 808463C4 E4440068 */ swc1 $f4, 0x0068($v0) ## 00000068 -/* 141B8 808463C8 A44E0032 */ sh $t6, 0x0032($v0) ## 00000032 -/* 141BC 808463CC E4460060 */ swc1 $f6, 0x0060($v0) ## 00000060 -/* 141C0 808463D0 8FA4002C */ lw $a0, 0x002C($sp) -/* 141C4 808463D4 0C20D191 */ jal func_80834644 -/* 141C8 808463D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 141CC 808463DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 141D0 808463E0 0C00BDF7 */ jal func_8002F7DC -/* 141D4 808463E4 2405083A */ addiu $a1, $zero, 0x083A ## $a1 = 0000083A -/* 141D8 808463E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 141DC 808463EC 0C20C9A6 */ jal func_80832698 -/* 141E0 808463F0 24056800 */ addiu $a1, $zero, 0x6800 ## $a1 = 00006800 -.L808463F4: -/* 141E4 808463F4 8FBF001C */ lw $ra, 0x001C($sp) -.L808463F8: -/* 141E8 808463F8 8FB00018 */ lw $s0, 0x0018($sp) -/* 141EC 808463FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 141F0 80846400 03E00008 */ jr $ra -/* 141F4 80846404 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846408.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846408.s deleted file mode 100644 index 6e4d3f9b80..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846408.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80846408 -/* 141F8 80846408 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 141FC 8084640C AFB00018 */ sw $s0, 0x0018($sp) -/* 14200 80846410 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 14204 80846414 AFBF001C */ sw $ra, 0x001C($sp) -/* 14208 80846418 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 1420C 8084641C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 14210 80846420 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 14214 80846424 0C028EF0 */ jal func_800A3BC0 -/* 14218 80846428 AFA70024 */ sw $a3, 0x0024($sp) -/* 1421C 8084642C 10400009 */ beq $v0, $zero, .L80846454 -/* 14220 80846430 8FA70024 */ lw $a3, 0x0024($sp) -/* 14224 80846434 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 14228 80846438 24C63070 */ addiu $a2, $a2, 0x3070 ## $a2 = 04003070 -/* 1422C 8084643C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 14230 80846440 0C20C8A1 */ jal func_80832284 -/* 14234 80846444 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 14238 80846448 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F -/* 1423C 8084644C 10000013 */ beq $zero, $zero, .L8084649C -/* 14240 80846450 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -.L80846454: -/* 14244 80846454 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 14248 80846458 10400010 */ beq $v0, $zero, .L8084649C -/* 1424C 8084645C 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 14250 80846460 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 -/* 14254 80846464 86180850 */ lh $t8, 0x0850($s0) ## 00000850 -/* 14258 80846468 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 1425C 8084646C 24A53068 */ addiu $a1, $a1, 0x3068 ## $a1 = 04003068 -/* 14260 80846470 1700000A */ bne $t8, $zero, .L8084649C -/* 14264 80846474 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 14268 80846478 0C20E826 */ jal func_8083A098 -/* 1426C 8084647C 00E03025 */ or $a2, $a3, $zero ## $a2 = 00000000 -/* 14270 80846480 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 14274 80846484 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 14278 80846488 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1427C 8084648C 03214024 */ and $t0, $t9, $at -/* 14280 80846490 AE08067C */ sw $t0, 0x067C($s0) ## 0000067C -/* 14284 80846494 0C20C9A6 */ jal func_80832698 -/* 14288 80846498 24056805 */ addiu $a1, $zero, 0x6805 ## $a1 = 00006805 -.L8084649C: -/* 1428C 8084649C 8FBF001C */ lw $ra, 0x001C($sp) -/* 14290 808464A0 8FB00018 */ lw $s0, 0x0018($sp) -/* 14294 808464A4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 14298 808464A8 03E00008 */ jr $ra -/* 1429C 808464AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808464B0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808464B0.s deleted file mode 100644 index cda73559c8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808464B0.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_808464B0 -/* 142A0 808464B0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 142A4 808464B4 AFBF001C */ sw $ra, 0x001C($sp) -/* 142A8 808464B8 AFB10018 */ sw $s1, 0x0018($sp) -/* 142AC 808464BC AFB00014 */ sw $s0, 0x0014($sp) -/* 142B0 808464C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 142B4 808464C4 0C20DC87 */ jal func_8083721C -/* 142B8 808464C8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 142BC 808464CC 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 -/* 142C0 808464D0 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001B4 -/* 142C4 808464D4 AFA60020 */ sw $a2, 0x0020($sp) -/* 142C8 808464D8 0C028EF0 */ jal func_800A3BC0 -/* 142CC 808464DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 142D0 808464E0 10400006 */ beq $v0, $zero, .L808464FC -/* 142D4 808464E4 8FA60020 */ lw $a2, 0x0020($sp) -/* 142D8 808464E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 142DC 808464EC 0C20E7E4 */ jal func_80839F90 -/* 142E0 808464F0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 142E4 808464F4 1000001C */ beq $zero, $zero, .L80846568 -/* 142E8 808464F8 8FBF001C */ lw $ra, 0x001C($sp) -.L808464FC: -/* 142EC 808464FC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 142F0 80846500 0C02914C */ jal func_800A4530 -/* 142F4 80846504 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 -/* 142F8 80846508 10400016 */ beq $v0, $zero, .L80846564 -/* 142FC 8084650C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14300 80846510 8E0603AC */ lw $a2, 0x03AC($s0) ## 000003AC -/* 14304 80846514 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 14308 80846518 0C20D591 */ jal func_80835644 -/* 1430C 8084651C AFA60024 */ sw $a2, 0x0024($sp) -/* 14310 80846520 14400010 */ bne $v0, $zero, .L80846564 -/* 14314 80846524 8FA60024 */ lw $a2, 0x0024($sp) -/* 14318 80846528 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 1431C 8084652C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14320 80846530 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 14324 80846534 E4C00060 */ swc1 $f0, 0x0060($a2) ## 00000060 -/* 14328 80846538 E4C00068 */ swc1 $f0, 0x0068($a2) ## 00000068 -/* 1432C 8084653C 0C20D191 */ jal func_80834644 -/* 14330 80846540 AFA60024 */ sw $a2, 0x0024($sp) -/* 14334 80846544 8FA60024 */ lw $a2, 0x0024($sp) -/* 14338 80846548 240100DA */ addiu $at, $zero, 0x00DA ## $at = 000000DA -/* 1433C 8084654C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 14340 80846550 84CE0000 */ lh $t6, 0x0000($a2) ## 00000000 -/* 14344 80846554 55C10004 */ bnel $t6, $at, .L80846568 -/* 14348 80846558 8FBF001C */ lw $ra, 0x001C($sp) -/* 1434C 8084655C 0C20EE3D */ jal func_8083B8F4 -/* 14350 80846560 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L80846564: -/* 14354 80846564 8FBF001C */ lw $ra, 0x001C($sp) -.L80846568: -/* 14358 80846568 8FB00014 */ lw $s0, 0x0014($sp) -/* 1435C 8084656C 8FB10018 */ lw $s1, 0x0018($sp) -/* 14360 80846570 03E00008 */ jr $ra -/* 14364 80846574 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846578.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846578.s deleted file mode 100644 index 786c1d604d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846578.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_80846578 -/* 14368 80846578 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 1436C 8084657C AFBF0024 */ sw $ra, 0x0024($sp) -/* 14370 80846580 AFB00020 */ sw $s0, 0x0020($sp) -/* 14374 80846584 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 14378 80846588 0C20DC87 */ jal func_8083721C -/* 1437C 8084658C AFA5003C */ sw $a1, 0x003C($sp) -/* 14380 80846590 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 14384 80846594 AFA5002C */ sw $a1, 0x002C($sp) -/* 14388 80846598 0C028EF0 */ jal func_800A3BC0 -/* 1438C 8084659C 8FA4003C */ lw $a0, 0x003C($sp) -/* 14390 808465A0 1440000E */ bne $v0, $zero, .L808465DC -/* 14394 808465A4 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 14398 808465A8 C60401CC */ lwc1 $f4, 0x01CC($s0) ## 000001CC -/* 1439C 808465AC 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 -/* 143A0 808465B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 143A4 808465B4 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 143A8 808465B8 4604303E */ c.le.s $f6, $f4 -/* 143AC 808465BC 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 143B0 808465C0 3C073C93 */ lui $a3, 0x3C93 ## $a3 = 3C930000 -/* 143B4 808465C4 8FAE003C */ lw $t6, 0x003C($sp) -/* 143B8 808465C8 45000009 */ bc1f .L808465F0 -/* 143BC 808465CC 34E774BC */ ori $a3, $a3, 0x74BC ## $a3 = 3C9374BC -/* 143C0 808465D0 0C20DC9A */ jal func_80837268 -/* 143C4 808465D4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 143C8 808465D8 10400005 */ beq $v0, $zero, .L808465F0 -.L808465DC: -/* 143CC 808465DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 143D0 808465E0 0C20E7E4 */ jal func_80839F90 -/* 143D4 808465E4 8FA5003C */ lw $a1, 0x003C($sp) -/* 143D8 808465E8 10000010 */ beq $zero, $zero, .L8084662C -/* 143DC 808465EC 8FBF0024 */ lw $ra, 0x0024($sp) -.L808465F0: -/* 143E0 808465F0 8FA4002C */ lw $a0, 0x002C($sp) -/* 143E4 808465F4 0C02914C */ jal func_800A4530 -/* 143E8 808465F8 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 -/* 143EC 808465FC 1040000A */ beq $v0, $zero, .L80846628 -/* 143F0 80846600 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 143F4 80846604 C6080838 */ lwc1 $f8, 0x0838($s0) ## 00000838 -/* 143F8 80846608 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 143FC 8084660C 8FA4003C */ lw $a0, 0x003C($sp) -/* 14400 80846610 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 14404 80846614 460A4400 */ add.s $f16, $f8, $f10 -/* 14408 80846618 3C074140 */ lui $a3, 0x4140 ## $a3 = 41400000 -/* 1440C 8084661C 44068000 */ mfc1 $a2, $f16 -/* 14410 80846620 0C211027 */ jal func_8084409C -/* 14414 80846624 00000000 */ nop -.L80846628: -/* 14418 80846628 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084662C: -/* 1441C 8084662C 8FB00020 */ lw $s0, 0x0020($sp) -/* 14420 80846630 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 14424 80846634 03E00008 */ jr $ra -/* 14428 80846638 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084663C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084663C.s deleted file mode 100644 index 482ccd93ec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084663C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_8084663C -/* 1442C 8084663C AFA40000 */ sw $a0, 0x0000($sp) -/* 14430 80846640 03E00008 */ jr $ra -/* 14434 80846644 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846648.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846648.s deleted file mode 100644 index 9b44c4c6dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846648.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80846648 -/* 14438 80846648 3C0E8084 */ lui $t6, %hi(func_8084663C) ## $t6 = 80840000 -/* 1443C 8084664C AFA40000 */ sw $a0, 0x0000($sp) -/* 14440 80846650 25CE663C */ addiu $t6, $t6, %lo(func_8084663C) ## $t6 = 8084663C -/* 14444 80846654 ACAE0130 */ sw $t6, 0x0130($a1) ## 00000130 -/* 14448 80846658 03E00008 */ jr $ra -/* 1444C 8084665C ACA00134 */ sw $zero, 0x0134($a1) ## 00000134 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s deleted file mode 100644 index 5082449f6d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80846660 -/* 14450 80846660 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 14454 80846664 AFBF002C */ sw $ra, 0x002C($sp) -/* 14458 80846668 AFB00028 */ sw $s0, 0x0028($sp) -/* 1445C 8084666C 3C068085 */ lui $a2, %hi(func_8084F710) ## $a2 = 80850000 -/* 14460 80846670 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 14464 80846674 24C6F710 */ addiu $a2, $a2, %lo(func_8084F710) ## $a2 = 8084F710 -/* 14468 80846678 AFA40030 */ sw $a0, 0x0030($sp) -/* 1446C 8084667C 0C20D716 */ jal func_80835C58 -/* 14470 80846680 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 14474 80846684 8FA40030 */ lw $a0, 0x0030($sp) -/* 14478 80846688 24010057 */ addiu $at, $zero, 0x0057 ## $at = 00000057 -/* 1447C 8084668C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 14480 80846690 848E00A4 */ lh $t6, 0x00A4($a0) ## 000000A4 -/* 14484 80846694 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 14488 80846698 24C63298 */ addiu $a2, $a2, 0x3298 ## $a2 = 04003298 -/* 1448C 8084669C 15C10008 */ bne $t6, $at, .L808466C0 -/* 14490 808466A0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 14494 808466A4 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1360) -/* 14498 808466A8 8DEFF9C0 */ lw $t7, %lo(gSaveContext+0x1360)($t7) -/* 1449C 808466AC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 144A0 808466B0 29E10004 */ slti $at, $t7, 0x0004 -/* 144A4 808466B4 54200003 */ bnel $at, $zero, .L808466C4 -/* 144A8 808466B8 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 144AC 808466BC A218084F */ sb $t8, 0x084F($s0) ## 0000084F -.L808466C0: -/* 144B0 808466C0 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -.L808466C4: -/* 144B4 808466C4 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 144B8 808466C8 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 -/* 144BC 808466CC 03214025 */ or $t0, $t9, $at ## $t0 = 20000000 -/* 144C0 808466D0 AE08067C */ sw $t0, 0x067C($s0) ## 0000067C -/* 144C4 808466D4 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 -/* 144C8 808466D8 44812000 */ mtc1 $at, $f4 ## $f4 = 24.00 -/* 144CC 808466DC 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 144D0 808466E0 AFA90018 */ sw $t1, 0x0018($sp) -/* 144D4 808466E4 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 144D8 808466E8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 144DC 808466EC 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 144E0 808466F0 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 144E4 808466F4 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 144E8 808466F8 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 144EC 808466FC 44814000 */ mtc1 $at, $f8 ## $f8 = 800.00 -/* 144F0 80846700 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 144F4 80846704 46083280 */ add.s $f10, $f6, $f8 -/* 144F8 80846708 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 144FC 8084670C 8FBF002C */ lw $ra, 0x002C($sp) -/* 14500 80846710 8FB00028 */ lw $s0, 0x0028($sp) -/* 14504 80846714 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 14508 80846718 03E00008 */ jr $ra -/* 1450C 8084671C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846720.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846720.s deleted file mode 100644 index cdf4455128..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846720.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80846720 -/* 14510 80846720 3C028016 */ lui $v0, %hi(gSaveContext+4) -/* 14514 80846724 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) -/* 14518 80846728 3C038085 */ lui $v1, %hi(D_808546F0) ## $v1 = 80850000 -/* 1451C 8084672C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 14520 80846730 00621821 */ addu $v1, $v1, $v0 -/* 14524 80846734 906346F0 */ lbu $v1, %lo(D_808546F0)($v1) -/* 14528 80846738 3C0E8085 */ lui $t6, %hi(D_80853E9C) ## $t6 = 80850000 -/* 1452C 8084673C AFBF001C */ sw $ra, 0x001C($sp) -/* 14530 80846740 01C37021 */ addu $t6, $t6, $v1 -/* 14534 80846744 81CE3E9C */ lb $t6, %lo(D_80853E9C)($t6) -/* 14538 80846748 AFB00018 */ sw $s0, 0x0018($sp) -/* 1453C 8084674C AFA40028 */ sw $a0, 0x0028($sp) -/* 14540 80846750 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 14544 80846754 AFA60030 */ sw $a2, 0x0030($sp) -/* 14548 80846758 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1454C 8084675C AFA30024 */ sw $v1, 0x0024($sp) -/* 14550 80846760 0C20D7BF */ jal func_80835EFC -/* 14554 80846764 AFAE0020 */ sw $t6, 0x0020($sp) -/* 14558 80846768 8FA40028 */ lw $a0, 0x0028($sp) -/* 1455C 8084676C 0C20C8ED */ jal func_808323B4 -/* 14560 80846770 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 14564 80846774 8FAF0024 */ lw $t7, 0x0024($sp) -/* 14568 80846778 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1456C 8084677C A20F0152 */ sb $t7, 0x0152($s0) ## 00000152 -/* 14570 80846780 0C023A7E */ jal func_8008E9F8 -/* 14574 80846784 8FA50020 */ lw $a1, 0x0020($sp) -/* 14578 80846788 A2020159 */ sb $v0, 0x0159($s0) ## 00000159 -/* 1457C 8084678C 83A60023 */ lb $a2, 0x0023($sp) -/* 14580 80846790 8FA40028 */ lw $a0, 0x0028($sp) -/* 14584 80846794 0C20CE67 */ jal func_8083399C -/* 14588 80846798 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1458C 8084679C 8FA40028 */ lw $a0, 0x0028($sp) -/* 14590 808467A0 0C20D191 */ jal func_80834644 -/* 14594 808467A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 14598 808467A8 8FB80030 */ lw $t8, 0x0030($sp) -/* 1459C 808467AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 145A0 808467B0 53000004 */ beql $t8, $zero, .L808467C4 -/* 145A4 808467B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 145A8 808467B8 0C00BDF7 */ jal func_8002F7DC -/* 145AC 808467BC 24051803 */ addiu $a1, $zero, 0x1803 ## $a1 = 00001803 -/* 145B0 808467C0 8FBF001C */ lw $ra, 0x001C($sp) -.L808467C4: -/* 145B4 808467C4 8FB00018 */ lw $s0, 0x0018($sp) -/* 145B8 808467C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 145BC 808467CC 03E00008 */ jr $ra -/* 145C0 808467D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s deleted file mode 100644 index ce60168978..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_808467D4 -/* 145C4 808467D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 145C8 808467D8 AFBF002C */ sw $ra, 0x002C($sp) -/* 145CC 808467DC AFB00028 */ sw $s0, 0x0028($sp) -/* 145D0 808467E0 3C068085 */ lui $a2, %hi(func_8084E9AC) ## $a2 = 80850000 -/* 145D4 808467E4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 145D8 808467E8 AFA40030 */ sw $a0, 0x0030($sp) -/* 145DC 808467EC 24C6E9AC */ addiu $a2, $a2, %lo(func_8084E9AC) ## $a2 = 8084E9AC -/* 145E0 808467F0 0C20D716 */ jal func_80835C58 -/* 145E4 808467F4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 145E8 808467F8 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 145EC 808467FC 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 145F0 80846800 3C058085 */ lui $a1, %hi(D_808546F4) ## $a1 = 80850000 -/* 145F4 80846804 01C17825 */ or $t7, $t6, $at ## $t7 = 20000000 -/* 145F8 80846808 AE0F067C */ sw $t7, 0x067C($s0) ## 0000067C -/* 145FC 8084680C 24A546F4 */ addiu $a1, $a1, %lo(D_808546F4) ## $a1 = 808546F4 -/* 14600 80846810 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 14604 80846814 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 14608 80846818 24188000 */ addiu $t8, $zero, 0x8000 ## $t8 = FFFF8000 -/* 1460C 8084681C A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -/* 14610 80846820 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 14614 80846824 8E080678 */ lw $t0, 0x0678($s0) ## 00000678 -/* 14618 80846828 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 1461C 8084682C A619083C */ sh $t9, 0x083C($s0) ## 0000083C -/* 14620 80846830 8D0600A0 */ lw $a2, 0x00A0($t0) ## 000000A0 -/* 14624 80846834 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 -/* 14628 80846838 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 1462C 8084683C AFA90018 */ sw $t1, 0x0018($sp) -/* 14630 80846840 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 14634 80846844 8FA40030 */ lw $a0, 0x0030($sp) -/* 14638 80846848 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1463C 8084684C E7A0001C */ swc1 $f0, 0x001C($sp) -/* 14640 80846850 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 14644 80846854 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 14648 80846858 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 1464C 8084685C 8FA40030 */ lw $a0, 0x0030($sp) -/* 14650 80846860 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 14654 80846864 0C20CBD5 */ jal func_80832F54 -/* 14658 80846868 2406028F */ addiu $a2, $zero, 0x028F ## $a2 = 0000028F -/* 1465C 8084686C 3C0A8016 */ lui $t2, %hi(gSaveContext+4) -/* 14660 80846870 8D4AE664 */ lw $t2, %lo(gSaveContext+4)($t2) -/* 14664 80846874 8FA40030 */ lw $a0, 0x0030($sp) -/* 14668 80846878 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1466C 8084687C 55400004 */ bnel $t2, $zero, .L80846890 -/* 14670 80846880 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 14674 80846884 0C2119C8 */ jal func_80846720 -/* 14678 80846888 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 1467C 8084688C 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -.L80846890: -/* 14680 80846890 A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 -/* 14684 80846894 8FBF002C */ lw $ra, 0x002C($sp) -/* 14688 80846898 8FB00028 */ lw $s0, 0x0028($sp) -/* 1468C 8084689C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 14690 808468A0 03E00008 */ jr $ra -/* 14694 808468A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808468A8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808468A8.s deleted file mode 100644 index 9b82221bdf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808468A8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_808468A8 -/* 14698 808468A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1469C 808468AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 146A0 808468B0 3C068085 */ lui $a2, %hi(func_8084F9A0) ## $a2 = 80850000 -/* 146A4 808468B4 AFA40018 */ sw $a0, 0x0018($sp) -/* 146A8 808468B8 AFA5001C */ sw $a1, 0x001C($sp) -/* 146AC 808468BC 24C6F9A0 */ addiu $a2, $a2, %lo(func_8084F9A0) ## $a2 = 8084F9A0 -/* 146B0 808468C0 0C20D716 */ jal func_80835C58 -/* 146B4 808468C4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 146B8 808468C8 8FA40018 */ lw $a0, 0x0018($sp) -/* 146BC 808468CC 8FA5001C */ lw $a1, 0x001C($sp) -/* 146C0 808468D0 0C20CBD5 */ jal func_80832F54 -/* 146C4 808468D4 2406009B */ addiu $a2, $zero, 0x009B ## $a2 = 0000009B -/* 146C8 808468D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 146CC 808468DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 146D0 808468E0 03E00008 */ jr $ra -/* 146D4 808468E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808468E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808468E8.s deleted file mode 100644 index 4ff23714b2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808468E8.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_808468E8 -/* 146D8 808468E8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 146DC 808468EC AFB00020 */ sw $s0, 0x0020($sp) -/* 146E0 808468F0 AFA40028 */ sw $a0, 0x0028($sp) -/* 146E4 808468F4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 146E8 808468F8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 146EC 808468FC AFBF0024 */ sw $ra, 0x0024($sp) -/* 146F0 80846900 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 146F4 80846904 24A52FE0 */ addiu $a1, $a1, 0x2FE0 ## $a1 = 04002FE0 -/* 146F8 80846908 8FA70028 */ lw $a3, 0x0028($sp) -/* 146FC 8084690C 0C20E27A */ jal func_808389E8 -/* 14700 80846910 3C064140 */ lui $a2, 0x4140 ## $a2 = 41400000 -/* 14704 80846914 3C068085 */ lui $a2, %hi(func_8084F9C0) ## $a2 = 80850000 -/* 14708 80846918 24C6F9C0 */ addiu $a2, $a2, %lo(func_8084F9C0) ## $a2 = 8084F9C0 -/* 1470C 8084691C 8FA40028 */ lw $a0, 0x0028($sp) -/* 14710 80846920 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 14714 80846924 0C20D716 */ jal func_80835C58 -/* 14718 80846928 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 1471C 8084692C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 14720 80846930 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 14724 80846934 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 14728 80846938 4600218D */ trunc.w.s $f6, $f4 -/* 1472C 8084693C 01C17825 */ or $t7, $t6, $at ## $t7 = 20000000 -/* 14730 80846940 AE0F067C */ sw $t7, 0x067C($s0) ## 0000067C -/* 14734 80846944 240513F6 */ addiu $a1, $zero, 0x13F6 ## $a1 = 000013F6 -/* 14738 80846948 44193000 */ mfc1 $t9, $f6 -/* 1473C 8084694C 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 -/* 14740 80846950 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 14744 80846954 A6190894 */ sh $t9, 0x0894($s0) ## 00000894 -/* 14748 80846958 AFA00010 */ sw $zero, 0x0010($sp) -/* 1474C 8084695C 0C02003E */ jal func_800800F8 -/* 14750 80846960 8FA40028 */ lw $a0, 0x0028($sp) -/* 14754 80846964 8FBF0024 */ lw $ra, 0x0024($sp) -/* 14758 80846968 8FB00020 */ lw $s0, 0x0020($sp) -/* 1475C 8084696C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 14760 80846970 03E00008 */ jr $ra -/* 14764 80846974 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846978.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846978.s deleted file mode 100644 index c6cf81f0b6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846978.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80846978 -/* 14768 80846978 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 1476C 8084697C 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 -/* 14770 80846980 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 14774 80846984 AFBF0024 */ sw $ra, 0x0024($sp) -/* 14778 80846988 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 1477C 8084698C 84AE00B6 */ lh $t6, 0x00B6($a1) ## 000000B6 -/* 14780 80846990 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 14784 80846994 44070000 */ mfc1 $a3, $f0 -/* 14788 80846998 01C17821 */ addu $t7, $t6, $at -/* 1478C 8084699C AFAF0014 */ sw $t7, 0x0014($sp) -/* 14790 808469A0 AFA00018 */ sw $zero, 0x0018($sp) -/* 14794 808469A4 0C20DF03 */ jal func_80837C0C -/* 14798 808469A8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 1479C 808469AC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 147A0 808469B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 147A4 808469B4 03E00008 */ jr $ra -/* 147A8 808469B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808469BC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808469BC.s deleted file mode 100644 index 1638ad3eba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808469BC.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_808469BC -/* 147AC 808469BC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 147B0 808469C0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 147B4 808469C4 3C068085 */ lui $a2, %hi(func_8084F698) ## $a2 = 80850000 -/* 147B8 808469C8 24C6F698 */ addiu $a2, $a2, %lo(func_8084F698) ## $a2 = 8084F698 -/* 147BC 808469CC AFA5001C */ sw $a1, 0x001C($sp) -/* 147C0 808469D0 0C20D716 */ jal func_80835C58 -/* 147C4 808469D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 147C8 808469D8 8FA5001C */ lw $a1, 0x001C($sp) -/* 147CC 808469DC 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 147D0 808469E0 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C -/* 147D4 808469E4 ACA00134 */ sw $zero, 0x0134($a1) ## 00000134 -/* 147D8 808469E8 01C17825 */ or $t7, $t6, $at ## $t7 = 20000000 -/* 147DC 808469EC ACAF067C */ sw $t7, 0x067C($a1) ## 0000067C -/* 147E0 808469F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 147E4 808469F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 147E8 808469F8 03E00008 */ jr $ra -/* 147EC 808469FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A00.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A00.s deleted file mode 100644 index be3276326c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A00.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80846A00 -/* 147F0 80846A00 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 147F4 80846A04 AFA50034 */ sw $a1, 0x0034($sp) -/* 147F8 80846A08 8FB80034 */ lw $t8, 0x0034($sp) -/* 147FC 80846A0C AFBF002C */ sw $ra, 0x002C($sp) -/* 14800 80846A10 AFA40030 */ sw $a0, 0x0030($sp) -/* 14804 80846A14 AFA60038 */ sw $a2, 0x0038($sp) -/* 14808 80846A18 C7040028 */ lwc1 $f4, 0x0028($t8) ## 00000028 -/* 1480C 80846A1C 8F070024 */ lw $a3, 0x0024($t8) ## 00000024 -/* 14810 80846A20 00067840 */ sll $t7, $a2, 1 -/* 14814 80846A24 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 14818 80846A28 C706002C */ lwc1 $f6, 0x002C($t8) ## 0000002C -/* 1481C 80846A2C 3C068085 */ lui $a2, %hi(D_80854700) ## $a2 = 80850000 -/* 14820 80846A30 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 14824 80846A34 00CF3021 */ addu $a2, $a2, $t7 -/* 14828 80846A38 84C64700 */ lh $a2, %lo(D_80854700)($a2) -/* 1482C 80846A3C 24841C24 */ addiu $a0, $a0, 0x1C24 ## $a0 = 00001C24 -/* 14830 80846A40 AFA00024 */ sw $zero, 0x0024($sp) -/* 14834 80846A44 AFA00020 */ sw $zero, 0x0020($sp) -/* 14838 80846A48 AFA0001C */ sw $zero, 0x001C($sp) -/* 1483C 80846A4C AFA00018 */ sw $zero, 0x0018($sp) -/* 14840 80846A50 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 14844 80846A54 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 14848 80846A58 8FBF002C */ lw $ra, 0x002C($sp) -/* 1484C 80846A5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 14850 80846A60 03E00008 */ jr $ra -/* 14854 80846A64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A68.s deleted file mode 100644 index 294e7cc9c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A68.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80846A68 -/* 14858 80846A68 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1485C 80846A6C AFBF0014 */ sw $ra, 0x0014($sp) -/* 14860 80846A70 ACA00134 */ sw $zero, 0x0134($a1) ## 00000134 -/* 14864 80846A74 3C068085 */ lui $a2, %hi(func_8085076C) ## $a2 = 80850000 -/* 14868 80846A78 24C6076C */ addiu $a2, $a2, %lo(func_8085076C) ## $a2 = 8085076C -/* 1486C 80846A7C AFA5001C */ sw $a1, 0x001C($sp) -/* 14870 80846A80 0C20D716 */ jal func_80835C58 -/* 14874 80846A84 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 14878 80846A88 8FA5001C */ lw $a1, 0x001C($sp) -/* 1487C 80846A8C 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 14880 80846A90 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C -/* 14884 80846A94 01C17825 */ or $t7, $t6, $at ## $t7 = 20000000 -/* 14888 80846A98 ACAF067C */ sw $t7, 0x067C($a1) ## 0000067C -/* 1488C 80846A9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 14890 80846AA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 14894 80846AA4 03E00008 */ jr $ra -/* 14898 80846AA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s deleted file mode 100644 index 45774ea7f4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s +++ /dev/null @@ -1,145 +0,0 @@ -glabel func_80846AAC -/* 1489C 80846AAC 3C0E8016 */ lui $t6, %hi(gSaveContext+4) -/* 148A0 80846AB0 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) -/* 148A4 80846AB4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 148A8 80846AB8 AFB10028 */ sw $s1, 0x0028($sp) -/* 148AC 80846ABC 000E7880 */ sll $t7, $t6, 2 -/* 148B0 80846AC0 01EE7823 */ subu $t7, $t7, $t6 -/* 148B4 80846AC4 000F7880 */ sll $t7, $t7, 2 -/* 148B8 80846AC8 01EE7821 */ addu $t7, $t7, $t6 -/* 148BC 80846ACC 000F7880 */ sll $t7, $t7, 2 -/* 148C0 80846AD0 3C188085 */ lui $t8, %hi(D_80853428) ## $t8 = 80850000 -/* 148C4 80846AD4 01EE7821 */ addu $t7, $t7, $t6 -/* 148C8 80846AD8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 148CC 80846ADC 000F7880 */ sll $t7, $t7, 2 -/* 148D0 80846AE0 27183428 */ addiu $t8, $t8, %lo(D_80853428) ## $t8 = 80853428 -/* 148D4 80846AE4 AFBF002C */ sw $ra, 0x002C($sp) -/* 148D8 80846AE8 AFB00024 */ sw $s0, 0x0024($sp) -/* 148DC 80846AEC AFA60040 */ sw $a2, 0x0040($sp) -/* 148E0 80846AF0 01F8C821 */ addu $t9, $t7, $t8 -/* 148E4 80846AF4 3C058085 */ lui $a1, %hi(D_80854708) ## $a1 = 80850000 -/* 148E8 80846AF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 148EC 80846AFC AC990678 */ sw $t9, 0x0678($a0) ## 00000678 -/* 148F0 80846B00 0C01E037 */ jal Actor_ProcessInitChain - -/* 148F4 80846B04 24A54708 */ addiu $a1, $a1, %lo(D_80854708) ## $a1 = 80854708 -/* 148F8 80846B08 86090032 */ lh $t1, 0x0032($s0) ## 00000032 -/* 148FC 80846B0C 2408001F */ addiu $t0, $zero, 0x001F ## $t0 = 0000001F -/* 14900 80846B10 AE080670 */ sw $t0, 0x0670($s0) ## 00000670 -/* 14904 80846B14 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14908 80846B18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1490C 80846B1C 0C20D191 */ jal func_80834644 -/* 14910 80846B20 A609083C */ sh $t1, 0x083C($s0) ## 0000083C -/* 14914 80846B24 920A015B */ lbu $t2, 0x015B($s0) ## 0000015B -/* 14918 80846B28 3C078085 */ lui $a3, %hi(D_80853914) ## $a3 = 80850000 -/* 1491C 80846B2C 240C0009 */ addiu $t4, $zero, 0x0009 ## $t4 = 00000009 -/* 14920 80846B30 000A5880 */ sll $t3, $t2, 2 -/* 14924 80846B34 00EB3821 */ addu $a3, $a3, $t3 -/* 14928 80846B38 260D01F8 */ addiu $t5, $s0, 0x01F8 ## $t5 = 000001F8 -/* 1492C 80846B3C 260E0288 */ addiu $t6, $s0, 0x0288 ## $t6 = 00000288 -/* 14930 80846B40 240F0016 */ addiu $t7, $zero, 0x0016 ## $t7 = 00000016 -/* 14934 80846B44 AFAF001C */ sw $t7, 0x001C($sp) -/* 14938 80846B48 AFAE0018 */ sw $t6, 0x0018($sp) -/* 1493C 80846B4C AFAD0014 */ sw $t5, 0x0014($sp) -/* 14940 80846B50 8CE73914 */ lw $a3, %lo(D_80853914)($a3) -/* 14944 80846B54 AFAC0010 */ sw $t4, 0x0010($sp) -/* 14948 80846B58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1494C 80846B5C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 14950 80846B60 0C028E6B */ jal SkelAnime_InitLinkAnimetion -/* 14954 80846B64 8FA60040 */ lw $a2, 0x0040($sp) -/* 14958 80846B68 3C188085 */ lui $t8, %hi(D_80854730) ## $t8 = 80850000 -/* 1495C 80846B6C 27184730 */ addiu $t8, $t8, %lo(D_80854730) ## $t8 = 80854730 -/* 14960 80846B70 8F080000 */ lw $t0, 0x0000($t8) ## 80854730 -/* 14964 80846B74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 14968 80846B78 AA0801F2 */ swl $t0, 0x01F2($s0) ## 000001F2 -/* 1496C 80846B7C BA0801F5 */ swr $t0, 0x01F5($s0) ## 000001F5 -/* 14970 80846B80 97080004 */ lhu $t0, 0x0004($t8) ## 80854734 -/* 14974 80846B84 0C20CCCE */ jal func_80833338 -/* 14978 80846B88 A60801F6 */ sh $t0, 0x01F6($s0) ## 000001F6 -/* 1497C 80846B8C 24090009 */ addiu $t1, $zero, 0x0009 ## $t1 = 00000009 -/* 14980 80846B90 260A070C */ addiu $t2, $s0, 0x070C ## $t2 = 0000070C -/* 14984 80846B94 260B079C */ addiu $t3, $s0, 0x079C ## $t3 = 0000079C -/* 14988 80846B98 240C0016 */ addiu $t4, $zero, 0x0016 ## $t4 = 00000016 -/* 1498C 80846B9C AFAC001C */ sw $t4, 0x001C($sp) -/* 14990 80846BA0 AFAB0018 */ sw $t3, 0x0018($sp) -/* 14994 80846BA4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 14998 80846BA8 AFA90010 */ sw $t1, 0x0010($sp) -/* 1499C 80846BAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 149A0 80846BB0 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 149A4 80846BB4 8FA60040 */ lw $a2, 0x0040($sp) -/* 149A8 80846BB8 0C028E6B */ jal SkelAnime_InitLinkAnimetion -/* 149AC 80846BBC 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 -/* 149B0 80846BC0 3C0D8085 */ lui $t5, %hi(D_80854730) ## $t5 = 80850000 -/* 149B4 80846BC4 25AD4730 */ addiu $t5, $t5, %lo(D_80854730) ## $t5 = 80854730 -/* 149B8 80846BC8 8DAF0000 */ lw $t7, 0x0000($t5) ## 80854730 -/* 149BC 80846BCC 3C188085 */ lui $t8, %hi(D_8085470C) ## $t8 = 80850000 -/* 149C0 80846BD0 2718470C */ addiu $t8, $t8, %lo(D_8085470C) ## $t8 = 8085470C -/* 149C4 80846BD4 AA0F0706 */ swl $t7, 0x0706($s0) ## 00000706 -/* 149C8 80846BD8 BA0F0709 */ swr $t7, 0x0709($s0) ## 00000709 -/* 149CC 80846BDC 95AF0004 */ lhu $t7, 0x0004($t5) ## 80854734 -/* 149D0 80846BE0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 149D4 80846BE4 26050670 */ addiu $a1, $s0, 0x0670 ## $a1 = 00000670 -/* 149D8 80846BE8 A60F070A */ sh $t7, 0x070A($s0) ## 0000070A -/* 149DC 80846BEC AFB80014 */ sw $t8, 0x0014($sp) -/* 149E0 80846BF0 AFA00010 */ sw $zero, 0x0010($sp) -/* 149E4 80846BF4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 149E8 80846BF8 0C009B35 */ jal Effect_Add - ## Effect_Add -/* 149EC 80846BFC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 149F0 80846C00 8E190678 */ lw $t9, 0x0678($s0) ## 00000678 -/* 149F4 80846C04 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Teardrop) -/* 149F8 80846C08 24C6B8C4 */ addiu $a2, %lo(ActorShadow_DrawFunc_Teardrop) -/* 149FC 80846C0C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 14A00 80846C10 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 14A04 80846C14 0C00AC78 */ jal ActorShape_Init - -/* 14A08 80846C18 8F270004 */ lw $a3, 0x0004($t9) ## 00000004 -/* 14A0C 80846C1C 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 14A10 80846C20 A608046C */ sh $t0, 0x046C($s0) ## 0000046C -/* 14A14 80846C24 26050498 */ addiu $a1, $s0, 0x0498 ## $a1 = 00000498 -/* 14A18 80846C28 AFA50030 */ sw $a1, 0x0030($sp) -/* 14A1C 80846C2C 0C0170D9 */ jal Collider_InitCylinder - -/* 14A20 80846C30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14A24 80846C34 3C078085 */ lui $a3, %hi(D_80854624) ## $a3 = 80850000 -/* 14A28 80846C38 8FA50030 */ lw $a1, 0x0030($sp) -/* 14A2C 80846C3C 24E74624 */ addiu $a3, $a3, %lo(D_80854624) ## $a3 = 80854624 -/* 14A30 80846C40 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14A34 80846C44 0C01712B */ jal Collider_SetCylinder - -/* 14A38 80846C48 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 14A3C 80846C4C 260504E4 */ addiu $a1, $s0, 0x04E4 ## $a1 = 000004E4 -/* 14A40 80846C50 AFA50030 */ sw $a1, 0x0030($sp) -/* 14A44 80846C54 0C017406 */ jal Collider_InitQuad -/* 14A48 80846C58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14A4C 80846C5C 3C078085 */ lui $a3, %hi(D_80854650) ## $a3 = 80850000 -/* 14A50 80846C60 8FA50030 */ lw $a1, 0x0030($sp) -/* 14A54 80846C64 24E74650 */ addiu $a3, $a3, %lo(D_80854650) ## $a3 = 80854650 -/* 14A58 80846C68 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14A5C 80846C6C 0C017441 */ jal Collider_SetQuad -/* 14A60 80846C70 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 14A64 80846C74 26050564 */ addiu $a1, $s0, 0x0564 ## $a1 = 00000564 -/* 14A68 80846C78 AFA50030 */ sw $a1, 0x0030($sp) -/* 14A6C 80846C7C 0C017406 */ jal Collider_InitQuad -/* 14A70 80846C80 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14A74 80846C84 3C078085 */ lui $a3, %hi(D_80854650) ## $a3 = 80850000 -/* 14A78 80846C88 8FA50030 */ lw $a1, 0x0030($sp) -/* 14A7C 80846C8C 24E74650 */ addiu $a3, $a3, %lo(D_80854650) ## $a3 = 80854650 -/* 14A80 80846C90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14A84 80846C94 0C017441 */ jal Collider_SetQuad -/* 14A88 80846C98 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 14A8C 80846C9C 260505E4 */ addiu $a1, $s0, 0x05E4 ## $a1 = 000005E4 -/* 14A90 80846CA0 AFA50030 */ sw $a1, 0x0030($sp) -/* 14A94 80846CA4 0C017406 */ jal Collider_InitQuad -/* 14A98 80846CA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14A9C 80846CAC 3C078085 */ lui $a3, %hi(D_808546A0) ## $a3 = 80850000 -/* 14AA0 80846CB0 8FA50030 */ lw $a1, 0x0030($sp) -/* 14AA4 80846CB4 24E746A0 */ addiu $a3, $a3, %lo(D_808546A0) ## $a3 = 808546A0 -/* 14AA8 80846CB8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14AAC 80846CBC 0C017441 */ jal Collider_SetQuad -/* 14AB0 80846CC0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 14AB4 80846CC4 8FBF002C */ lw $ra, 0x002C($sp) -/* 14AB8 80846CC8 8FB00024 */ lw $s0, 0x0024($sp) -/* 14ABC 80846CCC 8FB10028 */ lw $s1, 0x0028($sp) -/* 14AC0 80846CD0 03E00008 */ jr $ra -/* 14AC4 80846CD4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808471F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808471F4.s deleted file mode 100644 index 320317c50d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808471F4.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_808471F4 -/* 14FE4 808471F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 14FE8 808471F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 14FEC 808471FC 84820000 */ lh $v0, 0x0000($a0) ## 00000000 -/* 14FF0 80847200 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 14FF4 80847204 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 14FF8 80847208 04400003 */ bltz $v0, .L80847218 -/* 14FFC 8084720C 00021823 */ subu $v1, $zero, $v0 -/* 15000 80847210 10000001 */ beq $zero, $zero, .L80847218 -/* 15004 80847214 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80847218: -/* 15008 80847218 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 -/* 1500C 8084721C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 15010 80847220 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 15014 80847224 468021A0 */ cvt.s.w $f6, $f4 -/* 15018 80847228 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 1501C 8084722C 44818000 */ mtc1 $at, $f16 ## $f16 = 1000.00 -/* 15020 80847230 46083282 */ mul.s $f10, $f6, $f8 -/* 15024 80847234 46105483 */ div.s $f18, $f10, $f16 -/* 15028 80847238 4600910D */ trunc.w.s $f4, $f18 -/* 1502C 8084723C 44022000 */ mfc1 $v0, $f4 -/* 15030 80847240 00000000 */ nop -/* 15034 80847244 00022400 */ sll $a0, $v0, 16 -/* 15038 80847248 00042403 */ sra $a0, $a0, 16 -/* 1503C 8084724C 28810190 */ slti $at, $a0, 0x0190 -/* 15040 80847250 00023400 */ sll $a2, $v0, 16 -/* 15044 80847254 10200003 */ beq $at, $zero, .L80847264 -/* 15048 80847258 00063403 */ sra $a2, $a2, 16 -/* 1504C 8084725C 10000008 */ beq $zero, $zero, .L80847280 -/* 15050 80847260 24060190 */ addiu $a2, $zero, 0x0190 ## $a2 = 00000190 -.L80847264: -/* 15054 80847264 28810FA1 */ slti $at, $a0, 0x0FA1 -/* 15058 80847268 14200003 */ bne $at, $zero, .L80847278 -/* 1505C 8084726C 00C01825 */ or $v1, $a2, $zero ## $v1 = 00000190 -/* 15060 80847270 10000001 */ beq $zero, $zero, .L80847278 -/* 15064 80847274 24030FA0 */ addiu $v1, $zero, 0x0FA0 ## $v1 = 00000FA0 -.L80847278: -/* 15068 80847278 00033400 */ sll $a2, $v1, 16 -/* 1506C 8084727C 00063403 */ sra $a2, $a2, 16 -.L80847280: -/* 15070 80847280 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 15074 80847284 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 15078 80847288 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1507C 8084728C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 15080 80847290 03E00008 */ jr $ra -/* 15084 80847294 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847298.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847298.s deleted file mode 100644 index 61e5fa1e71..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847298.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_80847298 -/* 15088 80847298 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1508C 8084729C AFBF001C */ sw $ra, 0x001C($sp) -/* 15090 808472A0 AFB00018 */ sw $s0, 0x0018($sp) -/* 15094 808472A4 948206AE */ lhu $v0, 0x06AE($a0) ## 000006AE -/* 15098 808472A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1509C 808472AC 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 150A0 808472B0 55C0000D */ bnel $t6, $zero, .L808472E8 -/* 150A4 808472B4 304B0001 */ andi $t3, $v0, 0x0001 ## $t3 = 00000000 -/* 150A8 808472B8 848F0046 */ lh $t7, 0x0046($a0) ## 00000046 -/* 150AC 808472BC 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 150B0 808472C0 27A40026 */ addiu $a0, $sp, 0x0026 ## $a0 = FFFFFFFE -/* 150B4 808472C4 01F8C823 */ subu $t9, $t7, $t8 -/* 150B8 808472C8 0C211C7D */ jal func_808471F4 -/* 150BC 808472CC A7B90026 */ sh $t9, 0x0026($sp) -/* 150C0 808472D0 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 150C4 808472D4 87A90026 */ lh $t1, 0x0026($sp) -/* 150C8 808472D8 960206AE */ lhu $v0, 0x06AE($s0) ## 000006AE -/* 150CC 808472DC 01095021 */ addu $t2, $t0, $t1 -/* 150D0 808472E0 A60A0046 */ sh $t2, 0x0046($s0) ## 00000046 -/* 150D4 808472E4 304B0001 */ andi $t3, $v0, 0x0001 ## $t3 = 00000000 -.L808472E8: -/* 150D8 808472E8 55600005 */ bnel $t3, $zero, .L80847300 -/* 150DC 808472EC 304C0008 */ andi $t4, $v0, 0x0008 ## $t4 = 00000000 -/* 150E0 808472F0 0C211C7D */ jal func_808471F4 -/* 150E4 808472F4 26040044 */ addiu $a0, $s0, 0x0044 ## $a0 = 00000044 -/* 150E8 808472F8 960206AE */ lhu $v0, 0x06AE($s0) ## 000006AE -/* 150EC 808472FC 304C0008 */ andi $t4, $v0, 0x0008 ## $t4 = 00000000 -.L80847300: -/* 150F0 80847300 55800005 */ bnel $t4, $zero, .L80847318 -/* 150F4 80847304 304D0040 */ andi $t5, $v0, 0x0040 ## $t5 = 00000000 -/* 150F8 80847308 0C211C7D */ jal func_808471F4 -/* 150FC 8084730C 260406B6 */ addiu $a0, $s0, 0x06B6 ## $a0 = 000006B6 -/* 15100 80847310 960206AE */ lhu $v0, 0x06AE($s0) ## 000006AE -/* 15104 80847314 304D0040 */ andi $t5, $v0, 0x0040 ## $t5 = 00000000 -.L80847318: -/* 15108 80847318 55A00005 */ bnel $t5, $zero, .L80847330 -/* 1510C 8084731C 304E0004 */ andi $t6, $v0, 0x0004 ## $t6 = 00000000 -/* 15110 80847320 0C211C7D */ jal func_808471F4 -/* 15114 80847324 260406BC */ addiu $a0, $s0, 0x06BC ## $a0 = 000006BC -/* 15118 80847328 960206AE */ lhu $v0, 0x06AE($s0) ## 000006AE -/* 1511C 8084732C 304E0004 */ andi $t6, $v0, 0x0004 ## $t6 = 00000000 -.L80847330: -/* 15120 80847330 55C00005 */ bnel $t6, $zero, .L80847348 -/* 15124 80847334 304F0010 */ andi $t7, $v0, 0x0010 ## $t7 = 00000000 -/* 15128 80847338 0C211C7D */ jal func_808471F4 -/* 1512C 8084733C 26040048 */ addiu $a0, $s0, 0x0048 ## $a0 = 00000048 -/* 15130 80847340 960206AE */ lhu $v0, 0x06AE($s0) ## 000006AE -/* 15134 80847344 304F0010 */ andi $t7, $v0, 0x0010 ## $t7 = 00000000 -.L80847348: -/* 15138 80847348 55E00005 */ bnel $t7, $zero, .L80847360 -/* 1513C 8084734C 30580020 */ andi $t8, $v0, 0x0020 ## $t8 = 00000000 -/* 15140 80847350 0C211C7D */ jal func_808471F4 -/* 15144 80847354 260406B8 */ addiu $a0, $s0, 0x06B8 ## $a0 = 000006B8 -/* 15148 80847358 960206AE */ lhu $v0, 0x06AE($s0) ## 000006AE -/* 1514C 8084735C 30580020 */ andi $t8, $v0, 0x0020 ## $t8 = 00000000 -.L80847360: -/* 15150 80847360 57000005 */ bnel $t8, $zero, .L80847378 -/* 15154 80847364 30590080 */ andi $t9, $v0, 0x0080 ## $t9 = 00000000 -/* 15158 80847368 0C211C7D */ jal func_808471F4 -/* 1515C 8084736C 260406BA */ addiu $a0, $s0, 0x06BA ## $a0 = 000006BA -/* 15160 80847370 960206AE */ lhu $v0, 0x06AE($s0) ## 000006AE -/* 15164 80847374 30590080 */ andi $t9, $v0, 0x0080 ## $t9 = 00000000 -.L80847378: -/* 15168 80847378 5720000C */ bnel $t9, $zero, .L808473AC -/* 1516C 8084737C 30490100 */ andi $t1, $v0, 0x0100 ## $t1 = 00000000 -/* 15170 80847380 860806B0 */ lh $t0, 0x06B0($s0) ## 000006B0 -/* 15174 80847384 11000005 */ beq $t0, $zero, .L8084739C -/* 15178 80847388 00000000 */ nop -/* 1517C 8084738C 0C211C7D */ jal func_808471F4 -/* 15180 80847390 260406B0 */ addiu $a0, $s0, 0x06B0 ## $a0 = 000006B0 -/* 15184 80847394 10000004 */ beq $zero, $zero, .L808473A8 -/* 15188 80847398 960206AE */ lhu $v0, 0x06AE($s0) ## 000006AE -.L8084739C: -/* 1518C 8084739C 0C211C7D */ jal func_808471F4 -/* 15190 808473A0 260406BE */ addiu $a0, $s0, 0x06BE ## $a0 = 000006BE -/* 15194 808473A4 960206AE */ lhu $v0, 0x06AE($s0) ## 000006AE -.L808473A8: -/* 15198 808473A8 30490100 */ andi $t1, $v0, 0x0100 ## $t1 = 00000000 -.L808473AC: -/* 1519C 808473AC 55200004 */ bnel $t1, $zero, .L808473C0 -/* 151A0 808473B0 A60006AE */ sh $zero, 0x06AE($s0) ## 000006AE -/* 151A4 808473B4 0C211C7D */ jal func_808471F4 -/* 151A8 808473B8 260406C0 */ addiu $a0, $s0, 0x06C0 ## $a0 = 000006C0 -/* 151AC 808473BC A60006AE */ sh $zero, 0x06AE($s0) ## 000006AE -.L808473C0: -/* 151B0 808473C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 151B4 808473C4 8FB00018 */ lw $s0, 0x0018($sp) -/* 151B8 808473C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 151BC 808473CC 03E00008 */ jr $ra -/* 151C0 808473D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808473D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808473D4.s deleted file mode 100644 index 9fdf620378..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808473D4.s +++ /dev/null @@ -1,482 +0,0 @@ -glabel func_808473D4 -/* 151C4 808473D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 151C8 808473D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 151CC 808473DC AFA40030 */ sw $a0, 0x0030($sp) -/* 151D0 808473E0 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 151D4 808473E4 0C042F6F */ jal func_8010BDBC -/* 151D8 808473E8 AFA50034 */ sw $a1, 0x0034($sp) -/* 151DC 808473EC 1440019E */ bne $v0, $zero, .L80847A68 -/* 151E0 808473F0 8FA60034 */ lw $a2, 0x0034($sp) -/* 151E4 808473F4 90CE0002 */ lbu $t6, 0x0002($a2) ## 00000002 -/* 151E8 808473F8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 151EC 808473FC 55C1019B */ bnel $t6, $at, .L80847A6C -/* 151F0 80847400 8FBF0014 */ lw $ra, 0x0014($sp) -/* 151F4 80847404 8CCF03AC */ lw $t7, 0x03AC($a2) ## 000003AC -/* 151F8 80847408 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 151FC 8084740C AFAF002C */ sw $t7, 0x002C($sp) -/* 15200 80847410 8CD80438 */ lw $t8, 0x0438($a2) ## 00000438 -/* 15204 80847414 AFB80028 */ sw $t8, 0x0028($sp) -/* 15208 80847418 90D90846 */ lbu $t9, 0x0846($a2) ## 00000846 -/* 1520C 8084741C 00D96021 */ addu $t4, $a2, $t9 -/* 15210 80847420 818D084B */ lb $t5, 0x084B($t4) ## 0000084B -/* 15214 80847424 AFA60034 */ sw $a2, 0x0034($sp) -/* 15218 80847428 0C20CCAE */ jal func_808332B8 -/* 1521C 8084742C AFAD0020 */ sw $t5, 0x0020($sp) -/* 15220 80847430 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 15224 80847434 8FA50034 */ lw $a1, 0x0034($sp) -/* 15228 80847438 AFA70018 */ sw $a3, 0x0018($sp) -/* 1522C 8084743C 8FA40030 */ lw $a0, 0x0030($sp) -/* 15230 80847440 0C023A37 */ jal func_8008E8DC -/* 15234 80847444 AFA2001C */ sw $v0, 0x001C($sp) -/* 15238 80847448 8FA60034 */ lw $a2, 0x0034($sp) -/* 1523C 8084744C 8FA70018 */ lw $a3, 0x0018($sp) -/* 15240 80847450 1440015F */ bne $v0, $zero, .L808479D0 -/* 15244 80847454 8FA9001C */ lw $t1, 0x001C($sp) -/* 15248 80847458 8CC8067C */ lw $t0, 0x067C($a2) ## 0000067C -/* 1524C 8084745C 000872C0 */ sll $t6, $t0, 11 -/* 15250 80847460 05C30004 */ bgezl $t6, .L80847474 -/* 15254 80847464 80CF0151 */ lb $t7, 0x0151($a2) ## 00000151 -/* 15258 80847468 10000159 */ beq $zero, $zero, .L808479D0 -/* 1525C 8084746C 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 15260 80847470 80CF0151 */ lb $t7, 0x0151($a2) ## 00000151 -.L80847474: -/* 15264 80847474 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 15268 80847478 55E1000A */ bnel $t7, $at, .L808474A4 -/* 1526C 8084747C 8CCA0674 */ lw $t2, 0x0674($a2) ## 00000674 -/* 15270 80847480 84C20860 */ lh $v0, 0x0860($a2) ## 00000860 -/* 15274 80847484 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 15278 80847488 50400006 */ beql $v0, $zero, .L808474A4 -/* 1527C 8084748C 8CCA0674 */ lw $t2, 0x0674($a2) ## 00000674 -/* 15280 80847490 54410150 */ bnel $v0, $at, .L808479D4 -/* 15284 80847494 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 15288 80847498 1000014D */ beq $zero, $zero, .L808479D0 -/* 1528C 8084749C 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 -/* 15290 808474A0 8CCA0674 */ lw $t2, 0x0674($a2) ## 00000674 -.L808474A4: -/* 15294 808474A4 3C188085 */ lui $t8, %hi(func_8084E3C4) ## $t8 = 80850000 -/* 15298 808474A8 2718E3C4 */ addiu $t8, $t8, %lo(func_8084E3C4) ## $t8 = 8084E3C4 -/* 1529C 808474AC 51580149 */ beql $t2, $t8, .L808479D4 -/* 152A0 808474B0 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 152A4 808474B4 8CC40680 */ lw $a0, 0x0680($a2) ## 00000680 -/* 152A8 808474B8 0004CB40 */ sll $t9, $a0, 13 -/* 152AC 808474BC 07220145 */ bltzl $t9, .L808479D4 -/* 152B0 808474C0 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 152B4 808474C4 80CC042C */ lb $t4, 0x042C($a2) ## 0000042C -/* 152B8 808474C8 310D0800 */ andi $t5, $t0, 0x0800 ## $t5 = 00000000 -/* 152BC 808474CC 310B0800 */ andi $t3, $t0, 0x0800 ## $t3 = 00000000 -/* 152C0 808474D0 1180000B */ beq $t4, $zero, .L80847500 -/* 152C4 808474D4 00000000 */ nop -/* 152C8 808474D8 11A00007 */ beq $t5, $zero, .L808474F8 -/* 152CC 808474DC 8FAE002C */ lw $t6, 0x002C($sp) -/* 152D0 808474E0 11C00007 */ beq $t6, $zero, .L80847500 -/* 152D4 808474E4 00000000 */ nop -/* 152D8 808474E8 85CF0000 */ lh $t7, 0x0000($t6) ## 00000000 -/* 152DC 808474EC 240100A1 */ addiu $at, $zero, 0x00A1 ## $at = 000000A1 -/* 152E0 808474F0 15E10003 */ bne $t7, $at, .L80847500 -/* 152E4 808474F4 00000000 */ nop -.L808474F8: -/* 152E8 808474F8 10000135 */ beq $zero, $zero, .L808479D0 -/* 152EC 808474FC 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -.L80847500: -/* 152F0 80847500 11600003 */ beq $t3, $zero, .L80847510 -/* 152F4 80847504 8FB8002C */ lw $t8, 0x002C($sp) -/* 152F8 80847508 1700001F */ bne $t8, $zero, .L80847588 -/* 152FC 8084750C 00000000 */ nop -.L80847510: -/* 15300 80847510 8FA30028 */ lw $v1, 0x0028($sp) -/* 15304 80847514 1060001C */ beq $v1, $zero, .L80847588 -/* 15308 80847518 00000000 */ nop -/* 1530C 8084751C 55200005 */ bnel $t1, $zero, .L80847534 -/* 15310 80847520 80C20434 */ lb $v0, 0x0434($a2) ## 00000434 -/* 15314 80847524 80C20434 */ lb $v0, 0x0434($a2) ## 00000434 -/* 15318 80847528 10400007 */ beq $v0, $zero, .L80847548 -/* 1531C 8084752C 00000000 */ nop -/* 15320 80847530 80C20434 */ lb $v0, 0x0434($a2) ## 00000434 -.L80847534: -/* 15324 80847534 0008C900 */ sll $t9, $t0, 4 -/* 15328 80847538 04410013 */ bgez $v0, .L80847588 -/* 1532C 8084753C 00000000 */ nop -/* 15330 80847540 07200011 */ bltz $t9, .L80847588 -/* 15334 80847544 00000000 */ nop -.L80847548: -/* 15338 80847548 04430004 */ bgezl $v0, .L8084755C -/* 1533C 8084754C 846C0000 */ lh $t4, 0x0000($v1) ## 00000000 -/* 15340 80847550 1000011F */ beq $zero, $zero, .L808479D0 -/* 15344 80847554 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 15348 80847558 846C0000 */ lh $t4, 0x0000($v1) ## 00000000 -.L8084755C: -/* 1534C 8084755C 2401006C */ addiu $at, $zero, 0x006C ## $at = 0000006C -/* 15350 80847560 3C0D8016 */ lui $t5, %hi(gSaveContext+4) -/* 15354 80847564 15810006 */ bne $t4, $at, .L80847580 -/* 15358 80847568 00000000 */ nop -/* 1535C 8084756C 8DADE664 */ lw $t5, %lo(gSaveContext+4)($t5) -/* 15360 80847570 15A00003 */ bne $t5, $zero, .L80847580 -/* 15364 80847574 00000000 */ nop -/* 15368 80847578 10000115 */ beq $zero, $zero, .L808479D0 -/* 1536C 8084757C 2407000C */ addiu $a3, $zero, 0x000C ## $a3 = 0000000C -.L80847580: -/* 15370 80847580 10000113 */ beq $zero, $zero, .L808479D0 -/* 15374 80847584 24070011 */ addiu $a3, $zero, 0x0011 ## $a3 = 00000011 -.L80847588: -/* 15378 80847588 15200005 */ bne $t1, $zero, .L808475A0 -/* 1537C 8084758C 308E0001 */ andi $t6, $a0, 0x0001 ## $t6 = 00000000 -/* 15380 80847590 51C00004 */ beql $t6, $zero, .L808475A4 -/* 15384 80847594 308F0004 */ andi $t7, $a0, 0x0004 ## $t7 = 00000000 -/* 15388 80847598 1000010D */ beq $zero, $zero, .L808479D0 -/* 1538C 8084759C 24070011 */ addiu $a3, $zero, 0x0011 ## $a3 = 00000011 -.L808475A0: -/* 15390 808475A0 308F0004 */ andi $t7, $a0, 0x0004 ## $t7 = 00000000 -.L808475A4: -/* 15394 808475A4 15E00007 */ bne $t7, $zero, .L808475C4 -/* 15398 808475A8 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 1539C 808475AC 01012824 */ and $a1, $t0, $at -/* 153A0 808475B0 14A00006 */ bne $a1, $zero, .L808475CC -/* 153A4 808475B4 00000000 */ nop -/* 153A8 808475B8 8CD80440 */ lw $t8, 0x0440($a2) ## 00000440 -/* 153AC 808475BC 13000003 */ beq $t8, $zero, .L808475CC -/* 153B0 808475C0 00000000 */ nop -.L808475C4: -/* 153B4 808475C4 10000102 */ beq $zero, $zero, .L808479D0 -/* 153B8 808475C8 2407000B */ addiu $a3, $zero, 0x000B ## $a3 = 0000000B -.L808475CC: -/* 153BC 808475CC 50A00033 */ beql $a1, $zero, .L8084769C -/* 153C0 808475D0 308C0002 */ andi $t4, $a0, 0x0002 ## $t4 = 00000000 -/* 153C4 808475D4 8CC30440 */ lw $v1, 0x0440($a2) ## 00000440 -/* 153C8 808475D8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 153CC 808475DC 3C0D8085 */ lui $t5, %hi(func_8084D3E4) ## $t5 = 80850000 -/* 153D0 808475E0 8C62014C */ lw $v0, 0x014C($v1) ## 0000014C -/* 153D4 808475E4 25ADD3E4 */ addiu $t5, $t5, %lo(func_8084D3E4) ## $t5 = 8084D3E4 -/* 153D8 808475E8 50410006 */ beql $v0, $at, .L80847604 -/* 153DC 808475EC 8C6201F0 */ lw $v0, 0x01F0($v1) ## 000001F0 -/* 153E0 808475F0 10400003 */ beq $v0, $zero, .L80847600 -/* 153E4 808475F4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 153E8 808475F8 5441000A */ bnel $v0, $at, .L80847624 -/* 153EC 808475FC 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80847600: -/* 153F0 80847600 8C6201F0 */ lw $v0, 0x01F0($v1) ## 000001F0 -.L80847604: -/* 153F4 80847604 0002CB00 */ sll $t9, $v0, 12 -/* 153F8 80847608 07200005 */ bltz $t9, .L80847620 -/* 153FC 8084760C 00026180 */ sll $t4, $v0, 6 -/* 15400 80847610 05820004 */ bltzl $t4, .L80847624 -/* 15404 80847614 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 15408 80847618 10000002 */ beq $zero, $zero, .L80847624 -/* 1540C 8084761C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80847620: -/* 15410 80847620 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80847624: -/* 15414 80847624 5460001D */ bnel $v1, $zero, .L8084769C -/* 15418 80847628 308C0002 */ andi $t4, $a0, 0x0002 ## $t4 = 00000000 -/* 1541C 8084762C 114D001A */ beq $t2, $t5, .L80847698 -/* 15420 80847630 308E0002 */ andi $t6, $a0, 0x0002 ## $t6 = 00000000 -/* 15424 80847634 11C0000C */ beq $t6, $zero, .L80847668 -/* 15428 80847638 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1542C 8084763C 8CC20694 */ lw $v0, 0x0694($a2) ## 00000694 -/* 15430 80847640 5040000A */ beql $v0, $zero, .L8084766C -/* 15434 80847644 AFA60034 */ sw $a2, 0x0034($sp) -/* 15438 80847648 904F0002 */ lbu $t7, 0x0002($v0) ## 00000002 -/* 1543C 8084764C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 15440 80847650 15E10003 */ bne $t7, $at, .L80847660 -/* 15444 80847654 00000000 */ nop -/* 15448 80847658 100000DD */ beq $zero, $zero, .L808479D0 -/* 1544C 8084765C 2407000F */ addiu $a3, $zero, 0x000F ## $a3 = 0000000F -.L80847660: -/* 15450 80847660 100000DB */ beq $zero, $zero, .L808479D0 -/* 15454 80847664 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L80847668: -/* 15458 80847668 AFA60034 */ sw $a2, 0x0034($sp) -.L8084766C: -/* 1545C 8084766C 0C00B75E */ jal func_8002DD78 -/* 15460 80847670 AFA70018 */ sw $a3, 0x0018($sp) -/* 15464 80847674 8FA60034 */ lw $a2, 0x0034($sp) -/* 15468 80847678 144000D5 */ bne $v0, $zero, .L808479D0 -/* 1546C 8084767C 8FA70018 */ lw $a3, 0x0018($sp) -/* 15470 80847680 8CD8067C */ lw $t8, 0x067C($a2) ## 0000067C -/* 15474 80847684 0018CAC0 */ sll $t9, $t8, 11 -/* 15478 80847688 072200D2 */ bltzl $t9, .L808479D4 -/* 1547C 8084768C 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 15480 80847690 100000CF */ beq $zero, $zero, .L808479D0 -/* 15484 80847694 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -.L80847698: -/* 15488 80847698 308C0002 */ andi $t4, $a0, 0x0002 ## $t4 = 00000000 -.L8084769C: -/* 1548C 8084769C 1180000C */ beq $t4, $zero, .L808476D0 -/* 15490 808476A0 3C010020 */ lui $at, 0x0020 ## $at = 00200000 -/* 15494 808476A4 8CC20694 */ lw $v0, 0x0694($a2) ## 00000694 -/* 15498 808476A8 5040000A */ beql $v0, $zero, .L808476D4 -/* 1549C 808476AC 34212000 */ ori $at, $at, 0x2000 ## $at = 00202000 -/* 154A0 808476B0 904D0002 */ lbu $t5, 0x0002($v0) ## 00000002 -/* 154A4 808476B4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 154A8 808476B8 15A10003 */ bne $t5, $at, .L808476C8 -/* 154AC 808476BC 00000000 */ nop -/* 154B0 808476C0 100000C3 */ beq $zero, $zero, .L808479D0 -/* 154B4 808476C4 2407000F */ addiu $a3, $zero, 0x000F ## $a3 = 0000000F -.L808476C8: -/* 154B8 808476C8 100000C1 */ beq $zero, $zero, .L808479D0 -/* 154BC 808476CC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L808476D0: -/* 154C0 808476D0 34212000 */ ori $at, $at, 0x2000 ## $at = 00002004 -.L808476D4: -/* 154C4 808476D4 01017024 */ and $t6, $t0, $at -/* 154C8 808476D8 15C00005 */ bne $t6, $zero, .L808476F0 -/* 154CC 808476DC 00000000 */ nop -/* 154D0 808476E0 10A00005 */ beq $a1, $zero, .L808476F8 -/* 154D4 808476E4 00047A40 */ sll $t7, $a0, 9 -/* 154D8 808476E8 05E30004 */ bgezl $t7, .L808476FC -/* 154DC 808476EC 0004C3C0 */ sll $t8, $a0, 15 -.L808476F0: -/* 154E0 808476F0 100000B7 */ beq $zero, $zero, .L808479D0 -/* 154E4 808476F4 2407000D */ addiu $a3, $zero, 0x000D ## $a3 = 0000000D -.L808476F8: -/* 154E8 808476F8 0004C3C0 */ sll $t8, $a0, 15 -.L808476FC: -/* 154EC 808476FC 07010003 */ bgez $t8, .L8084770C -/* 154F0 80847700 00000000 */ nop -/* 154F4 80847704 100000B2 */ beq $zero, $zero, .L808479D0 -/* 154F8 80847708 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -.L8084770C: -/* 154FC 8084770C 11600019 */ beq $t3, $zero, .L80847774 -/* 15500 80847710 0008C100 */ sll $t8, $t0, 4 -/* 15504 80847714 80D90434 */ lb $t9, 0x0434($a2) ## 00000434 -/* 15508 80847718 8FAC002C */ lw $t4, 0x002C($sp) -/* 1550C 8084771C 17200015 */ bne $t9, $zero, .L80847774 -/* 15510 80847720 00000000 */ nop -/* 15514 80847724 11800013 */ beq $t4, $zero, .L80847774 -/* 15518 80847728 00000000 */ nop -/* 1551C 8084772C 94CD0088 */ lhu $t5, 0x0088($a2) ## 00000088 -/* 15520 80847730 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 15524 80847734 8FA5002C */ lw $a1, 0x002C($sp) -/* 15528 80847738 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 1552C 8084773C 15C00005 */ bne $t6, $zero, .L80847754 -/* 15530 80847740 00000000 */ nop -/* 15534 80847744 858F0000 */ lh $t7, 0x0000($t4) ## 00000000 -/* 15538 80847748 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 1553C 8084774C 55E100A1 */ bnel $t7, $at, .L808479D4 -/* 15540 80847750 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -.L80847754: -/* 15544 80847754 0C20FABC */ jal func_8083EAF0 -/* 15548 80847758 AFA60034 */ sw $a2, 0x0034($sp) -/* 1554C 8084775C 14400003 */ bne $v0, $zero, .L8084776C -/* 15550 80847760 8FA60034 */ lw $a2, 0x0034($sp) -/* 15554 80847764 1000009A */ beq $zero, $zero, .L808479D0 -/* 15558 80847768 2407000C */ addiu $a3, $zero, 0x000C ## $a3 = 0000000C -.L8084776C: -/* 1555C 8084776C 10000098 */ beq $zero, $zero, .L808479D0 -/* 15560 80847770 24070009 */ addiu $a3, $zero, 0x0009 ## $a3 = 00000009 -.L80847774: -/* 15564 80847774 0700000F */ bltz $t8, .L808477B4 -/* 15568 80847778 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1556C 8084777C AFA60034 */ sw $a2, 0x0034($sp) -/* 15570 80847780 AFA70018 */ sw $a3, 0x0018($sp) -/* 15574 80847784 0C20E835 */ jal func_8083A0D4 -/* 15578 80847788 AFA9001C */ sw $t1, 0x001C($sp) -/* 1557C 8084778C 8FA60034 */ lw $a2, 0x0034($sp) -/* 15580 80847790 8FA70018 */ lw $a3, 0x0018($sp) -/* 15584 80847794 10400007 */ beq $v0, $zero, .L808477B4 -/* 15588 80847798 8FA9001C */ lw $t1, 0x001C($sp) -/* 1558C 8084779C 80D90434 */ lb $t9, 0x0434($a2) ## 00000434 -/* 15590 808477A0 2B21007E */ slti $at, $t9, 0x007E -/* 15594 808477A4 50200004 */ beql $at, $zero, .L808477B8 -/* 15598 808477A8 8CC40680 */ lw $a0, 0x0680($a2) ## 00000680 -/* 1559C 808477AC 10000088 */ beq $zero, $zero, .L808479D0 -/* 155A0 808477B0 24070011 */ addiu $a3, $zero, 0x0011 ## $a3 = 00000011 -.L808477B4: -/* 155A4 808477B4 8CC40680 */ lw $a0, 0x0680($a2) ## 00000680 -.L808477B8: -/* 155A8 808477B8 3C0E8016 */ lui $t6, %hi(gSaveContext+0xa0) -/* 155AC 808477BC 3C0C8012 */ lui $t4, %hi(gUpgradeMasks+0xc) -/* 155B0 808477C0 308D0800 */ andi $t5, $a0, 0x0800 ## $t5 = 00000000 -/* 155B4 808477C4 11A0001F */ beq $t5, $zero, .L80847844 -/* 155B8 808477C8 3C188012 */ lui $t8, %hi(gUpgradeShifts+3) -/* 155BC 808477CC 8DCEE700 */ lw $t6, %lo(gSaveContext+0xa0)($t6) -/* 155C0 808477D0 8D8C71BC */ lw $t4, %lo(gUpgradeMasks+0xc)($t4) -/* 155C4 808477D4 931871F7 */ lbu $t8, %lo(gUpgradeShifts+3)($t8) -/* 155C8 808477D8 3C018085 */ lui $at, %hi(D_80854784) ## $at = 80850000 -/* 155CC 808477DC 01CC7824 */ and $t7, $t6, $t4 -/* 155D0 808477E0 030FC807 */ srav $t9, $t7, $t8 -/* 155D4 808477E4 00196880 */ sll $t5, $t9, 2 -/* 155D8 808477E8 002D0821 */ addu $at, $at, $t5 -/* 155DC 808477EC C4244784 */ lwc1 $f4, %lo(D_80854784)($at) -/* 155E0 808477F0 C4C60084 */ lwc1 $f6, 0x0084($a2) ## 00000084 -/* 155E4 808477F4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 155E8 808477F8 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 155EC 808477FC 46062201 */ sub.s $f8, $f4, $f6 -/* 155F0 80847800 3C078085 */ lui $a3, %hi(D_80854790) ## $a3 = 80850000 -/* 155F4 80847804 460A4403 */ div.s $f16, $f8, $f10 -/* 155F8 80847808 4600848D */ trunc.w.s $f18, $f16 -/* 155FC 8084780C 44029000 */ mfc1 $v0, $f18 -/* 15600 80847810 00000000 */ nop -/* 15604 80847814 04410003 */ bgez $v0, .L80847824 -/* 15608 80847818 28410008 */ slti $at, $v0, 0x0008 -/* 1560C 8084781C 10000006 */ beq $zero, $zero, .L80847838 -/* 15610 80847820 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80847824: -/* 15614 80847824 14200003 */ bne $at, $zero, .L80847834 -/* 15618 80847828 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 1561C 8084782C 10000001 */ beq $zero, $zero, .L80847834 -/* 15620 80847830 24030007 */ addiu $v1, $zero, 0x0007 ## $v1 = 00000007 -.L80847834: -/* 15624 80847834 00601025 */ or $v0, $v1, $zero ## $v0 = 00000007 -.L80847838: -/* 15628 80847838 00E23821 */ addu $a3, $a3, $v0 -/* 1562C 8084783C 10000064 */ beq $zero, $zero, .L808479D0 -/* 15630 80847840 90E74790 */ lbu $a3, %lo(D_80854790)($a3) -.L80847844: -/* 15634 80847844 11200005 */ beq $t1, $zero, .L8084785C -/* 15638 80847848 308C0400 */ andi $t4, $a0, 0x0400 ## $t4 = 00000000 -/* 1563C 8084784C 15800003 */ bne $t4, $zero, .L8084785C -/* 15640 80847850 00000000 */ nop -/* 15644 80847854 1000005E */ beq $zero, $zero, .L808479D0 -/* 15648 80847858 24070007 */ addiu $a3, $zero, 0x0007 ## $a3 = 00000007 -.L8084785C: -/* 1564C 8084785C 5520005D */ bnel $t1, $zero, .L808479D4 -/* 15650 80847860 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 15654 80847864 8CCF067C */ lw $t7, 0x067C($a2) ## 0000067C -/* 15658 80847868 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1565C 8084786C 000FC240 */ sll $t8, $t7, 9 -/* 15660 80847870 0703000F */ bgezl $t8, .L808478B0 -/* 15664 80847874 8CD9067C */ lw $t9, 0x067C($a2) ## 0000067C -/* 15668 80847878 AFA60034 */ sw $a2, 0x0034($sp) -/* 1566C 8084787C 0C20CEF3 */ jal func_80833BCC -/* 15670 80847880 AFA70018 */ sw $a3, 0x0018($sp) -/* 15674 80847884 8FA60034 */ lw $a2, 0x0034($sp) -/* 15678 80847888 14400008 */ bne $v0, $zero, .L808478AC -/* 1567C 8084788C 8FA70018 */ lw $a3, 0x0018($sp) -/* 15680 80847890 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 15684 80847894 AFA60034 */ sw $a2, 0x0034($sp) -/* 15688 80847898 0C023A74 */ jal func_8008E9D0 -/* 1568C 8084789C AFA70018 */ sw $a3, 0x0018($sp) -/* 15690 808478A0 8FA60034 */ lw $a2, 0x0034($sp) -/* 15694 808478A4 1440004A */ bne $v0, $zero, .L808479D0 -/* 15698 808478A8 8FA70018 */ lw $a3, 0x0018($sp) -.L808478AC: -/* 1569C 808478AC 8CD9067C */ lw $t9, 0x067C($a2) ## 0000067C -.L808478B0: -/* 156A0 808478B0 8FAE0020 */ lw $t6, 0x0020($sp) -/* 156A4 808478B4 332D4000 */ andi $t5, $t9, 0x4000 ## $t5 = 00000000 -/* 156A8 808478B8 55A00026 */ bnel $t5, $zero, .L80847954 -/* 156AC 808478BC 8FAC0030 */ lw $t4, 0x0030($sp) -/* 156B0 808478C0 1DC00023 */ bgtz $t6, .L80847950 -/* 156B4 808478C4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 156B8 808478C8 AFA60034 */ sw $a2, 0x0034($sp) -/* 156BC 808478CC 0C023A71 */ jal func_8008E9C4 -/* 156C0 808478D0 AFA70018 */ sw $a3, 0x0018($sp) -/* 156C4 808478D4 8FA60034 */ lw $a2, 0x0034($sp) -/* 156C8 808478D8 1440001B */ bne $v0, $zero, .L80847948 -/* 156CC 808478DC 8FA70018 */ lw $a3, 0x0018($sp) -/* 156D0 808478E0 3C0C8085 */ lui $t4, %hi(D_808535E4) ## $t4 = 80850000 -/* 156D4 808478E4 8D8C35E4 */ lw $t4, %lo(D_808535E4)($t4) -/* 156D8 808478E8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 156DC 808478EC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 156E0 808478F0 51810018 */ beql $t4, $at, .L80847954 -/* 156E4 808478F4 8FAC0030 */ lw $t4, 0x0030($sp) -/* 156E8 808478F8 AFA60034 */ sw $a2, 0x0034($sp) -/* 156EC 808478FC 0C20CECB */ jal func_80833B2C -/* 156F0 80847900 AFA70018 */ sw $a3, 0x0018($sp) -/* 156F4 80847904 8FA60034 */ lw $a2, 0x0034($sp) -/* 156F8 80847908 1440000F */ bne $v0, $zero, .L80847948 -/* 156FC 8084790C 8FA70018 */ lw $a3, 0x0018($sp) -/* 15700 80847910 8FAF0030 */ lw $t7, 0x0030($sp) -/* 15704 80847914 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 15708 80847918 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1570C 8084791C 030FC021 */ addu $t8, $t8, $t7 -/* 15710 80847920 93181CBF */ lbu $t8, 0x1CBF($t8) ## 00011CBF -/* 15714 80847924 5301000B */ beql $t8, $at, .L80847954 -/* 15718 80847928 8FAC0030 */ lw $t4, 0x0030($sp) -/* 1571C 8084792C 8CD9067C */ lw $t9, 0x067C($a2) ## 0000067C -/* 15720 80847930 8FAE0020 */ lw $t6, 0x0020($sp) -/* 15724 80847934 00196A40 */ sll $t5, $t9, 9 -/* 15728 80847938 05A20006 */ bltzl $t5, .L80847954 -/* 1572C 8084793C 8FAC0030 */ lw $t4, 0x0030($sp) -/* 15730 80847940 55C00004 */ bnel $t6, $zero, .L80847954 -/* 15734 80847944 8FAC0030 */ lw $t4, 0x0030($sp) -.L80847948: -/* 15738 80847948 10000021 */ beq $zero, $zero, .L808479D0 -/* 1573C 8084794C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -.L80847950: -/* 15740 80847950 8FAC0030 */ lw $t4, 0x0030($sp) -.L80847954: -/* 15744 80847954 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 15748 80847958 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1574C 8084795C 01EC7821 */ addu $t7, $t7, $t4 -/* 15750 80847960 91EF1CBF */ lbu $t7, 0x1CBF($t7) ## 00011CBF -/* 15754 80847964 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 15758 80847968 51E1000D */ beql $t7, $at, .L808479A0 -/* 1575C 8084796C 80D90151 */ lb $t9, 0x0151($a2) ## 00000151 -/* 15760 80847970 AFA60034 */ sw $a2, 0x0034($sp) -/* 15764 80847974 0C20CEF3 */ jal func_80833BCC -/* 15768 80847978 AFA70018 */ sw $a3, 0x0018($sp) -/* 1576C 8084797C 8FA60034 */ lw $a2, 0x0034($sp) -/* 15770 80847980 10400006 */ beq $v0, $zero, .L8084799C -/* 15774 80847984 8FA70018 */ lw $a3, 0x0018($sp) -/* 15778 80847988 8FB80020 */ lw $t8, 0x0020($sp) -/* 1577C 8084798C 5B000004 */ blezl $t8, .L808479A0 -/* 15780 80847990 80D90151 */ lb $t9, 0x0151($a2) ## 00000151 -/* 15784 80847994 1000000E */ beq $zero, $zero, .L808479D0 -/* 15788 80847998 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -.L8084799C: -/* 1578C 8084799C 80D90151 */ lb $t9, 0x0151($a2) ## 00000151 -.L808479A0: -/* 15790 808479A0 2B210003 */ slti $at, $t9, 0x0003 -/* 15794 808479A4 5020000A */ beql $at, $zero, .L808479D0 -/* 15798 808479A8 24070013 */ addiu $a3, $zero, 0x0013 ## $a3 = 00000013 -/* 1579C 808479AC 8CCD0680 */ lw $t5, 0x0680($a2) ## 00000680 -/* 157A0 808479B0 8FAC0030 */ lw $t4, 0x0030($sp) -/* 157A4 808479B4 000D72C0 */ sll $t6, $t5, 11 -/* 157A8 808479B8 05C30006 */ bgezl $t6, .L808479D4 -/* 157AC 808479BC 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 157B0 808479C0 8D8F1CC8 */ lw $t7, 0x1CC8($t4) ## 00001CC8 -/* 157B4 808479C4 55E00003 */ bnel $t7, $zero, .L808479D4 -/* 157B8 808479C8 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 157BC 808479CC 24070013 */ addiu $a3, $zero, 0x0013 ## $a3 = 00000013 -.L808479D0: -/* 157C0 808479D0 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -.L808479D4: -/* 157C4 808479D4 10E10003 */ beq $a3, $at, .L808479E4 -/* 157C8 808479D8 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 157CC 808479DC 10000006 */ beq $zero, $zero, .L808479F8 -/* 157D0 808479E0 A0D80837 */ sb $t8, 0x0837($a2) ## 00000837 -.L808479E4: -/* 157D4 808479E4 90C20837 */ lbu $v0, 0x0837($a2) ## 00000837 -/* 157D8 808479E8 10400003 */ beq $v0, $zero, .L808479F8 -/* 157DC 808479EC 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 157E0 808479F0 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 157E4 808479F4 A0D90837 */ sb $t9, 0x0837($a2) ## 00000837 -.L808479F8: -/* 157E8 808479F8 8FA40030 */ lw $a0, 0x0030($sp) -/* 157EC 808479FC 30E5FFFF */ andi $a1, $a3, 0xFFFF ## $a1 = 0000000A -/* 157F0 80847A00 0C021BC0 */ jal Interface_SetDoAction -/* 157F4 80847A04 AFA60034 */ sw $a2, 0x0034($sp) -/* 157F8 80847A08 8FA60034 */ lw $a2, 0x0034($sp) -/* 157FC 80847A0C 8FA40030 */ lw $a0, 0x0030($sp) -/* 15800 80847A10 8CCD0680 */ lw $t5, 0x0680($a2) ## 00000680 -/* 15804 80847A14 000D7280 */ sll $t6, $t5, 10 -/* 15808 80847A18 05C10011 */ bgez $t6, .L80847A60 -/* 1580C 80847A1C 00000000 */ nop -/* 15810 80847A20 8CCC0664 */ lw $t4, 0x0664($a2) ## 00000664 -/* 15814 80847A24 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 15818 80847A28 8FA40030 */ lw $a0, 0x0030($sp) -/* 1581C 80847A2C 11800005 */ beq $t4, $zero, .L80847A44 -/* 15820 80847A30 00000000 */ nop -/* 15824 80847A34 0C021BE2 */ jal Interface_SetNaviCall -/* 15828 80847A38 8FA40030 */ lw $a0, 0x0030($sp) -/* 1582C 80847A3C 10000004 */ beq $zero, $zero, .L80847A50 -/* 15830 80847A40 8FA40030 */ lw $a0, 0x0030($sp) -.L80847A44: -/* 15834 80847A44 0C021BE2 */ jal Interface_SetNaviCall -/* 15838 80847A48 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D -/* 1583C 80847A4C 8FA40030 */ lw $a0, 0x0030($sp) -.L80847A50: -/* 15840 80847A50 0C021BE2 */ jal Interface_SetNaviCall -/* 15844 80847A54 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 15848 80847A58 10000004 */ beq $zero, $zero, .L80847A6C -/* 1584C 80847A5C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80847A60: -/* 15850 80847A60 0C021BE2 */ jal Interface_SetNaviCall -/* 15854 80847A64 2405001F */ addiu $a1, $zero, 0x001F ## $a1 = 0000001F -.L80847A68: -/* 15858 80847A68 8FBF0014 */ lw $ra, 0x0014($sp) -.L80847A6C: -/* 1585C 80847A6C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 15860 80847A70 03E00008 */ jr $ra -/* 15864 80847A74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847A78.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847A78.s deleted file mode 100644 index 771818caae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847A78.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_80847A78 -/* 15868 80847A78 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1586C 80847A7C AFBF0014 */ sw $ra, 0x0014($sp) -/* 15870 80847A80 808E014F */ lb $t6, 0x014F($a0) ## 0000014F -/* 15874 80847A84 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 15878 80847A88 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 1587C 80847A8C 546E0007 */ bnel $v1, $t6, .L80847AAC -/* 15880 80847A90 A0A00893 */ sb $zero, 0x0893($a1) ## 00000893 -/* 15884 80847A94 90820893 */ lbu $v0, 0x0893($a0) ## 00000893 -/* 15888 80847A98 10400003 */ beq $v0, $zero, .L80847AA8 -/* 1588C 80847A9C 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 15890 80847AA0 10000002 */ beq $zero, $zero, .L80847AAC -/* 15894 80847AA4 A08F0893 */ sb $t7, 0x0893($a0) ## 00000893 -.L80847AA8: -/* 15898 80847AA8 A0A00893 */ sb $zero, 0x0893($a1) ## 00000893 -.L80847AAC: -/* 1589C 80847AAC 80B8014F */ lb $t8, 0x014F($a1) ## 0000014F -/* 158A0 80847AB0 00782026 */ xor $a0, $v1, $t8 -/* 158A4 80847AB4 2C840001 */ sltiu $a0, $a0, 0x0001 -/* 158A8 80847AB8 10800019 */ beq $a0, $zero, .L80847B20 -/* 158AC 80847ABC 00000000 */ nop -/* 158B0 80847AC0 C4A40084 */ lwc1 $f4, 0x0084($a1) ## 00000084 -/* 158B4 80847AC4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 158B8 80847AC8 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 158BC 80847ACC 4604303E */ c.le.s $f6, $f4 -/* 158C0 80847AD0 00000000 */ nop -/* 158C4 80847AD4 45000002 */ bc1f .L80847AE0 -/* 158C8 80847AD8 00000000 */ nop -/* 158CC 80847ADC 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -.L80847AE0: -/* 158D0 80847AE0 1480000F */ bne $a0, $zero, .L80847B20 -/* 158D4 80847AE4 00000000 */ nop -/* 158D8 80847AE8 3C048085 */ lui $a0, %hi(D_808535E4) ## $a0 = 80850000 -/* 158DC 80847AEC 8C8435E4 */ lw $a0, %lo(D_808535E4)($a0) -/* 158E0 80847AF0 0C20E051 */ jal func_80838144 -/* 158E4 80847AF4 AFA50018 */ sw $a1, 0x0018($sp) -/* 158E8 80847AF8 28430000 */ slti $v1, $v0, 0x0000 -/* 158EC 80847AFC 38640001 */ xori $a0, $v1, 0x0001 ## $a0 = 00000001 -/* 158F0 80847B00 14800007 */ bne $a0, $zero, .L80847B20 -/* 158F4 80847B04 8FA50018 */ lw $a1, 0x0018($sp) -/* 158F8 80847B08 3C048085 */ lui $a0, %hi(D_808535E4) ## $a0 = 80850000 -/* 158FC 80847B0C 8C8435E4 */ lw $a0, %lo(D_808535E4)($a0) -/* 15900 80847B10 0C20E05B */ jal func_8083816C -/* 15904 80847B14 AFA50018 */ sw $a1, 0x0018($sp) -/* 15908 80847B18 8FA50018 */ lw $a1, 0x0018($sp) -/* 1590C 80847B1C 0002202B */ sltu $a0, $zero, $v0 -.L80847B20: -/* 15910 80847B20 1080000A */ beq $a0, $zero, .L80847B4C -/* 15914 80847B24 3C018085 */ lui $at, %hi(D_808535E4) ## $at = 80850000 -/* 15918 80847B28 94A20088 */ lhu $v0, 0x0088($a1) ## 00000088 -/* 1591C 80847B2C 30590001 */ andi $t9, $v0, 0x0001 ## $t9 = 00000000 -/* 15920 80847B30 53200007 */ beql $t9, $zero, .L80847B50 -/* 15924 80847B34 94AA0088 */ lhu $t2, 0x0088($a1) ## 00000088 -/* 15928 80847B38 90A80893 */ lbu $t0, 0x0893($a1) ## 00000893 -/* 1592C 80847B3C 3049FFFE */ andi $t1, $v0, 0xFFFE ## $t1 = 00000000 -/* 15930 80847B40 51000003 */ beql $t0, $zero, .L80847B50 -/* 15934 80847B44 94AA0088 */ lhu $t2, 0x0088($a1) ## 00000088 -/* 15938 80847B48 A4A90088 */ sh $t1, 0x0088($a1) ## 00000088 -.L80847B4C: -/* 1593C 80847B4C 94AA0088 */ lhu $t2, 0x0088($a1) ## 00000088 -.L80847B50: -/* 15940 80847B50 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 15944 80847B54 11600006 */ beq $t3, $zero, .L80847B70 -/* 15948 80847B58 00000000 */ nop -/* 1594C 80847B5C 14800002 */ bne $a0, $zero, .L80847B68 -/* 15950 80847B60 240C0013 */ addiu $t4, $zero, 0x0013 ## $t4 = 00000013 -/* 15954 80847B64 A0AC0893 */ sb $t4, 0x0893($a1) ## 00000893 -.L80847B68: -/* 15958 80847B68 10000009 */ beq $zero, $zero, .L80847B90 -/* 1595C 80847B6C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80847B70: -/* 15960 80847B70 3C048085 */ lui $a0, %hi(D_80853610) ## $a0 = 80850000 -/* 15964 80847B74 24843610 */ addiu $a0, $a0, %lo(D_80853610) ## $a0 = 80853610 -/* 15968 80847B78 AC2035E4 */ sw $zero, %lo(D_808535E4)($at) -/* 1596C 80847B7C A4800000 */ sh $zero, 0x0000($a0) ## 80853610 -/* 15970 80847B80 84830000 */ lh $v1, 0x0000($a0) ## 80853610 -/* 15974 80847B84 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 15978 80847B88 A4A3089A */ sh $v1, 0x089A($a1) ## 0000089A -/* 1597C 80847B8C A4A30898 */ sh $v1, 0x0898($a1) ## 00000898 -.L80847B90: -/* 15980 80847B90 8FBF0014 */ lw $ra, 0x0014($sp) -/* 15984 80847B94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 15988 80847B98 03E00008 */ jr $ra -/* 1598C 80847B9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s index ad93a439de..9da691d679 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s @@ -1,21 +1,27 @@ .late_rodata glabel D_80855488 - .word 0x38A7C5AC + .float 0.00008 + glabel D_8085548C .float 0.1 glabel D_80855490 - .word 0x38000100 + .float 3.051851E-05 + glabel D_80855494 - .word 0x43C7FAE2 + .float 399.96002 + glabel D_80855498 - .word 0x43C7FAE2 + .float 399.96002 + glabel D_8085549C - .word 0x38000100 + .float 3.051851E-05 + glabel D_808554A0 - .word 0x38000100 + .float 3.051851E-05 + glabel D_808554A4 - .word 0x38000100 + .float 3.051851E-05 .text glabel func_80847BA0 @@ -271,20 +277,20 @@ glabel func_80847BA0 /* 15D18 80847F28 11A0013E */ beq $t5, $zero, .L80848424 /* 15D1C 80847F2C A60B0088 */ sh $t3, 0x0088($s0) ## 00000088 /* 15D20 80847F30 44812000 */ mtc1 $at, $f4 ## $f4 = 18.00 -/* 15D24 80847F34 3C018085 */ lui $at, %hi(D_8085479C) ## $at = 80850000 +/* 15D24 80847F34 3C018085 */ lui $at, %hi(D_80854798+4) ## $at = 80850000 /* 15D28 80847F38 8FAF00C8 */ lw $t7, 0x00C8($sp) -/* 15D2C 80847F3C E424479C */ swc1 $f4, %lo(D_8085479C)($at) +/* 15D2C 80847F3C E424479C */ swc1 $f4, %lo(D_80854798+4)($at) /* 15D30 80847F40 8E0E0678 */ lw $t6, 0x0678($s0) ## 00000678 /* 15D34 80847F44 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 15D38 80847F48 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 /* 15D3C 80847F4C C5C60038 */ lwc1 $f6, 0x0038($t6) ## 00000038 -/* 15D40 80847F50 3C018085 */ lui $at, %hi(D_808547A0) ## $at = 80850000 +/* 15D40 80847F50 3C018085 */ lui $at, %hi(D_80854798+8) ## $at = 80850000 /* 15D44 80847F54 25F807C0 */ addiu $t8, $t7, 0x07C0 ## $t8 = 000007C0 /* 15D48 80847F58 46083280 */ add.s $f10, $f6, $f8 /* 15D4C 80847F5C AFB80030 */ sw $t8, 0x0030($sp) /* 15D50 80847F60 3C068085 */ lui $a2, %hi(D_80854798) ## $a2 = 80850000 /* 15D54 80847F64 24C64798 */ addiu $a2, $a2, %lo(D_80854798) ## $a2 = 80854798 -/* 15D58 80847F68 E42A47A0 */ swc1 $f10, %lo(D_808547A0)($at) +/* 15D58 80847F68 E42A47A0 */ swc1 $f10, %lo(D_80854798+8)($at) /* 15D5C 80847F6C 8E190680 */ lw $t9, 0x0680($s0) ## 00000680 /* 15D60 80847F70 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 15D64 80847F74 27A700A0 */ addiu $a3, $sp, 0x00A0 ## $a3 = FFFFFFD8 @@ -517,14 +523,14 @@ glabel func_80847BA0 /* 160B8 808482C8 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 160BC 808482CC 3C0A8086 */ lui $t2, %hi(D_80858AA8) ## $t2 = 80860000 /* 160C0 808482D0 46047180 */ add.s $f6, $f14, $f4 -/* 160C4 808482D4 3C018085 */ lui $at, %hi(D_8085479C) ## $at = 80850000 +/* 160C4 808482D4 3C018085 */ lui $at, %hi(D_80854798+4) ## $at = 80850000 /* 160C8 808482D8 254A8AA8 */ addiu $t2, $t2, %lo(D_80858AA8) ## $t2 = 80858AA8 /* 160CC 808482DC 3C068085 */ lui $a2, %hi(D_80854798) ## $a2 = 80850000 /* 160D0 808482E0 46083281 */ sub.s $f10, $f6, $f8 /* 160D4 808482E4 27B80074 */ addiu $t8, $sp, 0x0074 ## $t8 = FFFFFFAC /* 160D8 808482E8 AFB80010 */ sw $t8, 0x0010($sp) /* 160DC 808482EC 24C64798 */ addiu $a2, $a2, %lo(D_80854798) ## $a2 = 80854798 -/* 160E0 808482F0 E42A479C */ swc1 $f10, %lo(D_8085479C)($at) +/* 160E0 808482F0 E42A479C */ swc1 $f10, %lo(D_80854798+4)($at) /* 160E4 808482F4 AFAA0014 */ sw $t2, 0x0014($sp) /* 160E8 808482F8 8FA400C8 */ lw $a0, 0x00C8($sp) /* 160EC 808482FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s deleted file mode 100644 index f56187ef09..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s +++ /dev/null @@ -1,246 +0,0 @@ -glabel func_808486A8 -/* 16498 808486A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1649C 808486AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 164A0 808486B0 AFA40028 */ sw $a0, 0x0028($sp) -/* 164A4 808486B4 90AE0002 */ lbu $t6, 0x0002($a1) ## 00000002 -/* 164A8 808486B8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 164AC 808486BC 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 164B0 808486C0 55C100CD */ bnel $t6, $at, .L808489F8 -/* 164B4 808486C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 164B8 808486C8 A3A00027 */ sb $zero, 0x0027($sp) -/* 164BC 808486CC 90AF0444 */ lbu $t7, 0x0444($a1) ## 00000444 -/* 164C0 808486D0 51E00009 */ beql $t7, $zero, .L808486F8 -/* 164C4 808486D4 8CE2067C */ lw $v0, 0x067C($a3) ## 0000067C -/* 164C8 808486D8 0C030129 */ jal Gameplay_GetCamera -/* 164CC 808486DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 164D0 808486E0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 164D4 808486E4 0C016911 */ jal func_8005A444 -/* 164D8 808486E8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 164DC 808486EC 100000B2 */ beq $zero, $zero, .L808489B8 -/* 164E0 808486F0 8FAC0028 */ lw $t4, 0x0028($sp) -/* 164E4 808486F4 8CE2067C */ lw $v0, 0x067C($a3) ## 0000067C -.L808486F8: -/* 164E8 808486F8 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 164EC 808486FC 0002C2C0 */ sll $t8, $v0, 11 -/* 164F0 80848700 070200AC */ bltzl $t8, .L808489B4 -/* 164F4 80848704 A3AB0027 */ sb $t3, 0x0027($sp) -/* 164F8 80848708 8CF90118 */ lw $t9, 0x0118($a3) ## 00000118 -/* 164FC 8084870C 53200012 */ beql $t9, $zero, .L80848758 -/* 16500 80848710 8CE30674 */ lw $v1, 0x0674($a3) ## 00000674 -/* 16504 80848714 90E80692 */ lbu $t0, 0x0692($a3) ## 00000692 -/* 16508 80848718 24030009 */ addiu $v1, $zero, 0x0009 ## $v1 = 00000009 -/* 1650C 8084871C 8FA40028 */ lw $a0, 0x0028($sp) -/* 16510 80848720 31090080 */ andi $t1, $t0, 0x0080 ## $t1 = 00000000 -/* 16514 80848724 1120000B */ beq $t1, $zero, .L80848754 -/* 16518 80848728 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1651C 8084872C AFA30018 */ sw $v1, 0x0018($sp) -/* 16520 80848730 0C030129 */ jal Gameplay_GetCamera -/* 16524 80848734 AFA7002C */ sw $a3, 0x002C($sp) -/* 16528 80848738 8FA7002C */ lw $a3, 0x002C($sp) -/* 1652C 8084873C 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 16530 80848740 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 16534 80848744 0C016AA4 */ jal Camera_SetParam -/* 16538 80848748 8CE60118 */ lw $a2, 0x0118($a3) ## 00000118 -/* 1653C 8084874C 1000008D */ beq $zero, $zero, .L80848984 -/* 16540 80848750 8FA30018 */ lw $v1, 0x0018($sp) -.L80848754: -/* 16544 80848754 8CE30674 */ lw $v1, 0x0674($a3) ## 00000674 -.L80848758: -/* 16548 80848758 3C0A8084 */ lui $t2, %hi(func_8084377C) ## $t2 = 80840000 -/* 1654C 8084875C 254A377C */ addiu $t2, $t2, %lo(func_8084377C) ## $t2 = 8084377C -/* 16550 80848760 546A0004 */ bnel $v1, $t2, .L80848774 -/* 16554 80848764 8CEB0680 */ lw $t3, 0x0680($a3) ## 00000680 -/* 16558 80848768 10000086 */ beq $zero, $zero, .L80848984 -/* 1655C 8084876C 24030012 */ addiu $v1, $zero, 0x0012 ## $v1 = 00000012 -/* 16560 80848770 8CEB0680 */ lw $t3, 0x0680($a3) ## 00000680 -.L80848774: -/* 16564 80848774 316C0100 */ andi $t4, $t3, 0x0100 ## $t4 = 00000000 -/* 16568 80848778 51800004 */ beql $t4, $zero, .L8084878C -/* 1656C 8084877C 8CE60664 */ lw $a2, 0x0664($a3) ## 00000664 -/* 16570 80848780 10000080 */ beq $zero, $zero, .L80848984 -/* 16574 80848784 24030013 */ addiu $v1, $zero, 0x0013 ## $v1 = 00000013 -/* 16578 80848788 8CE60664 */ lw $a2, 0x0664($a3) ## 00000664 -.L8084878C: -/* 1657C 8084878C 8FA40028 */ lw $a0, 0x0028($sp) -/* 16580 80848790 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 16584 80848794 10C0001B */ beq $a2, $zero, .L80848804 -/* 16588 80848798 30591000 */ andi $t9, $v0, 0x1000 ## $t9 = 00000000 -/* 1658C 8084879C 8CED0004 */ lw $t5, 0x0004($a3) ## 00000004 -/* 16590 808487A0 24010100 */ addiu $at, $zero, 0x0100 ## $at = 00000100 -/* 16594 808487A4 00027BC0 */ sll $t7, $v0, 15 -/* 16598 808487A8 31AE0100 */ andi $t6, $t5, 0x0100 ## $t6 = 00000000 -/* 1659C 808487AC 15C10003 */ bne $t6, $at, .L808487BC -/* 165A0 808487B0 00000000 */ nop -/* 165A4 808487B4 1000000A */ beq $zero, $zero, .L808487E0 -/* 165A8 808487B8 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -.L808487BC: -/* 165AC 808487BC 05E10008 */ bgez $t7, .L808487E0 -/* 165B0 808487C0 24030004 */ addiu $v1, $zero, 0x0004 ## $v1 = 00000004 -/* 165B4 808487C4 0002C180 */ sll $t8, $v0, 6 -/* 165B8 808487C8 07010003 */ bgez $t8, .L808487D8 -/* 165BC 808487CC 00000000 */ nop -/* 165C0 808487D0 10000003 */ beq $zero, $zero, .L808487E0 -/* 165C4 808487D4 24030014 */ addiu $v1, $zero, 0x0014 ## $v1 = 00000014 -.L808487D8: -/* 165C8 808487D8 10000001 */ beq $zero, $zero, .L808487E0 -/* 165CC 808487DC 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -.L808487E0: -/* 165D0 808487E0 AFA30018 */ sw $v1, 0x0018($sp) -/* 165D4 808487E4 0C030129 */ jal Gameplay_GetCamera -/* 165D8 808487E8 AFA6001C */ sw $a2, 0x001C($sp) -/* 165DC 808487EC 8FA6001C */ lw $a2, 0x001C($sp) -/* 165E0 808487F0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 165E4 808487F4 0C016AA4 */ jal Camera_SetParam -/* 165E8 808487F8 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 165EC 808487FC 10000061 */ beq $zero, $zero, .L80848984 -/* 165F0 80848800 8FA30018 */ lw $v1, 0x0018($sp) -.L80848804: -/* 165F4 80848804 13200003 */ beq $t9, $zero, .L80848814 -/* 165F8 80848808 00024180 */ sll $t0, $v0, 6 -/* 165FC 8084880C 1000005D */ beq $zero, $zero, .L80848984 -/* 16600 80848810 24030011 */ addiu $v1, $zero, 0x0011 ## $v1 = 00000011 -.L80848814: -/* 16604 80848814 0501000E */ bgez $t0, .L80848850 -/* 16608 80848818 30496000 */ andi $t1, $v0, 0x6000 ## $t1 = 00000000 -/* 1660C 8084881C 24030014 */ addiu $v1, $zero, 0x0014 ## $v1 = 00000014 -/* 16610 80848820 AFA30018 */ sw $v1, 0x0018($sp) -/* 16614 80848824 8FA40028 */ lw $a0, 0x0028($sp) -/* 16618 80848828 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1661C 8084882C 0C030129 */ jal Gameplay_GetCamera -/* 16620 80848830 AFA7002C */ sw $a3, 0x002C($sp) -/* 16624 80848834 8FA7002C */ lw $a3, 0x002C($sp) -/* 16628 80848838 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1662C 8084883C 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 16630 80848840 0C016AA4 */ jal Camera_SetParam -/* 16634 80848844 8CE60688 */ lw $a2, 0x0688($a3) ## 00000688 -/* 16638 80848848 1000004E */ beq $zero, $zero, .L80848984 -/* 1663C 8084884C 8FA30018 */ lw $v1, 0x0018($sp) -.L80848850: -/* 16640 80848850 11200009 */ beq $t1, $zero, .L80848878 -/* 16644 80848854 3C014002 */ lui $at, 0x4002 ## $at = 40020000 -/* 16648 80848858 0C20CECB */ jal func_80833B2C -/* 1664C 8084885C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 16650 80848860 10400003 */ beq $v0, $zero, .L80848870 -/* 16654 80848864 00000000 */ nop -/* 16658 80848868 10000046 */ beq $zero, $zero, .L80848984 -/* 1665C 8084886C 2403000F */ addiu $v1, $zero, 0x000F ## $v1 = 0000000F -.L80848870: -/* 16660 80848870 10000044 */ beq $zero, $zero, .L80848984 -/* 16664 80848874 2403000E */ addiu $v1, $zero, 0x000E ## $v1 = 0000000E -.L80848878: -/* 16668 80848878 00415024 */ and $t2, $v0, $at -/* 1666C 8084887C 11400015 */ beq $t2, $zero, .L808488D4 -/* 16670 80848880 3C010024 */ lui $at, 0x0024 ## $at = 00240000 -/* 16674 80848884 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 16678 80848888 0C00B75E */ jal func_8002DD78 -/* 1667C 8084888C AFA7002C */ sw $a3, 0x002C($sp) -/* 16680 80848890 14400006 */ bne $v0, $zero, .L808488AC -/* 16684 80848894 8FA7002C */ lw $a3, 0x002C($sp) -/* 16688 80848898 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 1668C 8084889C 0C20CD2D */ jal func_808334B4 -/* 16690 808488A0 AFA7002C */ sw $a3, 0x002C($sp) -/* 16694 808488A4 10400003 */ beq $v0, $zero, .L808488B4 -/* 16698 808488A8 8FA7002C */ lw $a3, 0x002C($sp) -.L808488AC: -/* 1669C 808488AC 10000035 */ beq $zero, $zero, .L80848984 -/* 166A0 808488B0 24030008 */ addiu $v1, $zero, 0x0008 ## $v1 = 00000008 -.L808488B4: -/* 166A4 808488B4 8CEB067C */ lw $t3, 0x067C($a3) ## 0000067C -/* 166A8 808488B8 000B6280 */ sll $t4, $t3, 10 -/* 166AC 808488BC 05810003 */ bgez $t4, .L808488CC -/* 166B0 808488C0 00000000 */ nop -/* 166B4 808488C4 1000002F */ beq $zero, $zero, .L80848984 -/* 166B8 808488C8 2403000C */ addiu $v1, $zero, 0x000C ## $v1 = 0000000C -.L808488CC: -/* 166BC 808488CC 1000002D */ beq $zero, $zero, .L80848984 -/* 166C0 808488D0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L808488D4: -/* 166C4 808488D4 00416824 */ and $t5, $v0, $at -/* 166C8 808488D8 11A0000B */ beq $t5, $zero, .L80848908 -/* 166CC 808488DC 0002C300 */ sll $t8, $v0, 12 -/* 166D0 808488E0 3C0E8084 */ lui $t6, %hi(func_80845668) ## $t6 = 80840000 -/* 166D4 808488E4 25CE5668 */ addiu $t6, $t6, %lo(func_80845668) ## $t6 = 80845668 -/* 166D8 808488E8 106E0003 */ beq $v1, $t6, .L808488F8 -/* 166DC 808488EC 00027A80 */ sll $t7, $v0, 10 -/* 166E0 808488F0 05E10003 */ bgez $t7, .L80848900 -/* 166E4 808488F4 00000000 */ nop -.L808488F8: -/* 166E8 808488F8 10000022 */ beq $zero, $zero, .L80848984 -/* 166EC 808488FC 24030005 */ addiu $v1, $zero, 0x0005 ## $v1 = 00000005 -.L80848900: -/* 166F0 80848900 10000020 */ beq $zero, $zero, .L80848984 -/* 166F4 80848904 2403000D */ addiu $v1, $zero, 0x000D ## $v1 = 0000000D -.L80848908: -/* 166F8 80848908 07030004 */ bgezl $t8, .L8084891C -/* 166FC 8084890C 80F90843 */ lb $t9, 0x0843($a3) ## 00000843 -/* 16700 80848910 1000001C */ beq $zero, $zero, .L80848984 -/* 16704 80848914 24030010 */ addiu $v1, $zero, 0x0010 ## $v1 = 00000010 -/* 16708 80848918 80F90843 */ lb $t9, 0x0843($a3) ## 00000843 -.L8084891C: -/* 1670C 8084891C 53200009 */ beql $t9, $zero, .L80848944 -/* 16710 80848920 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 16714 80848924 80E30842 */ lb $v1, 0x0842($a3) ## 00000842 -/* 16718 80848928 04600005 */ bltz $v1, .L80848940 -/* 1671C 8084892C 28610018 */ slti $at, $v1, 0x0018 -/* 16720 80848930 50200004 */ beql $at, $zero, .L80848944 -/* 16724 80848934 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 16728 80848938 10000012 */ beq $zero, $zero, .L80848984 -/* 1672C 8084893C 24030012 */ addiu $v1, $zero, 0x0012 ## $v1 = 00000012 -.L80848940: -/* 16730 80848940 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L80848944: -/* 16734 80848944 C4E40838 */ lwc1 $f4, 0x0838($a3) ## 00000838 -/* 16738 80848948 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 1673C 8084894C 00024200 */ sll $t0, $v0, 8 -/* 16740 80848950 46040032 */ c.eq.s $f0, $f4 -/* 16744 80848954 00000000 */ nop -/* 16748 80848958 4502000B */ bc1fl .L80848988 -/* 1674C 8084895C 8FA40028 */ lw $a0, 0x0028($sp) -/* 16750 80848960 05010007 */ bgez $t0, .L80848980 -/* 16754 80848964 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 16758 80848968 8CE90440 */ lw $t1, 0x0440($a3) ## 00000440 -/* 1675C 8084896C C5260068 */ lwc1 $f6, 0x0068($t1) ## 00000068 -/* 16760 80848970 46060032 */ c.eq.s $f0, $f6 -/* 16764 80848974 00000000 */ nop -/* 16768 80848978 45020003 */ bc1fl .L80848988 -/* 1676C 8084897C 8FA40028 */ lw $a0, 0x0028($sp) -.L80848980: -/* 16770 80848980 A3AA0027 */ sb $t2, 0x0027($sp) -.L80848984: -/* 16774 80848984 8FA40028 */ lw $a0, 0x0028($sp) -.L80848988: -/* 16778 80848988 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1677C 8084898C 0C030129 */ jal Gameplay_GetCamera -/* 16780 80848990 AFA30018 */ sw $v1, 0x0018($sp) -/* 16784 80848994 8FA30018 */ lw $v1, 0x0018($sp) -/* 16788 80848998 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1678C 8084899C 00032C00 */ sll $a1, $v1, 16 -/* 16790 808489A0 0C016911 */ jal func_8005A444 -/* 16794 808489A4 00052C03 */ sra $a1, $a1, 16 -/* 16798 808489A8 10000003 */ beq $zero, $zero, .L808489B8 -/* 1679C 808489AC 8FAC0028 */ lw $t4, 0x0028($sp) -/* 167A0 808489B0 A3AB0027 */ sb $t3, 0x0027($sp) -.L808489B4: -/* 167A4 808489B4 8FAC0028 */ lw $t4, 0x0028($sp) -.L808489B8: -/* 167A8 808489B8 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 167AC 808489BC 8D821D20 */ lw $v0, 0x1D20($t4) ## 00001D20 -/* 167B0 808489C0 50400006 */ beql $v0, $zero, .L808489DC -/* 167B4 808489C4 8FAE0028 */ lw $t6, 0x0028($sp) -/* 167B8 808489C8 A3AD0027 */ sb $t5, 0x0027($sp) -/* 167BC 808489CC C440008C */ lwc1 $f0, 0x008C($v0) ## 0000008C -/* 167C0 808489D0 0C03D845 */ jal func_800F6114 -/* 167C4 808489D4 46000304 */ sqrt.s $f12, $f0 -/* 167C8 808489D8 8FAE0028 */ lw $t6, 0x0028($sp) -.L808489DC: -/* 167CC 808489DC 24010049 */ addiu $at, $zero, 0x0049 ## $at = 00000049 -/* 167D0 808489E0 85CF00A4 */ lh $t7, 0x00A4($t6) ## 000000A4 -/* 167D4 808489E4 51E10004 */ beql $t7, $at, .L808489F8 -/* 167D8 808489E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 167DC 808489EC 0C03D7A4 */ jal func_800F5E90 -/* 167E0 808489F0 93A40027 */ lbu $a0, 0x0027($sp) -/* 167E4 808489F4 8FBF0014 */ lw $ra, 0x0014($sp) -.L808489F8: -/* 167E8 808489F8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 167EC 808489FC 03E00008 */ jr $ra -/* 167F0 80848A00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848A04.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848A04.s deleted file mode 100644 index b4a9f2fba3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848A04.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_80848A04 -/* 167F4 80848A04 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 167F8 80848A08 AFBF0034 */ sw $ra, 0x0034($sp) -/* 167FC 80848A0C AFB00030 */ sw $s0, 0x0030($sp) -/* 16800 80848A10 AFA40038 */ sw $a0, 0x0038($sp) -/* 16804 80848A14 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 16808 80848A18 C4A4085C */ lwc1 $f4, 0x085C($a1) ## 0000085C -/* 1680C 80848A1C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 16810 80848A20 46041032 */ c.eq.s $f2, $f4 -/* 16814 80848A24 00000000 */ nop -/* 16818 80848A28 45020006 */ bc1fl .L80848A44 -/* 1681C 80848A2C 86020860 */ lh $v0, 0x0860($s0) ## 00000860 -/* 16820 80848A30 0C20D7D1 */ jal func_80835F44 -/* 16824 80848A34 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 16828 80848A38 1000003E */ beq $zero, $zero, .L80848B34 -/* 1682C 80848A3C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 16830 80848A40 86020860 */ lh $v0, 0x0860($s0) ## 00000860 -.L80848A44: -/* 16834 80848A44 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 16838 80848A48 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 1683C 80848A4C 14400003 */ bne $v0, $zero, .L80848A5C -/* 16840 80848A50 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 16844 80848A54 10000004 */ beq $zero, $zero, .L80848A68 -/* 16848 80848A58 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80848A5C: -/* 1684C 80848A5C A60E0860 */ sh $t6, 0x0860($s0) ## 00000860 -/* 16850 80848A60 86020860 */ lh $v0, 0x0860($s0) ## 00000860 -/* 16854 80848A64 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80848A68: -/* 16858 80848A68 14600009 */ bne $v1, $zero, .L80848A90 -/* 1685C 80848A6C 284100C9 */ slti $at, $v0, 0x00C9 -/* 16860 80848A70 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 16864 80848A74 0C021CCC */ jal Inventory_ChangeAmmo -/* 16868 80848A78 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -/* 1686C 80848A7C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 16870 80848A80 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 16874 80848A84 A60F0860 */ sh $t7, 0x0860($s0) ## 00000860 -/* 16878 80848A88 10000013 */ beq $zero, $zero, .L80848AD8 -/* 1687C 80848A8C E600085C */ swc1 $f0, 0x085C($s0) ## 0000085C -.L80848A90: -/* 16880 80848A90 14200008 */ bne $at, $zero, .L80848AB4 -/* 16884 80848A94 241800D2 */ addiu $t8, $zero, 0x00D2 ## $t8 = 000000D2 -/* 16888 80848A98 0302C823 */ subu $t9, $t8, $v0 -/* 1688C 80848A9C 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 16890 80848AA0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 16894 80848AA4 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 16898 80848AA8 46803220 */ cvt.s.w $f8, $f6 -/* 1689C 80848AAC 1000000A */ beq $zero, $zero, .L80848AD8 -/* 168A0 80848AB0 460A4003 */ div.s $f0, $f8, $f10 -.L80848AB4: -/* 168A4 80848AB4 28410014 */ slti $at, $v0, 0x0014 -/* 168A8 80848AB8 50200008 */ beql $at, $zero, .L80848ADC -/* 168AC 80848ABC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 168B0 80848AC0 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 168B4 80848AC4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 168B8 80848AC8 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 168BC 80848ACC 468084A0 */ cvt.s.w $f18, $f16 -/* 168C0 80848AD0 46049003 */ div.s $f0, $f18, $f4 -/* 168C4 80848AD4 E600085C */ swc1 $f0, 0x085C($s0) ## 0000085C -.L80848AD8: -/* 168C8 80848AD8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -.L80848ADC: -/* 168CC 80848ADC 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 168D0 80848AE0 3C088085 */ lui $t0, %hi(D_808547BC) ## $t0 = 80850000 -/* 168D4 80848AE4 3C098085 */ lui $t1, %hi(D_808547C0) ## $t1 = 80850000 -/* 168D8 80848AE8 46060202 */ mul.s $f8, $f0, $f6 -/* 168DC 80848AEC 252947C0 */ addiu $t1, $t1, %lo(D_808547C0) ## $t1 = 808547C0 -/* 168E0 80848AF0 250847BC */ addiu $t0, $t0, %lo(D_808547BC) ## $t0 = 808547BC -/* 168E4 80848AF4 3C068085 */ lui $a2, %hi(D_808547A4) ## $a2 = 80850000 -/* 168E8 80848AF8 3C078085 */ lui $a3, %hi(D_808547B0) ## $a3 = 80850000 -/* 168EC 80848AFC 240C0008 */ addiu $t4, $zero, 0x0008 ## $t4 = 00000008 -/* 168F0 80848B00 AFAC0020 */ sw $t4, 0x0020($sp) -/* 168F4 80848B04 4600428D */ trunc.w.s $f10, $f8 -/* 168F8 80848B08 24E747B0 */ addiu $a3, $a3, %lo(D_808547B0) ## $a3 = 808547B0 -/* 168FC 80848B0C 24C647A4 */ addiu $a2, $a2, %lo(D_808547A4) ## $a2 = 808547A4 -/* 16900 80848B10 AFA80010 */ sw $t0, 0x0010($sp) -/* 16904 80848B14 440B5000 */ mfc1 $t3, $f10 -/* 16908 80848B18 AFA90014 */ sw $t1, 0x0014($sp) -/* 1690C 80848B1C 8FA40038 */ lw $a0, 0x0038($sp) -/* 16910 80848B20 260508B8 */ addiu $a1, $s0, 0x08B8 ## $a1 = 000008B8 -/* 16914 80848B24 AFA0001C */ sw $zero, 0x001C($sp) -/* 16918 80848B28 0C00A0DB */ jal func_8002836C -/* 1691C 80848B2C AFAB0018 */ sw $t3, 0x0018($sp) -/* 16920 80848B30 8FBF0034 */ lw $ra, 0x0034($sp) -.L80848B34: -/* 16924 80848B34 8FB00030 */ lw $s0, 0x0030($sp) -/* 16928 80848B38 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 1692C 80848B3C 03E00008 */ jr $ra -/* 16930 80848B40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848B44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848B44.s deleted file mode 100644 index 523e868e46..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848B44.s +++ /dev/null @@ -1,88 +0,0 @@ -.late_rodata -glabel D_808554A8 - .word 0x418F3333 - -.text -glabel func_80848B44 -/* 16934 80848B44 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 16938 80848B48 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1693C 80848B4C AFB00020 */ sw $s0, 0x0020($sp) -/* 16940 80848B50 AFA40048 */ sw $a0, 0x0048($sp) -/* 16944 80848B54 90AE0891 */ lbu $t6, 0x0891($a1) ## 00000891 -/* 16948 80848B58 90B80892 */ lbu $t8, 0x0892($a1) ## 00000892 -/* 1694C 80848B5C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 16950 80848B60 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 16954 80848B64 31E300FF */ andi $v1, $t7, 0x00FF ## $v1 = 000000FF -/* 16958 80848B68 0303C821 */ addu $t9, $t8, $v1 -/* 1695C 80848B6C 332200FF */ andi $v0, $t9, 0x00FF ## $v0 = 00000000 -/* 16960 80848B70 28410015 */ slti $at, $v0, 0x0015 -/* 16964 80848B74 A0AF0891 */ sb $t7, 0x0891($a1) ## 00000891 -/* 16968 80848B78 14200039 */ bne $at, $zero, .L80848C60 -/* 1696C 80848B7C A0B90892 */ sb $t9, 0x0892($a1) ## 00000892 -/* 16970 80848B80 00032040 */ sll $a0, $v1, 1 -/* 16974 80848B84 2448FFEC */ addiu $t0, $v0, 0xFFEC ## $t0 = FFFFFFEC -/* 16978 80848B88 28810029 */ slti $at, $a0, 0x0029 -/* 1697C 80848B8C 14200002 */ bne $at, $zero, .L80848B98 -/* 16980 80848B90 A0A80892 */ sb $t0, 0x0892($a1) ## 00000892 -/* 16984 80848B94 24040028 */ addiu $a0, $zero, 0x0028 ## $a0 = 00000028 -.L80848B98: -/* 16988 80848B98 3C018085 */ lui $at, %hi(D_808554A8) ## $at = 80850000 -/* 1698C 80848B9C C42C54A8 */ lwc1 $f12, %lo(D_808554A8)($at) -/* 16990 80848BA0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 16994 80848BA4 AFA40034 */ sw $a0, 0x0034($sp) -/* 16998 80848BA8 4600010D */ trunc.w.s $f4, $f0 -/* 1699C 80848BAC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 169A0 80848BB0 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 169A4 80848BB4 440A2000 */ mfc1 $t2, $f4 -/* 169A8 80848BB8 00000000 */ nop -/* 169AC 80848BBC 000A5880 */ sll $t3, $t2, 2 -/* 169B0 80848BC0 016A5823 */ subu $t3, $t3, $t2 -/* 169B4 80848BC4 000B5880 */ sll $t3, $t3, 2 -/* 169B8 80848BC8 01706021 */ addu $t4, $t3, $s0 -/* 169BC 80848BCC 258D0908 */ addiu $t5, $t4, 0x0908 ## $t5 = 00000908 -/* 169C0 80848BD0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 169C4 80848BD4 AFAD0038 */ sw $t5, 0x0038($sp) -/* 169C8 80848BD8 8FAE0038 */ lw $t6, 0x0038($sp) -/* 169CC 80848BDC C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 169D0 80848BE0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 169D4 80848BE4 C5C60000 */ lwc1 $f6, 0x0000($t6) ## 00000000 -/* 169D8 80848BE8 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 169DC 80848BEC 46060200 */ add.s $f8, $f0, $f6 -/* 169E0 80848BF0 460A4401 */ sub.s $f16, $f8, $f10 -/* 169E4 80848BF4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 169E8 80848BF8 E7B0003C */ swc1 $f16, 0x003C($sp) -/* 169EC 80848BFC 8FAF0038 */ lw $t7, 0x0038($sp) -/* 169F0 80848C00 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 169F4 80848C04 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 169F8 80848C08 C5F20004 */ lwc1 $f18, 0x0004($t7) ## 00000004 -/* 169FC 80848C0C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 16A00 80848C10 46120100 */ add.s $f4, $f0, $f18 -/* 16A04 80848C14 46062201 */ sub.s $f8, $f4, $f6 -/* 16A08 80848C18 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 16A0C 80848C1C E7A80040 */ swc1 $f8, 0x0040($sp) -/* 16A10 80848C20 8FB80038 */ lw $t8, 0x0038($sp) -/* 16A14 80848C24 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 16A18 80848C28 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 16A1C 80848C2C C70A0008 */ lwc1 $f10, 0x0008($t8) ## 00000008 -/* 16A20 80848C30 AFB90010 */ sw $t9, 0x0010($sp) -/* 16A24 80848C34 8FA40048 */ lw $a0, 0x0048($sp) -/* 16A28 80848C38 460A0400 */ add.s $f16, $f0, $f10 -/* 16A2C 80848C3C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 16A30 80848C40 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFF4 -/* 16A34 80848C44 87A70036 */ lh $a3, 0x0036($sp) -/* 16A38 80848C48 46128101 */ sub.s $f4, $f16, $f18 -/* 16A3C 80848C4C 0C00A757 */ jal EffectSsFhgFlash_Spawn2 -/* 16A40 80848C50 E7A40044 */ swc1 $f4, 0x0044($sp) -/* 16A44 80848C54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 16A48 80848C58 0C00BE3C */ jal func_8002F8F0 -/* 16A4C 80848C5C 24050068 */ addiu $a1, $zero, 0x0068 ## $a1 = 00000068 -.L80848C60: -/* 16A50 80848C60 8FBF0024 */ lw $ra, 0x0024($sp) -/* 16A54 80848C64 8FB00020 */ lw $s0, 0x0020($sp) -/* 16A58 80848C68 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 16A5C 80848C6C 03E00008 */ jr $ra -/* 16A60 80848C70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848C74.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848C74.s deleted file mode 100644 index 688a1bdf05..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848C74.s +++ /dev/null @@ -1,200 +0,0 @@ -.late_rodata -glabel D_808554AC - .float 0.4 - -glabel D_808554B0 - .float 0.2 - -glabel D_808554B4 - .word 0x3E4CCCCC -glabel D_808554B8 - .float 0.01 - -glabel D_808554BC - .float 0.02 - -glabel D_808554C0 - .float 0.01 - -.text -glabel func_80848C74 -/* 16A64 80848C74 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 16A68 80848C78 AFBF0044 */ sw $ra, 0x0044($sp) -/* 16A6C 80848C7C AFB30040 */ sw $s3, 0x0040($sp) -/* 16A70 80848C80 AFB2003C */ sw $s2, 0x003C($sp) -/* 16A74 80848C84 AFB10038 */ sw $s1, 0x0038($sp) -/* 16A78 80848C88 AFB00034 */ sw $s0, 0x0034($sp) -/* 16A7C 80848C8C F7BA0028 */ sdc1 $f26, 0x0028($sp) -/* 16A80 80848C90 F7B80020 */ sdc1 $f24, 0x0020($sp) -/* 16A84 80848C94 F7B60018 */ sdc1 $f22, 0x0018($sp) -/* 16A88 80848C98 F7B40010 */ sdc1 $f20, 0x0010($sp) -/* 16A8C 80848C9C 80AE014C */ lb $t6, 0x014C($a1) ## 0000014C -/* 16A90 80848CA0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 16A94 80848CA4 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 16A98 80848CA8 15C10003 */ bne $t6, $at, .L80848CB8 -/* 16A9C 80848CAC 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 16AA0 80848CB0 10000009 */ beq $zero, $zero, .L80848CD8 -/* 16AA4 80848CB4 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -.L80848CB8: -/* 16AA8 80848CB8 3C018085 */ lui $at, %hi(D_808554AC) ## $at = 80850000 -/* 16AAC 80848CBC C42654AC */ lwc1 $f6, %lo(D_808554AC)($at) -/* 16AB0 80848CC0 C4E40838 */ lwc1 $f4, 0x0838($a3) ## 00000838 -/* 16AB4 80848CC4 46062202 */ mul.s $f8, $f4, $f6 -/* 16AB8 80848CC8 4600428D */ trunc.w.s $f10, $f8 -/* 16ABC 80848CCC 44065000 */ mfc1 $a2, $f10 -/* 16AC0 80848CD0 00000000 */ nop -/* 16AC4 80848CD4 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000015 -.L80848CD8: -/* 16AC8 80848CD8 8CF80680 */ lw $t8, 0x0680($a3) ## 00000680 -/* 16ACC 80848CDC 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -/* 16AD0 80848CE0 24F00A61 */ addiu $s0, $a3, 0x0A61 ## $s0 = 00000A61 -/* 16AD4 80848CE4 33190008 */ andi $t9, $t8, 0x0008 ## $t9 = 00000000 -/* 16AD8 80848CE8 13200003 */ beq $t9, $zero, .L80848CF8 -/* 16ADC 80848CEC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 16AE0 80848CF0 10000002 */ beq $zero, $zero, .L80848CFC -/* 16AE4 80848CF4 24020064 */ addiu $v0, $zero, 0x0064 ## $v0 = 00000064 -.L80848CF8: -/* 16AE8 80848CF8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80848CFC: -/* 16AEC 80848CFC 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 16AF0 80848D00 AFA20058 */ sw $v0, 0x0058($sp) -/* 16AF4 80848D04 AFA60054 */ sw $a2, 0x0054($sp) -/* 16AF8 80848D08 0C20E067 */ jal func_8083819C -/* 16AFC 80848D0C AFA7007C */ sw $a3, 0x007C($sp) -/* 16B00 80848D10 3C018085 */ lui $at, %hi(D_808554B0) ## $at = 80850000 -/* 16B04 80848D14 C43A54B0 */ lwc1 $f26, %lo(D_808554B0)($at) -/* 16B08 80848D18 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 16B0C 80848D1C 4481C000 */ mtc1 $at, $f24 ## $f24 = 1.00 -/* 16B10 80848D20 3C018085 */ lui $at, %hi(D_808554B4) ## $at = 80850000 -/* 16B14 80848D24 C43454B4 */ lwc1 $f20, %lo(D_808554B4)($at) -/* 16B18 80848D28 3C018085 */ lui $at, %hi(D_808554B8) ## $at = 80850000 -/* 16B1C 80848D2C 8FA20058 */ lw $v0, 0x0058($sp) -/* 16B20 80848D30 8FA60054 */ lw $a2, 0x0054($sp) -/* 16B24 80848D34 C43254B8 */ lwc1 $f18, %lo(D_808554B8)($at) -/* 16B28 80848D38 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 16B2C 80848D3C 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 16B30 80848D40 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 -/* 16B34 80848D44 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 16B38 80848D48 00461821 */ addu $v1, $v0, $a2 -.L80848D4C: -/* 16B3C 80848D4C 92020000 */ lbu $v0, 0x0000($s0) ## 00000A61 -/* 16B40 80848D50 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 16B44 80848D54 00113400 */ sll $a2, $s1, 16 -/* 16B48 80848D58 0062082A */ slt $at, $v1, $v0 -/* 16B4C 80848D5C 14200003 */ bne $at, $zero, .L80848D6C -/* 16B50 80848D60 00434023 */ subu $t0, $v0, $v1 -/* 16B54 80848D64 1000003E */ beq $zero, $zero, .L80848E60 -/* 16B58 80848D68 A2000000 */ sb $zero, 0x0000($s0) ## 00000A61 -.L80848D6C: -/* 16B5C 80848D6C 310900FF */ andi $t1, $t0, 0x00FF ## $t1 = 00000000 -/* 16B60 80848D70 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 16B64 80848D74 24120001 */ addiu $s2, $zero, 0x0001 ## $s2 = 00000001 -/* 16B68 80848D78 A2080000 */ sb $t0, 0x0000($s0) ## 00000A61 -/* 16B6C 80848D7C 05210005 */ bgez $t1, .L80848D94 -/* 16B70 80848D80 46802320 */ cvt.s.w $f12, $f4 -/* 16B74 80848D84 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 16B78 80848D88 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 16B7C 80848D8C 00000000 */ nop -/* 16B80 80848D90 46066300 */ add.s $f12, $f12, $f6 -.L80848D94: -/* 16B84 80848D94 460C803C */ c.lt.s $f16, $f12 -/* 16B88 80848D98 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 16B8C 80848D9C 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 -/* 16B90 80848DA0 3C018085 */ lui $at, %hi(D_808554BC) ## $at = 80850000 -/* 16B94 80848DA4 45000012 */ bc1f .L80848DF0 -/* 16B98 80848DA8 460A6101 */ sub.s $f4, $f12, $f10 -/* 16B9C 80848DAC 46106201 */ sub.s $f8, $f12, $f16 -/* 16BA0 80848DB0 46124002 */ mul.s $f0, $f8, $f18 -/* 16BA4 80848DB4 4614003C */ c.lt.s $f0, $f20 -/* 16BA8 80848DB8 00000000 */ nop -/* 16BAC 80848DBC 45020004 */ bc1fl .L80848DD0 -/* 16BB0 80848DC0 4600D03C */ c.lt.s $f26, $f0 -/* 16BB4 80848DC4 1000000C */ beq $zero, $zero, .L80848DF8 -/* 16BB8 80848DC8 4600A386 */ mov.s $f14, $f20 -/* 16BBC 80848DCC 4600D03C */ c.lt.s $f26, $f0 -.L80848DD0: -/* 16BC0 80848DD0 00000000 */ nop -/* 16BC4 80848DD4 45020004 */ bc1fl .L80848DE8 -/* 16BC8 80848DD8 46000086 */ mov.s $f2, $f0 -/* 16BCC 80848DDC 10000006 */ beq $zero, $zero, .L80848DF8 -/* 16BD0 80848DE0 4600D386 */ mov.s $f14, $f26 -/* 16BD4 80848DE4 46000086 */ mov.s $f2, $f0 -.L80848DE8: -/* 16BD8 80848DE8 10000003 */ beq $zero, $zero, .L80848DF8 -/* 16BDC 80848DEC 46001386 */ mov.s $f14, $f2 -.L80848DF0: -/* 16BE0 80848DF0 46126382 */ mul.s $f14, $f12, $f18 -/* 16BE4 80848DF4 00000000 */ nop -.L80848DF8: -/* 16BE8 80848DF8 C42654BC */ lwc1 $f6, %lo(D_808554BC)($at) -/* 16BEC 80848DFC 44057000 */ mfc1 $a1, $f14 -/* 16BF0 80848E00 00063403 */ sra $a2, $a2, 16 -/* 16BF4 80848E04 46062002 */ mul.s $f0, $f4, $f6 -/* 16BF8 80848E08 4616003C */ c.lt.s $f0, $f22 -/* 16BFC 80848E0C 00000000 */ nop -/* 16C00 80848E10 45020004 */ bc1fl .L80848E24 -/* 16C04 80848E14 4600C03C */ c.lt.s $f24, $f0 -/* 16C08 80848E18 10000009 */ beq $zero, $zero, .L80848E40 -/* 16C0C 80848E1C 4600B006 */ mov.s $f0, $f22 -/* 16C10 80848E20 4600C03C */ c.lt.s $f24, $f0 -.L80848E24: -/* 16C14 80848E24 00000000 */ nop -/* 16C18 80848E28 45020004 */ bc1fl .L80848E3C -/* 16C1C 80848E2C 46000086 */ mov.s $f2, $f0 -/* 16C20 80848E30 10000002 */ beq $zero, $zero, .L80848E3C -/* 16C24 80848E34 4600C086 */ mov.s $f2, $f24 -/* 16C28 80848E38 46000086 */ mov.s $f2, $f0 -.L80848E3C: -/* 16C2C 80848E3C 46001006 */ mov.s $f0, $f2 -.L80848E40: -/* 16C30 80848E40 44070000 */ mfc1 $a3, $f0 -/* 16C34 80848E44 0C00A921 */ jal func_8002A484 -/* 16C38 80848E48 AFA3004C */ sw $v1, 0x004C($sp) -/* 16C3C 80848E4C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 16C40 80848E50 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 16C44 80848E54 3C018085 */ lui $at, %hi(D_808554C0) ## $at = 80850000 -/* 16C48 80848E58 C43254C0 */ lwc1 $f18, %lo(D_808554C0)($at) -/* 16C4C 80848E5C 8FA3004C */ lw $v1, 0x004C($sp) -.L80848E60: -/* 16C50 80848E60 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 16C54 80848E64 24010012 */ addiu $at, $zero, 0x0012 ## $at = 00000012 -/* 16C58 80848E68 1621FFB8 */ bne $s1, $at, .L80848D4C -/* 16C5C 80848E6C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000A62 -/* 16C60 80848E70 12400015 */ beq $s2, $zero, .L80848EC8 -/* 16C64 80848E74 8FAD007C */ lw $t5, 0x007C($sp) -/* 16C68 80848E78 8FA4007C */ lw $a0, 0x007C($sp) -/* 16C6C 80848E7C 0C00BDF7 */ jal func_8002F7DC -/* 16C70 80848E80 24052031 */ addiu $a1, $zero, 0x2031 ## $a1 = 00002031 -/* 16C74 80848E84 866A00A4 */ lh $t2, 0x00A4($s3) ## 000000A4 -/* 16C78 80848E88 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 -/* 16C7C 80848E8C 3C0B0001 */ lui $t3, 0x0001 ## $t3 = 00010000 -/* 16C80 80848E90 15410003 */ bne $t2, $at, .L80848EA0 -/* 16C84 80848E94 01735821 */ addu $t3, $t3, $s3 -/* 16C88 80848E98 10000002 */ beq $zero, $zero, .L80848EA4 -/* 16C8C 80848E9C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80848EA0: -/* 16C90 80848EA0 24020007 */ addiu $v0, $zero, 0x0007 ## $v0 = 00000007 -.L80848EA4: -/* 16C94 80848EA4 8D6B1DE4 */ lw $t3, 0x1DE4($t3) ## 00011DE4 -/* 16C98 80848EA8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 16C9C 80848EAC 004B6024 */ and $t4, $v0, $t3 -/* 16CA0 80848EB0 55800007 */ bnel $t4, $zero, .L80848ED0 -/* 16CA4 80848EB4 8FBF0044 */ lw $ra, 0x0044($sp) -/* 16CA8 80848EB8 0C214C38 */ jal func_808530E0 -/* 16CAC 80848EBC 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -/* 16CB0 80848EC0 10000003 */ beq $zero, $zero, .L80848ED0 -/* 16CB4 80848EC4 8FBF0044 */ lw $ra, 0x0044($sp) -.L80848EC8: -/* 16CB8 80848EC8 A1A00A60 */ sb $zero, 0x0A60($t5) ## 00000A60 -/* 16CBC 80848ECC 8FBF0044 */ lw $ra, 0x0044($sp) -.L80848ED0: -/* 16CC0 80848ED0 D7B40010 */ ldc1 $f20, 0x0010($sp) -/* 16CC4 80848ED4 D7B60018 */ ldc1 $f22, 0x0018($sp) -/* 16CC8 80848ED8 D7B80020 */ ldc1 $f24, 0x0020($sp) -/* 16CCC 80848EDC D7BA0028 */ ldc1 $f26, 0x0028($sp) -/* 16CD0 80848EE0 8FB00034 */ lw $s0, 0x0034($sp) -/* 16CD4 80848EE4 8FB10038 */ lw $s1, 0x0038($sp) -/* 16CD8 80848EE8 8FB2003C */ lw $s2, 0x003C($sp) -/* 16CDC 80848EEC 8FB30040 */ lw $s3, 0x0040($sp) -/* 16CE0 80848EF0 03E00008 */ jr $ra -/* 16CE4 80848EF4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848EF8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848EF8.s deleted file mode 100644 index 9193ff2dd9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848EF8.s +++ /dev/null @@ -1,52 +0,0 @@ -.late_rodata -glabel D_808554C4 - .word 0x48435000 -glabel D_808554C8 - .word 0x4A742400 - -.text -glabel func_80848EF8 -/* 16CE8 80848EF8 3C0E8012 */ lui $t6, %hi(gBitFlags+0x54) -/* 16CEC 80848EFC 3C0F8016 */ lui $t7, %hi(gSaveContext+0xa4) -/* 16CF0 80848F00 8DEFE704 */ lw $t7, %lo(gSaveContext+0xa4)($t7) -/* 16CF4 80848F04 8DCE7174 */ lw $t6, %lo(gBitFlags+0x54)($t6) -/* 16CF8 80848F08 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 16CFC 80848F0C AFBF001C */ sw $ra, 0x001C($sp) -/* 16D00 80848F10 01CFC024 */ and $t8, $t6, $t7 -/* 16D04 80848F14 1300001D */ beq $t8, $zero, .L80848F8C -/* 16D08 80848F18 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 16D0C 80848F1C C48406A4 */ lwc1 $f4, 0x06A4($a0) ## 000006A4 -/* 16D10 80848F20 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 16D14 80848F24 3C018085 */ lui $at, %hi(D_808554C4) ## $at = 80850000 -/* 16D18 80848F28 C42A54C4 */ lwc1 $f10, %lo(D_808554C4)($at) -/* 16D1C 80848F2C 46062202 */ mul.s $f8, $f4, $f6 -/* 16D20 80848F30 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 16D24 80848F34 24050078 */ addiu $a1, $zero, 0x0078 ## $a1 = 00000078 -/* 16D28 80848F38 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 16D2C 80848F3C 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 16D30 80848F40 46085001 */ sub.s $f0, $f10, $f8 -/* 16D34 80848F44 4602003C */ c.lt.s $f0, $f2 -/* 16D38 80848F48 00000000 */ nop -/* 16D3C 80848F4C 45020003 */ bc1fl .L80848F5C -/* 16D40 80848F50 C49006A0 */ lwc1 $f16, 0x06A0($a0) ## 000006A0 -/* 16D44 80848F54 46001006 */ mov.s $f0, $f2 -/* 16D48 80848F58 C49006A0 */ lwc1 $f16, 0x06A0($a0) ## 000006A0 -.L80848F5C: -/* 16D4C 80848F5C 3C018085 */ lui $at, %hi(D_808554C8) ## $at = 80850000 -/* 16D50 80848F60 46008480 */ add.s $f18, $f16, $f0 -/* 16D54 80848F64 E49206A0 */ swc1 $f18, 0x06A0($a0) ## 000006A0 -/* 16D58 80848F68 C48606A0 */ lwc1 $f6, 0x06A0($a0) ## 000006A0 -/* 16D5C 80848F6C C42454C8 */ lwc1 $f4, %lo(D_808554C8)($at) -/* 16D60 80848F70 4606203C */ c.lt.s $f4, $f6 -/* 16D64 80848F74 00000000 */ nop -/* 16D68 80848F78 45020005 */ bc1fl .L80848F90 -/* 16D6C 80848F7C 8FBF001C */ lw $ra, 0x001C($sp) -/* 16D70 80848F80 E48206A0 */ swc1 $f2, 0x06A0($a0) ## 000006A0 -/* 16D74 80848F84 0C20C993 */ jal func_8083264C -/* 16D78 80848F88 AFA00010 */ sw $zero, 0x0010($sp) -.L80848F8C: -/* 16D7C 80848F8C 8FBF001C */ lw $ra, 0x001C($sp) -.L80848F90: -/* 16D80 80848F90 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 16D84 80848F94 03E00008 */ jr $ra -/* 16D88 80848F98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80849EA8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80849EA8.s deleted file mode 100644 index 51792abfd4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80849EA8.s +++ /dev/null @@ -1,156 +0,0 @@ -glabel func_80849EA8 -/* 17C98 80849EA8 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 17C9C 80849EAC AFBF0034 */ sw $ra, 0x0034($sp) -/* 17CA0 80849EB0 AFB10030 */ sw $s1, 0x0030($sp) -/* 17CA4 80849EB4 AFB0002C */ sw $s0, 0x002C($sp) -/* 17CA8 80849EB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 17CAC 80849EBC 0C213F2B */ jal func_8084FCAC -/* 17CB0 80849EC0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 17CB4 80849EC4 1040006C */ beq $v0, $zero, .L8084A078 -/* 17CB8 80849EC8 3C038016 */ lui $v1, %hi(gSaveContext) -/* 17CBC 80849ECC 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 17CC0 80849ED0 846E13C4 */ lh $t6, 0x13C4($v1) ## 8015FA24 -/* 17CC4 80849ED4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 17CC8 80849ED8 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 17CCC 80849EDC 05C1002A */ bgez $t6, .L80849F88 -/* 17CD0 80849EE0 02212021 */ addu $a0, $s1, $at -/* 17CD4 80849EE4 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 17CD8 80849EE8 2405016B */ addiu $a1, $zero, 0x016B ## $a1 = 0000016B -/* 17CDC 80849EEC 3C038016 */ lui $v1, %hi(gSaveContext) -/* 17CE0 80849EF0 04410003 */ bgez $v0, .L80849F00 -/* 17CE4 80849EF4 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 17CE8 80849EF8 10000023 */ beq $zero, $zero, .L80849F88 -/* 17CEC 80849EFC A46013C4 */ sh $zero, 0x13C4($v1) ## 8015FA24 -.L80849F00: -/* 17CF0 80849F00 846F13C4 */ lh $t7, 0x13C4($v1) ## 8015FA24 -/* 17CF4 80849F04 3C068085 */ lui $a2, %hi(D_80854838) ## $a2 = 80850000 -/* 17CF8 80849F08 3C078086 */ lui $a3, %hi(D_80858AB8) ## $a3 = 80860000 -/* 17CFC 80849F0C 31F87FFF */ andi $t8, $t7, 0x7FFF ## $t8 = 00000000 -/* 17D00 80849F10 A47813C4 */ sh $t8, 0x13C4($v1) ## 8015FA24 -/* 17D04 80849F14 24E78AB8 */ addiu $a3, $a3, %lo(D_80858AB8) ## $a3 = 80858AB8 -/* 17D08 80849F18 24C64838 */ addiu $a2, $a2, %lo(D_80854838) ## $a2 = 80854838 -/* 17D0C 80849F1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 17D10 80849F20 0C20E577 */ jal func_808395DC -/* 17D14 80849F24 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 17D18 80849F28 3C018086 */ lui $at, %hi(D_80858ABC) ## $at = 80860000 -/* 17D1C 80849F2C C4248ABC */ lwc1 $f4, %lo(D_80858ABC)($at) -/* 17D20 80849F30 3C018086 */ lui $at, %hi(D_80858AC0) ## $at = 80860000 -/* 17D24 80849F34 C4268AC0 */ lwc1 $f6, %lo(D_80858AC0)($at) -/* 17D28 80849F38 3C038016 */ lui $v1, %hi(gSaveContext) -/* 17D2C 80849F3C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 17D30 80849F40 846213C4 */ lh $v0, 0x13C4($v1) ## 8015FA24 -/* 17D34 80849F44 AFA00018 */ sw $zero, 0x0018($sp) -/* 17D38 80849F48 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 17D3C 80849F4C E7A60014 */ swc1 $f6, 0x0014($sp) -/* 17D40 80849F50 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 17D44 80849F54 3C078086 */ lui $a3, %hi(D_80858AB8) ## $a3 = 80860000 -/* 17D48 80849F58 34488000 */ ori $t0, $v0, 0x8000 ## $t0 = 00008000 -/* 17D4C 80849F5C AFA80024 */ sw $t0, 0x0024($sp) -/* 17D50 80849F60 8CE78AB8 */ lw $a3, %lo(D_80858AB8)($a3) -/* 17D54 80849F64 AFA00020 */ sw $zero, 0x0020($sp) -/* 17D58 80849F68 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 17D5C 80849F6C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 17D60 80849F70 2406019B */ addiu $a2, $zero, 0x019B ## $a2 = 0000019B -/* 17D64 80849F74 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 17D68 80849F78 AFB9001C */ sw $t9, 0x001C($sp) -/* 17D6C 80849F7C 50400003 */ beql $v0, $zero, .L80849F8C -/* 17D70 80849F80 8E020438 */ lw $v0, 0x0438($s0) ## 00000438 -/* 17D74 80849F84 A0400003 */ sb $zero, 0x0003($v0) ## 00000003 -.L80849F88: -/* 17D78 80849F88 8E020438 */ lw $v0, 0x0438($s0) ## 00000438 -.L80849F8C: -/* 17D7C 80849F8C 50400006 */ beql $v0, $zero, .L80849FA8 -/* 17D80 80849F90 8E0203AC */ lw $v0, 0x03AC($s0) ## 000003AC -/* 17D84 80849F94 8C490130 */ lw $t1, 0x0130($v0) ## 00000130 -/* 17D88 80849F98 55200003 */ bnel $t1, $zero, .L80849FA8 -/* 17D8C 80849F9C 8E0203AC */ lw $v0, 0x03AC($s0) ## 000003AC -/* 17D90 80849FA0 AE000438 */ sw $zero, 0x0438($s0) ## 00000438 -/* 17D94 80849FA4 8E0203AC */ lw $v0, 0x03AC($s0) ## 000003AC -.L80849FA8: -/* 17D98 80849FA8 50400008 */ beql $v0, $zero, .L80849FCC -/* 17D9C 80849FAC 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 17DA0 80849FB0 8C4A0130 */ lw $t2, 0x0130($v0) ## 00000130 -/* 17DA4 80849FB4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 17DA8 80849FB8 55400004 */ bnel $t2, $zero, .L80849FCC -/* 17DAC 80849FBC 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 17DB0 80849FC0 0C20C8ED */ jal func_808323B4 -/* 17DB4 80849FC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 17DB8 80849FC8 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -.L80849FCC: -/* 17DBC 80849FCC 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 17DC0 80849FD0 34210020 */ ori $at, $at, 0x0020 ## $at = 20000020 -/* 17DC4 80849FD4 01616024 */ and $t4, $t3, $at -/* 17DC8 80849FD8 11800005 */ beq $t4, $zero, .L80849FF0 -/* 17DCC 80849FDC 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC -/* 17DD0 80849FE0 0C001114 */ jal bzero - -/* 17DD4 80849FE4 24050018 */ addiu $a1, $zero, 0x0018 ## $a1 = 00000018 -/* 17DD8 80849FE8 10000020 */ beq $zero, $zero, .L8084A06C -/* 17DDC 80849FEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80849FF0: -/* 17DE0 80849FF0 8A2F0014 */ lwl $t7, 0x0014($s1) ## 00000014 -/* 17DE4 80849FF4 9A2F0017 */ lwr $t7, 0x0017($s1) ## 00000017 -/* 17DE8 80849FF8 27AD0044 */ addiu $t5, $sp, 0x0044 ## $t5 = FFFFFFDC -/* 17DEC 80849FFC 3C02FFFF */ lui $v0, 0xFFFF ## $v0 = FFFF0000 -/* 17DF0 8084A000 ADAF0000 */ sw $t7, 0x0000($t5) ## FFFFFFDC -/* 17DF4 8084A004 8A2E0018 */ lwl $t6, 0x0018($s1) ## 00000018 -/* 17DF8 8084A008 9A2E001B */ lwr $t6, 0x001B($s1) ## 0000001B -/* 17DFC 8084A00C ADAE0004 */ sw $t6, 0x0004($t5) ## FFFFFFE0 -/* 17E00 8084A010 8A2F001C */ lwl $t7, 0x001C($s1) ## 0000001C -/* 17E04 8084A014 9A2F001F */ lwr $t7, 0x001F($s1) ## 0000001F -/* 17E08 8084A018 ADAF0008 */ sw $t7, 0x0008($t5) ## FFFFFFE4 -/* 17E0C 8084A01C 8A2E0020 */ lwl $t6, 0x0020($s1) ## 00000020 -/* 17E10 8084A020 9A2E0023 */ lwr $t6, 0x0023($s1) ## 00000023 -/* 17E14 8084A024 ADAE000C */ sw $t6, 0x000C($t5) ## FFFFFFE8 -/* 17E18 8084A028 8A2F0024 */ lwl $t7, 0x0024($s1) ## 00000024 -/* 17E1C 8084A02C 9A2F0027 */ lwr $t7, 0x0027($s1) ## 00000027 -/* 17E20 8084A030 ADAF0010 */ sw $t7, 0x0010($t5) ## FFFFFFEC -/* 17E24 8084A034 8A2E0028 */ lwl $t6, 0x0028($s1) ## 00000028 -/* 17E28 8084A038 9A2E002B */ lwr $t6, 0x002B($s1) ## 0000002B -/* 17E2C 8084A03C ADAE0014 */ sw $t6, 0x0014($t5) ## FFFFFFF0 -/* 17E30 8084A040 9218088E */ lbu $t8, 0x088E($s0) ## 0000088E -/* 17E34 8084A044 97B90044 */ lhu $t9, 0x0044($sp) -/* 17E38 8084A048 53000008 */ beql $t8, $zero, .L8084A06C -/* 17E3C 8084A04C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 17E40 8084A050 97A90050 */ lhu $t1, 0x0050($sp) -/* 17E44 8084A054 34423FF7 */ ori $v0, $v0, 0x3FF7 ## $v0 = FFFF3FF7 -/* 17E48 8084A058 03224024 */ and $t0, $t9, $v0 -/* 17E4C 8084A05C 01225024 */ and $t2, $t1, $v0 -/* 17E50 8084A060 A7A80044 */ sh $t0, 0x0044($sp) -/* 17E54 8084A064 A7AA0050 */ sh $t2, 0x0050($sp) -/* 17E58 8084A068 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084A06C: -/* 17E5C 8084A06C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 17E60 8084A070 0C2123E7 */ jal func_80848F9C -/* 17E64 8084A074 27A60044 */ addiu $a2, $sp, 0x0044 ## $a2 = FFFFFFDC -.L8084A078: -/* 17E68 8084A078 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 17E6C 8084A07C 3C028016 */ lui $v0, %hi(gGameInfo) -/* 17E70 8084A080 2442FA90 */ addiu $v0, %lo(gGameInfo) -/* 17E74 8084A084 4600428D */ trunc.w.s $f10, $f8 -/* 17E78 8084A088 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90 -/* 17E7C 8084A08C 440C5000 */ mfc1 $t4, $f10 -/* 17E80 8084A090 00000000 */ nop -/* 17E84 8084A094 A5AC043C */ sh $t4, 0x043C($t5) ## 0000043C -/* 17E88 8084A098 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 17E8C 8084A09C 8C580000 */ lw $t8, 0x0000($v0) ## 8015FA90 -/* 17E90 8084A0A0 4600848D */ trunc.w.s $f18, $f16 -/* 17E94 8084A0A4 440F9000 */ mfc1 $t7, $f18 -/* 17E98 8084A0A8 00000000 */ nop -/* 17E9C 8084A0AC A70F043E */ sh $t7, 0x043E($t8) ## 0000043E -/* 17EA0 8084A0B0 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 17EA4 8084A0B4 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90 -/* 17EA8 8084A0B8 4600218D */ trunc.w.s $f6, $f4 -/* 17EAC 8084A0BC 44083000 */ mfc1 $t0, $f6 -/* 17EB0 8084A0C0 00000000 */ nop -/* 17EB4 8084A0C4 A5280440 */ sh $t0, 0x0440($t1) ## 00000440 -/* 17EB8 8084A0C8 8C4B0000 */ lw $t3, 0x0000($v0) ## 8015FA90 -/* 17EBC 8084A0CC 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 -/* 17EC0 8084A0D0 A56A0442 */ sh $t2, 0x0442($t3) ## 00000442 -/* 17EC4 8084A0D4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 17EC8 8084A0D8 8FB10030 */ lw $s1, 0x0030($sp) -/* 17ECC 8084A0DC 8FB0002C */ lw $s0, 0x002C($sp) -/* 17ED0 8084A0E0 03E00008 */ jr $ra -/* 17ED4 8084A0E4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s deleted file mode 100644 index a58f47ad06..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s +++ /dev/null @@ -1,351 +0,0 @@ -.rdata -glabel D_808552A0 - .asciz "../z_player.c" - .balign 4 - -glabel D_808552B0 - .asciz "../z_player.c" - .balign 4 - -glabel D_808552C0 - .asciz "../z_player.c" - .balign 4 - -glabel D_808552D0 - .asciz "../z_player.c" - .balign 4 - -glabel D_808552E0 - .asciz "../z_player.c" - .balign 4 - -.late_rodata -glabel D_808554DC - .word 0xC4966000 -glabel D_808554E0 - .word 0xC4966000 -glabel D_808554E4 - .word 0x3DE38E39 - -.text -glabel func_8084A0E8 -/* 17ED8 8084A0E8 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 17EDC 8084A0EC AFB00034 */ sw $s0, 0x0034($sp) -/* 17EE0 8084A0F0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 17EE4 8084A0F4 AFBF003C */ sw $ra, 0x003C($sp) -/* 17EE8 8084A0F8 AFB10038 */ sw $s1, 0x0038($sp) -/* 17EEC 8084A0FC AFA40090 */ sw $a0, 0x0090($sp) -/* 17EF0 8084A100 AFA60098 */ sw $a2, 0x0098($sp) -/* 17EF4 8084A104 AFA7009C */ sw $a3, 0x009C($sp) -/* 17EF8 8084A108 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 17EFC 8084A10C 3C068085 */ lui $a2, %hi(D_808552A0) ## $a2 = 80850000 -/* 17F00 8084A110 24C652A0 */ addiu $a2, $a2, %lo(D_808552A0) ## $a2 = 808552A0 -/* 17F04 8084A114 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFEC -/* 17F08 8084A118 24074B1C */ addiu $a3, $zero, 0x4B1C ## $a3 = 00004B1C -/* 17F0C 8084A11C 0C031AB1 */ jal Graph_OpenDisps -/* 17F10 8084A120 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 17F14 8084A124 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 -/* 17F18 8084A128 8FA5009C */ lw $a1, 0x009C($sp) -/* 17F1C 8084A12C 3C04DB06 */ lui $a0, 0xDB06 ## $a0 = DB060000 -/* 17F20 8084A130 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 17F24 8084A134 AE2F02C0 */ sw $t7, 0x02C0($s1) ## 000002C0 -/* 17F28 8084A138 34840030 */ ori $a0, $a0, 0x0030 ## $a0 = DB060030 -/* 17F2C 8084A13C AC640000 */ sw $a0, 0x0000($v1) ## 00000000 -/* 17F30 8084A140 AC650004 */ sw $a1, 0x0004($v1) ## 00000004 -/* 17F34 8084A144 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 17F38 8084A148 3C0C8009 */ lui $t4, %hi(func_80090D20) -/* 17F3C 8084A14C 258C0D20 */ addiu $t4, %lo(func_80090D20) -/* 17F40 8084A150 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 17F44 8084A154 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 -/* 17F48 8084A158 AC450004 */ sw $a1, 0x0004($v0) ## 00000004 -/* 17F4C 8084A15C AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 17F50 8084A160 8FB90098 */ lw $t9, 0x0098($sp) -/* 17F54 8084A164 920701B6 */ lbu $a3, 0x01B6($s0) ## 000001B6 -/* 17F58 8084A168 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 -/* 17F5C 8084A16C 8E0501B8 */ lw $a1, 0x01B8($s0) ## 000001B8 -/* 17F60 8084A170 AFB90010 */ sw $t9, 0x0010($sp) -/* 17F64 8084A174 8208014C */ lb $t0, 0x014C($s0) ## 0000014C -/* 17F68 8084A178 8FAB00A0 */ lw $t3, 0x00A0($sp) -/* 17F6C 8084A17C 8FA40090 */ lw $a0, 0x0090($sp) -/* 17F70 8084A180 AFA80014 */ sw $t0, 0x0014($sp) -/* 17F74 8084A184 8209014F */ lb $t1, 0x014F($s0) ## 0000014F -/* 17F78 8084A188 AFA90018 */ sw $t1, 0x0018($sp) -/* 17F7C 8084A18C 860A00BA */ lh $t2, 0x00BA($s0) ## 000000BA -/* 17F80 8084A190 AFB00028 */ sw $s0, 0x0028($sp) -/* 17F84 8084A194 AFAC0024 */ sw $t4, 0x0024($sp) -/* 17F88 8084A198 AFAB0020 */ sw $t3, 0x0020($sp) -/* 17F8C 8084A19C 0C023D1C */ jal func_8008F470 -/* 17F90 8084A1A0 AFAA001C */ sw $t2, 0x001C($sp) -/* 17F94 8084A1A4 8FAD00A0 */ lw $t5, 0x00A0($sp) -/* 17F98 8084A1A8 3C0E8009 */ lui $t6, %hi(func_80090014) -/* 17F9C 8084A1AC 25CE0014 */ addiu $t6, %lo(func_80090014) -/* 17FA0 8084A1B0 55AE0051 */ bnel $t5, $t6, .L8084A2F8 -/* 17FA4 8084A1B4 8209014F */ lb $t1, 0x014F($s0) ## 0000014F -/* 17FA8 8084A1B8 920F015F */ lbu $t7, 0x015F($s0) ## 0000015F -/* 17FAC 8084A1BC 8FB80090 */ lw $t8, 0x0090($sp) -/* 17FB0 8084A1C0 24050080 */ addiu $a1, $zero, 0x0080 ## $a1 = 00000080 -/* 17FB4 8084A1C4 51E0004C */ beql $t7, $zero, .L8084A2F8 -/* 17FB8 8084A1C8 8209014F */ lb $t1, 0x014F($s0) ## 0000014F -/* 17FBC 8084A1CC 0C031A73 */ jal Graph_Alloc - -/* 17FC0 8084A1D0 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 17FC4 8084A1D4 AFA20070 */ sw $v0, 0x0070($sp) -/* 17FC8 8084A1D8 9219015F */ lbu $t9, 0x015F($s0) ## 0000015F -/* 17FCC 8084A1DC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 17FD0 8084A1E0 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 17FD4 8084A1E4 17210038 */ bne $t9, $at, .L8084A2C8 -/* 17FD8 8084A1E8 3529002C */ ori $t1, $t1, 0x002C ## $t1 = DB06002C -/* 17FDC 8084A1EC 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 -/* 17FE0 8084A1F0 3C0142C2 */ lui $at, 0x42C2 ## $at = 42C20000 -/* 17FE4 8084A1F4 44816000 */ mtc1 $at, $f12 ## $f12 = 97.00 -/* 17FE8 8084A1F8 24680008 */ addiu $t0, $v1, 0x0008 ## $t0 = 00000008 -/* 17FEC 8084A1FC AE2802C0 */ sw $t0, 0x02C0($s1) ## 000002C0 -/* 17FF0 8084A200 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 17FF4 8084A204 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 17FF8 8084A208 3C038086 */ lui $v1, %hi(D_80858AC8) ## $v1 = 80860000 -/* 17FFC 8084A20C 24638AC8 */ addiu $v1, $v1, %lo(D_80858AC8) ## $v1 = 80858AC8 -/* 18000 8084A210 846A0002 */ lh $t2, 0x0002($v1) ## 80858ACA -/* 18004 8084A214 846C0004 */ lh $t4, 0x0004($v1) ## 80858ACC -/* 18008 8084A218 846E0000 */ lh $t6, 0x0000($v1) ## 80858AC8 -/* 1800C 8084A21C 3C018085 */ lui $at, %hi(D_808554DC) ## $at = 80850000 -/* 18010 8084A220 254B03E2 */ addiu $t3, $t2, 0x03E2 ## $t3 = 000003E2 -/* 18014 8084A224 258D0DBE */ addiu $t5, $t4, 0x0DBE ## $t5 = 00000DBE -/* 18018 8084A228 25CFCB76 */ addiu $t7, $t6, 0xCB76 ## $t7 = FFFFCB76 -/* 1801C 8084A22C A7AB0068 */ sh $t3, 0x0068($sp) -/* 18020 8084A230 A7AD006A */ sh $t5, 0x006A($sp) -/* 18024 8084A234 A7AF006C */ sh $t7, 0x006C($sp) -/* 18028 8084A238 C42E54DC */ lwc1 $f14, %lo(D_808554DC)($at) -/* 1802C 8084A23C 3C06C370 */ lui $a2, 0xC370 ## $a2 = C3700000 -/* 18030 8084A240 0C0345A5 */ jal func_800D1694 -/* 18034 8084A244 27A70068 */ addiu $a3, $sp, 0x0068 ## $a3 = FFFFFFD8 -/* 18038 8084A248 8FA20070 */ lw $v0, 0x0070($sp) -/* 1803C 8084A24C 3C058085 */ lui $a1, %hi(D_808552B0) ## $a1 = 80850000 -/* 18040 8084A250 24A552B0 */ addiu $a1, $a1, %lo(D_808552B0) ## $a1 = 808552B0 -/* 18044 8084A254 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 18048 8084A258 24420040 */ addiu $v0, $v0, 0x0040 ## $v0 = 00000040 -/* 1804C 8084A25C AFA20070 */ sw $v0, 0x0070($sp) -/* 18050 8084A260 0C034695 */ jal Matrix_ToMtx -/* 18054 8084A264 24064B49 */ addiu $a2, $zero, 0x4B49 ## $a2 = 00004B49 -/* 18058 8084A268 3C038086 */ lui $v1, %hi(D_80858AC8) ## $v1 = 80860000 -/* 1805C 8084A26C 24638AC8 */ addiu $v1, $v1, %lo(D_80858AC8) ## $v1 = 80858AC8 -/* 18060 8084A270 84780002 */ lh $t8, 0x0002($v1) ## 80858ACA -/* 18064 8084A274 84680004 */ lh $t0, 0x0004($v1) ## 80858ACC -/* 18068 8084A278 846B0000 */ lh $t3, 0x0000($v1) ## 80858AC8 -/* 1806C 8084A27C 3C0142C2 */ lui $at, 0x42C2 ## $at = 42C20000 -/* 18070 8084A280 2409F242 */ addiu $t1, $zero, 0xF242 ## $t1 = FFFFF242 -/* 18074 8084A284 44816000 */ mtc1 $at, $f12 ## $f12 = 97.00 -/* 18078 8084A288 3C018085 */ lui $at, %hi(D_808554E0) ## $at = 80850000 -/* 1807C 8084A28C 2719FC1E */ addiu $t9, $t8, 0xFC1E ## $t9 = FFFFFC1E -/* 18080 8084A290 01285023 */ subu $t2, $t1, $t0 -/* 18084 8084A294 256CCB76 */ addiu $t4, $t3, 0xCB76 ## $t4 = FFFFCB76 -/* 18088 8084A298 A7B90068 */ sh $t9, 0x0068($sp) -/* 1808C 8084A29C A7AA006A */ sh $t2, 0x006A($sp) -/* 18090 8084A2A0 A7AC006C */ sh $t4, 0x006C($sp) -/* 18094 8084A2A4 C42E54E0 */ lwc1 $f14, %lo(D_808554E0)($at) -/* 18098 8084A2A8 3C064370 */ lui $a2, 0x4370 ## $a2 = 43700000 -/* 1809C 8084A2AC 0C0345A5 */ jal func_800D1694 -/* 180A0 8084A2B0 27A70068 */ addiu $a3, $sp, 0x0068 ## $a3 = FFFFFFD8 -/* 180A4 8084A2B4 3C058085 */ lui $a1, %hi(D_808552C0) ## $a1 = 80850000 -/* 180A8 8084A2B8 24A552C0 */ addiu $a1, $a1, %lo(D_808552C0) ## $a1 = 808552C0 -/* 180AC 8084A2BC 8FA40070 */ lw $a0, 0x0070($sp) -/* 180B0 8084A2C0 0C034695 */ jal Matrix_ToMtx -/* 180B4 8084A2C4 24064B4F */ addiu $a2, $zero, 0x4B4F ## $a2 = 00004B4F -.L8084A2C8: -/* 180B8 8084A2C8 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 -/* 180BC 8084A2CC 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 180C0 8084A2D0 3C198085 */ lui $t9, %hi(D_80854840) ## $t9 = 80850000 -/* 180C4 8084A2D4 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 180C8 8084A2D8 AE2D02C0 */ sw $t5, 0x02C0($s1) ## 000002C0 -/* 180CC 8084A2DC AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 180D0 8084A2E0 920F015F */ lbu $t7, 0x015F($s0) ## 0000015F -/* 180D4 8084A2E4 000FC080 */ sll $t8, $t7, 2 -/* 180D8 8084A2E8 0338C821 */ addu $t9, $t9, $t8 -/* 180DC 8084A2EC 8F394840 */ lw $t9, %lo(D_80854840)($t9) -/* 180E0 8084A2F0 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -/* 180E4 8084A2F4 8209014F */ lb $t1, 0x014F($s0) ## 0000014F -.L8084A2F8: -/* 180E8 8084A2F8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 180EC 8084A2FC 552100A6 */ bnel $t1, $at, .L8084A598 -/* 180F0 8084A300 8FAE0090 */ lw $t6, 0x0090($sp) -/* 180F4 8084A304 96080088 */ lhu $t0, 0x0088($s0) ## 00000088 -/* 180F8 8084A308 310A0001 */ andi $t2, $t0, 0x0001 ## $t2 = 00000000 -/* 180FC 8084A30C 554000A2 */ bnel $t2, $zero, .L8084A598 -/* 18100 8084A310 8FAE0090 */ lw $t6, 0x0090($sp) -/* 18104 8084A314 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 18108 8084A318 000B6200 */ sll $t4, $t3, 8 -/* 1810C 8084A31C 0582009E */ bltzl $t4, .L8084A598 -/* 18110 8084A320 8FAE0090 */ lw $t6, 0x0090($sp) -/* 18114 8084A324 92030893 */ lbu $v1, 0x0893($s0) ## 00000893 -/* 18118 8084A328 1060009A */ beq $v1, $zero, .L8084A594 -/* 1811C 8084A32C 28610013 */ slti $at, $v1, 0x0013 -/* 18120 8084A330 10200098 */ beq $at, $zero, .L8084A594 -/* 18124 8084A334 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 18128 8084A338 2861000F */ slti $at, $v1, 0x000F -/* 1812C 8084A33C 1420000C */ bne $at, $zero, .L8084A370 -/* 18130 8084A340 240D0013 */ addiu $t5, $zero, 0x0013 ## $t5 = 00000013 -/* 18134 8084A344 01A37023 */ subu $t6, $t5, $v1 -/* 18138 8084A348 448E2000 */ mtc1 $t6, $f4 ## $f4 = -2305843009213693952.00 -/* 1813C 8084A34C 3C01424C */ lui $at, 0x424C ## $at = 424C0000 -/* 18140 8084A350 44814000 */ mtc1 $at, $f8 ## $f8 = 51.00 -/* 18144 8084A354 468021A0 */ cvt.s.w $f6, $f4 -/* 18148 8084A358 3C018085 */ lui $at, %hi(D_8085486C) ## $at = 80850000 -/* 1814C 8084A35C 46083282 */ mul.s $f10, $f6, $f8 -/* 18150 8084A360 4600540D */ trunc.w.s $f16, $f10 -/* 18154 8084A364 44038000 */ mfc1 $v1, $f16 -/* 18158 8084A368 10000030 */ beq $zero, $zero, .L8084A42C -/* 1815C 8084A36C AC23486C */ sw $v1, %lo(D_8085486C)($at) -.L8084A370: -/* 18160 8084A370 28410013 */ slti $at, $v0, 0x0013 -/* 18164 8084A374 1020002D */ beq $at, $zero, .L8084A42C -/* 18168 8084A378 2841000A */ slti $at, $v0, 0x000A -/* 1816C 8084A37C 14200002 */ bne $at, $zero, .L8084A388 -/* 18170 8084A380 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 18174 8084A384 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -.L8084A388: -/* 18178 8084A388 00051823 */ subu $v1, $zero, $a1 -/* 1817C 8084A38C 00031880 */ sll $v1, $v1, 2 -/* 18180 8084A390 24630024 */ addiu $v1, $v1, 0x0024 ## $v1 = 00000024 -/* 18184 8084A394 00630019 */ multu $v1, $v1 -/* 18188 8084A398 3C018085 */ lui $at, %hi(D_8085486C) ## $at = 80850000 -/* 1818C 8084A39C AFA5005C */ sw $a1, 0x005C($sp) -/* 18190 8084A3A0 00001812 */ mflo $v1 -/* 18194 8084A3A4 00032400 */ sll $a0, $v1, 16 -/* 18198 8084A3A8 00042403 */ sra $a0, $a0, 16 -/* 1819C 8084A3AC 0C01DE0D */ jal Math_Coss - ## coss? -/* 181A0 8084A3B0 AC23486C */ sw $v1, %lo(D_8085486C)($at) -/* 181A4 8084A3B4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 181A8 8084A3B8 44811000 */ mtc1 $at, $f2 ## $f2 = 100.00 -/* 181AC 8084A3BC 3C01425C */ lui $at, 0x425C ## $at = 425C0000 -/* 181B0 8084A3C0 44818000 */ mtc1 $at, $f16 ## $f16 = 55.00 -/* 181B4 8084A3C4 46020482 */ mul.s $f18, $f0, $f2 -/* 181B8 8084A3C8 8FA5005C */ lw $a1, 0x005C($sp) -/* 181BC 8084A3CC 3C018085 */ lui $at, %hi(D_808554E4) ## $at = 80850000 -/* 181C0 8084A3D0 46029100 */ add.s $f4, $f18, $f2 -/* 181C4 8084A3D4 4600218D */ trunc.w.s $f6, $f4 -/* 181C8 8084A3D8 44193000 */ mfc1 $t9, $f6 -/* 181CC 8084A3DC 44853000 */ mtc1 $a1, $f6 ## $f6 = 0.00 -/* 181D0 8084A3E0 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 181D4 8084A3E4 00000000 */ nop -/* 181D8 8084A3E8 468042A0 */ cvt.s.w $f10, $f8 -/* 181DC 8084A3EC 46803220 */ cvt.s.w $f8, $f6 -/* 181E0 8084A3F0 46105480 */ add.s $f18, $f10, $f16 -/* 181E4 8084A3F4 C42A54E4 */ lwc1 $f10, %lo(D_808554E4)($at) -/* 181E8 8084A3F8 3C018085 */ lui $at, %hi(D_8085486C) ## $at = 80850000 -/* 181EC 8084A3FC 4600910D */ trunc.w.s $f4, $f18 -/* 181F0 8084A400 460A4402 */ mul.s $f16, $f8, $f10 -/* 181F4 8084A404 44032000 */ mfc1 $v1, $f4 -/* 181F8 8084A408 00000000 */ nop -/* 181FC 8084A40C 44839000 */ mtc1 $v1, $f18 ## $f18 = 0.00 -/* 18200 8084A410 00000000 */ nop -/* 18204 8084A414 46809120 */ cvt.s.w $f4, $f18 -/* 18208 8084A418 46102182 */ mul.s $f6, $f4, $f16 -/* 1820C 8084A41C 4600320D */ trunc.w.s $f8, $f6 -/* 18210 8084A420 44034000 */ mfc1 $v1, $f8 -/* 18214 8084A424 00000000 */ nop -/* 18218 8084A428 AC23486C */ sw $v1, %lo(D_8085486C)($at) -.L8084A42C: -/* 1821C 8084A42C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 18220 8084A430 44819000 */ mtc1 $at, $f18 ## $f18 = 2.00 -/* 18224 8084A434 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 18228 8084A438 3C078085 */ lui $a3, %hi(D_80854864) ## $a3 = 80850000 -/* 1822C 8084A43C 24E74864 */ addiu $a3, $a3, %lo(D_80854864) ## $a3 = 80854864 -/* 18230 8084A440 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 -/* 18234 8084A444 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 18238 8084A448 0C0345A5 */ jal func_800D1694 -/* 1823C 8084A44C 46125380 */ add.s $f14, $f10, $f18 -/* 18240 8084A450 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 18244 8084A454 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 -/* 18248 8084A458 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 1824C 8084A45C 44066000 */ mfc1 $a2, $f12 -/* 18250 8084A460 0C0342A3 */ jal Matrix_Scale -/* 18254 8084A464 46006386 */ mov.s $f14, $f12 -/* 18258 8084A468 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 1825C 8084A46C 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 18260 8084A470 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 18264 8084A474 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 18268 8084A478 AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0 -/* 1826C 8084A47C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 18270 8084A480 8FAC0090 */ lw $t4, 0x0090($sp) -/* 18274 8084A484 3C058085 */ lui $a1, %hi(D_808552D0) ## $a1 = 80850000 -/* 18278 8084A488 24A552D0 */ addiu $a1, $a1, %lo(D_808552D0) ## $a1 = 808552D0 -/* 1827C 8084A48C 24064B75 */ addiu $a2, $zero, 0x4B75 ## $a2 = 00004B75 -/* 18280 8084A490 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 18284 8084A494 0C0346A2 */ jal Matrix_NewMtx -/* 18288 8084A498 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 1828C 8084A49C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 18290 8084A4A0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 18294 8084A4A4 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 18298 8084A4A8 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 1829C 8084A4AC 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 182A0 8084A4B0 AE2D02D0 */ sw $t5, 0x02D0($s1) ## 000002D0 -/* 182A4 8084A4B4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 182A8 8084A4B8 8FAF0090 */ lw $t7, 0x0090($sp) -/* 182AC 8084A4BC 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 182B0 8084A4C0 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 182B4 8084A4C4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 182B8 8084A4C8 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 182BC 8084A4CC 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 182C0 8084A4D0 AFA90018 */ sw $t1, 0x0018($sp) -/* 182C4 8084A4D4 AFA0001C */ sw $zero, 0x001C($sp) -/* 182C8 8084A4D8 AFB90014 */ sw $t9, 0x0014($sp) -/* 182CC 8084A4DC AFB80010 */ sw $t8, 0x0010($sp) -/* 182D0 8084A4E0 010F4021 */ addu $t0, $t0, $t7 -/* 182D4 8084A4E4 8D081DE4 */ lw $t0, 0x1DE4($t0) ## 00011DE4 -/* 182D8 8084A4E8 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 182DC 8084A4EC 240C0010 */ addiu $t4, $zero, 0x0010 ## $t4 = 00000010 -/* 182E0 8084A4F0 00080823 */ subu $at, $zero, $t0 -/* 182E4 8084A4F4 00015100 */ sll $t2, $at, 4 -/* 182E8 8084A4F8 01415023 */ subu $t2, $t2, $at -/* 182EC 8084A4FC 314B007F */ andi $t3, $t2, 0x007F ## $t3 = 00000000 -/* 182F0 8084A500 AFAB0020 */ sw $t3, 0x0020($sp) -/* 182F4 8084A504 AFAC0024 */ sw $t4, 0x0024($sp) -/* 182F8 8084A508 AFAD0028 */ sw $t5, 0x0028($sp) -/* 182FC 8084A50C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 18300 8084A510 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 18304 8084A514 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 18308 8084A518 0C0253D0 */ jal Gfx_TwoTexScroll -/* 1830C 8084A51C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 18310 8084A520 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 18314 8084A524 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 18318 8084A528 3C038085 */ lui $v1, %hi(D_8085486C) ## $v1 = 80850000 -/* 1831C 8084A52C 8C63486C */ lw $v1, %lo(D_8085486C)($v1) -/* 18320 8084A530 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 18324 8084A534 AE2E02D0 */ sw $t6, 0x02D0($s1) ## 000002D0 -/* 18328 8084A538 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 -/* 1832C 8084A53C 2401FF00 */ addiu $at, $zero, 0xFF00 ## $at = FFFFFF00 -/* 18330 8084A540 307900FF */ andi $t9, $v1, 0x00FF ## $t9 = 00000000 -/* 18334 8084A544 03214825 */ or $t1, $t9, $at ## $t1 = FFFFFF00 -/* 18338 8084A548 37188080 */ ori $t8, $t8, 0x8080 ## $t8 = FA008080 -/* 1833C 8084A54C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 18340 8084A550 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 18344 8084A554 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 18348 8084A558 3C0A785A */ lui $t2, 0x785A ## $t2 = 785A0000 -/* 1834C 8084A55C 354A1E80 */ ori $t2, $t2, 0x1E80 ## $t2 = 785A1E80 -/* 18350 8084A560 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 18354 8084A564 AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 -/* 18358 8084A568 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 -/* 1835C 8084A56C AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 18360 8084A570 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 18364 8084A574 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 18368 8084A578 3C0D0403 */ lui $t5, 0x0403 ## $t5 = 04030000 -/* 1836C 8084A57C 25AD7E30 */ addiu $t5, $t5, 0x7E30 ## $t5 = 04037E30 -/* 18370 8084A580 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 18374 8084A584 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 -/* 18378 8084A588 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 1837C 8084A58C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 18380 8084A590 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -.L8084A594: -/* 18384 8084A594 8FAE0090 */ lw $t6, 0x0090($sp) -.L8084A598: -/* 18388 8084A598 3C068085 */ lui $a2, %hi(D_808552E0) ## $a2 = 80850000 -/* 1838C 8084A59C 24C652E0 */ addiu $a2, $a2, %lo(D_808552E0) ## $a2 = 808552E0 -/* 18390 8084A5A0 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFEC -/* 18394 8084A5A4 24074B80 */ addiu $a3, $zero, 0x4B80 ## $a3 = 00004B80 -/* 18398 8084A5A8 0C031AD5 */ jal Graph_CloseDisps -/* 1839C 8084A5AC 8DC50000 */ lw $a1, 0x0000($t6) ## 00000008 -/* 183A0 8084A5B0 8FBF003C */ lw $ra, 0x003C($sp) -/* 183A4 8084A5B4 8FB00034 */ lw $s0, 0x0034($sp) -/* 183A8 8084A5B8 8FB10038 */ lw $s1, 0x0038($sp) -/* 183AC 8084A5BC 03E00008 */ jr $ra -/* 183B0 8084A5C0 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s deleted file mode 100644 index 92208f2144..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s +++ /dev/null @@ -1,398 +0,0 @@ -.rdata -glabel D_808552F0 - .asciz "../z_player.c" - .balign 4 - -glabel D_80855300 - .asciz "../z_player.c" - .balign 4 - -glabel D_80855310 - .asciz "../z_player.c" - .balign 4 - -.late_rodata -glabel D_808554E8 - .float 3.14159274101 - -glabel D_808554EC - .float 1.1 - -glabel D_808554F0 - .word 0x3F733333 - -.text -glabel func_8084A5C4 -/* 183B4 8084A5C4 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 -/* 183B8 8084A5C8 AFBF003C */ sw $ra, 0x003C($sp) -/* 183BC 8084A5CC AFB00038 */ sw $s0, 0x0038($sp) -/* 183C0 8084A5D0 AFA500B4 */ sw $a1, 0x00B4($sp) -/* 183C4 8084A5D4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 183C8 8084A5D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 183CC 8084A5DC 3C068085 */ lui $a2, %hi(D_808552F0) ## $a2 = 80850000 -/* 183D0 8084A5E0 24C652F0 */ addiu $a2, $a2, %lo(D_808552F0) ## $a2 = 808552F0 -/* 183D4 8084A5E4 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFE4 -/* 183D8 8084A5E8 24074B92 */ addiu $a3, $zero, 0x4B92 ## $a3 = 00004B92 -/* 183DC 8084A5EC 0C031AB1 */ jal Graph_OpenDisps -/* 183E0 8084A5F0 AFA500A4 */ sw $a1, 0x00A4($sp) -/* 183E4 8084A5F4 8E0F0680 */ lw $t7, 0x0680($s0) ## 00000680 -/* 183E8 8084A5F8 3C198009 */ lui $t9, %hi(func_80090014) -/* 183EC 8084A5FC 27390014 */ addiu $t9, %lo(func_80090014) -/* 183F0 8084A600 000FC080 */ sll $t8, $t7, 2 -/* 183F4 8084A604 07020148 */ bltzl $t8, .L8084AB28 -/* 183F8 8084A608 8FB800B4 */ lw $t8, 0x00B4($sp) -/* 183FC 8084A60C AFB90090 */ sw $t9, 0x0090($sp) -/* 18400 8084A610 920B0444 */ lbu $t3, 0x0444($s0) ## 00000444 -/* 18404 8084A614 1560000B */ bne $t3, $zero, .L8084A644 -/* 18408 8084A618 00000000 */ nop -/* 1840C 8084A61C 0C023A71 */ jal func_8008E9C4 -/* 18410 8084A620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 18414 8084A624 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 18418 8084A628 44813000 */ mtc1 $at, $f6 ## $f6 = 160.00 -/* 1841C 8084A62C C60400EC */ lwc1 $f4, 0x00EC($s0) ## 000000EC -/* 18420 8084A630 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 18424 8084A634 4606203C */ c.lt.s $f4, $f6 -/* 18428 8084A638 00000000 */ nop -/* 1842C 8084A63C 45020004 */ bc1fl .L8084A650 -/* 18430 8084A640 AFAC008C */ sw $t4, 0x008C($sp) -.L8084A644: -/* 18434 8084A644 10000002 */ beq $zero, $zero, .L8084A650 -/* 18438 8084A648 AFA0008C */ sw $zero, 0x008C($sp) -/* 1843C 8084A64C AFAC008C */ sw $t4, 0x008C($sp) -.L8084A650: -/* 18440 8084A650 0C024F20 */ jal func_80093C80 -/* 18444 8084A654 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 18448 8084A658 8FAD00B4 */ lw $t5, 0x00B4($sp) -/* 1844C 8084A65C 0C024F61 */ jal func_80093D84 -/* 18450 8084A660 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 18454 8084A664 82030A78 */ lb $v1, 0x0A78($s0) ## 00000A78 -/* 18458 8084A668 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 -/* 1845C 8084A66C 18600026 */ blez $v1, .L8084A708 -/* 18460 8084A670 01C31023 */ subu $v0, $t6, $v1 -/* 18464 8084A674 28410008 */ slti $at, $v0, 0x0008 -/* 18468 8084A678 50200004 */ beql $at, $zero, .L8084A68C -/* 1846C 8084A67C 28410029 */ slti $at, $v0, 0x0029 -/* 18470 8084A680 10000007 */ beq $zero, $zero, .L8084A6A0 -/* 18474 8084A684 24020008 */ addiu $v0, $zero, 0x0008 ## $v0 = 00000008 -/* 18478 8084A688 28410029 */ slti $at, $v0, 0x0029 -.L8084A68C: -/* 1847C 8084A68C 14200003 */ bne $at, $zero, .L8084A69C -/* 18480 8084A690 00401825 */ or $v1, $v0, $zero ## $v1 = 00000008 -/* 18484 8084A694 10000001 */ beq $zero, $zero, .L8084A69C -/* 18488 8084A698 24030028 */ addiu $v1, $zero, 0x0028 ## $v1 = 00000028 -.L8084A69C: -/* 1848C 8084A69C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000028 -.L8084A6A0: -/* 18490 8084A6A0 920F088F */ lbu $t7, 0x088F($s0) ## 0000088F -/* 18494 8084A6A4 01E22021 */ addu $a0, $t7, $v0 -/* 18498 8084A6A8 A204088F */ sb $a0, 0x088F($s0) ## 0000088F -/* 1849C 8084A6AC 00042200 */ sll $a0, $a0, 8 -/* 184A0 8084A6B0 00042400 */ sll $a0, $a0, 16 -/* 184A4 8084A6B4 0C01DE0D */ jal Math_Coss - ## coss? -/* 184A8 8084A6B8 00042403 */ sra $a0, $a0, 16 -/* 184AC 8084A6BC 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 -/* 184B0 8084A6C0 44814000 */ mtc1 $at, $f8 ## $f8 = 2000.00 -/* 184B4 8084A6C4 8FB900A4 */ lw $t9, 0x00A4($sp) -/* 184B8 8084A6C8 240D0FA0 */ addiu $t5, $zero, 0x0FA0 ## $t5 = 00000FA0 -/* 184BC 8084A6CC 46080282 */ mul.s $f10, $f0, $f8 -/* 184C0 8084A6D0 8F2402C0 */ lw $a0, 0x02C0($t9) ## 000002C0 -/* 184C4 8084A6D4 AFA00014 */ sw $zero, 0x0014($sp) -/* 184C8 8084A6D8 AFA00010 */ sw $zero, 0x0010($sp) -/* 184CC 8084A6DC 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 184D0 8084A6E0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 184D4 8084A6E4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 184D8 8084A6E8 4600540D */ trunc.w.s $f16, $f10 -/* 184DC 8084A6EC 440C8000 */ mfc1 $t4, $f16 -/* 184E0 8084A6F0 00000000 */ nop -/* 184E4 8084A6F4 01AC7023 */ subu $t6, $t5, $t4 -/* 184E8 8084A6F8 0C024DC2 */ jal Gfx_SetFog2 -/* 184EC 8084A6FC AFAE0018 */ sw $t6, 0x0018($sp) -/* 184F0 8084A700 8FAF00A4 */ lw $t7, 0x00A4($sp) -/* 184F4 8084A704 ADE202C0 */ sw $v0, 0x02C0($t7) ## 000002C0 -.L8084A708: -/* 184F8 8084A708 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 184FC 8084A70C 8FA500B4 */ lw $a1, 0x00B4($sp) -/* 18500 8084A710 0C00BAF3 */ jal func_8002EBCC -/* 18504 8084A714 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 18508 8084A718 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1850C 8084A71C 8FA500B4 */ lw $a1, 0x00B4($sp) -/* 18510 8084A720 0C00BB60 */ jal func_8002ED80 -/* 18514 8084A724 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 18518 8084A728 921806AD */ lbu $t8, 0x06AD($s0) ## 000006AD -/* 1851C 8084A72C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 18520 8084A730 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 -/* 18524 8084A734 13000011 */ beq $t8, $zero, .L8084A77C -/* 18528 8084A738 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 1852C 8084A73C 00812021 */ addu $a0, $a0, $at -/* 18530 8084A740 26050038 */ addiu $a1, $s0, 0x0038 ## $a1 = 00000038 -/* 18534 8084A744 0C029BBD */ jal SkinMatrix_Vec3fMtxFMultXYZ -/* 18538 8084A748 27A6007C */ addiu $a2, $sp, 0x007C ## $a2 = FFFFFFCC -/* 1853C 8084A74C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 18540 8084A750 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 -/* 18544 8084A754 C7B20084 */ lwc1 $f18, 0x0084($sp) -/* 18548 8084A758 3C198009 */ lui $t9, %hi(func_800902F0) -/* 1854C 8084A75C 273902F0 */ addiu $t9, %lo(func_800902F0) -/* 18550 8084A760 4604903C */ c.lt.s $f18, $f4 -/* 18554 8084A764 00000000 */ nop -/* 18558 8084A768 45000002 */ bc1f .L8084A774 -/* 1855C 8084A76C 00000000 */ nop -/* 18560 8084A770 AFB90090 */ sw $t9, 0x0090($sp) -.L8084A774: -/* 18564 8084A774 1000000E */ beq $zero, $zero, .L8084A7B0 -/* 18568 8084A778 8E020680 */ lw $v0, 0x0680($s0) ## 00000680 -.L8084A77C: -/* 1856C 8084A77C 8E020680 */ lw $v0, 0x0680($s0) ## 00000680 -/* 18570 8084A780 00025B40 */ sll $t3, $v0, 13 -/* 18574 8084A784 0563000B */ bgezl $t3, .L8084A7B4 -/* 18578 8084A788 00026140 */ sll $t4, $v0, 5 -/* 1857C 8084A78C C60600EC */ lwc1 $f6, 0x00EC($s0) ## 000000EC -/* 18580 8084A790 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 18584 8084A794 3C0D8009 */ lui $t5, %hi(func_80090440) -/* 18588 8084A798 25AD0440 */ addiu $t5, %lo(func_80090440) -/* 1858C 8084A79C 4608303C */ c.lt.s $f6, $f8 -/* 18590 8084A7A0 00000000 */ nop -/* 18594 8084A7A4 45020003 */ bc1fl .L8084A7B4 -/* 18598 8084A7A8 00026140 */ sll $t4, $v0, 5 -/* 1859C 8084A7AC AFAD0090 */ sw $t5, 0x0090($sp) -.L8084A7B0: -/* 185A0 8084A7B0 00026140 */ sll $t4, $v0, 5 -.L8084A7B4: -/* 185A4 8084A7B4 05810061 */ bgez $t4, .L8084A93C -/* 185A8 8084A7B8 8FAE00B4 */ lw $t6, 0x00B4($sp) -/* 185AC 8084A7BC 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 185B0 8084A7C0 006E1821 */ addu $v1, $v1, $t6 -/* 185B4 8084A7C4 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 -/* 185B8 8084A7C8 3C018085 */ lui $at, %hi(D_808554E8) ## $at = 80850000 -/* 185BC 8084A7CC C42054E8 */ lwc1 $f0, %lo(D_808554E8)($at) -/* 185C0 8084A7D0 00037880 */ sll $t7, $v1, 2 -/* 185C4 8084A7D4 01E37821 */ addu $t7, $t7, $v1 -/* 185C8 8084A7D8 000F7880 */ sll $t7, $t7, 2 -/* 185CC 8084A7DC 01E37823 */ subu $t7, $t7, $v1 -/* 185D0 8084A7E0 000F7880 */ sll $t7, $t7, 2 -/* 185D4 8084A7E4 01E37823 */ subu $t7, $t7, $v1 -/* 185D8 8084A7E8 000F78C0 */ sll $t7, $t7, 3 -/* 185DC 8084A7EC 31F8FFFF */ andi $t8, $t7, 0xFFFF ## $t8 = 00000000 -/* 185E0 8084A7F0 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 185E4 8084A7F4 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 185E8 8084A7F8 44811000 */ mtc1 $at, $f2 ## $f2 = 32768.00 -/* 185EC 8084A7FC 07010005 */ bgez $t8, .L8084A814 -/* 185F0 8084A800 46805420 */ cvt.s.w $f16, $f10 -/* 185F4 8084A804 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 185F8 8084A808 44819000 */ mtc1 $at, $f18 ## $f18 = 4294967296.00 -/* 185FC 8084A80C 00000000 */ nop -/* 18600 8084A810 46128400 */ add.s $f16, $f16, $f18 -.L8084A814: -/* 18604 8084A814 46008102 */ mul.s $f4, $f16, $f0 -/* 18608 8084A818 0003C940 */ sll $t9, $v1, 5 -/* 1860C 8084A81C 0323C823 */ subu $t9, $t9, $v1 -/* 18610 8084A820 0019C880 */ sll $t9, $t9, 2 -/* 18614 8084A824 0323C821 */ addu $t9, $t9, $v1 -/* 18618 8084A828 0019C8C0 */ sll $t9, $t9, 3 -/* 1861C 8084A82C 332BFFFF */ andi $t3, $t9, 0xFFFF ## $t3 = 000002F0 -/* 18620 8084A830 46022183 */ div.s $f6, $f4, $f2 -/* 18624 8084A834 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 -/* 18628 8084A838 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 1862C 8084A83C 468042A0 */ cvt.s.w $f10, $f8 -/* 18630 8084A840 05610004 */ bgez $t3, .L8084A854 -/* 18634 8084A844 E7A60078 */ swc1 $f6, 0x0078($sp) -/* 18638 8084A848 44819000 */ mtc1 $at, $f18 ## $f18 = 4294967296.00 -/* 1863C 8084A84C 00000000 */ nop -/* 18640 8084A850 46125280 */ add.s $f10, $f10, $f18 -.L8084A854: -/* 18644 8084A854 46005402 */ mul.s $f16, $f10, $f0 -/* 18648 8084A858 46028103 */ div.s $f4, $f16, $f2 -/* 1864C 8084A85C 0C034213 */ jal Matrix_Push -/* 18650 8084A860 E7A40074 */ swc1 $f4, 0x0074($sp) -/* 18654 8084A864 C6060054 */ lwc1 $f6, 0x0054($s0) ## 00000054 -/* 18658 8084A868 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 -/* 1865C 8084A86C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 18660 8084A870 46003207 */ neg.s $f8, $f6 -/* 18664 8084A874 C61200BC */ lwc1 $f18, 0x00BC($s0) ## 000000BC -/* 18668 8084A878 E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 -/* 1866C 8084A87C C60A0054 */ lwc1 $f10, 0x0054($s0) ## 00000054 -/* 18670 8084A880 46040181 */ sub.s $f6, $f0, $f4 -/* 18674 8084A884 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 -/* 18678 8084A888 460A9402 */ mul.s $f16, $f18, $f10 -/* 1867C 8084A88C 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 18680 8084A890 46060200 */ add.s $f8, $f0, $f6 -/* 18684 8084A894 260700B4 */ addiu $a3, $s0, 0x00B4 ## $a3 = 000000B4 -/* 18688 8084A898 0C0345A5 */ jal func_800D1694 -/* 1868C 8084A89C 46104380 */ add.s $f14, $f8, $f16 -/* 18690 8084A8A0 C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 -/* 18694 8084A8A4 C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 -/* 18698 8084A8A8 8E060058 */ lw $a2, 0x0058($s0) ## 00000058 -/* 1869C 8084A8AC 0C0342A3 */ jal Matrix_Scale -/* 186A0 8084A8B0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 186A4 8084A8B4 C7AC0078 */ lwc1 $f12, 0x0078($sp) -/* 186A8 8084A8B8 0C0342DC */ jal Matrix_RotateX -/* 186AC 8084A8BC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 186B0 8084A8C0 C7AC0074 */ lwc1 $f12, 0x0074($sp) -/* 186B4 8084A8C4 0C034348 */ jal Matrix_RotateY -/* 186B8 8084A8C8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 186BC 8084A8CC 3C018085 */ lui $at, %hi(D_808554EC) ## $at = 80850000 -/* 186C0 8084A8D0 C42C54EC */ lwc1 $f12, %lo(D_808554EC)($at) -/* 186C4 8084A8D4 3C018085 */ lui $at, %hi(D_808554F0) ## $at = 80850000 -/* 186C8 8084A8D8 3C063F86 */ lui $a2, 0x3F86 ## $a2 = 3F860000 -/* 186CC 8084A8DC 34C66666 */ ori $a2, $a2, 0x6666 ## $a2 = 3F866666 -/* 186D0 8084A8E0 C42E54F0 */ lwc1 $f14, %lo(D_808554F0)($at) -/* 186D4 8084A8E4 0C0342A3 */ jal Matrix_Scale -/* 186D8 8084A8E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 186DC 8084A8EC C7AC0074 */ lwc1 $f12, 0x0074($sp) -/* 186E0 8084A8F0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 186E4 8084A8F4 0C034348 */ jal Matrix_RotateY -/* 186E8 8084A8F8 46006307 */ neg.s $f12, $f12 -/* 186EC 8084A8FC C7AC0078 */ lwc1 $f12, 0x0078($sp) -/* 186F0 8084A900 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 186F4 8084A904 0C0342DC */ jal Matrix_RotateX -/* 186F8 8084A908 46006307 */ neg.s $f12, $f12 -/* 186FC 8084A90C 8FAD0090 */ lw $t5, 0x0090($sp) -/* 18700 8084A910 3C078012 */ lui $a3, %hi(D_80125FA8) -/* 18704 8084A914 24E75FA8 */ addiu $a3, %lo(D_80125FA8) -/* 18708 8084A918 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 1870C 8084A91C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 18710 8084A920 8FA6008C */ lw $a2, 0x008C($sp) -/* 18714 8084A924 0C21283A */ jal func_8084A0E8 -/* 18718 8084A928 AFAD0010 */ sw $t5, 0x0010($sp) -/* 1871C 8084A92C C6120054 */ lwc1 $f18, 0x0054($s0) ## 00000054 -/* 18720 8084A930 46009287 */ neg.s $f10, $f18 -/* 18724 8084A934 0C034221 */ jal Matrix_Pull -/* 18728 8084A938 E60A0054 */ swc1 $f10, 0x0054($s0) ## 00000054 -.L8084A93C: -/* 1872C 8084A93C 8FA800A4 */ lw $t0, 0x00A4($sp) -/* 18730 8084A940 3C04D9FF */ lui $a0, 0xD9FF ## $a0 = D9FF0000 -/* 18734 8084A944 3484F9FF */ ori $a0, $a0, 0xF9FF ## $a0 = D9FFF9FF -/* 18738 8084A948 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 1873C 8084A94C 3C078012 */ lui $a3, %hi(D_80125F98) -/* 18740 8084A950 24E75F98 */ addiu $a3, %lo(D_80125F98) -/* 18744 8084A954 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 18748 8084A958 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 -/* 1874C 8084A95C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 18750 8084A960 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 18754 8084A964 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 18758 8084A968 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1875C 8084A96C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 18760 8084A970 AD0E02D0 */ sw $t6, 0x02D0($t0) ## 000002D0 -/* 18764 8084A974 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 18768 8084A978 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 1876C 8084A97C 8FAF0090 */ lw $t7, 0x0090($sp) -/* 18770 8084A980 8FA6008C */ lw $a2, 0x008C($sp) -/* 18774 8084A984 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 18778 8084A988 0C21283A */ jal func_8084A0E8 -/* 1877C 8084A98C AFAF0010 */ sw $t7, 0x0010($sp) -/* 18780 8084A990 82180A78 */ lb $t8, 0x0A78($s0) ## 00000A78 -/* 18784 8084A994 8FB900A4 */ lw $t9, 0x00A4($sp) -/* 18788 8084A998 5B000007 */ blezl $t8, .L8084A9B8 -/* 1878C 8084A99C 8E0B0680 */ lw $t3, 0x0680($s0) ## 00000680 -/* 18790 8084A9A0 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 18794 8084A9A4 0C02F228 */ jal func_800BC8A0 -/* 18798 8084A9A8 8F2502C0 */ lw $a1, 0x02C0($t9) ## 000002C0 -/* 1879C 8084A9AC 8FAA00A4 */ lw $t2, 0x00A4($sp) -/* 187A0 8084A9B0 AD4202C0 */ sw $v0, 0x02C0($t2) ## 000002C0 -/* 187A4 8084A9B4 8E0B0680 */ lw $t3, 0x0680($s0) ## 00000680 -.L8084A9B8: -/* 187A8 8084A9B8 8FAA00A4 */ lw $t2, 0x00A4($sp) -/* 187AC 8084A9BC 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 187B0 8084A9C0 316D4000 */ andi $t5, $t3, 0x4000 ## $t5 = 00000000 -/* 187B4 8084A9C4 11A00051 */ beq $t5, $zero, .L8084AB0C -/* 187B8 8084A9C8 8FA900B4 */ lw $t1, 0x00B4($sp) -/* 187BC 8084A9CC 820C084F */ lb $t4, 0x084F($s0) ## 0000084F -/* 187C0 8084A9D0 8D4202D0 */ lw $v0, 0x02D0($t2) ## 000002D0 -/* 187C4 8084A9D4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 187C8 8084A9D8 000C7043 */ sra $t6, $t4, 1 -/* 187CC 8084A9DC 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 187D0 8084A9E0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 187D4 8084A9E4 AD4F02D0 */ sw $t7, 0x02D0($t2) ## 000002D0 -/* 187D8 8084A9E8 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 187DC 8084A9EC 44814000 */ mtc1 $at, $f8 ## $f8 = 22.00 -/* 187E0 8084A9F0 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 187E4 8084A9F4 468021A0 */ cvt.s.w $f6, $f4 -/* 187E8 8084A9F8 8FB900B4 */ lw $t9, 0x00B4($sp) -/* 187EC 8084A9FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 187F0 8084AA00 01214821 */ addu $t1, $t1, $at -/* 187F4 8084AA04 8D231DE4 */ lw $v1, 0x1DE4($t1) ## 00001DE4 -/* 187F8 8084AA08 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 187FC 8084AA0C 46083302 */ mul.s $f12, $f6, $f8 -/* 18800 8084AA10 00030823 */ subu $at, $zero, $v1 -/* 18804 8084AA14 00017040 */ sll $t6, $at, 1 -/* 18808 8084AA18 31CF007F */ andi $t7, $t6, 0x007F ## $t7 = 00000000 -/* 1880C 8084AA1C 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 18810 8084AA20 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 18814 8084AA24 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 18818 8084AA28 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 1881C 8084AA2C 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 18820 8084AA30 00033823 */ subu $a3, $zero, $v1 -/* 18824 8084AA34 30E7007F */ andi $a3, $a3, 0x007F ## $a3 = 00000000 -/* 18828 8084AA38 AFAD0014 */ sw $t5, 0x0014($sp) -/* 1882C 8084AA3C AFAB0010 */ sw $t3, 0x0010($sp) -/* 18830 8084AA40 AFAC0018 */ sw $t4, 0x0018($sp) -/* 18834 8084AA44 AFB80024 */ sw $t8, 0x0024($sp) -/* 18838 8084AA48 AFB90028 */ sw $t9, 0x0028($sp) -/* 1883C 8084AA4C AFAF0020 */ sw $t7, 0x0020($sp) -/* 18840 8084AA50 E7AC0068 */ swc1 $f12, 0x0068($sp) -/* 18844 8084AA54 AFA0001C */ sw $zero, 0x001C($sp) -/* 18848 8084AA58 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1884C 8084AA5C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 18850 8084AA60 0C0253D0 */ jal Gfx_TwoTexScroll -/* 18854 8084AA64 AFA20064 */ sw $v0, 0x0064($sp) -/* 18858 8084AA68 C7AC0068 */ lwc1 $f12, 0x0068($sp) -/* 1885C 8084AA6C 8FA80064 */ lw $t0, 0x0064($sp) -/* 18860 8084AA70 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 18864 8084AA74 44066000 */ mfc1 $a2, $f12 -/* 18868 8084AA78 46006386 */ mov.s $f14, $f12 -/* 1886C 8084AA7C 0C0342A3 */ jal Matrix_Scale -/* 18870 8084AA80 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 18874 8084AA84 8FA700A4 */ lw $a3, 0x00A4($sp) -/* 18878 8084AA88 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 1887C 8084AA8C 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 -/* 18880 8084AA90 8CE202D0 */ lw $v0, 0x02D0($a3) ## 000002D0 -/* 18884 8084AA94 3C058085 */ lui $a1, %hi(D_80855300) ## $a1 = 80850000 -/* 18888 8084AA98 24A55300 */ addiu $a1, $a1, %lo(D_80855300) ## $a1 = 80855300 -/* 1888C 8084AA9C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 18890 8084AAA0 ACEB02D0 */ sw $t3, 0x02D0($a3) ## 000002D0 -/* 18894 8084AAA4 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 18898 8084AAA8 8FAC00B4 */ lw $t4, 0x00B4($sp) -/* 1889C 8084AAAC 24064C03 */ addiu $a2, $zero, 0x4C03 ## $a2 = 00004C03 -/* 188A0 8084AAB0 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 188A4 8084AAB4 0C0346A2 */ jal Matrix_NewMtx -/* 188A8 8084AAB8 AFA20060 */ sw $v0, 0x0060($sp) -/* 188AC 8084AABC 8FA30060 */ lw $v1, 0x0060($sp) -/* 188B0 8084AAC0 3C190032 */ lui $t9, 0x0032 ## $t9 = 00320000 -/* 188B4 8084AAC4 373964FF */ ori $t9, $t9, 0x64FF ## $t9 = 003264FF -/* 188B8 8084AAC8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 188BC 8084AACC 8FAE00A4 */ lw $t6, 0x00A4($sp) -/* 188C0 8084AAD0 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 188C4 8084AAD4 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 188C8 8084AAD8 8DC202D0 */ lw $v0, 0x02D0($t6) ## 000002D0 -/* 188CC 8084AADC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 188D0 8084AAE0 ADCF02D0 */ sw $t7, 0x02D0($t6) ## 000002D0 -/* 188D4 8084AAE4 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 188D8 8084AAE8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 188DC 8084AAEC 8FAB00A4 */ lw $t3, 0x00A4($sp) -/* 188E0 8084AAF0 3C0F0403 */ lui $t7, 0x0403 ## $t7 = 04030000 -/* 188E4 8084AAF4 25EF3EE0 */ addiu $t7, $t7, 0x3EE0 ## $t7 = 04033EE0 -/* 188E8 8084AAF8 8D6202D0 */ lw $v0, 0x02D0($t3) ## 000002D0 -/* 188EC 8084AAFC 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 188F0 8084AB00 AD6D02D0 */ sw $t5, 0x02D0($t3) ## 000002D0 -/* 188F4 8084AB04 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 188F8 8084AB08 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -.L8084AB0C: -/* 188FC 8084AB0C 820E0862 */ lb $t6, 0x0862($s0) ## 00000862 -/* 18900 8084AB10 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 18904 8084AB14 59C00004 */ blezl $t6, .L8084AB28 -/* 18908 8084AB18 8FB800B4 */ lw $t8, 0x00B4($sp) -/* 1890C 8084AB1C 0C02426D */ jal func_800909B4 -/* 18910 8084AB20 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 18914 8084AB24 8FB800B4 */ lw $t8, 0x00B4($sp) -.L8084AB28: -/* 18918 8084AB28 3C068085 */ lui $a2, %hi(D_80855310) ## $a2 = 80850000 -/* 1891C 8084AB2C 24C65310 */ addiu $a2, $a2, %lo(D_80855310) ## $a2 = 80855310 -/* 18920 8084AB30 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFE4 -/* 18924 8084AB34 24074C11 */ addiu $a3, $zero, 0x4C11 ## $a3 = 00004C11 -/* 18928 8084AB38 0C031AD5 */ jal Graph_CloseDisps -/* 1892C 8084AB3C 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 18930 8084AB40 8FBF003C */ lw $ra, 0x003C($sp) -/* 18934 8084AB44 8FB00038 */ lw $s0, 0x0038($sp) -/* 18938 8084AB48 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 -/* 1893C 8084AB4C 03E00008 */ jr $ra -/* 18940 8084AB50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s deleted file mode 100644 index 491089b4a6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_8084AB54 -/* 18944 8084AB54 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 18948 8084AB58 AFB00014 */ sw $s0, 0x0014($sp) -/* 1894C 8084AB5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 18950 8084AB60 AFB10018 */ sw $s1, 0x0018($sp) -/* 18954 8084AB64 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 18958 8084AB68 AFBF001C */ sw $ra, 0x001C($sp) -/* 1895C 8084AB6C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 18960 8084AB70 0C009C27 */ jal Effect_Delete -/* 18964 8084AB74 8E050670 */ lw $a1, 0x0670($s0) ## 00000670 -/* 18968 8084AB78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1896C 8084AB7C 0C0170EB */ jal Collider_DestroyCylinder - -/* 18970 8084AB80 26050498 */ addiu $a1, $s0, 0x0498 ## $a1 = 00000498 -/* 18974 8084AB84 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 18978 8084AB88 0C017418 */ jal Collider_DestroyQuad -/* 1897C 8084AB8C 260504E4 */ addiu $a1, $s0, 0x04E4 ## $a1 = 000004E4 -/* 18980 8084AB90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 18984 8084AB94 0C017418 */ jal Collider_DestroyQuad -/* 18988 8084AB98 26050564 */ addiu $a1, $s0, 0x0564 ## $a1 = 00000564 -/* 1898C 8084AB9C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 18990 8084ABA0 0C017418 */ jal Collider_DestroyQuad -/* 18994 8084ABA4 260505E4 */ addiu $a1, $s0, 0x05E4 ## $a1 = 000005E4 -/* 18998 8084ABA8 0C021DB2 */ jal func_800876C8 -/* 1899C 8084ABAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 189A0 8084ABB0 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 189A4 8084ABB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 189A8 8084ABB8 01D17021 */ addu $t6, $t6, $s1 -/* 189AC 8084ABBC 91CE1DE8 */ lbu $t6, 0x1DE8($t6) ## 00011DE8 -/* 189B0 8084ABC0 3C018016 */ lui $at, %hi(gSaveContext+4) -/* 189B4 8084ABC4 8FB10018 */ lw $s1, 0x0018($sp) -/* 189B8 8084ABC8 8FB00014 */ lw $s0, 0x0014($sp) -/* 189BC 8084ABCC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 189C0 8084ABD0 03E00008 */ jr $ra -/* 189C4 8084ABD4 AC2EE664 */ sw $t6, %lo(gSaveContext+4)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ABD8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ABD8.s index 72fdf5d454..b98dd7a00c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ABD8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ABD8.s @@ -3,7 +3,7 @@ glabel D_808554F4 .float 1500.0 glabel D_808554F8 - .word 0xC4BB8000 + .float -1500.0 .text glabel func_8084ABD8 @@ -24,8 +24,8 @@ glabel func_8084ABD8 /* 18A00 8084AC10 54400036 */ bnel $v0, $zero, .L8084ACEC /* 18A04 8084AC14 8E2D067C */ lw $t5, 0x067C($s1) ## 0000067C /* 18A08 8084AC18 16000033 */ bne $s0, $zero, .L8084ACE8 -/* 18A0C 8084AC1C 3C0E8086 */ lui $t6, %hi(D_80858AB4) ## $t6 = 80860000 -/* 18A10 8084AC20 8DCE8AB4 */ lw $t6, %lo(D_80858AB4)($t6) +/* 18A0C 8084AC1C 3C0E8086 */ lui $t6, %hi(sControlInput) ## $t6 = 80860000 +/* 18A10 8084AC20 8DCE8AB4 */ lw $t6, %lo(sControlInput)($t6) /* 18A14 8084AC24 3C014370 */ lui $at, 0x4370 ## $at = 43700000 /* 18A18 8084AC28 44814000 */ mtc1 $at, $f8 ## $f8 = 240.00 /* 18A1C 8084AC2C 81CF0015 */ lb $t7, 0x0015($t6) ## 80860015 @@ -46,8 +46,8 @@ glabel func_8084ABD8 /* 18A58 8084AC68 0C01E1A7 */ jal Math_SmoothScaleMaxMinS /* 18A5C 8084AC6C 00052C03 */ sra $a1, $a1, 16 -/* 18A60 8084AC70 3C088086 */ lui $t0, %hi(D_80858AB4) ## $t0 = 80860000 -/* 18A64 8084AC74 8D088AB4 */ lw $t0, %lo(D_80858AB4)($t0) +/* 18A60 8084AC70 3C088086 */ lui $t0, %hi(sControlInput) ## $t0 = 80860000 +/* 18A64 8084AC74 8D088AB4 */ lw $t0, %lo(sControlInput)($t0) /* 18A68 8084AC78 3C01C180 */ lui $at, 0xC180 ## $at = C1800000 /* 18A6C 8084AC7C 44813000 */ mtc1 $at, $f6 ## $f6 = -16.00 /* 18A70 8084AC80 81090014 */ lb $t1, 0x0014($t0) ## 80860014 @@ -83,14 +83,14 @@ glabel func_8084ABD8 /* 18AD8 8084ACE8 8E2D067C */ lw $t5, 0x067C($s1) ## 0000067C .L8084ACEC: /* 18ADC 8084ACEC 241036B0 */ addiu $s0, $zero, 0x36B0 ## $s0 = 000036B0 -/* 18AE0 8084ACF0 3C0F8086 */ lui $t7, %hi(D_80858AB4) ## $t7 = 80860000 +/* 18AE0 8084ACF0 3C0F8086 */ lui $t7, %hi(sControlInput) ## $t7 = 80860000 /* 18AE4 8084ACF4 000D7200 */ sll $t6, $t5, 8 /* 18AE8 8084ACF8 05C10003 */ bgez $t6, .L8084AD08 /* 18AEC 8084ACFC 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF /* 18AF0 8084AD00 10000001 */ beq $zero, $zero, .L8084AD08 /* 18AF4 8084AD04 24100DAC */ addiu $s0, $zero, 0x0DAC ## $s0 = 00000DAC .L8084AD08: -/* 18AF8 8084AD08 8DEF8AB4 */ lw $t7, %lo(D_80858AB4)($t7) +/* 18AF8 8084AD08 8DEF8AB4 */ lw $t7, %lo(sControlInput)($t7) /* 18AFC 8084AD0C 81E20015 */ lb $v0, 0x0015($t7) ## 80860015 /* 18B00 8084AD10 04400003 */ bltz $v0, .L8084AD20 /* 18B04 8084AD14 00022080 */ sll $a0, $v0, 2 @@ -115,7 +115,7 @@ glabel func_8084ABD8 /* 18B48 8084AD58 862B0044 */ lh $t3, 0x0044($s1) ## 00000044 /* 18B4C 8084AD5C 00101823 */ subu $v1, $zero, $s0 /* 18B50 8084AD60 46049182 */ mul.s $f6, $f18, $f4 -/* 18B54 8084AD64 3C0F8086 */ lui $t7, %hi(D_80858AB4) ## $t7 = 80860000 +/* 18B54 8084AD64 3C0F8086 */ lui $t7, %hi(sControlInput) ## $t7 = 80860000 /* 18B58 8084AD68 4600320D */ trunc.w.s $f8, $f6 /* 18B5C 8084AD6C 44194000 */ mfc1 $t9, $f8 /* 18B60 8084AD70 00000000 */ nop @@ -138,7 +138,7 @@ glabel func_8084ABD8 .L8084ADB0: /* 18BA0 8084ADB0 A6250044 */ sh $a1, 0x0044($s1) ## 00000044 .L8084ADB4: -/* 18BA4 8084ADB4 8DEF8AB4 */ lw $t7, %lo(D_80858AB4)($t7) +/* 18BA4 8084ADB4 8DEF8AB4 */ lw $t7, %lo(sControlInput)($t7) /* 18BA8 8084ADB8 862D0046 */ lh $t5, 0x0046($s1) ## 00000046 /* 18BAC 8084ADBC 862E00B6 */ lh $t6, 0x00B6($s1) ## 000000B6 /* 18BB0 8084ADC0 81E20014 */ lb $v0, 0x0014($t7) ## 80860014 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AEEC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AEEC.s deleted file mode 100644 index 8f2185863f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AEEC.s +++ /dev/null @@ -1,85 +0,0 @@ -.late_rodata -glabel D_808554FC - .float 0.8 - -glabel D_80855500 - .float 0.02 - -glabel D_80855504 - .float 0.05 - -.text -glabel func_8084AEEC -/* 18CDC 8084AEEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 18CE0 8084AEF0 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 18CE4 8084AEF4 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 18CE8 8084AEF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 18CEC 8084AEFC AFA40018 */ sw $a0, 0x0018($sp) -/* 18CF0 8084AF00 AFA5001C */ sw $a1, 0x001C($sp) -/* 18CF4 8084AF04 AFA70024 */ sw $a3, 0x0024($sp) -/* 18CF8 8084AF08 85F8006E */ lh $t8, 0x006E($t7) ## 8016006E -/* 18CFC 8084AF0C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 18D00 8084AF10 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 18D04 8084AF14 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 18D08 8084AF18 3C018085 */ lui $at, %hi(D_808554FC) ## $at = 80850000 -/* 18D0C 8084AF1C C43254FC */ lwc1 $f18, %lo(D_808554FC)($at) -/* 18D10 8084AF20 46803220 */ cvt.s.w $f8, $f6 -/* 18D14 8084AF24 C48401CC */ lwc1 $f4, 0x01CC($a0) ## 000001CC -/* 18D18 8084AF28 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 18D1C 8084AF2C 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 18D20 8084AF30 C4AC0000 */ lwc1 $f12, 0x0000($a1) ## 00000000 -/* 18D24 8084AF34 46102081 */ sub.s $f2, $f4, $f16 -/* 18D28 8084AF38 44867000 */ mtc1 $a2, $f14 ## $f14 = 0.00 -/* 18D2C 8084AF3C 460A4103 */ div.s $f4, $f8, $f10 -/* 18D30 8084AF40 46122002 */ mul.s $f0, $f4, $f18 -/* 18D34 8084AF44 460C003C */ c.lt.s $f0, $f12 -/* 18D38 8084AF48 00000000 */ nop -/* 18D3C 8084AF4C 45020005 */ bc1fl .L8084AF64 -/* 18D40 8084AF50 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 18D44 8084AF54 E4A00000 */ swc1 $f0, 0x0000($a1) ## 00000000 -/* 18D48 8084AF58 8FA8001C */ lw $t0, 0x001C($sp) -/* 18D4C 8084AF5C C50C0000 */ lwc1 $f12, 0x0000($t0) ## 00000000 -/* 18D50 8084AF60 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L8084AF64: -/* 18D54 8084AF64 00000000 */ nop -/* 18D58 8084AF68 4602003C */ c.lt.s $f0, $f2 -/* 18D5C 8084AF6C 00000000 */ nop -/* 18D60 8084AF70 4502000B */ bc1fl .L8084AFA0 -/* 18D64 8084AF74 46000086 */ mov.s $f2, $f0 -/* 18D68 8084AF78 4610103C */ c.lt.s $f2, $f16 -/* 18D6C 8084AF7C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 18D70 8084AF80 45020007 */ bc1fl .L8084AFA0 -/* 18D74 8084AF84 46000086 */ mov.s $f2, $f0 -/* 18D78 8084AF88 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 -/* 18D7C 8084AF8C 00000000 */ nop -/* 18D80 8084AF90 46061082 */ mul.s $f2, $f2, $f6 -/* 18D84 8084AF94 10000003 */ beq $zero, $zero, .L8084AFA4 -/* 18D88 8084AF98 00000000 */ nop -/* 18D8C 8084AF9C 46000086 */ mov.s $f2, $f0 -.L8084AFA0: -/* 18D90 8084AFA0 46000386 */ mov.s $f14, $f0 -.L8084AFA4: -/* 18D94 8084AFA4 3C018085 */ lui $at, %hi(D_80855500) ## $at = 80850000 -/* 18D98 8084AFA8 46127202 */ mul.s $f8, $f14, $f18 -/* 18D9C 8084AFAC C42A5500 */ lwc1 $f10, %lo(D_80855500)($at) -/* 18DA0 8084AFB0 46006005 */ abs.s $f0, $f12 -/* 18DA4 8084AFB4 3C018085 */ lui $at, %hi(D_80855504) ## $at = 80850000 -/* 18DA8 8084AFB8 460A0102 */ mul.s $f4, $f0, $f10 -/* 18DAC 8084AFBC C4265504 */ lwc1 $f6, %lo(D_80855504)($at) -/* 18DB0 8084AFC0 44061000 */ mfc1 $a2, $f2 -/* 18DB4 8084AFC4 44054000 */ mfc1 $a1, $f8 -/* 18DB8 8084AFC8 8FA4001C */ lw $a0, 0x001C($sp) -/* 18DBC 8084AFCC 46062200 */ add.s $f8, $f4, $f6 -/* 18DC0 8084AFD0 44074000 */ mfc1 $a3, $f8 -/* 18DC4 8084AFD4 0C01DF1B */ jal func_80077C6C -/* 18DC8 8084AFD8 00000000 */ nop -/* 18DCC 8084AFDC 8FA40018 */ lw $a0, 0x0018($sp) -/* 18DD0 8084AFE0 87A50026 */ lh $a1, 0x0026($sp) -/* 18DD4 8084AFE4 24060640 */ addiu $a2, $zero, 0x0640 ## $a2 = 00000640 -/* 18DD8 8084AFE8 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 18DDC 8084AFEC 2484083C */ addiu $a0, $a0, 0x083C ## $a0 = 0000083C -/* 18DE0 8084AFF0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 18DE4 8084AFF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 18DE8 8084AFF8 03E00008 */ jr $ra -/* 18DEC 8084AFFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B000.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B000.s deleted file mode 100644 index 1b90d5aaf2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B000.s +++ /dev/null @@ -1,110 +0,0 @@ -.late_rodata -glabel D_80855508 - .word 0xBDCCCCCD -glabel D_8085550C - .word 0xBE4CCCCD -glabel D_80855510 - .word 0xBE99999A -glabel D_80855514 - .float 0.1 - -.text -glabel func_8084B000 -/* 18DF0 8084B000 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 18DF4 8084B004 C4800060 */ lwc1 $f0, 0x0060($a0) ## 00000060 -/* 18DF8 8084B008 8C8E0678 */ lw $t6, 0x0678($a0) ## 00000678 -/* 18DFC 8084B00C 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 18E00 8084B010 4602003C */ c.lt.s $f0, $f2 -/* 18E04 8084B014 44817000 */ mtc1 $at, $f14 ## $f14 = -5.00 -/* 18E08 8084B018 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 18E0C 8084B01C C5D00028 */ lwc1 $f16, 0x0028($t6) ## 00000028 -/* 18E10 8084B020 45020005 */ bc1fl .L8084B038 -/* 18E14 8084B024 C48C0084 */ lwc1 $f12, 0x0084($a0) ## 00000084 -/* 18E18 8084B028 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 18E1C 8084B02C 00000000 */ nop -/* 18E20 8084B030 46048400 */ add.s $f16, $f16, $f4 -/* 18E24 8084B034 C48C0084 */ lwc1 $f12, 0x0084($a0) ## 00000084 -.L8084B038: -/* 18E28 8084B038 4610603C */ c.lt.s $f12, $f16 -/* 18E2C 8084B03C 00000000 */ nop -/* 18E30 8084B040 45020010 */ bc1fl .L8084B084 -/* 18E34 8084B044 8C8F067C */ lw $t7, 0x067C($a0) ## 0000067C -/* 18E38 8084B048 4602003E */ c.le.s $f0, $f2 -/* 18E3C 8084B04C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 18E40 8084B050 45020004 */ bc1fl .L8084B064 -/* 18E44 8084B054 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 18E48 8084B058 10000005 */ beq $zero, $zero, .L8084B070 -/* 18E4C 8084B05C 46001406 */ mov.s $f16, $f2 -/* 18E50 8084B060 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -.L8084B064: -/* 18E54 8084B064 00000000 */ nop -/* 18E58 8084B068 46060402 */ mul.s $f16, $f0, $f6 -/* 18E5C 8084B06C 00000000 */ nop -.L8084B070: -/* 18E60 8084B070 3C018085 */ lui $at, %hi(D_80855508) ## $at = 80850000 -/* 18E64 8084B074 C4285508 */ lwc1 $f8, %lo(D_80855508)($at) -/* 18E68 8084B078 1000002A */ beq $zero, $zero, .L8084B124 -/* 18E6C 8084B07C 46104481 */ sub.s $f18, $f8, $f16 -/* 18E70 8084B080 8C8F067C */ lw $t7, 0x067C($a0) ## 0000067C -.L8084B084: -/* 18E74 8084B084 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 -/* 18E78 8084B088 5700000E */ bnel $t8, $zero, .L8084B0C4 -/* 18E7C 8084B08C 4600103E */ c.le.s $f2, $f0 -/* 18E80 8084B090 8099014F */ lb $t9, 0x014F($a0) ## 0000014F -/* 18E84 8084B094 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 18E88 8084B098 17210009 */ bne $t9, $at, .L8084B0C0 -/* 18E8C 8084B09C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 18E90 8084B0A0 44815000 */ mtc1 $at, $f10 ## $f10 = -3.00 -/* 18E94 8084B0A4 3C018085 */ lui $at, %hi(D_8085550C) ## $at = 80850000 -/* 18E98 8084B0A8 4600503E */ c.le.s $f10, $f0 -/* 18E9C 8084B0AC 00000000 */ nop -/* 18EA0 8084B0B0 45020004 */ bc1fl .L8084B0C4 -/* 18EA4 8084B0B4 4600103E */ c.le.s $f2, $f0 -/* 18EA8 8084B0B8 1000000F */ beq $zero, $zero, .L8084B0F8 -/* 18EAC 8084B0BC C432550C */ lwc1 $f18, %lo(D_8085550C)($at) -.L8084B0C0: -/* 18EB0 8084B0C0 4600103E */ c.le.s $f2, $f0 -.L8084B0C4: -/* 18EB4 8084B0C4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 18EB8 8084B0C8 44817000 */ mtc1 $at, $f14 ## $f14 = 2.00 -/* 18EBC 8084B0CC 3C018085 */ lui $at, %hi(D_80855510) ## $at = 80850000 -/* 18EC0 8084B0D0 45000003 */ bc1f .L8084B0E0 -/* 18EC4 8084B0D4 00000000 */ nop -/* 18EC8 8084B0D8 10000004 */ beq $zero, $zero, .L8084B0EC -/* 18ECC 8084B0DC 46001406 */ mov.s $f16, $f2 -.L8084B0E0: -/* 18ED0 8084B0E0 C4245510 */ lwc1 $f4, %lo(D_80855510)($at) -/* 18ED4 8084B0E4 46040402 */ mul.s $f16, $f0, $f4 -/* 18ED8 8084B0E8 00000000 */ nop -.L8084B0EC: -/* 18EDC 8084B0EC 3C018085 */ lui $at, %hi(D_80855514) ## $at = 80850000 -/* 18EE0 8084B0F0 C4265514 */ lwc1 $f6, %lo(D_80855514)($at) -/* 18EE4 8084B0F4 46068480 */ add.s $f18, $f16, $f6 -.L8084B0F8: -/* 18EE8 8084B0F8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 18EEC 8084B0FC 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 18EF0 8084B100 00000000 */ nop -/* 18EF4 8084B104 460C403C */ c.lt.s $f8, $f12 -/* 18EF8 8084B108 00000000 */ nop -/* 18EFC 8084B10C 45020006 */ bc1fl .L8084B128 -/* 18F00 8084B110 46120280 */ add.s $f10, $f0, $f18 -/* 18F04 8084B114 8C880680 */ lw $t0, 0x0680($a0) ## 00000680 -/* 18F08 8084B118 C4800060 */ lwc1 $f0, 0x0060($a0) ## 00000060 -/* 18F0C 8084B11C 35090400 */ ori $t1, $t0, 0x0400 ## $t1 = 00000400 -/* 18F10 8084B120 AC890680 */ sw $t1, 0x0680($a0) ## 00000680 -.L8084B124: -/* 18F14 8084B124 46120280 */ add.s $f10, $f0, $f18 -.L8084B128: -/* 18F18 8084B128 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 18F1C 8084B12C E48A0060 */ swc1 $f10, 0x0060($a0) ## 00000060 -/* 18F20 8084B130 C4860060 */ lwc1 $f6, 0x0060($a0) ## 00000060 -/* 18F24 8084B134 460E3201 */ sub.s $f8, $f6, $f14 -/* 18F28 8084B138 46124282 */ mul.s $f10, $f8, $f18 -/* 18F2C 8084B13C 460A203C */ c.lt.s $f4, $f10 -/* 18F30 8084B140 00000000 */ nop -/* 18F34 8084B144 45000002 */ bc1f .L8084B150 -/* 18F38 8084B148 00000000 */ nop -/* 18F3C 8084B14C E48E0060 */ swc1 $f14, 0x0060($a0) ## 00000060 -.L8084B150: -/* 18F40 8084B150 03E00008 */ jr $ra -/* 18F44 8084B154 E482006C */ swc1 $f2, 0x006C($a0) ## 0000006C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B158.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B158.s deleted file mode 100644 index d7e31d4a8b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B158.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_8084B158 -/* 18F48 8084B158 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 18F4C 8084B15C 44876000 */ mtc1 $a3, $f12 ## $f12 = 0.00 -/* 18F50 8084B160 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 18F54 8084B164 AFBF0014 */ sw $ra, 0x0014($sp) -/* 18F58 8084B168 10C00009 */ beq $a2, $zero, .L8084B190 -/* 18F5C 8084B16C AFA5001C */ sw $a1, 0x001C($sp) -/* 18F60 8084B170 94CE000C */ lhu $t6, 0x000C($a2) ## 0000000C -/* 18F64 8084B174 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 18F68 8084B178 31CFC000 */ andi $t7, $t6, 0xC000 ## $t7 = 00000000 -/* 18F6C 8084B17C 51E00005 */ beql $t7, $zero, .L8084B194 -/* 18F70 8084B180 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 18F74 8084B184 44811000 */ mtc1 $at, $f2 ## $f2 = 0.50 -/* 18F78 8084B188 10000006 */ beq $zero, $zero, .L8084B1A4 -/* 18F7C 8084B18C 46001006 */ mov.s $f0, $f2 -.L8084B190: -/* 18F80 8084B190 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -.L8084B194: -/* 18F84 8084B194 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 18F88 8084B198 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 18F8C 8084B19C 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 18F90 8084B1A0 00000000 */ nop -.L8084B1A4: -/* 18F94 8084B1A4 460C0002 */ mul.s $f0, $f0, $f12 -/* 18F98 8084B1A8 24E501B4 */ addiu $a1, $a3, 0x01B4 ## $a1 = 000001B4 -/* 18F9C 8084B1AC 4602003C */ c.lt.s $f0, $f2 -/* 18FA0 8084B1B0 00000000 */ nop -/* 18FA4 8084B1B4 45000002 */ bc1f .L8084B1C0 -/* 18FA8 8084B1B8 00000000 */ nop -/* 18FAC 8084B1BC 46001006 */ mov.s $f0, $f2 -.L8084B1C0: -/* 18FB0 8084B1C0 0C028EF0 */ jal func_800A3BC0 -/* 18FB4 8084B1C4 E4E001D0 */ swc1 $f0, 0x01D0($a3) ## 000001D0 -/* 18FB8 8084B1C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 18FBC 8084B1CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 18FC0 8084B1D0 03E00008 */ jr $ra -/* 18FC4 8084B1D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B1D8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B1D8.s deleted file mode 100644 index 0157a922eb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B1D8.s +++ /dev/null @@ -1,142 +0,0 @@ -glabel func_8084B1D8 -/* 18FC8 8084B1D8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 18FCC 8084B1DC AFBF001C */ sw $ra, 0x001C($sp) -/* 18FD0 8084B1E0 AFB00018 */ sw $s0, 0x0018($sp) -/* 18FD4 8084B1E4 AFA50024 */ sw $a1, 0x0024($sp) -/* 18FD8 8084B1E8 8C8E067C */ lw $t6, 0x067C($a0) ## 0000067C -/* 18FDC 8084B1EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 18FE0 8084B1F0 000E7900 */ sll $t7, $t6, 4 -/* 18FE4 8084B1F4 05E1000A */ bgez $t7, .L8084B220 -/* 18FE8 8084B1F8 00000000 */ nop -/* 18FEC 8084B1FC 0C212C00 */ jal func_8084B000 -/* 18FF0 8084B200 00000000 */ nop -/* 18FF4 8084B204 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 18FF8 8084B208 26050838 */ addiu $a1, $s0, 0x0838 ## $a1 = 00000838 -/* 18FFC 8084B20C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 19000 8084B210 0C212BBB */ jal func_8084AEEC -/* 19004 8084B214 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 19008 8084B218 10000004 */ beq $zero, $zero, .L8084B22C -/* 1900C 8084B21C 921806AD */ lbu $t8, 0x06AD($s0) ## 000006AD -.L8084B220: -/* 19010 8084B220 0C20DC87 */ jal func_8083721C -/* 19014 8084B224 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19018 8084B228 921806AD */ lbu $t8, 0x06AD($s0) ## 000006AD -.L8084B22C: -/* 1901C 8084B22C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 19020 8084B230 5701000C */ bnel $t8, $at, .L8084B264 -/* 19024 8084B234 92190444 */ lbu $t9, 0x0444($s0) ## 00000444 -/* 19028 8084B238 0C00B75B */ jal func_8002DD6C -/* 1902C 8084B23C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19030 8084B240 54400005 */ bnel $v0, $zero, .L8084B258 -/* 19034 8084B244 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19038 8084B248 0C20CCB9 */ jal func_808332E4 -/* 1903C 8084B24C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19040 8084B250 10400003 */ beq $v0, $zero, .L8084B260 -/* 19044 8084B254 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084B258: -/* 19048 8084B258 0C20D99C */ jal func_80836670 -/* 1904C 8084B25C 8FA50024 */ lw $a1, 0x0024($sp) -.L8084B260: -/* 19050 8084B260 92190444 */ lbu $t9, 0x0444($s0) ## 00000444 -.L8084B264: -/* 19054 8084B264 57200032 */ bnel $t9, $zero, .L8084B330 -/* 19058 8084B268 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1905C 8084B26C 920206AD */ lbu $v0, 0x06AD($s0) ## 000006AD -/* 19060 8084B270 1040002E */ beq $v0, $zero, .L8084B32C -/* 19064 8084B274 28410004 */ slti $at, $v0, 0x0004 -/* 19068 8084B278 5020002D */ beql $at, $zero, .L8084B330 -/* 1906C 8084B27C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19070 8084B280 0C20CED5 */ jal func_80833B54 -/* 19074 8084B284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19078 8084B288 54400029 */ bnel $v0, $zero, .L8084B330 -/* 1907C 8084B28C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19080 8084B290 8E080664 */ lw $t0, 0x0664($s0) ## 00000664 -/* 19084 8084B294 8FA40024 */ lw $a0, 0x0024($sp) -/* 19088 8084B298 55000025 */ bnel $t0, $zero, .L8084B330 -/* 1908C 8084B29C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19090 8084B2A0 0C20EB53 */ jal func_8083AD4C -/* 19094 8084B2A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19098 8084B2A8 50400021 */ beql $v0, $zero, .L8084B330 -/* 1909C 8084B2AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 190A0 8084B2B0 920906AD */ lbu $t1, 0x06AD($s0) ## 000006AD -/* 190A4 8084B2B4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 190A8 8084B2B8 3C0A8086 */ lui $t2, %hi(D_80858AB4) ## $t2 = 80860000 -/* 190AC 8084B2BC 55210013 */ bnel $t1, $at, .L8084B30C -/* 190B0 8084B2C0 920D06AD */ lbu $t5, 0x06AD($s0) ## 000006AD -/* 190B4 8084B2C4 8D4A8AB4 */ lw $t2, %lo(D_80858AB4)($t2) -/* 190B8 8084B2C8 954B000C */ lhu $t3, 0x000C($t2) ## 8086000C -/* 190BC 8084B2CC 316CC010 */ andi $t4, $t3, 0xC010 ## $t4 = 00000000 -/* 190C0 8084B2D0 55800017 */ bnel $t4, $zero, .L8084B330 -/* 190C4 8084B2D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 190C8 8084B2D8 0C20CECB */ jal func_80833B2C -/* 190CC 8084B2DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 190D0 8084B2E0 54400013 */ bnel $v0, $zero, .L8084B330 -/* 190D4 8084B2E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 190D8 8084B2E8 0C00B75E */ jal func_8002DD78 -/* 190DC 8084B2EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 190E0 8084B2F0 54400006 */ bnel $v0, $zero, .L8084B30C -/* 190E4 8084B2F4 920D06AD */ lbu $t5, 0x06AD($s0) ## 000006AD -/* 190E8 8084B2F8 0C20CD2D */ jal func_808334B4 -/* 190EC 8084B2FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 190F0 8084B300 5040000B */ beql $v0, $zero, .L8084B330 -/* 190F4 8084B304 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 190F8 8084B308 920D06AD */ lbu $t5, 0x06AD($s0) ## 000006AD -.L8084B30C: -/* 190FC 8084B30C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 19100 8084B310 3C0E8086 */ lui $t6, %hi(D_80858AB4) ## $t6 = 80860000 -/* 19104 8084B314 55A1000D */ bnel $t5, $at, .L8084B34C -/* 19108 8084B318 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 1910C 8084B31C 8DCE8AB4 */ lw $t6, %lo(D_80858AB4)($t6) -/* 19110 8084B320 95CF000C */ lhu $t7, 0x000C($t6) ## 8086000C -/* 19114 8084B324 31F8C01F */ andi $t8, $t7, 0xC01F ## $t8 = 00000000 -/* 19118 8084B328 13000007 */ beq $t8, $zero, .L8084B348 -.L8084B32C: -/* 1911C 8084B32C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084B330: -/* 19120 8084B330 0C20F052 */ jal func_8083C148 -/* 19124 8084B334 8FA50024 */ lw $a1, 0x0024($sp) -/* 19128 8084B338 0C01E221 */ jal func_80078884 -/* 1912C 8084B33C 24044813 */ addiu $a0, $zero, 0x4813 ## $a0 = 00004813 -/* 19130 8084B340 1000001C */ beq $zero, $zero, .L8084B3B4 -/* 19134 8084B344 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 -.L8084B348: -/* 19138 8084B348 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -.L8084B34C: -/* 1913C 8084B34C 14400003 */ bne $v0, $zero, .L8084B35C -/* 19140 8084B350 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 19144 8084B354 10000003 */ beq $zero, $zero, .L8084B364 -/* 19148 8084B358 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L8084B35C: -/* 1914C 8084B35C A6190850 */ sh $t9, 0x0850($s0) ## 00000850 -/* 19150 8084B360 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -.L8084B364: -/* 19154 8084B364 10600005 */ beq $v1, $zero, .L8084B37C -/* 19158 8084B368 00000000 */ nop -/* 1915C 8084B36C 920806AD */ lbu $t0, 0x06AD($s0) ## 000006AD -/* 19160 8084B370 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 19164 8084B374 5101000F */ beql $t0, $at, .L8084B3B4 -/* 19168 8084B378 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 -.L8084B37C: -/* 1916C 8084B37C 0C023C4A */ jal func_8008F128 -/* 19170 8084B380 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19174 8084B384 10400005 */ beq $v0, $zero, .L8084B39C -/* 19178 8084B388 8FA40024 */ lw $a0, 0x0024($sp) -/* 1917C 8084B38C 960906AE */ lhu $t1, 0x06AE($s0) ## 000006AE -/* 19180 8084B390 352A0043 */ ori $t2, $t1, 0x0043 ## $t2 = 00000043 -/* 19184 8084B394 10000006 */ beq $zero, $zero, .L8084B3B0 -/* 19188 8084B398 A60A06AE */ sh $t2, 0x06AE($s0) ## 000006AE -.L8084B39C: -/* 1918C 8084B39C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19190 8084B3A0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 19194 8084B3A4 0C212AF6 */ jal func_8084ABD8 -/* 19198 8084B3A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 1919C 8084B3AC A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -.L8084B3B0: -/* 191A0 8084B3B0 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 -.L8084B3B4: -/* 191A4 8084B3B4 A60B083C */ sh $t3, 0x083C($s0) ## 0000083C -/* 191A8 8084B3B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 191AC 8084B3BC 8FB00018 */ lw $s0, 0x0018($sp) -/* 191B0 8084B3C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 191B4 8084B3C4 03E00008 */ jr $ra -/* 191B8 8084B3C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B3CC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B3CC.s deleted file mode 100644 index 308e3abb9e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B3CC.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_8084B3CC -/* 191BC 8084B3CC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 191C0 8084B3D0 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 191C4 8084B3D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 191C8 8084B3D8 AFB10018 */ sw $s1, 0x0018($sp) -/* 191CC 8084B3DC AFB00014 */ sw $s0, 0x0014($sp) -/* 191D0 8084B3E0 01C47021 */ addu $t6, $t6, $a0 -/* 191D4 8084B3E4 81CE1E5C */ lb $t6, 0x1E5C($t6) ## 00011E5C -/* 191D8 8084B3E8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 191DC 8084B3EC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 191E0 8084B3F0 11C00024 */ beq $t6, $zero, .L8084B484 -/* 191E4 8084B3F4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 191E8 8084B3F8 0C20C959 */ jal func_80832564 -/* 191EC 8084B3FC 00000000 */ nop -/* 191F0 8084B400 3C068085 */ lui $a2, %hi(func_8084FA54) ## $a2 = 80850000 -/* 191F4 8084B404 24C6FA54 */ addiu $a2, $a2, %lo(func_8084FA54) ## $a2 = 8084FA54 -/* 191F8 8084B408 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 191FC 8084B40C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19200 8084B410 0C20D716 */ jal func_80835C58 -/* 19204 8084B414 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 19208 8084B418 0C00B75B */ jal func_8002DD6C -/* 1920C 8084B41C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19210 8084B420 50400005 */ beql $v0, $zero, .L8084B438 -/* 19214 8084B424 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 19218 8084B428 0C023C41 */ jal func_8008F104 -/* 1921C 8084B42C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19220 8084B430 10400004 */ beq $v0, $zero, .L8084B444 -/* 19224 8084B434 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L8084B438: -/* 19228 8084B438 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1922C 8084B43C 0C20D7D1 */ jal func_80835F44 -/* 19230 8084B440 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -.L8084B444: -/* 19234 8084B444 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 19238 8084B448 3C010010 */ lui $at, 0x0010 ## $at = 00100000 -/* 1923C 8084B44C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19240 8084B450 01E1C025 */ or $t8, $t7, $at ## $t8 = 00100000 -/* 19244 8084B454 0C20CCCE */ jal func_80833338 -/* 19248 8084B458 AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 1924C 8084B45C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 19250 8084B460 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19254 8084B464 0C20C899 */ jal func_80832264 -/* 19258 8084B468 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 1925C 8084B46C 0C20C884 */ jal func_80832210 -/* 19260 8084B470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19264 8084B474 0C20EC04 */ jal func_8083B010 -/* 19268 8084B478 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1926C 8084B47C 10000001 */ beq $zero, $zero, .L8084B484 -/* 19270 8084B480 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8084B484: -/* 19274 8084B484 8FBF001C */ lw $ra, 0x001C($sp) -/* 19278 8084B488 8FB00014 */ lw $s0, 0x0014($sp) -/* 1927C 8084B48C 8FB10018 */ lw $s1, 0x0018($sp) -/* 19280 8084B490 03E00008 */ jr $ra -/* 19284 8084B494 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B498.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B498.s deleted file mode 100644 index 19bf23e879..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B498.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8084B498 -/* 19288 8084B498 3C0E8012 */ lui $t6, %hi(gItemSlots+7) -/* 1928C 8084B49C 91CE746B */ lbu $t6, %lo(gItemSlots+7)($t6) -/* 19290 8084B4A0 3C0F8016 */ lui $t7, %hi(gSaveContext+0x74) -/* 19294 8084B4A4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 19298 8084B4A8 01EE7821 */ addu $t7, $t7, $t6 -/* 1929C 8084B4AC 91EFE6D4 */ lbu $t7, %lo(gSaveContext+0x74)($t7) -/* 192A0 8084B4B0 2419001D */ addiu $t9, $zero, 0x001D ## $t9 = 0000001D -/* 192A4 8084B4B4 2418001C */ addiu $t8, $zero, 0x001C ## $t8 = 0000001C -/* 192A8 8084B4B8 55E10004 */ bnel $t7, $at, .L8084B4CC -/* 192AC 8084B4BC A0990154 */ sb $t9, 0x0154($a0) ## 00000154 -/* 192B0 8084B4C0 03E00008 */ jr $ra -/* 192B4 8084B4C4 A0980154 */ sb $t8, 0x0154($a0) ## 00000154 -.L8084B4C8: -/* 192B8 8084B4C8 A0990154 */ sb $t9, 0x0154($a0) ## 00000154 -.L8084B4CC: -/* 192BC 8084B4CC 03E00008 */ jr $ra -/* 192C0 8084B4D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B4D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B4D4.s deleted file mode 100644 index c257ca9621..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B4D4.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_8084B4D4 -/* 192C4 8084B4D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 192C8 8084B4D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 192CC 8084B4DC AFA40018 */ sw $a0, 0x0018($sp) -/* 192D0 8084B4E0 90A20692 */ lbu $v0, 0x0692($a1) ## 00000692 -/* 192D4 8084B4E4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 192D8 8084B4E8 304E0020 */ andi $t6, $v0, 0x0020 ## $t6 = 00000000 -/* 192DC 8084B4EC 11C0000B */ beq $t6, $zero, .L8084B51C -/* 192E0 8084B4F0 304FFFDF */ andi $t7, $v0, 0xFFDF ## $t7 = 00000000 -/* 192E4 8084B4F4 A0AF0692 */ sb $t7, 0x0692($a1) ## 00000692 -/* 192E8 8084B4F8 0C212D26 */ jal func_8084B498 -/* 192EC 8084B4FC AFA5001C */ sw $a1, 0x001C($sp) -/* 192F0 8084B500 8FA4001C */ lw $a0, 0x001C($sp) -/* 192F4 8084B504 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 192F8 8084B508 A09806AD */ sb $t8, 0x06AD($a0) ## 000006AD -/* 192FC 8084B50C 0C20EC10 */ jal func_8083B040 -/* 19300 8084B510 8FA50018 */ lw $a1, 0x0018($sp) -/* 19304 8084B514 10000002 */ beq $zero, $zero, .L8084B520 -/* 19308 8084B518 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8084B51C: -/* 1930C 8084B51C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8084B520: -/* 19310 8084B520 8FBF0014 */ lw $ra, 0x0014($sp) -/* 19314 8084B524 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 19318 8084B528 03E00008 */ jr $ra -/* 1931C 8084B52C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B530.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B530.s deleted file mode 100644 index e38dee0b5f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B530.s +++ /dev/null @@ -1,167 +0,0 @@ -glabel func_8084B530 -/* 19320 8084B530 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 19324 8084B534 AFBF001C */ sw $ra, 0x001C($sp) -/* 19328 8084B538 AFB10018 */ sw $s1, 0x0018($sp) -/* 1932C 8084B53C AFB00014 */ sw $s0, 0x0014($sp) -/* 19330 8084B540 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 19334 8084B544 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 19338 8084B548 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 1933C 8084B54C 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 19340 8084B550 0C20D99C */ jal func_80836670 -/* 19344 8084B554 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 19348 8084B558 0C042F6F */ jal func_8010BDBC -/* 1934C 8084B55C 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 19350 8084B560 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 19354 8084B564 14410043 */ bne $v0, $at, .L8084B674 -/* 19358 8084B568 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1935C 8084B56C 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 -/* 19360 8084B570 8E080694 */ lw $t0, 0x0694($s0) ## 00000694 -/* 19364 8084B574 2401FEFF */ addiu $at, $zero, 0xFEFF ## $at = FFFFFEFF -/* 19368 8084B578 0301C824 */ and $t9, $t8, $at -/* 1936C 8084B57C AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 19370 8084B580 8D090004 */ lw $t1, 0x0004($t0) ## 00000004 -/* 19374 8084B584 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 19378 8084B588 312A0005 */ andi $t2, $t1, 0x0005 ## $t2 = 00000000 -/* 1937C 8084B58C 11410005 */ beq $t2, $at, .L8084B5A4 -/* 19380 8084B590 00000000 */ nop -/* 19384 8084B594 8E0B0680 */ lw $t3, 0x0680($s0) ## 00000680 -/* 19388 8084B598 2401DFFF */ addiu $at, $zero, 0xDFFF ## $at = FFFFDFFF -/* 1938C 8084B59C 01616024 */ and $t4, $t3, $at -/* 19390 8084B5A0 AE0C0680 */ sw $t4, 0x0680($s0) ## 00000680 -.L8084B5A4: -/* 19394 8084B5A4 0C030129 */ jal Gameplay_GetCamera -/* 19398 8084B5A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1939C 8084B5AC 0C016C69 */ jal func_8005B1A4 -/* 193A0 8084B5B0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 193A4 8084B5B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 193A8 8084B5B8 0C212D35 */ jal func_8084B4D4 -/* 193AC 8084B5BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 193B0 8084B5C0 14400029 */ bne $v0, $zero, .L8084B668 -/* 193B4 8084B5C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 193B8 8084B5C8 0C212CF3 */ jal func_8084B3CC -/* 193BC 8084B5CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 193C0 8084B5D0 14400025 */ bne $v0, $zero, .L8084B668 -/* 193C4 8084B5D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 193C8 8084B5D8 0C20EB75 */ jal func_8083ADD4 -/* 193CC 8084B5DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 193D0 8084B5E0 54400022 */ bnel $v0, $zero, .L8084B66C -/* 193D4 8084B5E4 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 193D8 8084B5E8 8E0D0438 */ lw $t5, 0x0438($s0) ## 00000438 -/* 193DC 8084B5EC 8E0E0694 */ lw $t6, 0x0694($s0) ## 00000694 -/* 193E0 8084B5F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 193E4 8084B5F4 55AE0006 */ bnel $t5, $t6, .L8084B610 -/* 193E8 8084B5F8 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 193EC 8084B5FC 0C20F96A */ jal func_8083E5A8 -/* 193F0 8084B600 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 193F4 8084B604 54400019 */ bnel $v0, $zero, .L8084B66C -/* 193F8 8084B608 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 193FC 8084B60C 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -.L8084B610: -/* 19400 8084B610 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 19404 8084B614 000FC200 */ sll $t8, $t7, 8 -/* 19408 8084B618 07010008 */ bgez $t8, .L8084B63C -/* 1940C 8084B61C 00000000 */ nop -/* 19410 8084B620 86190850 */ lh $t9, 0x0850($s0) ## 00000850 -/* 19414 8084B624 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19418 8084B628 0C20E8D8 */ jal func_8083A360 -/* 1941C 8084B62C AFB90024 */ sw $t9, 0x0024($sp) -/* 19420 8084B630 8FA80024 */ lw $t0, 0x0024($sp) -/* 19424 8084B634 1000000C */ beq $zero, $zero, .L8084B668 -/* 19428 8084B638 A6080850 */ sh $t0, 0x0850($s0) ## 00000850 -.L8084B63C: -/* 1942C 8084B63C 0C20CCAE */ jal func_808332B8 -/* 19430 8084B640 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19434 8084B644 10400006 */ beq $v0, $zero, .L8084B660 -/* 19438 8084B648 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1943C 8084B64C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 19440 8084B650 0C20E3C6 */ jal func_80838F18 -/* 19444 8084B654 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19448 8084B658 10000004 */ beq $zero, $zero, .L8084B66C -/* 1944C 8084B65C 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -.L8084B660: -/* 19450 8084B660 0C214C20 */ jal func_80853080 -/* 19454 8084B664 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L8084B668: -/* 19458 8084B668 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -.L8084B66C: -/* 1945C 8084B66C 10000042 */ beq $zero, $zero, .L8084B778 -/* 19460 8084B670 A209088E */ sb $t1, 0x088E($s0) ## 0000088E -.L8084B674: -/* 19464 8084B674 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C -/* 19468 8084B678 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1946C 8084B67C 000A5A00 */ sll $t3, $t2, 8 -/* 19470 8084B680 05610005 */ bgez $t3, .L8084B698 -/* 19474 8084B684 00000000 */ nop -/* 19478 8084B688 0C213326 */ jal func_8084CC98 -/* 1947C 8084B68C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 19480 8084B690 10000032 */ beq $zero, $zero, .L8084B75C -/* 19484 8084B694 8E180664 */ lw $t8, 0x0664($s0) ## 00000664 -.L8084B698: -/* 19488 8084B698 0C20CCAE */ jal func_808332B8 -/* 1948C 8084B69C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19490 8084B6A0 10400005 */ beq $v0, $zero, .L8084B6B8 -/* 19494 8084B6A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19498 8084B6A8 0C213584 */ jal func_8084D610 -/* 1949C 8084B6AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 194A0 8084B6B0 1000002A */ beq $zero, $zero, .L8084B75C -/* 194A4 8084B6B4 8E180664 */ lw $t8, 0x0664($s0) ## 00000664 -.L8084B6B8: -/* 194A8 8084B6B8 0C023A71 */ jal func_8008E9C4 -/* 194AC 8084B6BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 194B0 8084B6C0 14400025 */ bne $v0, $zero, .L8084B758 -/* 194B4 8084B6C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 194B8 8084B6C8 0C028EF0 */ jal func_800A3BC0 -/* 194BC 8084B6CC 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 194C0 8084B6D0 50400022 */ beql $v0, $zero, .L8084B75C -/* 194C4 8084B6D4 8E180664 */ lw $t8, 0x0664($s0) ## 00000664 -/* 194C8 8084B6D8 920C01E9 */ lbu $t4, 0x01E9($s0) ## 000001E9 -/* 194CC 8084B6DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 194D0 8084B6E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 194D4 8084B6E4 1180001A */ beq $t4, $zero, .L8084B750 -/* 194D8 8084B6E8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 194DC 8084B6EC 0C20CB6F */ jal func_80832DBC -/* 194E0 8084B6F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 194E4 8084B6F4 8E0D0694 */ lw $t5, 0x0694($s0) ## 00000694 -/* 194E8 8084B6F8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 194EC 8084B6FC 91AE0002 */ lbu $t6, 0x0002($t5) ## 00000002 -/* 194F0 8084B700 15C1000B */ bne $t6, $at, .L8084B730 -/* 194F4 8084B704 00000000 */ nop -/* 194F8 8084B708 820F0151 */ lb $t7, 0x0151($s0) ## 00000151 -/* 194FC 8084B70C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 19500 8084B710 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 19504 8084B714 11E10006 */ beq $t7, $at, .L8084B730 -/* 19508 8084B718 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1950C 8084B71C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 19510 8084B720 0C20C8B4 */ jal func_808322D0 -/* 19514 8084B724 24C631A0 */ addiu $a2, $a2, 0x31A0 ## $a2 = 040031A0 -/* 19518 8084B728 1000000C */ beq $zero, $zero, .L8084B75C -/* 1951C 8084B72C 8E180664 */ lw $t8, 0x0664($s0) ## 00000664 -.L8084B730: -/* 19520 8084B730 0C20CCCE */ jal func_80833338 -/* 19524 8084B734 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19528 8084B738 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1952C 8084B73C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19530 8084B740 0C20C8A1 */ jal func_80832284 -/* 19534 8084B744 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 19538 8084B748 10000004 */ beq $zero, $zero, .L8084B75C -/* 1953C 8084B74C 8E180664 */ lw $t8, 0x0664($s0) ## 00000664 -.L8084B750: -/* 19540 8084B750 0C20C8A9 */ jal func_808322A4 -/* 19544 8084B754 24C631A8 */ addiu $a2, $a2, 0x31A8 ## $a2 = 000031A8 -.L8084B758: -/* 19548 8084B758 8E180664 */ lw $t8, 0x0664($s0) ## 00000664 -.L8084B75C: -/* 1954C 8084B75C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19550 8084B760 53000006 */ beql $t8, $zero, .L8084B77C -/* 19554 8084B764 8FBF001C */ lw $ra, 0x001C($sp) -/* 19558 8084B768 0C20F6E6 */ jal func_8083DB98 -/* 1955C 8084B76C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 19560 8084B770 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 19564 8084B774 A602083C */ sh $v0, 0x083C($s0) ## 0000083C -.L8084B778: -/* 19568 8084B778 8FBF001C */ lw $ra, 0x001C($sp) -.L8084B77C: -/* 1956C 8084B77C 8FB00014 */ lw $s0, 0x0014($sp) -/* 19570 8084B780 8FB10018 */ lw $s1, 0x0018($sp) -/* 19574 8084B784 03E00008 */ jr $ra -/* 19578 8084B788 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B78C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B78C.s deleted file mode 100644 index a7f9f7bab5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B78C.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_8084B78C -/* 1957C 8084B78C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 19580 8084B790 AFBF0024 */ sw $ra, 0x0024($sp) -/* 19584 8084B794 AFB10020 */ sw $s1, 0x0020($sp) -/* 19588 8084B798 AFB0001C */ sw $s0, 0x001C($sp) -/* 1958C 8084B79C 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 19590 8084B7A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 19594 8084B7A4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 19598 8084B7A8 35CF0141 */ ori $t7, $t6, 0x0141 ## $t7 = 00000141 -/* 1959C 8084B7AC AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 195A0 8084B7B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 195A4 8084B7B4 0C20FD49 */ jal func_8083F524 -/* 195A8 8084B7B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 195AC 8084B7BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 195B0 8084B7C0 0C028EF0 */ jal func_800A3BC0 -/* 195B4 8084B7C4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 195B8 8084B7C8 10400018 */ beq $v0, $zero, .L8084B82C -/* 195BC 8084B7CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 195C0 8084B7D0 0C20FE74 */ jal func_8083F9D0 -/* 195C4 8084B7D4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 195C8 8084B7D8 14400014 */ bne $v0, $zero, .L8084B82C -/* 195CC 8084B7DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 195D0 8084B7E0 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 195D4 8084B7E4 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 195D8 8084B7E8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 195DC 8084B7EC 0C20DC9A */ jal func_80837268 -/* 195E0 8084B7F0 AFB10010 */ sw $s1, 0x0010($sp) -/* 195E4 8084B7F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 195E8 8084B7F8 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 195EC 8084B7FC 0C20FFEE */ jal func_8083FFB8 -/* 195F0 8084B800 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 195F4 8084B804 18400005 */ blez $v0, .L8084B81C -/* 195F8 8084B808 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 195FC 8084B80C 0C20FEAE */ jal func_8083FAB8 -/* 19600 8084B810 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 19604 8084B814 10000006 */ beq $zero, $zero, .L8084B830 -/* 19608 8084B818 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084B81C: -/* 1960C 8084B81C 04410003 */ bgez $v0, .L8084B82C -/* 19610 8084B820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19614 8084B824 0C20FEC5 */ jal func_8083FB14 -/* 19618 8084B828 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L8084B82C: -/* 1961C 8084B82C 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084B830: -/* 19620 8084B830 8FB0001C */ lw $s0, 0x001C($sp) -/* 19624 8084B834 8FB10020 */ lw $s1, 0x0020($sp) -/* 19628 8084B838 03E00008 */ jr $ra -/* 1962C 8084B83C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B840.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B840.s deleted file mode 100644 index 17b833c43b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B840.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8084B840 -/* 19630 8084B840 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 19634 8084B844 AFBF0014 */ sw $ra, 0x0014($sp) -/* 19638 8084B848 AFA40018 */ sw $a0, 0x0018($sp) -/* 1963C 8084B84C AFA60020 */ sw $a2, 0x0020($sp) -/* 19640 8084B850 90A6007C */ lbu $a2, 0x007C($a1) ## 0000007C -/* 19644 8084B854 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 19648 8084B858 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 1964C 8084B85C 10C1000A */ beq $a2, $at, .L8084B888 -/* 19650 8084B860 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 19654 8084B864 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 19658 8084B868 0C00FAE1 */ jal DynaPolyInfo_GetActor - ## DynaPolyInfo_getActor -/* 1965C 8084B86C AFA7001C */ sw $a3, 0x001C($sp) -/* 19660 8084B870 8FA7001C */ lw $a3, 0x001C($sp) -/* 19664 8084B874 10400004 */ beq $v0, $zero, .L8084B888 -/* 19668 8084B878 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1966C 8084B87C 8FA50020 */ lw $a1, 0x0020($sp) -/* 19670 8084B880 0C00B7E9 */ jal func_8002DFA4 -/* 19674 8084B884 84E60032 */ lh $a2, 0x0032($a3) ## 00000032 -.L8084B888: -/* 19678 8084B888 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1967C 8084B88C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 19680 8084B890 03E00008 */ jr $ra -/* 19684 8084B894 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B898.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B898.s deleted file mode 100644 index 41d38c2512..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B898.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_8084B898 -/* 19688 8084B898 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 1968C 8084B89C AFBF0024 */ sw $ra, 0x0024($sp) -/* 19690 8084B8A0 AFB10020 */ sw $s1, 0x0020($sp) -/* 19694 8084B8A4 AFB0001C */ sw $s0, 0x001C($sp) -/* 19698 8084B8A8 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1969C 8084B8AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 196A0 8084B8B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 196A4 8084B8B4 35CF0141 */ ori $t7, $t6, 0x0141 ## $t7 = 00000141 -/* 196A8 8084B8B8 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 196AC 8084B8BC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 196B0 8084B8C0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 196B4 8084B8C4 24C63108 */ addiu $a2, $a2, 0x3108 ## $a2 = 04003108 -/* 196B8 8084B8C8 0C20CB2C */ jal func_80832CB0 -/* 196BC 8084B8CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 196C0 8084B8D0 10400003 */ beq $v0, $zero, .L8084B8E0 -/* 196C4 8084B8D4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 196C8 8084B8D8 1000000B */ beq $zero, $zero, .L8084B908 -/* 196CC 8084B8DC A6180850 */ sh $t8, 0x0850($s0) ## 00000850 -.L8084B8E0: -/* 196D0 8084B8E0 86190850 */ lh $t9, 0x0850($s0) ## 00000850 -/* 196D4 8084B8E4 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 -/* 196D8 8084B8E8 17200007 */ bne $t9, $zero, .L8084B908 -/* 196DC 8084B8EC 00000000 */ nop -/* 196E0 8084B8F0 0C02914C */ jal func_800A4530 -/* 196E4 8084B8F4 3C054130 */ lui $a1, 0x4130 ## $a1 = 41300000 -/* 196E8 8084B8F8 10400003 */ beq $v0, $zero, .L8084B908 -/* 196EC 8084B8FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 196F0 8084B900 0C20C9A6 */ jal func_80832698 -/* 196F4 8084B904 24056818 */ addiu $a1, $zero, 0x6818 ## $a1 = 00006818 -.L8084B908: -/* 196F8 8084B908 3C058085 */ lui $a1, %hi(D_80854870) ## $a1 = 80850000 -/* 196FC 8084B90C 24A54870 */ addiu $a1, $a1, %lo(D_80854870) ## $a1 = 80854870 -/* 19700 8084B910 0C20CA49 */ jal func_80832924 -/* 19704 8084B914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19708 8084B918 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1970C 8084B91C 0C20FD49 */ jal func_8083F524 -/* 19710 8084B920 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19714 8084B924 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 19718 8084B928 0C20FE74 */ jal func_8083F9D0 -/* 1971C 8084B92C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19720 8084B930 1440001B */ bne $v0, $zero, .L8084B9A0 -/* 19724 8084B934 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19728 8084B938 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 1972C 8084B93C 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 19730 8084B940 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 19734 8084B944 0C20DC9A */ jal func_80837268 -/* 19738 8084B948 AFB10010 */ sw $s1, 0x0010($sp) -/* 1973C 8084B94C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19740 8084B950 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 19744 8084B954 0C20FFEE */ jal func_8083FFB8 -/* 19748 8084B958 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 1974C 8084B95C 04410005 */ bgez $v0, .L8084B974 -/* 19750 8084B960 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19754 8084B964 0C20FEC5 */ jal func_8083FB14 -/* 19758 8084B968 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 1975C 8084B96C 1000000D */ beq $zero, $zero, .L8084B9A4 -/* 19760 8084B970 8E0A0680 */ lw $t2, 0x0680($s0) ## 00000680 -.L8084B974: -/* 19764 8084B974 14400007 */ bne $v0, $zero, .L8084B994 -/* 19768 8084B978 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1976C 8084B97C 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 19770 8084B980 24A530E0 */ addiu $a1, $a1, 0x30E0 ## $a1 = 040030E0 -/* 19774 8084B984 0C20FDCB */ jal func_8083F72C -/* 19778 8084B988 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 1977C 8084B98C 10000005 */ beq $zero, $zero, .L8084B9A4 -/* 19780 8084B990 8E0A0680 */ lw $t2, 0x0680($s0) ## 00000680 -.L8084B994: -/* 19784 8084B994 8E080680 */ lw $t0, 0x0680($s0) ## 00000680 -/* 19788 8084B998 35090010 */ ori $t1, $t0, 0x0010 ## $t1 = 00000010 -/* 1978C 8084B99C AE090680 */ sw $t1, 0x0680($s0) ## 00000680 -.L8084B9A0: -/* 19790 8084B9A0 8E0A0680 */ lw $t2, 0x0680($s0) ## 00000680 -.L8084B9A4: -/* 19794 8084B9A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 19798 8084B9A8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1979C 8084B9AC 314B0010 */ andi $t3, $t2, 0x0010 ## $t3 = 00000000 -/* 197A0 8084B9B0 51600008 */ beql $t3, $zero, .L8084B9D4 -/* 197A4 8084B9B4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 197A8 8084B9B8 0C212E10 */ jal func_8084B840 -/* 197AC 8084B9BC 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 197B0 8084B9C0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 197B4 8084B9C4 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 197B8 8084B9C8 00000000 */ nop -/* 197BC 8084B9CC E6040838 */ swc1 $f4, 0x0838($s0) ## 00000838 -/* 197C0 8084B9D0 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084B9D4: -/* 197C4 8084B9D4 8FB0001C */ lw $s0, 0x001C($sp) -/* 197C8 8084B9D8 8FB10020 */ lw $s1, 0x0020($sp) -/* 197CC 8084B9DC 03E00008 */ jr $ra -/* 197D0 8084B9E0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B9E4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B9E4.s deleted file mode 100644 index bf4007102a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B9E4.s +++ /dev/null @@ -1,141 +0,0 @@ -glabel func_8084B9E4 -/* 197D4 8084B9E4 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 197D8 8084B9E8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 197DC 8084B9EC AFB10030 */ sw $s1, 0x0030($sp) -/* 197E0 8084B9F0 AFB0002C */ sw $s0, 0x002C($sp) -/* 197E4 8084B9F4 908E015B */ lbu $t6, 0x015B($a0) ## 0000015B -/* 197E8 8084B9F8 8C980680 */ lw $t8, 0x0680($a0) ## 00000680 -/* 197EC 8084B9FC 3C068085 */ lui $a2, %hi(D_80853C74) ## $a2 = 80850000 -/* 197F0 8084BA00 000E7880 */ sll $t7, $t6, 2 -/* 197F4 8084BA04 00CF3021 */ addu $a2, $a2, $t7 -/* 197F8 8084BA08 8CC63C74 */ lw $a2, %lo(D_80853C74)($a2) -/* 197FC 8084BA0C 37190141 */ ori $t9, $t8, 0x0141 ## $t9 = 00000141 -/* 19800 8084BA10 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 19804 8084BA14 AC990680 */ sw $t9, 0x0680($a0) ## 00000680 -/* 19808 8084BA18 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 1980C 8084BA1C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 19810 8084BA20 0C20CB2C */ jal func_80832CB0 -/* 19814 8084BA24 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19818 8084BA28 10400003 */ beq $v0, $zero, .L8084BA38 -/* 1981C 8084BA2C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 19820 8084BA30 10000011 */ beq $zero, $zero, .L8084BA78 -/* 19824 8084BA34 A6080850 */ sh $t0, 0x0850($s0) ## 00000850 -.L8084BA38: -/* 19828 8084BA38 86090850 */ lh $t1, 0x0850($s0) ## 00000850 -/* 1982C 8084BA3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19830 8084BA40 3C058085 */ lui $a1, %hi(D_80854878) ## $a1 = 80850000 -/* 19834 8084BA44 1520000A */ bne $t1, $zero, .L8084BA70 -/* 19838 8084BA48 00000000 */ nop -/* 1983C 8084BA4C 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 -/* 19840 8084BA50 0C02914C */ jal func_800A4530 -/* 19844 8084BA54 3C054130 */ lui $a1, 0x4130 ## $a1 = 41300000 -/* 19848 8084BA58 10400007 */ beq $v0, $zero, .L8084BA78 -/* 1984C 8084BA5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19850 8084BA60 0C20C9A6 */ jal func_80832698 -/* 19854 8084BA64 24056818 */ addiu $a1, $zero, 0x6818 ## $a1 = 00006818 -/* 19858 8084BA68 10000004 */ beq $zero, $zero, .L8084BA7C -/* 1985C 8084BA6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L8084BA70: -/* 19860 8084BA70 0C20CA49 */ jal func_80832924 -/* 19864 8084BA74 24A54878 */ addiu $a1, $a1, %lo(D_80854878) ## $a1 = 00004878 -.L8084BA78: -/* 19868 8084BA78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L8084BA7C: -/* 1986C 8084BA7C 0C20FD49 */ jal func_8083F524 -/* 19870 8084BA80 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19874 8084BA84 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 19878 8084BA88 0C20FE74 */ jal func_8083F9D0 -/* 1987C 8084BA8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19880 8084BA90 1440001E */ bne $v0, $zero, .L8084BB0C -/* 19884 8084BA94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19888 8084BA98 27A50070 */ addiu $a1, $sp, 0x0070 ## $a1 = FFFFFFF8 -/* 1988C 8084BA9C 27A6006E */ addiu $a2, $sp, 0x006E ## $a2 = FFFFFFF6 -/* 19890 8084BAA0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 19894 8084BAA4 0C20DC9A */ jal func_80837268 -/* 19898 8084BAA8 AFB10010 */ sw $s1, 0x0010($sp) -/* 1989C 8084BAAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 198A0 8084BAB0 27A50070 */ addiu $a1, $sp, 0x0070 ## $a1 = FFFFFFF8 -/* 198A4 8084BAB4 0C20FFEE */ jal func_8083FFB8 -/* 198A8 8084BAB8 27A6006E */ addiu $a2, $sp, 0x006E ## $a2 = FFFFFFF6 -/* 198AC 8084BABC 18400005 */ blez $v0, .L8084BAD4 -/* 198B0 8084BAC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 198B4 8084BAC4 0C20FEAE */ jal func_8083FAB8 -/* 198B8 8084BAC8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 198BC 8084BACC 10000010 */ beq $zero, $zero, .L8084BB10 -/* 198C0 8084BAD0 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 -.L8084BAD4: -/* 198C4 8084BAD4 1440000A */ bne $v0, $zero, .L8084BB00 -/* 198C8 8084BAD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 198CC 8084BADC 920A015B */ lbu $t2, 0x015B($s0) ## 0000015B -/* 198D0 8084BAE0 3C058085 */ lui $a1, %hi(D_80853C8C) ## $a1 = 80850000 -/* 198D4 8084BAE4 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 198D8 8084BAE8 000A5880 */ sll $t3, $t2, 2 -/* 198DC 8084BAEC 00AB2821 */ addu $a1, $a1, $t3 -/* 198E0 8084BAF0 0C20FDCB */ jal func_8083F72C -/* 198E4 8084BAF4 8CA53C8C */ lw $a1, %lo(D_80853C8C)($a1) -/* 198E8 8084BAF8 10000005 */ beq $zero, $zero, .L8084BB10 -/* 198EC 8084BAFC 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 -.L8084BB00: -/* 198F0 8084BB00 8E0C0680 */ lw $t4, 0x0680($s0) ## 00000680 -/* 198F4 8084BB04 358D0010 */ ori $t5, $t4, 0x0010 ## $t5 = 00000010 -/* 198F8 8084BB08 AE0D0680 */ sw $t5, 0x0680($s0) ## 00000680 -.L8084BB0C: -/* 198FC 8084BB0C 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 -.L8084BB10: -/* 19900 8084BB10 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 19904 8084BB14 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19908 8084BB18 31CF0010 */ andi $t7, $t6, 0x0010 ## $t7 = 00000000 -/* 1990C 8084BB1C 11E0002C */ beq $t7, $zero, .L8084BBD0 -/* 19910 8084BB20 3C068085 */ lui $a2, %hi(D_80854880) ## $a2 = 80850000 -/* 19914 8084BB24 24C64880 */ addiu $a2, $a2, %lo(D_80854880) ## $a2 = 80854880 -/* 19918 8084BB28 0C20E5CF */ jal func_8083973C -/* 1991C 8084BB2C 27A7005C */ addiu $a3, $sp, 0x005C ## $a3 = FFFFFFE4 -/* 19920 8084BB30 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 19924 8084BB34 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 19928 8084BB38 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 1992C 8084BB3C 46040081 */ sub.s $f2, $f0, $f4 -/* 19930 8084BB40 262407C0 */ addiu $a0, $s1, 0x07C0 ## $a0 = 000007C0 -/* 19934 8084BB44 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFCC -/* 19938 8084BB48 27A6005C */ addiu $a2, $sp, 0x005C ## $a2 = FFFFFFE4 -/* 1993C 8084BB4C 46001005 */ abs.s $f0, $f2 -/* 19940 8084BB50 27A70038 */ addiu $a3, $sp, 0x0038 ## $a3 = FFFFFFC0 -/* 19944 8084BB54 4606003C */ c.lt.s $f0, $f6 -/* 19948 8084BB58 27B80054 */ addiu $t8, $sp, 0x0054 ## $t8 = FFFFFFDC -/* 1994C 8084BB5C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 19950 8084BB60 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 19954 8084BB64 45020017 */ bc1fl .L8084BBC4 -/* 19958 8084BB68 8E0A0680 */ lw $t2, 0x0680($s0) ## 00000680 -/* 1995C 8084BB6C C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 19960 8084BB70 C7B00060 */ lwc1 $f16, 0x0060($sp) -/* 19964 8084BB74 27A90050 */ addiu $t1, $sp, 0x0050 ## $t1 = FFFFFFD8 -/* 19968 8084BB78 E7A80044 */ swc1 $f8, 0x0044($sp) -/* 1996C 8084BB7C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 19970 8084BB80 AFA90024 */ sw $t1, 0x0024($sp) -/* 19974 8084BB84 AFA80020 */ sw $t0, 0x0020($sp) -/* 19978 8084BB88 AFA0001C */ sw $zero, 0x001C($sp) -/* 1997C 8084BB8C AFA00018 */ sw $zero, 0x0018($sp) -/* 19980 8084BB90 AFB90014 */ sw $t9, 0x0014($sp) -/* 19984 8084BB94 AFB80010 */ sw $t8, 0x0010($sp) -/* 19988 8084BB98 E7B00048 */ swc1 $f16, 0x0048($sp) -/* 1998C 8084BB9C 0C00F7A1 */ jal func_8003DE84 -/* 19990 8084BBA0 E7AA004C */ swc1 $f10, 0x004C($sp) -/* 19994 8084BBA4 14400006 */ bne $v0, $zero, .L8084BBC0 -/* 19998 8084BBA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1999C 8084BBAC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 199A0 8084BBB0 0C212E10 */ jal func_8084B840 -/* 199A4 8084BBB4 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 -/* 199A8 8084BBB8 10000006 */ beq $zero, $zero, .L8084BBD4 -/* 199AC 8084BBBC 8FBF0034 */ lw $ra, 0x0034($sp) -.L8084BBC0: -/* 199B0 8084BBC0 8E0A0680 */ lw $t2, 0x0680($s0) ## 00000680 -.L8084BBC4: -/* 199B4 8084BBC4 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 199B8 8084BBC8 01415824 */ and $t3, $t2, $at -/* 199BC 8084BBCC AE0B0680 */ sw $t3, 0x0680($s0) ## 00000680 -.L8084BBD0: -/* 199C0 8084BBD0 8FBF0034 */ lw $ra, 0x0034($sp) -.L8084BBD4: -/* 199C4 8084BBD4 8FB0002C */ lw $s0, 0x002C($sp) -/* 199C8 8084BBD8 8FB10030 */ lw $s1, 0x0030($sp) -/* 199CC 8084BBDC 03E00008 */ jr $ra -/* 199D0 8084BBE0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BBE4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BBE4.s deleted file mode 100644 index f5b9d40892..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BBE4.s +++ /dev/null @@ -1,160 +0,0 @@ -.late_rodata -glabel D_80855518 - .float -0.8 - -glabel D_8085551C - .float 0.8 - -.text -glabel func_8084BBE4 -/* 199D4 8084BBE4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 199D8 8084BBE8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 199DC 8084BBEC AFB00020 */ sw $s0, 0x0020($sp) -/* 199E0 8084BBF0 AFA50044 */ sw $a1, 0x0044($sp) -/* 199E4 8084BBF4 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 199E8 8084BBF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 199EC 8084BBFC 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 -/* 199F0 8084BC00 35CF0040 */ ori $t7, $t6, 0x0040 ## $t7 = 00000040 -/* 199F4 8084BC04 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 199F8 8084BC08 AFA6002C */ sw $a2, 0x002C($sp) -/* 199FC 8084BC0C 8FA40044 */ lw $a0, 0x0044($sp) -/* 19A00 8084BC10 0C028EF0 */ jal func_800A3BC0 -/* 19A04 8084BC14 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001B4 -/* 19A08 8084BC18 10400011 */ beq $v0, $zero, .L8084BC60 -/* 19A0C 8084BC1C 8FA6002C */ lw $a2, 0x002C($sp) -/* 19A10 8084BC20 8218084F */ lb $t8, 0x084F($s0) ## 0000084F -/* 19A14 8084BC24 8FA40044 */ lw $a0, 0x0044($sp) -/* 19A18 8084BC28 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19A1C 8084BC2C 1B000003 */ blez $t8, .L8084BC3C -/* 19A20 8084BC30 3C070400 */ lui $a3, 0x0400 ## $a3 = 04000000 -/* 19A24 8084BC34 10000006 */ beq $zero, $zero, .L8084BC50 -/* 19A28 8084BC38 24E72F28 */ addiu $a3, $a3, 0x2F28 ## $a3 = 04002F28 -.L8084BC3C: -/* 19A2C 8084BC3C 9219015B */ lbu $t9, 0x015B($s0) ## 0000015B -/* 19A30 8084BC40 3C078085 */ lui $a3, %hi(D_80853CD4) ## $a3 = 80850000 -/* 19A34 8084BC44 00194080 */ sll $t0, $t9, 2 -/* 19A38 8084BC48 00E83821 */ addu $a3, $a3, $t0 -/* 19A3C 8084BC4C 8CE73CD4 */ lw $a3, %lo(D_80853CD4)($a3) -.L8084BC50: -/* 19A40 8084BC50 0C20C8A1 */ jal func_80832284 -/* 19A44 8084BC54 00E03025 */ or $a2, $a3, $zero ## $a2 = 80850000 -/* 19A48 8084BC58 10000020 */ beq $zero, $zero, .L8084BCDC -/* 19A4C 8084BC5C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -.L8084BC60: -/* 19A50 8084BC60 8209084F */ lb $t1, 0x084F($s0) ## 0000084F -/* 19A54 8084BC64 5520001D */ bnel $t1, $zero, .L8084BCDC -/* 19A58 8084BC68 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 19A5C 8084BC6C 8E0B01BC */ lw $t3, 0x01BC($s0) ## 000001BC -/* 19A60 8084BC70 3C0A0400 */ lui $t2, 0x0400 ## $t2 = 04000000 -/* 19A64 8084BC74 254A2F10 */ addiu $t2, $t2, 0x2F10 ## $t2 = 04002F10 -/* 19A68 8084BC78 154B0005 */ bne $t2, $t3, .L8084BC90 -/* 19A6C 8084BC7C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 19A70 8084BC80 3C014130 */ lui $at, 0x4130 ## $at = 41300000 -/* 19A74 8084BC84 44810000 */ mtc1 $at, $f0 ## $f0 = 11.00 -/* 19A78 8084BC88 10000004 */ beq $zero, $zero, .L8084BC9C -/* 19A7C 8084BC8C 44050000 */ mfc1 $a1, $f0 -.L8084BC90: -/* 19A80 8084BC90 44810000 */ mtc1 $at, $f0 ## $f0 = 11.00 -/* 19A84 8084BC94 00000000 */ nop -/* 19A88 8084BC98 44050000 */ mfc1 $a1, $f0 -.L8084BC9C: -/* 19A8C 8084BC9C 0C02914C */ jal func_800A4530 -/* 19A90 8084BCA0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 19A94 8084BCA4 1040000C */ beq $v0, $zero, .L8084BCD8 -/* 19A98 8084BCA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19A9C 8084BCAC 0C20C9DC */ jal func_80832770 -/* 19AA0 8084BCB0 24050800 */ addiu $a1, $zero, 0x0800 ## $a1 = 00000800 -/* 19AA4 8084BCB4 8E0D01BC */ lw $t5, 0x01BC($s0) ## 000001BC -/* 19AA8 8084BCB8 3C0C0400 */ lui $t4, 0x0400 ## $t4 = 04000000 -/* 19AAC 8084BCBC 258C2F10 */ addiu $t4, $t4, 0x2F10 ## $t4 = 04002F10 -/* 19AB0 8084BCC0 158D0004 */ bne $t4, $t5, .L8084BCD4 -/* 19AB4 8084BCC4 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 19AB8 8084BCC8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 19ABC 8084BCCC 10000002 */ beq $zero, $zero, .L8084BCD8 -/* 19AC0 8084BCD0 A20E084F */ sb $t6, 0x084F($s0) ## 0000084F -.L8084BCD4: -/* 19AC4 8084BCD4 A20F084F */ sb $t7, 0x084F($s0) ## 0000084F -.L8084BCD8: -/* 19AC8 8084BCD8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -.L8084BCDC: -/* 19ACC 8084BCDC 8605083C */ lh $a1, 0x083C($s0) ## 0000083C -/* 19AD0 8084BCE0 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 19AD4 8084BCE4 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 19AD8 8084BCE8 8218084F */ lb $t8, 0x084F($s0) ## 0000084F -/* 19ADC 8084BCEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19AE0 8084BCF0 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFFC -/* 19AE4 8084BCF4 1300003C */ beq $t8, $zero, .L8084BDE8 -/* 19AE8 8084BCF8 27A6003A */ addiu $a2, $sp, 0x003A ## $a2 = FFFFFFFA -/* 19AEC 8084BCFC 8FB90044 */ lw $t9, 0x0044($sp) -/* 19AF0 8084BD00 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 19AF4 8084BD04 0C20DC9A */ jal func_80837268 -/* 19AF8 8084BD08 AFB90010 */ sw $t9, 0x0010($sp) -/* 19AFC 8084BD0C 92080846 */ lbu $t0, 0x0846($s0) ## 00000846 -/* 19B00 8084BD10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19B04 8084BD14 8FA60044 */ lw $a2, 0x0044($sp) -/* 19B08 8084BD18 02084821 */ addu $t1, $s0, $t0 -/* 19B0C 8084BD1C 812A0847 */ lb $t2, 0x0847($t1) ## 00000847 -/* 19B10 8084BD20 3C188086 */ lui $t8, %hi(D_80858AB4) ## $t8 = 80860000 -/* 19B14 8084BD24 05400013 */ bltz $t2, .L8084BD74 -/* 19B18 8084BD28 00000000 */ nop -/* 19B1C 8084BD2C 820B084F */ lb $t3, 0x084F($s0) ## 0000084F -/* 19B20 8084BD30 59600008 */ blezl $t3, .L8084BD54 -/* 19B24 8084BD34 920E015B */ lbu $t6, 0x015B($s0) ## 0000015B -/* 19B28 8084BD38 920C015B */ lbu $t4, 0x015B($s0) ## 0000015B -/* 19B2C 8084BD3C 3C078085 */ lui $a3, %hi(D_80853CA4) ## $a3 = 80850000 -/* 19B30 8084BD40 000C6880 */ sll $t5, $t4, 2 -/* 19B34 8084BD44 00ED3821 */ addu $a3, $a3, $t5 -/* 19B38 8084BD48 10000006 */ beq $zero, $zero, .L8084BD64 -/* 19B3C 8084BD4C 8CE73CA4 */ lw $a3, %lo(D_80853CA4)($a3) -/* 19B40 8084BD50 920E015B */ lbu $t6, 0x015B($s0) ## 0000015B -.L8084BD54: -/* 19B44 8084BD54 3C078085 */ lui $a3, %hi(D_80853CEC) ## $a3 = 80850000 -/* 19B48 8084BD58 000E7880 */ sll $t7, $t6, 2 -/* 19B4C 8084BD5C 00EF3821 */ addu $a3, $a3, $t7 -/* 19B50 8084BD60 8CE73CEC */ lw $a3, %lo(D_80853CEC)($a3) -.L8084BD64: -/* 19B54 8084BD64 0C20EA6E */ jal func_8083A9B8 -/* 19B58 8084BD68 00E02825 */ or $a1, $a3, $zero ## $a1 = 80850000 -/* 19B5C 8084BD6C 1000001F */ beq $zero, $zero, .L8084BDEC -/* 19B60 8084BD70 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084BD74: -/* 19B64 8084BD74 8F188AB4 */ lw $t8, %lo(D_80858AB4)($t8) -/* 19B68 8084BD78 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 19B6C 8084BD7C 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 19B70 8084BD80 97190000 */ lhu $t9, 0x0000($t8) ## 00000000 -/* 19B74 8084BD84 03214027 */ nor $t0, $t9, $at -/* 19B78 8084BD88 11000004 */ beq $t0, $zero, .L8084BD9C -/* 19B7C 8084BD8C 00000000 */ nop -/* 19B80 8084BD90 920900C9 */ lbu $t1, 0x00C9($s0) ## 000000C9 -/* 19B84 8084BD94 51200015 */ beql $t1, $zero, .L8084BDEC -/* 19B88 8084BD98 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084BD9C: -/* 19B8C 8084BD9C 0C20DED8 */ jal func_80837B60 -/* 19B90 8084BDA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19B94 8084BDA4 820A084F */ lb $t2, 0x084F($s0) ## 0000084F -/* 19B98 8084BDA8 3C018085 */ lui $at, %hi(D_8085551C) ## $at = 80850000 -/* 19B9C 8084BDAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19BA0 8084BDB0 05410005 */ bgez $t2, .L8084BDC8 -/* 19BA4 8084BDB4 00000000 */ nop -/* 19BA8 8084BDB8 3C018085 */ lui $at, %hi(D_80855518) ## $at = 80850000 -/* 19BAC 8084BDBC C4245518 */ lwc1 $f4, %lo(D_80855518)($at) -/* 19BB0 8084BDC0 10000003 */ beq $zero, $zero, .L8084BDD0 -/* 19BB4 8084BDC4 E6040838 */ swc1 $f4, 0x0838($s0) ## 00000838 -.L8084BDC8: -/* 19BB8 8084BDC8 C426551C */ lwc1 $f6, %lo(D_8085551C)($at) -/* 19BBC 8084BDCC E6060838 */ swc1 $f6, 0x0838($s0) ## 00000838 -.L8084BDD0: -/* 19BC0 8084BDD0 0C20DEE7 */ jal func_80837B9C -/* 19BC4 8084BDD4 8FA50044 */ lw $a1, 0x0044($sp) -/* 19BC8 8084BDD8 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 19BCC 8084BDDC 24019FFF */ addiu $at, $zero, 0x9FFF ## $at = FFFF9FFF -/* 19BD0 8084BDE0 01616024 */ and $t4, $t3, $at -/* 19BD4 8084BDE4 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -.L8084BDE8: -/* 19BD8 8084BDE8 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084BDEC: -/* 19BDC 8084BDEC 8FB00020 */ lw $s0, 0x0020($sp) -/* 19BE0 8084BDF0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 19BE4 8084BDF4 03E00008 */ jr $ra -/* 19BE8 8084BDF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BDFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BDFC.s deleted file mode 100644 index 05e67ae82e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BDFC.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_8084BDFC -/* 19BEC 8084BDFC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 19BF0 8084BE00 AFBF001C */ sw $ra, 0x001C($sp) -/* 19BF4 8084BE04 AFB00018 */ sw $s0, 0x0018($sp) -/* 19BF8 8084BE08 AFA5002C */ sw $a1, 0x002C($sp) -/* 19BFC 8084BE0C 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 19C00 8084BE10 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 19C04 8084BE14 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 19C08 8084BE18 35CF0040 */ ori $t7, $t6, 0x0040 ## $t7 = 00000040 -/* 19C0C 8084BE1C AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 19C10 8084BE20 AFA50024 */ sw $a1, 0x0024($sp) -/* 19C14 8084BE24 0C028EF0 */ jal func_800A3BC0 -/* 19C18 8084BE28 8FA4002C */ lw $a0, 0x002C($sp) -/* 19C1C 8084BE2C 10400009 */ beq $v0, $zero, .L8084BE54 -/* 19C20 8084BE30 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 19C24 8084BE34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19C28 8084BE38 0C20CB92 */ jal func_80832E48 -/* 19C2C 8084BE3C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 19C30 8084BE40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19C34 8084BE44 0C20F03A */ jal func_8083C0E8 -/* 19C38 8084BE48 8FA5002C */ lw $a1, 0x002C($sp) -/* 19C3C 8084BE4C 10000021 */ beq $zero, $zero, .L8084BED4 -/* 19C40 8084BE50 8FBF001C */ lw $ra, 0x001C($sp) -.L8084BE54: -/* 19C44 8084BE54 C60401C4 */ lwc1 $f4, 0x01C4($s0) ## 000001C4 -/* 19C48 8084BE58 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 -/* 19C4C 8084BE5C 8FA40024 */ lw $a0, 0x0024($sp) -/* 19C50 8084BE60 46062201 */ sub.s $f8, $f4, $f6 -/* 19C54 8084BE64 44054000 */ mfc1 $a1, $f8 -/* 19C58 8084BE68 0C02914C */ jal func_800A4530 -/* 19C5C 8084BE6C 00000000 */ nop -/* 19C60 8084BE70 10400005 */ beq $v0, $zero, .L8084BE88 -/* 19C64 8084BE74 3C014208 */ lui $at, 0x4208 ## $at = 42080000 -/* 19C68 8084BE78 0C20CA28 */ jal func_808328A0 -/* 19C6C 8084BE7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19C70 8084BE80 10000014 */ beq $zero, $zero, .L8084BED4 -/* 19C74 8084BE84 8FBF001C */ lw $ra, 0x001C($sp) -.L8084BE88: -/* 19C78 8084BE88 C60A01C4 */ lwc1 $f10, 0x01C4($s0) ## 000001C4 -/* 19C7C 8084BE8C 44818000 */ mtc1 $at, $f16 ## $f16 = 0.00 -/* 19C80 8084BE90 8FA40024 */ lw $a0, 0x0024($sp) -/* 19C84 8084BE94 46105481 */ sub.s $f18, $f10, $f16 -/* 19C88 8084BE98 44059000 */ mfc1 $a1, $f18 -/* 19C8C 8084BE9C 0C02914C */ jal func_800A4530 -/* 19C90 8084BEA0 00000000 */ nop -/* 19C94 8084BEA4 1040000A */ beq $v0, $zero, .L8084BED0 -/* 19C98 8084BEA8 24019FFF */ addiu $at, $zero, 0x9FFF ## $at = FFFF9FFF -/* 19C9C 8084BEAC 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 19CA0 8084BEB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19CA4 8084BEB4 24050831 */ addiu $a1, $zero, 0x0831 ## $a1 = 00000831 -/* 19CA8 8084BEB8 0301C824 */ and $t9, $t8, $at -/* 19CAC 8084BEBC 0C00BDF7 */ jal func_8002F7DC -/* 19CB0 8084BEC0 AE19067C */ sw $t9, 0x067C($s0) ## 0000067C -/* 19CB4 8084BEC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19CB8 8084BEC8 0C20C9A6 */ jal func_80832698 -/* 19CBC 8084BECC 24056804 */ addiu $a1, $zero, 0x6804 ## $a1 = 00006804 -.L8084BED0: -/* 19CC0 8084BED0 8FBF001C */ lw $ra, 0x001C($sp) -.L8084BED4: -/* 19CC4 8084BED4 8FB00018 */ lw $s0, 0x0018($sp) -/* 19CC8 8084BED8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 19CCC 8084BEDC 03E00008 */ jr $ra -/* 19CD0 8084BEE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BEE4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BEE4.s deleted file mode 100644 index b46c9656ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BEE4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8084BEE4 -/* 19CD4 8084BEE4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 19CD8 8084BEE8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 19CDC 8084BEEC 808E084F */ lb $t6, 0x084F($a0) ## 0000084F -/* 19CE0 8084BEF0 2402080A */ addiu $v0, $zero, 0x080A ## $v0 = 0000080A -/* 19CE4 8084BEF4 11C00003 */ beq $t6, $zero, .L8084BF04 -/* 19CE8 8084BEF8 00000000 */ nop -/* 19CEC 8084BEFC 10000001 */ beq $zero, $zero, .L8084BF04 -/* 19CF0 8084BF00 2402080C */ addiu $v0, $zero, 0x080C ## $v0 = 0000080C -.L8084BF04: -/* 19CF4 8084BF04 0C00BDF7 */ jal func_8002F7DC -/* 19CF8 8084BF08 3045FFFF */ andi $a1, $v0, 0xFFFF ## $a1 = 0000080C -/* 19CFC 8084BF0C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 19D00 8084BF10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 19D04 8084BF14 03E00008 */ jr $ra -/* 19D08 8084BF18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s deleted file mode 100644 index 1386fe2de5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s +++ /dev/null @@ -1,491 +0,0 @@ -.late_rodata -glabel D_80855520 - .word 0x3D051EB8 -glabel D_80855524 - .float 0.05 - -glabel D_80855528 - .word 0x40566666 - -.text -glabel func_8084BF1C -/* 19D0C 8084BF1C 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 19D10 8084BF20 AFBF002C */ sw $ra, 0x002C($sp) -/* 19D14 8084BF24 AFB00028 */ sw $s0, 0x0028($sp) -/* 19D18 8084BF28 AFA5008C */ sw $a1, 0x008C($sp) -/* 19D1C 8084BF2C C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 -/* 19D20 8084BF30 3C028086 */ lui $v0, %hi(D_80858AB4) ## $v0 = 80860000 -/* 19D24 8084BF34 8C428AB4 */ lw $v0, %lo(D_80858AB4)($v0) -/* 19D28 8084BF38 4600218D */ trunc.w.s $f6, $f4 -/* 19D2C 8084BF3C 8C980680 */ lw $t8, 0x0680($a0) ## 00000680 -/* 19D30 8084BF40 808A084F */ lb $t2, 0x084F($a0) ## 0000084F -/* 19D34 8084BF44 80480015 */ lb $t0, 0x0015($v0) ## 80860015 -/* 19D38 8084BF48 440F3000 */ mfc1 $t7, $f6 -/* 19D3C 8084BF4C 80490014 */ lb $t1, 0x0014($v0) ## 80860014 -/* 19D40 8084BF50 37190040 */ ori $t9, $t8, 0x0040 ## $t9 = 00000040 -/* 19D44 8084BF54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 19D48 8084BF58 AC990680 */ sw $t9, 0x0680($a0) ## 00000680 -/* 19D4C 8084BF5C 11400018 */ beq $t2, $zero, .L8084BFC0 -/* 19D50 8084BF60 A48F0894 */ sh $t7, 0x0894($a0) ## 00000894 -/* 19D54 8084BF64 05000003 */ bltz $t0, .L8084BF74 -/* 19D58 8084BF68 00081823 */ subu $v1, $zero, $t0 -/* 19D5C 8084BF6C 10000001 */ beq $zero, $zero, .L8084BF74 -/* 19D60 8084BF70 01001825 */ or $v1, $t0, $zero ## $v1 = 00000000 -.L8084BF74: -/* 19D64 8084BF74 05200003 */ bltz $t1, .L8084BF84 -/* 19D68 8084BF78 00091023 */ subu $v0, $zero, $t1 -/* 19D6C 8084BF7C 10000001 */ beq $zero, $zero, .L8084BF84 -/* 19D70 8084BF80 01201025 */ or $v0, $t1, $zero ## $v0 = 00000000 -.L8084BF84: -/* 19D74 8084BF84 0062082A */ slt $at, $v1, $v0 -/* 19D78 8084BF88 1020000D */ beq $at, $zero, .L8084BFC0 -/* 19D7C 8084BF8C 00000000 */ nop -/* 19D80 8084BF90 05200003 */ bltz $t1, .L8084BFA0 -/* 19D84 8084BF94 00091023 */ subu $v0, $zero, $t1 -/* 19D88 8084BF98 10000001 */ beq $zero, $zero, .L8084BFA0 -/* 19D8C 8084BF9C 01201025 */ or $v0, $t1, $zero ## $v0 = 00000000 -.L8084BFA0: -/* 19D90 8084BFA0 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 19D94 8084BFA4 3C018085 */ lui $at, %hi(D_80855520) ## $at = 80850000 -/* 19D98 8084BFA8 C4305520 */ lwc1 $f16, %lo(D_80855520)($at) -/* 19D9C 8084BFAC 468042A0 */ cvt.s.w $f10, $f8 -/* 19DA0 8084BFB0 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 -/* 19DA4 8084BFB4 46105002 */ mul.s $f0, $f10, $f16 -/* 19DA8 8084BFB8 1000000D */ beq $zero, $zero, .L8084BFF0 -/* 19DAC 8084BFBC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -.L8084BFC0: -/* 19DB0 8084BFC0 05000003 */ bltz $t0, .L8084BFD0 -/* 19DB4 8084BFC4 00081023 */ subu $v0, $zero, $t0 -/* 19DB8 8084BFC8 10000001 */ beq $zero, $zero, .L8084BFD0 -/* 19DBC 8084BFCC 01001025 */ or $v0, $t0, $zero ## $v0 = 00000000 -.L8084BFD0: -/* 19DC0 8084BFD0 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 19DC4 8084BFD4 3C018085 */ lui $at, %hi(D_80855524) ## $at = 80850000 -/* 19DC8 8084BFD8 C4265524 */ lwc1 $f6, %lo(D_80855524)($at) -/* 19DCC 8084BFDC 46809120 */ cvt.s.w $f4, $f18 -/* 19DD0 8084BFE0 00004825 */ or $t1, $zero, $zero ## $t1 = 00000000 -/* 19DD4 8084BFE4 46062002 */ mul.s $f0, $f4, $f6 -/* 19DD8 8084BFE8 00000000 */ nop -/* 19DDC 8084BFEC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -.L8084BFF0: -/* 19DE0 8084BFF0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 19DE4 8084BFF4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 19DE8 8084BFF8 3C018085 */ lui $at, %hi(D_80855528) ## $at = 80850000 -/* 19DEC 8084BFFC 460C003C */ c.lt.s $f0, $f12 -/* 19DF0 8084C000 00000000 */ nop -/* 19DF4 8084C004 45000003 */ bc1f .L8084C014 -/* 19DF8 8084C008 00000000 */ nop -/* 19DFC 8084C00C 10000007 */ beq $zero, $zero, .L8084C02C -/* 19E00 8084C010 46006006 */ mov.s $f0, $f12 -.L8084C014: -/* 19E04 8084C014 C4225528 */ lwc1 $f2, %lo(D_80855528)($at) -/* 19E08 8084C018 4600103C */ c.lt.s $f2, $f0 -/* 19E0C 8084C01C 00000000 */ nop -/* 19E10 8084C020 45020003 */ bc1fl .L8084C030 -/* 19E14 8084C024 C60801D0 */ lwc1 $f8, 0x01D0($s0) ## 000001D0 -/* 19E18 8084C028 46001006 */ mov.s $f0, $f2 -.L8084C02C: -/* 19E1C 8084C02C C60801D0 */ lwc1 $f8, 0x01D0($s0) ## 000001D0 -.L8084C030: -/* 19E20 8084C030 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 19E24 8084C034 4608503E */ c.le.s $f10, $f8 -/* 19E28 8084C038 00000000 */ nop -/* 19E2C 8084C03C 45020004 */ bc1fl .L8084C050 -/* 19E30 8084C040 44811000 */ mtc1 $at, $f2 ## $f2 = -1.00 -/* 19E34 8084C044 10000003 */ beq $zero, $zero, .L8084C054 -/* 19E38 8084C048 46006086 */ mov.s $f2, $f12 -/* 19E3C 8084C04C 44811000 */ mtc1 $at, $f2 ## $f2 = -1.00 -.L8084C050: -/* 19E40 8084C050 00000000 */ nop -.L8084C054: -/* 19E44 8084C054 46001402 */ mul.s $f16, $f2, $f0 -/* 19E48 8084C058 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 19E4C 8084C05C 04600036 */ bltz $v1, .L8084C138 -/* 19E50 8084C060 E61001D0 */ swc1 $f16, 0x01D0($s0) ## 000001D0 -/* 19E54 8084C064 8E0B0074 */ lw $t3, 0x0074($s0) ## 00000074 -/* 19E58 8084C068 51600019 */ beql $t3, $zero, .L8084C0D0 -/* 19E5C 8084C06C 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 -/* 19E60 8084C070 9205007C */ lbu $a1, 0x007C($s0) ## 0000007C -/* 19E64 8084C074 8FA4008C */ lw $a0, 0x008C($sp) -/* 19E68 8084C078 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 19E6C 8084C07C 10A10013 */ beq $a1, $at, .L8084C0CC -/* 19E70 8084C080 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 19E74 8084C084 AFA80084 */ sw $t0, 0x0084($sp) -/* 19E78 8084C088 0C00FAE1 */ jal DynaPolyInfo_GetActor - ## DynaPolyInfo_getActor -/* 19E7C 8084C08C AFA90080 */ sw $t1, 0x0080($sp) -/* 19E80 8084C090 8FA80084 */ lw $t0, 0x0084($sp) -/* 19E84 8084C094 1040000D */ beq $v0, $zero, .L8084C0CC -/* 19E88 8084C098 8FA90080 */ lw $t1, 0x0080($sp) -/* 19E8C 8084C09C 24440024 */ addiu $a0, $v0, 0x0024 ## $a0 = 00000024 -/* 19E90 8084C0A0 24450100 */ addiu $a1, $v0, 0x0100 ## $a1 = 00000100 -/* 19E94 8084C0A4 27A6006C */ addiu $a2, $sp, 0x006C ## $a2 = FFFFFFE4 -/* 19E98 8084C0A8 AFA80084 */ sw $t0, 0x0084($sp) -/* 19E9C 8084C0AC 0C01DFB4 */ jal Math_Vec3f_Diff - ## Vec3f_Sub -/* 19EA0 8084C0B0 AFA90080 */ sw $t1, 0x0080($sp) -/* 19EA4 8084C0B4 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 19EA8 8084C0B8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000024 -/* 19EAC 8084C0BC 0C01DFA7 */ jal Math_Vec3f_Sum - ## Vec3f_Add -/* 19EB0 8084C0C0 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFE4 -/* 19EB4 8084C0C4 8FA80084 */ lw $t0, 0x0084($sp) -/* 19EB8 8084C0C8 8FA90080 */ lw $t1, 0x0080($sp) -.L8084C0CC: -/* 19EBC 8084C0CC 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 -.L8084C0D0: -/* 19EC0 8084C0D0 240D0007 */ addiu $t5, $zero, 0x0007 ## $t5 = 00000007 -/* 19EC4 8084C0D4 8FA4008C */ lw $a0, 0x008C($sp) -/* 19EC8 8084C0D8 C5920000 */ lwc1 $f18, 0x0000($t4) ## 00000000 -/* 19ECC 8084C0DC AFA90080 */ sw $t1, 0x0080($sp) -/* 19ED0 8084C0E0 AFA80084 */ sw $t0, 0x0084($sp) -/* 19ED4 8084C0E4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 19ED8 8084C0E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19EDC 8084C0EC 3C0641D0 */ lui $a2, 0x41D0 ## $a2 = 41D00000 -/* 19EE0 8084C0F0 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 19EE4 8084C0F4 0C00B92D */ jal func_8002E4B4 -/* 19EE8 8084C0F8 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 19EEC 8084C0FC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 19EF0 8084C100 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 19EF4 8084C104 8E0E0678 */ lw $t6, 0x0678($s0) ## 00000678 -/* 19EF8 8084C108 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 -/* 19EFC 8084C10C 44813000 */ mtc1 $at, $f6 ## $f6 = -20.00 -/* 19F00 8084C110 8DC7003C */ lw $a3, 0x003C($t6) ## 0000003C -/* 19F04 8084C114 8FA4008C */ lw $a0, 0x008C($sp) -/* 19F08 8084C118 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19F0C 8084C11C 3C0641D0 */ lui $a2, 0x41D0 ## $a2 = 41D00000 -/* 19F10 8084C120 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 19F14 8084C124 0C20FCD8 */ jal func_8083F360 -/* 19F18 8084C128 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 19F1C 8084C12C 8FA80084 */ lw $t0, 0x0084($sp) -/* 19F20 8084C130 8FA90080 */ lw $t1, 0x0080($sp) -/* 19F24 8084C134 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -.L8084C138: -/* 19F28 8084C138 04600008 */ bltz $v1, .L8084C15C -/* 19F2C 8084C13C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19F30 8084C140 8FA5008C */ lw $a1, 0x008C($sp) -/* 19F34 8084C144 AFA80084 */ sw $t0, 0x0084($sp) -/* 19F38 8084C148 0C20FEF0 */ jal func_8083FBC0 -/* 19F3C 8084C14C AFA90080 */ sw $t1, 0x0080($sp) -/* 19F40 8084C150 8FA80084 */ lw $t0, 0x0084($sp) -/* 19F44 8084C154 144000E7 */ bne $v0, $zero, .L8084C4F4 -/* 19F48 8084C158 8FA90080 */ lw $t1, 0x0080($sp) -.L8084C15C: -/* 19F4C 8084C15C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 19F50 8084C160 AFA50030 */ sw $a1, 0x0030($sp) -/* 19F54 8084C164 8FA4008C */ lw $a0, 0x008C($sp) -/* 19F58 8084C168 AFA80084 */ sw $t0, 0x0084($sp) -/* 19F5C 8084C16C 0C028EF0 */ jal func_800A3BC0 -/* 19F60 8084C170 AFA90080 */ sw $t1, 0x0080($sp) -/* 19F64 8084C174 8FA80084 */ lw $t0, 0x0084($sp) -/* 19F68 8084C178 104000DE */ beq $v0, $zero, .L8084C4F4 -/* 19F6C 8084C17C 8FA90080 */ lw $t1, 0x0080($sp) -/* 19F70 8084C180 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 19F74 8084C184 04610008 */ bgez $v1, .L8084C1A8 -/* 19F78 8084C188 00000000 */ nop -/* 19F7C 8084C18C 04600003 */ bltz $v1, .L8084C19C -/* 19F80 8084C190 00031023 */ subu $v0, $zero, $v1 -/* 19F84 8084C194 10000001 */ beq $zero, $zero, .L8084C19C -/* 19F88 8084C198 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L8084C19C: -/* 19F8C 8084C19C 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 -/* 19F90 8084C1A0 10000110 */ beq $zero, $zero, .L8084C5E4 -/* 19F94 8084C1A4 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 -.L8084C1A8: -/* 19F98 8084C1A8 51000099 */ beql $t0, $zero, .L8084C410 -/* 19F9C 8084C1AC 8219084F */ lb $t9, 0x084F($s0) ## 0000084F -/* 19FA0 8084C1B0 8204084F */ lb $a0, 0x084F($s0) ## 0000084F -/* 19FA4 8084C1B4 3C018085 */ lui $at, %hi(D_80854890) ## $at = 80850000 -/* 19FA8 8084C1B8 1900004F */ blez $t0, .L8084C2F8 -/* 19FAC 8084C1BC 00831021 */ addu $v0, $a0, $v1 -/* 19FB0 8084C1C0 8E180678 */ lw $t8, 0x0678($s0) ## 00000678 -/* 19FB4 8084C1C4 3C068085 */ lui $a2, %hi(D_8085488C) ## $a2 = 80850000 -/* 19FB8 8084C1C8 24C6488C */ addiu $a2, $a2, %lo(D_8085488C) ## $a2 = 8085488C -/* 19FBC 8084C1CC C7080040 */ lwc1 $f8, 0x0040($t8) ## 00000040 -/* 19FC0 8084C1D0 AFA20068 */ sw $v0, 0x0068($sp) -/* 19FC4 8084C1D4 8FA4008C */ lw $a0, 0x008C($sp) -/* 19FC8 8084C1D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 19FCC 8084C1DC 27A7005C */ addiu $a3, $sp, 0x005C ## $a3 = FFFFFFD4 -/* 19FD0 8084C1E0 0C20E5CF */ jal func_8083973C -/* 19FD4 8084C1E4 E4284890 */ swc1 $f8, %lo(D_80854890)($at) -/* 19FD8 8084C1E8 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 19FDC 8084C1EC 8FA20068 */ lw $v0, 0x0068($sp) -/* 19FE0 8084C1F0 46000086 */ mov.s $f2, $f0 -/* 19FE4 8084C1F4 4600503C */ c.lt.s $f10, $f0 -/* 19FE8 8084C1F8 0002C080 */ sll $t8, $v0, 2 -/* 19FEC 8084C1FC 4502002C */ bc1fl .L8084C2B0 -/* 19FF0 8084C200 8E0F0678 */ lw $t7, 0x0678($s0) ## 00000678 -/* 19FF4 8084C204 8219084F */ lb $t9, 0x084F($s0) ## 0000084F -/* 19FF8 8084C208 3C01FFDF */ lui $at, 0xFFDF ## $at = FFDF0000 -/* 19FFC 8084C20C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFDFFFFF -/* 1A000 8084C210 1320001D */ beq $t9, $zero, .L8084C288 -/* 1A004 8084C214 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1A008 8084C218 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C -/* 1A00C 8084C21C 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 -/* 1A010 8084C220 E6020028 */ swc1 $f2, 0x0028($s0) ## 00000028 -/* 1A014 8084C224 01415824 */ and $t3, $t2, $at -/* 1A018 8084C228 AE0B067C */ sw $t3, 0x067C($s0) ## 0000067C -/* 1A01C 8084C22C 3C0D0400 */ lui $t5, 0x0400 ## $t5 = 04000000 -/* 1A020 8084C230 25AD3000 */ addiu $t5, $t5, 0x3000 ## $t5 = 04003000 -/* 1A024 8084C234 8E060074 */ lw $a2, 0x0074($s0) ## 00000074 -/* 1A028 8084C238 8D87003C */ lw $a3, 0x003C($t4) ## 0000003C -/* 1A02C 8084C23C AFAD0010 */ sw $t5, 0x0010($sp) -/* 1A030 8084C240 8FA4008C */ lw $a0, 0x008C($sp) -/* 1A034 8084C244 0C20E971 */ jal func_8083A5C4 -/* 1A038 8084C248 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1A03C 8084C24C 860E083C */ lh $t6, 0x083C($s0) ## 0000083C -/* 1A040 8084C250 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 1A044 8084C254 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 1A048 8084C258 01C17821 */ addu $t7, $t6, $at -/* 1A04C 8084C25C A60F083C */ sh $t7, 0x083C($s0) ## 0000083C -/* 1A050 8084C260 8618083C */ lh $t8, 0x083C($s0) ## 0000083C -/* 1A054 8084C264 24A53000 */ addiu $a1, $a1, 0x3000 ## $a1 = 04003000 -/* 1A058 8084C268 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1A05C 8084C26C A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -/* 1A060 8084C270 0C20EA6E */ jal func_8083A9B8 -/* 1A064 8084C274 8FA6008C */ lw $a2, 0x008C($sp) -/* 1A068 8084C278 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 1A06C 8084C27C 372A4000 */ ori $t2, $t9, 0x4000 ## $t2 = 00004000 -/* 1A070 8084C280 1000005E */ beq $zero, $zero, .L8084C3FC -/* 1A074 8084C284 AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C -.L8084C288: -/* 1A078 8084C288 860C0850 */ lh $t4, 0x0850($s0) ## 00000850 -/* 1A07C 8084C28C 8E0B0678 */ lw $t3, 0x0678($s0) ## 00000678 -/* 1A080 8084C290 8FA6008C */ lw $a2, 0x008C($sp) -/* 1A084 8084C294 000C6880 */ sll $t5, $t4, 2 -/* 1A088 8084C298 016D7021 */ addu $t6, $t3, $t5 -/* 1A08C 8084C29C 0C20FC1C */ jal func_8083F070 -/* 1A090 8084C2A0 8DC500CC */ lw $a1, 0x00CC($t6) ## 000000CC -/* 1A094 8084C2A4 10000056 */ beq $zero, $zero, .L8084C400 -/* 1A098 8084C2A8 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 -/* 1A09C 8084C2AC 8E0F0678 */ lw $t7, 0x0678($s0) ## 00000678 -.L8084C2B0: -/* 1A0A0 8084C2B0 0302C023 */ subu $t8, $t8, $v0 -/* 1A0A4 8084C2B4 0018C040 */ sll $t8, $t8, 1 -/* 1A0A8 8084C2B8 01F8C821 */ addu $t9, $t7, $t8 -/* 1A0AC 8084C2BC 8B2C004A */ lwl $t4, 0x004A($t9) ## 0000004A -/* 1A0B0 8084C2C0 9B2C004D */ lwr $t4, 0x004D($t9) ## 0000004D -/* 1A0B4 8084C2C4 8E0B0678 */ lw $t3, 0x0678($s0) ## 00000678 -/* 1A0B8 8084C2C8 00026880 */ sll $t5, $v0, 2 -/* 1A0BC 8084C2CC AA0C01EC */ swl $t4, 0x01EC($s0) ## 000001EC -/* 1A0C0 8084C2D0 BA0C01EF */ swr $t4, 0x01EF($s0) ## 000001EF -/* 1A0C4 8084C2D4 972C004E */ lhu $t4, 0x004E($t9) ## 0000004E -/* 1A0C8 8084C2D8 016D7021 */ addu $t6, $t3, $t5 -/* 1A0CC 8084C2DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1A0D0 8084C2E0 A60C01F0 */ sh $t4, 0x01F0($s0) ## 000001F0 -/* 1A0D4 8084C2E4 8DC600AC */ lw $a2, 0x00AC($t6) ## 000000AC -/* 1A0D8 8084C2E8 0C20C899 */ jal func_80832264 -/* 1A0DC 8084C2EC 8FA4008C */ lw $a0, 0x008C($sp) -/* 1A0E0 8084C2F0 10000043 */ beq $zero, $zero, .L8084C400 -/* 1A0E4 8084C2F4 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 -.L8084C2F8: -/* 1A0E8 8084C2F8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 1A0EC 8084C2FC C6120080 */ lwc1 $f18, 0x0080($s0) ## 00000080 -/* 1A0F0 8084C300 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 1A0F4 8084C304 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 1A0F8 8084C308 46128101 */ sub.s $f4, $f16, $f18 -/* 1A0FC 8084C30C 38420001 */ xori $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 1A100 8084C310 00027880 */ sll $t7, $v0, 2 -/* 1A104 8084C314 4606203C */ c.lt.s $f4, $f6 -/* 1A108 8084C318 00000000 */ nop -/* 1A10C 8084C31C 4502001B */ bc1fl .L8084C38C -/* 1A110 8084C320 8E0E0678 */ lw $t6, 0x0678($s0) ## 00000678 -/* 1A114 8084C324 10800005 */ beq $a0, $zero, .L8084C33C -/* 1A118 8084C328 8FA5008C */ lw $a1, 0x008C($sp) -/* 1A11C 8084C32C 0C20FEDF */ jal func_8083FB7C -/* 1A120 8084C330 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1A124 8084C334 10000032 */ beq $zero, $zero, .L8084C400 -/* 1A128 8084C338 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 -.L8084C33C: -/* 1A12C 8084C33C 10600009 */ beq $v1, $zero, .L8084C364 -/* 1A130 8084C340 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1A134 8084C344 8E0F0678 */ lw $t7, 0x0678($s0) ## 00000678 -/* 1A138 8084C348 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 1A13C 8084C34C 89F90044 */ lwl $t9, 0x0044($t7) ## 00000044 -/* 1A140 8084C350 99F90047 */ lwr $t9, 0x0047($t7) ## 00000047 -/* 1A144 8084C354 AA1901EC */ swl $t9, 0x01EC($s0) ## 000001EC -/* 1A148 8084C358 BA1901EF */ swr $t9, 0x01EF($s0) ## 000001EF -/* 1A14C 8084C35C 95F90048 */ lhu $t9, 0x0048($t7) ## 00000048 -/* 1A150 8084C360 A61901F0 */ sh $t9, 0x01F0($s0) ## 000001F0 -.L8084C364: -/* 1A154 8084C364 8E0A0678 */ lw $t2, 0x0678($s0) ## 00000678 -/* 1A158 8084C368 00036080 */ sll $t4, $v1, 2 -/* 1A15C 8084C36C 8FA6008C */ lw $a2, 0x008C($sp) -/* 1A160 8084C370 014C5821 */ addu $t3, $t2, $t4 -/* 1A164 8084C374 0C20FC1C */ jal func_8083F070 -/* 1A168 8084C378 8D6500C4 */ lw $a1, 0x00C4($t3) ## 000000C4 -/* 1A16C 8084C37C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 1A170 8084C380 1000001E */ beq $zero, $zero, .L8084C3FC -/* 1A174 8084C384 A60D0850 */ sh $t5, 0x0850($s0) ## 00000850 -/* 1A178 8084C388 8E0E0678 */ lw $t6, 0x0678($s0) ## 00000678 -.L8084C38C: -/* 1A17C 8084C38C 01E27823 */ subu $t7, $t7, $v0 -/* 1A180 8084C390 000F7840 */ sll $t7, $t7, 1 -/* 1A184 8084C394 01CFC021 */ addu $t8, $t6, $t7 -/* 1A188 8084C398 8B0A0062 */ lwl $t2, 0x0062($t8) ## 00000062 -/* 1A18C 8084C39C 9B0A0065 */ lwr $t2, 0x0065($t8) ## 00000065 -/* 1A190 8084C3A0 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 -/* 1A194 8084C3A4 00025880 */ sll $t3, $v0, 2 -/* 1A198 8084C3A8 AA0A01EC */ swl $t2, 0x01EC($s0) ## 000001EC -/* 1A19C 8084C3AC BA0A01EF */ swr $t2, 0x01EF($s0) ## 000001EF -/* 1A1A0 8084C3B0 970A0066 */ lhu $t2, 0x0066($t8) ## 00000066 -/* 1A1A4 8084C3B4 018B6821 */ addu $t5, $t4, $t3 -/* 1A1A8 8084C3B8 A60A01F0 */ sh $t2, 0x01F0($s0) ## 000001F0 -/* 1A1AC 8084C3BC 8DA400AC */ lw $a0, 0x00AC($t5) ## 000000AD -/* 1A1B0 8084C3C0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 1A1B4 8084C3C4 AFA40054 */ sw $a0, 0x0054($sp) -/* 1A1B8 8084C3C8 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 1A1BC 8084C3CC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 1A1C0 8084C3D0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 1A1C4 8084C3D4 468042A0 */ cvt.s.w $f10, $f8 -/* 1A1C8 8084C3D8 AFAE0018 */ sw $t6, 0x0018($sp) -/* 1A1CC 8084C3DC 8FA60054 */ lw $a2, 0x0054($sp) -/* 1A1D0 8084C3E0 8FA4008C */ lw $a0, 0x008C($sp) -/* 1A1D4 8084C3E4 8FA50030 */ lw $a1, 0x0030($sp) -/* 1A1D8 8084C3E8 3C07BF80 */ lui $a3, 0xBF80 ## $a3 = BF800000 -/* 1A1DC 8084C3EC E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 1A1E0 8084C3F0 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 1A1E4 8084C3F4 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 1A1E8 8084C3F8 E7A0001C */ swc1 $f0, 0x001C($sp) -.L8084C3FC: -/* 1A1EC 8084C3FC 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 -.L8084C400: -/* 1A1F0 8084C400 39F80001 */ xori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 1A1F4 8084C404 10000077 */ beq $zero, $zero, .L8084C5E4 -/* 1A1F8 8084C408 A6180850 */ sh $t8, 0x0850($s0) ## 00000850 -/* 1A1FC 8084C40C 8219084F */ lb $t9, 0x084F($s0) ## 0000084F -.L8084C410: -/* 1A200 8084C410 53200035 */ beql $t9, $zero, .L8084C4E8 -/* 1A204 8084C414 8E0D0680 */ lw $t5, 0x0680($s0) ## 00000680 -/* 1A208 8084C418 51200033 */ beql $t1, $zero, .L8084C4E8 -/* 1A20C 8084C41C 8E0D0680 */ lw $t5, 0x0680($s0) ## 00000680 -/* 1A210 8084C420 8E020678 */ lw $v0, 0x0678($s0) ## 00000678 -/* 1A214 8084C424 00035080 */ sll $t2, $v1, 2 -/* 1A218 8084C428 0003C080 */ sll $t8, $v1, 2 -/* 1A21C 8084C42C 004A6021 */ addu $t4, $v0, $t2 -/* 1A220 8084C430 19200010 */ blez $t1, .L8084C474 -/* 1A224 8084C434 8D8600BC */ lw $a2, 0x00BC($t4) ## 000000BC -/* 1A228 8084C438 00035880 */ sll $t3, $v1, 2 -/* 1A22C 8084C43C 01635823 */ subu $t3, $t3, $v1 -/* 1A230 8084C440 000B5840 */ sll $t3, $t3, 1 -/* 1A234 8084C444 004B6821 */ addu $t5, $v0, $t3 -/* 1A238 8084C448 89AF007A */ lwl $t7, 0x007A($t5) ## 0000007A -/* 1A23C 8084C44C 99AF007D */ lwr $t7, 0x007D($t5) ## 0000007D -/* 1A240 8084C450 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1A244 8084C454 AA0F01EC */ swl $t7, 0x01EC($s0) ## 000001EC -/* 1A248 8084C458 BA0F01EF */ swr $t7, 0x01EF($s0) ## 000001EF -/* 1A24C 8084C45C 95AF007E */ lhu $t7, 0x007E($t5) ## 0000007E -/* 1A250 8084C460 A60F01F0 */ sh $t7, 0x01F0($s0) ## 000001F0 -/* 1A254 8084C464 0C20C899 */ jal func_80832264 -/* 1A258 8084C468 8FA4008C */ lw $a0, 0x008C($sp) -/* 1A25C 8084C46C 1000005E */ beq $zero, $zero, .L8084C5E8 -/* 1A260 8084C470 8FBF002C */ lw $ra, 0x002C($sp) -.L8084C474: -/* 1A264 8084C474 0303C023 */ subu $t8, $t8, $v1 -/* 1A268 8084C478 0018C040 */ sll $t8, $t8, 1 -/* 1A26C 8084C47C 0058C821 */ addu $t9, $v0, $t8 -/* 1A270 8084C480 8B2C0086 */ lwl $t4, 0x0086($t9) ## 00000086 -/* 1A274 8084C484 9B2C0089 */ lwr $t4, 0x0089($t9) ## 00000089 -/* 1A278 8084C488 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1A27C 8084C48C AA0C01EC */ swl $t4, 0x01EC($s0) ## 000001EC -/* 1A280 8084C490 BA0C01EF */ swr $t4, 0x01EF($s0) ## 000001EF -/* 1A284 8084C494 972C008A */ lhu $t4, 0x008A($t9) ## 0000008A -/* 1A288 8084C498 A60C01F0 */ sh $t4, 0x01F0($s0) ## 000001F0 -/* 1A28C 8084C49C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 1A290 8084C4A0 AFA60050 */ sw $a2, 0x0050($sp) -/* 1A294 8084C4A4 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 1A298 8084C4A8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 1A29C 8084C4AC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 1A2A0 8084C4B0 468084A0 */ cvt.s.w $f18, $f16 -/* 1A2A4 8084C4B4 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 1A2A8 8084C4B8 AFAB0018 */ sw $t3, 0x0018($sp) -/* 1A2AC 8084C4BC 8FA60050 */ lw $a2, 0x0050($sp) -/* 1A2B0 8084C4C0 8FA4008C */ lw $a0, 0x008C($sp) -/* 1A2B4 8084C4C4 8FA50030 */ lw $a1, 0x0030($sp) -/* 1A2B8 8084C4C8 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 1A2BC 8084C4CC 3C07BF80 */ lui $a3, 0xBF80 ## $a3 = BF800000 -/* 1A2C0 8084C4D0 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 1A2C4 8084C4D4 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 1A2C8 8084C4D8 E7A6001C */ swc1 $f6, 0x001C($sp) -/* 1A2CC 8084C4DC 10000042 */ beq $zero, $zero, .L8084C5E8 -/* 1A2D0 8084C4E0 8FBF002C */ lw $ra, 0x002C($sp) -/* 1A2D4 8084C4E4 8E0D0680 */ lw $t5, 0x0680($s0) ## 00000680 -.L8084C4E8: -/* 1A2D8 8084C4E8 35AE1000 */ ori $t6, $t5, 0x1000 ## $t6 = 00001000 -/* 1A2DC 8084C4EC 1000003D */ beq $zero, $zero, .L8084C5E4 -/* 1A2E0 8084C4F0 AE0E0680 */ sw $t6, 0x0680($s0) ## 00000680 -.L8084C4F4: -/* 1A2E4 8084C4F4 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 1A2E8 8084C4F8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 1A2EC 8084C4FC 04630026 */ bgezl $v1, .L8084C598 -/* 1A2F0 8084C500 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 1A2F4 8084C504 1461000B */ bne $v1, $at, .L8084C534 -/* 1A2F8 8084C508 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 -/* 1A2FC 8084C50C 3C054160 */ lui $a1, 0x4160 ## $a1 = 41600000 -/* 1A300 8084C510 0C02914C */ jal func_800A4530 -/* 1A304 8084C514 AFA40030 */ sw $a0, 0x0030($sp) -/* 1A308 8084C518 1440001A */ bne $v0, $zero, .L8084C584 -/* 1A30C 8084C51C 8FA40030 */ lw $a0, 0x0030($sp) -/* 1A310 8084C520 0C02914C */ jal func_800A4530 -/* 1A314 8084C524 3C0541E8 */ lui $a1, 0x41E8 ## $a1 = 41E80000 -/* 1A318 8084C528 14400016 */ bne $v0, $zero, .L8084C584 -/* 1A31C 8084C52C 00000000 */ nop -/* 1A320 8084C530 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -.L8084C534: -/* 1A324 8084C534 2401FFFC */ addiu $at, $zero, 0xFFFC ## $at = FFFFFFFC -/* 1A328 8084C538 1461002A */ bne $v1, $at, .L8084C5E4 -/* 1A32C 8084C53C 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 -/* 1A330 8084C540 3C0541B0 */ lui $a1, 0x41B0 ## $a1 = 41B00000 -/* 1A334 8084C544 0C02914C */ jal func_800A4530 -/* 1A338 8084C548 AFA40030 */ sw $a0, 0x0030($sp) -/* 1A33C 8084C54C 1440000D */ bne $v0, $zero, .L8084C584 -/* 1A340 8084C550 8FA40030 */ lw $a0, 0x0030($sp) -/* 1A344 8084C554 0C02914C */ jal func_800A4530 -/* 1A348 8084C558 3C05420C */ lui $a1, 0x420C ## $a1 = 420C0000 -/* 1A34C 8084C55C 14400009 */ bne $v0, $zero, .L8084C584 -/* 1A350 8084C560 8FA40030 */ lw $a0, 0x0030($sp) -/* 1A354 8084C564 0C02914C */ jal func_800A4530 -/* 1A358 8084C568 3C054244 */ lui $a1, 0x4244 ## $a1 = 42440000 -/* 1A35C 8084C56C 14400005 */ bne $v0, $zero, .L8084C584 -/* 1A360 8084C570 8FA40030 */ lw $a0, 0x0030($sp) -/* 1A364 8084C574 0C02914C */ jal func_800A4530 -/* 1A368 8084C578 3C05425C */ lui $a1, 0x425C ## $a1 = 425C0000 -/* 1A36C 8084C57C 5040001A */ beql $v0, $zero, .L8084C5E8 -/* 1A370 8084C580 8FBF002C */ lw $ra, 0x002C($sp) -.L8084C584: -/* 1A374 8084C584 0C212FB9 */ jal func_8084BEE4 -/* 1A378 8084C588 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1A37C 8084C58C 10000016 */ beq $zero, $zero, .L8084C5E8 -/* 1A380 8084C590 8FBF002C */ lw $ra, 0x002C($sp) -/* 1A384 8084C594 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -.L8084C598: -/* 1A388 8084C598 C60A01D0 */ lwc1 $f10, 0x01D0($s0) ## 000001D0 -/* 1A38C 8084C59C 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 -/* 1A390 8084C5A0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 1A394 8084C5A4 460A403C */ c.lt.s $f8, $f10 -/* 1A398 8084C5A8 00000000 */ nop -/* 1A39C 8084C5AC 45020005 */ bc1fl .L8084C5C4 -/* 1A3A0 8084C5B0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 1A3A4 8084C5B4 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 1A3A8 8084C5B8 10000004 */ beq $zero, $zero, .L8084C5CC -/* 1A3AC 8084C5BC 44050000 */ mfc1 $a1, $f0 -/* 1A3B0 8084C5C0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L8084C5C4: -/* 1A3B4 8084C5C4 00000000 */ nop -/* 1A3B8 8084C5C8 44050000 */ mfc1 $a1, $f0 -.L8084C5CC: -/* 1A3BC 8084C5CC 0C02914C */ jal func_800A4530 -/* 1A3C0 8084C5D0 00000000 */ nop -/* 1A3C4 8084C5D4 50400004 */ beql $v0, $zero, .L8084C5E8 -/* 1A3C8 8084C5D8 8FBF002C */ lw $ra, 0x002C($sp) -/* 1A3CC 8084C5DC 0C212FB9 */ jal func_8084BEE4 -/* 1A3D0 8084C5E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084C5E4: -/* 1A3D4 8084C5E4 8FBF002C */ lw $ra, 0x002C($sp) -.L8084C5E8: -/* 1A3D8 8084C5E8 8FB00028 */ lw $s0, 0x0028($sp) -/* 1A3DC 8084C5EC 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 1A3E0 8084C5F0 03E00008 */ jr $ra -/* 1A3E4 8084C5F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C5F8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C5F8.s deleted file mode 100644 index 82e317b9d0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C5F8.s +++ /dev/null @@ -1,98 +0,0 @@ -glabel func_8084C5F8 -/* 1A3E8 8084C5F8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 1A3EC 8084C5FC AFBF001C */ sw $ra, 0x001C($sp) -/* 1A3F0 8084C600 AFB00018 */ sw $s0, 0x0018($sp) -/* 1A3F4 8084C604 AFA50044 */ sw $a1, 0x0044($sp) -/* 1A3F8 8084C608 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1A3FC 8084C60C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1A400 8084C610 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 -/* 1A404 8084C614 35CF0040 */ ori $t7, $t6, 0x0040 ## $t7 = 00000040 -/* 1A408 8084C618 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1A40C 8084C61C AFA60020 */ sw $a2, 0x0020($sp) -/* 1A410 8084C620 8FA40044 */ lw $a0, 0x0044($sp) -/* 1A414 8084C624 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1A418 8084C628 0C20DD28 */ jal func_808374A0 -/* 1A41C 8084C62C 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 1A420 8084C630 14400007 */ bne $v0, $zero, .L8084C650 -/* 1A424 8084C634 00000000 */ nop -/* 1A428 8084C638 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 1A42C 8084C63C 3C01FFDF */ lui $at, 0xFFDF ## $at = FFDF0000 -/* 1A430 8084C640 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFDFFFFF -/* 1A434 8084C644 0301C824 */ and $t9, $t8, $at -/* 1A438 8084C648 10000040 */ beq $zero, $zero, .L8084C74C -/* 1A43C 8084C64C AE19067C */ sw $t9, 0x067C($s0) ## 0000067C -.L8084C650: -/* 1A440 8084C650 1C400004 */ bgtz $v0, .L8084C664 -/* 1A444 8084C654 8FA40044 */ lw $a0, 0x0044($sp) -/* 1A448 8084C658 0C028EF0 */ jal func_800A3BC0 -/* 1A44C 8084C65C 8FA50020 */ lw $a1, 0x0020($sp) -/* 1A450 8084C660 10400009 */ beq $v0, $zero, .L8084C688 -.L8084C664: -/* 1A454 8084C664 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1A458 8084C668 0C20F03A */ jal func_8083C0E8 -/* 1A45C 8084C66C 8FA50044 */ lw $a1, 0x0044($sp) -/* 1A460 8084C670 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 1A464 8084C674 3C01FFDF */ lui $at, 0xFFDF ## $at = FFDF0000 -/* 1A468 8084C678 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFDFFFFF -/* 1A46C 8084C67C 01014824 */ and $t1, $t0, $at -/* 1A470 8084C680 10000032 */ beq $zero, $zero, .L8084C74C -/* 1A474 8084C684 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C -.L8084C688: -/* 1A478 8084C688 860A0850 */ lh $t2, 0x0850($s0) ## 00000850 -/* 1A47C 8084C68C 3C038085 */ lui $v1, %hi(D_80854898) ## $v1 = 80850000 -/* 1A480 8084C690 24634898 */ addiu $v1, $v1, %lo(D_80854898) ## $v1 = 80854898 -/* 1A484 8084C694 11400006 */ beq $t2, $zero, .L8084C6B0 -/* 1A488 8084C698 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1A48C 8084C69C 3C058085 */ lui $a1, %hi(D_808548A8) ## $a1 = 80850000 -/* 1A490 8084C6A0 0C20CA49 */ jal func_80832924 -/* 1A494 8084C6A4 24A548A8 */ addiu $a1, $a1, %lo(D_808548A8) ## $a1 = 808548A8 -/* 1A498 8084C6A8 3C038085 */ lui $v1, %hi(D_808548A0) ## $v1 = 80850000 -/* 1A49C 8084C6AC 246348A0 */ addiu $v1, $v1, %lo(D_808548A0) ## $v1 = 808548A0 -.L8084C6B0: -/* 1A4A0 8084C6B0 8C650000 */ lw $a1, 0x0000($v1) ## 808548A0 -/* 1A4A4 8084C6B4 AFA30038 */ sw $v1, 0x0038($sp) -/* 1A4A8 8084C6B8 0C02914C */ jal func_800A4530 -/* 1A4AC 8084C6BC 8FA40020 */ lw $a0, 0x0020($sp) -/* 1A4B0 8084C6C0 14400006 */ bne $v0, $zero, .L8084C6DC -/* 1A4B4 8084C6C4 8FA30038 */ lw $v1, 0x0038($sp) -/* 1A4B8 8084C6C8 8FA40020 */ lw $a0, 0x0020($sp) -/* 1A4BC 8084C6CC 0C02914C */ jal func_800A4530 -/* 1A4C0 8084C6D0 8C650004 */ lw $a1, 0x0004($v1) ## 00000004 -/* 1A4C4 8084C6D4 5040001E */ beql $v0, $zero, .L8084C750 -/* 1A4C8 8084C6D8 8FBF001C */ lw $ra, 0x001C($sp) -.L8084C6DC: -/* 1A4CC 8084C6DC C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 1A4D0 8084C6E0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 1A4D4 8084C6E4 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 1A4D8 8084C6E8 E7A40024 */ swc1 $f4, 0x0024($sp) -/* 1A4DC 8084C6EC C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 1A4E0 8084C6F0 8FA40044 */ lw $a0, 0x0044($sp) -/* 1A4E4 8084C6F4 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 -/* 1A4E8 8084C6F8 46083280 */ add.s $f10, $f6, $f8 -/* 1A4EC 8084C6FC 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 1A4F0 8084C700 27A60030 */ addiu $a2, $sp, 0x0030 ## $a2 = FFFFFFF0 -/* 1A4F4 8084C704 27A70024 */ addiu $a3, $sp, 0x0024 ## $a3 = FFFFFFE4 -/* 1A4F8 8084C708 E7AA0028 */ swc1 $f10, 0x0028($sp) -/* 1A4FC 8084C70C C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 1A500 8084C710 AFA40020 */ sw $a0, 0x0020($sp) -/* 1A504 8084C714 0C00F250 */ jal func_8003C940 -/* 1A508 8084C718 E7B0002C */ swc1 $f16, 0x002C($sp) -/* 1A50C 8084C71C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 1A510 8084C720 8FA40020 */ lw $a0, 0x0020($sp) -/* 1A514 8084C724 8FA50034 */ lw $a1, 0x0034($sp) -/* 1A518 8084C728 46120032 */ c.eq.s $f0, $f18 -/* 1A51C 8084C72C 00000000 */ nop -/* 1A520 8084C730 45030007 */ bc1tl .L8084C750 -/* 1A524 8084C734 8FBF001C */ lw $ra, 0x001C($sp) -/* 1A528 8084C738 0C0107C4 */ jal func_80041F10 -/* 1A52C 8084C73C 8FA60030 */ lw $a2, 0x0030($sp) -/* 1A530 8084C740 A602089E */ sh $v0, 0x089E($s0) ## 0000089E -/* 1A534 8084C744 0C20CA28 */ jal func_808328A0 -/* 1A538 8084C748 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084C74C: -/* 1A53C 8084C74C 8FBF001C */ lw $ra, 0x001C($sp) -.L8084C750: -/* 1A540 8084C750 8FB00018 */ lw $s0, 0x0018($sp) -/* 1A544 8084C754 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 1A548 8084C758 03E00008 */ jr $ra -/* 1A54C 8084C75C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C760.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C760.s deleted file mode 100644 index ffddb3a21d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C760.s +++ /dev/null @@ -1,57 +0,0 @@ -.late_rodata -glabel D_8085552C - .float 0.03 - -.text -glabel func_8084C760 -/* 1A550 8084C760 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1A554 8084C764 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1A558 8084C768 AFA5001C */ sw $a1, 0x001C($sp) -/* 1A55C 8084C76C 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1A560 8084C770 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 1A564 8084C774 24C501B4 */ addiu $a1, $a2, 0x01B4 ## $a1 = 000001B4 -/* 1A568 8084C778 35CF0040 */ ori $t7, $t6, 0x0040 ## $t7 = 00000040 -/* 1A56C 8084C77C AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1A570 8084C780 AFA60018 */ sw $a2, 0x0018($sp) -/* 1A574 8084C784 0C028EF0 */ jal func_800A3BC0 -/* 1A578 8084C788 8FA4001C */ lw $a0, 0x001C($sp) -/* 1A57C 8084C78C 1040001B */ beq $v0, $zero, .L8084C7FC -/* 1A580 8084C790 8FA60018 */ lw $a2, 0x0018($sp) -/* 1A584 8084C794 8CD8067C */ lw $t8, 0x067C($a2) ## 0000067C -/* 1A588 8084C798 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 1A58C 8084C79C 5720001C */ bnel $t9, $zero, .L8084C810 -/* 1A590 8084C7A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1A594 8084C7A4 90C801E9 */ lbu $t0, 0x01E9($a2) ## 000001E9 -/* 1A598 8084C7A8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1A59C 8084C7AC 8FA5001C */ lw $a1, 0x001C($sp) -/* 1A5A0 8084C7B0 11000003 */ beq $t0, $zero, .L8084C7C0 -/* 1A5A4 8084C7B4 00000000 */ nop -/* 1A5A8 8084C7B8 10000014 */ beq $zero, $zero, .L8084C80C -/* 1A5AC 8084C7BC A0C001E9 */ sb $zero, 0x01E9($a2) ## 000001E9 -.L8084C7C0: -/* 1A5B0 8084C7C0 0C20FD5C */ jal func_8083F570 -/* 1A5B4 8084C7C4 AFA60018 */ sw $a2, 0x0018($sp) -/* 1A5B8 8084C7C8 14400010 */ bne $v0, $zero, .L8084C80C -/* 1A5BC 8084C7CC 8FA60018 */ lw $a2, 0x0018($sp) -/* 1A5C0 8084C7D0 3C098086 */ lui $t1, %hi(D_80858AB4) ## $t1 = 80860000 -/* 1A5C4 8084C7D4 8D298AB4 */ lw $t1, %lo(D_80858AB4)($t1) -/* 1A5C8 8084C7D8 3C018085 */ lui $at, %hi(D_8085552C) ## $at = 80850000 -/* 1A5CC 8084C7DC C428552C */ lwc1 $f8, %lo(D_8085552C)($at) -/* 1A5D0 8084C7E0 812A0015 */ lb $t2, 0x0015($t1) ## 80860015 -/* 1A5D4 8084C7E4 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 1A5D8 8084C7E8 00000000 */ nop -/* 1A5DC 8084C7EC 468021A0 */ cvt.s.w $f6, $f4 -/* 1A5E0 8084C7F0 46083282 */ mul.s $f10, $f6, $f8 -/* 1A5E4 8084C7F4 10000005 */ beq $zero, $zero, .L8084C80C -/* 1A5E8 8084C7F8 E4CA0838 */ swc1 $f10, 0x0838($a2) ## 00000838 -.L8084C7FC: -/* 1A5EC 8084C7FC 3C058085 */ lui $a1, %hi(D_808548B4) ## $a1 = 80850000 -/* 1A5F0 8084C800 24A548B4 */ addiu $a1, $a1, %lo(D_808548B4) ## $a1 = 808548B4 -/* 1A5F4 8084C804 0C20CA49 */ jal func_80832924 -/* 1A5F8 8084C808 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L8084C80C: -/* 1A5FC 8084C80C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8084C810: -/* 1A600 8084C810 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1A604 8084C814 03E00008 */ jr $ra -/* 1A608 8084C818 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C81C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C81C.s deleted file mode 100644 index 4a74e2106d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C81C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_8084C81C -/* 1A60C 8084C81C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1A610 8084C820 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1A614 8084C824 AFA5001C */ sw $a1, 0x001C($sp) -/* 1A618 8084C828 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1A61C 8084C82C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 1A620 8084C830 24C501B4 */ addiu $a1, $a2, 0x01B4 ## $a1 = 000001B4 -/* 1A624 8084C834 35CF0040 */ ori $t7, $t6, 0x0040 ## $t7 = 00000040 -/* 1A628 8084C838 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1A62C 8084C83C AFA60018 */ sw $a2, 0x0018($sp) -/* 1A630 8084C840 0C028EF0 */ jal func_800A3BC0 -/* 1A634 8084C844 8FA4001C */ lw $a0, 0x001C($sp) -/* 1A638 8084C848 1040000C */ beq $v0, $zero, .L8084C87C -/* 1A63C 8084C84C 8FA60018 */ lw $a2, 0x0018($sp) -/* 1A640 8084C850 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1A644 8084C854 8FA5001C */ lw $a1, 0x001C($sp) -/* 1A648 8084C858 0C20F03A */ jal func_8083C0E8 -/* 1A64C 8084C85C AFA60018 */ sw $a2, 0x0018($sp) -/* 1A650 8084C860 8FA60018 */ lw $a2, 0x0018($sp) -/* 1A654 8084C864 3C01FFFB */ lui $at, 0xFFFB ## $at = FFFB0000 -/* 1A658 8084C868 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFBFFFF -/* 1A65C 8084C86C 8CD80680 */ lw $t8, 0x0680($a2) ## 00000680 -/* 1A660 8084C870 0301C824 */ and $t9, $t8, $at -/* 1A664 8084C874 10000005 */ beq $zero, $zero, .L8084C88C -/* 1A668 8084C878 ACD90680 */ sw $t9, 0x0680($a2) ## 00000680 -.L8084C87C: -/* 1A66C 8084C87C 3C058085 */ lui $a1, %hi(D_808548D8) ## $a1 = 80850000 -/* 1A670 8084C880 24A548D8 */ addiu $a1, $a1, %lo(D_808548D8) ## $a1 = 808548D8 -/* 1A674 8084C884 0C20CA49 */ jal func_80832924 -/* 1A678 8084C888 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L8084C88C: -/* 1A67C 8084C88C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1A680 8084C890 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1A684 8084C894 03E00008 */ jr $ra -/* 1A688 8084C898 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C89C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C89C.s deleted file mode 100644 index 12b4a21a7b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C89C.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_8084C89C -/* 1A68C 8084C89C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 1A690 8084C8A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 1A694 8084C8A4 AFA40058 */ sw $a0, 0x0058($sp) -/* 1A698 8084C8A8 AFA60060 */ sw $a2, 0x0060($sp) -/* 1A69C 8084C8AC AFA70064 */ sw $a3, 0x0064($sp) -/* 1A6A0 8084C8B0 8CA20440 */ lw $v0, 0x0440($a1) ## 00000440 -/* 1A6A4 8084C8B4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 1A6A8 8084C8B8 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -/* 1A6AC 8084C8BC C4400028 */ lwc1 $f0, 0x0028($v0) ## 00000028 -/* 1A6B0 8084C8C0 00061880 */ sll $v1, $a2, 2 -/* 1A6B4 8084C8C4 00661823 */ subu $v1, $v1, $a2 -/* 1A6B8 8084C8C8 46020100 */ add.s $f4, $f0, $f2 -/* 1A6BC 8084C8CC 3C0E8085 */ lui $t6, %hi(D_808548FC) ## $t6 = 80850000 -/* 1A6C0 8084C8D0 25CE48FC */ addiu $t6, $t6, %lo(D_808548FC) ## $t6 = 808548FC -/* 1A6C4 8084C8D4 46020181 */ sub.s $f6, $f0, $f2 -/* 1A6C8 8084C8D8 00031880 */ sll $v1, $v1, 2 -/* 1A6CC 8084C8DC E7A40050 */ swc1 $f4, 0x0050($sp) -/* 1A6D0 8084C8E0 006E3021 */ addu $a2, $v1, $t6 -/* 1A6D4 8084C8E4 E7A6004C */ swc1 $f6, 0x004C($sp) -/* 1A6D8 8084C8E8 AFA30028 */ sw $v1, 0x0028($sp) -/* 1A6DC 8084C8EC AFA5005C */ sw $a1, 0x005C($sp) -/* 1A6E0 8084C8F0 0C20E5CF */ jal func_8083973C -/* 1A6E4 8084C8F4 27A70040 */ addiu $a3, $sp, 0x0040 ## $a3 = FFFFFFE8 -/* 1A6E8 8084C8F8 8FA30064 */ lw $v1, 0x0064($sp) -/* 1A6EC 8084C8FC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1A6F0 8084C900 E4600000 */ swc1 $f0, 0x0000($v1) ## 00000000 -/* 1A6F4 8084C904 C7A8004C */ lwc1 $f8, 0x004C($sp) -/* 1A6F8 8084C908 C7B00050 */ lwc1 $f16, 0x0050($sp) -/* 1A6FC 8084C90C 4600403C */ c.lt.s $f8, $f0 -/* 1A700 8084C910 00000000 */ nop -/* 1A704 8084C914 45000002 */ bc1f .L8084C920 -/* 1A708 8084C918 00000000 */ nop -/* 1A70C 8084C91C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8084C920: -/* 1A710 8084C920 50400023 */ beql $v0, $zero, .L8084C9B0 -/* 1A714 8084C924 8FBF001C */ lw $ra, 0x001C($sp) -/* 1A718 8084C928 C46A0000 */ lwc1 $f10, 0x0000($v1) ## 00000000 -/* 1A71C 8084C92C 3C188085 */ lui $t8, %hi(D_80854914) ## $t8 = 80850000 -/* 1A720 8084C930 27184914 */ addiu $t8, $t8, %lo(D_80854914) ## $t8 = 80854914 -/* 1A724 8084C934 4610503C */ c.lt.s $f10, $f16 -/* 1A728 8084C938 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1A72C 8084C93C 8FA40058 */ lw $a0, 0x0058($sp) -/* 1A730 8084C940 8FA5005C */ lw $a1, 0x005C($sp) -/* 1A734 8084C944 45000002 */ bc1f .L8084C950 -/* 1A738 8084C948 8FAF0028 */ lw $t7, 0x0028($sp) -/* 1A73C 8084C94C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8084C950: -/* 1A740 8084C950 10400016 */ beq $v0, $zero, .L8084C9AC -/* 1A744 8084C954 01F83021 */ addu $a2, $t7, $t8 -/* 1A748 8084C958 27B9002C */ addiu $t9, $sp, 0x002C ## $t9 = FFFFFFD4 -/* 1A74C 8084C95C 27A80034 */ addiu $t0, $sp, 0x0034 ## $t0 = FFFFFFDC -/* 1A750 8084C960 AFA80014 */ sw $t0, 0x0014($sp) -/* 1A754 8084C964 AFB90010 */ sw $t9, 0x0010($sp) -/* 1A758 8084C968 0C20E5DA */ jal func_80839768 -/* 1A75C 8084C96C 27A70030 */ addiu $a3, $sp, 0x0030 ## $a3 = FFFFFFD8 -/* 1A760 8084C970 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 1A764 8084C974 1040000D */ beq $v0, $zero, .L8084C9AC -/* 1A768 8084C978 8FA40058 */ lw $a0, 0x0058($sp) -/* 1A76C 8084C97C 8FA90028 */ lw $t1, 0x0028($sp) -/* 1A770 8084C980 3C0A8085 */ lui $t2, %hi(D_8085492C) ## $t2 = 80850000 -/* 1A774 8084C984 254A492C */ addiu $t2, $t2, %lo(D_8085492C) ## $t2 = 8085492C -/* 1A778 8084C988 27AB002C */ addiu $t3, $sp, 0x002C ## $t3 = FFFFFFD4 -/* 1A77C 8084C98C 27AC0034 */ addiu $t4, $sp, 0x0034 ## $t4 = FFFFFFDC -/* 1A780 8084C990 AFAC0014 */ sw $t4, 0x0014($sp) -/* 1A784 8084C994 AFAB0010 */ sw $t3, 0x0010($sp) -/* 1A788 8084C998 8FA5005C */ lw $a1, 0x005C($sp) -/* 1A78C 8084C99C 27A70030 */ addiu $a3, $sp, 0x0030 ## $a3 = FFFFFFD8 -/* 1A790 8084C9A0 0C20E5DA */ jal func_80839768 -/* 1A794 8084C9A4 012A3021 */ addu $a2, $t1, $t2 -/* 1A798 8084C9A8 2C420001 */ sltiu $v0, $v0, 0x0001 -.L8084C9AC: -/* 1A79C 8084C9AC 8FBF001C */ lw $ra, 0x001C($sp) -.L8084C9B0: -/* 1A7A0 8084C9B0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 1A7A4 8084C9B4 03E00008 */ jr $ra -/* 1A7A8 8084C9B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C9BC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C9BC.s deleted file mode 100644 index a5e0269572..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C9BC.s +++ /dev/null @@ -1,160 +0,0 @@ -glabel func_8084C9BC -/* 1A7AC 8084C9BC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 1A7B0 8084C9C0 AFBF001C */ sw $ra, 0x001C($sp) -/* 1A7B4 8084C9C4 AFB00018 */ sw $s0, 0x0018($sp) -/* 1A7B8 8084C9C8 AFA50044 */ sw $a1, 0x0044($sp) -/* 1A7BC 8084C9CC 848E0850 */ lh $t6, 0x0850($a0) ## 00000850 -/* 1A7C0 8084C9D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1A7C4 8084C9D4 8C880440 */ lw $t0, 0x0440($a0) ## 00000440 -/* 1A7C8 8084C9D8 05C10004 */ bgez $t6, .L8084C9EC -/* 1A7CC 8084C9DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1A7D0 8084C9E0 240F0063 */ addiu $t7, $zero, 0x0063 ## $t7 = 00000063 -/* 1A7D4 8084C9E4 1000007D */ beq $zero, $zero, .L8084CBDC -/* 1A7D8 8084C9E8 A48F0850 */ sh $t7, 0x0850($a0) ## 00000850 -.L8084C9EC: -/* 1A7DC 8084C9EC 8218043C */ lb $t8, 0x043C($s0) ## 0000043C -/* 1A7E0 8084C9F0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 1A7E4 8084C9F4 8FA40044 */ lw $a0, 0x0044($sp) -/* 1A7E8 8084C9F8 07010003 */ bgez $t8, .L8084CA08 -/* 1A7EC 8084C9FC 27A70034 */ addiu $a3, $sp, 0x0034 ## $a3 = FFFFFFF4 -/* 1A7F0 8084CA00 10000001 */ beq $zero, $zero, .L8084CA08 -/* 1A7F4 8084CA04 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -.L8084CA08: -/* 1A7F8 8084CA08 AFA60038 */ sw $a2, 0x0038($sp) -/* 1A7FC 8084CA0C 0C213227 */ jal func_8084C89C -/* 1A800 8084CA10 AFA8003C */ sw $t0, 0x003C($sp) -/* 1A804 8084CA14 8FA60038 */ lw $a2, 0x0038($sp) -/* 1A808 8084CA18 1440000E */ bne $v0, $zero, .L8084CA54 -/* 1A80C 8084CA1C 8FA8003C */ lw $t0, 0x003C($sp) -/* 1A810 8084CA20 38C60001 */ xori $a2, $a2, 0x0001 ## $a2 = 00000001 -/* 1A814 8084CA24 8FA40044 */ lw $a0, 0x0044($sp) -/* 1A818 8084CA28 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1A81C 8084CA2C 27A70034 */ addiu $a3, $sp, 0x0034 ## $a3 = FFFFFFF4 -/* 1A820 8084CA30 0C213227 */ jal func_8084C89C -/* 1A824 8084CA34 AFA8003C */ sw $t0, 0x003C($sp) -/* 1A828 8084CA38 14400003 */ bne $v0, $zero, .L8084CA48 -/* 1A82C 8084CA3C 8FA8003C */ lw $t0, 0x003C($sp) -/* 1A830 8084CA40 10000067 */ beq $zero, $zero, .L8084CBE0 -/* 1A834 8084CA44 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8084CA48: -/* 1A838 8084CA48 8219043C */ lb $t9, 0x043C($s0) ## 0000043C -/* 1A83C 8084CA4C 00194823 */ subu $t1, $zero, $t9 -/* 1A840 8084CA50 A209043C */ sb $t1, 0x043C($s0) ## 0000043C -.L8084CA54: -/* 1A844 8084CA54 8FA40044 */ lw $a0, 0x0044($sp) -/* 1A848 8084CA58 3C0B0001 */ lui $t3, 0x0001 ## $t3 = 00010000 -/* 1A84C 8084CA5C 908A1D6C */ lbu $t2, 0x1D6C($a0) ## 00001D6C -/* 1A850 8084CA60 01645821 */ addu $t3, $t3, $a0 -/* 1A854 8084CA64 5540005E */ bnel $t2, $zero, .L8084CBE0 -/* 1A858 8084CA68 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1A85C 8084CA6C 916B241B */ lbu $t3, 0x241B($t3) ## 0001241B -/* 1A860 8084CA70 5560005B */ bnel $t3, $zero, .L8084CBE0 -/* 1A864 8084CA74 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1A868 8084CA78 8D0301F0 */ lw $v1, 0x01F0($t0) ## 000001F0 -/* 1A86C 8084CA7C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 1A870 8084CA80 306C0040 */ andi $t4, $v1, 0x0040 ## $t4 = 00000000 -/* 1A874 8084CA84 11800003 */ beq $t4, $zero, .L8084CA94 -/* 1A878 8084CA88 00000000 */ nop -/* 1A87C 8084CA8C 10000001 */ beq $zero, $zero, .L8084CA94 -/* 1A880 8084CA90 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -.L8084CA94: -/* 1A884 8084CA94 54C00014 */ bnel $a2, $zero, .L8084CAE8 -/* 1A888 8084CA98 8E0F0680 */ lw $t7, 0x0680($s0) ## 00000680 -/* 1A88C 8084CA9C 8D02014C */ lw $v0, 0x014C($t0) ## 0000014C -/* 1A890 8084CAA0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 1A894 8084CAA4 00036B00 */ sll $t5, $v1, 12 -/* 1A898 8084CAA8 10410005 */ beq $v0, $at, .L8084CAC0 -/* 1A89C 8084CAAC 00000000 */ nop -/* 1A8A0 8084CAB0 10400003 */ beq $v0, $zero, .L8084CAC0 -/* 1A8A4 8084CAB4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 1A8A8 8084CAB8 54410008 */ bnel $v0, $at, .L8084CADC -/* 1A8AC 8084CABC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8084CAC0: -/* 1A8B0 8084CAC0 05A00005 */ bltz $t5, .L8084CAD8 -/* 1A8B4 8084CAC4 00037180 */ sll $t6, $v1, 6 -/* 1A8B8 8084CAC8 05C20004 */ bltzl $t6, .L8084CADC -/* 1A8BC 8084CACC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1A8C0 8084CAD0 10000002 */ beq $zero, $zero, .L8084CADC -/* 1A8C4 8084CAD4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8084CAD8: -/* 1A8C8 8084CAD8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8084CADC: -/* 1A8CC 8084CADC 50400040 */ beql $v0, $zero, .L8084CBE0 -/* 1A8D0 8084CAE0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1A8D4 8084CAE4 8E0F0680 */ lw $t7, 0x0680($s0) ## 00000680 -.L8084CAE8: -/* 1A8D8 8084CAE8 3C010040 */ lui $at, 0x0040 ## $at = 00400000 -/* 1A8DC 8084CAEC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 1A8E0 8084CAF0 01E1C025 */ or $t8, $t7, $at ## $t8 = 00400000 -/* 1A8E4 8084CAF4 AE180680 */ sw $t8, 0x0680($s0) ## 00000680 -/* 1A8E8 8084CAF8 8D0301F0 */ lw $v1, 0x01F0($t0) ## 000001F0 -/* 1A8EC 8084CAFC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1A8F0 8084CB00 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 1A8F4 8084CB04 30790040 */ andi $t9, $v1, 0x0040 ## $t9 = 00000000 -/* 1A8F8 8084CB08 13200003 */ beq $t9, $zero, .L8084CB18 -/* 1A8FC 8084CB0C 00000000 */ nop -/* 1A900 8084CB10 10000001 */ beq $zero, $zero, .L8084CB18 -/* 1A904 8084CB14 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -.L8084CB18: -/* 1A908 8084CB18 54C0001B */ bnel $a2, $zero, .L8084CB88 -/* 1A90C 8084CB1C AD00011C */ sw $zero, 0x011C($t0) ## 0000011C -/* 1A910 8084CB20 8D02014C */ lw $v0, 0x014C($t0) ## 0000014C -/* 1A914 8084CB24 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 1A918 8084CB28 00034B00 */ sll $t1, $v1, 12 -/* 1A91C 8084CB2C 10410005 */ beq $v0, $at, .L8084CB44 -/* 1A920 8084CB30 3C0B8086 */ lui $t3, %hi(D_80858AB4) ## $t3 = 80860000 -/* 1A924 8084CB34 10400003 */ beq $v0, $zero, .L8084CB44 -/* 1A928 8084CB38 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 1A92C 8084CB3C 54410008 */ bnel $v0, $at, .L8084CB60 -/* 1A930 8084CB40 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8084CB44: -/* 1A934 8084CB44 05200005 */ bltz $t1, .L8084CB5C -/* 1A938 8084CB48 00035180 */ sll $t2, $v1, 6 -/* 1A93C 8084CB4C 05420004 */ bltzl $t2, .L8084CB60 -/* 1A940 8084CB50 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1A944 8084CB54 10000002 */ beq $zero, $zero, .L8084CB60 -/* 1A948 8084CB58 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8084CB5C: -/* 1A94C 8084CB5C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8084CB60: -/* 1A950 8084CB60 5040001F */ beql $v0, $zero, .L8084CBE0 -/* 1A954 8084CB64 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1A958 8084CB68 8D6B8AB4 */ lw $t3, %lo(D_80858AB4)($t3) -/* 1A95C 8084CB6C 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 1A960 8084CB70 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 1A964 8084CB74 956C000C */ lhu $t4, 0x000C($t3) ## 8086000C -/* 1A968 8084CB78 01816827 */ nor $t5, $t4, $at -/* 1A96C 8084CB7C 55A00018 */ bnel $t5, $zero, .L8084CBE0 -/* 1A970 8084CB80 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1A974 8084CB84 AD00011C */ sw $zero, 0x011C($t0) ## 0000011C -.L8084CB88: -/* 1A978 8084CB88 3C068085 */ lui $a2, %hi(func_8084D3E4) ## $a2 = 80850000 -/* 1A97C 8084CB8C 24C6D3E4 */ addiu $a2, $a2, %lo(func_8084D3E4) ## $a2 = 8084D3E4 -/* 1A980 8084CB90 0C20D76B */ jal func_80835DAC -/* 1A984 8084CB94 AFA8003C */ sw $t0, 0x003C($sp) -/* 1A988 8084CB98 8FA8003C */ lw $t0, 0x003C($sp) -/* 1A98C 8084CB9C C7A40034 */ lwc1 $f4, 0x0034($sp) -/* 1A990 8084CBA0 820E043C */ lb $t6, 0x043C($s0) ## 0000043C -/* 1A994 8084CBA4 C5060028 */ lwc1 $f6, 0x0028($t0) ## 00000028 -/* 1A998 8084CBA8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1A99C 8084CBAC 24C633A0 */ addiu $a2, $a2, 0x33A0 ## $a2 = 040033A0 -/* 1A9A0 8084CBB0 46062201 */ sub.s $f8, $f4, $f6 -/* 1A9A4 8084CBB4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1A9A8 8084CBB8 05C10004 */ bgez $t6, .L8084CBCC -/* 1A9AC 8084CBBC E6080878 */ swc1 $f8, 0x0878($s0) ## 00000878 -/* 1A9B0 8084CBC0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1A9B4 8084CBC4 10000001 */ beq $zero, $zero, .L8084CBCC -/* 1A9B8 8084CBC8 24C63390 */ addiu $a2, $a2, 0x3390 ## $a2 = 04003390 -.L8084CBCC: -/* 1A9BC 8084CBCC 0C20C899 */ jal func_80832264 -/* 1A9C0 8084CBD0 8FA40044 */ lw $a0, 0x0044($sp) -/* 1A9C4 8084CBD4 10000002 */ beq $zero, $zero, .L8084CBE0 -/* 1A9C8 8084CBD8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8084CBDC: -/* 1A9CC 8084CBDC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8084CBE0: -/* 1A9D0 8084CBE0 8FBF001C */ lw $ra, 0x001C($sp) -/* 1A9D4 8084CBE4 8FB00018 */ lw $s0, 0x0018($sp) -/* 1A9D8 8084CBE8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 1A9DC 8084CBEC 03E00008 */ jr $ra -/* 1A9E0 8084CBF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CBF4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CBF4.s deleted file mode 100644 index be48836aac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CBF4.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_8084CBF4 -/* 1A9E4 8084CBF4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 1A9E8 8084CBF8 C4820878 */ lwc1 $f2, 0x0878($a0) ## 00000878 -/* 1A9EC 8084CBFC 44857000 */ mtc1 $a1, $f14 ## $f14 = 0.00 -/* 1A9F0 8084CC00 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 1A9F4 8084CC04 46028032 */ c.eq.s $f16, $f2 -/* 1A9F8 8084CC08 00000000 */ nop -/* 1A9FC 8084CC0C 45010020 */ bc1t .L8084CC90 -/* 1AA00 8084CC10 00000000 */ nop -/* 1AA04 8084CC14 C48401CC */ lwc1 $f4, 0x01CC($a0) ## 000001CC -/* 1AA08 8084CC18 4604603E */ c.le.s $f12, $f4 -/* 1AA0C 8084CC1C 00000000 */ nop -/* 1AA10 8084CC20 4500001B */ bc1f .L8084CC90 -/* 1AA14 8084CC24 00000000 */ nop -/* 1AA18 8084CC28 46001005 */ abs.s $f0, $f2 -/* 1AA1C 8084CC2C 4600703C */ c.lt.s $f14, $f0 -/* 1AA20 8084CC30 00000000 */ nop -/* 1AA24 8084CC34 45020011 */ bc1fl .L8084CC7C -/* 1AA28 8084CC38 46001306 */ mov.s $f12, $f2 -/* 1AA2C 8084CC3C 4602803E */ c.le.s $f16, $f2 -/* 1AA30 8084CC40 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 1AA34 8084CC44 45020008 */ bc1fl .L8084CC68 -/* 1AA38 8084CC48 44810000 */ mtc1 $at, $f0 ## $f0 = -1.00 -/* 1AA3C 8084CC4C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 1AA40 8084CC50 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 1AA44 8084CC54 00000000 */ nop -/* 1AA48 8084CC58 460E0302 */ mul.s $f12, $f0, $f14 -/* 1AA4C 8084CC5C 10000008 */ beq $zero, $zero, .L8084CC80 -/* 1AA50 8084CC60 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 1AA54 8084CC64 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -.L8084CC68: -/* 1AA58 8084CC68 00000000 */ nop -/* 1AA5C 8084CC6C 460E0302 */ mul.s $f12, $f0, $f14 -/* 1AA60 8084CC70 10000003 */ beq $zero, $zero, .L8084CC80 -/* 1AA64 8084CC74 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 1AA68 8084CC78 46001306 */ mov.s $f12, $f2 -.L8084CC7C: -/* 1AA6C 8084CC7C C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -.L8084CC80: -/* 1AA70 8084CC80 460C1281 */ sub.s $f10, $f2, $f12 -/* 1AA74 8084CC84 460C3200 */ add.s $f8, $f6, $f12 -/* 1AA78 8084CC88 E48A0878 */ swc1 $f10, 0x0878($a0) ## 00000878 -/* 1AA7C 8084CC8C E4880028 */ swc1 $f8, 0x0028($a0) ## 00000028 -.L8084CC90: -/* 1AA80 8084CC90 03E00008 */ jr $ra -/* 1AA84 8084CC94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s deleted file mode 100644 index 5d723dd6cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s +++ /dev/null @@ -1,526 +0,0 @@ -.late_rodata -glabel D_80855530 - .float 0.1 - -glabel D_80855534 - .float 0.2 - -.text -glabel func_8084CC98 -/* 1AA88 8084CC98 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 1AA8C 8084CC9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 1AA90 8084CCA0 AFB00020 */ sw $s0, 0x0020($sp) -/* 1AA94 8084CCA4 AFA50054 */ sw $a1, 0x0054($sp) -/* 1AA98 8084CCA8 8C8E0440 */ lw $t6, 0x0440($a0) ## 00000440 -/* 1AA9C 8084CCAC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1AAA0 8084CCB0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 1AAA4 8084CCB4 AFAE004C */ sw $t6, 0x004C($sp) -/* 1AAA8 8084CCB8 8C8F0680 */ lw $t7, 0x0680($a0) ## 00000680 -/* 1AAAC 8084CCBC 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 1AAB0 8084CCC0 35F80040 */ ori $t8, $t7, 0x0040 ## $t8 = 00000040 -/* 1AAB4 8084CCC4 0C2132FD */ jal func_8084CBF4 -/* 1AAB8 8084CCC8 AC980680 */ sw $t8, 0x0680($a0) ## 00000680 -/* 1AABC 8084CCCC 86190850 */ lh $t9, 0x0850($s0) ## 00000850 -/* 1AAC0 8084CCD0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1AAC4 8084CCD4 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AAC8 8084CCD8 1720003C */ bne $t9, $zero, .L8084CDCC -/* 1AACC 8084CCDC 00000000 */ nop -/* 1AAD0 8084CCE0 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AAD4 8084CCE4 0C028EF0 */ jal func_800A3BC0 -/* 1AAD8 8084CCE8 AFA50030 */ sw $a1, 0x0030($sp) -/* 1AADC 8084CCEC 10400007 */ beq $v0, $zero, .L8084CD0C -/* 1AAE0 8084CCF0 3C0C8085 */ lui $t4, %hi(D_80854998) ## $t4 = 80850000 -/* 1AAE4 8084CCF4 3C080400 */ lui $t0, 0x0400 ## $t0 = 04000000 -/* 1AAE8 8084CCF8 250833B8 */ addiu $t0, $t0, 0x33B8 ## $t0 = 040033B8 -/* 1AAEC 8084CCFC 24090063 */ addiu $t1, $zero, 0x0063 ## $t1 = 00000063 -/* 1AAF0 8084CD00 AE0801BC */ sw $t0, 0x01BC($s0) ## 000001BC -/* 1AAF4 8084CD04 100001B2 */ beq $zero, $zero, .L8084D3D0 -/* 1AAF8 8084CD08 A6090850 */ sh $t1, 0x0850($s0) ## 00000850 -.L8084CD0C: -/* 1AAFC 8084CD0C 820A043C */ lb $t2, 0x043C($s0) ## 0000043C -/* 1AB00 8084CD10 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 1AB04 8084CD14 258C4998 */ addiu $t4, $t4, %lo(D_80854998) ## $t4 = 80854998 -/* 1AB08 8084CD18 05410003 */ bgez $t2, .L8084CD28 -/* 1AB0C 8084CD1C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 1AB10 8084CD20 10000001 */ beq $zero, $zero, .L8084CD28 -/* 1AB14 8084CD24 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8084CD28: -/* 1AB18 8084CD28 00025840 */ sll $t3, $v0, 1 -/* 1AB1C 8084CD2C 016C1821 */ addu $v1, $t3, $t4 -/* 1AB20 8084CD30 906D0000 */ lbu $t5, 0x0000($v1) ## 00000000 -/* 1AB24 8084CD34 8FA40030 */ lw $a0, 0x0030($sp) -/* 1AB28 8084CD38 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 1AB2C 8084CD3C 05A10004 */ bgez $t5, .L8084CD50 -/* 1AB30 8084CD40 46802120 */ cvt.s.w $f4, $f4 -/* 1AB34 8084CD44 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 1AB38 8084CD48 00000000 */ nop -/* 1AB3C 8084CD4C 46062100 */ add.s $f4, $f4, $f6 -.L8084CD50: -/* 1AB40 8084CD50 44052000 */ mfc1 $a1, $f4 -/* 1AB44 8084CD54 0C02914C */ jal func_800A4530 -/* 1AB48 8084CD58 AFA3002C */ sw $v1, 0x002C($sp) -/* 1AB4C 8084CD5C 10400006 */ beq $v0, $zero, .L8084CD78 -/* 1AB50 8084CD60 8FA3002C */ lw $v1, 0x002C($sp) -/* 1AB54 8084CD64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AB58 8084CD68 0C00BDF7 */ jal func_8002F7DC -/* 1AB5C 8084CD6C 24050831 */ addiu $a1, $zero, 0x0831 ## $a1 = 00000831 -/* 1AB60 8084CD70 10000198 */ beq $zero, $zero, .L8084D3D4 -/* 1AB64 8084CD74 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084CD78: -/* 1AB68 8084CD78 906E0001 */ lbu $t6, 0x0001($v1) ## 00000001 -/* 1AB6C 8084CD7C 8FA40030 */ lw $a0, 0x0030($sp) -/* 1AB70 8084CD80 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 1AB74 8084CD84 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 1AB78 8084CD88 05C10004 */ bgez $t6, .L8084CD9C -/* 1AB7C 8084CD8C 46804220 */ cvt.s.w $f8, $f8 -/* 1AB80 8084CD90 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 -/* 1AB84 8084CD94 00000000 */ nop -/* 1AB88 8084CD98 460A4200 */ add.s $f8, $f8, $f10 -.L8084CD9C: -/* 1AB8C 8084CD9C 44054000 */ mfc1 $a1, $f8 -/* 1AB90 8084CDA0 0C02914C */ jal func_800A4530 -/* 1AB94 8084CDA4 00000000 */ nop -/* 1AB98 8084CDA8 10400189 */ beq $v0, $zero, .L8084D3D0 -/* 1AB9C 8084CDAC 8FA40054 */ lw $a0, 0x0054($sp) -/* 1ABA0 8084CDB0 0C00B79D */ jal func_8002DE74 -/* 1ABA4 8084CDB4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1ABA8 8084CDB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1ABAC 8084CDBC 0C00BDF7 */ jal func_8002F7DC -/* 1ABB0 8084CDC0 24050832 */ addiu $a1, $zero, 0x0832 ## $a1 = 00000832 -/* 1ABB4 8084CDC4 10000183 */ beq $zero, $zero, .L8084D3D4 -/* 1ABB8 8084CDC8 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084CDCC: -/* 1ABBC 8084CDCC 0C00B79D */ jal func_8002DE74 -/* 1ABC0 8084CDD0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1ABC4 8084CDD4 3C0F8085 */ lui $t7, %hi(D_8085499C) ## $t7 = 80850000 -/* 1ABC8 8084CDD8 25EF499C */ addiu $t7, $t7, %lo(D_8085499C) ## $t7 = 8085499C -/* 1ABCC 8084CDDC 8DF90000 */ lw $t9, 0x0000($t7) ## 8085499C -/* 1ABD0 8084CDE0 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 1ABD4 8084CDE4 AA1901EC */ swl $t9, 0x01EC($s0) ## 000001EC -/* 1ABD8 8084CDE8 BA1901EF */ swr $t9, 0x01EF($s0) ## 000001EF -/* 1ABDC 8084CDEC 95F90004 */ lhu $t9, 0x0004($t7) ## 808549A0 -/* 1ABE0 8084CDF0 A61901F0 */ sh $t9, 0x01F0($s0) ## 000001F0 -/* 1ABE4 8084CDF4 8FA8004C */ lw $t0, 0x004C($sp) -/* 1ABE8 8084CDF8 8D030210 */ lw $v1, 0x0210($t0) ## 00000210 -/* 1ABEC 8084CDFC 10430039 */ beq $v0, $v1, .L8084CEE4 -/* 1ABF0 8084CE00 28610002 */ slti $at, $v1, 0x0002 -/* 1ABF4 8084CE04 10200003 */ beq $at, $zero, .L8084CE14 -/* 1ABF8 8084CE08 28410002 */ slti $at, $v0, 0x0002 -/* 1ABFC 8084CE0C 54200036 */ bnel $at, $zero, .L8084CEE8 -/* 1AC00 8084CE10 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L8084CE14: -/* 1AC04 8084CE14 00031400 */ sll $v0, $v1, 16 -/* 1AC08 8084CE18 00021403 */ sra $v0, $v0, 16 -/* 1AC0C 8084CE1C 28410002 */ slti $at, $v0, 0x0002 -/* 1AC10 8084CE20 1020001D */ beq $at, $zero, .L8084CE98 -/* 1AC14 8084CE24 A6020850 */ sh $v0, 0x0850($s0) ## 00000850 -/* 1AC18 8084CE28 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 1AC1C 8084CE2C 00000000 */ nop -/* 1AC20 8084CE30 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 1AC24 8084CE34 A6090850 */ sh $t1, 0x0850($s0) ## 00000850 -/* 1AC28 8084CE38 3C018085 */ lui $at, %hi(D_80855530) ## $at = 80850000 -/* 1AC2C 8084CE3C C4305530 */ lwc1 $f16, %lo(D_80855530)($at) -/* 1AC30 8084CE40 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1AC34 8084CE44 3C018085 */ lui $at, %hi(D_80855534) ## $at = 80850000 -/* 1AC38 8084CE48 4610003C */ c.lt.s $f0, $f16 -/* 1AC3C 8084CE4C 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AC40 8084CE50 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1AC44 8084CE54 3C068085 */ lui $a2, %hi(D_8085498C) ## $a2 = 80850000 -/* 1AC48 8084CE58 45000003 */ bc1f .L8084CE68 -/* 1AC4C 8084CE5C 00000000 */ nop -/* 1AC50 8084CE60 10000007 */ beq $zero, $zero, .L8084CE80 -/* 1AC54 8084CE64 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L8084CE68: -/* 1AC58 8084CE68 C4325534 */ lwc1 $f18, %lo(D_80855534)($at) -/* 1AC5C 8084CE6C 4612003C */ c.lt.s $f0, $f18 -/* 1AC60 8084CE70 00000000 */ nop -/* 1AC64 8084CE74 45020003 */ bc1fl .L8084CE84 -/* 1AC68 8084CE78 00025080 */ sll $t2, $v0, 2 -/* 1AC6C 8084CE7C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8084CE80: -/* 1AC70 8084CE80 00025080 */ sll $t2, $v0, 2 -.L8084CE84: -/* 1AC74 8084CE84 00CA3021 */ addu $a2, $a2, $t2 -/* 1AC78 8084CE88 0C20C899 */ jal func_80832264 -/* 1AC7C 8084CE8C 8CC6498C */ lw $a2, %lo(D_8085498C)($a2) -/* 1AC80 8084CE90 10000014 */ beq $zero, $zero, .L8084CEE4 -/* 1AC84 8084CE94 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -.L8084CE98: -/* 1AC88 8084CE98 860B0850 */ lh $t3, 0x0850($s0) ## 00000850 -/* 1AC8C 8084CE9C 3C0D8085 */ lui $t5, %hi(D_8085493C) ## $t5 = 80850000 -/* 1AC90 8084CEA0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1AC94 8084CEA4 000B6080 */ sll $t4, $t3, 2 -/* 1AC98 8084CEA8 01AC6821 */ addu $t5, $t5, $t4 -/* 1AC9C 8084CEAC 8DAD493C */ lw $t5, %lo(D_8085493C)($t5) -/* 1ACA0 8084CEB0 3C064100 */ lui $a2, 0x4100 ## $a2 = 41000000 -/* 1ACA4 8084CEB4 AE0D01BC */ sw $t5, 0x01BC($s0) ## 000001BC -/* 1ACA8 8084CEB8 0C028FBA */ jal SkelAnime_SetTransition -/* 1ACAC 8084CEBC 8FA40054 */ lw $a0, 0x0054($sp) -/* 1ACB0 8084CEC0 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 1ACB4 8084CEC4 8FA40054 */ lw $a0, 0x0054($sp) -/* 1ACB8 8084CEC8 28410004 */ slti $at, $v0, 0x0004 -/* 1ACBC 8084CECC 50200006 */ beql $at, $zero, .L8084CEE8 -/* 1ACC0 8084CED0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 1ACC4 8084CED4 0C20D191 */ jal func_80834644 -/* 1ACC8 8084CED8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1ACCC 8084CEDC A200084F */ sb $zero, 0x084F($s0) ## 0000084F -/* 1ACD0 8084CEE0 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -.L8084CEE4: -/* 1ACD4 8084CEE4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L8084CEE8: -/* 1ACD8 8084CEE8 14410020 */ bne $v0, $at, .L8084CF6C -/* 1ACDC 8084CEEC 8FA8004C */ lw $t0, 0x004C($sp) -/* 1ACE0 8084CEF0 3C0E8085 */ lui $t6, %hi(D_808535E0) ## $t6 = 80850000 -/* 1ACE4 8084CEF4 8DCE35E0 */ lw $t6, %lo(D_808535E0)($t6) -/* 1ACE8 8084CEF8 15C00005 */ bne $t6, $zero, .L8084CF10 -/* 1ACEC 8084CEFC 00000000 */ nop -/* 1ACF0 8084CF00 0C20C893 */ jal func_8083224C -/* 1ACF4 8084CF04 8FA40054 */ lw $a0, 0x0054($sp) -/* 1ACF8 8084CF08 10400008 */ beq $v0, $zero, .L8084CF2C -/* 1ACFC 8084CF0C 8FA40054 */ lw $a0, 0x0054($sp) -.L8084CF10: -/* 1AD00 8084CF10 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1AD04 8084CF14 24C633C8 */ addiu $a2, $a2, 0x33C8 ## $a2 = 040033C8 -/* 1AD08 8084CF18 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AD0C 8084CF1C 0C20C899 */ jal func_80832264 -/* 1AD10 8084CF20 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1AD14 8084CF24 10000017 */ beq $zero, $zero, .L8084CF84 -/* 1AD18 8084CF28 8FA40054 */ lw $a0, 0x0054($sp) -.L8084CF2C: -/* 1AD1C 8084CF2C 0C028EF0 */ jal func_800A3BC0 -/* 1AD20 8084CF30 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1AD24 8084CF34 10400003 */ beq $v0, $zero, .L8084CF44 -/* 1AD28 8084CF38 240F0063 */ addiu $t7, $zero, 0x0063 ## $t7 = 00000063 -/* 1AD2C 8084CF3C 10000010 */ beq $zero, $zero, .L8084CF80 -/* 1AD30 8084CF40 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 -.L8084CF44: -/* 1AD34 8084CF44 8E1901BC */ lw $t9, 0x01BC($s0) ## 000001BC -/* 1AD38 8084CF48 3C180400 */ lui $t8, 0x0400 ## $t8 = 04000000 -/* 1AD3C 8084CF4C 271833B8 */ addiu $t8, $t8, 0x33B8 ## $t8 = 040033B8 -/* 1AD40 8084CF50 1719000B */ bne $t8, $t9, .L8084CF80 -/* 1AD44 8084CF54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AD48 8084CF58 3C058085 */ lui $a1, %hi(D_808549A4) ## $a1 = 80850000 -/* 1AD4C 8084CF5C 0C20CA49 */ jal func_80832924 -/* 1AD50 8084CF60 24A549A4 */ addiu $a1, $a1, %lo(D_808549A4) ## $a1 = 808549A4 -/* 1AD54 8084CF64 10000007 */ beq $zero, $zero, .L8084CF84 -/* 1AD58 8084CF68 8FA40054 */ lw $a0, 0x0054($sp) -.L8084CF6C: -/* 1AD5C 8084CF6C C5040214 */ lwc1 $f4, 0x0214($t0) ## 00000214 -/* 1AD60 8084CF70 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1AD64 8084CF74 E60401CC */ swc1 $f4, 0x01CC($s0) ## 000001CC -/* 1AD68 8084CF78 0C028F27 */ jal func_800A3C9C -/* 1AD6C 8084CF7C 8FA40054 */ lw $a0, 0x0054($sp) -.L8084CF80: -/* 1AD70 8084CF80 8FA40054 */ lw $a0, 0x0054($sp) -.L8084CF84: -/* 1AD74 8084CF84 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 -/* 1AD78 8084CF88 8E0601D8 */ lw $a2, 0x01D8($s0) ## 000001D8 -/* 1AD7C 8084CF8C 0C028D1E */ jal SkelAnime_LoadAnimationType1 -/* 1AD80 8084CF90 8E0701D4 */ lw $a3, 0x01D4($s0) ## 000001D4 -/* 1AD84 8084CF94 8FA90054 */ lw $t1, 0x0054($sp) -/* 1AD88 8084CF98 912A1D6C */ lbu $t2, 0x1D6C($t1) ## 00001D6C -/* 1AD8C 8084CF9C 55400005 */ bnel $t2, $zero, .L8084CFB4 -/* 1AD90 8084CFA0 920C0444 */ lbu $t4, 0x0444($s0) ## 00000444 -/* 1AD94 8084CFA4 920B0444 */ lbu $t3, 0x0444($s0) ## 00000444 -/* 1AD98 8084CFA8 5160000A */ beql $t3, $zero, .L8084CFD4 -/* 1AD9C 8084CFAC 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 1ADA0 8084CFB0 920C0444 */ lbu $t4, 0x0444($s0) ## 00000444 -.L8084CFB4: -/* 1ADA4 8084CFB4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 1ADA8 8084CFB8 55810003 */ bnel $t4, $at, .L8084CFC8 -/* 1ADAC 8084CFBC A20006AD */ sb $zero, 0x06AD($s0) ## 000006AD -/* 1ADB0 8084CFC0 A2000444 */ sb $zero, 0x0444($s0) ## 00000444 -/* 1ADB4 8084CFC4 A20006AD */ sb $zero, 0x06AD($s0) ## 000006AD -.L8084CFC8: -/* 1ADB8 8084CFC8 10000011 */ beq $zero, $zero, .L8084D010 -/* 1ADBC 8084CFCC A200084F */ sb $zero, 0x084F($s0) ## 0000084F -/* 1ADC0 8084CFD0 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -.L8084CFD4: -/* 1ADC4 8084CFD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1ADC8 8084CFD8 28410002 */ slti $at, $v0, 0x0002 -/* 1ADCC 8084CFDC 14200003 */ bne $at, $zero, .L8084CFEC -/* 1ADD0 8084CFE0 28410004 */ slti $at, $v0, 0x0004 -/* 1ADD4 8084CFE4 5420000B */ bnel $at, $zero, .L8084D014 -/* 1ADD8 8084CFE8 8FA7004C */ lw $a3, 0x004C($sp) -.L8084CFEC: -/* 1ADDC 8084CFEC 0C20D99C */ jal func_80836670 -/* 1ADE0 8084CFF0 8FA50054 */ lw $a1, 0x0054($sp) -/* 1ADE4 8084CFF4 3C018085 */ lui $at, %hi(D_808535E0) ## $at = 80850000 -/* 1ADE8 8084CFF8 AC2235E0 */ sw $v0, %lo(D_808535E0)($at) -/* 1ADEC 8084CFFC 3C0D8085 */ lui $t5, %hi(D_808535E0) ## $t5 = 80850000 -/* 1ADF0 8084D000 8DAD35E0 */ lw $t5, %lo(D_808535E0)($t5) -/* 1ADF4 8084D004 51A00003 */ beql $t5, $zero, .L8084D014 -/* 1ADF8 8084D008 8FA7004C */ lw $a3, 0x004C($sp) -/* 1ADFC 8084D00C A200084F */ sb $zero, 0x084F($s0) ## 0000084F -.L8084D010: -/* 1AE00 8084D010 8FA7004C */ lw $a3, 0x004C($sp) -.L8084D014: -/* 1AE04 8084D014 3C0141D8 */ lui $at, 0x41D8 ## $at = 41D80000 -/* 1AE08 8084D018 920E0444 */ lbu $t6, 0x0444($s0) ## 00000444 -/* 1AE0C 8084D01C C4E60024 */ lwc1 $f6, 0x0024($a3) ## 00000024 -/* 1AE10 8084D020 C4E80258 */ lwc1 $f8, 0x0258($a3) ## 00000258 -/* 1AE14 8084D024 46083280 */ add.s $f10, $f6, $f8 -/* 1AE18 8084D028 44813000 */ mtc1 $at, $f6 ## $f6 = 27.00 -/* 1AE1C 8084D02C E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 1AE20 8084D030 C4F2025C */ lwc1 $f18, 0x025C($a3) ## 0000025C -/* 1AE24 8084D034 C4F00028 */ lwc1 $f16, 0x0028($a3) ## 00000028 -/* 1AE28 8084D038 46128100 */ add.s $f4, $f16, $f18 -/* 1AE2C 8084D03C 46062201 */ sub.s $f8, $f4, $f6 -/* 1AE30 8084D040 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 1AE34 8084D044 C4F00260 */ lwc1 $f16, 0x0260($a3) ## 00000260 -/* 1AE38 8084D048 C4EA002C */ lwc1 $f10, 0x002C($a3) ## 0000002C -/* 1AE3C 8084D04C 46105480 */ add.s $f18, $f10, $f16 -/* 1AE40 8084D050 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 1AE44 8084D054 84E200B6 */ lh $v0, 0x00B6($a3) ## 000000B6 -/* 1AE48 8084D058 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 1AE4C 8084D05C 15C00014 */ bne $t6, $zero, .L8084D0B0 -/* 1AE50 8084D060 A602083C */ sh $v0, 0x083C($s0) ## 0000083C -/* 1AE54 8084D064 0C20C893 */ jal func_8083224C -/* 1AE58 8084D068 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AE5C 8084D06C 144000D8 */ bne $v0, $zero, .L8084D3D0 -/* 1AE60 8084D070 8FAF004C */ lw $t7, 0x004C($sp) -/* 1AE64 8084D074 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 1AE68 8084D078 C5E60068 */ lwc1 $f6, 0x0068($t7) ## 00000068 -/* 1AE6C 8084D07C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AE70 8084D080 46062032 */ c.eq.s $f4, $f6 -/* 1AE74 8084D084 00000000 */ nop -/* 1AE78 8084D088 45020005 */ bc1fl .L8084D0A0 -/* 1AE7C 8084D08C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AE80 8084D090 0C20ED91 */ jal func_8083B644 -/* 1AE84 8084D094 8FA50054 */ lw $a1, 0x0054($sp) -/* 1AE88 8084D098 144000CD */ bne $v0, $zero, .L8084D3D0 -/* 1AE8C 8084D09C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084D0A0: -/* 1AE90 8084D0A0 0C20F077 */ jal func_8083C1DC -/* 1AE94 8084D0A4 8FA50054 */ lw $a1, 0x0054($sp) -/* 1AE98 8084D0A8 144000C9 */ bne $v0, $zero, .L8084D3D0 -/* 1AE9C 8084D0AC 8FA7004C */ lw $a3, 0x004C($sp) -.L8084D0B0: -/* 1AEA0 8084D0B0 3C188085 */ lui $t8, %hi(D_808535E0) ## $t8 = 80850000 -/* 1AEA4 8084D0B4 8F1835E0 */ lw $t8, %lo(D_808535E0)($t8) -/* 1AEA8 8084D0B8 5700005C */ bnel $t8, $zero, .L8084D22C -/* 1AEAC 8084D0BC 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 1AEB0 8084D0C0 8219084F */ lb $t9, 0x084F($s0) ## 0000084F -/* 1AEB4 8084D0C4 260606C8 */ addiu $a2, $s0, 0x06C8 ## $a2 = 000006C8 -/* 1AEB8 8084D0C8 00C02825 */ or $a1, $a2, $zero ## $a1 = 000006C8 -/* 1AEBC 8084D0CC 13200034 */ beq $t9, $zero, .L8084D1A0 -/* 1AEC0 8084D0D0 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AEC4 8084D0D4 0C028EF0 */ jal func_800A3BC0 -/* 1AEC8 8084D0D8 AFA60030 */ sw $a2, 0x0030($sp) -/* 1AECC 8084D0DC 10400007 */ beq $v0, $zero, .L8084D0FC -/* 1AED0 8084D0E0 8FA60030 */ lw $a2, 0x0030($sp) -/* 1AED4 8084D0E4 8FA8004C */ lw $t0, 0x004C($sp) -/* 1AED8 8084D0E8 2401FEFF */ addiu $at, $zero, 0xFEFF ## $at = FFFFFEFF -/* 1AEDC 8084D0EC 8D0901F0 */ lw $t1, 0x01F0($t0) ## 000001F0 -/* 1AEE0 8084D0F0 01215024 */ and $t2, $t1, $at -/* 1AEE4 8084D0F4 AD0A01F0 */ sw $t2, 0x01F0($t0) ## 000001F0 -/* 1AEE8 8084D0F8 A200084F */ sb $zero, 0x084F($s0) ## 0000084F -.L8084D0FC: -/* 1AEEC 8084D0FC 8E0C06D0 */ lw $t4, 0x06D0($s0) ## 000006D0 -/* 1AEF0 8084D100 3C0B0400 */ lui $t3, 0x0400 ## $t3 = 04000000 -/* 1AEF4 8084D104 256B33B0 */ addiu $t3, $t3, 0x33B0 ## $t3 = 040033B0 -/* 1AEF8 8084D108 156C0012 */ bne $t3, $t4, .L8084D154 -/* 1AEFC 8084D10C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1AF00 8084D110 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1AF04 8084D114 0C02914C */ jal func_800A4530 -/* 1AF08 8084D118 3C0541B8 */ lui $a1, 0x41B8 ## $a1 = 41B80000 -/* 1AF0C 8084D11C 10400006 */ beq $v0, $zero, .L8084D138 -/* 1AF10 8084D120 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AF14 8084D124 0C00BDF7 */ jal func_8002F7DC -/* 1AF18 8084D128 2405181E */ addiu $a1, $zero, 0x181E ## $a1 = 0000181E -/* 1AF1C 8084D12C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AF20 8084D130 0C20C9A6 */ jal func_80832698 -/* 1AF24 8084D134 24056802 */ addiu $a1, $zero, 0x6802 ## $a1 = 00006802 -.L8084D138: -/* 1AF28 8084D138 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AF2C 8084D13C 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 -/* 1AF30 8084D140 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 -/* 1AF34 8084D144 0C028D1E */ jal SkelAnime_LoadAnimationType1 -/* 1AF38 8084D148 8E0706E8 */ lw $a3, 0x06E8($s0) ## 000006E8 -/* 1AF3C 8084D14C 10000037 */ beq $zero, $zero, .L8084D22C -/* 1AF40 8084D150 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -.L8084D154: -/* 1AF44 8084D154 0C02914C */ jal func_800A4530 -/* 1AF48 8084D158 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 1AF4C 8084D15C 10400006 */ beq $v0, $zero, .L8084D178 -/* 1AF50 8084D160 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AF54 8084D164 0C00BDF7 */ jal func_8002F7DC -/* 1AF58 8084D168 2405181E */ addiu $a1, $zero, 0x181E ## $a1 = 0000181E -/* 1AF5C 8084D16C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AF60 8084D170 0C20C9A6 */ jal func_80832698 -/* 1AF64 8084D174 24056802 */ addiu $a1, $zero, 0x6802 ## $a1 = 00006802 -.L8084D178: -/* 1AF68 8084D178 3C0D8085 */ lui $t5, %hi(D_80853410) ## $t5 = 80850000 -/* 1AF6C 8084D17C 25AD3410 */ addiu $t5, $t5, %lo(D_80853410) ## $t5 = 80853410 -/* 1AF70 8084D180 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 -/* 1AF74 8084D184 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 -/* 1AF78 8084D188 8E0706E8 */ lw $a3, 0x06E8($s0) ## 000006E8 -/* 1AF7C 8084D18C AFAD0010 */ sw $t5, 0x0010($sp) -/* 1AF80 8084D190 0C028D52 */ jal SkelAnime_LoadAnimationType3 -/* 1AF84 8084D194 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AF88 8084D198 10000024 */ beq $zero, $zero, .L8084D22C -/* 1AF8C 8084D19C 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -.L8084D1A0: -/* 1AF90 8084D1A0 8CE301F0 */ lw $v1, 0x01F0($a3) ## 000001F0 -/* 1AF94 8084D1A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 1AF98 8084D1A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1AF9C 8084D1AC 306E0200 */ andi $t6, $v1, 0x0200 ## $t6 = 00000000 -/* 1AFA0 8084D1B0 11C00003 */ beq $t6, $zero, .L8084D1C0 -/* 1AFA4 8084D1B4 306F0100 */ andi $t7, $v1, 0x0100 ## $t7 = 00000000 -/* 1AFA8 8084D1B8 10000001 */ beq $zero, $zero, .L8084D1C0 -/* 1AFAC 8084D1BC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8084D1C0: -/* 1AFB0 8084D1C0 10400004 */ beq $v0, $zero, .L8084D1D4 -/* 1AFB4 8084D1C4 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AFB8 8084D1C8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1AFBC 8084D1CC 10000010 */ beq $zero, $zero, .L8084D210 -/* 1AFC0 8084D1D0 24C633B0 */ addiu $a2, $a2, 0x33B0 ## $a2 = 040033B0 -.L8084D1D4: -/* 1AFC4 8084D1D4 11E00003 */ beq $t7, $zero, .L8084D1E4 -/* 1AFC8 8084D1D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1AFCC 8084D1DC 10000001 */ beq $zero, $zero, .L8084D1E4 -/* 1AFD0 8084D1E0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8084D1E4: -/* 1AFD4 8084D1E4 1040000A */ beq $v0, $zero, .L8084D210 -/* 1AFD8 8084D1E8 00000000 */ nop -/* 1AFDC 8084D1EC 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 1AFE0 8084D1F0 28410002 */ slti $at, $v0, 0x0002 -/* 1AFE4 8084D1F4 14200006 */ bne $at, $zero, .L8084D210 -/* 1AFE8 8084D1F8 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 1AFEC 8084D1FC 10410004 */ beq $v0, $at, .L8084D210 -/* 1AFF0 8084D200 0002C080 */ sll $t8, $v0, 2 -/* 1AFF4 8084D204 3C068085 */ lui $a2, %hi(D_80854960) ## $a2 = 80850000 -/* 1AFF8 8084D208 00D83021 */ addu $a2, $a2, $t8 -/* 1AFFC 8084D20C 8CC64960 */ lw $a2, %lo(D_80854960)($a2) -.L8084D210: -/* 1B000 8084D210 50C00006 */ beql $a2, $zero, .L8084D22C -/* 1B004 8084D214 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 1B008 8084D218 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop -/* 1B00C 8084D21C 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 1B010 8084D220 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 1B014 8084D224 A219084F */ sb $t9, 0x084F($s0) ## 0000084F -/* 1B018 8084D228 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -.L8084D22C: -/* 1B01C 8084D22C 8FA40054 */ lw $a0, 0x0054($sp) -/* 1B020 8084D230 000952C0 */ sll $t2, $t1, 11 -/* 1B024 8084D234 05430023 */ bgezl $t2, .L8084D2C4 -/* 1B028 8084D238 92080444 */ lbu $t0, 0x0444($s0) ## 00000444 -/* 1B02C 8084D23C 0C20EB53 */ jal func_8083AD4C -/* 1B030 8084D240 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B034 8084D244 1040000A */ beq $v0, $zero, .L8084D270 -/* 1B038 8084D248 3C088086 */ lui $t0, %hi(D_80858AB4) ## $t0 = 80860000 -/* 1B03C 8084D24C 8D088AB4 */ lw $t0, %lo(D_80858AB4)($t0) -/* 1B040 8084D250 950B000C */ lhu $t3, 0x000C($t0) ## 8086000C -/* 1B044 8084D254 316C8000 */ andi $t4, $t3, 0x8000 ## $t4 = 00000000 -/* 1B048 8084D258 55800006 */ bnel $t4, $zero, .L8084D274 -/* 1B04C 8084D25C 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C -/* 1B050 8084D260 0C20CEF3 */ jal func_80833BCC -/* 1B054 8084D264 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B058 8084D268 10400008 */ beq $v0, $zero, .L8084D28C -/* 1B05C 8084D26C 8FA40054 */ lw $a0, 0x0054($sp) -.L8084D270: -/* 1B060 8084D270 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C -.L8084D274: -/* 1B064 8084D274 3C01FFEF */ lui $at, 0xFFEF ## $at = FFEF0000 -/* 1B068 8084D278 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFEFFFFF -/* 1B06C 8084D27C 01A17024 */ and $t6, $t5, $at -/* 1B070 8084D280 A20006AD */ sb $zero, 0x06AD($s0) ## 000006AD -/* 1B074 8084D284 10000052 */ beq $zero, $zero, .L8084D3D0 -/* 1B078 8084D288 AE0E067C */ sw $t6, 0x067C($s0) ## 0000067C -.L8084D28C: -/* 1B07C 8084D28C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B080 8084D290 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 1B084 8084D294 0C212AF6 */ jal func_8084ABD8 -/* 1B088 8084D298 2407EC78 */ addiu $a3, $zero, 0xEC78 ## $a3 = FFFFEC78 -/* 1B08C 8084D29C 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 1B090 8084D2A0 240AEC78 */ addiu $t2, $zero, 0xEC78 ## $t2 = FFFFEC78 -/* 1B094 8084D2A4 A60A06B0 */ sh $t2, 0x06B0($s0) ## 000006B0 -/* 1B098 8084D2A8 004FC023 */ subu $t8, $v0, $t7 -/* 1B09C 8084D2AC A61806BE */ sh $t8, 0x06BE($s0) ## 000006BE -/* 1B0A0 8084D2B0 861906BE */ lh $t9, 0x06BE($s0) ## 000006BE -/* 1B0A4 8084D2B4 27291388 */ addiu $t1, $t9, 0x1388 ## $t1 = 00001388 -/* 1B0A8 8084D2B8 10000045 */ beq $zero, $zero, .L8084D3D0 -/* 1B0AC 8084D2BC A60906BE */ sh $t1, 0x06BE($s0) ## 000006BE -/* 1B0B0 8084D2C0 92080444 */ lbu $t0, 0x0444($s0) ## 00000444 -.L8084D2C4: -/* 1B0B4 8084D2C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B0B8 8084D2C8 5500000A */ bnel $t0, $zero, .L8084D2F4 -/* 1B0BC 8084D2CC 8E0B0664 */ lw $t3, 0x0664($s0) ## 00000664 -/* 1B0C0 8084D2D0 0C21326F */ jal func_8084C9BC -/* 1B0C4 8084D2D4 8FA50054 */ lw $a1, 0x0054($sp) -/* 1B0C8 8084D2D8 1440003D */ bne $v0, $zero, .L8084D3D0 -/* 1B0CC 8084D2DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B0D0 8084D2E0 0C20EC10 */ jal func_8083B040 -/* 1B0D4 8084D2E4 8FA50054 */ lw $a1, 0x0054($sp) -/* 1B0D8 8084D2E8 5440003A */ bnel $v0, $zero, .L8084D3D4 -/* 1B0DC 8084D2EC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 1B0E0 8084D2F0 8E0B0664 */ lw $t3, 0x0664($s0) ## 00000664 -.L8084D2F4: -/* 1B0E4 8084D2F4 11600026 */ beq $t3, $zero, .L8084D390 -/* 1B0E8 8084D2F8 00000000 */ nop -/* 1B0EC 8084D2FC 0C00B75E */ jal func_8002DD78 -/* 1B0F0 8084D300 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B0F4 8084D304 1040001E */ beq $v0, $zero, .L8084D380 -/* 1B0F8 8084D308 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B0FC 8084D30C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B100 8084D310 0C20F6E6 */ jal func_8083DB98 -/* 1B104 8084D314 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 1B108 8084D318 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 1B10C 8084D31C 240EB556 */ addiu $t6, $zero, 0xB556 ## $t6 = FFFFB556 -/* 1B110 8084D320 004C6823 */ subu $t5, $v0, $t4 -/* 1B114 8084D324 A60D06BE */ sh $t5, 0x06BE($s0) ## 000006BE -/* 1B118 8084D328 860306BE */ lh $v1, 0x06BE($s0) ## 000006BE -/* 1B11C 8084D32C 2861B556 */ slti $at, $v1, 0xB556 -/* 1B120 8084D330 50200004 */ beql $at, $zero, .L8084D344 -/* 1B124 8084D334 28614AAB */ slti $at, $v1, 0x4AAB -/* 1B128 8084D338 10000007 */ beq $zero, $zero, .L8084D358 -/* 1B12C 8084D33C A60E06BE */ sh $t6, 0x06BE($s0) ## 000006BE -/* 1B130 8084D340 28614AAB */ slti $at, $v1, 0x4AAB -.L8084D344: -/* 1B134 8084D344 14200003 */ bne $at, $zero, .L8084D354 -/* 1B138 8084D348 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 1B13C 8084D34C 10000001 */ beq $zero, $zero, .L8084D354 -/* 1B140 8084D350 24024AAA */ addiu $v0, $zero, 0x4AAA ## $v0 = 00004AAA -.L8084D354: -/* 1B144 8084D354 A60206BE */ sh $v0, 0x06BE($s0) ## 000006BE -.L8084D358: -/* 1B148 8084D358 860306BE */ lh $v1, 0x06BE($s0) ## 000006BE -/* 1B14C 8084D35C 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 1B150 8084D360 960906AE */ lhu $t1, 0x06AE($s0) ## 000006AE -/* 1B154 8084D364 24791388 */ addiu $t9, $v1, 0x1388 ## $t9 = 00001388 -/* 1B158 8084D368 01E3C021 */ addu $t8, $t7, $v1 -/* 1B15C 8084D36C 352A0080 */ ori $t2, $t1, 0x0080 ## $t2 = 00000080 -/* 1B160 8084D370 A6180046 */ sh $t8, 0x0046($s0) ## 00000046 -/* 1B164 8084D374 A61906BE */ sh $t9, 0x06BE($s0) ## 000006BE -/* 1B168 8084D378 10000015 */ beq $zero, $zero, .L8084D3D0 -/* 1B16C 8084D37C A60A06AE */ sh $t2, 0x06AE($s0) ## 000006AE -.L8084D380: -/* 1B170 8084D380 0C20F6E6 */ jal func_8083DB98 -/* 1B174 8084D384 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1B178 8084D388 10000012 */ beq $zero, $zero, .L8084D3D4 -/* 1B17C 8084D38C 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084D390: -/* 1B180 8084D390 0C00B75E */ jal func_8002DD78 -/* 1B184 8084D394 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B188 8084D398 1040000D */ beq $v0, $zero, .L8084D3D0 -/* 1B18C 8084D39C 8FA40054 */ lw $a0, 0x0054($sp) -/* 1B190 8084D3A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B194 8084D3A4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 1B198 8084D3A8 0C212AF6 */ jal func_8084ABD8 -/* 1B19C 8084D3AC 2407EC78 */ addiu $a3, $zero, 0xEC78 ## $a3 = FFFFEC78 -/* 1B1A0 8084D3B0 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 1B1A4 8084D3B4 240EEC78 */ addiu $t6, $zero, 0xEC78 ## $t6 = FFFFEC78 -/* 1B1A8 8084D3B8 A60E06B0 */ sh $t6, 0x06B0($s0) ## 000006B0 -/* 1B1AC 8084D3BC 00485823 */ subu $t3, $v0, $t0 -/* 1B1B0 8084D3C0 A60B06BE */ sh $t3, 0x06BE($s0) ## 000006BE -/* 1B1B4 8084D3C4 860C06BE */ lh $t4, 0x06BE($s0) ## 000006BE -/* 1B1B8 8084D3C8 258D1388 */ addiu $t5, $t4, 0x1388 ## $t5 = 00001388 -/* 1B1BC 8084D3CC A60D06BE */ sh $t5, 0x06BE($s0) ## 000006BE -.L8084D3D0: -/* 1B1C0 8084D3D0 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084D3D4: -/* 1B1C4 8084D3D4 8FB00020 */ lw $s0, 0x0020($sp) -/* 1B1C8 8084D3D8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 1B1CC 8084D3DC 03E00008 */ jr $ra -/* 1B1D0 8084D3E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s deleted file mode 100644 index 2ec9a8e1eb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_8084D3E4 -/* 1B1D4 8084D3E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1B1D8 8084D3E8 AFBF001C */ sw $ra, 0x001C($sp) -/* 1B1DC 8084D3EC AFB00018 */ sw $s0, 0x0018($sp) -/* 1B1E0 8084D3F0 AFA5002C */ sw $a1, 0x002C($sp) -/* 1B1E4 8084D3F4 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1B1E8 8084D3F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1B1EC 8084D3FC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 1B1F0 8084D400 35CF0040 */ ori $t7, $t6, 0x0040 ## $t7 = 00000040 -/* 1B1F4 8084D404 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1B1F8 8084D408 0C2132FD */ jal func_8084CBF4 -/* 1B1FC 8084D40C 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 1B200 8084D410 8FA4002C */ lw $a0, 0x002C($sp) -/* 1B204 8084D414 0C028EF0 */ jal func_800A3BC0 -/* 1B208 8084D418 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1B20C 8084D41C 1040002C */ beq $v0, $zero, .L8084D4D0 -/* 1B210 8084D420 8FA6002C */ lw $a2, 0x002C($sp) -/* 1B214 8084D424 8E030440 */ lw $v1, 0x0440($s0) ## 00000440 -/* 1B218 8084D428 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B21C 8084D42C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 1B220 8084D430 0C20F03A */ jal func_8083C0E8 -/* 1B224 8084D434 AFA30024 */ sw $v1, 0x0024($sp) -/* 1B228 8084D438 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 1B22C 8084D43C 3C01FF7F */ lui $at, 0xFF7F ## $at = FF7F0000 -/* 1B230 8084D440 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FF7FFFFF -/* 1B234 8084D444 0301C824 */ and $t9, $t8, $at -/* 1B238 8084D448 AE19067C */ sw $t9, 0x067C($s0) ## 0000067C -/* 1B23C 8084D44C AE000118 */ sw $zero, 0x0118($s0) ## 00000118 -/* 1B240 8084D450 3C088016 */ lui $t0, %hi(gGameInfo) -/* 1B244 8084D454 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) -/* 1B248 8084D458 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 1B24C 8084D45C 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 1B250 8084D460 A5000E60 */ sh $zero, 0x0E60($t0) ## 80160E60 -/* 1B254 8084D464 14400006 */ bne $v0, $zero, .L8084D480 -/* 1B258 8084D468 8FA30024 */ lw $v1, 0x0024($sp) -/* 1B25C 8084D46C 3C098016 */ lui $t1, %hi(gGameInfo) -/* 1B260 8084D470 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) -/* 1B264 8084D474 852A0556 */ lh $t2, 0x0556($t1) ## 80160556 -/* 1B268 8084D478 51400029 */ beql $t2, $zero, .L8084D520 -/* 1B26C 8084D47C 8FBF001C */ lw $ra, 0x001C($sp) -.L8084D480: -/* 1B270 8084D480 C4640024 */ lwc1 $f4, 0x0024($v1) ## 00000024 -/* 1B274 8084D484 3C028016 */ lui $v0, %hi(gSaveContext) -/* 1B278 8084D488 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 1B27C 8084D48C 4600218D */ trunc.w.s $f6, $f4 -/* 1B280 8084D490 440C3000 */ mfc1 $t4, $f6 -/* 1B284 8084D494 00000000 */ nop -/* 1B288 8084D498 A44C134A */ sh $t4, 0x134A($v0) ## 8015F9AA -/* 1B28C 8084D49C C4680028 */ lwc1 $f8, 0x0028($v1) ## 00000028 -/* 1B290 8084D4A0 4600428D */ trunc.w.s $f10, $f8 -/* 1B294 8084D4A4 440E5000 */ mfc1 $t6, $f10 -/* 1B298 8084D4A8 00000000 */ nop -/* 1B29C 8084D4AC A44E134C */ sh $t6, 0x134C($v0) ## 8015F9AC -/* 1B2A0 8084D4B0 C470002C */ lwc1 $f16, 0x002C($v1) ## 0000002C -/* 1B2A4 8084D4B4 4600848D */ trunc.w.s $f18, $f16 -/* 1B2A8 8084D4B8 44189000 */ mfc1 $t8, $f18 -/* 1B2AC 8084D4BC 00000000 */ nop -/* 1B2B0 8084D4C0 A458134E */ sh $t8, 0x134E($v0) ## 8015F9AE -/* 1B2B4 8084D4C4 847900B6 */ lh $t9, 0x00B6($v1) ## 000000B6 -/* 1B2B8 8084D4C8 10000014 */ beq $zero, $zero, .L8084D51C -/* 1B2BC 8084D4CC A4591350 */ sh $t9, 0x1350($v0) ## 8015F9B0 -.L8084D4D0: -/* 1B2C0 8084D4D0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1B2C4 8084D4D4 0C030129 */ jal Gameplay_GetCamera -/* 1B2C8 8084D4D8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1B2CC 8084D4DC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1B2D0 8084D4E0 0C0169DF */ jal func_8005A77C -/* 1B2D4 8084D4E4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 1B2D8 8084D4E8 8208043C */ lb $t0, 0x043C($s0) ## 0000043C -/* 1B2DC 8084D4EC 3C058085 */ lui $a1, %hi(D_808549C4) ## $a1 = 80850000 -/* 1B2E0 8084D4F0 24A549C4 */ addiu $a1, $a1, %lo(D_808549C4) ## $a1 = 808549C4 -/* 1B2E4 8084D4F4 05010006 */ bgez $t0, .L8084D510 -/* 1B2E8 8084D4F8 240A281D */ addiu $t2, $zero, 0x281D ## $t2 = 0000281D -/* 1B2EC 8084D4FC 3C058085 */ lui $a1, %hi(D_808549C4) ## $a1 = 80850000 -/* 1B2F0 8084D500 24A549C4 */ addiu $a1, $a1, %lo(D_808549C4) ## $a1 = 808549C4 -/* 1B2F4 8084D504 24092828 */ addiu $t1, $zero, 0x2828 ## $t1 = 00002828 -/* 1B2F8 8084D508 10000002 */ beq $zero, $zero, .L8084D514 -/* 1B2FC 8084D50C A4A90002 */ sh $t1, 0x0002($a1) ## 808549C6 -.L8084D510: -/* 1B300 8084D510 A4AA0002 */ sh $t2, 0x0002($a1) ## 808549C6 -.L8084D514: -/* 1B304 8084D514 0C20CA49 */ jal func_80832924 -/* 1B308 8084D518 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084D51C: -/* 1B30C 8084D51C 8FBF001C */ lw $ra, 0x001C($sp) -.L8084D520: -/* 1B310 8084D520 8FB00018 */ lw $s0, 0x0018($sp) -/* 1B314 8084D524 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1B318 8084D528 03E00008 */ jr $ra -/* 1B31C 8084D52C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D530.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D530.s deleted file mode 100644 index a4ef9f9399..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D530.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8084D530 -/* 1B320 8084D530 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 1B324 8084D534 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1B328 8084D538 AFA70024 */ sw $a3, 0x0024($sp) -/* 1B32C 8084D53C 00073C00 */ sll $a3, $a3, 16 -/* 1B330 8084D540 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1B334 8084D544 44066000 */ mfc1 $a2, $f12 -/* 1B338 8084D548 00073C03 */ sra $a3, $a3, 16 -/* 1B33C 8084D54C 0C212BBB */ jal func_8084AEEC -/* 1B340 8084D550 AFA40018 */ sw $a0, 0x0018($sp) -/* 1B344 8084D554 3C058085 */ lui $a1, %hi(D_808549D0) ## $a1 = 80850000 -/* 1B348 8084D558 24A549D0 */ addiu $a1, $a1, %lo(D_808549D0) ## $a1 = 808549D0 -/* 1B34C 8084D55C 0C20CA49 */ jal func_80832924 -/* 1B350 8084D560 8FA40018 */ lw $a0, 0x0018($sp) -/* 1B354 8084D564 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1B358 8084D568 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1B35C 8084D56C 03E00008 */ jr $ra -/* 1B360 8084D570 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D574.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D574.s deleted file mode 100644 index d91b06c77b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D574.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8084D574 -/* 1B364 8084D574 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1B368 8084D578 AFA60020 */ sw $a2, 0x0020($sp) -/* 1B36C 8084D57C AFBF0014 */ sw $ra, 0x0014($sp) -/* 1B370 8084D580 3C068085 */ lui $a2, %hi(func_8084D84C) ## $a2 = 80850000 -/* 1B374 8084D584 AFA40018 */ sw $a0, 0x0018($sp) -/* 1B378 8084D588 24C6D84C */ addiu $a2, $a2, %lo(func_8084D84C) ## $a2 = 8084D84C -/* 1B37C 8084D58C AFA5001C */ sw $a1, 0x001C($sp) -/* 1B380 8084D590 0C20D716 */ jal func_80835C58 -/* 1B384 8084D594 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 1B388 8084D598 8FA5001C */ lw $a1, 0x001C($sp) -/* 1B38C 8084D59C 87AE0022 */ lh $t6, 0x0022($sp) -/* 1B390 8084D5A0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1B394 8084D5A4 24C632F0 */ addiu $a2, $a2, 0x32F0 ## $a2 = 040032F0 -/* 1B398 8084D5A8 A4AE083C */ sh $t6, 0x083C($a1) ## 0000083C -/* 1B39C 8084D5AC 84AF083C */ lh $t7, 0x083C($a1) ## 0000083C -/* 1B3A0 8084D5B0 A4AF00B6 */ sh $t7, 0x00B6($a1) ## 000000B6 -/* 1B3A4 8084D5B4 0C20CB1B */ jal func_80832C6C -/* 1B3A8 8084D5B8 8FA40018 */ lw $a0, 0x0018($sp) -/* 1B3AC 8084D5BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1B3B0 8084D5C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1B3B4 8084D5C4 03E00008 */ jr $ra -/* 1B3B8 8084D5C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D5CC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D5CC.s deleted file mode 100644 index f00b3399e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D5CC.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8084D5CC -/* 1B3BC 8084D5CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1B3C0 8084D5D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1B3C4 8084D5D4 3C068085 */ lui $a2, %hi(func_8084DAB4) ## $a2 = 80850000 -/* 1B3C8 8084D5D8 AFA40018 */ sw $a0, 0x0018($sp) -/* 1B3CC 8084D5DC AFA5001C */ sw $a1, 0x001C($sp) -/* 1B3D0 8084D5E0 24C6DAB4 */ addiu $a2, $a2, %lo(func_8084DAB4) ## $a2 = 8084DAB4 -/* 1B3D4 8084D5E4 0C20D716 */ jal func_80835C58 -/* 1B3D8 8084D5E8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 1B3DC 8084D5EC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1B3E0 8084D5F0 24C632F0 */ addiu $a2, $a2, 0x32F0 ## $a2 = 040032F0 -/* 1B3E4 8084D5F4 8FA40018 */ lw $a0, 0x0018($sp) -/* 1B3E8 8084D5F8 0C20CB1B */ jal func_80832C6C -/* 1B3EC 8084D5FC 8FA5001C */ lw $a1, 0x001C($sp) -/* 1B3F0 8084D600 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1B3F4 8084D604 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1B3F8 8084D608 03E00008 */ jr $ra -/* 1B3FC 8084D60C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D610.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D610.s deleted file mode 100644 index 9499ed6462..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D610.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel func_8084D610 -/* 1B400 8084D610 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 1B404 8084D614 AFB00020 */ sw $s0, 0x0020($sp) -/* 1B408 8084D618 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1B40C 8084D61C AFBF0024 */ sw $ra, 0x0024($sp) -/* 1B410 8084D620 AFA5003C */ sw $a1, 0x003C($sp) -/* 1B414 8084D624 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1B418 8084D628 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1B41C 8084D62C 24C63328 */ addiu $a2, $a2, 0x3328 ## $a2 = 04003328 -/* 1B420 8084D630 0C20CB2C */ jal func_80832CB0 -/* 1B424 8084D634 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B428 8084D638 0C212C00 */ jal func_8084B000 -/* 1B42C 8084D63C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B430 8084D640 0C20C893 */ jal func_8083224C -/* 1B434 8084D644 8FA4003C */ lw $a0, 0x003C($sp) -/* 1B438 8084D648 14400059 */ bne $v0, $zero, .L8084D7B0 -/* 1B43C 8084D64C 8FA4003C */ lw $a0, 0x003C($sp) -/* 1B440 8084D650 3C068085 */ lui $a2, %hi(D_80854444) ## $a2 = 80850000 -/* 1B444 8084D654 24C64444 */ addiu $a2, $a2, %lo(D_80854444) ## $a2 = 80854444 -/* 1B448 8084D658 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B44C 8084D65C 0C20DCD2 */ jal func_80837348 -/* 1B450 8084D660 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 1B454 8084D664 14400052 */ bne $v0, $zero, .L8084D7B0 -/* 1B458 8084D668 8FA4003C */ lw $a0, 0x003C($sp) -/* 1B45C 8084D66C 3C068086 */ lui $a2, %hi(D_80858AB4) ## $a2 = 80860000 -/* 1B460 8084D670 8CC68AB4 */ lw $a2, %lo(D_80858AB4)($a2) -/* 1B464 8084D674 0C20F44B */ jal func_8083D12C -/* 1B468 8084D678 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B46C 8084D67C 5440004D */ bnel $v0, $zero, .L8084D7B4 -/* 1B470 8084D680 8FBF0024 */ lw $ra, 0x0024($sp) -/* 1B474 8084D684 920E06AD */ lbu $t6, 0x06AD($s0) ## 000006AD -/* 1B478 8084D688 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 1B47C 8084D68C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B480 8084D690 104E0002 */ beq $v0, $t6, .L8084D69C -/* 1B484 8084D694 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 1B488 8084D698 A20006AD */ sb $zero, 0x06AD($s0) ## 000006AD -.L8084D69C: -/* 1B48C 8084D69C 820F014F */ lb $t7, 0x014F($s0) ## 0000014F -/* 1B490 8084D6A0 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 1B494 8084D6A4 8FAB003C */ lw $t3, 0x003C($sp) -/* 1B498 8084D6A8 544F0016 */ bnel $v0, $t7, .L8084D704 -/* 1B49C 8084D6AC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 1B4A0 8084D6B0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 1B4A4 8084D6B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B4A8 8084D6B8 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 1B4AC 8084D6BC 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 1B4B0 8084D6C0 A7B80032 */ sh $t8, 0x0032($sp) -/* 1B4B4 8084D6C4 96190088 */ lhu $t9, 0x0088($s0) ## 00000088 -/* 1B4B8 8084D6C8 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 1B4BC 8084D6CC 51000034 */ beql $t0, $zero, .L8084D7A0 -/* 1B4C0 8084D6D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B4C4 8084D6D4 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B -/* 1B4C8 8084D6D8 3C058085 */ lui $a1, %hi(D_80853A7C) ## $a1 = 80850000 -/* 1B4CC 8084D6DC 8FA6003C */ lw $a2, 0x003C($sp) -/* 1B4D0 8084D6E0 00095080 */ sll $t2, $t1, 2 -/* 1B4D4 8084D6E4 00AA2821 */ addu $a1, $a1, $t2 -/* 1B4D8 8084D6E8 0C20E826 */ jal func_8083A098 -/* 1B4DC 8084D6EC 8CA53A7C */ lw $a1, %lo(D_80853A7C)($a1) -/* 1B4E0 8084D6F0 0C20CA28 */ jal func_808328A0 -/* 1B4E4 8084D6F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B4E8 8084D6F8 10000029 */ beq $zero, $zero, .L8084D7A0 -/* 1B4EC 8084D6FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B4F0 8084D700 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -.L8084D704: -/* 1B4F4 8084D704 0C20DC9A */ jal func_80837268 -/* 1B4F8 8084D708 AFAB0010 */ sw $t3, 0x0010($sp) -/* 1B4FC 8084D70C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 1B500 8084D710 C7A60034 */ lwc1 $f6, 0x0034($sp) -/* 1B504 8084D714 87AD0032 */ lh $t5, 0x0032($sp) -/* 1B508 8084D718 46003032 */ c.eq.s $f6, $f0 -/* 1B50C 8084D71C 00000000 */ nop -/* 1B510 8084D720 4503001F */ bc1tl .L8084D7A0 -/* 1B514 8084D724 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B518 8084D728 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 1B51C 8084D72C 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 1B520 8084D730 018D1023 */ subu $v0, $t4, $t5 -/* 1B524 8084D734 00021400 */ sll $v0, $v0, 16 -/* 1B528 8084D738 00021403 */ sra $v0, $v0, 16 -/* 1B52C 8084D73C 04400003 */ bltz $v0, .L8084D74C -/* 1B530 8084D740 00021823 */ subu $v1, $zero, $v0 -/* 1B534 8084D744 10000001 */ beq $zero, $zero, .L8084D74C -/* 1B538 8084D748 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L8084D74C: -/* 1B53C 8084D74C 28616001 */ slti $at, $v1, 0x6001 -/* 1B540 8084D750 14200006 */ bne $at, $zero, .L8084D76C -/* 1B544 8084D754 00000000 */ nop -/* 1B548 8084D758 44050000 */ mfc1 $a1, $f0 -/* 1B54C 8084D75C 0C01DE80 */ jal Math_ApproxF - -/* 1B550 8084D760 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 1B554 8084D764 50400013 */ beql $v0, $zero, .L8084D7B4 -/* 1B558 8084D768 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084D76C: -/* 1B55C 8084D76C 0C20CF01 */ jal func_80833C04 -/* 1B560 8084D770 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B564 8084D774 10400006 */ beq $v0, $zero, .L8084D790 -/* 1B568 8084D778 8FA4003C */ lw $a0, 0x003C($sp) -/* 1B56C 8084D77C 8FA4003C */ lw $a0, 0x003C($sp) -/* 1B570 8084D780 0C213573 */ jal func_8084D5CC -/* 1B574 8084D784 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B578 8084D788 10000005 */ beq $zero, $zero, .L8084D7A0 -/* 1B57C 8084D78C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084D790: -/* 1B580 8084D790 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B584 8084D794 0C21355D */ jal func_8084D574 -/* 1B588 8084D798 87A60032 */ lh $a2, 0x0032($sp) -/* 1B58C 8084D79C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084D7A0: -/* 1B590 8084D7A0 26050838 */ addiu $a1, $s0, 0x0838 ## $a1 = 00000838 -/* 1B594 8084D7A4 8FA60034 */ lw $a2, 0x0034($sp) -/* 1B598 8084D7A8 0C212BBB */ jal func_8084AEEC -/* 1B59C 8084D7AC 87A70032 */ lh $a3, 0x0032($sp) -.L8084D7B0: -/* 1B5A0 8084D7B0 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084D7B4: -/* 1B5A4 8084D7B4 8FB00020 */ lw $s0, 0x0020($sp) -/* 1B5A8 8084D7B8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 1B5AC 8084D7BC 03E00008 */ jr $ra -/* 1B5B0 8084D7C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D7C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D7C4.s deleted file mode 100644 index 8f6326bdb5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D7C4.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_8084D7C4 -/* 1B5B4 8084D7C4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1B5B8 8084D7C8 AFBF001C */ sw $ra, 0x001C($sp) -/* 1B5BC 8084D7CC AFB00018 */ sw $s0, 0x0018($sp) -/* 1B5C0 8084D7D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1B5C4 8084D7D4 0C20EC10 */ jal func_8083B040 -/* 1B5C8 8084D7D8 AFA50024 */ sw $a1, 0x0024($sp) -/* 1B5CC 8084D7DC 14400016 */ bne $v0, $zero, .L8084D838 -/* 1B5D0 8084D7E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B5D4 8084D7E4 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 -/* 1B5D8 8084D7E8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 1B5DC 8084D7EC 8E070838 */ lw $a3, 0x0838($s0) ## 00000838 -/* 1B5E0 8084D7F0 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 1B5E4 8084D7F4 AE0F0680 */ sw $t7, 0x0680($s0) ## 00000680 -/* 1B5E8 8084D7F8 0C212C56 */ jal func_8084B158 -/* 1B5EC 8084D7FC 8FA40024 */ lw $a0, 0x0024($sp) -/* 1B5F0 8084D800 0C212C00 */ jal func_8084B000 -/* 1B5F4 8084D804 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B5F8 8084D808 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 1B5FC 8084D80C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B600 8084D810 14400003 */ bne $v0, $zero, .L8084D820 -/* 1B604 8084D814 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 1B608 8084D818 10000003 */ beq $zero, $zero, .L8084D828 -/* 1B60C 8084D81C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L8084D820: -/* 1B610 8084D820 A6180850 */ sh $t8, 0x0850($s0) ## 00000850 -/* 1B614 8084D824 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -.L8084D828: -/* 1B618 8084D828 54600004 */ bnel $v1, $zero, .L8084D83C -/* 1B61C 8084D82C 8FBF001C */ lw $ra, 0x001C($sp) -/* 1B620 8084D830 0C20E3C6 */ jal func_80838F18 -/* 1B624 8084D834 8FA40024 */ lw $a0, 0x0024($sp) -.L8084D838: -/* 1B628 8084D838 8FBF001C */ lw $ra, 0x001C($sp) -.L8084D83C: -/* 1B62C 8084D83C 8FB00018 */ lw $s0, 0x0018($sp) -/* 1B630 8084D840 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1B634 8084D844 03E00008 */ jr $ra -/* 1B638 8084D848 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D84C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D84C.s deleted file mode 100644 index e1fd6f1396..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D84C.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_8084D84C -/* 1B63C 8084D84C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 1B640 8084D850 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1B644 8084D854 AFB00020 */ sw $s0, 0x0020($sp) -/* 1B648 8084D858 AFA5003C */ sw $a1, 0x003C($sp) -/* 1B64C 8084D85C 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1B650 8084D860 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1B654 8084D864 3C068086 */ lui $a2, %hi(D_80858AB4) ## $a2 = 80860000 -/* 1B658 8084D868 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 1B65C 8084D86C AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1B660 8084D870 8E070838 */ lw $a3, 0x0838($s0) ## 00000838 -/* 1B664 8084D874 8CC68AB4 */ lw $a2, %lo(D_80858AB4)($a2) -/* 1B668 8084D878 8FA4003C */ lw $a0, 0x003C($sp) -/* 1B66C 8084D87C 0C212C56 */ jal func_8084B158 -/* 1B670 8084D880 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B674 8084D884 0C212C00 */ jal func_8084B000 -/* 1B678 8084D888 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B67C 8084D88C 3C068085 */ lui $a2, %hi(D_80854444) ## $a2 = 80850000 -/* 1B680 8084D890 24C64444 */ addiu $a2, $a2, %lo(D_80854444) ## $a2 = 80854444 -/* 1B684 8084D894 8FA4003C */ lw $a0, 0x003C($sp) -/* 1B688 8084D898 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B68C 8084D89C 0C20DCD2 */ jal func_80837348 -/* 1B690 8084D8A0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 1B694 8084D8A4 14400031 */ bne $v0, $zero, .L8084D96C -/* 1B698 8084D8A8 8FA4003C */ lw $a0, 0x003C($sp) -/* 1B69C 8084D8AC 3C068086 */ lui $a2, %hi(D_80858AB4) ## $a2 = 80860000 -/* 1B6A0 8084D8B0 8CC68AB4 */ lw $a2, %lo(D_80858AB4)($a2) -/* 1B6A4 8084D8B4 0C20F44B */ jal func_8083D12C -/* 1B6A8 8084D8B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B6AC 8084D8BC 1440002B */ bne $v0, $zero, .L8084D96C -/* 1B6B0 8084D8C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B6B4 8084D8C4 8FB8003C */ lw $t8, 0x003C($sp) -/* 1B6B8 8084D8C8 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 1B6BC 8084D8CC 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 1B6C0 8084D8D0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 1B6C4 8084D8D4 0C20DC9A */ jal func_80837268 -/* 1B6C8 8084D8D8 AFB80010 */ sw $t8, 0x0010($sp) -/* 1B6CC 8084D8DC C7A40034 */ lwc1 $f4, 0x0034($sp) -/* 1B6D0 8084D8E0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 1B6D4 8084D8E4 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 1B6D8 8084D8E8 87A80032 */ lh $t0, 0x0032($sp) -/* 1B6DC 8084D8EC 46062032 */ c.eq.s $f4, $f6 -/* 1B6E0 8084D8F0 8FA4003C */ lw $a0, 0x003C($sp) -/* 1B6E4 8084D8F4 03281823 */ subu $v1, $t9, $t0 -/* 1B6E8 8084D8F8 00031C00 */ sll $v1, $v1, 16 -/* 1B6EC 8084D8FC 4501000C */ bc1t .L8084D930 -/* 1B6F0 8084D900 00031C03 */ sra $v1, $v1, 16 -/* 1B6F4 8084D904 04600003 */ bltz $v1, .L8084D914 -/* 1B6F8 8084D908 00031023 */ subu $v0, $zero, $v1 -/* 1B6FC 8084D90C 10000001 */ beq $zero, $zero, .L8084D914 -/* 1B700 8084D910 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L8084D914: -/* 1B704 8084D914 28416001 */ slti $at, $v0, 0x6001 -/* 1B708 8084D918 10200005 */ beq $at, $zero, .L8084D930 -/* 1B70C 8084D91C 00000000 */ nop -/* 1B710 8084D920 8209014F */ lb $t1, 0x014F($s0) ## 0000014F -/* 1B714 8084D924 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 1B718 8084D928 15210005 */ bne $t1, $at, .L8084D940 -/* 1B71C 8084D92C 00000000 */ nop -.L8084D930: -/* 1B720 8084D930 0C20E3C6 */ jal func_80838F18 -/* 1B724 8084D934 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B728 8084D938 10000008 */ beq $zero, $zero, .L8084D95C -/* 1B72C 8084D93C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084D940: -/* 1B730 8084D940 0C20CF01 */ jal func_80833C04 -/* 1B734 8084D944 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B738 8084D948 10400003 */ beq $v0, $zero, .L8084D958 -/* 1B73C 8084D94C 8FA4003C */ lw $a0, 0x003C($sp) -/* 1B740 8084D950 0C213573 */ jal func_8084D5CC -/* 1B744 8084D954 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L8084D958: -/* 1B748 8084D958 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084D95C: -/* 1B74C 8084D95C 26050838 */ addiu $a1, $s0, 0x0838 ## $a1 = 00000838 -/* 1B750 8084D960 8FA60034 */ lw $a2, 0x0034($sp) -/* 1B754 8084D964 0C21354C */ jal func_8084D530 -/* 1B758 8084D968 87A70032 */ lh $a3, 0x0032($sp) -.L8084D96C: -/* 1B75C 8084D96C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 1B760 8084D970 8FB00020 */ lw $s0, 0x0020($sp) -/* 1B764 8084D974 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 1B768 8084D978 03E00008 */ jr $ra -/* 1B76C 8084D97C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D980.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D980.s deleted file mode 100644 index de04de72a2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D980.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel func_8084D980 -/* 1B770 8084D980 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1B774 8084D984 AFBF001C */ sw $ra, 0x001C($sp) -/* 1B778 8084D988 AFB00018 */ sw $s0, 0x0018($sp) -/* 1B77C 8084D98C AFA40028 */ sw $a0, 0x0028($sp) -/* 1B780 8084D990 AFA60030 */ sw $a2, 0x0030($sp) -/* 1B784 8084D994 AFA70034 */ sw $a3, 0x0034($sp) -/* 1B788 8084D998 84F80000 */ lh $t8, 0x0000($a3) ## 00000000 -/* 1B78C 8084D99C 84AE083C */ lh $t6, 0x083C($a1) ## 0000083C -/* 1B790 8084D9A0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1B794 8084D9A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B798 8084D9A8 01D81023 */ subu $v0, $t6, $t8 -/* 1B79C 8084D9AC 00021400 */ sll $v0, $v0, 16 -/* 1B7A0 8084D9B0 00021403 */ sra $v0, $v0, 16 -/* 1B7A4 8084D9B4 04400003 */ bltz $v0, .L8084D9C4 -/* 1B7A8 8084D9B8 00021823 */ subu $v1, $zero, $v0 -/* 1B7AC 8084D9BC 10000001 */ beq $zero, $zero, .L8084D9C4 -/* 1B7B0 8084D9C0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L8084D9C4: -/* 1B7B4 8084D9C4 28616001 */ slti $at, $v1, 0x6001 -/* 1B7B8 8084D9C8 14200014 */ bne $at, $zero, .L8084DA1C -/* 1B7BC 8084D9CC 8FA50030 */ lw $a1, 0x0030($sp) -/* 1B7C0 8084D9D0 3C070400 */ lui $a3, 0x0400 ## $a3 = 04000000 -/* 1B7C4 8084D9D4 24E73328 */ addiu $a3, $a3, 0x3328 ## $a3 = 04003328 -/* 1B7C8 8084D9D8 AFA70024 */ sw $a3, 0x0024($sp) -/* 1B7CC 8084D9DC 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 1B7D0 8084D9E0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 1B7D4 8084D9E4 0C01DE80 */ jal Math_ApproxF - -/* 1B7D8 8084D9E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 1B7DC 8084D9EC 8FA30034 */ lw $v1, 0x0034($sp) -/* 1B7E0 8084D9F0 10400004 */ beq $v0, $zero, .L8084DA04 -/* 1B7E4 8084D9F4 8FA70024 */ lw $a3, 0x0024($sp) -/* 1B7E8 8084D9F8 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 1B7EC 8084D9FC 1000001F */ beq $zero, $zero, .L8084DA7C -/* 1B7F0 8084DA00 A619083C */ sh $t9, 0x083C($s0) ## 0000083C -.L8084DA04: -/* 1B7F4 8084DA04 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 1B7F8 8084DA08 8FA80030 */ lw $t0, 0x0030($sp) -/* 1B7FC 8084DA0C E5040000 */ swc1 $f4, 0x0000($t0) ## 00000000 -/* 1B800 8084DA10 8609083C */ lh $t1, 0x083C($s0) ## 0000083C -/* 1B804 8084DA14 10000019 */ beq $zero, $zero, .L8084DA7C -/* 1B808 8084DA18 A4690000 */ sh $t1, 0x0000($v1) ## 00000000 -.L8084DA1C: -/* 1B80C 8084DA1C 8FA60034 */ lw $a2, 0x0034($sp) -/* 1B810 8084DA20 0C20FF5E */ jal func_8083FD78 -/* 1B814 8084DA24 8FA70028 */ lw $a3, 0x0028($sp) -/* 1B818 8084DA28 18400004 */ blez $v0, .L8084DA3C -/* 1B81C 8084DA2C 8FA30034 */ lw $v1, 0x0034($sp) -/* 1B820 8084DA30 3C070400 */ lui $a3, 0x0400 ## $a3 = 04000000 -/* 1B824 8084DA34 10000011 */ beq $zero, $zero, .L8084DA7C -/* 1B828 8084DA38 24E732F0 */ addiu $a3, $a3, 0x32F0 ## $a3 = 040032F0 -.L8084DA3C: -/* 1B82C 8084DA3C 04410003 */ bgez $v0, .L8084DA4C -/* 1B830 8084DA40 3C070400 */ lui $a3, 0x0400 ## $a3 = 04000000 -/* 1B834 8084DA44 1000000D */ beq $zero, $zero, .L8084DA7C -/* 1B838 8084DA48 24E732D8 */ addiu $a3, $a3, 0x32D8 ## $a3 = 040032D8 -.L8084DA4C: -/* 1B83C 8084DA4C 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 1B840 8084DA50 846B0000 */ lh $t3, 0x0000($v1) ## 00000000 -/* 1B844 8084DA54 3C070400 */ lui $a3, 0x0400 ## $a3 = 04000000 -/* 1B848 8084DA58 24E732C8 */ addiu $a3, $a3, 0x32C8 ## $a3 = 040032C8 -/* 1B84C 8084DA5C 014B1023 */ subu $v0, $t2, $t3 -/* 1B850 8084DA60 00021400 */ sll $v0, $v0, 16 -/* 1B854 8084DA64 00021403 */ sra $v0, $v0, 16 -/* 1B858 8084DA68 18400004 */ blez $v0, .L8084DA7C -/* 1B85C 8084DA6C 00000000 */ nop -/* 1B860 8084DA70 3C070400 */ lui $a3, 0x0400 ## $a3 = 04000000 -/* 1B864 8084DA74 10000001 */ beq $zero, $zero, .L8084DA7C -/* 1B868 8084DA78 24E732D0 */ addiu $a3, $a3, 0x32D0 ## $a3 = 040032D0 -.L8084DA7C: -/* 1B86C 8084DA7C 8E0C01BC */ lw $t4, 0x01BC($s0) ## 000001BC -/* 1B870 8084DA80 8FA40028 */ lw $a0, 0x0028($sp) -/* 1B874 8084DA84 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B878 8084DA88 10EC0005 */ beq $a3, $t4, .L8084DAA0 -/* 1B87C 8084DA8C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1B880 8084DA90 0C20CB1B */ jal func_80832C6C -/* 1B884 8084DA94 00E03025 */ or $a2, $a3, $zero ## $a2 = 040032D0 -/* 1B888 8084DA98 10000001 */ beq $zero, $zero, .L8084DAA0 -/* 1B88C 8084DA9C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8084DAA0: -/* 1B890 8084DAA0 8FBF001C */ lw $ra, 0x001C($sp) -/* 1B894 8084DAA4 8FB00018 */ lw $s0, 0x0018($sp) -/* 1B898 8084DAA8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1B89C 8084DAAC 03E00008 */ jr $ra -/* 1B8A0 8084DAB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DAB4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DAB4.s deleted file mode 100644 index ae26cbe95e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DAB4.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_8084DAB4 -/* 1B8A4 8084DAB4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 1B8A8 8084DAB8 AFB0001C */ sw $s0, 0x001C($sp) -/* 1B8AC 8084DABC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1B8B0 8084DAC0 AFB10020 */ sw $s1, 0x0020($sp) -/* 1B8B4 8084DAC4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 1B8B8 8084DAC8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1B8BC 8084DACC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1B8C0 8084DAD0 3C068086 */ lui $a2, %hi(D_80858AB4) ## $a2 = 80860000 -/* 1B8C4 8084DAD4 8CC68AB4 */ lw $a2, %lo(D_80858AB4)($a2) -/* 1B8C8 8084DAD8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B8CC 8084DADC 0C212C56 */ jal func_8084B158 -/* 1B8D0 8084DAE0 8E070838 */ lw $a3, 0x0838($s0) ## 00000838 -/* 1B8D4 8084DAE4 0C212C00 */ jal func_8084B000 -/* 1B8D8 8084DAE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B8DC 8084DAEC 3C068085 */ lui $a2, %hi(D_80854444) ## $a2 = 80850000 -/* 1B8E0 8084DAF0 24C64444 */ addiu $a2, $a2, %lo(D_80854444) ## $a2 = 80854444 -/* 1B8E4 8084DAF4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1B8E8 8084DAF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B8EC 8084DAFC 0C20DCD2 */ jal func_80837348 -/* 1B8F0 8084DB00 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 1B8F4 8084DB04 1440002A */ bne $v0, $zero, .L8084DBB0 -/* 1B8F8 8084DB08 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1B8FC 8084DB0C 3C068086 */ lui $a2, %hi(D_80858AB4) ## $a2 = 80860000 -/* 1B900 8084DB10 8CC68AB4 */ lw $a2, %lo(D_80858AB4)($a2) -/* 1B904 8084DB14 0C20F44B */ jal func_8083D12C -/* 1B908 8084DB18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B90C 8084DB1C 14400024 */ bne $v0, $zero, .L8084DBB0 -/* 1B910 8084DB20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B914 8084DB24 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFFC -/* 1B918 8084DB28 27A6002A */ addiu $a2, $sp, 0x002A ## $a2 = FFFFFFFA -/* 1B91C 8084DB2C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 1B920 8084DB30 0C20DC9A */ jal func_80837268 -/* 1B924 8084DB34 AFB10010 */ sw $s1, 0x0010($sp) -/* 1B928 8084DB38 C7A4002C */ lwc1 $f4, 0x002C($sp) -/* 1B92C 8084DB3C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 1B930 8084DB40 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1B934 8084DB44 46062032 */ c.eq.s $f4, $f6 -/* 1B938 8084DB48 00000000 */ nop -/* 1B93C 8084DB4C 45000005 */ bc1f .L8084DB64 -/* 1B940 8084DB50 00000000 */ nop -/* 1B944 8084DB54 0C20E3C6 */ jal func_80838F18 -/* 1B948 8084DB58 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B94C 8084DB5C 10000010 */ beq $zero, $zero, .L8084DBA0 -/* 1B950 8084DB60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084DB64: -/* 1B954 8084DB64 0C20CF01 */ jal func_80833C04 -/* 1B958 8084DB68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B95C 8084DB6C 14400007 */ bne $v0, $zero, .L8084DB8C -/* 1B960 8084DB70 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1B964 8084DB74 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1B968 8084DB78 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B96C 8084DB7C 0C21355D */ jal func_8084D574 -/* 1B970 8084DB80 87A6002A */ lh $a2, 0x002A($sp) -/* 1B974 8084DB84 10000006 */ beq $zero, $zero, .L8084DBA0 -/* 1B978 8084DB88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084DB8C: -/* 1B97C 8084DB8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B980 8084DB90 27A6002C */ addiu $a2, $sp, 0x002C ## $a2 = FFFFFFFC -/* 1B984 8084DB94 0C213660 */ jal func_8084D980 -/* 1B988 8084DB98 27A7002A */ addiu $a3, $sp, 0x002A ## $a3 = FFFFFFFA -/* 1B98C 8084DB9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084DBA0: -/* 1B990 8084DBA0 26050838 */ addiu $a1, $s0, 0x0838 ## $a1 = 00000838 -/* 1B994 8084DBA4 8FA6002C */ lw $a2, 0x002C($sp) -/* 1B998 8084DBA8 0C21354C */ jal func_8084D530 -/* 1B99C 8084DBAC 87A7002A */ lh $a3, 0x002A($sp) -.L8084DBB0: -/* 1B9A0 8084DBB0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 1B9A4 8084DBB4 8FB0001C */ lw $s0, 0x001C($sp) -/* 1B9A8 8084DBB8 8FB10020 */ lw $s1, 0x0020($sp) -/* 1B9AC 8084DBBC 03E00008 */ jr $ra -/* 1B9B0 8084DBC0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DBC4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DBC4.s deleted file mode 100644 index 84f538a18b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DBC4.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8084DBC4 -/* 1B9B4 8084DBC4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 1B9B8 8084DBC8 AFA40030 */ sw $a0, 0x0030($sp) -/* 1B9BC 8084DBCC 8FAE0030 */ lw $t6, 0x0030($sp) -/* 1B9C0 8084DBD0 AFB00020 */ sw $s0, 0x0020($sp) -/* 1B9C4 8084DBD4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1B9C8 8084DBD8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1B9CC 8084DBDC AFA60038 */ sw $a2, 0x0038($sp) -/* 1B9D0 8084DBE0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1B9D4 8084DBE4 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFFC -/* 1B9D8 8084DBE8 27A6002A */ addiu $a2, $sp, 0x002A ## $a2 = FFFFFFFA -/* 1B9DC 8084DBEC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 1B9E0 8084DBF0 0C20DC9A */ jal func_80837268 -/* 1B9E4 8084DBF4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 1B9E8 8084DBF8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 1B9EC 8084DBFC 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 1B9F0 8084DC00 C7A4002C */ lwc1 $f4, 0x002C($sp) -/* 1B9F4 8084DC04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B9F8 8084DC08 26050838 */ addiu $a1, $s0, 0x0838 ## $a1 = 00000838 -/* 1B9FC 8084DC0C 46062202 */ mul.s $f8, $f4, $f6 -/* 1BA00 8084DC10 87A7002A */ lh $a3, 0x002A($sp) -/* 1BA04 8084DC14 44064000 */ mfc1 $a2, $f8 -/* 1BA08 8084DC18 0C212BBB */ jal func_8084AEEC -/* 1BA0C 8084DC1C 00000000 */ nop -/* 1BA10 8084DC20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1BA14 8084DC24 26050060 */ addiu $a1, $s0, 0x0060 ## $a1 = 00000060 -/* 1BA18 8084DC28 8FA60038 */ lw $a2, 0x0038($sp) -/* 1BA1C 8084DC2C 0C212BBB */ jal func_8084AEEC -/* 1BA20 8084DC30 8607083C */ lh $a3, 0x083C($s0) ## 0000083C -/* 1BA24 8084DC34 8FBF0024 */ lw $ra, 0x0024($sp) -/* 1BA28 8084DC38 8FB00020 */ lw $s0, 0x0020($sp) -/* 1BA2C 8084DC3C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 1BA30 8084DC40 03E00008 */ jr $ra -/* 1BA34 8084DC44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DC48.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DC48.s deleted file mode 100644 index 20ffe60f9f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DC48.s +++ /dev/null @@ -1,221 +0,0 @@ -.late_rodata -glabel D_80855538 - .word 0x3C9374BC - -.text -glabel func_8084DC48 -/* 1BA38 8084DC48 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 1BA3C 8084DC4C AFBF001C */ sw $ra, 0x001C($sp) -/* 1BA40 8084DC50 AFB10018 */ sw $s1, 0x0018($sp) -/* 1BA44 8084DC54 AFB00014 */ sw $s0, 0x0014($sp) -/* 1BA48 8084DC58 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1BA4C 8084DC5C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 1BA50 8084DC60 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1BA54 8084DC64 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 1BA58 8084DC68 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 1BA5C 8084DC6C AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1BA60 8084DC70 0C20D99C */ jal func_80836670 -/* 1BA64 8084DC74 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -/* 1BA68 8084DC78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1BA6C 8084DC7C 0C20EC10 */ jal func_8083B040 -/* 1BA70 8084DC80 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 1BA74 8084DC84 544000B5 */ bnel $v0, $zero, .L8084DF5C -/* 1BA78 8084DC88 8FBF001C */ lw $ra, 0x001C($sp) -/* 1BA7C 8084DC8C 8218014F */ lb $t8, 0x014F($s0) ## 0000014F -/* 1BA80 8084DC90 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 1BA84 8084DC94 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1BA88 8084DC98 54780006 */ bnel $v1, $t8, .L8084DCB4 -/* 1BA8C 8084DC9C 8202084F */ lb $v0, 0x084F($s0) ## 0000084F -/* 1BA90 8084DCA0 0C20E3C6 */ jal func_80838F18 -/* 1BA94 8084DCA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1BA98 8084DCA8 100000AC */ beq $zero, $zero, .L8084DF5C -/* 1BA9C 8084DCAC 8FBF001C */ lw $ra, 0x001C($sp) -/* 1BAA0 8084DCB0 8202084F */ lb $v0, 0x084F($s0) ## 0000084F -.L8084DCB4: -/* 1BAA4 8084DCB4 14400063 */ bne $v0, $zero, .L8084DE44 -/* 1BAA8 8084DCB8 00000000 */ nop -/* 1BAAC 8084DCBC 86190850 */ lh $t9, 0x0850($s0) ## 00000850 -/* 1BAB0 8084DCC0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1BAB4 8084DCC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1BAB8 8084DCC8 17200028 */ bne $t9, $zero, .L8084DD6C -/* 1BABC 8084DCCC 3C068086 */ lui $a2, %hi(D_80858AB4) ## $a2 = 80860000 -/* 1BAC0 8084DCD0 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 -/* 1BAC4 8084DCD4 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001B4 -/* 1BAC8 8084DCD8 AFA60024 */ sw $a2, 0x0024($sp) -/* 1BACC 8084DCDC 0C028EF0 */ jal func_800A3BC0 -/* 1BAD0 8084DCE0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1BAD4 8084DCE4 14400011 */ bne $v0, $zero, .L8084DD2C -/* 1BAD8 8084DCE8 8FA60024 */ lw $a2, 0x0024($sp) -/* 1BADC 8084DCEC 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 1BAE0 8084DCF0 44814000 */ mtc1 $at, $f8 ## $f8 = 22.00 -/* 1BAE4 8084DCF4 C60601CC */ lwc1 $f6, 0x01CC($s0) ## 000001CC -/* 1BAE8 8084DCF8 3C088086 */ lui $t0, %hi(D_80858AB4) ## $t0 = 80860000 -/* 1BAEC 8084DCFC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1BAF0 8084DD00 4606403E */ c.le.s $f8, $f6 -/* 1BAF4 8084DD04 00000000 */ nop -/* 1BAF8 8084DD08 4500000D */ bc1f .L8084DD40 -/* 1BAFC 8084DD0C 00000000 */ nop -/* 1BB00 8084DD10 8D088AB4 */ lw $t0, %lo(D_80858AB4)($t0) -/* 1BB04 8084DD14 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 1BB08 8084DD18 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 1BB0C 8084DD1C 95090000 */ lhu $t1, 0x0000($t0) ## 80860000 -/* 1BB10 8084DD20 01215027 */ nor $t2, $t1, $at -/* 1BB14 8084DD24 11400006 */ beq $t2, $zero, .L8084DD40 -/* 1BB18 8084DD28 00000000 */ nop -.L8084DD2C: -/* 1BB1C 8084DD2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1BB20 8084DD30 0C20F4CC */ jal func_8083D330 -/* 1BB24 8084DD34 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1BB28 8084DD38 10000008 */ beq $zero, $zero, .L8084DD5C -/* 1BB2C 8084DD3C 00000000 */ nop -.L8084DD40: -/* 1BB30 8084DD40 0C02914C */ jal func_800A4530 -/* 1BB34 8084DD44 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 1BB38 8084DD48 10400004 */ beq $v0, $zero, .L8084DD5C -/* 1BB3C 8084DD4C 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 1BB40 8084DD50 44815000 */ mtc1 $at, $f10 ## $f10 = -2.00 -/* 1BB44 8084DD54 00000000 */ nop -/* 1BB48 8084DD58 E60A0060 */ swc1 $f10, 0x0060($s0) ## 00000060 -.L8084DD5C: -/* 1BB4C 8084DD5C 0C20DC87 */ jal func_8083721C -/* 1BB50 8084DD60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1BB54 8084DD64 1000007D */ beq $zero, $zero, .L8084DF5C -/* 1BB58 8084DD68 8FBF001C */ lw $ra, 0x001C($sp) -.L8084DD6C: -/* 1BB5C 8084DD6C 8CC68AB4 */ lw $a2, %lo(D_80858AB4)($a2) -/* 1BB60 8084DD70 0C212C56 */ jal func_8084B158 -/* 1BB64 8084DD74 8E070060 */ lw $a3, 0x0060($s0) ## 00000060 -/* 1BB68 8084DD78 240B3E80 */ addiu $t3, $zero, 0x3E80 ## $t3 = 00003E80 -/* 1BB6C 8084DD7C A60B06C2 */ sh $t3, 0x06C2($s0) ## 000006C2 -/* 1BB70 8084DD80 3C0C8086 */ lui $t4, %hi(D_80858AB4) ## $t4 = 80860000 -/* 1BB74 8084DD84 8D8C8AB4 */ lw $t4, %lo(D_80858AB4)($t4) -/* 1BB78 8084DD88 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 1BB7C 8084DD8C 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 1BB80 8084DD90 958D0000 */ lhu $t5, 0x0000($t4) ## 80860000 -/* 1BB84 8084DD94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1BB88 8084DD98 01A17027 */ nor $t6, $t5, $at -/* 1BB8C 8084DD9C 55C00020 */ bnel $t6, $zero, .L8084DE20 -/* 1BB90 8084DDA0 820D084F */ lb $t5, 0x084F($s0) ## 0000084F -/* 1BB94 8084DDA4 0C20F96A */ jal func_8083E5A8 -/* 1BB98 8084DDA8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 1BB9C 8084DDAC 5440001C */ bnel $v0, $zero, .L8084DE20 -/* 1BBA0 8084DDB0 820D084F */ lb $t5, 0x084F($s0) ## 0000084F -/* 1BBA4 8084DDB4 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 1BBA8 8084DDB8 3C198016 */ lui $t9, %hi(gSaveContext+0xa0) -/* 1BBAC 8084DDBC 3C088012 */ lui $t0, %hi(gUpgradeMasks+0xc) -/* 1BBB0 8084DDC0 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 1BBB4 8084DDC4 17000015 */ bne $t8, $zero, .L8084DE1C -/* 1BBB8 8084DDC8 3C0A8012 */ lui $t2, %hi(gUpgradeShifts+3) -/* 1BBBC 8084DDCC 8F39E700 */ lw $t9, %lo(gSaveContext+0xa0)($t9) -/* 1BBC0 8084DDD0 8D0871BC */ lw $t0, %lo(gUpgradeMasks+0xc)($t0) -/* 1BBC4 8084DDD4 914A71F7 */ lbu $t2, %lo(gUpgradeShifts+3)($t2) -/* 1BBC8 8084DDD8 3C018085 */ lui $at, %hi(D_80854784) ## $at = 80850000 -/* 1BBCC 8084DDDC 03284824 */ and $t1, $t9, $t0 -/* 1BBD0 8084DDE0 01495807 */ srav $t3, $t1, $t2 -/* 1BBD4 8084DDE4 000B6080 */ sll $t4, $t3, 2 -/* 1BBD8 8084DDE8 002C0821 */ addu $at, $at, $t4 -/* 1BBDC 8084DDEC C4324784 */ lwc1 $f18, %lo(D_80854784)($at) -/* 1BBE0 8084DDF0 C6100084 */ lwc1 $f16, 0x0084($s0) ## 00000084 -/* 1BBE4 8084DDF4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1BBE8 8084DDF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1BBEC 8084DDFC 4612803C */ c.lt.s $f16, $f18 -/* 1BBF0 8084DE00 00000000 */ nop -/* 1BBF4 8084DE04 45020006 */ bc1fl .L8084DE20 -/* 1BBF8 8084DE08 820D084F */ lb $t5, 0x084F($s0) ## 0000084F -/* 1BBFC 8084DE0C 0C2136F1 */ jal func_8084DBC4 -/* 1BC00 8084DE10 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 -/* 1BC04 8084DE14 10000051 */ beq $zero, $zero, .L8084DF5C -/* 1BC08 8084DE18 8FBF001C */ lw $ra, 0x001C($sp) -.L8084DE1C: -/* 1BC0C 8084DE1C 820D084F */ lb $t5, 0x084F($s0) ## 0000084F -.L8084DE20: -/* 1BC10 8084DE20 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1BC14 8084DE24 24C63328 */ addiu $a2, $a2, 0x3328 ## $a2 = 04003328 -/* 1BC18 8084DE28 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 1BC1C 8084DE2C A20E084F */ sb $t6, 0x084F($s0) ## 0000084F -/* 1BC20 8084DE30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1BC24 8084DE34 0C20CB1B */ jal func_80832C6C -/* 1BC28 8084DE38 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1BC2C 8084DE3C 10000047 */ beq $zero, $zero, .L8084DF5C -/* 1BC30 8084DE40 8FBF001C */ lw $ra, 0x001C($sp) -.L8084DE44: -/* 1BC34 8084DE44 14620018 */ bne $v1, $v0, .L8084DEA8 -/* 1BC38 8084DE48 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1BC3C 8084DE4C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1BC40 8084DE50 0C028EF0 */ jal func_800A3BC0 -/* 1BC44 8084DE54 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1BC48 8084DE58 0C212C00 */ jal func_8084B000 -/* 1BC4C 8084DE5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1BC50 8084DE60 860F06C2 */ lh $t7, 0x06C2($s0) ## 000006C2 -/* 1BC54 8084DE64 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1BC58 8084DE68 29E12710 */ slti $at, $t7, 0x2710 -/* 1BC5C 8084DE6C 5020003B */ beql $at, $zero, .L8084DF5C -/* 1BC60 8084DE70 8FBF001C */ lw $ra, 0x001C($sp) -/* 1BC64 8084DE74 C6040084 */ lwc1 $f4, 0x0084($s0) ## 00000084 -/* 1BC68 8084DE78 8218084F */ lb $t8, 0x084F($s0) ## 0000084F -/* 1BC6C 8084DE7C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1BC70 8084DE80 4600218D */ trunc.w.s $f6, $f4 -/* 1BC74 8084DE84 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 1BC78 8084DE88 A219084F */ sb $t9, 0x084F($s0) ## 0000084F -/* 1BC7C 8084DE8C 24C632F0 */ addiu $a2, $a2, 0x32F0 ## $a2 = 040032F0 -/* 1BC80 8084DE90 44093000 */ mfc1 $t1, $f6 -/* 1BC84 8084DE94 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1BC88 8084DE98 0C20CB1B */ jal func_80832C6C -/* 1BC8C 8084DE9C A6090850 */ sh $t1, 0x0850($s0) ## 00000850 -/* 1BC90 8084DEA0 1000002E */ beq $zero, $zero, .L8084DF5C -/* 1BC94 8084DEA4 8FBF001C */ lw $ra, 0x001C($sp) -.L8084DEA8: -/* 1BC98 8084DEA8 3C068086 */ lui $a2, %hi(D_80858AB4) ## $a2 = 80860000 -/* 1BC9C 8084DEAC 8CC68AB4 */ lw $a2, %lo(D_80858AB4)($a2) -/* 1BCA0 8084DEB0 0C20F44B */ jal func_8083D12C -/* 1BCA4 8084DEB4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1BCA8 8084DEB8 3C038086 */ lui $v1, %hi(D_80858AB4) ## $v1 = 80860000 -/* 1BCAC 8084DEBC 14400026 */ bne $v0, $zero, .L8084DF58 -/* 1BCB0 8084DEC0 24638AB4 */ addiu $v1, $v1, %lo(D_80858AB4) ## $v1 = 80858AB4 -/* 1BCB4 8084DEC4 860A0850 */ lh $t2, 0x0850($s0) ## 00000850 -/* 1BCB8 8084DEC8 3C018085 */ lui $at, %hi(D_80855538) ## $at = 80850000 -/* 1BCBC 8084DECC C4305538 */ lwc1 $f16, %lo(D_80855538)($at) -/* 1BCC0 8084DED0 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 1BCC4 8084DED4 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 1BCC8 8084DED8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 1BCCC 8084DEDC 468042A0 */ cvt.s.w $f10, $f8 -/* 1BCD0 8084DEE0 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 -/* 1BCD4 8084DEE4 316C0800 */ andi $t4, $t3, 0x0800 ## $t4 = 00000000 -/* 1BCD8 8084DEE8 46105482 */ mul.s $f18, $f10, $f16 -/* 1BCDC 8084DEEC 11800002 */ beq $t4, $zero, .L8084DEF8 -/* 1BCE0 8084DEF0 46049080 */ add.s $f2, $f18, $f4 -/* 1BCE4 8084DEF4 AC600000 */ sw $zero, 0x0000($v1) ## 80858AB4 -.L8084DEF8: -/* 1BCE8 8084DEF8 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 -/* 1BCEC 8084DEFC E7A2002C */ swc1 $f2, 0x002C($sp) -/* 1BCF0 8084DF00 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1BCF4 8084DF04 46000005 */ abs.s $f0, $f0 -/* 1BCF8 8084DF08 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1BCFC 8084DF0C 44070000 */ mfc1 $a3, $f0 -/* 1BD00 8084DF10 0C212C56 */ jal func_8084B158 -/* 1BD04 8084DF14 8C660000 */ lw $a2, 0x0000($v1) ## 80858AB4 -/* 1BD08 8084DF18 260406C2 */ addiu $a0, $s0, 0x06C2 ## $a0 = 000006C2 -/* 1BD0C 8084DF1C 2405D8F0 */ addiu $a1, $zero, 0xD8F0 ## $a1 = FFFFD8F0 -/* 1BD10 8084DF20 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 1BD14 8084DF24 24060320 */ addiu $a2, $zero, 0x0320 ## $a2 = 00000320 -/* 1BD18 8084DF28 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 1BD1C 8084DF2C 44810000 */ mtc1 $at, $f0 ## $f0 = 8.00 -/* 1BD20 8084DF30 C7A2002C */ lwc1 $f2, 0x002C($sp) -/* 1BD24 8084DF34 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1BD28 8084DF38 4602003C */ c.lt.s $f0, $f2 -/* 1BD2C 8084DF3C 00000000 */ nop -/* 1BD30 8084DF40 45020003 */ bc1fl .L8084DF50 -/* 1BD34 8084DF44 44061000 */ mfc1 $a2, $f2 -/* 1BD38 8084DF48 46000086 */ mov.s $f2, $f0 -/* 1BD3C 8084DF4C 44061000 */ mfc1 $a2, $f2 -.L8084DF50: -/* 1BD40 8084DF50 0C2136F1 */ jal func_8084DBC4 -/* 1BD44 8084DF54 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L8084DF58: -/* 1BD48 8084DF58 8FBF001C */ lw $ra, 0x001C($sp) -.L8084DF5C: -/* 1BD4C 8084DF5C 8FB00014 */ lw $s0, 0x0014($sp) -/* 1BD50 8084DF60 8FB10018 */ lw $s1, 0x0018($sp) -/* 1BD54 8084DF64 03E00008 */ jr $ra -/* 1BD58 8084DF68 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DF6C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DF6C.s deleted file mode 100644 index 70b2becfcb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DF6C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8084DF6C -/* 1BD5C 8084DF6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1BD60 8084DF70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1BD64 8084DF74 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C -/* 1BD68 8084DF78 2401F3FF */ addiu $at, $zero, 0xF3FF ## $at = FFFFF3FF -/* 1BD6C 8084DF7C A0A00862 */ sb $zero, 0x0862($a1) ## 00000862 -/* 1BD70 8084DF80 01C17824 */ and $t7, $t6, $at -/* 1BD74 8084DF84 ACAF067C */ sw $t7, 0x067C($a1) ## 0000067C -/* 1BD78 8084DF88 A0A00434 */ sb $zero, 0x0434($a1) ## 00000434 -/* 1BD7C 8084DF8C 0C030129 */ jal Gameplay_GetCamera -/* 1BD80 8084DF90 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1BD84 8084DF94 0C016C69 */ jal func_8005B1A4 -/* 1BD88 8084DF98 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1BD8C 8084DF9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1BD90 8084DFA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1BD94 8084DFA4 03E00008 */ jr $ra -/* 1BD98 8084DFA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFAC.s deleted file mode 100644 index b6437dfcda..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFAC.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8084DFAC -/* 1BD9C 8084DFAC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1BDA0 8084DFB0 AFBF001C */ sw $ra, 0x001C($sp) -/* 1BDA4 8084DFB4 AFB00018 */ sw $s0, 0x0018($sp) -/* 1BDA8 8084DFB8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1BDAC 8084DFBC 0C2137DB */ jal func_8084DF6C -/* 1BDB0 8084DFC0 AFA40020 */ sw $a0, 0x0020($sp) -/* 1BDB4 8084DFC4 0C20C8BF */ jal func_808322FC -/* 1BDB8 8084DFC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1BDBC 8084DFCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1BDC0 8084DFD0 0C20F03A */ jal func_8083C0E8 -/* 1BDC4 8084DFD4 8FA50020 */ lw $a1, 0x0020($sp) -/* 1BDC8 8084DFD8 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 1BDCC 8084DFDC A60E083C */ sh $t6, 0x083C($s0) ## 0000083C -/* 1BDD0 8084DFE0 8FBF001C */ lw $ra, 0x001C($sp) -/* 1BDD4 8084DFE4 8FB00018 */ lw $s0, 0x0018($sp) -/* 1BDD8 8084DFE8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1BDDC 8084DFEC 03E00008 */ jr $ra -/* 1BDE0 8084DFF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFF4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFF4.s deleted file mode 100644 index 67a57f7285..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFF4.s +++ /dev/null @@ -1,142 +0,0 @@ -glabel func_8084DFF4 -/* 1BDE4 8084DFF4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1BDE8 8084DFF8 AFBF001C */ sw $ra, 0x001C($sp) -/* 1BDEC 8084DFFC 80A30434 */ lb $v1, 0x0434($a1) ## 00000434 -/* 1BDF0 8084E000 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 1BDF4 8084E004 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 1BDF8 8084E008 54600004 */ bnel $v1, $zero, .L8084E01C -/* 1BDFC 8084E00C 80CE084F */ lb $t6, 0x084F($a2) ## 0000084F -/* 1BE00 8084E010 10000072 */ beq $zero, $zero, .L8084E1DC -/* 1BE04 8084E014 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 1BE08 8084E018 80CE084F */ lb $t6, 0x084F($a2) ## 0000084F -.L8084E01C: -/* 1BE0C 8084E01C 00037880 */ sll $t7, $v1, 2 -/* 1BE10 8084E020 01E37823 */ subu $t7, $t7, $v1 -/* 1BE14 8084E024 15C00048 */ bne $t6, $zero, .L8084E148 -/* 1BE18 8084E028 24E420D8 */ addiu $a0, $a3, 0x20D8 ## $a0 = 000020D8 -/* 1BE1C 8084E02C 000F7840 */ sll $t7, $t7, 1 -/* 1BE20 8084E030 3C198085 */ lui $t9, %hi(D_80853624) ## $t9 = 80850000 -/* 1BE24 8084E034 27393624 */ addiu $t9, $t9, %lo(D_80853624) ## $t9 = 80853624 -/* 1BE28 8084E038 25F8FFFA */ addiu $t8, $t7, 0xFFFA ## $t8 = FFFFFFFA -/* 1BE2C 8084E03C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 1BE30 8084E040 03191021 */ addu $v0, $t8, $t9 -/* 1BE34 8084E044 A0C8084F */ sb $t0, 0x084F($a2) ## 0000084F -/* 1BE38 8084E048 90450003 */ lbu $a1, 0x0003($v0) ## 00000004 -/* 1BE3C 8084E04C AFA70028 */ sw $a3, 0x0028($sp) -/* 1BE40 8084E050 AFA6002C */ sw $a2, 0x002C($sp) -/* 1BE44 8084E054 AFA20024 */ sw $v0, 0x0024($sp) -/* 1BE48 8084E058 0C042DA0 */ jal func_8010B680 -/* 1BE4C 8084E05C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 1BE50 8084E060 8FA20024 */ lw $v0, 0x0024($sp) -/* 1BE54 8084E064 8FA40028 */ lw $a0, 0x0028($sp) -/* 1BE58 8084E068 0C021344 */ jal Item_Give -/* 1BE5C 8084E06C 90450000 */ lbu $a1, 0x0000($v0) ## 00000000 -/* 1BE60 8084E070 8FA9002C */ lw $t1, 0x002C($sp) -/* 1BE64 8084E074 81230434 */ lb $v1, 0x0434($t1) ## 00000434 -/* 1BE68 8084E078 2861004C */ slti $at, $v1, 0x004C -/* 1BE6C 8084E07C 14200002 */ bne $at, $zero, .L8084E088 -/* 1BE70 8084E080 2861004F */ slti $at, $v1, 0x004F -/* 1BE74 8084E084 1420000A */ bne $at, $zero, .L8084E0B0 -.L8084E088: -/* 1BE78 8084E088 28610055 */ slti $at, $v1, 0x0055 -/* 1BE7C 8084E08C 14200002 */ bne $at, $zero, .L8084E098 -/* 1BE80 8084E090 28610057 */ slti $at, $v1, 0x0057 -/* 1BE84 8084E094 14200006 */ bne $at, $zero, .L8084E0B0 -.L8084E098: -/* 1BE88 8084E098 28610072 */ slti $at, $v1, 0x0072 -/* 1BE8C 8084E09C 14200002 */ bne $at, $zero, .L8084E0A8 -/* 1BE90 8084E0A0 28610076 */ slti $at, $v1, 0x0076 -/* 1BE94 8084E0A4 14200002 */ bne $at, $zero, .L8084E0B0 -.L8084E0A8: -/* 1BE98 8084E0A8 24010048 */ addiu $at, $zero, 0x0048 ## $at = 00000048 -/* 1BE9C 8084E0AC 1461000D */ bne $v1, $at, .L8084E0E4 -.L8084E0B0: -/* 1BEA0 8084E0B0 3C078013 */ lui $a3, %hi(D_801333E0) -/* 1BEA4 8084E0B4 3C0A8013 */ lui $t2, %hi(D_801333E8) -/* 1BEA8 8084E0B8 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 1BEAC 8084E0BC 254A33E8 */ addiu $t2, %lo(D_801333E8) -/* 1BEB0 8084E0C0 3C058013 */ lui $a1, %hi(D_801333D4) -/* 1BEB4 8084E0C4 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 1BEB8 8084E0C8 AFAA0014 */ sw $t2, 0x0014($sp) -/* 1BEBC 8084E0CC AFA70010 */ sw $a3, 0x0010($sp) -/* 1BEC0 8084E0D0 24044831 */ addiu $a0, $zero, 0x4831 ## $a0 = 00004831 -/* 1BEC4 8084E0D4 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 1BEC8 8084E0D8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 1BECC 8084E0DC 1000003F */ beq $zero, $zero, .L8084E1DC -/* 1BED0 8084E0E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8084E0E4: -/* 1BED4 8084E0E4 2401004F */ addiu $at, $zero, 0x004F ## $at = 0000004F -/* 1BED8 8084E0E8 1061000B */ beq $v1, $at, .L8084E118 -/* 1BEDC 8084E0EC 2401003D */ addiu $at, $zero, 0x003D ## $at = 0000003D -/* 1BEE0 8084E0F0 10610009 */ beq $v1, $at, .L8084E118 -/* 1BEE4 8084E0F4 2402003E */ addiu $v0, $zero, 0x003E ## $v0 = 0000003E -/* 1BEE8 8084E0F8 14430009 */ bne $v0, $v1, .L8084E120 -/* 1BEEC 8084E0FC 3C0B8016 */ lui $t3, %hi(gSaveContext+0xa4) -/* 1BEF0 8084E100 8D6BE704 */ lw $t3, %lo(gSaveContext+0xa4)($t3) -/* 1BEF4 8084E104 3C01F000 */ lui $at, 0xF000 ## $at = F0000000 -/* 1BEF8 8084E108 01616024 */ and $t4, $t3, $at -/* 1BEFC 8084E10C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 1BF00 8084E110 15810003 */ bne $t4, $at, .L8084E120 -/* 1BF04 8084E114 00000000 */ nop -.L8084E118: -/* 1BF08 8084E118 10000007 */ beq $zero, $zero, .L8084E138 -/* 1BF0C 8084E11C 24020924 */ addiu $v0, $zero, 0x0924 ## $v0 = 00000924 -.L8084E120: -/* 1BF10 8084E120 54430004 */ bnel $v0, $v1, .L8084E134 -/* 1BF14 8084E124 24030922 */ addiu $v1, $zero, 0x0922 ## $v1 = 00000922 -/* 1BF18 8084E128 10000002 */ beq $zero, $zero, .L8084E134 -/* 1BF1C 8084E12C 24030039 */ addiu $v1, $zero, 0x0039 ## $v1 = 00000039 -/* 1BF20 8084E130 24030922 */ addiu $v1, $zero, 0x0922 ## $v1 = 00000922 -.L8084E134: -/* 1BF24 8084E134 00601025 */ or $v0, $v1, $zero ## $v0 = 00000922 -.L8084E138: -/* 1BF28 8084E138 0C03D719 */ jal func_800F5C64 -/* 1BF2C 8084E13C 3044FFFF */ andi $a0, $v0, 0xFFFF ## $a0 = 00000922 -/* 1BF30 8084E140 10000026 */ beq $zero, $zero, .L8084E1DC -/* 1BF34 8084E144 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8084E148: -/* 1BF38 8084E148 AFA6002C */ sw $a2, 0x002C($sp) -/* 1BF3C 8084E14C 0C042F6F */ jal func_8010BDBC -/* 1BF40 8084E150 AFA70028 */ sw $a3, 0x0028($sp) -/* 1BF44 8084E154 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1BF48 8084E158 1441001F */ bne $v0, $at, .L8084E1D8 -/* 1BF4C 8084E15C 8FA70028 */ lw $a3, 0x0028($sp) -/* 1BF50 8084E160 8FA2002C */ lw $v0, 0x002C($sp) -/* 1BF54 8084E164 24010035 */ addiu $at, $zero, 0x0035 ## $at = 00000035 -/* 1BF58 8084E168 240E0123 */ addiu $t6, $zero, 0x0123 ## $t6 = 00000123 -/* 1BF5C 8084E16C 804D0434 */ lb $t5, 0x0434($v0) ## 00000434 -/* 1BF60 8084E170 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 1BF64 8084E174 3418FFF1 */ ori $t8, $zero, 0xFFF1 ## $t8 = 0000FFF1 -/* 1BF68 8084E178 15A10016 */ bne $t5, $at, .L8084E1D4 -/* 1BF6C 8084E17C 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F -/* 1BF70 8084E180 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 1BF74 8084E184 00270821 */ addu $at, $at, $a3 -/* 1BF78 8084E188 A42E1E1A */ sh $t6, 0x1E1A($at) ## 00011E1A -/* 1BF7C 8084E18C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 1BF80 8084E190 00270821 */ addu $at, $at, $a3 -/* 1BF84 8084E194 A02F1E15 */ sb $t7, 0x1E15($at) ## 00011E15 -/* 1BF88 8084E198 3C018016 */ lui $at, %hi(gSaveContext+0x1412) -/* 1BF8C 8084E19C A438FA72 */ sh $t8, %lo(gSaveContext+0x1412)($at) -/* 1BF90 8084E1A0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 1BF94 8084E1A4 00270821 */ addu $at, $at, $a3 -/* 1BF98 8084E1A8 A0391E5E */ sb $t9, 0x1E5E($at) ## 00011E5E -/* 1BF9C 8084E1AC 8C48067C */ lw $t0, 0x067C($v0) ## 0000067C -/* 1BFA0 8084E1B0 3C01DFFF */ lui $at, 0xDFFF ## $at = DFFF0000 -/* 1BFA4 8084E1B4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = DFFFFFFF -/* 1BFA8 8084E1B8 01014824 */ and $t1, $t0, $at -/* 1BFAC 8084E1BC AC49067C */ sw $t1, 0x067C($v0) ## 0000067C -/* 1BFB0 8084E1C0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 1BFB4 8084E1C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1BFB8 8084E1C8 0C214BFF */ jal func_80852FFC -/* 1BFBC 8084E1CC 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 1BFC0 8084E1D0 8FA2002C */ lw $v0, 0x002C($sp) -.L8084E1D4: -/* 1BFC4 8084E1D4 A0400434 */ sb $zero, 0x0434($v0) ## 00000434 -.L8084E1D8: -/* 1BFC8 8084E1D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8084E1DC: -/* 1BFCC 8084E1DC 8FBF001C */ lw $ra, 0x001C($sp) -/* 1BFD0 8084E1E0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1BFD4 8084E1E4 03E00008 */ jr $ra -/* 1BFD8 8084E1E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E1EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E1EC.s deleted file mode 100644 index c6fbc7d7e3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E1EC.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_8084E1EC -/* 1BFDC 8084E1EC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1BFE0 8084E1F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 1BFE4 8084E1F4 AFB10018 */ sw $s1, 0x0018($sp) -/* 1BFE8 8084E1F8 AFB00014 */ sw $s0, 0x0014($sp) -/* 1BFEC 8084E1FC 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1BFF0 8084E200 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1BFF4 8084E204 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 1BFF8 8084E208 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 1BFFC 8084E20C AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1C000 8084E210 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1C004 8084E214 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1C008 8084E218 0C028EF0 */ jal func_800A3BC0 -/* 1C00C 8084E21C AFA50024 */ sw $a1, 0x0024($sp) -/* 1C010 8084E220 50400015 */ beql $v0, $zero, .L8084E278 -/* 1C014 8084E224 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 1C018 8084E228 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 1C01C 8084E22C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C020 8084E230 33190400 */ andi $t9, $t8, 0x0400 ## $t9 = 00000000 -/* 1C024 8084E234 53200005 */ beql $t9, $zero, .L8084E24C -/* 1C028 8084E238 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C02C 8084E23C 0C2137FD */ jal func_8084DFF4 -/* 1C030 8084E240 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1C034 8084E244 10400025 */ beq $v0, $zero, .L8084E2DC -/* 1C038 8084E248 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L8084E24C: -/* 1C03C 8084E24C 0C2137DB */ jal func_8084DF6C -/* 1C040 8084E250 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1C044 8084E254 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C048 8084E258 0C20E3C6 */ jal func_80838F18 -/* 1C04C 8084E25C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1C050 8084E260 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C054 8084E264 0C20C8D0 */ jal func_80832340 -/* 1C058 8084E268 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1C05C 8084E26C 1000001B */ beq $zero, $zero, .L8084E2DC -/* 1C060 8084E270 00000000 */ nop -/* 1C064 8084E274 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -.L8084E278: -/* 1C068 8084E278 8FA40024 */ lw $a0, 0x0024($sp) -/* 1C06C 8084E27C 31090400 */ andi $t1, $t0, 0x0400 ## $t1 = 00000000 -/* 1C070 8084E280 51200010 */ beql $t1, $zero, .L8084E2C4 -/* 1C074 8084E284 8FA40024 */ lw $a0, 0x0024($sp) -/* 1C078 8084E288 0C02914C */ jal func_800A4530 -/* 1C07C 8084E28C 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 1C080 8084E290 1040000B */ beq $v0, $zero, .L8084E2C0 -/* 1C084 8084E294 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C088 8084E298 0C20CCBD */ jal func_808332F4 -/* 1C08C 8084E29C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 1C090 8084E2A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C094 8084E2A4 0C20C8D0 */ jal func_80832340 -/* 1C098 8084E2A8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1C09C 8084E2AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C0A0 8084E2B0 0C20D7A9 */ jal func_80835EA4 -/* 1C0A4 8084E2B4 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 1C0A8 8084E2B8 10000008 */ beq $zero, $zero, .L8084E2DC -/* 1C0AC 8084E2BC 00000000 */ nop -.L8084E2C0: -/* 1C0B0 8084E2C0 8FA40024 */ lw $a0, 0x0024($sp) -.L8084E2C4: -/* 1C0B4 8084E2C4 0C02914C */ jal func_800A4530 -/* 1C0B8 8084E2C8 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 1C0BC 8084E2CC 10400003 */ beq $v0, $zero, .L8084E2DC -/* 1C0C0 8084E2D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C0C4 8084E2D4 0C20C9A6 */ jal func_80832698 -/* 1C0C8 8084E2D8 2405680A */ addiu $a1, $zero, 0x680A ## $a1 = 0000680A -.L8084E2DC: -/* 1C0CC 8084E2DC 0C212C00 */ jal func_8084B000 -/* 1C0D0 8084E2E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C0D4 8084E2E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C0D8 8084E2E8 26050838 */ addiu $a1, $s0, 0x0838 ## $a1 = 00000838 -/* 1C0DC 8084E2EC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 1C0E0 8084E2F0 0C212BBB */ jal func_8084AEEC -/* 1C0E4 8084E2F4 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 1C0E8 8084E2F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 1C0EC 8084E2FC 8FB00014 */ lw $s0, 0x0014($sp) -/* 1C0F0 8084E300 8FB10018 */ lw $s1, 0x0018($sp) -/* 1C0F4 8084E304 03E00008 */ jr $ra -/* 1C0F8 8084E308 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E30C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E30C.s deleted file mode 100644 index 0d24873cae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E30C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8084E30C -/* 1C0FC 8084E30C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1C100 8084E310 AFBF001C */ sw $ra, 0x001C($sp) -/* 1C104 8084E314 AFB00018 */ sw $s0, 0x0018($sp) -/* 1C108 8084E318 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1C10C 8084E31C 0C212C00 */ jal func_8084B000 -/* 1C110 8084E320 AFA50024 */ sw $a1, 0x0024($sp) -/* 1C114 8084E324 8FA40024 */ lw $a0, 0x0024($sp) -/* 1C118 8084E328 0C028EF0 */ jal func_800A3BC0 -/* 1C11C 8084E32C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1C120 8084E330 10400003 */ beq $v0, $zero, .L8084E340 -/* 1C124 8084E334 8FA40024 */ lw $a0, 0x0024($sp) -/* 1C128 8084E338 0C20E3C6 */ jal func_80838F18 -/* 1C12C 8084E33C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L8084E340: -/* 1C130 8084E340 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C134 8084E344 26050838 */ addiu $a1, $s0, 0x0838 ## $a1 = 00000838 -/* 1C138 8084E348 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 1C13C 8084E34C 0C212BBB */ jal func_8084AEEC -/* 1C140 8084E350 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 1C144 8084E354 8FBF001C */ lw $ra, 0x001C($sp) -/* 1C148 8084E358 8FB00018 */ lw $s0, 0x0018($sp) -/* 1C14C 8084E35C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1C150 8084E360 03E00008 */ jr $ra -/* 1C154 8084E364 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E368.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E368.s deleted file mode 100644 index 6a4b91bd54..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E368.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8084E368 -/* 1C158 8084E368 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1C15C 8084E36C AFBF001C */ sw $ra, 0x001C($sp) -/* 1C160 8084E370 AFB00018 */ sw $s0, 0x0018($sp) -/* 1C164 8084E374 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1C168 8084E378 0C212C00 */ jal func_8084B000 -/* 1C16C 8084E37C AFA50024 */ sw $a1, 0x0024($sp) -/* 1C170 8084E380 8FA40024 */ lw $a0, 0x0024($sp) -/* 1C174 8084E384 0C028EF0 */ jal func_800A3BC0 -/* 1C178 8084E388 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1C17C 8084E38C 10400003 */ beq $v0, $zero, .L8084E39C -/* 1C180 8084E390 8FA40024 */ lw $a0, 0x0024($sp) -/* 1C184 8084E394 0C210EBA */ jal func_80843AE8 -/* 1C188 8084E398 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L8084E39C: -/* 1C18C 8084E39C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C190 8084E3A0 26050838 */ addiu $a1, $s0, 0x0838 ## $a1 = 00000838 -/* 1C194 8084E3A4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 1C198 8084E3A8 0C212BBB */ jal func_8084AEEC -/* 1C19C 8084E3AC 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 1C1A0 8084E3B0 8FBF001C */ lw $ra, 0x001C($sp) -/* 1C1A4 8084E3B4 8FB00018 */ lw $s0, 0x0018($sp) -/* 1C1A8 8084E3B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1C1AC 8084E3BC 03E00008 */ jr $ra -/* 1C1B0 8084E3C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s deleted file mode 100644 index 813a7aafe4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s +++ /dev/null @@ -1,156 +0,0 @@ -glabel func_8084E3C4 -/* 1C1B4 8084E3C4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 1C1B8 8084E3C8 AFB0002C */ sw $s0, 0x002C($sp) -/* 1C1BC 8084E3CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1C1C0 8084E3D0 AFB10030 */ sw $s1, 0x0030($sp) -/* 1C1C4 8084E3D4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 1C1C8 8084E3D8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 1C1CC 8084E3DC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1C1D0 8084E3E0 0C028EF0 */ jal func_800A3BC0 -/* 1C1D4 8084E3E4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1C1D8 8084E3E8 10400014 */ beq $v0, $zero, .L8084E43C -/* 1C1DC 8084E3EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C1E0 8084E3F0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1C1E4 8084E3F4 24C630A8 */ addiu $a2, $a2, 0x30A8 ## $a2 = 040030A8 -/* 1C1E8 8084E3F8 0C20C8A9 */ jal func_808322A4 -/* 1C1EC 8084E3FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1C1F0 8084E400 8E020680 */ lw $v0, 0x0680($s0) ## 00000680 -/* 1C1F4 8084E404 3C010280 */ lui $at, 0x0280 ## $at = 02800000 -/* 1C1F8 8084E408 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 1C1FC 8084E40C 00417824 */ and $t7, $v0, $at -/* 1C200 8084E410 11E00005 */ beq $t7, $zero, .L8084E428 -/* 1C204 8084E414 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -/* 1C208 8084E418 3C010100 */ lui $at, 0x0100 ## $at = 01000000 -/* 1C20C 8084E41C 0041C025 */ or $t8, $v0, $at ## $t8 = 01000000 -/* 1C210 8084E420 10000073 */ beq $zero, $zero, .L8084E5F0 -/* 1C214 8084E424 AE180680 */ sw $t8, 0x0680($s0) ## 00000680 -.L8084E428: -/* 1C218 8084E428 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C21C 8084E42C 0C042F56 */ jal func_8010BD58 -/* 1C220 8084E430 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 1C224 8084E434 1000006F */ beq $zero, $zero, .L8084E5F4 -/* 1C228 8084E438 8FBF0034 */ lw $ra, 0x0034($sp) -.L8084E43C: -/* 1C22C 8084E43C 86190850 */ lh $t9, 0x0850($s0) ## 00000850 -/* 1C230 8084E440 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 1C234 8084E444 02211021 */ addu $v0, $s1, $at -/* 1C238 8084E448 5320006A */ beql $t9, $zero, .L8084E5F4 -/* 1C23C 8084E44C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 1C240 8084E450 944304C6 */ lhu $v1, 0x04C6($v0) ## 000004C6 -/* 1C244 8084E454 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 1C248 8084E458 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C24C 8084E45C 5461002C */ bnel $v1, $at, .L8084E510 -/* 1C250 8084E460 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1C254 8084E464 0C030129 */ jal Gameplay_GetCamera -/* 1C258 8084E468 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1C25C 8084E46C 0C016C69 */ jal func_8005B1A4 -/* 1C260 8084E470 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1C264 8084E474 8E050694 */ lw $a1, 0x0694($s0) ## 00000694 -/* 1C268 8084E478 50A00009 */ beql $a1, $zero, .L8084E4A0 -/* 1C26C 8084E47C 86030690 */ lh $v1, 0x0690($s0) ## 00000690 -/* 1C270 8084E480 8E0806A8 */ lw $t0, 0x06A8($s0) ## 000006A8 -/* 1C274 8084E484 55050006 */ bnel $t0, $a1, .L8084E4A0 -/* 1C278 8084E488 86030690 */ lh $v1, 0x0690($s0) ## 00000690 -/* 1C27C 8084E48C 0C214C52 */ jal func_80853148 -/* 1C280 8084E490 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C284 8084E494 10000017 */ beq $zero, $zero, .L8084E4F4 -/* 1C288 8084E498 8E0A0680 */ lw $t2, 0x0680($s0) ## 00000680 -/* 1C28C 8084E49C 86030690 */ lh $v1, 0x0690($s0) ## 00000690 -.L8084E4A0: -/* 1C290 8084E4A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C294 8084E4A4 0461000A */ bgez $v1, .L8084E4D0 -/* 1C298 8084E4A8 00000000 */ nop -/* 1C29C 8084E4AC 8E02068C */ lw $v0, 0x068C($s0) ## 0000068C -/* 1C2A0 8084E4B0 00034823 */ subu $t1, $zero, $v1 -/* 1C2A4 8084E4B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C2A8 8084E4B8 AE020694 */ sw $v0, 0x0694($s0) ## 00000694 -/* 1C2AC 8084E4BC A449010E */ sh $t1, 0x010E($v0) ## 0000010E -/* 1C2B0 8084E4C0 0C214C52 */ jal func_80853148 -/* 1C2B4 8084E4C4 8E050694 */ lw $a1, 0x0694($s0) ## 00000694 -/* 1C2B8 8084E4C8 1000000A */ beq $zero, $zero, .L8084E4F4 -/* 1C2BC 8084E4CC 8E0A0680 */ lw $t2, 0x0680($s0) ## 00000680 -.L8084E4D0: -/* 1C2C0 8084E4D0 0C20EC10 */ jal func_8083B040 -/* 1C2C4 8084E4D4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 1C2C8 8084E4D8 14400005 */ bne $v0, $zero, .L8084E4F0 -/* 1C2CC 8084E4DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C2D0 8084E4E0 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 1C2D4 8084E4E4 24A53098 */ addiu $a1, $a1, 0x3098 ## $a1 = 04003098 -/* 1C2D8 8084E4E8 0C20E826 */ jal func_8083A098 -/* 1C2DC 8084E4EC 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -.L8084E4F0: -/* 1C2E0 8084E4F0 8E0A0680 */ lw $t2, 0x0680($s0) ## 00000680 -.L8084E4F4: -/* 1C2E4 8084E4F4 3C01FC7F */ lui $at, 0xFC7F ## $at = FC7F0000 -/* 1C2E8 8084E4F8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FC7FFFFF -/* 1C2EC 8084E4FC 01415824 */ and $t3, $t2, $at -/* 1C2F0 8084E500 AE0B0680 */ sw $t3, 0x0680($s0) ## 00000680 -/* 1C2F4 8084E504 1000003A */ beq $zero, $zero, .L8084E5F0 -/* 1C2F8 8084E508 AE0006A8 */ sw $zero, 0x06A8($s0) ## 000006A8 -/* 1C2FC 8084E50C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L8084E510: -/* 1C300 8084E510 14610037 */ bne $v1, $at, .L8084E5F0 -/* 1C304 8084E514 3C0E8085 */ lui $t6, %hi(D_808549D4) ## $t6 = 80850000 -/* 1C308 8084E518 944C04C4 */ lhu $t4, 0x04C4($v0) ## 000004C4 -/* 1C30C 8084E51C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 1C310 8084E520 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 1C314 8084E524 000C6840 */ sll $t5, $t4, 1 -/* 1C318 8084E528 01CD7021 */ addu $t6, $t6, $t5 -/* 1C31C 8084E52C 85CE49D4 */ lh $t6, %lo(D_808549D4)($t6) -/* 1C320 8084E530 240F05FF */ addiu $t7, $zero, 0x05FF ## $t7 = 000005FF -/* 1C324 8084E534 A46F1392 */ sh $t7, 0x1392($v1) ## 8015F9F2 -/* 1C328 8084E538 A46E1394 */ sh $t6, 0x1394($v1) ## 8015F9F4 -/* 1C32C 8084E53C 945804C4 */ lhu $t8, 0x04C4($v0) ## 000004C4 -/* 1C330 8084E540 3C01DFFF */ lui $at, 0xDFFF ## $at = DFFF0000 -/* 1C334 8084E544 3421FFFF */ ori $at, $at, 0xFFFF ## $at = DFFFFFFF -/* 1C338 8084E548 A0781397 */ sb $t8, 0x1397($v1) ## 8015F9F7 -/* 1C33C 8084E54C 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 1C340 8084E550 A2000444 */ sb $zero, 0x0444($s0) ## 00000444 -/* 1C344 8084E554 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C348 8084E558 03214024 */ and $t0, $t9, $at -/* 1C34C 8084E55C AE08067C */ sw $t0, 0x067C($s0) ## 0000067C -/* 1C350 8084E560 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1C354 8084E564 0C214BFF */ jal func_80852FFC -/* 1C358 8084E568 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 1C35C 8084E56C 8629032C */ lh $t1, 0x032C($s1) ## 0000032C -/* 1C360 8084E570 3C013000 */ lui $at, 0x3000 ## $at = 30000000 -/* 1C364 8084E574 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 1C368 8084E578 312AFFF7 */ andi $t2, $t1, 0xFFF7 ## $t2 = 00000000 -/* 1C36C 8084E57C A62A032C */ sh $t2, 0x032C($s1) ## 0000032C -/* 1C370 8084E580 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 1C374 8084E584 8E0D0680 */ lw $t5, 0x0680($s0) ## 00000680 -/* 1C378 8084E588 240F000F */ addiu $t7, $zero, 0x000F ## $t7 = 0000000F -/* 1C37C 8084E58C 01616025 */ or $t4, $t3, $at ## $t4 = 30000000 -/* 1C380 8084E590 3C010800 */ lui $at, 0x0800 ## $at = 08000000 -/* 1C384 8084E594 01A17025 */ or $t6, $t5, $at ## $t6 = 08000000 -/* 1C388 8084E598 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -/* 1C38C 8084E59C AE0E0680 */ sw $t6, 0x0680($s0) ## 00000680 -/* 1C390 8084E5A0 44070000 */ mfc1 $a3, $f0 -/* 1C394 8084E5A4 AFAF0024 */ sw $t7, 0x0024($sp) -/* 1C398 8084E5A8 AFA00020 */ sw $zero, 0x0020($sp) -/* 1C39C 8084E5AC AFA0001C */ sw $zero, 0x001C($sp) -/* 1C3A0 8084E5B0 AFA00018 */ sw $zero, 0x0018($sp) -/* 1C3A4 8084E5B4 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 1C3A8 8084E5B8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 1C3AC 8084E5BC 2406008C */ addiu $a2, $zero, 0x008C ## $a2 = 0000008C -/* 1C3B0 8084E5C0 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 1C3B4 8084E5C4 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 1C3B8 8084E5C8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 1C3BC 8084E5CC 14400003 */ bne $v0, $zero, .L8084E5DC -/* 1C3C0 8084E5D0 00000000 */ nop -/* 1C3C4 8084E5D4 0C01DDB9 */ jal func_800776E4 -/* 1C3C8 8084E5D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L8084E5DC: -/* 1C3CC 8084E5DC 3C038016 */ lui $v1, %hi(gSaveContext) -/* 1C3D0 8084E5E0 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 1C3D4 8084E5E4 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 1C3D8 8084E5E8 A06213E0 */ sb $v0, 0x13E0($v1) ## 8015FA40 -/* 1C3DC 8084E5EC A06213E1 */ sb $v0, 0x13E1($v1) ## 8015FA41 -.L8084E5F0: -/* 1C3E0 8084E5F0 8FBF0034 */ lw $ra, 0x0034($sp) -.L8084E5F4: -/* 1C3E4 8084E5F4 8FB0002C */ lw $s0, 0x002C($sp) -/* 1C3E8 8084E5F8 8FB10030 */ lw $s1, 0x0030($sp) -/* 1C3EC 8084E5FC 03E00008 */ jr $ra -/* 1C3F0 8084E600 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E604.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E604.s deleted file mode 100644 index 3d4c216eae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E604.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_8084E604 -/* 1C3F4 8084E604 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 1C3F8 8084E608 AFB00030 */ sw $s0, 0x0030($sp) -/* 1C3FC 8084E60C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1C400 8084E610 AFBF0034 */ sw $ra, 0x0034($sp) -/* 1C404 8084E614 AFA50044 */ sw $a1, 0x0044($sp) -/* 1C408 8084E618 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 -/* 1C40C 8084E61C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1C410 8084E620 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001B4 -/* 1C414 8084E624 0C028EF0 */ jal func_800A3BC0 -/* 1C418 8084E628 AFA6003C */ sw $a2, 0x003C($sp) -/* 1C41C 8084E62C 10400008 */ beq $v0, $zero, .L8084E650 -/* 1C420 8084E630 8FA6003C */ lw $a2, 0x003C($sp) -/* 1C424 8084E634 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 1C428 8084E638 24A53050 */ addiu $a1, $a1, 0x3050 ## $a1 = 04003050 -/* 1C42C 8084E63C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C430 8084E640 0C20E826 */ jal func_8083A098 -/* 1C434 8084E644 8FA60044 */ lw $a2, 0x0044($sp) -/* 1C438 8084E648 1000001B */ beq $zero, $zero, .L8084E6B8 -/* 1C43C 8084E64C 00000000 */ nop -.L8084E650: -/* 1C440 8084E650 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1C444 8084E654 0C02914C */ jal func_800A4530 -/* 1C448 8084E658 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 -/* 1C44C 8084E65C 10400016 */ beq $v0, $zero, .L8084E6B8 -/* 1C450 8084E660 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 1C454 8084E664 0C021CCC */ jal Inventory_ChangeAmmo -/* 1C458 8084E668 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -/* 1C45C 8084E66C C60409C0 */ lwc1 $f4, 0x09C0($s0) ## 000009C0 -/* 1C460 8084E670 8E0709BC */ lw $a3, 0x09BC($s0) ## 000009BC -/* 1C464 8084E674 240E0FA0 */ addiu $t6, $zero, 0x0FA0 ## $t6 = 00000FA0 -/* 1C468 8084E678 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 1C46C 8084E67C C60609C4 */ lwc1 $f6, 0x09C4($s0) ## 000009C4 -/* 1C470 8084E680 AFAE0018 */ sw $t6, 0x0018($sp) -/* 1C474 8084E684 8FA50044 */ lw $a1, 0x0044($sp) -/* 1C478 8084E688 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 1C47C 8084E68C 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 1C480 8084E690 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 1C484 8084E694 AFB80024 */ sw $t8, 0x0024($sp) -/* 1C488 8084E698 AFA00020 */ sw $zero, 0x0020($sp) -/* 1C48C 8084E69C 24060016 */ addiu $a2, $zero, 0x0016 ## $a2 = 00000016 -/* 1C490 8084E6A0 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 1C494 8084E6A4 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 1C498 8084E6A8 AFAF001C */ sw $t7, 0x001C($sp) -/* 1C49C 8084E6AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C4A0 8084E6B0 0C20C9A6 */ jal func_80832698 -/* 1C4A4 8084E6B4 24056800 */ addiu $a1, $zero, 0x6800 ## $a1 = 00006800 -.L8084E6B8: -/* 1C4A8 8084E6B8 0C20DC87 */ jal func_8083721C -/* 1C4AC 8084E6BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C4B0 8084E6C0 8FBF0034 */ lw $ra, 0x0034($sp) -/* 1C4B4 8084E6C4 8FB00030 */ lw $s0, 0x0030($sp) -/* 1C4B8 8084E6C8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 1C4BC 8084E6CC 03E00008 */ jr $ra -/* 1C4C0 8084E6D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E6D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E6D4.s deleted file mode 100644 index 720f69345e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E6D4.s +++ /dev/null @@ -1,191 +0,0 @@ -glabel func_8084E6D4 -/* 1C4C4 8084E6D4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 1C4C8 8084E6D8 AFB0002C */ sw $s0, 0x002C($sp) -/* 1C4CC 8084E6DC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1C4D0 8084E6E0 AFB10030 */ sw $s1, 0x0030($sp) -/* 1C4D4 8084E6E4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 1C4D8 8084E6E8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1C4DC 8084E6EC AFBF0034 */ sw $ra, 0x0034($sp) -/* 1C4E0 8084E6F0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1C4E4 8084E6F4 0C028EF0 */ jal func_800A3BC0 -/* 1C4E8 8084E6F8 AFA50038 */ sw $a1, 0x0038($sp) -/* 1C4EC 8084E6FC 50400079 */ beql $v0, $zero, .L8084E8E4 -/* 1C4F0 8084E700 860D0850 */ lh $t5, 0x0850($s0) ## 00000850 -/* 1C4F4 8084E704 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 1C4F8 8084E708 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C4FC 8084E70C 10400030 */ beq $v0, $zero, .L8084E7D0 -/* 1C500 8084E710 28410002 */ slti $at, $v0, 0x0002 -/* 1C504 8084E714 14200002 */ bne $at, $zero, .L8084E720 -/* 1C508 8084E718 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 1C50C 8084E71C A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -.L8084E720: -/* 1C510 8084E720 0C2137FD */ jal func_8084DFF4 -/* 1C514 8084E724 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1C518 8084E728 50400093 */ beql $v0, $zero, .L8084E978 -/* 1C51C 8084E72C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 1C520 8084E730 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 -/* 1C524 8084E734 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 1C528 8084E738 55E1008F */ bnel $t7, $at, .L8084E978 -/* 1C52C 8084E73C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 1C530 8084E740 8E020694 */ lw $v0, 0x0694($s0) ## 00000694 -/* 1C534 8084E744 3C188016 */ lui $t8, %hi(gSaveContext+0x1424) -/* 1C538 8084E748 0002102B */ sltu $v0, $zero, $v0 -/* 1C53C 8084E74C 50400006 */ beql $v0, $zero, .L8084E768 -/* 1C540 8084E750 92020692 */ lbu $v0, 0x0692($s0) ## 00000692 -/* 1C544 8084E754 82020693 */ lb $v0, 0x0693($s0) ## 00000693 -/* 1C548 8084E758 28420000 */ slti $v0, $v0, 0x0000 -/* 1C54C 8084E75C 14400004 */ bne $v0, $zero, .L8084E770 -/* 1C550 8084E760 00000000 */ nop -/* 1C554 8084E764 92020692 */ lbu $v0, 0x0692($s0) ## 00000692 -.L8084E768: -/* 1C558 8084E768 30420020 */ andi $v0, $v0, 0x0020 ## $v0 = 00000000 -/* 1C55C 8084E76C 0002102B */ sltu $v0, $zero, $v0 -.L8084E770: -/* 1C560 8084E770 14400004 */ bne $v0, $zero, .L8084E784 -/* 1C564 8084E774 00000000 */ nop -/* 1C568 8084E778 8718FA84 */ lh $t8, %lo(gSaveContext+0x1424)($t8) -/* 1C56C 8084E77C 5700007E */ bnel $t8, $zero, .L8084E978 -/* 1C570 8084E780 8FBF0034 */ lw $ra, 0x0034($sp) -.L8084E784: -/* 1C574 8084E784 1040000E */ beq $v0, $zero, .L8084E7C0 -/* 1C578 8084E788 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C57C 8084E78C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C580 8084E790 0C2137DB */ jal func_8084DF6C -/* 1C584 8084E794 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1C588 8084E798 A2000693 */ sb $zero, 0x0693($s0) ## 00000693 -/* 1C58C 8084E79C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C590 8084E7A0 0C212D35 */ jal func_8084B4D4 -/* 1C594 8084E7A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1C598 8084E7A8 14400072 */ bne $v0, $zero, .L8084E974 -/* 1C59C 8084E7AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C5A0 8084E7B0 0C214C52 */ jal func_80853148 -/* 1C5A4 8084E7B4 8E050694 */ lw $a1, 0x0694($s0) ## 00000694 -/* 1C5A8 8084E7B8 1000006F */ beq $zero, $zero, .L8084E978 -/* 1C5AC 8084E7BC 8FBF0034 */ lw $ra, 0x0034($sp) -.L8084E7C0: -/* 1C5B0 8084E7C0 0C2137EB */ jal func_8084DFAC -/* 1C5B4 8084E7C4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1C5B8 8084E7C8 1000006B */ beq $zero, $zero, .L8084E978 -/* 1C5BC 8084E7CC 8FBF0034 */ lw $ra, 0x0034($sp) -.L8084E7D0: -/* 1C5C0 8084E7D0 0C20CB6F */ jal func_80832DBC -/* 1C5C4 8084E7D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C5C8 8084E7D8 82020434 */ lb $v0, 0x0434($s0) ## 00000434 -/* 1C5CC 8084E7DC 2403007C */ addiu $v1, $zero, 0x007C ## $v1 = 0000007C -/* 1C5D0 8084E7E0 54620029 */ bnel $v1, $v0, .L8084E888 -/* 1C5D4 8084E7E4 8E0B01BC */ lw $t3, 0x01BC($s0) ## 000001BC -/* 1C5D8 8084E7E8 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 1C5DC 8084E7EC 2401F3FF */ addiu $at, $zero, 0xF3FF ## $at = FFFFF3FF -/* 1C5E0 8084E7F0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C5E4 8084E7F4 03214024 */ and $t0, $t9, $at -/* 1C5E8 8084E7F8 10620016 */ beq $v1, $v0, .L8084E854 -/* 1C5EC 8084E7FC AE08067C */ sw $t0, 0x067C($s0) ## 0000067C -/* 1C5F0 8084E800 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 1C5F4 8084E804 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 1C5F8 8084E808 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 1C5FC 8084E80C 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 1C600 8084E810 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 1C604 8084E814 46062200 */ add.s $f8, $f4, $f6 -/* 1C608 8084E818 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 1C60C 8084E81C 2406013B */ addiu $a2, $zero, 0x013B ## $a2 = 0000013B -/* 1C610 8084E820 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 1C614 8084E824 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 1C618 8084E828 AFA00024 */ sw $zero, 0x0024($sp) -/* 1C61C 8084E82C AFA00020 */ sw $zero, 0x0020($sp) -/* 1C620 8084E830 AFA0001C */ sw $zero, 0x001C($sp) -/* 1C624 8084E834 AFA00018 */ sw $zero, 0x0018($sp) -/* 1C628 8084E838 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 1C62C 8084E83C E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 1C630 8084E840 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C634 8084E844 0C20F03A */ jal func_8083C0E8 -/* 1C638 8084E848 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 1C63C 8084E84C 1000004A */ beq $zero, $zero, .L8084E978 -/* 1C640 8084E850 8FBF0034 */ lw $ra, 0x0034($sp) -.L8084E854: -/* 1C644 8084E854 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 1C648 8084E858 A20000B0 */ sb $zero, 0x00B0($s0) ## 000000B0 -/* 1C64C 8084E85C 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 1C650 8084E860 44070000 */ mfc1 $a3, $f0 -/* 1C654 8084E864 AFA90018 */ sw $t1, 0x0018($sp) -/* 1C658 8084E868 AFA00014 */ sw $zero, 0x0014($sp) -/* 1C65C 8084E86C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1C660 8084E870 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 1C664 8084E874 0C20DF03 */ jal func_80837C0C -/* 1C668 8084E878 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 1C66C 8084E87C 1000003E */ beq $zero, $zero, .L8084E978 -/* 1C670 8084E880 8FBF0034 */ lw $ra, 0x0034($sp) -/* 1C674 8084E884 8E0B01BC */ lw $t3, 0x01BC($s0) ## 000001BC -.L8084E888: -/* 1C678 8084E888 3C0A0400 */ lui $t2, 0x0400 ## $t2 = 04000000 -/* 1C67C 8084E88C 254A2DF8 */ addiu $t2, $t2, 0x2DF8 ## $t2 = 04002DF8 -/* 1C680 8084E890 154B0008 */ bne $t2, $t3, .L8084E8B4 -/* 1C684 8084E894 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C688 8084E898 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1C68C 8084E89C 24C62788 */ addiu $a2, $a2, 0x2788 ## $a2 = 04002788 -/* 1C690 8084E8A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C694 8084E8A4 0C20C8B4 */ jal func_808322D0 -/* 1C698 8084E8A8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1C69C 8084E8AC 10000006 */ beq $zero, $zero, .L8084E8C8 -/* 1C6A0 8084E8B0 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -.L8084E8B4: -/* 1C6A4 8084E8B4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1C6A8 8084E8B8 24C62780 */ addiu $a2, $a2, 0x2780 ## $a2 = 04002780 -/* 1C6AC 8084E8BC 0C20C8B4 */ jal func_808322D0 -/* 1C6B0 8084E8C0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1C6B4 8084E8C4 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -.L8084E8C8: -/* 1C6B8 8084E8C8 A60C0850 */ sh $t4, 0x0850($s0) ## 00000850 -/* 1C6BC 8084E8CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1C6C0 8084E8D0 0C20D7A9 */ jal func_80835EA4 -/* 1C6C4 8084E8D4 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 1C6C8 8084E8D8 10000027 */ beq $zero, $zero, .L8084E978 -/* 1C6CC 8084E8DC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 1C6D0 8084E8E0 860D0850 */ lh $t5, 0x0850($s0) ## 00000850 -.L8084E8E4: -/* 1C6D4 8084E8E4 3C0E8016 */ lui $t6, %hi(gSaveContext+4) -/* 1C6D8 8084E8E8 55A0000B */ bnel $t5, $zero, .L8084E918 -/* 1C6DC 8084E8EC 8E1801BC */ lw $t8, 0x01BC($s0) ## 000001BC -/* 1C6E0 8084E8F0 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) -/* 1C6E4 8084E8F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C6E8 8084E8F8 3C058085 */ lui $a1, %hi(D_808549E0) ## $a1 = 80850000 -/* 1C6EC 8084E8FC 51C0001E */ beql $t6, $zero, .L8084E978 -/* 1C6F0 8084E900 8FBF0034 */ lw $ra, 0x0034($sp) -/* 1C6F4 8084E904 0C20CA49 */ jal func_80832924 -/* 1C6F8 8084E908 24A549E0 */ addiu $a1, $a1, %lo(D_808549E0) ## $a1 = 808549E0 -/* 1C6FC 8084E90C 1000001A */ beq $zero, $zero, .L8084E978 -/* 1C700 8084E910 8FBF0034 */ lw $ra, 0x0034($sp) -/* 1C704 8084E914 8E1801BC */ lw $t8, 0x01BC($s0) ## 000001BC -.L8084E918: -/* 1C708 8084E918 3C0F0400 */ lui $t7, 0x0400 ## $t7 = 04000000 -/* 1C70C 8084E91C 25EF2788 */ addiu $t7, $t7, 0x2788 ## $t7 = 04002788 -/* 1C710 8084E920 55F8000E */ bnel $t7, $t8, .L8084E95C -/* 1C714 8084E924 8FA40038 */ lw $a0, 0x0038($sp) -/* 1C718 8084E928 863907A0 */ lh $t9, 0x07A0($s1) ## 000007A0 -/* 1C71C 8084E92C 00194080 */ sll $t0, $t9, 2 -/* 1C720 8084E930 02284821 */ addu $t1, $s1, $t0 -/* 1C724 8084E934 0C016A7D */ jal func_8005A9F4 -/* 1C728 8084E938 8D240790 */ lw $a0, 0x0790($t1) ## 00000790 -/* 1C72C 8084E93C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 1C730 8084E940 00412821 */ addu $a1, $v0, $at -/* 1C734 8084E944 00052C00 */ sll $a1, $a1, 16 -/* 1C738 8084E948 00052C03 */ sra $a1, $a1, 16 -/* 1C73C 8084E94C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 1C740 8084E950 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 1C744 8084E954 24060FA0 */ addiu $a2, $zero, 0x0FA0 ## $a2 = 00000FA0 -/* 1C748 8084E958 8FA40038 */ lw $a0, 0x0038($sp) -.L8084E95C: -/* 1C74C 8084E95C 0C02914C */ jal func_800A4530 -/* 1C750 8084E960 3C0541A8 */ lui $a1, 0x41A8 ## $a1 = 41A80000 -/* 1C754 8084E964 10400003 */ beq $v0, $zero, .L8084E974 -/* 1C758 8084E968 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C75C 8084E96C 0C20CCBD */ jal func_808332F4 -/* 1C760 8084E970 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L8084E974: -/* 1C764 8084E974 8FBF0034 */ lw $ra, 0x0034($sp) -.L8084E978: -/* 1C768 8084E978 8FB0002C */ lw $s0, 0x002C($sp) -/* 1C76C 8084E97C 8FB10030 */ lw $s1, 0x0030($sp) -/* 1C770 8084E980 03E00008 */ jr $ra -/* 1C774 8084E984 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E988.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E988.s deleted file mode 100644 index 9adbf49a34..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E988.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8084E988 -/* 1C778 8084E988 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1C77C 8084E98C AFBF0014 */ sw $ra, 0x0014($sp) -/* 1C780 8084E990 3C058085 */ lui $a1, %hi(D_808549F0) ## $a1 = 80850000 -/* 1C784 8084E994 0C20CA49 */ jal func_80832924 -/* 1C788 8084E998 24A549F0 */ addiu $a1, $a1, %lo(D_808549F0) ## $a1 = 808549F0 -/* 1C78C 8084E99C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1C790 8084E9A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1C794 8084E9A4 03E00008 */ jr $ra -/* 1C798 8084E9A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E9AC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E9AC.s deleted file mode 100644 index f87580a13f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E9AC.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_8084E9AC -/* 1C79C 8084E9AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1C7A0 8084E9B0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 1C7A4 8084E9B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1C7A8 8084E9B8 AFA50024 */ sw $a1, 0x0024($sp) -/* 1C7AC 8084E9BC 24C701B4 */ addiu $a3, $a2, 0x01B4 ## $a3 = 000001B4 -/* 1C7B0 8084E9C0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1C7B4 8084E9C4 00E02825 */ or $a1, $a3, $zero ## $a1 = 000001B4 -/* 1C7B8 8084E9C8 AFA70018 */ sw $a3, 0x0018($sp) -/* 1C7BC 8084E9CC 0C028EF0 */ jal func_800A3BC0 -/* 1C7C0 8084E9D0 AFA60020 */ sw $a2, 0x0020($sp) -/* 1C7C4 8084E9D4 8FA60020 */ lw $a2, 0x0020($sp) -/* 1C7C8 8084E9D8 1040001A */ beq $v0, $zero, .L8084EA44 -/* 1C7CC 8084E9DC 8FA70018 */ lw $a3, 0x0018($sp) -/* 1C7D0 8084E9E0 80CE084F */ lb $t6, 0x084F($a2) ## 0000084F -/* 1C7D4 8084E9E4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1C7D8 8084E9E8 15C00012 */ bne $t6, $zero, .L8084EA34 -/* 1C7DC 8084E9EC 00000000 */ nop -/* 1C7E0 8084E9F0 84C20850 */ lh $v0, 0x0850($a2) ## 00000850 -/* 1C7E4 8084E9F4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 1C7E8 8084E9F8 14400003 */ bne $v0, $zero, .L8084EA08 -/* 1C7EC 8084E9FC 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 1C7F0 8084EA00 10000003 */ beq $zero, $zero, .L8084EA10 -/* 1C7F4 8084EA04 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L8084EA08: -/* 1C7F8 8084EA08 A4CF0850 */ sh $t7, 0x0850($a2) ## 00000850 -/* 1C7FC 8084EA0C 84C30850 */ lh $v1, 0x0850($a2) ## 00000850 -.L8084EA10: -/* 1C800 8084EA10 54600028 */ bnel $v1, $zero, .L8084EAB4 -/* 1C804 8084EA14 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1C808 8084EA18 C4C401C8 */ lwc1 $f4, 0x01C8($a2) ## 000001C8 -/* 1C80C 8084EA1C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 1C810 8084EA20 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 1C814 8084EA24 A0D8084F */ sb $t8, 0x084F($a2) ## 0000084F -/* 1C818 8084EA28 46062201 */ sub.s $f8, $f4, $f6 -/* 1C81C 8084EA2C 10000020 */ beq $zero, $zero, .L8084EAB0 -/* 1C820 8084EA30 E4C801C4 */ swc1 $f8, 0x01C4($a2) ## 000001C4 -.L8084EA34: -/* 1C824 8084EA34 0C20F03A */ jal func_8083C0E8 -/* 1C828 8084EA38 8FA50024 */ lw $a1, 0x0024($sp) -/* 1C82C 8084EA3C 1000001D */ beq $zero, $zero, .L8084EAB4 -/* 1C830 8084EA40 8FBF0014 */ lw $ra, 0x0014($sp) -.L8084EA44: -/* 1C834 8084EA44 3C198016 */ lui $t9, %hi(gSaveContext+4) -/* 1C838 8084EA48 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) -/* 1C83C 8084EA4C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 1C840 8084EA50 3C05431E */ lui $a1, 0x431E ## $a1 = 431E0000 -/* 1C844 8084EA54 1720000A */ bne $t9, $zero, .L8084EA80 -/* 1C848 8084EA58 00000000 */ nop -/* 1C84C 8084EA5C 0C02914C */ jal func_800A4530 -/* 1C850 8084EA60 AFA60020 */ sw $a2, 0x0020($sp) -/* 1C854 8084EA64 10400006 */ beq $v0, $zero, .L8084EA80 -/* 1C858 8084EA68 8FA60020 */ lw $a2, 0x0020($sp) -/* 1C85C 8084EA6C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1C860 8084EA70 0C20C9A6 */ jal func_80832698 -/* 1C864 8084EA74 24056800 */ addiu $a1, $zero, 0x6800 ## $a1 = 00006800 -/* 1C868 8084EA78 1000000E */ beq $zero, $zero, .L8084EAB4 -/* 1C86C 8084EA7C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8084EA80: -/* 1C870 8084EA80 3C088016 */ lui $t0, %hi(gSaveContext+4) -/* 1C874 8084EA84 8D08E664 */ lw $t0, %lo(gSaveContext+4)($t0) -/* 1C878 8084EA88 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1C87C 8084EA8C 3C058085 */ lui $a1, %hi(D_808549F4) ## $a1 = 80850000 -/* 1C880 8084EA90 11000005 */ beq $t0, $zero, .L8084EAA8 -/* 1C884 8084EA94 00000000 */ nop -/* 1C888 8084EA98 0C20CA49 */ jal func_80832924 -/* 1C88C 8084EA9C 24A549F4 */ addiu $a1, $a1, %lo(D_808549F4) ## $a1 = 808549F4 -/* 1C890 8084EAA0 10000004 */ beq $zero, $zero, .L8084EAB4 -/* 1C894 8084EAA4 8FBF0014 */ lw $ra, 0x0014($sp) -.L8084EAA8: -/* 1C898 8084EAA8 0C213A62 */ jal func_8084E988 -/* 1C89C 8084EAAC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L8084EAB0: -/* 1C8A0 8084EAB0 8FBF0014 */ lw $ra, 0x0014($sp) -.L8084EAB4: -/* 1C8A4 8084EAB4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1C8A8 8084EAB8 03E00008 */ jr $ra -/* 1C8AC 8084EABC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s deleted file mode 100644 index 6fd05d948a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s +++ /dev/null @@ -1,137 +0,0 @@ -glabel func_8084EAC0 -/* 1C8B0 8084EAC0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 1C8B4 8084EAC4 AFB00018 */ sw $s0, 0x0018($sp) -/* 1C8B8 8084EAC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1C8BC 8084EACC AFBF001C */ sw $ra, 0x001C($sp) -/* 1C8C0 8084EAD0 AFA50034 */ sw $a1, 0x0034($sp) -/* 1C8C4 8084EAD4 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 -/* 1C8C8 8084EAD8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1C8CC 8084EADC 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001B4 -/* 1C8D0 8084EAE0 0C028EF0 */ jal func_800A3BC0 -/* 1C8D4 8084EAE4 AFA60020 */ sw $a2, 0x0020($sp) -/* 1C8D8 8084EAE8 10400043 */ beq $v0, $zero, .L8084EBF8 -/* 1C8DC 8084EAEC 8FA60020 */ lw $a2, 0x0020($sp) -/* 1C8E0 8084EAF0 860E0850 */ lh $t6, 0x0850($s0) ## 00000850 -/* 1C8E4 8084EAF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1C8E8 8084EAF8 15C00036 */ bne $t6, $zero, .L8084EBD4 -/* 1C8EC 8084EAFC 00000000 */ nop -/* 1C8F0 8084EB00 82020154 */ lb $v0, 0x0154($s0) ## 00000154 -/* 1C8F4 8084EB04 24010022 */ addiu $at, $zero, 0x0022 ## $at = 00000022 -/* 1C8F8 8084EB08 3C038085 */ lui $v1, %hi(D_808549D7) ## $v1 = 80850000 -/* 1C8FC 8084EB0C 14410018 */ bne $v0, $at, .L8084EB70 -/* 1C900 8084EB10 00621821 */ addu $v1, $v1, $v0 -/* 1C904 8084EB14 2404FFFF */ addiu $a0, $zero, 0xFFFF ## $a0 = FFFFFFFF -/* 1C908 8084EB18 0C01DF64 */ jal Math_Rand_S16Offset - -/* 1C90C 8084EB1C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 1C910 8084EB20 14400002 */ bne $v0, $zero, .L8084EB2C -/* 1C914 8084EB24 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 1C918 8084EB28 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -.L8084EB2C: -/* 1C91C 8084EB2C 04610006 */ bgez $v1, .L8084EB48 -/* 1C920 8084EB30 3C0F8016 */ lui $t7, %hi(gSaveContext+0x30) -/* 1C924 8084EB34 85EFE690 */ lh $t7, %lo(gSaveContext+0x30)($t7) -/* 1C928 8084EB38 29E10011 */ slti $at, $t7, 0x0011 -/* 1C92C 8084EB3C 10200002 */ beq $at, $zero, .L8084EB48 -/* 1C930 8084EB40 00000000 */ nop -/* 1C934 8084EB44 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -.L8084EB48: -/* 1C938 8084EB48 04610006 */ bgez $v1, .L8084EB64 -/* 1C93C 8084EB4C 0003C100 */ sll $t8, $v1, 4 -/* 1C940 8084EB50 8FA40034 */ lw $a0, 0x0034($sp) -/* 1C944 8084EB54 0C021C5D */ jal Health_ChangeBy -/* 1C948 8084EB58 2405FFF0 */ addiu $a1, $zero, 0xFFF0 ## $a1 = FFFFFFF0 -/* 1C94C 8084EB5C 10000015 */ beq $zero, $zero, .L8084EBB4 -/* 1C950 8084EB60 00000000 */ nop -.L8084EB64: -/* 1C954 8084EB64 3C018016 */ lui $at, %hi(gSaveContext+0x1424) -/* 1C958 8084EB68 10000012 */ beq $zero, $zero, .L8084EBB4 -/* 1C95C 8084EB6C A438FA84 */ sh $t8, %lo(gSaveContext+0x1424)($at) -.L8084EB70: -/* 1C960 8084EB70 906349D7 */ lbu $v1, %lo(D_808549D7)($v1) -/* 1C964 8084EB74 24080140 */ addiu $t0, $zero, 0x0140 ## $t0 = 00000140 -/* 1C968 8084EB78 3C018016 */ lui $at, %hi(gSaveContext+0x1424) -/* 1C96C 8084EB7C 30790001 */ andi $t9, $v1, 0x0001 ## $t9 = 00000000 -/* 1C970 8084EB80 13200002 */ beq $t9, $zero, .L8084EB8C -/* 1C974 8084EB84 30690002 */ andi $t1, $v1, 0x0002 ## $t1 = 00000000 -/* 1C978 8084EB88 A428FA84 */ sh $t0, %lo(gSaveContext+0x1424)($at) -.L8084EB8C: -/* 1C97C 8084EB8C 11200004 */ beq $t1, $zero, .L8084EBA0 -/* 1C980 8084EB90 8FA40034 */ lw $a0, 0x0034($sp) -/* 1C984 8084EB94 0C021DA0 */ jal func_80087680 -/* 1C988 8084EB98 AFA30028 */ sw $v1, 0x0028($sp) -/* 1C98C 8084EB9C 8FA30028 */ lw $v1, 0x0028($sp) -.L8084EBA0: -/* 1C990 8084EBA0 306A0004 */ andi $t2, $v1, 0x0004 ## $t2 = 00000000 -/* 1C994 8084EBA4 11400003 */ beq $t2, $zero, .L8084EBB4 -/* 1C998 8084EBA8 240B0050 */ addiu $t3, $zero, 0x0050 ## $t3 = 00000050 -/* 1C99C 8084EBAC 3C018016 */ lui $at, %hi(gSaveContext+0x1424) -/* 1C9A0 8084EBB0 A42BFA84 */ sh $t3, %lo(gSaveContext+0x1424)($at) -.L8084EBB4: -/* 1C9A4 8084EBB4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1C9A8 8084EBB8 24C62670 */ addiu $a2, $a2, 0x2670 ## $a2 = 04002670 -/* 1C9AC 8084EBBC 8FA40034 */ lw $a0, 0x0034($sp) -/* 1C9B0 8084EBC0 0C20C8A9 */ jal func_808322A4 -/* 1C9B4 8084EBC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1C9B8 8084EBC8 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 1C9BC 8084EBCC 10000030 */ beq $zero, $zero, .L8084EC90 -/* 1C9C0 8084EBD0 A60C0850 */ sh $t4, 0x0850($s0) ## 00000850 -.L8084EBD4: -/* 1C9C4 8084EBD4 0C20F03A */ jal func_8083C0E8 -/* 1C9C8 8084EBD8 8FA50034 */ lw $a1, 0x0034($sp) -/* 1C9CC 8084EBDC 8FA40034 */ lw $a0, 0x0034($sp) -/* 1C9D0 8084EBE0 0C030129 */ jal Gameplay_GetCamera -/* 1C9D4 8084EBE4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1C9D8 8084EBE8 0C016C69 */ jal func_8005B1A4 -/* 1C9DC 8084EBEC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1C9E0 8084EBF0 10000028 */ beq $zero, $zero, .L8084EC94 -/* 1C9E4 8084EBF4 8FBF001C */ lw $ra, 0x001C($sp) -.L8084EBF8: -/* 1C9E8 8084EBF8 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 1C9EC 8084EBFC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 1C9F0 8084EC00 3C0D8016 */ lui $t5, %hi(gSaveContext+0x1424) -/* 1C9F4 8084EC04 5441001A */ bnel $v0, $at, .L8084EC70 -/* 1C9F8 8084EC08 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1C9FC 8084EC0C 85ADFA84 */ lh $t5, %lo(gSaveContext+0x1424)($t5) -/* 1CA00 8084EC10 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13f0) -/* 1CA04 8084EC14 55A00011 */ bnel $t5, $zero, .L8084EC5C -/* 1CA08 8084EC18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1CA0C 8084EC1C 85CEFA50 */ lh $t6, %lo(gSaveContext+0x13f0)($t6) -/* 1CA10 8084EC20 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 1CA14 8084EC24 8FA40034 */ lw $a0, 0x0034($sp) -/* 1CA18 8084EC28 11C1000B */ beq $t6, $at, .L8084EC58 -/* 1CA1C 8084EC2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1CA20 8084EC30 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1CA24 8084EC34 0C20CADE */ jal func_80832B78 -/* 1CA28 8084EC38 24C62660 */ addiu $a2, $a2, 0x2660 ## $a2 = 04002660 -/* 1CA2C 8084EC3C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 1CA30 8084EC40 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 -/* 1CA34 8084EC44 8FA40034 */ lw $a0, 0x0034($sp) -/* 1CA38 8084EC48 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1CA3C 8084EC4C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 1CA40 8084EC50 0C023B67 */ jal func_8008ED9C -/* 1CA44 8084EC54 2407001E */ addiu $a3, $zero, 0x001E ## $a3 = 0000001E -.L8084EC58: -/* 1CA48 8084EC58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084EC5C: -/* 1CA4C 8084EC5C 0C20C9A6 */ jal func_80832698 -/* 1CA50 8084EC60 24056010 */ addiu $a1, $zero, 0x6010 ## $a1 = 00006010 -/* 1CA54 8084EC64 1000000B */ beq $zero, $zero, .L8084EC94 -/* 1CA58 8084EC68 8FBF001C */ lw $ra, 0x001C($sp) -/* 1CA5C 8084EC6C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L8084EC70: -/* 1CA60 8084EC70 14410007 */ bne $v0, $at, .L8084EC90 -/* 1CA64 8084EC74 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1CA68 8084EC78 0C02914C */ jal func_800A4530 -/* 1CA6C 8084EC7C 3C0541E8 */ lui $a1, 0x41E8 ## $a1 = 41E80000 -/* 1CA70 8084EC80 10400003 */ beq $v0, $zero, .L8084EC90 -/* 1CA74 8084EC84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1CA78 8084EC88 0C20C9A6 */ jal func_80832698 -/* 1CA7C 8084EC8C 2405680A */ addiu $a1, $zero, 0x680A ## $a1 = 0000680A -.L8084EC90: -/* 1CA80 8084EC90 8FBF001C */ lw $ra, 0x001C($sp) -.L8084EC94: -/* 1CA84 8084EC94 8FB00018 */ lw $s0, 0x0018($sp) -/* 1CA88 8084EC98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 1CA8C 8084EC9C 03E00008 */ jr $ra -/* 1CA90 8084ECA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ECA4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ECA4.s deleted file mode 100644 index 68c2a59bc9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ECA4.s +++ /dev/null @@ -1,154 +0,0 @@ -glabel func_8084ECA4 -/* 1CA94 8084ECA4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1CA98 8084ECA8 AFBF001C */ sw $ra, 0x001C($sp) -/* 1CA9C 8084ECAC AFB00018 */ sw $s0, 0x0018($sp) -/* 1CAA0 8084ECB0 AFA5002C */ sw $a1, 0x002C($sp) -/* 1CAA4 8084ECB4 848E0850 */ lh $t6, 0x0850($a0) ## 00000850 -/* 1CAA8 8084ECB8 3C188085 */ lui $t8, %hi(D_80854554) ## $t8 = 80850000 -/* 1CAAC 8084ECBC 27184554 */ addiu $t8, $t8, %lo(D_80854554) ## $t8 = 80854554 -/* 1CAB0 8084ECC0 000E7880 */ sll $t7, $t6, 2 -/* 1CAB4 8084ECC4 01EE7823 */ subu $t7, $t7, $t6 -/* 1CAB8 8084ECC8 000F7880 */ sll $t7, $t7, 2 -/* 1CABC 8084ECCC 01F8C821 */ addu $t9, $t7, $t8 -/* 1CAC0 8084ECD0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1CAC4 8084ECD4 0C20DC87 */ jal func_8083721C -/* 1CAC8 8084ECD8 AFB90024 */ sw $t9, 0x0024($sp) -/* 1CACC 8084ECDC 8FA4002C */ lw $a0, 0x002C($sp) -/* 1CAD0 8084ECE0 0C028EF0 */ jal func_800A3BC0 -/* 1CAD4 8084ECE4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1CAD8 8084ECE8 50400027 */ beql $v0, $zero, .L8084ED88 -/* 1CADC 8084ECEC 820B084F */ lb $t3, 0x084F($s0) ## 0000084F -/* 1CAE0 8084ECF0 8202084F */ lb $v0, 0x084F($s0) ## 0000084F -/* 1CAE4 8084ECF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1CAE8 8084ECF8 1040001E */ beq $v0, $zero, .L8084ED74 -/* 1CAEC 8084ECFC 00000000 */ nop -/* 1CAF0 8084ED00 86080850 */ lh $t0, 0x0850($s0) ## 00000850 -/* 1CAF4 8084ED04 00024880 */ sll $t1, $v0, 2 -/* 1CAF8 8084ED08 01224823 */ subu $t1, $t1, $v0 -/* 1CAFC 8084ED0C 1500000D */ bne $t0, $zero, .L8084ED44 -/* 1CB00 8084ED10 8FA4002C */ lw $a0, 0x002C($sp) -/* 1CB04 8084ED14 00094840 */ sll $t1, $t1, 1 -/* 1CB08 8084ED18 3C058085 */ lui $a1, %hi(D_80854A02) ## $a1 = 80850000 -/* 1CB0C 8084ED1C 00A92821 */ addu $a1, $a1, $t1 -/* 1CB10 8084ED20 90A54A02 */ lbu $a1, %lo(D_80854A02)($a1) -/* 1CB14 8084ED24 8FA4002C */ lw $a0, 0x002C($sp) -/* 1CB18 8084ED28 0C042DA0 */ jal func_8010B680 -/* 1CB1C 8084ED2C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 1CB20 8084ED30 0C03D719 */ jal func_800F5C64 -/* 1CB24 8084ED34 24040922 */ addiu $a0, $zero, 0x0922 ## $a0 = 00000922 -/* 1CB28 8084ED38 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 1CB2C 8084ED3C 10000057 */ beq $zero, $zero, .L8084EE9C -/* 1CB30 8084ED40 A60A0850 */ sh $t2, 0x0850($s0) ## 00000850 -.L8084ED44: -/* 1CB34 8084ED44 0C042F6F */ jal func_8010BDBC -/* 1CB38 8084ED48 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 1CB3C 8084ED4C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1CB40 8084ED50 14410052 */ bne $v0, $at, .L8084EE9C -/* 1CB44 8084ED54 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1CB48 8084ED58 A200084F */ sb $zero, 0x084F($s0) ## 0000084F -/* 1CB4C 8084ED5C 0C030129 */ jal Gameplay_GetCamera -/* 1CB50 8084ED60 8FA4002C */ lw $a0, 0x002C($sp) -/* 1CB54 8084ED64 0C016C69 */ jal func_8005B1A4 -/* 1CB58 8084ED68 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1CB5C 8084ED6C 1000004C */ beq $zero, $zero, .L8084EEA0 -/* 1CB60 8084ED70 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -.L8084ED74: -/* 1CB64 8084ED74 0C20F03A */ jal func_8083C0E8 -/* 1CB68 8084ED78 8FA5002C */ lw $a1, 0x002C($sp) -/* 1CB6C 8084ED7C 10000048 */ beq $zero, $zero, .L8084EEA0 -/* 1CB70 8084ED80 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 1CB74 8084ED84 820B084F */ lb $t3, 0x084F($s0) ## 0000084F -.L8084ED88: -/* 1CB78 8084ED88 8FAC0024 */ lw $t4, 0x0024($sp) -/* 1CB7C 8084ED8C 55600044 */ bnel $t3, $zero, .L8084EEA0 -/* 1CB80 8084ED90 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 1CB84 8084ED94 918D0008 */ lbu $t5, 0x0008($t4) ## 00000008 -/* 1CB88 8084ED98 C60401CC */ lwc1 $f4, 0x01CC($s0) ## 000001CC -/* 1CB8C 8084ED9C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 1CB90 8084EDA0 448D3000 */ mtc1 $t5, $f6 ## $f6 = 0.00 -/* 1CB94 8084EDA4 05A10004 */ bgez $t5, .L8084EDB8 -/* 1CB98 8084EDA8 46803220 */ cvt.s.w $f8, $f6 -/* 1CB9C 8084EDAC 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 -/* 1CBA0 8084EDB0 00000000 */ nop -/* 1CBA4 8084EDB4 460A4200 */ add.s $f8, $f8, $f10 -.L8084EDB8: -/* 1CBA8 8084EDB8 46082401 */ sub.s $f16, $f4, $f8 -/* 1CBAC 8084EDBC 4600848D */ trunc.w.s $f18, $f16 -/* 1CBB0 8084EDC0 44029000 */ mfc1 $v0, $f18 -/* 1CBB4 8084EDC4 00000000 */ nop -/* 1CBB8 8084EDC8 04420035 */ bltzl $v0, .L8084EEA0 -/* 1CBBC 8084EDCC 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 1CBC0 8084EDD0 918F0009 */ lbu $t7, 0x0009($t4) ## 00000009 -/* 1CBC4 8084EDD4 01E2082A */ slt $at, $t7, $v0 -/* 1CBC8 8084EDD8 54200031 */ bnel $at, $zero, .L8084EEA0 -/* 1CBCC 8084EDDC 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 1CBD0 8084EDE0 86180850 */ lh $t8, 0x0850($s0) ## 00000850 -/* 1CBD4 8084EDE4 53000006 */ beql $t8, $zero, .L8084EE00 -/* 1CBD8 8084EDE8 8E060438 */ lw $a2, 0x0438($s0) ## 00000438 -/* 1CBDC 8084EDEC 14400003 */ bne $v0, $zero, .L8084EDFC -/* 1CBE0 8084EDF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1CBE4 8084EDF4 0C00BDF7 */ jal func_8002F7DC -/* 1CBE8 8084EDF8 24052868 */ addiu $a1, $zero, 0x2868 ## $a1 = 00002868 -.L8084EDFC: -/* 1CBEC 8084EDFC 8E060438 */ lw $a2, 0x0438($s0) ## 00000438 -.L8084EE00: -/* 1CBF0 8084EE00 3C038085 */ lui $v1, %hi(D_80854A04) ## $v1 = 80850000 -/* 1CBF4 8084EE04 24634A04 */ addiu $v1, $v1, %lo(D_80854A04) ## $v1 = 80854A04 -/* 1CBF8 8084EE08 10C00024 */ beq $a2, $zero, .L8084EE9C -/* 1CBFC 8084EE0C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1CC00 8084EE10 84C40000 */ lh $a0, 0x0000($a2) ## 00000000 -/* 1CC04 8084EE14 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -.L8084EE18: -/* 1CC08 8084EE18 84790000 */ lh $t9, 0x0000($v1) ## 80854A04 -/* 1CC0C 8084EE1C 53240005 */ beql $t9, $a0, .L8084EE34 -/* 1CC10 8084EE20 28410004 */ slti $at, $v0, 0x0004 -/* 1CC14 8084EE24 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 1CC18 8084EE28 1445FFFB */ bne $v0, $a1, .L8084EE18 -/* 1CC1C 8084EE2C 24630006 */ addiu $v1, $v1, 0x0006 ## $v1 = 80854A0A -/* 1CC20 8084EE30 28410004 */ slti $at, $v0, 0x0004 -.L8084EE34: -/* 1CC24 8084EE34 10200019 */ beq $at, $zero, .L8084EE9C -/* 1CC28 8084EE38 24480001 */ addiu $t0, $v0, 0x0001 ## $t0 = 00000002 -/* 1CC2C 8084EE3C 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 1CC30 8084EE40 3C013000 */ lui $at, 0x3000 ## $at = 30000000 -/* 1CC34 8084EE44 A208084F */ sb $t0, 0x084F($s0) ## 0000084F -/* 1CC38 8084EE48 01215025 */ or $t2, $t1, $at ## $t2 = 30000000 -/* 1CC3C 8084EE4C A6000850 */ sh $zero, 0x0850($s0) ## 00000850 -/* 1CC40 8084EE50 AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C -/* 1CC44 8084EE54 ACD00118 */ sw $s0, 0x0118($a2) ## 00000118 -/* 1CC48 8084EE58 90640003 */ lbu $a0, 0x0003($v1) ## 80854A0D -/* 1CC4C 8084EE5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1CC50 8084EE60 04800003 */ bltz $a0, .L8084EE70 -/* 1CC54 8084EE64 00043823 */ subu $a3, $zero, $a0 -/* 1CC58 8084EE68 10000001 */ beq $zero, $zero, .L8084EE70 -/* 1CC5C 8084EE6C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -.L8084EE70: -/* 1CC60 8084EE70 8FA4002C */ lw $a0, 0x002C($sp) -/* 1CC64 8084EE74 0C023B67 */ jal func_8008ED9C -/* 1CC68 8084EE78 90660002 */ lbu $a2, 0x0002($v1) ## 80854A0C -/* 1CC6C 8084EE7C 8FAB0024 */ lw $t3, 0x0024($sp) -/* 1CC70 8084EE80 8FA4002C */ lw $a0, 0x002C($sp) -/* 1CC74 8084EE84 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1CC78 8084EE88 0C20C8B4 */ jal func_808322D0 -/* 1CC7C 8084EE8C 8D660004 */ lw $a2, 0x0004($t3) ## 00000004 -/* 1CC80 8084EE90 8FA4002C */ lw $a0, 0x002C($sp) -/* 1CC84 8084EE94 0C20D7A9 */ jal func_80835EA4 -/* 1CC88 8084EE98 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -.L8084EE9C: -/* 1CC8C 8084EE9C 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -.L8084EEA0: -/* 1CC90 8084EEA0 44813000 */ mtc1 $at, $f6 ## $f6 = 7.00 -/* 1CC94 8084EEA4 C60A01CC */ lwc1 $f10, 0x01CC($s0) ## 000001CC -/* 1CC98 8084EEA8 4606503E */ c.le.s $f10, $f6 -/* 1CC9C 8084EEAC 00000000 */ nop -/* 1CCA0 8084EEB0 45020005 */ bc1fl .L8084EEC8 -/* 1CCA4 8084EEB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 1CCA8 8084EEB8 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C -/* 1CCAC 8084EEBC 35AE0002 */ ori $t6, $t5, 0x0002 ## $t6 = 00000002 -/* 1CCB0 8084EEC0 AE0E067C */ sw $t6, 0x067C($s0) ## 0000067C -/* 1CCB4 8084EEC4 8FBF001C */ lw $ra, 0x001C($sp) -.L8084EEC8: -/* 1CCB8 8084EEC8 8FB00018 */ lw $s0, 0x0018($sp) -/* 1CCBC 8084EECC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1CCC0 8084EED0 03E00008 */ jr $ra -/* 1CCC4 8084EED4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s deleted file mode 100644 index eaf60edf72..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_8084EED8 -/* 1CCC8 8084EED8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 1CCCC 8084EEDC AFB0001C */ sw $s0, 0x001C($sp) -/* 1CCD0 8084EEE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1CCD4 8084EEE4 AFB10020 */ sw $s1, 0x0020($sp) -/* 1CCD8 8084EEE8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 1CCDC 8084EEEC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1CCE0 8084EEF0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1CCE4 8084EEF4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1CCE8 8084EEF8 0C028EF0 */ jal func_800A3BC0 -/* 1CCEC 8084EEFC AFA50028 */ sw $a1, 0x0028($sp) -/* 1CCF0 8084EF00 1040000B */ beq $v0, $zero, .L8084EF30 -/* 1CCF4 8084EF04 8FA40028 */ lw $a0, 0x0028($sp) -/* 1CCF8 8084EF08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1CCFC 8084EF0C 0C20F03A */ jal func_8083C0E8 -/* 1CD00 8084EF10 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 1CD04 8084EF14 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1CD08 8084EF18 0C030129 */ jal Gameplay_GetCamera -/* 1CD0C 8084EF1C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1CD10 8084EF20 0C016C69 */ jal func_8005B1A4 -/* 1CD14 8084EF24 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1CD18 8084EF28 10000021 */ beq $zero, $zero, .L8084EFB0 -/* 1CD1C 8084EF2C 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084EF30: -/* 1CD20 8084EF30 0C02914C */ jal func_800A4530 -/* 1CD24 8084EF34 3C054214 */ lui $a1, 0x4214 ## $a1 = 42140000 -/* 1CD28 8084EF38 10400016 */ beq $v0, $zero, .L8084EF94 -/* 1CD2C 8084EF3C 8FA40028 */ lw $a0, 0x0028($sp) -/* 1CD30 8084EF40 3C078085 */ lui $a3, %hi(D_80854A1C) ## $a3 = 80850000 -/* 1CD34 8084EF44 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 1CD38 8084EF48 AFAE0010 */ sw $t6, 0x0010($sp) -/* 1CD3C 8084EF4C 24E74A1C */ addiu $a3, $a3, %lo(D_80854A1C) ## $a3 = 80854A1C -/* 1CD40 8084EF50 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1CD44 8084EF54 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1CD48 8084EF58 0C20E5A0 */ jal func_80839680 -/* 1CD4C 8084EF5C 260603B0 */ addiu $a2, $s0, 0x03B0 ## $a2 = 000003B0 -/* 1CD50 8084EF60 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1CD54 8084EF64 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1CD58 8084EF68 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 1CD5C 8084EF6C 0C023B67 */ jal func_8008ED9C -/* 1CD60 8084EF70 2407001E */ addiu $a3, $zero, 0x001E ## $a3 = 0000001E -/* 1CD64 8084EF74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1CD68 8084EF78 0C00BDF7 */ jal func_8002F7DC -/* 1CD6C 8084EF7C 2405286C */ addiu $a1, $zero, 0x286C ## $a1 = 0000286C -/* 1CD70 8084EF80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1CD74 8084EF84 0C00BDF7 */ jal func_8002F7DC -/* 1CD78 8084EF88 240520A8 */ addiu $a1, $zero, 0x20A8 ## $a1 = 000020A8 -/* 1CD7C 8084EF8C 10000008 */ beq $zero, $zero, .L8084EFB0 -/* 1CD80 8084EF90 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084EF94: -/* 1CD84 8084EF94 0C02914C */ jal func_800A4530 -/* 1CD88 8084EF98 3C05423C */ lui $a1, 0x423C ## $a1 = 423C0000 -/* 1CD8C 8084EF9C 10400003 */ beq $v0, $zero, .L8084EFAC -/* 1CD90 8084EFA0 240F0140 */ addiu $t7, $zero, 0x0140 ## $t7 = 00000140 -/* 1CD94 8084EFA4 3C018016 */ lui $at, %hi(gSaveContext+0x1424) -/* 1CD98 8084EFA8 A42FFA84 */ sh $t7, %lo(gSaveContext+0x1424)($at) -.L8084EFAC: -/* 1CD9C 8084EFAC 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084EFB0: -/* 1CDA0 8084EFB0 8FB0001C */ lw $s0, 0x001C($sp) -/* 1CDA4 8084EFB4 8FB10020 */ lw $s1, 0x0020($sp) -/* 1CDA8 8084EFB8 03E00008 */ jr $ra -/* 1CDAC 8084EFBC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EFC0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EFC0.s deleted file mode 100644 index d3649261f0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EFC0.s +++ /dev/null @@ -1,88 +0,0 @@ -glabel func_8084EFC0 -/* 1CDB0 8084EFC0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 1CDB4 8084EFC4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 1CDB8 8084EFC8 AFB10030 */ sw $s1, 0x0030($sp) -/* 1CDBC 8084EFCC AFB0002C */ sw $s0, 0x002C($sp) -/* 1CDC0 8084EFD0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1CDC4 8084EFD4 0C20DC87 */ jal func_8083721C -/* 1CDC8 8084EFD8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 1CDCC 8084EFDC 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 -/* 1CDD0 8084EFE0 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001B4 -/* 1CDD4 8084EFE4 AFA6003C */ sw $a2, 0x003C($sp) -/* 1CDD8 8084EFE8 0C028EF0 */ jal func_800A3BC0 -/* 1CDDC 8084EFEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1CDE0 8084EFF0 1040000B */ beq $v0, $zero, .L8084F020 -/* 1CDE4 8084EFF4 8FA6003C */ lw $a2, 0x003C($sp) -/* 1CDE8 8084EFF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1CDEC 8084EFFC 0C20F03A */ jal func_8083C0E8 -/* 1CDF0 8084F000 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 1CDF4 8084F004 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1CDF8 8084F008 0C030129 */ jal Gameplay_GetCamera -/* 1CDFC 8084F00C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1CE00 8084F010 0C016C69 */ jal func_8005B1A4 -/* 1CE04 8084F014 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1CE08 8084F018 10000036 */ beq $zero, $zero, .L8084F0F4 -/* 1CE0C 8084F01C 8FBF0034 */ lw $ra, 0x0034($sp) -.L8084F020: -/* 1CE10 8084F020 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1CE14 8084F024 0C02914C */ jal func_800A4530 -/* 1CE18 8084F028 3C054298 */ lui $a1, 0x4298 ## $a1 = 42980000 -/* 1CE1C 8084F02C 1040002D */ beq $v0, $zero, .L8084F0E4 -/* 1CE20 8084F030 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1CE24 8084F034 820E0154 */ lb $t6, 0x0154($s0) ## 00000154 -/* 1CE28 8084F038 3C198085 */ lui $t9, %hi(D_80854A28) ## $t9 = 80850000 -/* 1CE2C 8084F03C 27394A28 */ addiu $t9, $t9, %lo(D_80854A28) ## $t9 = 80854A28 -/* 1CE30 8084F040 000E7880 */ sll $t7, $t6, 2 -/* 1CE34 8084F044 25F8FF84 */ addiu $t8, $t7, 0xFF84 ## $t8 = FFFFFF84 -/* 1CE38 8084F048 03194021 */ addu $t0, $t8, $t9 -/* 1CE3C 8084F04C AFA8004C */ sw $t0, 0x004C($sp) -/* 1CE40 8084F050 0C01DE1C */ jal Math_Sins - ## sins? -/* 1CE44 8084F054 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 1CE48 8084F058 E7A00040 */ swc1 $f0, 0x0040($sp) -/* 1CE4C 8084F05C 0C01DE0D */ jal Math_Coss - ## coss? -/* 1CE50 8084F060 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 1CE54 8084F064 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 1CE58 8084F068 44811000 */ mtc1 $at, $f2 ## $f2 = 5.00 -/* 1CE5C 8084F06C C7A40040 */ lwc1 $f4, 0x0040($sp) -/* 1CE60 8084F070 8FA2004C */ lw $v0, 0x004C($sp) -/* 1CE64 8084F074 C61003B4 */ lwc1 $f16, 0x03B4($s0) ## 000003B4 -/* 1CE68 8084F078 46022182 */ mul.s $f6, $f4, $f2 -/* 1CE6C 8084F07C C60803B0 */ lwc1 $f8, 0x03B0($s0) ## 000003B0 -/* 1CE70 8084F080 84460000 */ lh $a2, 0x0000($v0) ## 00000000 -/* 1CE74 8084F084 46020482 */ mul.s $f18, $f0, $f2 -/* 1CE78 8084F088 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 1CE7C 8084F08C C60403B8 */ lwc1 $f4, 0x03B8($s0) ## 000003B8 -/* 1CE80 8084F090 24094000 */ addiu $t1, $zero, 0x4000 ## $t1 = 00004000 -/* 1CE84 8084F094 AFA90018 */ sw $t1, 0x0018($sp) -/* 1CE88 8084F098 46083280 */ add.s $f10, $f6, $f8 -/* 1CE8C 8084F09C 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 1CE90 8084F0A0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 1CE94 8084F0A4 46049180 */ add.s $f6, $f18, $f4 -/* 1CE98 8084F0A8 44075000 */ mfc1 $a3, $f10 -/* 1CE9C 8084F0AC E7A60014 */ swc1 $f6, 0x0014($sp) -/* 1CEA0 8084F0B0 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 1CEA4 8084F0B4 AFA00020 */ sw $zero, 0x0020($sp) -/* 1CEA8 8084F0B8 AFAA001C */ sw $t2, 0x001C($sp) -/* 1CEAC 8084F0BC 844B0002 */ lh $t3, 0x0002($v0) ## 00000002 -/* 1CEB0 8084F0C0 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 1CEB4 8084F0C4 AFAB0024 */ sw $t3, 0x0024($sp) -/* 1CEB8 8084F0C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1CEBC 8084F0CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1CEC0 8084F0D0 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 1CEC4 8084F0D4 0C023B67 */ jal func_8008ED9C -/* 1CEC8 8084F0D8 2407001E */ addiu $a3, $zero, 0x001E ## $a3 = 0000001E -/* 1CECC 8084F0DC 10000005 */ beq $zero, $zero, .L8084F0F4 -/* 1CED0 8084F0E0 8FBF0034 */ lw $ra, 0x0034($sp) -.L8084F0E4: -/* 1CED4 8084F0E4 3C058085 */ lui $a1, %hi(D_80854A34) ## $a1 = 80850000 -/* 1CED8 8084F0E8 0C20CA49 */ jal func_80832924 -/* 1CEDC 8084F0EC 24A54A34 */ addiu $a1, $a1, %lo(D_80854A34) ## $a1 = 80854A34 -/* 1CEE0 8084F0F0 8FBF0034 */ lw $ra, 0x0034($sp) -.L8084F0F4: -/* 1CEE4 8084F0F4 8FB0002C */ lw $s0, 0x002C($sp) -/* 1CEE8 8084F0F8 8FB10030 */ lw $s1, 0x0030($sp) -/* 1CEEC 8084F0FC 03E00008 */ jr $ra -/* 1CEF0 8084F100 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F104.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F104.s deleted file mode 100644 index e958a55b64..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F104.s +++ /dev/null @@ -1,144 +0,0 @@ -glabel func_8084F104 -/* 1CEF4 8084F104 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1CEF8 8084F108 AFBF001C */ sw $ra, 0x001C($sp) -/* 1CEFC 8084F10C AFB00018 */ sw $s0, 0x0018($sp) -/* 1CF00 8084F110 AFA50024 */ sw $a1, 0x0024($sp) -/* 1CF04 8084F114 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1CF08 8084F118 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1CF0C 8084F11C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1CF10 8084F120 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 1CF14 8084F124 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1CF18 8084F128 0C028EF0 */ jal func_800A3BC0 -/* 1CF1C 8084F12C 8FA40024 */ lw $a0, 0x0024($sp) -/* 1CF20 8084F130 5040005F */ beql $v0, $zero, .L8084F2B0 -/* 1CF24 8084F134 860A0850 */ lh $t2, 0x0850($s0) ## 00000850 -/* 1CF28 8084F138 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 1CF2C 8084F13C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1CF30 8084F140 04630006 */ bgezl $v1, .L8084F15C -/* 1CF34 8084F144 82020693 */ lb $v0, 0x0693($s0) ## 00000693 -/* 1CF38 8084F148 0C20F03A */ jal func_8083C0E8 -/* 1CF3C 8084F14C 8FA50024 */ lw $a1, 0x0024($sp) -/* 1CF40 8084F150 1000005E */ beq $zero, $zero, .L8084F2CC -/* 1CF44 8084F154 820B084F */ lb $t3, 0x084F($s0) ## 0000084F -/* 1CF48 8084F158 82020693 */ lb $v0, 0x0693($s0) ## 00000693 -.L8084F15C: -/* 1CF4C 8084F15C 3C098085 */ lui $t1, %hi(D_80854527) ## $t1 = 80850000 -/* 1CF50 8084F160 3C0C8085 */ lui $t4, %hi(D_80853624) ## $t4 = 80850000 -/* 1CF54 8084F164 1440000E */ bne $v0, $zero, .L8084F1A0 -/* 1CF58 8084F168 01224821 */ addu $t1, $t1, $v0 -/* 1CF5C 8084F16C 8E050694 */ lw $a1, 0x0694($s0) ## 00000694 -/* 1CF60 8084F170 A2000862 */ sb $zero, 0x0862($s0) ## 00000862 -/* 1CF64 8084F174 3401FFFF */ ori $at, $zero, 0xFFFF ## $at = 0000FFFF -/* 1CF68 8084F178 94B8010E */ lhu $t8, 0x010E($a1) ## 0000010E -/* 1CF6C 8084F17C 13010004 */ beq $t8, $at, .L8084F190 -/* 1CF70 8084F180 00000000 */ nop -/* 1CF74 8084F184 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 1CF78 8084F188 37280100 */ ori $t0, $t9, 0x0100 ## $t0 = 00000100 -/* 1CF7C 8084F18C AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -.L8084F190: -/* 1CF80 8084F190 0C214C52 */ jal func_80853148 -/* 1CF84 8084F194 8FA40024 */ lw $a0, 0x0024($sp) -/* 1CF88 8084F198 1000004C */ beq $zero, $zero, .L8084F2CC -/* 1CF8C 8084F19C 820B084F */ lb $t3, 0x084F($s0) ## 0000084F -.L8084F1A0: -/* 1CF90 8084F1A0 91294527 */ lbu $t1, %lo(D_80854527)($t1) -/* 1CF94 8084F1A4 820D0154 */ lb $t5, 0x0154($s0) ## 00000154 -/* 1CF98 8084F1A8 258C3624 */ addiu $t4, $t4, %lo(D_80853624) ## $t4 = 00003624 -/* 1CF9C 8084F1AC 00095080 */ sll $t2, $t1, 2 -/* 1CFA0 8084F1B0 01495023 */ subu $t2, $t2, $t1 -/* 1CFA4 8084F1B4 000A5040 */ sll $t2, $t2, 1 -/* 1CFA8 8084F1B8 254BFFFA */ addiu $t3, $t2, 0xFFFA ## $t3 = FFFFFFFA -/* 1CFAC 8084F1BC 29A1002B */ slti $at, $t5, 0x002B -/* 1CFB0 8084F1C0 14200009 */ bne $at, $zero, .L8084F1E8 -/* 1CFB4 8084F1C4 016C2021 */ addu $a0, $t3, $t4 -/* 1CFB8 8084F1C8 80820002 */ lb $v0, 0x0002($a0) ## 00000002 -/* 1CFBC 8084F1CC 04400004 */ bltz $v0, .L8084F1E0 -/* 1CFC0 8084F1D0 00027023 */ subu $t6, $zero, $v0 -/* 1CFC4 8084F1D4 A2020862 */ sb $v0, 0x0862($s0) ## 00000862 -/* 1CFC8 8084F1D8 10000003 */ beq $zero, $zero, .L8084F1E8 -/* 1CFCC 8084F1DC 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -.L8084F1E0: -/* 1CFD0 8084F1E0 A20E0862 */ sb $t6, 0x0862($s0) ## 00000862 -/* 1CFD4 8084F1E4 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -.L8084F1E8: -/* 1CFD8 8084F1E8 14600011 */ bne $v1, $zero, .L8084F230 -/* 1CFDC 8084F1EC 8FA40024 */ lw $a0, 0x0024($sp) -/* 1CFE0 8084F1F0 8FA40024 */ lw $a0, 0x0024($sp) -/* 1CFE4 8084F1F4 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E -/* 1CFE8 8084F1F8 0C042DA0 */ jal func_8010B680 -/* 1CFEC 8084F1FC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 1CFF0 8084F200 82020154 */ lb $v0, 0x0154($s0) ## 00000154 -/* 1CFF4 8084F204 2401002D */ addiu $at, $zero, 0x002D ## $at = 0000002D -/* 1CFF8 8084F208 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1CFFC 8084F20C 10410003 */ beq $v0, $at, .L8084F21C -/* 1D000 8084F210 24010030 */ addiu $at, $zero, 0x0030 ## $at = 00000030 -/* 1D004 8084F214 54410004 */ bnel $v0, $at, .L8084F228 -/* 1D008 8084F218 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -.L8084F21C: -/* 1D00C 8084F21C 0C00BDF7 */ jal func_8002F7DC -/* 1D010 8084F220 24052813 */ addiu $a1, $zero, 0x2813 ## $a1 = 00002813 -/* 1D014 8084F224 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -.L8084F228: -/* 1D018 8084F228 10000027 */ beq $zero, $zero, .L8084F2C8 -/* 1D01C 8084F22C A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 -.L8084F230: -/* 1D020 8084F230 0C042F6F */ jal func_8010BDBC -/* 1D024 8084F234 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 1D028 8084F238 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1D02C 8084F23C 54410023 */ bnel $v0, $at, .L8084F2CC -/* 1D030 8084F240 820B084F */ lb $t3, 0x084F($s0) ## 0000084F -/* 1D034 8084F244 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 -/* 1D038 8084F248 8208084F */ lb $t0, 0x084F($s0) ## 0000084F -/* 1D03C 8084F24C 2401FEFF */ addiu $at, $zero, 0xFEFF ## $at = FFFFFEFF -/* 1D040 8084F250 0301C824 */ and $t9, $t8, $at -/* 1D044 8084F254 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 1D048 8084F258 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 1D04C 8084F25C 15010009 */ bne $t0, $at, .L8084F284 -/* 1D050 8084F260 A2000862 */ sb $zero, 0x0862($s0) ## 00000862 -/* 1D054 8084F264 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1D058 8084F268 24C62698 */ addiu $a2, $a2, 0x2698 ## $a2 = 04002698 -/* 1D05C 8084F26C 8FA40024 */ lw $a0, 0x0024($sp) -/* 1D060 8084F270 0C20C899 */ jal func_80832264 -/* 1D064 8084F274 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1D068 8084F278 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 1D06C 8084F27C 10000004 */ beq $zero, $zero, .L8084F290 -/* 1D070 8084F280 A6090850 */ sh $t1, 0x0850($s0) ## 00000850 -.L8084F284: -/* 1D074 8084F284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D078 8084F288 0C20F03A */ jal func_8083C0E8 -/* 1D07C 8084F28C 8FA50024 */ lw $a1, 0x0024($sp) -.L8084F290: -/* 1D080 8084F290 8FA40024 */ lw $a0, 0x0024($sp) -/* 1D084 8084F294 0C030129 */ jal Gameplay_GetCamera -/* 1D088 8084F298 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1D08C 8084F29C 0C016C69 */ jal func_8005B1A4 -/* 1D090 8084F2A0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1D094 8084F2A4 10000009 */ beq $zero, $zero, .L8084F2CC -/* 1D098 8084F2A8 820B084F */ lb $t3, 0x084F($s0) ## 0000084F -/* 1D09C 8084F2AC 860A0850 */ lh $t2, 0x0850($s0) ## 00000850 -.L8084F2B0: -/* 1D0A0 8084F2B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D0A4 8084F2B4 3C058085 */ lui $a1, %hi(D_80854A3C) ## $a1 = 80850000 -/* 1D0A8 8084F2B8 05420004 */ bltzl $t2, .L8084F2CC -/* 1D0AC 8084F2BC 820B084F */ lb $t3, 0x084F($s0) ## 0000084F -/* 1D0B0 8084F2C0 0C20CA49 */ jal func_80832924 -/* 1D0B4 8084F2C4 24A54A3C */ addiu $a1, $a1, %lo(D_80854A3C) ## $a1 = 80854A3C -.L8084F2C8: -/* 1D0B8 8084F2C8 820B084F */ lb $t3, 0x084F($s0) ## 0000084F -.L8084F2CC: -/* 1D0BC 8084F2CC 5560000A */ bnel $t3, $zero, .L8084F2F8 -/* 1D0C0 8084F2D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 1D0C4 8084F2D4 8E0C0664 */ lw $t4, 0x0664($s0) ## 00000664 -/* 1D0C8 8084F2D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D0CC 8084F2DC 51800006 */ beql $t4, $zero, .L8084F2F8 -/* 1D0D0 8084F2E0 8FBF001C */ lw $ra, 0x001C($sp) -/* 1D0D4 8084F2E4 0C20F6E6 */ jal func_8083DB98 -/* 1D0D8 8084F2E8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1D0DC 8084F2EC A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 1D0E0 8084F2F0 A602083C */ sh $v0, 0x083C($s0) ## 0000083C -/* 1D0E4 8084F2F4 8FBF001C */ lw $ra, 0x001C($sp) -.L8084F2F8: -/* 1D0E8 8084F2F8 8FB00018 */ lw $s0, 0x0018($sp) -/* 1D0EC 8084F2FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1D0F0 8084F300 03E00008 */ jr $ra -/* 1D0F4 8084F304 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F308.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F308.s deleted file mode 100644 index 22888400a2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F308.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_8084F308 -/* 1D0F8 8084F308 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1D0FC 8084F30C AFBF001C */ sw $ra, 0x001C($sp) -/* 1D100 8084F310 AFB00018 */ sw $s0, 0x0018($sp) -/* 1D104 8084F314 AFA50024 */ sw $a1, 0x0024($sp) -/* 1D108 8084F318 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1D10C 8084F31C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1D110 8084F320 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1D114 8084F324 35CF0060 */ ori $t7, $t6, 0x0060 ## $t7 = 00000060 -/* 1D118 8084F328 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1D11C 8084F32C 0C028EF0 */ jal func_800A3BC0 -/* 1D120 8084F330 8FA40024 */ lw $a0, 0x0024($sp) -/* 1D124 8084F334 10400005 */ beq $v0, $zero, .L8084F34C -/* 1D128 8084F338 8FA40024 */ lw $a0, 0x0024($sp) -/* 1D12C 8084F33C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1D130 8084F340 24C63128 */ addiu $a2, $a2, 0x3128 ## $a2 = 04003128 -/* 1D134 8084F344 0C20C8A1 */ jal func_80832284 -/* 1D138 8084F348 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L8084F34C: -/* 1D13C 8084F34C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D140 8084F350 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1D144 8084F354 0C20C965 */ jal func_80832594 -/* 1D148 8084F358 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 1D14C 8084F35C 10400007 */ beq $v0, $zero, .L8084F37C -/* 1D150 8084F360 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D154 8084F364 0C20E7E4 */ jal func_80839F90 -/* 1D158 8084F368 8FA50024 */ lw $a1, 0x0024($sp) -/* 1D15C 8084F36C 8E180680 */ lw $t8, 0x0680($s0) ## 00000680 -/* 1D160 8084F370 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 1D164 8084F374 0301C824 */ and $t9, $t8, $at -/* 1D168 8084F378 AE190680 */ sw $t9, 0x0680($s0) ## 00000680 -.L8084F37C: -/* 1D16C 8084F37C 8FBF001C */ lw $ra, 0x001C($sp) -/* 1D170 8084F380 8FB00018 */ lw $s0, 0x0018($sp) -/* 1D174 8084F384 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1D178 8084F388 03E00008 */ jr $ra -/* 1D17C 8084F38C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F390.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F390.s deleted file mode 100644 index 89617ec5df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F390.s +++ /dev/null @@ -1,181 +0,0 @@ -.late_rodata -glabel D_8085553C - .word 0x3C75C28F -glabel D_80855540 - .float 0.01 - -.text -glabel func_8084F390 -/* 1D180 8084F390 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 1D184 8084F394 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1D188 8084F398 AFB00020 */ sw $s0, 0x0020($sp) -/* 1D18C 8084F39C AFA5005C */ sw $a1, 0x005C($sp) -/* 1D190 8084F3A0 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1D194 8084F3A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1D198 8084F3A8 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1D19C 8084F3AC 35CF0060 */ ori $t7, $t6, 0x0060 ## $t7 = 00000060 -/* 1D1A0 8084F3B0 AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1D1A4 8084F3B4 0C028EF0 */ jal func_800A3BC0 -/* 1D1A8 8084F3B8 8FA4005C */ lw $a0, 0x005C($sp) -/* 1D1AC 8084F3BC 8FA4005C */ lw $a0, 0x005C($sp) -/* 1D1B0 8084F3C0 0C2109A7 */ jal func_8084269C -/* 1D1B4 8084F3C4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1D1B8 8084F3C8 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 1D1BC 8084F3CC 240500D0 */ addiu $a1, $zero, 0x00D0 ## $a1 = 000000D0 -/* 1D1C0 8084F3D0 0C03D04E */ jal func_800F4138 -/* 1D1C4 8084F3D4 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 -/* 1D1C8 8084F3D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D1CC 8084F3DC 0C20EC10 */ jal func_8083B040 -/* 1D1D0 8084F3E0 8FA5005C */ lw $a1, 0x005C($sp) -/* 1D1D4 8084F3E4 54400084 */ bnel $v0, $zero, .L8084F5F8 -/* 1D1D8 8084F3E8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 1D1DC 8084F3EC 8E070078 */ lw $a3, 0x0078($s0) ## 00000078 -/* 1D1E0 8084F3F0 27A50038 */ addiu $a1, $sp, 0x0038 ## $a1 = FFFFFFE0 -/* 1D1E4 8084F3F4 27A60046 */ addiu $a2, $sp, 0x0046 ## $a2 = FFFFFFEE -/* 1D1E8 8084F3F8 14E00006 */ bne $a3, $zero, .L8084F414 -/* 1D1EC 8084F3FC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 1D1F0 8084F400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D1F4 8084F404 0C20DEE7 */ jal func_80837B9C -/* 1D1F8 8084F408 8FA5005C */ lw $a1, 0x005C($sp) -/* 1D1FC 8084F40C 1000007A */ beq $zero, $zero, .L8084F5F8 -/* 1D200 8084F410 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084F414: -/* 1D204 8084F414 0C20F8A6 */ jal func_8083E298 -/* 1D208 8084F418 AFA70054 */ sw $a3, 0x0054($sp) -/* 1D20C 8084F41C 8219084F */ lb $t9, 0x084F($s0) ## 0000084F -/* 1D210 8084F420 87B80046 */ lh $t8, 0x0046($sp) -/* 1D214 8084F424 8FA70054 */ lw $a3, 0x0054($sp) -/* 1D218 8084F428 13200005 */ beq $t9, $zero, .L8084F440 -/* 1D21C 8084F42C 03001025 */ or $v0, $t8, $zero ## $v0 = 00000000 -/* 1D220 8084F430 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 1D224 8084F434 03011021 */ addu $v0, $t8, $at -/* 1D228 8084F438 00021400 */ sll $v0, $v0, 16 -/* 1D22C 8084F43C 00021403 */ sra $v0, $v0, 16 -.L8084F440: -/* 1D230 8084F440 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 1D234 8084F444 C6040838 */ lwc1 $f4, 0x0838($s0) ## 00000838 -/* 1D238 8084F448 87A80046 */ lh $t0, 0x0046($sp) -/* 1D23C 8084F44C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 1D240 8084F450 460E203C */ c.lt.s $f4, $f14 -/* 1D244 8084F454 01014821 */ addu $t1, $t0, $at -/* 1D248 8084F458 45020003 */ bc1fl .L8084F468 -/* 1D24C 8084F45C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 1D250 8084F460 A7A90046 */ sh $t1, 0x0046($sp) -/* 1D254 8084F464 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -.L8084F468: -/* 1D258 8084F468 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 1D25C 8084F46C C7A6003C */ lwc1 $f6, 0x003C($sp) -/* 1D260 8084F470 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 1D264 8084F474 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 1D268 8084F478 46068201 */ sub.s $f8, $f16, $f6 -/* 1D26C 8084F47C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 1D270 8084F480 460A4002 */ mul.s $f0, $f8, $f10 -/* 1D274 8084F484 460E003C */ c.lt.s $f0, $f14 -/* 1D278 8084F488 00000000 */ nop -/* 1D27C 8084F48C 45020004 */ bc1fl .L8084F4A0 -/* 1D280 8084F490 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 1D284 8084F494 1000000C */ beq $zero, $zero, .L8084F4C8 -/* 1D288 8084F498 46007006 */ mov.s $f0, $f14 -/* 1D28C 8084F49C 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -.L8084F4A0: -/* 1D290 8084F4A0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 1D294 8084F4A4 4600903C */ c.lt.s $f18, $f0 -/* 1D298 8084F4A8 00000000 */ nop -/* 1D29C 8084F4AC 45020005 */ bc1fl .L8084F4C4 -/* 1D2A0 8084F4B0 46000086 */ mov.s $f2, $f0 -/* 1D2A4 8084F4B4 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 1D2A8 8084F4B8 10000003 */ beq $zero, $zero, .L8084F4C8 -/* 1D2AC 8084F4BC 46001006 */ mov.s $f0, $f2 -/* 1D2B0 8084F4C0 46000086 */ mov.s $f2, $f0 -.L8084F4C4: -/* 1D2B4 8084F4C4 46001006 */ mov.s $f0, $f2 -.L8084F4C8: -/* 1D2B8 8084F4C8 46000102 */ mul.s $f4, $f0, $f0 -/* 1D2BC 8084F4CC 3C018085 */ lui $at, %hi(D_8085553C) ## $at = 80850000 -/* 1D2C0 8084F4D0 C426553C */ lwc1 $f6, %lo(D_8085553C)($at) -/* 1D2C4 8084F4D4 3C018085 */ lui $at, %hi(D_80855540) ## $at = 80850000 -/* 1D2C8 8084F4D8 C42A5540 */ lwc1 $f10, %lo(D_80855540)($at) -/* 1D2CC 8084F4DC C7A8003C */ lwc1 $f8, 0x003C($sp) -/* 1D2D0 8084F4E0 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 1D2D4 8084F4E4 46062082 */ mul.s $f2, $f4, $f6 -/* 1D2D8 8084F4E8 8FA4005C */ lw $a0, 0x005C($sp) -/* 1D2DC 8084F4EC E7A00050 */ swc1 $f0, 0x0050($sp) -/* 1D2E0 8084F4F0 460A4302 */ mul.s $f12, $f8, $f10 -/* 1D2E4 8084F4F4 A7A20044 */ sh $v0, 0x0044($sp) -/* 1D2E8 8084F4F8 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 1D2EC 8084F4FC 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 1D2F0 8084F500 E7A2004C */ swc1 $f2, 0x004C($sp) -/* 1D2F4 8084F504 0C0107DF */ jal func_80041F7C -/* 1D2F8 8084F508 E7AC0048 */ swc1 $f12, 0x0048($sp) -/* 1D2FC 8084F50C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 1D300 8084F510 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 1D304 8084F514 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 1D308 8084F518 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 1D30C 8084F51C C7A00050 */ lwc1 $f0, 0x0050($sp) -/* 1D310 8084F520 C7A2004C */ lwc1 $f2, 0x004C($sp) -/* 1D314 8084F524 10410007 */ beq $v0, $at, .L8084F544 -/* 1D318 8084F528 C7AC0048 */ lwc1 $f12, 0x0048($sp) -/* 1D31C 8084F52C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 1D320 8084F530 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 1D324 8084F534 C7B2003C */ lwc1 $f18, 0x003C($sp) -/* 1D328 8084F538 46007006 */ mov.s $f0, $f14 -/* 1D32C 8084F53C 46049302 */ mul.s $f12, $f18, $f4 -/* 1D330 8084F540 00000000 */ nop -.L8084F544: -/* 1D334 8084F544 4610103C */ c.lt.s $f2, $f16 -/* 1D338 8084F548 44050000 */ mfc1 $a1, $f0 -/* 1D33C 8084F54C 44076000 */ mfc1 $a3, $f12 -/* 1D340 8084F550 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 1D344 8084F554 45020003 */ bc1fl .L8084F564 -/* 1D348 8084F558 44061000 */ mfc1 $a2, $f2 -/* 1D34C 8084F55C 46008086 */ mov.s $f2, $f16 -/* 1D350 8084F560 44061000 */ mfc1 $a2, $f2 -.L8084F564: -/* 1D354 8084F564 0C01DF1B */ jal func_80077C6C -/* 1D358 8084F568 E7A00050 */ swc1 $f0, 0x0050($sp) -/* 1D35C 8084F56C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 1D360 8084F570 10400015 */ beq $v0, $zero, .L8084F5C8 -/* 1D364 8084F574 C7A00050 */ lwc1 $f0, 0x0050($sp) -/* 1D368 8084F578 460E0032 */ c.eq.s $f0, $f14 -/* 1D36C 8084F57C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D370 8084F580 45020012 */ bc1fl .L8084F5CC -/* 1D374 8084F584 240F0320 */ addiu $t7, $zero, 0x0320 ## $t7 = 00000320 -/* 1D378 8084F588 820A084F */ lb $t2, 0x084F($s0) ## 0000084F -/* 1D37C 8084F58C 55400008 */ bnel $t2, $zero, .L8084F5B0 -/* 1D380 8084F590 920D015B */ lbu $t5, 0x015B($s0) ## 0000015B -/* 1D384 8084F594 920B015B */ lbu $t3, 0x015B($s0) ## 0000015B -/* 1D388 8084F598 3C058085 */ lui $a1, %hi(D_80853D04) ## $a1 = 80850000 -/* 1D38C 8084F59C 000B6080 */ sll $t4, $t3, 2 -/* 1D390 8084F5A0 00AC2821 */ addu $a1, $a1, $t4 -/* 1D394 8084F5A4 10000006 */ beq $zero, $zero, .L8084F5C0 -/* 1D398 8084F5A8 8CA53D04 */ lw $a1, %lo(D_80853D04)($a1) -/* 1D39C 8084F5AC 920D015B */ lbu $t5, 0x015B($s0) ## 0000015B -.L8084F5B0: -/* 1D3A0 8084F5B0 3C058085 */ lui $a1, %hi(D_80853D1C) ## $a1 = 80850000 -/* 1D3A4 8084F5B4 000D7080 */ sll $t6, $t5, 2 -/* 1D3A8 8084F5B8 00AE2821 */ addu $a1, $a1, $t6 -/* 1D3AC 8084F5BC 8CA53D1C */ lw $a1, %lo(D_80853D1C)($a1) -.L8084F5C0: -/* 1D3B0 8084F5C0 0C20E826 */ jal func_8083A098 -/* 1D3B4 8084F5C4 8FA6005C */ lw $a2, 0x005C($sp) -.L8084F5C8: -/* 1D3B8 8084F5C8 240F0320 */ addiu $t7, $zero, 0x0320 ## $t7 = 00000320 -.L8084F5CC: -/* 1D3BC 8084F5CC AFAF0010 */ sw $t7, 0x0010($sp) -/* 1D3C0 8084F5D0 2604083C */ addiu $a0, $s0, 0x083C ## $a0 = 0000083C -/* 1D3C4 8084F5D4 87A50046 */ lh $a1, 0x0046($sp) -/* 1D3C8 8084F5D8 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 1D3CC 8084F5DC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 1D3D0 8084F5E0 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 1D3D4 8084F5E4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 1D3D8 8084F5E8 87A50044 */ lh $a1, 0x0044($sp) -/* 1D3DC 8084F5EC 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 1D3E0 8084F5F0 240607D0 */ addiu $a2, $zero, 0x07D0 ## $a2 = 000007D0 -/* 1D3E4 8084F5F4 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084F5F8: -/* 1D3E8 8084F5F8 8FB00020 */ lw $s0, 0x0020($sp) -/* 1D3EC 8084F5FC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 1D3F0 8084F600 03E00008 */ jr $ra -/* 1D3F4 8084F604 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F608.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F608.s deleted file mode 100644 index 7d48e4fb8f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F608.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8084F608 -/* 1D3F8 8084F608 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1D3FC 8084F60C AFBF001C */ sw $ra, 0x001C($sp) -/* 1D400 8084F610 AFB00018 */ sw $s0, 0x0018($sp) -/* 1D404 8084F614 AFA50024 */ sw $a1, 0x0024($sp) -/* 1D408 8084F618 84820850 */ lh $v0, 0x0850($a0) ## 00000850 -/* 1D40C 8084F61C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1D410 8084F620 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1D414 8084F624 14400003 */ bne $v0, $zero, .L8084F634 -/* 1D418 8084F628 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 1D41C 8084F62C 10000003 */ beq $zero, $zero, .L8084F63C -/* 1D420 8084F630 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L8084F634: -/* 1D424 8084F634 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -/* 1D428 8084F638 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -.L8084F63C: -/* 1D42C 8084F63C 54600012 */ bnel $v1, $zero, .L8084F688 -/* 1D430 8084F640 8FBF001C */ lw $ra, 0x001C($sp) -/* 1D434 8084F644 0C20EB75 */ jal func_8083ADD4 -/* 1D438 8084F648 8FA40024 */ lw $a0, 0x0024($sp) -/* 1D43C 8084F64C 1040000D */ beq $v0, $zero, .L8084F684 -/* 1D440 8084F650 8FA40024 */ lw $a0, 0x0024($sp) -/* 1D444 8084F654 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1D448 8084F658 0C2148A0 */ jal func_80852280 -/* 1D44C 8084F65C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 1D450 8084F660 3C068085 */ lui $a2, %hi(func_80852E14) ## $a2 = 80850000 -/* 1D454 8084F664 24C62E14 */ addiu $a2, $a2, %lo(func_80852E14) ## $a2 = 80852E14 -/* 1D458 8084F668 8FA40024 */ lw $a0, 0x0024($sp) -/* 1D45C 8084F66C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1D460 8084F670 0C20D716 */ jal func_80835C58 -/* 1D464 8084F674 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 1D468 8084F678 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D46C 8084F67C 0C214B85 */ jal func_80852E14 -/* 1D470 8084F680 8FA50024 */ lw $a1, 0x0024($sp) -.L8084F684: -/* 1D474 8084F684 8FBF001C */ lw $ra, 0x001C($sp) -.L8084F688: -/* 1D478 8084F688 8FB00018 */ lw $s0, 0x0018($sp) -/* 1D47C 8084F68C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1D480 8084F690 03E00008 */ jr $ra -/* 1D484 8084F694 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F698.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F698.s deleted file mode 100644 index b0c4e5ffb8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F698.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_8084F698 -/* 1D488 8084F698 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 1D48C 8084F69C AFA40030 */ sw $a0, 0x0030($sp) -/* 1D490 8084F6A0 AFBF002C */ sw $ra, 0x002C($sp) -/* 1D494 8084F6A4 AFA50034 */ sw $a1, 0x0034($sp) -/* 1D498 8084F6A8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1D49C 8084F6AC 3C068085 */ lui $a2, %hi(func_8084F608) ## $a2 = 80850000 -/* 1D4A0 8084F6B0 24C6F608 */ addiu $a2, $a2, %lo(func_8084F608) ## $a2 = 8084F608 -/* 1D4A4 8084F6B4 8FA50030 */ lw $a1, 0x0030($sp) -/* 1D4A8 8084F6B8 0C20D716 */ jal func_80835C58 -/* 1D4AC 8084F6BC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 1D4B0 8084F6C0 8FAF0030 */ lw $t7, 0x0030($sp) -/* 1D4B4 8084F6C4 8FA50034 */ lw $a1, 0x0034($sp) -/* 1D4B8 8084F6C8 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 -/* 1D4BC 8084F6CC A5EE0850 */ sh $t6, 0x0850($t7) ## 00000850 -/* 1D4C0 8084F6D0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 1D4C4 8084F6D4 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 1D4C8 8084F6D8 AFB80024 */ sw $t8, 0x0024($sp) -/* 1D4CC 8084F6DC 44070000 */ mfc1 $a3, $f0 -/* 1D4D0 8084F6E0 AFA00020 */ sw $zero, 0x0020($sp) -/* 1D4D4 8084F6E4 AFA0001C */ sw $zero, 0x001C($sp) -/* 1D4D8 8084F6E8 AFA00018 */ sw $zero, 0x0018($sp) -/* 1D4DC 8084F6EC 2406008C */ addiu $a2, $zero, 0x008C ## $a2 = 0000008C -/* 1D4E0 8084F6F0 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 1D4E4 8084F6F4 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 1D4E8 8084F6F8 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 1D4EC 8084F6FC E7A00014 */ swc1 $f0, 0x0014($sp) -/* 1D4F0 8084F700 8FBF002C */ lw $ra, 0x002C($sp) -/* 1D4F4 8084F704 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 1D4F8 8084F708 03E00008 */ jr $ra -/* 1D4FC 8084F70C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F710.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F710.s deleted file mode 100644 index 8ee3e23162..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F710.s +++ /dev/null @@ -1,107 +0,0 @@ -glabel func_8084F710 -/* 1D500 8084F710 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 1D504 8084F714 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1D508 8084F718 AFB10020 */ sw $s1, 0x0020($sp) -/* 1D50C 8084F71C AFB0001C */ sw $s0, 0x001C($sp) -/* 1D510 8084F720 808E084F */ lb $t6, 0x084F($a0) ## 0000084F -/* 1D514 8084F724 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1D518 8084F728 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 1D51C 8084F72C 11C0000A */ beq $t6, $zero, .L8084F758 -/* 1D520 8084F730 00000000 */ nop -/* 1D524 8084F734 94AF1D74 */ lhu $t7, 0x1D74($a1) ## 00001D74 -/* 1D528 8084F738 29E10131 */ slti $at, $t7, 0x0131 -/* 1D52C 8084F73C 10200006 */ beq $at, $zero, .L8084F758 -/* 1D530 8084F740 00000000 */ nop -/* 1D534 8084F744 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 1D538 8084F748 00000000 */ nop -/* 1D53C 8084F74C E480006C */ swc1 $f0, 0x006C($a0) ## 0000006C -/* 1D540 8084F750 10000033 */ beq $zero, $zero, .L8084F820 -/* 1D544 8084F754 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -.L8084F758: -/* 1D548 8084F758 3C018085 */ lui $at, %hi(D_80853600) ## $at = 80850000 -/* 1D54C 8084F75C C4243600 */ lwc1 $f4, %lo(D_80853600)($at) -/* 1D550 8084F760 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 1D554 8084F764 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 -/* 1D558 8084F768 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1D55C 8084F76C 4606203C */ c.lt.s $f4, $f6 -/* 1D560 8084F770 00000000 */ nop -/* 1D564 8084F774 4502002B */ bc1fl .L8084F824 -/* 1D568 8084F778 862B00A4 */ lh $t3, 0x00A4($s1) ## 000000A4 -/* 1D56C 8084F77C 0C028EF0 */ jal func_800A3BC0 -/* 1D570 8084F780 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1D574 8084F784 5040001E */ beql $v0, $zero, .L8084F800 -/* 1D578 8084F788 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 1D57C 8084F78C 86180850 */ lh $t8, 0x0850($s0) ## 00000850 -/* 1D580 8084F790 57000010 */ bnel $t8, $zero, .L8084F7D4 -/* 1D584 8084F794 862A00A4 */ lh $t2, 0x00A4($s1) ## 000000A4 -/* 1D588 8084F798 96190088 */ lhu $t9, 0x0088($s0) ## 00000088 -/* 1D58C 8084F79C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 1D590 8084F7A0 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 1D594 8084F7A4 51000016 */ beql $t0, $zero, .L8084F800 -/* 1D598 8084F7A8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 1D59C 8084F7AC C60801C8 */ lwc1 $f8, 0x01C8($s0) ## 000001C8 -/* 1D5A0 8084F7B0 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 1D5A4 8084F7B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D5A8 8084F7B8 460A4401 */ sub.s $f16, $f8, $f10 -/* 1D5AC 8084F7BC 0C20CA28 */ jal func_808328A0 -/* 1D5B0 8084F7C0 E61001C4 */ swc1 $f16, 0x01C4($s0) ## 000001C4 -/* 1D5B4 8084F7C4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 1D5B8 8084F7C8 1000000C */ beq $zero, $zero, .L8084F7FC -/* 1D5BC 8084F7CC A6090850 */ sh $t1, 0x0850($s0) ## 00000850 -/* 1D5C0 8084F7D0 862A00A4 */ lh $t2, 0x00A4($s1) ## 000000A4 -.L8084F7D4: -/* 1D5C4 8084F7D4 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 1D5C8 8084F7D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1D5CC 8084F7DC 55410005 */ bnel $t2, $at, .L8084F7F4 -/* 1D5D0 8084F7E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D5D4 8084F7E4 0C20EB75 */ jal func_8083ADD4 -/* 1D5D8 8084F7E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1D5DC 8084F7EC 14400022 */ bne $v0, $zero, .L8084F878 -/* 1D5E0 8084F7F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084F7F4: -/* 1D5E4 8084F7F4 0C214C20 */ jal func_80853080 -/* 1D5E8 8084F7F8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L8084F7FC: -/* 1D5EC 8084F7FC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -.L8084F800: -/* 1D5F0 8084F800 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 1D5F4 8084F804 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 1D5F8 8084F808 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 1D5FC 8084F80C 26040060 */ addiu $a0, $s0, 0x0060 ## $a0 = 00000060 -/* 1D600 8084F810 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 -/* 1D604 8084F814 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 1D608 8084F818 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 1D60C 8084F81C E7B20010 */ swc1 $f18, 0x0010($sp) -.L8084F820: -/* 1D610 8084F820 862B00A4 */ lh $t3, 0x00A4($s1) ## 000000A4 -.L8084F824: -/* 1D614 8084F824 24010044 */ addiu $at, $zero, 0x0044 ## $at = 00000044 -/* 1D618 8084F828 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1D61C 8084F82C 55610006 */ bnel $t3, $at, .L8084F848 -/* 1D620 8084F830 922C1D6C */ lbu $t4, 0x1D6C($s1) ## 00001D6C -/* 1D624 8084F834 0C20EB75 */ jal func_8083ADD4 -/* 1D628 8084F838 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1D62C 8084F83C 5440000F */ bnel $v0, $zero, .L8084F87C -/* 1D630 8084F840 8FBF0024 */ lw $ra, 0x0024($sp) -/* 1D634 8084F844 922C1D6C */ lbu $t4, 0x1D6C($s1) ## 00001D6C -.L8084F848: -/* 1D638 8084F848 5180000C */ beql $t4, $zero, .L8084F87C -/* 1D63C 8084F84C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 1D640 8084F850 8E261D88 */ lw $a2, 0x1D88($s1) ## 00001D88 -/* 1D644 8084F854 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1D648 8084F858 50C00008 */ beql $a2, $zero, .L8084F87C -/* 1D64C 8084F85C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 1D650 8084F860 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 1D654 8084F864 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1D658 8084F868 0C214A74 */ jal func_808529D0 -/* 1D65C 8084F86C E7A40028 */ swc1 $f4, 0x0028($sp) -/* 1D660 8084F870 C7A60028 */ lwc1 $f6, 0x0028($sp) -/* 1D664 8084F874 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -.L8084F878: -/* 1D668 8084F878 8FBF0024 */ lw $ra, 0x0024($sp) -.L8084F87C: -/* 1D66C 8084F87C 8FB0001C */ lw $s0, 0x001C($sp) -/* 1D670 8084F880 8FB10020 */ lw $s1, 0x0020($sp) -/* 1D674 8084F884 03E00008 */ jr $ra -/* 1D678 8084F888 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s deleted file mode 100644 index 0b43af0fe6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_8084F88C -/* 1D67C 8084F88C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1D680 8084F890 AFB00018 */ sw $s0, 0x0018($sp) -/* 1D684 8084F894 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 1D688 8084F898 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1D68C 8084F89C AFBF001C */ sw $ra, 0x001C($sp) -/* 1D690 8084F8A0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1D694 8084F8A4 24C501B4 */ addiu $a1, $a2, 0x01B4 ## $a1 = 000001B4 -/* 1D698 8084F8A8 0C028EF0 */ jal func_800A3BC0 -/* 1D69C 8084F8AC AFA60020 */ sw $a2, 0x0020($sp) -/* 1D6A0 8084F8B0 8FA60020 */ lw $a2, 0x0020($sp) -/* 1D6A4 8084F8B4 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 1D6A8 8084F8B8 01F07821 */ addu $t7, $t7, $s0 -/* 1D6AC 8084F8BC 84C20850 */ lh $v0, 0x0850($a2) ## 00000850 -/* 1D6B0 8084F8C0 28430009 */ slti $v1, $v0, 0x0009 -/* 1D6B4 8084F8C4 38630001 */ xori $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 1D6B8 8084F8C8 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 -/* 1D6BC 8084F8CC 1060002F */ beq $v1, $zero, .L8084F98C -/* 1D6C0 8084F8D0 A4CE0850 */ sh $t6, 0x0850($a2) ## 00000850 -/* 1D6C4 8084F8D4 81EF1E15 */ lb $t7, 0x1E15($t7) ## 00011E15 -/* 1D6C8 8084F8D8 55E0002D */ bnel $t7, $zero, .L8084F990 -/* 1D6CC 8084F8DC 8FBF001C */ lw $ra, 0x001C($sp) -/* 1D6D0 8084F8E0 80C2084F */ lb $v0, 0x084F($a2) ## 0000084F -/* 1D6D4 8084F8E4 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 1D6D8 8084F8E8 240400FF */ addiu $a0, $zero, 0x00FF ## $a0 = 000000FF -/* 1D6DC 8084F8EC 1040001C */ beq $v0, $zero, .L8084F960 -/* 1D6E0 8084F8F0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 1D6E4 8084F8F4 861800A4 */ lh $t8, 0x00A4($s0) ## 000000A4 -/* 1D6E8 8084F8F8 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 1D6EC 8084F8FC 17010008 */ bne $t8, $at, .L8084F920 -/* 1D6F0 8084F900 00000000 */ nop -/* 1D6F4 8084F904 0C030322 */ jal Gameplay_TriggerRespawn -/* 1D6F8 8084F908 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D6FC 8084F90C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 1D700 8084F910 00300821 */ addu $at, $at, $s0 -/* 1D704 8084F914 24190088 */ addiu $t9, $zero, 0x0088 ## $t9 = 00000088 -/* 1D708 8084F918 10000009 */ beq $zero, $zero, .L8084F940 -/* 1D70C 8084F91C A4391E1A */ sh $t9, 0x1E1A($at) ## 00011E1A -.L8084F920: -/* 1D710 8084F920 04410005 */ bgez $v0, .L8084F938 -/* 1D714 8084F924 00000000 */ nop -/* 1D718 8084F928 0C030322 */ jal Gameplay_TriggerRespawn -/* 1D71C 8084F92C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D720 8084F930 10000004 */ beq $zero, $zero, .L8084F944 -/* 1D724 8084F934 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L8084F938: -/* 1D728 8084F938 0C0302D8 */ jal Gameplay_TriggerVoidOut -/* 1D72C 8084F93C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8084F940: -/* 1D730 8084F940 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L8084F944: -/* 1D734 8084F944 00300821 */ addu $at, $at, $s0 -/* 1D738 8084F948 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 1D73C 8084F94C A0281E5E */ sb $t0, 0x1E5E($at) ## 00011E5E -/* 1D740 8084F950 0C01E221 */ jal func_80078884 -/* 1D744 8084F954 24045801 */ addiu $a0, $zero, 0x5801 ## $a0 = 00005801 -/* 1D748 8084F958 10000009 */ beq $zero, $zero, .L8084F980 -/* 1D74C 8084F95C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L8084F960: -/* 1D750 8084F960 3C028016 */ lui $v0, %hi(gSaveContext) -/* 1D754 8084F964 00300821 */ addu $at, $at, $s0 -/* 1D758 8084F968 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 1D75C 8084F96C A0231E5E */ sb $v1, 0x1E5E($at) ## 00011E5E -/* 1D760 8084F970 A043141D */ sb $v1, 0x141D($v0) ## 8015FA7D -/* 1D764 8084F974 A04413E0 */ sb $a0, 0x13E0($v0) ## 8015FA40 -/* 1D768 8084F978 A04413E1 */ sb $a0, 0x13E1($v0) ## 8015FA41 -/* 1D76C 8084F97C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L8084F980: -/* 1D770 8084F980 00300821 */ addu $at, $at, $s0 -/* 1D774 8084F984 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 1D778 8084F988 A0291E15 */ sb $t1, 0x1E15($at) ## 00011E15 -.L8084F98C: -/* 1D77C 8084F98C 8FBF001C */ lw $ra, 0x001C($sp) -.L8084F990: -/* 1D780 8084F990 8FB00018 */ lw $s0, 0x0018($sp) -/* 1D784 8084F994 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1D788 8084F998 03E00008 */ jr $ra -/* 1D78C 8084F99C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9A0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9A0.s deleted file mode 100644 index c5a71dd905..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9A0.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8084F9A0 -/* 1D790 8084F9A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1D794 8084F9A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1D798 8084F9A8 0C20E600 */ jal func_80839800 -/* 1D79C 8084F9AC 00000000 */ nop -/* 1D7A0 8084F9B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1D7A4 8084F9B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1D7A8 8084F9B8 03E00008 */ jr $ra -/* 1D7AC 8084F9BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9C0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9C0.s deleted file mode 100644 index c31217680d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9C0.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8084F9C0 -/* 1D7B0 8084F9C0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 1D7B4 8084F9C4 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 1D7B8 8084F9C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1D7BC 8084F9CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 1D7C0 8084F9D0 AFA5001C */ sw $a1, 0x001C($sp) -/* 1D7C4 8084F9D4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 1D7C8 8084F9D8 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -/* 1D7CC 8084F9DC AFA70018 */ sw $a3, 0x0018($sp) -/* 1D7D0 8084F9E0 8FA4001C */ lw $a0, 0x001C($sp) -/* 1D7D4 8084F9E4 0C028EF0 */ jal func_800A3BC0 -/* 1D7D8 8084F9E8 24E501B4 */ addiu $a1, $a3, 0x01B4 ## $a1 = 000001B4 -/* 1D7DC 8084F9EC 8FA70018 */ lw $a3, 0x0018($sp) -/* 1D7E0 8084F9F0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 1D7E4 8084F9F4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 1D7E8 8084F9F8 C4E00060 */ lwc1 $f0, 0x0060($a3) ## 00000060 -/* 1D7EC 8084F9FC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 1D7F0 8084FA00 4606003C */ c.lt.s $f0, $f6 -/* 1D7F4 8084FA04 00000000 */ nop -/* 1D7F8 8084FA08 45020006 */ bc1fl .L8084FA24 -/* 1D7FC 8084FA0C 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -/* 1D800 8084FA10 0C20DEE7 */ jal func_80837B9C -/* 1D804 8084FA14 8FA5001C */ lw $a1, 0x001C($sp) -/* 1D808 8084FA18 1000000B */ beq $zero, $zero, .L8084FA48 -/* 1D80C 8084FA1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1D810 8084FA20 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 -.L8084FA24: -/* 1D814 8084FA24 24E40838 */ addiu $a0, $a3, 0x0838 ## $a0 = 00000838 -/* 1D818 8084FA28 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 -/* 1D81C 8084FA2C 4608003C */ c.lt.s $f0, $f8 -/* 1D820 8084FA30 00000000 */ nop -/* 1D824 8084FA34 45020004 */ bc1fl .L8084FA48 -/* 1D828 8084FA38 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1D82C 8084FA3C 0C01DE80 */ jal Math_ApproxF - -/* 1D830 8084FA40 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 1D834 8084FA44 8FBF0014 */ lw $ra, 0x0014($sp) -.L8084FA48: -/* 1D838 8084FA48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1D83C 8084FA4C 03E00008 */ jr $ra -/* 1D840 8084FA50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FA54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FA54.s deleted file mode 100644 index 25bdb60073..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FA54.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_8084FA54 -/* 1D844 8084FA54 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1D848 8084FA58 AFB00014 */ sw $s0, 0x0014($sp) -/* 1D84C 8084FA5C AFBF001C */ sw $ra, 0x001C($sp) -/* 1D850 8084FA60 AFB10018 */ sw $s1, 0x0018($sp) -/* 1D854 8084FA64 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 1D858 8084FA68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1D85C 8084FA6C A08E06AD */ sb $t6, 0x06AD($a0) ## 000006AD -/* 1D860 8084FA70 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 1D864 8084FA74 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1D868 8084FA78 0C20EB53 */ jal func_8083AD4C -/* 1D86C 8084FA7C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1D870 8084FA80 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1D874 8084FA84 0C028EF0 */ jal func_800A3BC0 -/* 1D878 8084FA88 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1D87C 8084FA8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D880 8084FA90 0C20D99C */ jal func_80836670 -/* 1D884 8084FA94 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 1D888 8084FA98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1D88C 8084FA9C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1D890 8084FAA0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 1D894 8084FAA4 0C212AF6 */ jal func_8084ABD8 -/* 1D898 8084FAA8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 1D89C 8084FAAC 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 1D8A0 8084FAB0 961906AE */ lhu $t9, 0x06AE($s0) ## 000006AE -/* 1D8A4 8084FAB4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 1D8A8 8084FAB8 004FC023 */ subu $t8, $v0, $t7 -/* 1D8AC 8084FABC 37280080 */ ori $t0, $t9, 0x0080 ## $t0 = 00000080 -/* 1D8B0 8084FAC0 A61806BE */ sh $t8, 0x06BE($s0) ## 000006BE -/* 1D8B4 8084FAC4 A60806AE */ sh $t0, 0x06AE($s0) ## 000006AE -/* 1D8B8 8084FAC8 02211821 */ addu $v1, $s1, $at -/* 1D8BC 8084FACC 80641E5C */ lb $a0, 0x1E5C($v1) ## 00001E5C -/* 1D8C0 8084FAD0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 1D8C4 8084FAD4 00310821 */ addu $at, $at, $s1 -/* 1D8C8 8084FAD8 04810008 */ bgez $a0, .L8084FAFC -/* 1D8CC 8084FADC 24890001 */ addiu $t1, $a0, 0x0001 ## $t1 = 00000001 -/* 1D8D0 8084FAE0 A0291E5C */ sb $t1, 0x1E5C($at) ## 00011E5C -/* 1D8D4 8084FAE4 806A1E5C */ lb $t2, 0x1E5C($v1) ## 00001E5C -/* 1D8D8 8084FAE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D8DC 8084FAEC 55400004 */ bnel $t2, $zero, .L8084FB00 -/* 1D8E0 8084FAF0 8FBF001C */ lw $ra, 0x001C($sp) -/* 1D8E4 8084FAF4 0C20F052 */ jal func_8083C148 -/* 1D8E8 8084FAF8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L8084FAFC: -/* 1D8EC 8084FAFC 8FBF001C */ lw $ra, 0x001C($sp) -.L8084FB00: -/* 1D8F0 8084FB00 8FB00014 */ lw $s0, 0x0014($sp) -/* 1D8F4 8084FB04 8FB10018 */ lw $s1, 0x0018($sp) -/* 1D8F8 8084FB08 03E00008 */ jr $ra -/* 1D8FC 8084FB0C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FB10.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FB10.s deleted file mode 100644 index 19d11bce71..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FB10.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_8084FB10 -/* 1D900 8084FB10 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1D904 8084FB14 AFBF001C */ sw $ra, 0x001C($sp) -/* 1D908 8084FB18 AFB00018 */ sw $s0, 0x0018($sp) -/* 1D90C 8084FB1C AFA50024 */ sw $a1, 0x0024($sp) -/* 1D910 8084FB20 8082084F */ lb $v0, 0x084F($a0) ## 0000084F -/* 1D914 8084FB24 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1D918 8084FB28 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1D91C 8084FB2C 04400023 */ bltz $v0, .L8084FBBC -/* 1D920 8084FB30 28410006 */ slti $at, $v0, 0x0006 -/* 1D924 8084FB34 10200003 */ beq $at, $zero, .L8084FB44 -/* 1D928 8084FB38 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 1D92C 8084FB3C 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 -/* 1D930 8084FB40 A08E084F */ sb $t6, 0x084F($a0) ## 0000084F -.L8084FB44: -/* 1D934 8084FB44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D938 8084FB48 0C20C965 */ jal func_80832594 -/* 1D93C 8084FB4C 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 1D940 8084FB50 1040000B */ beq $v0, $zero, .L8084FB80 -/* 1D944 8084FB54 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 1D948 8084FB58 A20F084F */ sb $t7, 0x084F($s0) ## 0000084F -/* 1D94C 8084FB5C 8FA40024 */ lw $a0, 0x0024($sp) -/* 1D950 8084FB60 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 1D954 8084FB64 0C00A7EB */ jal func_80029FAC -/* 1D958 8084FB68 8E060050 */ lw $a2, 0x0050($s0) ## 00000050 -/* 1D95C 8084FB6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D960 8084FB70 0C00BDF7 */ jal func_8002F7DC -/* 1D964 8084FB74 24050875 */ addiu $a1, $zero, 0x0875 ## $a1 = 00000875 -/* 1D968 8084FB78 10000005 */ beq $zero, $zero, .L8084FB90 -/* 1D96C 8084FB7C 8FA80024 */ lw $t0, 0x0024($sp) -.L8084FB80: -/* 1D970 8084FB80 8E180680 */ lw $t8, 0x0680($s0) ## 00000680 -/* 1D974 8084FB84 37194000 */ ori $t9, $t8, 0x4000 ## $t9 = 00004000 -/* 1D978 8084FB88 AE190680 */ sw $t9, 0x0680($s0) ## 00000680 -/* 1D97C 8084FB8C 8FA80024 */ lw $t0, 0x0024($sp) -.L8084FB90: -/* 1D980 8084FB90 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 1D984 8084FB94 01284821 */ addu $t1, $t1, $t0 -/* 1D988 8084FB98 8D291DE4 */ lw $t1, 0x1DE4($t1) ## 00011DE4 -/* 1D98C 8084FB9C 01002025 */ or $a0, $t0, $zero ## $a0 = 00000000 -/* 1D990 8084FBA0 312A0003 */ andi $t2, $t1, 0x0003 ## $t2 = 00000000 -/* 1D994 8084FBA4 5540000F */ bnel $t2, $zero, .L8084FBE4 -/* 1D998 8084FBA8 8FBF001C */ lw $ra, 0x001C($sp) -/* 1D99C 8084FBAC 0C214C38 */ jal func_808530E0 -/* 1D9A0 8084FBB0 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -/* 1D9A4 8084FBB4 1000000B */ beq $zero, $zero, .L8084FBE4 -/* 1D9A8 8084FBB8 8FBF001C */ lw $ra, 0x001C($sp) -.L8084FBBC: -/* 1D9AC 8084FBBC 0C028EF0 */ jal func_800A3BC0 -/* 1D9B0 8084FBC0 8FA40024 */ lw $a0, 0x0024($sp) -/* 1D9B4 8084FBC4 10400006 */ beq $v0, $zero, .L8084FBE0 -/* 1D9B8 8084FBC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D9BC 8084FBCC 0C20E7E4 */ jal func_80839F90 -/* 1D9C0 8084FBD0 8FA50024 */ lw $a1, 0x0024($sp) -/* 1D9C4 8084FBD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1D9C8 8084FBD8 0C20DEBF */ jal func_80837AFC -/* 1D9CC 8084FBDC 2405FFEC */ addiu $a1, $zero, 0xFFEC ## $a1 = FFFFFFEC -.L8084FBE0: -/* 1D9D0 8084FBE0 8FBF001C */ lw $ra, 0x001C($sp) -.L8084FBE4: -/* 1D9D4 8084FBE4 8FB00018 */ lw $s0, 0x0018($sp) -/* 1D9D8 8084FBE8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1D9DC 8084FBEC 03E00008 */ jr $ra -/* 1D9E0 8084FBF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FBF4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FBF4.s deleted file mode 100644 index e36418b8f7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FBF4.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_8084FBF4 -/* 1D9E4 8084FBF4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1D9E8 8084FBF8 AFB00018 */ sw $s0, 0x0018($sp) -/* 1D9EC 8084FBFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1D9F0 8084FC00 AFBF001C */ sw $ra, 0x001C($sp) -/* 1D9F4 8084FC04 AFA50024 */ sw $a1, 0x0024($sp) -/* 1D9F8 8084FC08 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1D9FC 8084FC0C 0C028EF0 */ jal func_800A3BC0 -/* 1DA00 8084FC10 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1DA04 8084FC14 0C20E0AF */ jal func_808382BC -/* 1DA08 8084FC18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1DA0C 8084FC1C 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 1DA10 8084FC20 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 1DA14 8084FC24 8FA40024 */ lw $a0, 0x0024($sp) -/* 1DA18 8084FC28 0041001A */ div $zero, $v0, $at -/* 1DA1C 8084FC2C 00007010 */ mfhi $t6 -/* 1DA20 8084FC30 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1DA24 8084FC34 15C00006 */ bne $t6, $zero, .L8084FC50 -/* 1DA28 8084FC38 00000000 */ nop -/* 1DA2C 8084FC3C 0C20DEC6 */ jal func_80837B18 -/* 1DA30 8084FC40 2406FFFF */ addiu $a2, $zero, 0xFFFF ## $a2 = FFFFFFFF -/* 1DA34 8084FC44 5040000D */ beql $v0, $zero, .L8084FC7C -/* 1DA38 8084FC48 8E190678 */ lw $t9, 0x0678($s0) ## 00000678 -/* 1DA3C 8084FC4C 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -.L8084FC50: -/* 1DA40 8084FC50 14400003 */ bne $v0, $zero, .L8084FC60 -/* 1DA44 8084FC54 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 1DA48 8084FC58 10000003 */ beq $zero, $zero, .L8084FC68 -/* 1DA4C 8084FC5C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L8084FC60: -/* 1DA50 8084FC60 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 -/* 1DA54 8084FC64 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -.L8084FC68: -/* 1DA58 8084FC68 14600003 */ bne $v1, $zero, .L8084FC78 -/* 1DA5C 8084FC6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1DA60 8084FC70 0C20E7E4 */ jal func_80839F90 -/* 1DA64 8084FC74 8FA50024 */ lw $a1, 0x0024($sp) -.L8084FC78: -/* 1DA68 8084FC78 8E190678 */ lw $t9, 0x0678($s0) ## 00000678 -.L8084FC7C: -/* 1DA6C 8084FC7C 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 -/* 1DA70 8084FC80 A2180891 */ sb $t8, 0x0891($s0) ## 00000891 -/* 1DA74 8084FC84 97250092 */ lhu $a1, 0x0092($t9) ## 00000092 -/* 1DA78 8084FC88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1DA7C 8084FC8C 24A5600C */ addiu $a1, $a1, 0x600C ## $a1 = 0000600C -/* 1DA80 8084FC90 0C00BE3C */ jal func_8002F8F0 -/* 1DA84 8084FC94 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 0000600C -/* 1DA88 8084FC98 8FBF001C */ lw $ra, 0x001C($sp) -/* 1DA8C 8084FC9C 8FB00018 */ lw $s0, 0x0018($sp) -/* 1DA90 8084FCA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1DA94 8084FCA4 03E00008 */ jr $ra -/* 1DA98 8084FCA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FCAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FCAC.s deleted file mode 100644 index a1cadee34e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FCAC.s +++ /dev/null @@ -1,207 +0,0 @@ -.rdata -glabel D_80855320 - .asciz "DEBUG MODE" - .balign 4 - -.text -glabel func_8084FCAC -/* 1DA9C 8084FCAC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1DAA0 8084FCB0 3C078086 */ lui $a3, %hi(D_80858AB4) ## $a3 = 80860000 -/* 1DAA4 8084FCB4 24E78AB4 */ addiu $a3, $a3, %lo(D_80858AB4) ## $a3 = 80858AB4 -/* 1DAA8 8084FCB8 24AF0014 */ addiu $t7, $a1, 0x0014 ## $t7 = 00000014 -/* 1DAAC 8084FCBC AFBF001C */ sw $ra, 0x001C($sp) -/* 1DAB0 8084FCC0 AFB00018 */ sw $s0, 0x0018($sp) -/* 1DAB4 8084FCC4 AFA5002C */ sw $a1, 0x002C($sp) -/* 1DAB8 8084FCC8 ACEF0000 */ sw $t7, 0x0000($a3) ## 80858AB4 -/* 1DABC 8084FCCC 95E30000 */ lhu $v1, 0x0000($t7) ## 00000014 -/* 1DAC0 8084FCD0 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 1DAC4 8084FCD4 34217FCF */ ori $at, $at, 0x7FCF ## $at = FFFF7FCF -/* 1DAC8 8084FCD8 0061C027 */ nor $t8, $v1, $at -/* 1DACC 8084FCDC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1DAD0 8084FCE0 17000005 */ bne $t8, $zero, .L8084FCF8 -/* 1DAD4 8084FCE4 01E03025 */ or $a2, $t7, $zero ## $a2 = 00000014 -/* 1DAD8 8084FCE8 95F9000C */ lhu $t9, 0x000C($t7) ## 00000020 -/* 1DADC 8084FCEC 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 1DAE0 8084FCF0 03214027 */ nor $t0, $t9, $at -/* 1DAE4 8084FCF4 11000008 */ beq $t0, $zero, .L8084FD18 -.L8084FCF8: -/* 1DAE8 8084FCF8 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF -/* 1DAEC 8084FCFC 00614827 */ nor $t1, $v1, $at -/* 1DAF0 8084FD00 15200013 */ bne $t1, $zero, .L8084FD50 -/* 1DAF4 8084FD04 00000000 */ nop -/* 1DAF8 8084FD08 94CA000C */ lhu $t2, 0x000C($a2) ## 00000020 -/* 1DAFC 8084FD0C 2401FEFF */ addiu $at, $zero, 0xFEFF ## $at = FFFFFEFF -/* 1DB00 8084FD10 01415827 */ nor $t3, $t2, $at -/* 1DB04 8084FD14 1560000E */ bne $t3, $zero, .L8084FD50 -.L8084FD18: -/* 1DB08 8084FD18 3C028085 */ lui $v0, %hi(D_808535D0) ## $v0 = 80850000 -/* 1DB0C 8084FD1C 244235D0 */ addiu $v0, $v0, %lo(D_808535D0) ## $v0 = 808535D0 -/* 1DB10 8084FD20 8C4C0000 */ lw $t4, 0x0000($v0) ## 808535D0 -/* 1DB14 8084FD24 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1DB18 8084FD28 398D0001 */ xori $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 1DB1C 8084FD2C 11A00008 */ beq $t5, $zero, .L8084FD50 -/* 1DB20 8084FD30 AC4D0000 */ sw $t5, 0x0000($v0) ## 808535D0 -/* 1DB24 8084FD34 0C030129 */ jal Gameplay_GetCamera -/* 1DB28 8084FD38 8FA4002C */ lw $a0, 0x002C($sp) -/* 1DB2C 8084FD3C 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1DB30 8084FD40 0C016911 */ jal func_8005A444 -/* 1DB34 8084FD44 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 1DB38 8084FD48 3C078086 */ lui $a3, %hi(D_80858AB4) ## $a3 = 80860000 -/* 1DB3C 8084FD4C 24E78AB4 */ addiu $a3, $a3, %lo(D_80858AB4) ## $a3 = 80858AB4 -.L8084FD50: -/* 1DB40 8084FD50 3C028085 */ lui $v0, %hi(D_808535D0) ## $v0 = 80850000 -/* 1DB44 8084FD54 244235D0 */ addiu $v0, $v0, %lo(D_808535D0) ## $v0 = 808535D0 -/* 1DB48 8084FD58 8C4F0000 */ lw $t7, 0x0000($v0) ## 808535D0 -/* 1DB4C 8084FD5C 24040003 */ addiu $a0, $zero, 0x0003 ## $a0 = 00000003 -/* 1DB50 8084FD60 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 1DB54 8084FD64 11E00080 */ beq $t7, $zero, .L8084FF68 -/* 1DB58 8084FD68 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 1DB5C 8084FD6C 8CF80000 */ lw $t8, 0x0000($a3) ## 80858AB4 -/* 1DB60 8084FD70 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 1DB64 8084FD74 3C068085 */ lui $a2, %hi(D_80855320) ## $a2 = 80850000 -/* 1DB68 8084FD78 97190000 */ lhu $t9, 0x0000($t8) ## 00000000 -/* 1DB6C 8084FD7C 24C65320 */ addiu $a2, $a2, %lo(D_80855320) ## $a2 = 80855320 -/* 1DB70 8084FD80 03214027 */ nor $t0, $t9, $at -/* 1DB74 8084FD84 15000005 */ bne $t0, $zero, .L8084FD9C -/* 1DB78 8084FD88 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 1DB7C 8084FD8C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 1DB80 8084FD90 44811000 */ mtc1 $at, $f2 ## $f2 = 100.00 -/* 1DB84 8084FD94 10000003 */ beq $zero, $zero, .L8084FDA4 -/* 1DB88 8084FD98 00000000 */ nop -.L8084FD9C: -/* 1DB8C 8084FD9C 44811000 */ mtc1 $at, $f2 ## $f2 = 100.00 -/* 1DB90 8084FDA0 00000000 */ nop -.L8084FDA4: -/* 1DB94 8084FDA4 0C018DD7 */ jal func_8006375C -/* 1DB98 8084FDA8 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 1DB9C 8084FDAC 3C098086 */ lui $t1, %hi(D_80858AB4) ## $t1 = 80860000 -/* 1DBA0 8084FDB0 8D298AB4 */ lw $t1, %lo(D_80858AB4)($t1) -/* 1DBA4 8084FDB4 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF -/* 1DBA8 8084FDB8 C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 1DBAC 8084FDBC 95230000 */ lhu $v1, 0x0000($t1) ## 80860000 -/* 1DBB0 8084FDC0 00615027 */ nor $t2, $v1, $at -/* 1DBB4 8084FDC4 1140004C */ beq $t2, $zero, .L8084FEF8 -/* 1DBB8 8084FDC8 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 1DBBC 8084FDCC 00615827 */ nor $t3, $v1, $at -/* 1DBC0 8084FDD0 15600008 */ bne $t3, $zero, .L8084FDF4 -/* 1DBC4 8084FDD4 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 1DBC8 8084FDD8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 1DBCC 8084FDDC 3C0C8086 */ lui $t4, %hi(D_80858AB4) ## $t4 = 80860000 -/* 1DBD0 8084FDE0 46022180 */ add.s $f6, $f4, $f2 -/* 1DBD4 8084FDE4 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 1DBD8 8084FDE8 8D8C8AB4 */ lw $t4, %lo(D_80858AB4)($t4) -/* 1DBDC 8084FDEC 1000000B */ beq $zero, $zero, .L8084FE1C -/* 1DBE0 8084FDF0 95830000 */ lhu $v1, 0x0000($t4) ## 80860000 -.L8084FDF4: -/* 1DBE4 8084FDF4 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 1DBE8 8084FDF8 00616827 */ nor $t5, $v1, $at -/* 1DBEC 8084FDFC 55A00008 */ bnel $t5, $zero, .L8084FE20 -/* 1DBF0 8084FE00 306F0F00 */ andi $t7, $v1, 0x0F00 ## $t7 = 00000000 -/* 1DBF4 8084FE04 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 1DBF8 8084FE08 3C0E8086 */ lui $t6, %hi(D_80858AB4) ## $t6 = 80860000 -/* 1DBFC 8084FE0C 46024281 */ sub.s $f10, $f8, $f2 -/* 1DC00 8084FE10 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 1DC04 8084FE14 8DCE8AB4 */ lw $t6, %lo(D_80858AB4)($t6) -/* 1DC08 8084FE18 95C30000 */ lhu $v1, 0x0000($t6) ## 80860000 -.L8084FE1C: -/* 1DC0C 8084FE1C 306F0F00 */ andi $t7, $v1, 0x0F00 ## $t7 = 00000000 -.L8084FE20: -/* 1DC10 8084FE20 11E00035 */ beq $t7, $zero, .L8084FEF8 -/* 1DC14 8084FE24 8FA2002C */ lw $v0, 0x002C($sp) -/* 1DC18 8084FE28 845807A0 */ lh $t8, 0x07A0($v0) ## 000007A0 -/* 1DC1C 8084FE2C 0018C880 */ sll $t9, $t8, 2 -/* 1DC20 8084FE30 00594021 */ addu $t0, $v0, $t9 -/* 1DC24 8084FE34 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 1DC28 8084FE38 0C016A52 */ jal func_8005A948 -/* 1DC2C 8084FE3C E7A20024 */ swc1 $f2, 0x0024($sp) -/* 1DC30 8084FE40 3C098086 */ lui $t1, %hi(D_80858AB4) ## $t1 = 80860000 -/* 1DC34 8084FE44 8D298AB4 */ lw $t1, %lo(D_80858AB4)($t1) -/* 1DC38 8084FE48 2401FBFF */ addiu $at, $zero, 0xFBFF ## $at = FFFFFBFF -/* 1DC3C 8084FE4C 00022400 */ sll $a0, $v0, 16 -/* 1DC40 8084FE50 95230000 */ lhu $v1, 0x0000($t1) ## 80860000 -/* 1DC44 8084FE54 00042403 */ sra $a0, $a0, 16 -/* 1DC48 8084FE58 C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 1DC4C 8084FE5C 00615027 */ nor $t2, $v1, $at -/* 1DC50 8084FE60 15400007 */ bne $t2, $zero, .L8084FE80 -/* 1DC54 8084FE64 2401FDFF */ addiu $at, $zero, 0xFDFF ## $at = FFFFFDFF -/* 1DC58 8084FE68 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1DC5C 8084FE6C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 1DC60 8084FE70 00812021 */ addu $a0, $a0, $at -/* 1DC64 8084FE74 00042400 */ sll $a0, $a0, 16 -/* 1DC68 8084FE78 10000010 */ beq $zero, $zero, .L8084FEBC -/* 1DC6C 8084FE7C 00042403 */ sra $a0, $a0, 16 -.L8084FE80: -/* 1DC70 8084FE80 00615827 */ nor $t3, $v1, $at -/* 1DC74 8084FE84 15600006 */ bne $t3, $zero, .L8084FEA0 -/* 1DC78 8084FE88 2401FEFF */ addiu $at, $zero, 0xFEFF ## $at = FFFFFEFF -/* 1DC7C 8084FE8C 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1DC80 8084FE90 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 1DC84 8084FE94 00042400 */ sll $a0, $a0, 16 -/* 1DC88 8084FE98 10000008 */ beq $zero, $zero, .L8084FEBC -/* 1DC8C 8084FE9C 00042403 */ sra $a0, $a0, 16 -.L8084FEA0: -/* 1DC90 8084FEA0 00616027 */ nor $t4, $v1, $at -/* 1DC94 8084FEA4 55800006 */ bnel $t4, $zero, .L8084FEC0 -/* 1DC98 8084FEA8 A7A40022 */ sh $a0, 0x0022($sp) -/* 1DC9C 8084FEAC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1DCA0 8084FEB0 2484C000 */ addiu $a0, $a0, 0xC000 ## $a0 = FFFFC000 -/* 1DCA4 8084FEB4 00042400 */ sll $a0, $a0, 16 -/* 1DCA8 8084FEB8 00042403 */ sra $a0, $a0, 16 -.L8084FEBC: -/* 1DCAC 8084FEBC A7A40022 */ sh $a0, 0x0022($sp) -.L8084FEC0: -/* 1DCB0 8084FEC0 0C01DE1C */ jal Math_Sins - ## sins? -/* 1DCB4 8084FEC4 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 1DCB8 8084FEC8 C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 1DCBC 8084FECC C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 1DCC0 8084FED0 87A40022 */ lh $a0, 0x0022($sp) -/* 1DCC4 8084FED4 46001482 */ mul.s $f18, $f2, $f0 -/* 1DCC8 8084FED8 46128100 */ add.s $f4, $f16, $f18 -/* 1DCCC 8084FEDC 0C01DE0D */ jal Math_Coss - ## coss? -/* 1DCD0 8084FEE0 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 1DCD4 8084FEE4 C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 1DCD8 8084FEE8 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 1DCDC 8084FEEC 46001202 */ mul.s $f8, $f2, $f0 -/* 1DCE0 8084FEF0 46083280 */ add.s $f10, $f6, $f8 -/* 1DCE4 8084FEF4 E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -.L8084FEF8: -/* 1DCE8 8084FEF8 0C20C884 */ jal func_80832210 -/* 1DCEC 8084FEFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1DCF0 8084FF00 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 1DCF4 8084FF04 3C068086 */ lui $a2, %hi(D_80858AB4) ## $a2 = 80860000 -/* 1DCF8 8084FF08 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF -/* 1DCFC 8084FF0C E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 1DD00 8084FF10 E6000064 */ swc1 $f0, 0x0064($s0) ## 00000064 -/* 1DD04 8084FF14 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 1DD08 8084FF18 E600005C */ swc1 $f0, 0x005C($s0) ## 0000005C -/* 1DD0C 8084FF1C 8CC68AB4 */ lw $a2, %lo(D_80858AB4)($a2) -/* 1DD10 8084FF20 94CD0000 */ lhu $t5, 0x0000($a2) ## 80860000 -/* 1DD14 8084FF24 01A17027 */ nor $t6, $t5, $at -/* 1DD18 8084FF28 55C0000B */ bnel $t6, $zero, .L8084FF58 -/* 1DD1C 8084FF2C 26040008 */ addiu $a0, $s0, 0x0008 ## $a0 = 00000008 -/* 1DD20 8084FF30 94CF000C */ lhu $t7, 0x000C($a2) ## 8086000C -/* 1DD24 8084FF34 2401FDFF */ addiu $at, $zero, 0xFDFF ## $at = FFFFFDFF -/* 1DD28 8084FF38 8FA4002C */ lw $a0, 0x002C($sp) -/* 1DD2C 8084FF3C 01E1C027 */ nor $t8, $t7, $at -/* 1DD30 8084FF40 17000004 */ bne $t8, $zero, .L8084FF54 -/* 1DD34 8084FF44 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 1DD38 8084FF48 00A42821 */ addu $a1, $a1, $a0 -/* 1DD3C 8084FF4C 0C00B34E */ jal Flags_SetTempClear - -/* 1DD40 8084FF50 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC -.L8084FF54: -/* 1DD44 8084FF54 26040008 */ addiu $a0, $s0, 0x0008 ## $a0 = 00000008 -.L8084FF58: -/* 1DD48 8084FF58 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 1DD4C 8084FF5C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 1DD50 8084FF60 10000001 */ beq $zero, $zero, .L8084FF68 -/* 1DD54 8084FF64 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8084FF68: -/* 1DD58 8084FF68 8FBF001C */ lw $ra, 0x001C($sp) -/* 1DD5C 8084FF6C 8FB00018 */ lw $s0, 0x0018($sp) -/* 1DD60 8084FF70 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1DD64 8084FF74 03E00008 */ jr $ra -/* 1DD68 8084FF78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FF7C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FF7C.s deleted file mode 100644 index 5a7176fb0b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FF7C.s +++ /dev/null @@ -1,57 +0,0 @@ -.late_rodata -glabel D_80855544 - .float 0.3 - -glabel D_80855548 - .float 9.99999974738e-06 - -.text -glabel func_8084FF7C -/* 1DD6C 8084FF7C C482085C */ lwc1 $f2, 0x085C($a0) ## 0000085C -/* 1DD70 8084FF80 C4840858 */ lwc1 $f4, 0x0858($a0) ## 00000858 -/* 1DD74 8084FF84 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 1DD78 8084FF88 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 1DD7C 8084FF8C 46022180 */ add.s $f6, $f4, $f2 -/* 1DD80 8084FF90 3C018085 */ lui $at, %hi(D_80855544) ## $at = 80850000 -/* 1DD84 8084FF94 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 1DD88 8084FF98 E4860858 */ swc1 $f6, 0x0858($a0) ## 00000858 -/* 1DD8C 8084FF9C C4800858 */ lwc1 $f0, 0x0858($a0) ## 00000858 -/* 1DD90 8084FFA0 46080282 */ mul.s $f10, $f0, $f8 -/* 1DD94 8084FFA4 460A1481 */ sub.s $f18, $f2, $f10 -/* 1DD98 8084FFA8 E492085C */ swc1 $f18, 0x085C($a0) ## 0000085C -/* 1DD9C 8084FFAC C484085C */ lwc1 $f4, 0x085C($a0) ## 0000085C -/* 1DDA0 8084FFB0 C4265544 */ lwc1 $f6, %lo(D_80855544)($at) -/* 1DDA4 8084FFB4 3C018085 */ lui $at, %hi(D_80855548) ## $at = 80850000 -/* 1DDA8 8084FFB8 46062202 */ mul.s $f8, $f4, $f6 -/* 1DDAC 8084FFBC E488085C */ swc1 $f8, 0x085C($a0) ## 0000085C -/* 1DDB0 8084FFC0 C482085C */ lwc1 $f2, 0x085C($a0) ## 0000085C -/* 1DDB4 8084FFC4 4602703E */ c.le.s $f14, $f2 -/* 1DDB8 8084FFC8 00000000 */ nop -/* 1DDBC 8084FFCC 45020004 */ bc1fl .L8084FFE0 -/* 1DDC0 8084FFD0 46001307 */ neg.s $f12, $f2 -/* 1DDC4 8084FFD4 10000002 */ beq $zero, $zero, .L8084FFE0 -/* 1DDC8 8084FFD8 46001306 */ mov.s $f12, $f2 -/* 1DDCC 8084FFDC 46001307 */ neg.s $f12, $f2 -.L8084FFE0: -/* 1DDD0 8084FFE0 C4225548 */ lwc1 $f2, %lo(D_80855548)($at) -/* 1DDD4 8084FFE4 4602603C */ c.lt.s $f12, $f2 -/* 1DDD8 8084FFE8 00000000 */ nop -/* 1DDDC 8084FFEC 4500000D */ bc1f .L80850024 -/* 1DDE0 8084FFF0 00000000 */ nop -/* 1DDE4 8084FFF4 4600703E */ c.le.s $f14, $f0 -/* 1DDE8 8084FFF8 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 1DDEC 8084FFFC 45000003 */ bc1f .L8085000C -/* 1DDF0 80850000 E490085C */ swc1 $f16, 0x085C($a0) ## 0000085C -/* 1DDF4 80850004 10000002 */ beq $zero, $zero, .L80850010 -/* 1DDF8 80850008 46000306 */ mov.s $f12, $f0 -.L8085000C: -/* 1DDFC 8085000C 46000307 */ neg.s $f12, $f0 -.L80850010: -/* 1DE00 80850010 4602603C */ c.lt.s $f12, $f2 -/* 1DE04 80850014 00000000 */ nop -/* 1DE08 80850018 45000002 */ bc1f .L80850024 -/* 1DE0C 8085001C 00000000 */ nop -/* 1DE10 80850020 E4900858 */ swc1 $f16, 0x0858($a0) ## 00000858 -.L80850024: -/* 1DE14 80850024 03E00008 */ jr $ra -/* 1DE18 80850028 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850224.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850224.s deleted file mode 100644 index 24c6d896f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850224.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80850224 -/* 1E014 80850224 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1E018 80850228 AFB00018 */ sw $s0, 0x0018($sp) -/* 1E01C 8085022C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1E020 80850230 AFBF001C */ sw $ra, 0x001C($sp) -/* 1E024 80850234 AFA5002C */ sw $a1, 0x002C($sp) -/* 1E028 80850238 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1E02C 8085023C 0C20F1AE */ jal func_8083C6B8 -/* 1E030 80850240 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1E034 80850244 5440001D */ bnel $v0, $zero, .L808502BC -/* 1E038 80850248 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 1E03C 8085024C 0C20EEC8 */ jal func_8083BB20 -/* 1E040 80850250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E044 80850254 10400016 */ beq $v0, $zero, .L808502B0 -/* 1E048 80850258 00000000 */ nop -/* 1E04C 8085025C 0C20DE06 */ jal func_80837818 -/* 1E050 80850260 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E054 80850264 AFA20024 */ sw $v0, 0x0024($sp) -/* 1E058 80850268 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E05C 8085026C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1E060 80850270 0C20DE52 */ jal func_80837948 -/* 1E064 80850274 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 1E068 80850278 8FAE0024 */ lw $t6, 0x0024($sp) -/* 1E06C 8085027C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1E070 80850280 29C10018 */ slti $at, $t6, 0x0018 -/* 1E074 80850284 5420000D */ bnel $at, $zero, .L808502BC -/* 1E078 80850288 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 1E07C 8085028C 8E0F0680 */ lw $t7, 0x0680($s0) ## 00000680 -/* 1E080 80850290 3C010002 */ lui $at, 0x0002 ## $at = 00020000 -/* 1E084 80850294 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 1E088 80850298 01E1C025 */ or $t8, $t7, $at ## $t8 = 00020000 -/* 1E08C 8085029C AE180680 */ sw $t8, 0x0680($s0) ## 00000680 -/* 1E090 808502A0 0C20DD4C */ jal func_80837530 -/* 1E094 808502A4 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E098 808502A8 10000004 */ beq $zero, $zero, .L808502BC -/* 1E09C 808502AC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808502B0: -/* 1E0A0 808502B0 10000002 */ beq $zero, $zero, .L808502BC -/* 1E0A4 808502B4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1E0A8 808502B8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808502BC: -/* 1E0AC 808502BC 8FBF001C */ lw $ra, 0x001C($sp) -/* 1E0B0 808502C0 8FB00018 */ lw $s0, 0x0018($sp) -/* 1E0B4 808502C4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1E0B8 808502C8 03E00008 */ jr $ra -/* 1E0BC 808502CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808502D0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808502D0.s deleted file mode 100644 index cf2b07bcb5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808502D0.s +++ /dev/null @@ -1,214 +0,0 @@ -glabel func_808502D0 -/* 1E0C0 808502D0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 1E0C4 808502D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 1E0C8 808502D8 AFB00018 */ sw $s0, 0x0018($sp) -/* 1E0CC 808502DC AFA5004C */ sw $a1, 0x004C($sp) -/* 1E0D0 808502E0 808E0842 */ lb $t6, 0x0842($a0) ## 00000842 -/* 1E0D4 808502E4 3C188085 */ lui $t8, %hi(D_80854190) ## $t8 = 80850000 -/* 1E0D8 808502E8 27184190 */ addiu $t8, $t8, %lo(D_80854190) ## $t8 = 80854190 -/* 1E0DC 808502EC 000E7900 */ sll $t7, $t6, 4 -/* 1E0E0 808502F0 01F8C821 */ addu $t9, $t7, $t8 -/* 1E0E4 808502F4 AFB90044 */ sw $t9, 0x0044($sp) -/* 1E0E8 808502F8 8C880680 */ lw $t0, 0x0680($a0) ## 00000680 -/* 1E0EC 808502FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1E0F0 80850300 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1E0F4 80850304 35090020 */ ori $t1, $t0, 0x0020 ## $t1 = 00000020 -/* 1E0F8 80850308 AC890680 */ sw $t1, 0x0680($a0) ## 00000680 -/* 1E0FC 8085030C 0C210B7D */ jal func_80842DF4 -/* 1E100 80850310 8FA4004C */ lw $a0, 0x004C($sp) -/* 1E104 80850314 544000AD */ bnel $v0, $zero, .L808505CC -/* 1E108 80850318 8FBF001C */ lw $ra, 0x001C($sp) -/* 1E10C 8085031C 8FA20044 */ lw $v0, 0x0044($sp) -/* 1E110 80850320 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E114 80850324 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 1E118 80850328 904A000C */ lbu $t2, 0x000C($v0) ## 0000000C -/* 1E11C 8085032C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 1E120 80850330 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 1E124 80850334 05410004 */ bgez $t2, .L80850348 -/* 1E128 80850338 46802120 */ cvt.s.w $f4, $f4 -/* 1E12C 8085033C 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 1E130 80850340 00000000 */ nop -/* 1E134 80850344 46062100 */ add.s $f4, $f4, $f6 -.L80850348: -/* 1E138 80850348 904B000D */ lbu $t3, 0x000D($v0) ## 0000000D -/* 1E13C 8085034C 44062000 */ mfc1 $a2, $f4 -/* 1E140 80850350 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 1E144 80850354 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 -/* 1E148 80850358 05610004 */ bgez $t3, .L8085036C -/* 1E14C 8085035C 46804220 */ cvt.s.w $f8, $f8 -/* 1E150 80850360 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 -/* 1E154 80850364 00000000 */ nop -/* 1E158 80850368 460A4200 */ add.s $f8, $f8, $f10 -.L8085036C: -/* 1E15C 8085036C 44074000 */ mfc1 $a3, $f8 -/* 1E160 80850370 0C210A17 */ jal func_8084285C -/* 1E164 80850374 00000000 */ nop -/* 1E168 80850378 8E0C0680 */ lw $t4, 0x0680($s0) ## 00000680 -/* 1E16C 8085037C 000C6840 */ sll $t5, $t4, 1 -/* 1E170 80850380 05A30012 */ bgezl $t5, .L808503CC -/* 1E174 80850384 261901B4 */ addiu $t9, $s0, 0x01B4 ## $t9 = 000001B4 -/* 1E178 80850388 820E0151 */ lb $t6, 0x0151($s0) ## 00000151 -/* 1E17C 8085038C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 1E180 80850390 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 -/* 1E184 80850394 51C1000D */ beql $t6, $at, .L808503CC -/* 1E188 80850398 261901B4 */ addiu $t9, $s0, 0x01B4 ## $t9 = 000001B4 -/* 1E18C 8085039C 0C02914C */ jal func_800A4530 -/* 1E190 808503A0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 1E194 808503A4 10400008 */ beq $v0, $zero, .L808503C8 -/* 1E198 808503A8 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 1E19C 808503AC 44818000 */ mtc1 $at, $f16 ## $f16 = 15.00 -/* 1E1A0 808503B0 8E0F0680 */ lw $t7, 0x0680($s0) ## 00000680 -/* 1E1A4 808503B4 3C01BFFF */ lui $at, 0xBFFF ## $at = BFFF0000 -/* 1E1A8 808503B8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = BFFFFFFF -/* 1E1AC 808503BC 01E1C024 */ and $t8, $t7, $at -/* 1E1B0 808503C0 AE180680 */ sw $t8, 0x0680($s0) ## 00000680 -/* 1E1B4 808503C4 E6100838 */ swc1 $f16, 0x0838($s0) ## 00000838 -.L808503C8: -/* 1E1B8 808503C8 261901B4 */ addiu $t9, $s0, 0x01B4 ## $t9 = 000001B4 -.L808503CC: -/* 1E1BC 808503CC AFB90020 */ sw $t9, 0x0020($sp) -/* 1E1C0 808503D0 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 1E1C4 808503D4 44819000 */ mtc1 $at, $f18 ## $f18 = 12.00 -/* 1E1C8 808503D8 C6040838 */ lwc1 $f4, 0x0838($s0) ## 00000838 -/* 1E1CC 808503DC 8FA4004C */ lw $a0, 0x004C($sp) -/* 1E1D0 808503E0 4604903C */ c.lt.s $f18, $f4 -/* 1E1D4 808503E4 00000000 */ nop -/* 1E1D8 808503E8 45020004 */ bc1fl .L808503FC -/* 1E1DC 808503EC 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -/* 1E1E0 808503F0 0C2109A7 */ jal func_8084269C -/* 1E1E4 808503F4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1E1E8 808503F8 26040838 */ addiu $a0, $s0, 0x0838 ## $a0 = 00000838 -.L808503FC: -/* 1E1EC 808503FC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 1E1F0 80850400 0C01DE80 */ jal Math_ApproxF - -/* 1E1F4 80850404 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 1E1F8 80850408 0C20F143 */ jal func_8083C50C -/* 1E1FC 8085040C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E200 80850410 8FA4004C */ lw $a0, 0x004C($sp) -/* 1E204 80850414 0C028EF0 */ jal func_800A3BC0 -/* 1E208 80850418 8FA50020 */ lw $a1, 0x0020($sp) -/* 1E20C 8085041C 10400026 */ beq $v0, $zero, .L808504B8 -/* 1E210 80850420 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E214 80850424 0C214089 */ jal func_80850224 -/* 1E218 80850428 8FA5004C */ lw $a1, 0x004C($sp) -/* 1E21C 8085042C 54400067 */ bnel $v0, $zero, .L808505CC -/* 1E220 80850430 8FBF001C */ lw $ra, 0x001C($sp) -/* 1E224 80850434 920801E9 */ lbu $t0, 0x01E9($s0) ## 000001E9 -/* 1E228 80850438 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E22C 8085043C 0C023A71 */ jal func_8008E9C4 -/* 1E230 80850440 A3A80043 */ sb $t0, 0x0043($sp) -/* 1E234 80850444 10400004 */ beq $v0, $zero, .L80850458 -/* 1E238 80850448 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E23C 8085044C 8FA90044 */ lw $t1, 0x0044($sp) -/* 1E240 80850450 10000003 */ beq $zero, $zero, .L80850460 -/* 1E244 80850454 8D250008 */ lw $a1, 0x0008($t1) ## 00000008 -.L80850458: -/* 1E248 80850458 8FAA0044 */ lw $t2, 0x0044($sp) -/* 1E24C 8085045C 8D450004 */ lw $a1, 0x0004($t2) ## 00000004 -.L80850460: -/* 1E250 80850460 0C20C8C6 */ jal func_80832318 -/* 1E254 80850464 AFA5003C */ sw $a1, 0x003C($sp) -/* 1E258 80850468 8FA5003C */ lw $a1, 0x003C($sp) -/* 1E25C 8085046C 3C0B0400 */ lui $t3, 0x0400 ## $t3 = 04000000 -/* 1E260 80850470 256B2908 */ addiu $t3, $t3, 0x2908 ## $t3 = 04002908 -/* 1E264 80850474 14AB0007 */ bne $a1, $t3, .L80850494 -/* 1E268 80850478 A20001E9 */ sb $zero, 0x01E9($s0) ## 000001E9 -/* 1E26C 8085047C 920C015B */ lbu $t4, 0x015B($s0) ## 0000015B -/* 1E270 80850480 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 1E274 80850484 51810004 */ beql $t4, $at, .L80850498 -/* 1E278 80850488 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E27C 8085048C 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 1E280 80850490 24A52AC8 */ addiu $a1, $a1, 0x2AC8 ## $a1 = 04002AC8 -.L80850494: -/* 1E284 80850494 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80850498: -/* 1E288 80850498 0C20E826 */ jal func_8083A098 -/* 1E28C 8085049C 8FA6004C */ lw $a2, 0x004C($sp) -/* 1E290 808504A0 920E0692 */ lbu $t6, 0x0692($s0) ## 00000692 -/* 1E294 808504A4 93AD0043 */ lbu $t5, 0x0043($sp) -/* 1E298 808504A8 35CF0008 */ ori $t7, $t6, 0x0008 ## $t7 = 00000008 -/* 1E29C 808504AC A20F0692 */ sb $t7, 0x0692($s0) ## 00000692 -/* 1E2A0 808504B0 10000045 */ beq $zero, $zero, .L808505C8 -/* 1E2A4 808504B4 A20D01E9 */ sb $t5, 0x01E9($s0) ## 000001E9 -.L808504B8: -/* 1E2A8 808504B8 82180151 */ lb $t8, 0x0151($s0) ## 00000151 -/* 1E2AC 808504BC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 1E2B0 808504C0 57010042 */ bnel $t8, $at, .L808505CC -/* 1E2B4 808504C4 8FBF001C */ lw $ra, 0x001C($sp) -/* 1E2B8 808504C8 82030842 */ lb $v1, 0x0842($s0) ## 00000842 -/* 1E2BC 808504CC 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 -/* 1E2C0 808504D0 8FA4004C */ lw $a0, 0x004C($sp) -/* 1E2C4 808504D4 10610003 */ beq $v1, $at, .L808504E4 -/* 1E2C8 808504D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1E2CC 808504DC 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 1E2D0 808504E0 14610039 */ bne $v1, $at, .L808505C8 -.L808504E4: -/* 1E2D4 808504E4 3C068085 */ lui $a2, %hi(D_80854A40) ## $a2 = 80850000 -/* 1E2D8 808504E8 24C64A40 */ addiu $a2, $a2, %lo(D_80854A40) ## $a2 = 80854A40 -/* 1E2DC 808504EC 0C20E5CF */ jal func_8083973C -/* 1E2E0 808504F0 27A70030 */ addiu $a3, $sp, 0x0030 ## $a3 = FFFFFFE8 -/* 1E2E4 808504F4 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 1E2E8 808504F8 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 1E2EC 808504FC 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 1E2F0 80850500 44816000 */ mtc1 $at, $f12 ## $f12 = 45.00 -/* 1E2F4 80850504 46003381 */ sub.s $f14, $f6, $f0 -/* 1E2F8 80850508 0C034199 */ jal atan2s - -/* 1E2FC 8085050C E7AE002C */ swc1 $f14, 0x002C($sp) -/* 1E300 80850510 00022C00 */ sll $a1, $v0, 16 -/* 1E304 80850514 00052C03 */ sra $a1, $a1, 16 -/* 1E308 80850518 26040044 */ addiu $a0, $s0, 0x0044 ## $a0 = 00000044 -/* 1E30C 8085051C 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 1E310 80850520 24060320 */ addiu $a2, $zero, 0x0320 ## $a2 = 00000320 -/* 1E314 80850524 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E318 80850528 0C20DAAE */ jal func_80836AB8 -/* 1E31C 8085052C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 1E320 80850530 82030842 */ lb $v1, 0x0842($s0) ## 00000842 -/* 1E324 80850534 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 -/* 1E328 80850538 8FA40020 */ lw $a0, 0x0020($sp) -/* 1E32C 8085053C 54610007 */ bnel $v1, $at, .L8085055C -/* 1E330 80850540 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 1E334 80850544 0C02914C */ jal func_800A4530 -/* 1E338 80850548 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 -/* 1E33C 8085054C 54400009 */ bnel $v0, $zero, .L80850574 -/* 1E340 80850550 3C01C220 */ lui $at, 0xC220 ## $at = C2200000 -/* 1E344 80850554 82030842 */ lb $v1, 0x0842($s0) ## 00000842 -/* 1E348 80850558 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -.L8085055C: -/* 1E34C 8085055C 1461001A */ bne $v1, $at, .L808505C8 -/* 1E350 80850560 8FA40020 */ lw $a0, 0x0020($sp) -/* 1E354 80850564 0C02914C */ jal func_800A4530 -/* 1E358 80850568 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 -/* 1E35C 8085056C 10400016 */ beq $v0, $zero, .L808505C8 -/* 1E360 80850570 3C01C220 */ lui $at, 0xC220 ## $at = C2200000 -.L80850574: -/* 1E364 80850574 44814000 */ mtc1 $at, $f8 ## $f8 = -40.00 -/* 1E368 80850578 C7A0002C */ lwc1 $f0, 0x002C($sp) -/* 1E36C 8085057C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 1E370 80850580 4600403C */ c.lt.s $f8, $f0 -/* 1E374 80850584 00000000 */ nop -/* 1E378 80850588 45020010 */ bc1fl .L808505CC -/* 1E37C 8085058C 8FBF001C */ lw $ra, 0x001C($sp) -/* 1E380 80850590 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 1E384 80850594 8FA4004C */ lw $a0, 0x004C($sp) -/* 1E388 80850598 460A003C */ c.lt.s $f0, $f10 -/* 1E38C 8085059C 00000000 */ nop -/* 1E390 808505A0 4502000A */ bc1fl .L808505CC -/* 1E394 808505A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 1E398 808505A8 0C210A8A */ jal func_80842A28 -/* 1E39C 808505AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1E3A0 808505B0 3C068085 */ lui $a2, %hi(D_80854A4C) ## $a2 = 80850000 -/* 1E3A4 808505B4 24C64A4C */ addiu $a2, $a2, %lo(D_80854A4C) ## $a2 = 80854A4C -/* 1E3A8 808505B8 00C03825 */ or $a3, $a2, $zero ## $a3 = 80854A4C -/* 1E3AC 808505BC 8FA4004C */ lw $a0, 0x004C($sp) -/* 1E3B0 808505C0 0C00A409 */ jal func_80029024 -/* 1E3B4 808505C4 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFE8 -.L808505C8: -/* 1E3B8 808505C8 8FBF001C */ lw $ra, 0x001C($sp) -.L808505CC: -/* 1E3BC 808505CC 8FB00018 */ lw $s0, 0x0018($sp) -/* 1E3C0 808505D0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 1E3C4 808505D4 03E00008 */ jr $ra -/* 1E3C8 808505D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808505DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808505DC.s deleted file mode 100644 index bcb3674ab9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808505DC.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_808505DC -/* 1E3CC 808505DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1E3D0 808505E0 AFA40018 */ sw $a0, 0x0018($sp) -/* 1E3D4 808505E4 AFA5001C */ sw $a1, 0x001C($sp) -/* 1E3D8 808505E8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1E3DC 808505EC 8FA50018 */ lw $a1, 0x0018($sp) -/* 1E3E0 808505F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1E3E4 808505F4 0C028EF0 */ jal func_800A3BC0 -/* 1E3E8 808505F8 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1E3EC 808505FC 0C20DC87 */ jal func_8083721C -/* 1E3F0 80850600 8FA40018 */ lw $a0, 0x0018($sp) -/* 1E3F4 80850604 8FA40018 */ lw $a0, 0x0018($sp) -/* 1E3F8 80850608 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 1E3FC 8085060C 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 -/* 1E400 80850610 C48401CC */ lwc1 $f4, 0x01CC($a0) ## 000001CC -/* 1E404 80850614 4604303E */ c.le.s $f6, $f4 -/* 1E408 80850618 00000000 */ nop -/* 1E40C 8085061C 45020004 */ bc1fl .L80850630 -/* 1E410 80850620 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1E414 80850624 0C20E7FF */ jal func_80839FFC -/* 1E418 80850628 8FA5001C */ lw $a1, 0x001C($sp) -/* 1E41C 8085062C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80850630: -/* 1E420 80850630 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1E424 80850634 03E00008 */ jr $ra -/* 1E428 80850638 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s deleted file mode 100644 index f78977da8a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s +++ /dev/null @@ -1,82 +0,0 @@ -glabel func_8085063C -/* 1E42C 8085063C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1E430 80850640 AFBF001C */ sw $ra, 0x001C($sp) -/* 1E434 80850644 AFB10018 */ sw $s1, 0x0018($sp) -/* 1E438 80850648 AFB00014 */ sw $s0, 0x0014($sp) -/* 1E43C 8085064C 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1E440 80850650 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 1E444 80850654 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1E448 80850658 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 1E44C 8085065C AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1E450 80850660 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1E454 80850664 0C028EF0 */ jal func_800A3BC0 -/* 1E458 80850668 262501B4 */ addiu $a1, $s1, 0x01B4 ## $a1 = 000001B4 -/* 1E45C 8085066C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1E460 80850670 0C20D99C */ jal func_80836670 -/* 1E464 80850674 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1E468 80850678 86380850 */ lh $t8, 0x0850($s1) ## 00000850 -/* 1E46C 8085067C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E470 80850680 2405003B */ addiu $a1, $zero, 0x003B ## $a1 = 0000003B -/* 1E474 80850684 17000006 */ bne $t8, $zero, .L808506A0 -/* 1E478 80850688 00000000 */ nop -/* 1E47C 8085068C 0C042DA0 */ jal func_8010B680 -/* 1E480 80850690 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 1E484 80850694 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 1E488 80850698 1000002F */ beq $zero, $zero, .L80850758 -/* 1E48C 8085069C A6390850 */ sh $t9, 0x0850($s1) ## 00000850 -.L808506A0: -/* 1E490 808506A0 0C042F6F */ jal func_8010BDBC -/* 1E494 808506A4 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 1E498 808506A8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1E49C 808506AC 1441002A */ bne $v0, $at, .L80850758 -/* 1E4A0 808506B0 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 1E4A4 808506B4 00701821 */ addu $v1, $v1, $s0 -/* 1E4A8 808506B8 906304BD */ lbu $v1, 0x04BD($v1) ## 000104BD -/* 1E4AC 808506BC 3C028016 */ lui $v0, %hi(gSaveContext) -/* 1E4B0 808506C0 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 1E4B4 808506C4 14600013 */ bne $v1, $zero, .L80850714 -/* 1E4B8 808506C8 804613B3 */ lb $a2, 0x13B3($v0) ## 8015FA13 -/* 1E4BC 808506CC 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 1E4C0 808506D0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 1E4C4 808506D4 AC481364 */ sw $t0, 0x1364($v0) ## 8015F9C4 -/* 1E4C8 808506D8 00300821 */ addu $at, $at, $s0 -/* 1E4CC 808506DC 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 1E4D0 808506E0 A0291E15 */ sb $t1, 0x1E15($at) ## 00011E15 -/* 1E4D4 808506E4 844A13B0 */ lh $t2, 0x13B0($v0) ## 8015FA10 -/* 1E4D8 808506E8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 1E4DC 808506EC 00300821 */ addu $at, $at, $s0 -/* 1E4E0 808506F0 A42A1E1A */ sh $t2, 0x1E1A($at) ## 00011E1A -/* 1E4E4 808506F4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 1E4E8 808506F8 00300821 */ addu $at, $at, $s0 -/* 1E4EC 808506FC 240B0005 */ addiu $t3, $zero, 0x0005 ## $t3 = 00000005 -/* 1E4F0 80850700 A02B1E5E */ sb $t3, 0x1E5E($at) ## 00011E5E -/* 1E4F4 80850704 0C0222BC */ jal func_80088AF0 -/* 1E4F8 80850708 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E4FC 8085070C 10000013 */ beq $zero, $zero, .L8085075C -/* 1E500 80850710 8FBF001C */ lw $ra, 0x001C($sp) -.L80850714: -/* 1E504 80850714 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 1E508 80850718 14610007 */ bne $v1, $at, .L80850738 -/* 1E50C 8085071C 00066023 */ subu $t4, $zero, $a2 -/* 1E510 80850720 3C048016 */ lui $a0, %hi(gSaveContext+0x13a0) -/* 1E514 80850724 A04C13B3 */ sb $t4, 0x13B3($v0) ## 000013B3 -/* 1E518 80850728 AC400E80 */ sw $zero, 0x0E80($v0) ## 00000E80 -/* 1E51C 8085072C 2484FA00 */ addiu $a0, %lo(gSaveContext+0x13a0) -/* 1E520 80850730 0C01E245 */ jal func_80078914 -/* 1E524 80850734 240508C8 */ addiu $a1, $zero, 0x08C8 ## $a1 = 000008C8 -.L80850738: -/* 1E528 80850738 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1E52C 8085073C 0C214C20 */ jal func_80853080 -/* 1E530 80850740 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1E534 80850744 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E538 80850748 0C030129 */ jal Gameplay_GetCamera -/* 1E53C 8085074C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1E540 80850750 0C016C69 */ jal func_8005B1A4 -/* 1E544 80850754 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -.L80850758: -/* 1E548 80850758 8FBF001C */ lw $ra, 0x001C($sp) -.L8085075C: -/* 1E54C 8085075C 8FB00014 */ lw $s0, 0x0014($sp) -/* 1E550 80850760 8FB10018 */ lw $s1, 0x0018($sp) -/* 1E554 80850764 03E00008 */ jr $ra -/* 1E558 80850768 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085076C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085076C.s deleted file mode 100644 index 5546252c4a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085076C.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8085076C -/* 1E55C 8085076C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1E560 80850770 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1E564 80850774 84820850 */ lh $v0, 0x0850($a0) ## 00000850 -/* 1E568 80850778 3C078016 */ lui $a3, %hi(gSaveContext) -/* 1E56C 8085077C 24E7E660 */ addiu $a3, %lo(gSaveContext) -/* 1E570 80850780 28410015 */ slti $at, $v0, 0x0015 -/* 1E574 80850784 1420000C */ bne $at, $zero, .L808507B8 -/* 1E578 80850788 80E613B3 */ lb $a2, 0x13B3($a3) ## 8015FA13 -/* 1E57C 8085078C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 1E580 80850790 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 -/* 1E584 80850794 C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 -/* 1E588 80850798 3C0E8085 */ lui $t6, %hi(func_8084A5C4) ## $t6 = 80850000 -/* 1E58C 8085079C 25CEA5C4 */ addiu $t6, $t6, %lo(func_8084A5C4) ## $t6 = 8084A5C4 -/* 1E590 808507A0 46062200 */ add.s $f8, $f4, $f6 -/* 1E594 808507A4 AC8E0134 */ sw $t6, 0x0134($a0) ## 00000134 -/* 1E598 808507A8 0C20DEE7 */ jal func_80837B9C -/* 1E59C 808507AC E4880028 */ swc1 $f8, 0x0028($a0) ## 00000028 -/* 1E5A0 808507B0 1000000D */ beq $zero, $zero, .L808507E8 -/* 1E5A4 808507B4 8FBF0014 */ lw $ra, 0x0014($sp) -.L808507B8: -/* 1E5A8 808507B8 38430014 */ xori $v1, $v0, 0x0014 ## $v1 = 00000014 -/* 1E5AC 808507BC 2C630001 */ sltiu $v1, $v1, 0x0001 -/* 1E5B0 808507C0 244F0001 */ addiu $t7, $v0, 0x0001 ## $t7 = 00000001 -/* 1E5B4 808507C4 10600007 */ beq $v1, $zero, .L808507E4 -/* 1E5B8 808507C8 A48F0850 */ sh $t7, 0x0850($a0) ## 00000850 -/* 1E5BC 808507CC 24D80001 */ addiu $t8, $a2, 0x0001 ## $t8 = 00000001 -/* 1E5C0 808507D0 3C048016 */ lui $a0, %hi(gSaveContext+0x13a0) -/* 1E5C4 808507D4 A0F813B3 */ sb $t8, 0x13B3($a3) ## 000013B3 -/* 1E5C8 808507D8 2484FA00 */ addiu $a0, %lo(gSaveContext+0x13a0) -/* 1E5CC 808507DC 0C01E245 */ jal func_80078914 -/* 1E5D0 808507E0 2405087B */ addiu $a1, $zero, 0x087B ## $a1 = 0000087B -.L808507E4: -/* 1E5D4 808507E4 8FBF0014 */ lw $ra, 0x0014($sp) -.L808507E8: -/* 1E5D8 808507E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1E5DC 808507EC 03E00008 */ jr $ra -/* 1E5E0 808507F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s deleted file mode 100644 index e9f2804519..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s +++ /dev/null @@ -1,203 +0,0 @@ -glabel func_808507F4 -/* 1E5E4 808507F4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1E5E8 808507F8 AFB00018 */ sw $s0, 0x0018($sp) -/* 1E5EC 808507FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1E5F0 80850800 AFA5002C */ sw $a1, 0x002C($sp) -/* 1E5F4 80850804 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1E5F8 80850808 AFBF001C */ sw $ra, 0x001C($sp) -/* 1E5FC 8085080C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1E600 80850810 0C028EF0 */ jal func_800A3BC0 -/* 1E604 80850814 AFA50020 */ sw $a1, 0x0020($sp) -/* 1E608 80850818 5040004C */ beql $v0, $zero, .L8085094C -/* 1E60C 8085081C 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 1E610 80850820 8203084F */ lb $v1, 0x084F($s0) ## 0000084F -/* 1E614 80850824 04630013 */ bgezl $v1, .L80850874 -/* 1E618 80850828 86180850 */ lh $t8, 0x0850($s0) ## 00000850 -/* 1E61C 8085082C 820E0154 */ lb $t6, 0x0154($s0) ## 00000154 -/* 1E620 80850830 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 1E624 80850834 3C028016 */ lui $v0, %hi(gSaveContext) -/* 1E628 80850838 11C10003 */ beq $t6, $at, .L80850848 -/* 1E62C 8085083C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 1E630 80850840 844F13F0 */ lh $t7, 0x13F0($v0) ## 8015FA50 -/* 1E634 80850844 15E000A2 */ bne $t7, $zero, .L80850AD0 -.L80850848: -/* 1E638 80850848 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E63C 8085084C 0C20E7FF */ jal func_80839FFC -/* 1E640 80850850 8FA5002C */ lw $a1, 0x002C($sp) -/* 1E644 80850854 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E648 80850858 0C030129 */ jal Gameplay_GetCamera -/* 1E64C 8085085C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1E650 80850860 0C016C69 */ jal func_8005B1A4 -/* 1E654 80850864 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1E658 80850868 10000099 */ beq $zero, $zero, .L80850AD0 -/* 1E65C 8085086C 00000000 */ nop -/* 1E660 80850870 86180850 */ lh $t8, 0x0850($s0) ## 00000850 -.L80850874: -/* 1E664 80850874 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E668 80850878 8FA50020 */ lw $a1, 0x0020($sp) -/* 1E66C 8085087C 17000023 */ bne $t8, $zero, .L8085090C -/* 1E670 80850880 00036880 */ sll $t5, $v1, 2 -/* 1E674 80850884 0003C880 */ sll $t9, $v1, 2 -/* 1E678 80850888 3C068085 */ lui $a2, %hi(D_80854A58) ## $a2 = 80850000 -/* 1E67C 8085088C 00D93021 */ addu $a2, $a2, $t9 -/* 1E680 80850890 3C073F54 */ lui $a3, 0x3F54 ## $a3 = 3F540000 -/* 1E684 80850894 34E77AE1 */ ori $a3, $a3, 0x7AE1 ## $a3 = 3F547AE1 -/* 1E688 80850898 8CC64A58 */ lw $a2, %lo(D_80854A58)($a2) -/* 1E68C 8085089C 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E690 808508A0 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop -/* 1E694 808508A4 8FA50020 */ lw $a1, 0x0020($sp) -/* 1E698 808508A8 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E69C 808508AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1E6A0 808508B0 0C211A80 */ jal func_80846A00 -/* 1E6A4 808508B4 8206084F */ lb $a2, 0x084F($s0) ## 0000084F -/* 1E6A8 808508B8 10400010 */ beq $v0, $zero, .L808508FC -/* 1E6AC 808508BC 00000000 */ nop -/* 1E6B0 808508C0 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 1E6B4 808508C4 820A084F */ lb $t2, 0x084F($s0) ## 0000084F -/* 1E6B8 808508C8 3C013000 */ lui $at, 0x3000 ## $at = 30000000 -/* 1E6BC 808508CC 01014825 */ or $t1, $t0, $at ## $t1 = 30000000 -/* 1E6C0 808508D0 15400005 */ bne $t2, $zero, .L808508E8 -/* 1E6C4 808508D4 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C -/* 1E6C8 808508D8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 1E6CC 808508DC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 1E6D0 808508E0 804B13B3 */ lb $t3, 0x13B3($v0) ## 8015FA13 -/* 1E6D4 808508E4 1D600014 */ bgtz $t3, .L80850938 -.L808508E8: -/* 1E6D8 808508E8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 1E6DC 808508EC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 1E6E0 808508F0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 1E6E4 808508F4 10000010 */ beq $zero, $zero, .L80850938 -/* 1E6E8 808508F8 A44C13F0 */ sh $t4, 0x13F0($v0) ## 8015FA50 -.L808508FC: -/* 1E6EC 808508FC 0C021DB2 */ jal func_800876C8 -/* 1E6F0 80850900 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E6F4 80850904 1000000D */ beq $zero, $zero, .L8085093C -/* 1E6F8 80850908 86180850 */ lh $t8, 0x0850($s0) ## 00000850 -.L8085090C: -/* 1E6FC 8085090C 3C068085 */ lui $a2, %hi(D_80854A64) ## $a2 = 80850000 -/* 1E700 80850910 00CD3021 */ addu $a2, $a2, $t5 -/* 1E704 80850914 3C073F54 */ lui $a3, 0x3F54 ## $a3 = 3F540000 -/* 1E708 80850918 34E77AE1 */ ori $a3, $a3, 0x7AE1 ## $a3 = 3F547AE1 -/* 1E70C 8085091C 0C029067 */ jal SkelAnime_ChangeLinkAnimPlaybackRepeat -/* 1E710 80850920 8CC64A64 */ lw $a2, %lo(D_80854A64)($a2) -/* 1E714 80850924 820E084F */ lb $t6, 0x084F($s0) ## 0000084F -/* 1E718 80850928 240FFFF6 */ addiu $t7, $zero, 0xFFF6 ## $t7 = FFFFFFF6 -/* 1E71C 8085092C 55C00003 */ bnel $t6, $zero, .L8085093C -/* 1E720 80850930 86180850 */ lh $t8, 0x0850($s0) ## 00000850 -/* 1E724 80850934 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 -.L80850938: -/* 1E728 80850938 86180850 */ lh $t8, 0x0850($s0) ## 00000850 -.L8085093C: -/* 1E72C 8085093C 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 1E730 80850940 10000063 */ beq $zero, $zero, .L80850AD0 -/* 1E734 80850944 A6190850 */ sh $t9, 0x0850($s0) ## 00000850 -/* 1E738 80850948 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -.L8085094C: -/* 1E73C 8085094C 0441002B */ bgez $v0, .L808509FC -/* 1E740 80850950 24480001 */ addiu $t0, $v0, 0x0001 ## $t0 = 00000001 -/* 1E744 80850954 A6080850 */ sh $t0, 0x0850($s0) ## 00000850 -/* 1E748 80850958 86090850 */ lh $t1, 0x0850($s0) ## 00000850 -/* 1E74C 8085095C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 1E750 80850960 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 1E754 80850964 1520005A */ bne $t1, $zero, .L80850AD0 -/* 1E758 80850968 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 1E75C 8085096C A04A13B3 */ sb $t2, 0x13B3($v0) ## 8015FA13 -/* 1E760 80850970 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E764 80850974 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 1E768 80850978 0C0302BD */ jal Gameplay_SetupRespawnPoint -/* 1E76C 8085097C 240606FF */ addiu $a2, $zero, 0x06FF ## $a2 = 000006FF -/* 1E770 80850980 3C028016 */ lui $v0, %hi(gSaveContext) -/* 1E774 80850984 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 1E778 80850988 C4441368 */ lwc1 $f4, 0x1368($v0) ## 8015F9C8 -/* 1E77C 8085098C C448136C */ lwc1 $f8, 0x136C($v0) ## 8015F9CC -/* 1E780 80850990 C4501370 */ lwc1 $f16, 0x1370($v0) ## 8015F9D0 -/* 1E784 80850994 4600218D */ trunc.w.s $f6, $f4 -/* 1E788 80850998 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 1E78C 8085099C AC4B0E80 */ sw $t3, 0x0E80($v0) ## 8015F4E0 -/* 1E790 808509A0 4600428D */ trunc.w.s $f10, $f8 -/* 1E794 808509A4 440D3000 */ mfc1 $t5, $f6 -/* 1E798 808509A8 84481374 */ lh $t0, 0x1374($v0) ## 8015F9D4 -/* 1E79C 808509AC 4600848D */ trunc.w.s $f18, $f16 -/* 1E7A0 808509B0 AC4D0E64 */ sw $t5, 0x0E64($v0) ## 8015F4C4 -/* 1E7A4 808509B4 440F5000 */ mfc1 $t7, $f10 -/* 1E7A8 808509B8 844A1378 */ lh $t2, 0x1378($v0) ## 8015F9D8 -/* 1E7AC 808509BC 44199000 */ mfc1 $t9, $f18 -/* 1E7B0 808509C0 904B137A */ lbu $t3, 0x137A($v0) ## 8015F9DA -/* 1E7B4 808509C4 8C4C137C */ lw $t4, 0x137C($v0) ## 8015F9DC -/* 1E7B8 808509C8 8C4D1380 */ lw $t5, 0x1380($v0) ## 8015F9E0 -/* 1E7BC 808509CC 240906FF */ addiu $t1, $zero, 0x06FF ## $t1 = 000006FF -/* 1E7C0 808509D0 AC490E74 */ sw $t1, 0x0E74($v0) ## 8015F4D4 -/* 1E7C4 808509D4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 1E7C8 808509D8 AC480E70 */ sw $t0, 0x0E70($v0) ## 8015F4D0 -/* 1E7CC 808509DC AC4F0E68 */ sw $t7, 0x0E68($v0) ## 8015F4C8 -/* 1E7D0 808509E0 AC4A0E78 */ sw $t2, 0x0E78($v0) ## 8015F4D8 -/* 1E7D4 808509E4 AC590E6C */ sw $t9, 0x0E6C($v0) ## 8015F4CC -/* 1E7D8 808509E8 AC4B0E7C */ sw $t3, 0x0E7C($v0) ## 8015F4DC -/* 1E7DC 808509EC AC4C0E84 */ sw $t4, 0x0E84($v0) ## 8015F4E4 -/* 1E7E0 808509F0 AC4D0E88 */ sw $t5, 0x0E88($v0) ## 8015F4E8 -/* 1E7E4 808509F4 10000036 */ beq $zero, $zero, .L80850AD0 -/* 1E7E8 808509F8 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -.L808509FC: -/* 1E7EC 808509FC 8203084F */ lb $v1, 0x084F($s0) ## 0000084F -/* 1E7F0 80850A00 04600033 */ bltz $v1, .L80850AD0 -/* 1E7F4 80850A04 00000000 */ nop -/* 1E7F8 80850A08 14400007 */ bne $v0, $zero, .L80850A28 -/* 1E7FC 80850A0C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 1E800 80850A10 3C058085 */ lui $a1, %hi(D_80854A80) ## $a1 = 80850000 -/* 1E804 80850A14 24A54A80 */ addiu $a1, $a1, %lo(D_80854A80) ## $a1 = 80854A80 -/* 1E808 80850A18 0C20CA49 */ jal func_80832924 -/* 1E80C 80850A1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E810 80850A20 1000002B */ beq $zero, $zero, .L80850AD0 -/* 1E814 80850A24 00000000 */ nop -.L80850A28: -/* 1E818 80850A28 14410016 */ bne $v0, $at, .L80850A84 -/* 1E81C 80850A2C 3C0A8085 */ lui $t2, %hi(D_80854A7C) ## $t2 = 80850000 -/* 1E820 80850A30 3C188085 */ lui $t8, %hi(D_80854A8C) ## $t8 = 80850000 -/* 1E824 80850A34 27184A8C */ addiu $t8, $t8, %lo(D_80854A8C) ## $t8 = 80854A8C -/* 1E828 80850A38 000378C0 */ sll $t7, $v1, 3 -/* 1E82C 80850A3C 01F82821 */ addu $a1, $t7, $t8 -/* 1E830 80850A40 0C20CA49 */ jal func_80832924 -/* 1E834 80850A44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E838 80850A48 8219084F */ lb $t9, 0x084F($s0) ## 0000084F -/* 1E83C 80850A4C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1E840 80850A50 8FA40020 */ lw $a0, 0x0020($sp) -/* 1E844 80850A54 1721001E */ bne $t9, $at, .L80850AD0 -/* 1E848 80850A58 00000000 */ nop -/* 1E84C 80850A5C 0C02914C */ jal func_800A4530 -/* 1E850 80850A60 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 -/* 1E854 80850A64 1040001A */ beq $v0, $zero, .L80850AD0 -/* 1E858 80850A68 00000000 */ nop -/* 1E85C 80850A6C 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 1E860 80850A70 3C01CFFF */ lui $at, 0xCFFF ## $at = CFFF0000 -/* 1E864 80850A74 3421FFFF */ ori $at, $at, 0xFFFF ## $at = CFFFFFFF -/* 1E868 80850A78 01014824 */ and $t1, $t0, $at -/* 1E86C 80850A7C 10000014 */ beq $zero, $zero, .L80850AD0 -/* 1E870 80850A80 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C -.L80850A84: -/* 1E874 80850A84 01435021 */ addu $t2, $t2, $v1 -/* 1E878 80850A88 914A4A7C */ lbu $t2, %lo(D_80854A7C)($t2) -/* 1E87C 80850A8C 244B0001 */ addiu $t3, $v0, 0x0001 ## $t3 = 00000001 -/* 1E880 80850A90 A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 -/* 1E884 80850A94 0142202A */ slt $a0, $t2, $v0 -/* 1E888 80850A98 1080000D */ beq $a0, $zero, .L80850AD0 -/* 1E88C 80850A9C 8FA50020 */ lw $a1, 0x0020($sp) -/* 1E890 80850AA0 00036080 */ sll $t4, $v1, 2 -/* 1E894 80850AA4 3C068085 */ lui $a2, %hi(D_80854A70) ## $a2 = 80850000 -/* 1E898 80850AA8 00CC3021 */ addu $a2, $a2, $t4 -/* 1E89C 80850AAC 3C073F54 */ lui $a3, 0x3F54 ## $a3 = 3F540000 -/* 1E8A0 80850AB0 34E77AE1 */ ori $a3, $a3, 0x7AE1 ## $a3 = 3F547AE1 -/* 1E8A4 80850AB4 8CC64A70 */ lw $a2, %lo(D_80854A70)($a2) -/* 1E8A8 80850AB8 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop -/* 1E8AC 80850ABC 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E8B0 80850AC0 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 -/* 1E8B4 80850AC4 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 1E8B8 80850AC8 A20E084F */ sb $t6, 0x084F($s0) ## 0000084F -/* 1E8BC 80850ACC A60D083C */ sh $t5, 0x083C($s0) ## 0000083C -.L80850AD0: -/* 1E8C0 80850AD0 0C20DC87 */ jal func_8083721C -/* 1E8C4 80850AD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E8C8 80850AD8 8FBF001C */ lw $ra, 0x001C($sp) -/* 1E8CC 80850ADC 8FB00018 */ lw $s0, 0x0018($sp) -/* 1E8D0 80850AE0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1E8D4 80850AE4 03E00008 */ jr $ra -/* 1E8D8 80850AE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850AEC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850AEC.s deleted file mode 100644 index 04548804e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850AEC.s +++ /dev/null @@ -1,105 +0,0 @@ -glabel func_80850AEC -/* 1E8DC 80850AEC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 1E8E0 80850AF0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1E8E4 80850AF4 AFB00020 */ sw $s0, 0x0020($sp) -/* 1E8E8 80850AF8 AFA50034 */ sw $a1, 0x0034($sp) -/* 1E8EC 80850AFC 8C8E0680 */ lw $t6, 0x0680($a0) ## 00000680 -/* 1E8F0 80850B00 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1E8F4 80850B04 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1E8F8 80850B08 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 1E8FC 80850B0C AC8F0680 */ sw $t7, 0x0680($a0) ## 00000680 -/* 1E900 80850B10 0C028EF0 */ jal func_800A3BC0 -/* 1E904 80850B14 8FA40034 */ lw $a0, 0x0034($sp) -/* 1E908 80850B18 10400005 */ beq $v0, $zero, .L80850B30 -/* 1E90C 80850B1C 8FA40034 */ lw $a0, 0x0034($sp) -/* 1E910 80850B20 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1E914 80850B24 24C62C98 */ addiu $a2, $a2, 0x2C98 ## $a2 = 04002C98 -/* 1E918 80850B28 0C20C8A1 */ jal func_80832284 -/* 1E91C 80850B2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L80850B30: -/* 1E920 80850B30 26070024 */ addiu $a3, $s0, 0x0024 ## $a3 = 00000024 -/* 1E924 80850B34 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000024 -/* 1E928 80850B38 00E03025 */ or $a2, $a3, $zero ## $a2 = 00000024 -/* 1E92C 80850B3C AFA70028 */ sw $a3, 0x0028($sp) -/* 1E930 80850B40 0C01DFA7 */ jal Math_Vec3f_Sum - ## Vec3f_Add -/* 1E934 80850B44 2605005C */ addiu $a1, $s0, 0x005C ## $a1 = 0000005C -/* 1E938 80850B48 0C20D3EF */ jal func_80834FBC -/* 1E93C 80850B4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E940 80850B50 10400028 */ beq $v0, $zero, .L80850BF4 -/* 1E944 80850B54 8FA70028 */ lw $a3, 0x0028($sp) -/* 1E948 80850B58 26040100 */ addiu $a0, $s0, 0x0100 ## $a0 = 00000100 -/* 1E94C 80850B5C 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 1E950 80850B60 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 1E954 80850B64 8FA40034 */ lw $a0, 0x0034($sp) -/* 1E958 80850B68 0C211EE8 */ jal func_80847BA0 -/* 1E95C 80850B6C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1E960 80850B70 C6020028 */ lwc1 $f2, 0x0028($s0) ## 00000028 -/* 1E964 80850B74 C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 -/* 1E968 80850B78 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 1E96C 80850B7C 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 1E970 80850B80 46041001 */ sub.s $f0, $f2, $f4 -/* 1E974 80850B84 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 1E978 80850B88 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 1E97C 80850B8C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 1E980 80850B90 4600603C */ c.lt.s $f12, $f0 -/* 1E984 80850B94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E988 80850B98 45020003 */ bc1fl .L80850BA8 -/* 1E98C 80850B9C 46001181 */ sub.s $f6, $f2, $f0 -/* 1E990 80850BA0 46006006 */ mov.s $f0, $f12 -/* 1E994 80850BA4 46001181 */ sub.s $f6, $f2, $f0 -.L80850BA8: -/* 1E998 80850BA8 A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 -/* 1E99C 80850BAC 861800B4 */ lh $t8, 0x00B4($s0) ## 000000B4 -/* 1E9A0 80850BB0 E6080838 */ swc1 $f8, 0x0838($s0) ## 00000838 -/* 1E9A4 80850BB4 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 1E9A8 80850BB8 E60A0060 */ swc1 $f10, 0x0060($s0) ## 00000060 -/* 1E9AC 80850BBC A6180030 */ sh $t8, 0x0030($s0) ## 00000030 -/* 1E9B0 80850BC0 0C20DEE7 */ jal func_80837B9C -/* 1E9B4 80850BC4 8FA50034 */ lw $a1, 0x0034($sp) -/* 1E9B8 80850BC8 8E190680 */ lw $t9, 0x0680($s0) ## 00000680 -/* 1E9BC 80850BCC 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -/* 1E9C0 80850BD0 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 1E9C4 80850BD4 2401FBFF */ addiu $at, $zero, 0xFBFF ## $at = FFFFFBFF -/* 1E9C8 80850BD8 03214024 */ and $t0, $t9, $at -/* 1E9CC 80850BDC 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 1E9D0 80850BE0 356C0004 */ ori $t4, $t3, 0x0004 ## $t4 = 00000004 -/* 1E9D4 80850BE4 AE080680 */ sw $t0, 0x0680($s0) ## 00000680 -/* 1E9D8 80850BE8 A60A0088 */ sh $t2, 0x0088($s0) ## 00000088 -/* 1E9DC 80850BEC 10000019 */ beq $zero, $zero, .L80850C54 -/* 1E9E0 80850BF0 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -.L80850BF4: -/* 1E9E4 80850BF4 8E0E01BC */ lw $t6, 0x01BC($s0) ## 000001BC -/* 1E9E8 80850BF8 3C0D0400 */ lui $t5, 0x0400 ## $t5 = 04000000 -/* 1E9EC 80850BFC 25AD2C90 */ addiu $t5, $t5, 0x2C90 ## $t5 = 04002C90 -/* 1E9F0 80850C00 15AE0008 */ bne $t5, $t6, .L80850C24 -/* 1E9F4 80850C04 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 1E9F8 80850C08 C61001CC */ lwc1 $f16, 0x01CC($s0) ## 000001CC -/* 1E9FC 80850C0C 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 -/* 1EA00 80850C10 00000000 */ nop -/* 1EA04 80850C14 4610903E */ c.le.s $f18, $f16 -/* 1EA08 80850C18 00000000 */ nop -/* 1EA0C 80850C1C 4502000E */ bc1fl .L80850C58 -/* 1EA10 80850C20 8FBF0024 */ lw $ra, 0x0024($sp) -.L80850C24: -/* 1EA14 80850C24 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 1EA18 80850C28 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 1EA1C 80850C2C 86050030 */ lh $a1, 0x0030($s0) ## 00000030 -/* 1EA20 80850C30 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 1EA24 80850C34 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 1EA28 80850C38 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 1EA2C 80850C3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1EA30 80850C40 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 -/* 1EA34 80850C44 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 1EA38 80850C48 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 1EA3C 80850C4C 0C20C993 */ jal func_8083264C -/* 1EA40 80850C50 AFA00010 */ sw $zero, 0x0010($sp) -.L80850C54: -/* 1EA44 80850C54 8FBF0024 */ lw $ra, 0x0024($sp) -.L80850C58: -/* 1EA48 80850C58 8FB00020 */ lw $s0, 0x0020($sp) -/* 1EA4C 80850C5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 1EA50 80850C60 03E00008 */ jr $ra -/* 1EA54 80850C64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850C68.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850C68.s deleted file mode 100644 index ad126c12bb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850C68.s +++ /dev/null @@ -1,146 +0,0 @@ -glabel func_80850C68 -/* 1EA58 80850C68 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 1EA5C 80850C6C AFBF002C */ sw $ra, 0x002C($sp) -/* 1EA60 80850C70 AFB00028 */ sw $s0, 0x0028($sp) -/* 1EA64 80850C74 AFA5004C */ sw $a1, 0x004C($sp) -/* 1EA68 80850C78 848E0850 */ lh $t6, 0x0850($a0) ## 00000850 -/* 1EA6C 80850C7C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1EA70 80850C80 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1EA74 80850C84 11C00057 */ beq $t6, $zero, .L80850DE4 -/* 1EA78 80850C88 00000000 */ nop -/* 1EA7C 80850C8C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 1EA80 80850C90 C4840858 */ lwc1 $f4, 0x0858($a0) ## 00000858 -/* 1EA84 80850C94 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1EA88 80850C98 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 1EA8C 80850C9C 46047032 */ c.eq.s $f14, $f4 -/* 1EA90 80850CA0 24C62C38 */ addiu $a2, $a2, 0x2C38 ## $a2 = 04002C38 -/* 1EA94 80850CA4 26190318 */ addiu $t9, $s0, 0x0318 ## $t9 = 00000318 -/* 1EA98 80850CA8 45000006 */ bc1f .L80850CC4 -/* 1EA9C 80850CAC 00000000 */ nop -/* 1EAA0 80850CB0 C486085C */ lwc1 $f6, 0x085C($a0) ## 0000085C -/* 1EAA4 80850CB4 46067032 */ c.eq.s $f14, $f6 -/* 1EAA8 80850CB8 00000000 */ nop -/* 1EAAC 80850CBC 45010049 */ bc1t .L80850DE4 -/* 1EAB0 80850CC0 00000000 */ nop -.L80850CC4: -/* 1EAB4 80850CC4 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 1EAB8 80850CC8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 1EABC 80850CCC 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 1EAC0 80850CD0 85F80110 */ lh $t8, 0x0110($t7) ## 80160110 -/* 1EAC4 80850CD4 C60401D0 */ lwc1 $f4, 0x01D0($s0) ## 000001D0 -/* 1EAC8 80850CD8 C61201CC */ lwc1 $f18, 0x01CC($s0) ## 000001CC -/* 1EACC 80850CDC 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 1EAD0 80850CE0 C60C01C8 */ lwc1 $f12, 0x01C8($s0) ## 000001C8 -/* 1EAD4 80850CE4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 1EAD8 80850CE8 468042A0 */ cvt.s.w $f10, $f8 -/* 1EADC 80850CEC 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 -/* 1EAE0 80850CF0 24422C20 */ addiu $v0, $v0, 0x2C20 ## $v0 = 04002C20 -/* 1EAE4 80850CF4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1EAE8 80850CF8 46105002 */ mul.s $f0, $f10, $f16 -/* 1EAEC 80850CFC 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 1EAF0 80850D00 46002182 */ mul.s $f6, $f4, $f0 -/* 1EAF4 80850D04 46069200 */ add.s $f8, $f18, $f6 -/* 1EAF8 80850D08 E60801CC */ swc1 $f8, 0x01CC($s0) ## 000001CC -/* 1EAFC 80850D0C C60201CC */ lwc1 $f2, 0x01CC($s0) ## 000001CC -/* 1EB00 80850D10 4602603E */ c.le.s $f12, $f2 -/* 1EB04 80850D14 00000000 */ nop -/* 1EB08 80850D18 45020005 */ bc1fl .L80850D30 -/* 1EB0C 80850D1C C60C0858 */ lwc1 $f12, 0x0858($s0) ## 00000858 -/* 1EB10 80850D20 460C1281 */ sub.s $f10, $f2, $f12 -/* 1EB14 80850D24 E60A01CC */ swc1 $f10, 0x01CC($s0) ## 000001CC -/* 1EB18 80850D28 C60201CC */ lwc1 $f2, 0x01CC($s0) ## 000001CC -/* 1EB1C 80850D2C C60C0858 */ lwc1 $f12, 0x0858($s0) ## 00000858 -.L80850D30: -/* 1EB20 80850D30 44071000 */ mfc1 $a3, $f2 -/* 1EB24 80850D34 8FA4004C */ lw $a0, 0x004C($sp) -/* 1EB28 80850D38 460E603C */ c.lt.s $f12, $f14 -/* 1EB2C 80850D3C 46006005 */ abs.s $f0, $f12 -/* 1EB30 80850D40 45000004 */ bc1f .L80850D54 -/* 1EB34 80850D44 00000000 */ nop -/* 1EB38 80850D48 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 -/* 1EB3C 80850D4C 10000001 */ beq $zero, $zero, .L80850D54 -/* 1EB40 80850D50 24422C18 */ addiu $v0, $v0, 0x2C18 ## $v0 = 04002C18 -.L80850D54: -/* 1EB44 80850D54 AFA20010 */ sw $v0, 0x0010($sp) -/* 1EB48 80850D58 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 1EB4C 80850D5C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 1EB50 80850D60 AFB9001C */ sw $t9, 0x001C($sp) -/* 1EB54 80850D64 0C0290C7 */ jal func_800A431C -/* 1EB58 80850D68 AFA50030 */ sw $a1, 0x0030($sp) -/* 1EB5C 80850D6C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 1EB60 80850D70 C602085C */ lwc1 $f2, 0x085C($s0) ## 0000085C -/* 1EB64 80850D74 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1EB68 80850D78 24C62C38 */ addiu $a2, $a2, 0x2C38 ## $a2 = 04002C38 -/* 1EB6C 80850D7C 460E103C */ c.lt.s $f2, $f14 -/* 1EB70 80850D80 8FA4004C */ lw $a0, 0x004C($sp) -/* 1EB74 80850D84 8FA50030 */ lw $a1, 0x0030($sp) -/* 1EB78 80850D88 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 1EB7C 80850D8C 45000004 */ bc1f .L80850DA0 -/* 1EB80 80850D90 46001005 */ abs.s $f0, $f2 -/* 1EB84 80850D94 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 -/* 1EB88 80850D98 10000003 */ beq $zero, $zero, .L80850DA8 -/* 1EB8C 80850D9C 24422C28 */ addiu $v0, $v0, 0x2C28 ## $v0 = 04002C28 -.L80850DA0: -/* 1EB90 80850DA0 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 -/* 1EB94 80850DA4 24422C10 */ addiu $v0, $v0, 0x2C10 ## $v0 = 04002C10 -.L80850DA8: -/* 1EB98 80850DA8 8E0701CC */ lw $a3, 0x01CC($s0) ## 000001CC -/* 1EB9C 80850DAC 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 1EBA0 80850DB0 3C088086 */ lui $t0, %hi(D_80858AD8) ## $t0 = 80860000 -/* 1EBA4 80850DB4 25088AD8 */ addiu $t0, $t0, %lo(D_80858AD8) ## $t0 = 80858AD8 -/* 1EBA8 80850DB8 AFA8001C */ sw $t0, 0x001C($sp) -/* 1EBAC 80850DBC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 1EBB0 80850DC0 AFA20010 */ sw $v0, 0x0010($sp) -/* 1EBB4 80850DC4 0C0290EE */ jal func_800A43B8 -/* 1EBB8 80850DC8 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 1EBBC 80850DCC 8FA4004C */ lw $a0, 0x004C($sp) -/* 1EBC0 80850DD0 8FA50030 */ lw $a1, 0x0030($sp) -/* 1EBC4 80850DD4 0C0290B9 */ jal func_800A42E4 -/* 1EBC8 80850DD8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 1EBCC 80850DDC 1000000D */ beq $zero, $zero, .L80850E14 -/* 1EBD0 80850DE0 00000000 */ nop -.L80850DE4: -/* 1EBD4 80850DE4 0C028EF0 */ jal func_800A3BC0 -/* 1EBD8 80850DE8 8FA4004C */ lw $a0, 0x004C($sp) -/* 1EBDC 80850DEC 10400009 */ beq $v0, $zero, .L80850E14 -/* 1EBE0 80850DF0 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 1EBE4 80850DF4 A6090860 */ sh $t1, 0x0860($s0) ## 00000860 -/* 1EBE8 80850DF8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1EBEC 80850DFC 24C62C38 */ addiu $a2, $a2, 0x2C38 ## $a2 = 04002C38 -/* 1EBF0 80850E00 8FA4004C */ lw $a0, 0x004C($sp) -/* 1EBF4 80850E04 0C20C8A1 */ jal func_80832284 -/* 1EBF8 80850E08 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1EBFC 80850E0C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 1EC00 80850E10 A60A0850 */ sh $t2, 0x0850($s0) ## 00000850 -.L80850E14: -/* 1EC04 80850E14 0C20DC87 */ jal func_8083721C -/* 1EC08 80850E18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1EC0C 80850E1C 86030860 */ lh $v1, 0x0860($s0) ## 00000860 -/* 1EC10 80850E20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1EC14 80850E24 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 1EC18 80850E28 14600005 */ bne $v1, $zero, .L80850E40 -/* 1EC1C 80850E2C 00000000 */ nop -/* 1EC20 80850E30 0C214C20 */ jal func_80853080 -/* 1EC24 80850E34 8FA5004C */ lw $a1, 0x004C($sp) -/* 1EC28 80850E38 1000000E */ beq $zero, $zero, .L80850E74 -/* 1EC2C 80850E3C 8FBF002C */ lw $ra, 0x002C($sp) -.L80850E40: -/* 1EC30 80850E40 1461000B */ bne $v1, $at, .L80850E70 -/* 1EC34 80850E44 8FA4004C */ lw $a0, 0x004C($sp) -/* 1EC38 80850E48 3C068085 */ lui $a2, %hi(func_80850E84) ## $a2 = 80850000 -/* 1EC3C 80850E4C 24C60E84 */ addiu $a2, $a2, %lo(func_80850E84) ## $a2 = 80850E84 -/* 1EC40 80850E50 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1EC44 80850E54 0C20D716 */ jal func_80835C58 -/* 1EC48 80850E58 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 1EC4C 80850E5C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1EC50 80850E60 24C62C00 */ addiu $a2, $a2, 0x2C00 ## $a2 = 04002C00 -/* 1EC54 80850E64 8FA4004C */ lw $a0, 0x004C($sp) -/* 1EC58 80850E68 0C20CAC3 */ jal func_80832B0C -/* 1EC5C 80850E6C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L80850E70: -/* 1EC60 80850E70 8FBF002C */ lw $ra, 0x002C($sp) -.L80850E74: -/* 1EC64 80850E74 8FB00028 */ lw $s0, 0x0028($sp) -/* 1EC68 80850E78 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 1EC6C 80850E7C 03E00008 */ jr $ra -/* 1EC70 80850E80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850E84.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850E84.s deleted file mode 100644 index 11a09b40df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850E84.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80850E84 -/* 1EC74 80850E84 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EC78 80850E88 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 1EC7C 80850E8C AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EC80 80850E90 AFA5001C */ sw $a1, 0x001C($sp) -/* 1EC84 80850E94 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1EC88 80850E98 24E501B4 */ addiu $a1, $a3, 0x01B4 ## $a1 = 000001B4 -/* 1EC8C 80850E9C 0C028EF0 */ jal func_800A3BC0 -/* 1EC90 80850EA0 AFA70018 */ sw $a3, 0x0018($sp) -/* 1EC94 80850EA4 10400008 */ beq $v0, $zero, .L80850EC8 -/* 1EC98 80850EA8 8FA70018 */ lw $a3, 0x0018($sp) -/* 1EC9C 80850EAC 84EE0860 */ lh $t6, 0x0860($a3) ## 00000860 -/* 1ECA0 80850EB0 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 1ECA4 80850EB4 24A52C08 */ addiu $a1, $a1, 0x2C08 ## $a1 = 04002C08 -/* 1ECA8 80850EB8 15C00003 */ bne $t6, $zero, .L80850EC8 -/* 1ECAC 80850EBC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 1ECB0 80850EC0 0C20E826 */ jal func_8083A098 -/* 1ECB4 80850EC4 8FA6001C */ lw $a2, 0x001C($sp) -.L80850EC8: -/* 1ECB8 80850EC8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1ECBC 80850ECC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1ECC0 80850ED0 03E00008 */ jr $ra -/* 1ECC4 80850ED4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850ED8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850ED8.s deleted file mode 100644 index 0194b0b25f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850ED8.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80850ED8 -/* 1ECC8 80850ED8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1ECCC 80850EDC AFBF0014 */ sw $ra, 0x0014($sp) -/* 1ECD0 80850EE0 AFA40018 */ sw $a0, 0x0018($sp) -/* 1ECD4 80850EE4 AFA5001C */ sw $a1, 0x001C($sp) -/* 1ECD8 80850EE8 AFA60020 */ sw $a2, 0x0020($sp) -/* 1ECDC 80850EEC 0C20CB6C */ jal func_80832DB0 -/* 1ECE0 80850EF0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1ECE4 80850EF4 8FA40018 */ lw $a0, 0x0018($sp) -/* 1ECE8 80850EF8 8FA5001C */ lw $a1, 0x001C($sp) -/* 1ECEC 80850EFC 0C20CAC3 */ jal func_80832B0C -/* 1ECF0 80850F00 8FA60020 */ lw $a2, 0x0020($sp) -/* 1ECF4 80850F04 0C20C884 */ jal func_80832210 -/* 1ECF8 80850F08 8FA4001C */ lw $a0, 0x001C($sp) -/* 1ECFC 80850F0C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1ED00 80850F10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1ED04 80850F14 03E00008 */ jr $ra -/* 1ED08 80850F18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s deleted file mode 100644 index a3b48477ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80850F1C -/* 1ED0C 80850F1C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1ED10 80850F20 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1ED14 80850F24 AFA40028 */ sw $a0, 0x0028($sp) -/* 1ED18 80850F28 AFA5002C */ sw $a1, 0x002C($sp) -/* 1ED1C 80850F2C AFA60030 */ sw $a2, 0x0030($sp) -/* 1ED20 80850F30 0C20CB6C */ jal func_80832DB0 -/* 1ED24 80850F34 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1ED28 80850F38 0C028800 */ jal SkelAnime_GetFrameCount - -/* 1ED2C 80850F3C 8FA40030 */ lw $a0, 0x0030($sp) -/* 1ED30 80850F40 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 1ED34 80850F44 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 1ED38 80850F48 44815000 */ mtc1 $at, $f10 ## $f10 = -8.00 -/* 1ED3C 80850F4C 46803220 */ cvt.s.w $f8, $f6 -/* 1ED40 80850F50 8FA5002C */ lw $a1, 0x002C($sp) -/* 1ED44 80850F54 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 1ED48 80850F58 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 -/* 1ED4C 80850F5C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 1ED50 80850F60 AFAE0018 */ sw $t6, 0x0018($sp) -/* 1ED54 80850F64 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 1ED58 80850F68 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 1ED5C 80850F6C 8FA40028 */ lw $a0, 0x0028($sp) -/* 1ED60 80850F70 8FA60030 */ lw $a2, 0x0030($sp) -/* 1ED64 80850F74 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 1ED68 80850F78 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1ED6C 80850F7C 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 1ED70 80850F80 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 1ED74 80850F84 0C20C884 */ jal func_80832210 -/* 1ED78 80850F88 8FA4002C */ lw $a0, 0x002C($sp) -/* 1ED7C 80850F8C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 1ED80 80850F90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1ED84 80850F94 03E00008 */ jr $ra -/* 1ED88 80850F98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s deleted file mode 100644 index 9d239656b6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80850F9C -/* 1ED8C 80850F9C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1ED90 80850FA0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1ED94 80850FA4 AFA40028 */ sw $a0, 0x0028($sp) -/* 1ED98 80850FA8 AFA5002C */ sw $a1, 0x002C($sp) -/* 1ED9C 80850FAC AFA60030 */ sw $a2, 0x0030($sp) -/* 1EDA0 80850FB0 0C20CB6C */ jal func_80832DB0 -/* 1EDA4 80850FB4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1EDA8 80850FB8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 1EDAC 80850FBC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 1EDB0 80850FC0 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 1EDB4 80850FC4 8FA5002C */ lw $a1, 0x002C($sp) -/* 1EDB8 80850FC8 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 -/* 1EDBC 80850FCC 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 1EDC0 80850FD0 8FA40028 */ lw $a0, 0x0028($sp) -/* 1EDC4 80850FD4 8FA60030 */ lw $a2, 0x0030($sp) -/* 1EDC8 80850FD8 AFA00018 */ sw $zero, 0x0018($sp) -/* 1EDCC 80850FDC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 1EDD0 80850FE0 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 1EDD4 80850FE4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1EDD8 80850FE8 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 1EDDC 80850FEC E7A4001C */ swc1 $f4, 0x001C($sp) -/* 1EDE0 80850FF0 0C20C884 */ jal func_80832210 -/* 1EDE4 80850FF4 8FA4002C */ lw $a0, 0x002C($sp) -/* 1EDE8 80850FF8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 1EDEC 80850FFC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1EDF0 80851000 03E00008 */ jr $ra -/* 1EDF4 80851004 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851008.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851008.s deleted file mode 100644 index 65b285c1ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851008.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80851008 -/* 1EDF8 80851008 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EDFC 8085100C AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EE00 80851010 AFA40018 */ sw $a0, 0x0018($sp) -/* 1EE04 80851014 AFA60020 */ sw $a2, 0x0020($sp) -/* 1EE08 80851018 0C20C884 */ jal func_80832210 -/* 1EE0C 8085101C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1EE10 80851020 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1EE14 80851024 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1EE18 80851028 03E00008 */ jr $ra -/* 1EE1C 8085102C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851030.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851030.s deleted file mode 100644 index 8c6bd4820d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851030.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80851030 -/* 1EE20 80851030 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EE24 80851034 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EE28 80851038 0C2143B6 */ jal func_80850ED8 -/* 1EE2C 8085103C 00000000 */ nop -/* 1EE30 80851040 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1EE34 80851044 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1EE38 80851048 03E00008 */ jr $ra -/* 1EE3C 8085104C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851050.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851050.s deleted file mode 100644 index 5f13945855..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851050.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80851050 -/* 1EE40 80851050 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EE44 80851054 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EE48 80851058 AFA40018 */ sw $a0, 0x0018($sp) -/* 1EE4C 8085105C AFA5001C */ sw $a1, 0x001C($sp) -/* 1EE50 80851060 AFA60020 */ sw $a2, 0x0020($sp) -/* 1EE54 80851064 0C20CB6C */ jal func_80832DB0 -/* 1EE58 80851068 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1EE5C 8085106C 8FA40018 */ lw $a0, 0x0018($sp) -/* 1EE60 80851070 8FA5001C */ lw $a1, 0x001C($sp) -/* 1EE64 80851074 0C20CB0B */ jal func_80832C2C -/* 1EE68 80851078 8FA60020 */ lw $a2, 0x0020($sp) -/* 1EE6C 8085107C 0C20C884 */ jal func_80832210 -/* 1EE70 80851080 8FA4001C */ lw $a0, 0x001C($sp) -/* 1EE74 80851084 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1EE78 80851088 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1EE7C 8085108C 03E00008 */ jr $ra -/* 1EE80 80851090 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851094.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851094.s deleted file mode 100644 index 0ff33385e3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851094.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80851094 -/* 1EE84 80851094 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EE88 80851098 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EE8C 8085109C 0C2143C7 */ jal func_80850F1C -/* 1EE90 808510A0 00000000 */ nop -/* 1EE94 808510A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1EE98 808510A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1EE9C 808510AC 03E00008 */ jr $ra -/* 1EEA0 808510B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510B4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510B4.s deleted file mode 100644 index c174ebe2a3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510B4.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_808510B4 -/* 1EEA4 808510B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EEA8 808510B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EEAC 808510BC 0C2143E7 */ jal func_80850F9C -/* 1EEB0 808510C0 00000000 */ nop -/* 1EEB4 808510C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1EEB8 808510C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1EEBC 808510CC 03E00008 */ jr $ra -/* 1EEC0 808510D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510D4.s deleted file mode 100644 index 97fdc127c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510D4.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_808510D4 -/* 1EEC4 808510D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EEC8 808510D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EECC 808510DC 0C20CC23 */ jal func_8083308C -/* 1EED0 808510E0 00000000 */ nop -/* 1EED4 808510E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1EED8 808510E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1EEDC 808510EC 03E00008 */ jr $ra -/* 1EEE0 808510F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510F4.s deleted file mode 100644 index 80c22a397e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808510F4.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_808510F4 -/* 1EEE4 808510F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EEE8 808510F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EEEC 808510FC 0C20CC0F */ jal func_8083303C -/* 1EEF0 80851100 2407009C */ addiu $a3, $zero, 0x009C ## $a3 = 0000009C -/* 1EEF4 80851104 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1EEF8 80851108 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1EEFC 8085110C 03E00008 */ jr $ra -/* 1EF00 80851110 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851114.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851114.s deleted file mode 100644 index 8c2c6024e3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851114.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80851114 -/* 1EF04 80851114 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EF08 80851118 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EF0C 8085111C 0C20CC4F */ jal func_8083313C -/* 1EF10 80851120 00000000 */ nop -/* 1EF14 80851124 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1EF18 80851128 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1EF1C 8085112C 03E00008 */ jr $ra -/* 1EF20 80851130 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851134.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851134.s deleted file mode 100644 index c899fe1d3d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851134.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80851134 -/* 1EF24 80851134 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EF28 80851138 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EF2C 8085113C 0C20CC3B */ jal func_808330EC -/* 1EF30 80851140 2407009C */ addiu $a3, $zero, 0x009C ## $a3 = 0000009C -/* 1EF34 80851144 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1EF38 80851148 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1EF3C 8085114C 03E00008 */ jr $ra -/* 1EF40 80851150 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851154.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851154.s deleted file mode 100644 index c9afc936d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851154.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80851154 -/* 1EF44 80851154 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EF48 80851158 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EF4C 8085115C 0C20C899 */ jal func_80832264 -/* 1EF50 80851160 00000000 */ nop -/* 1EF54 80851164 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1EF58 80851168 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1EF5C 8085116C 03E00008 */ jr $ra -/* 1EF60 80851170 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851174.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851174.s deleted file mode 100644 index 6a131675ef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851174.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80851174 -/* 1EF64 80851174 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EF68 80851178 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EF6C 8085117C 0C20C8A1 */ jal func_80832284 -/* 1EF70 80851180 00000000 */ nop -/* 1EF74 80851184 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1EF78 80851188 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1EF7C 8085118C 03E00008 */ jr $ra -/* 1EF80 80851190 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851194.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851194.s deleted file mode 100644 index bbd28af0f5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851194.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80851194 -/* 1EF84 80851194 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EF88 80851198 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EF8C 8085119C 0C20C8B4 */ jal func_808322D0 -/* 1EF90 808511A0 00000000 */ nop -/* 1EF94 808511A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1EF98 808511A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1EF9C 808511AC 03E00008 */ jr $ra -/* 1EFA0 808511B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511B4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511B4.s deleted file mode 100644 index 4f7ec758fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511B4.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_808511B4 -/* 1EFA4 808511B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EFA8 808511B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EFAC 808511BC 0C20C8A9 */ jal func_808322A4 -/* 1EFB0 808511C0 00000000 */ nop -/* 1EFB4 808511C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1EFB8 808511C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1EFBC 808511CC 03E00008 */ jr $ra -/* 1EFC0 808511D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511D4.s deleted file mode 100644 index b0d734a267..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511D4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_808511D4 -/* 1EFC4 808511D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EFC8 808511D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EFCC 808511DC AFA5001C */ sw $a1, 0x001C($sp) -/* 1EFD0 808511E0 AFA60020 */ sw $a2, 0x0020($sp) -/* 1EFD4 808511E4 0C028EF0 */ jal func_800A3BC0 -/* 1EFD8 808511E8 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1EFDC 808511EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1EFE0 808511F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1EFE4 808511F4 03E00008 */ jr $ra -/* 1EFE8 808511F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511FC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511FC.s deleted file mode 100644 index 07338462cf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808511FC.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_808511FC -/* 1EFEC 808511FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1EFF0 80851200 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1EFF4 80851204 AFA5001C */ sw $a1, 0x001C($sp) -/* 1EFF8 80851208 AFA40018 */ sw $a0, 0x0018($sp) -/* 1EFFC 8085120C AFA60020 */ sw $a2, 0x0020($sp) -/* 1F000 80851210 0C028EF0 */ jal func_800A3BC0 -/* 1F004 80851214 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1F008 80851218 10400007 */ beq $v0, $zero, .L80851238 -/* 1F00C 8085121C 8FA40018 */ lw $a0, 0x0018($sp) -/* 1F010 80851220 8FA5001C */ lw $a1, 0x001C($sp) -/* 1F014 80851224 0C2143E7 */ jal func_80850F9C -/* 1F018 80851228 8FA60020 */ lw $a2, 0x0020($sp) -/* 1F01C 8085122C 8FAF001C */ lw $t7, 0x001C($sp) -/* 1F020 80851230 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 1F024 80851234 A5EE0850 */ sh $t6, 0x0850($t7) ## 00000850 -.L80851238: -/* 1F028 80851238 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1F02C 8085123C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1F030 80851240 03E00008 */ jr $ra -/* 1F034 80851244 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851248.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851248.s deleted file mode 100644 index f16f5ab93d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851248.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80851248 -/* 1F038 80851248 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1F03C 8085124C AFBF0014 */ sw $ra, 0x0014($sp) -/* 1F040 80851250 AFA5001C */ sw $a1, 0x001C($sp) -/* 1F044 80851254 AFA40018 */ sw $a0, 0x0018($sp) -/* 1F048 80851258 AFA60020 */ sw $a2, 0x0020($sp) -/* 1F04C 8085125C 0C028EF0 */ jal func_800A3BC0 -/* 1F050 80851260 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1F054 80851264 50400008 */ beql $v0, $zero, .L80851288 -/* 1F058 80851268 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1F05C 8085126C 0C20CB6F */ jal func_80832DBC -/* 1F060 80851270 8FA4001C */ lw $a0, 0x001C($sp) -/* 1F064 80851274 8FA40018 */ lw $a0, 0x0018($sp) -/* 1F068 80851278 8FA5001C */ lw $a1, 0x001C($sp) -/* 1F06C 8085127C 0C20C8A9 */ jal func_808322A4 -/* 1F070 80851280 8FA60020 */ lw $a2, 0x0020($sp) -/* 1F074 80851284 8FBF0014 */ lw $ra, 0x0014($sp) -.L80851288: -/* 1F078 80851288 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1F07C 8085128C 03E00008 */ jr $ra -/* 1F080 80851290 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851294.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851294.s deleted file mode 100644 index 91646f9b00..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851294.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80851294 -/* 1F084 80851294 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1F088 80851298 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1F08C 8085129C AFA5001C */ sw $a1, 0x001C($sp) -/* 1F090 808512A0 AFA40018 */ sw $a0, 0x0018($sp) -/* 1F094 808512A4 AFA60020 */ sw $a2, 0x0020($sp) -/* 1F098 808512A8 0C028EF0 */ jal func_800A3BC0 -/* 1F09C 808512AC 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1F0A0 808512B0 10400007 */ beq $v0, $zero, .L808512D0 -/* 1F0A4 808512B4 8FA40018 */ lw $a0, 0x0018($sp) -/* 1F0A8 808512B8 8FA5001C */ lw $a1, 0x001C($sp) -/* 1F0AC 808512BC 0C20CC4F */ jal func_8083313C -/* 1F0B0 808512C0 8FA60020 */ lw $a2, 0x0020($sp) -/* 1F0B4 808512C4 8FAF001C */ lw $t7, 0x001C($sp) -/* 1F0B8 808512C8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 1F0BC 808512CC A5EE0850 */ sh $t6, 0x0850($t7) ## 00000850 -.L808512D0: -/* 1F0C0 808512D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1F0C4 808512D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1F0C8 808512D8 03E00008 */ jr $ra -/* 1F0CC 808512DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808512E0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808512E0.s deleted file mode 100644 index 5f6a57d0dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808512E0.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_808512E0 -/* 1F0D0 808512E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1F0D4 808512E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1F0D8 808512E8 AFA5001C */ sw $a1, 0x001C($sp) -/* 1F0DC 808512EC AFA60020 */ sw $a2, 0x0020($sp) -/* 1F0E0 808512F0 0C028EF0 */ jal func_800A3BC0 -/* 1F0E4 808512F4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1F0E8 808512F8 8FA4001C */ lw $a0, 0x001C($sp) -/* 1F0EC 808512FC 0C20CA49 */ jal func_80832924 -/* 1F0F0 80851300 8FA50020 */ lw $a1, 0x0020($sp) -/* 1F0F4 80851304 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1F0F8 80851308 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1F0FC 8085130C 03E00008 */ jr $ra -/* 1F100 80851310 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851314.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851314.s deleted file mode 100644 index cafcdcd73a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851314.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80851314 -/* 1F104 80851314 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1F108 80851318 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1F10C 8085131C 8C820448 */ lw $v0, 0x0448($a0) ## 00000448 -/* 1F110 80851320 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1F114 80851324 50400005 */ beql $v0, $zero, .L8085133C -/* 1F118 80851328 AC800448 */ sw $zero, 0x0448($a0) ## 00000448 -/* 1F11C 8085132C 8C4E0130 */ lw $t6, 0x0130($v0) ## 00000130 -/* 1F120 80851330 15C00003 */ bne $t6, $zero, .L80851340 -/* 1F124 80851334 00000000 */ nop -/* 1F128 80851338 AC800448 */ sw $zero, 0x0448($a0) ## 00000448 -.L8085133C: -/* 1F12C 8085133C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80851340: -/* 1F130 80851340 10400005 */ beq $v0, $zero, .L80851358 -/* 1F134 80851344 AC820664 */ sw $v0, 0x0664($a0) ## 00000664 -/* 1F138 80851348 0C20F6E6 */ jal func_8083DB98 -/* 1F13C 8085134C AFA40018 */ sw $a0, 0x0018($sp) -/* 1F140 80851350 8FA40018 */ lw $a0, 0x0018($sp) -/* 1F144 80851354 A48200B6 */ sh $v0, 0x00B6($a0) ## 000000B6 -.L80851358: -/* 1F148 80851358 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1F14C 8085135C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1F150 80851360 03E00008 */ jr $ra -/* 1F154 80851364 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851368.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851368.s deleted file mode 100644 index 9de95b0f55..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851368.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80851368 -/* 1F158 80851368 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1F15C 8085136C AFBF0014 */ sw $ra, 0x0014($sp) -/* 1F160 80851370 AFA60020 */ sw $a2, 0x0020($sp) -/* 1F164 80851374 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C -/* 1F168 80851378 3C010800 */ lui $at, 0x0800 ## $at = 08000000 -/* 1F16C 8085137C 8CB80680 */ lw $t8, 0x0680($a1) ## 00000680 -/* 1F170 80851380 01C17825 */ or $t7, $t6, $at ## $t7 = 08000000 -/* 1F174 80851384 3C01FFF3 */ lui $at, 0xFFF3 ## $at = FFF30000 -/* 1F178 80851388 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFF3FFFF -/* 1F17C 8085138C ACAF067C */ sw $t7, 0x067C($a1) ## 0000067C -/* 1F180 80851390 01E14824 */ and $t1, $t7, $at -/* 1F184 80851394 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1F188 80851398 37190400 */ ori $t9, $t8, 0x0400 ## $t9 = 00000400 -/* 1F18C 8085139C ACB90680 */ sw $t9, 0x0680($a1) ## 00000680 -/* 1F190 808513A0 ACA9067C */ sw $t1, 0x067C($a1) ## 0000067C -/* 1F194 808513A4 0C20C8A1 */ jal func_80832284 -/* 1F198 808513A8 24C632F0 */ addiu $a2, $a2, 0x32F0 ## $a2 = 040032F0 -/* 1F19C 808513AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1F1A0 808513B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1F1A4 808513B4 03E00008 */ jr $ra -/* 1F1A8 808513B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808513BC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808513BC.s deleted file mode 100644 index 67e40c490a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808513BC.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_808513BC -/* 1F1AC 808513BC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1F1B0 808513C0 AFBF001C */ sw $ra, 0x001C($sp) -/* 1F1B4 808513C4 AFB00018 */ sw $s0, 0x0018($sp) -/* 1F1B8 808513C8 AFA60028 */ sw $a2, 0x0028($sp) -/* 1F1BC 808513CC 80AE084F */ lb $t6, 0x084F($a1) ## 0000084F -/* 1F1C0 808513D0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 1F1C4 808513D4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1F1C8 808513D8 15C0001B */ bne $t6, $zero, .L80851448 -/* 1F1CC 808513DC E4A4006C */ swc1 $f4, 0x006C($a1) ## 0000006C -/* 1F1D0 808513E0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 1F1D4 808513E4 0C20F44B */ jal func_8083D12C -/* 1F1D8 808513E8 AFA40020 */ sw $a0, 0x0020($sp) -/* 1F1DC 808513EC 10400004 */ beq $v0, $zero, .L80851400 -/* 1F1E0 808513F0 8FA40020 */ lw $a0, 0x0020($sp) -/* 1F1E4 808513F4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 1F1E8 808513F8 1000002C */ beq $zero, $zero, .L808514AC -/* 1F1EC 808513FC A20F084F */ sb $t7, 0x084F($s0) ## 0000084F -.L80851400: -/* 1F1F0 80851400 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 -/* 1F1F4 80851404 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1F1F8 80851408 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 1F1FC 8085140C 46000005 */ abs.s $f0, $f0 -/* 1F200 80851410 44070000 */ mfc1 $a3, $f0 -/* 1F204 80851414 0C212C56 */ jal func_8084B158 -/* 1F208 80851418 00000000 */ nop -/* 1F20C 8085141C 260406C2 */ addiu $a0, $s0, 0x06C2 ## $a0 = 000006C2 -/* 1F210 80851420 2405D8F0 */ addiu $a1, $zero, 0xD8F0 ## $a1 = FFFFD8F0 -/* 1F214 80851424 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 1F218 80851428 24060320 */ addiu $a2, $zero, 0x0320 ## $a2 = 00000320 -/* 1F21C 8085142C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F220 80851430 26050060 */ addiu $a1, $s0, 0x0060 ## $a1 = 00000060 -/* 1F224 80851434 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 1F228 80851438 0C212BBB */ jal func_8084AEEC -/* 1F22C 8085143C 8607083C */ lh $a3, 0x083C($s0) ## 0000083C -/* 1F230 80851440 1000001B */ beq $zero, $zero, .L808514B0 -/* 1F234 80851444 8FBF001C */ lw $ra, 0x001C($sp) -.L80851448: -/* 1F238 80851448 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1F23C 8085144C 0C028EF0 */ jal func_800A3BC0 -/* 1F240 80851450 AFA40020 */ sw $a0, 0x0020($sp) -/* 1F244 80851454 1040000E */ beq $v0, $zero, .L80851490 -/* 1F248 80851458 8FA40020 */ lw $a0, 0x0020($sp) -/* 1F24C 8085145C 8218084F */ lb $t8, 0x084F($s0) ## 0000084F -/* 1F250 80851460 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 1F254 80851464 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1F258 80851468 17010007 */ bne $t8, $at, .L80851488 -/* 1F25C 8085146C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1F260 80851470 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1F264 80851474 24C63328 */ addiu $a2, $a2, 0x3328 ## $a2 = 04003328 -/* 1F268 80851478 0C20CB1B */ jal func_80832C6C -/* 1F26C 8085147C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1F270 80851480 10000003 */ beq $zero, $zero, .L80851490 -/* 1F274 80851484 00000000 */ nop -.L80851488: -/* 1F278 80851488 0C20C8A1 */ jal func_80832284 -/* 1F27C 8085148C 24C63328 */ addiu $a2, $a2, 0x3328 ## $a2 = 00003328 -.L80851490: -/* 1F280 80851490 0C212C00 */ jal func_8084B000 -/* 1F284 80851494 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F288 80851498 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F28C 8085149C 26050838 */ addiu $a1, $s0, 0x0838 ## $a1 = 00000838 -/* 1F290 808514A0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 1F294 808514A4 0C212BBB */ jal func_8084AEEC -/* 1F298 808514A8 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -.L808514AC: -/* 1F29C 808514AC 8FBF001C */ lw $ra, 0x001C($sp) -.L808514B0: -/* 1F2A0 808514B0 8FB00018 */ lw $s0, 0x0018($sp) -/* 1F2A4 808514B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1F2A8 808514B8 03E00008 */ jr $ra -/* 1F2AC 808514BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808514C0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808514C0.s deleted file mode 100644 index 28553f42b2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808514C0.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_808514C0 -/* 1F2B0 808514C0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1F2B4 808514C4 AFBF001C */ sw $ra, 0x001C($sp) -/* 1F2B8 808514C8 AFB00018 */ sw $s0, 0x0018($sp) -/* 1F2BC 808514CC AFA40020 */ sw $a0, 0x0020($sp) -/* 1F2C0 808514D0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1F2C4 808514D4 AFA60028 */ sw $a2, 0x0028($sp) -/* 1F2C8 808514D8 0C2144C5 */ jal func_80851314 -/* 1F2CC 808514DC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1F2D0 808514E0 0C20CCAE */ jal func_808332B8 -/* 1F2D4 808514E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F2D8 808514E8 10400007 */ beq $v0, $zero, .L80851508 -/* 1F2DC 808514EC 8FA40020 */ lw $a0, 0x0020($sp) -/* 1F2E0 808514F0 8FA40020 */ lw $a0, 0x0020($sp) -/* 1F2E4 808514F4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1F2E8 808514F8 0C2144EF */ jal func_808513BC -/* 1F2EC 808514FC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 1F2F0 80851500 1000001A */ beq $zero, $zero, .L8085156C -/* 1F2F4 80851504 8FBF001C */ lw $ra, 0x001C($sp) -.L80851508: -/* 1F2F8 80851508 0C028EF0 */ jal func_800A3BC0 -/* 1F2FC 8085150C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1F300 80851510 0C023C4A */ jal func_8008F128 -/* 1F304 80851514 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F308 80851518 14400005 */ bne $v0, $zero, .L80851530 -/* 1F30C 8085151C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F310 80851520 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 1F314 80851524 31CF0800 */ andi $t7, $t6, 0x0800 ## $t7 = 00000000 -/* 1F318 80851528 51E00006 */ beql $t7, $zero, .L80851544 -/* 1F31C 8085152C 8E020438 */ lw $v0, 0x0438($s0) ## 00000438 -.L80851530: -/* 1F320 80851530 0C20D99C */ jal func_80836670 -/* 1F324 80851534 8FA50020 */ lw $a1, 0x0020($sp) -/* 1F328 80851538 1000000C */ beq $zero, $zero, .L8085156C -/* 1F32C 8085153C 8FBF001C */ lw $ra, 0x001C($sp) -/* 1F330 80851540 8E020438 */ lw $v0, 0x0438($s0) ## 00000438 -.L80851544: -/* 1F334 80851544 50400009 */ beql $v0, $zero, .L8085156C -/* 1F338 80851548 8FBF001C */ lw $ra, 0x001C($sp) -/* 1F33C 8085154C 9458010E */ lhu $t8, 0x010E($v0) ## 0000010E -/* 1F340 80851550 3401FFFF */ ori $at, $zero, 0xFFFF ## $at = 0000FFFF -/* 1F344 80851554 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F348 80851558 57010004 */ bnel $t8, $at, .L8085156C -/* 1F34C 8085155C 8FBF001C */ lw $ra, 0x001C($sp) -/* 1F350 80851560 0C20F96A */ jal func_8083E5A8 -/* 1F354 80851564 8FA50020 */ lw $a1, 0x0020($sp) -/* 1F358 80851568 8FBF001C */ lw $ra, 0x001C($sp) -.L8085156C: -/* 1F35C 8085156C 8FB00018 */ lw $s0, 0x0018($sp) -/* 1F360 80851570 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1F364 80851574 03E00008 */ jr $ra -/* 1F368 80851578 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085157C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085157C.s deleted file mode 100644 index 94b08f7998..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085157C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8085157C -/* 1F36C 8085157C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1F370 80851580 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1F374 80851584 AFA5001C */ sw $a1, 0x001C($sp) -/* 1F378 80851588 AFA60020 */ sw $a2, 0x0020($sp) -/* 1F37C 8085158C 0C028EF0 */ jal func_800A3BC0 -/* 1F380 80851590 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1F384 80851594 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1F388 80851598 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1F38C 8085159C 03E00008 */ jr $ra -/* 1F390 808515A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s deleted file mode 100644 index e86c6f268b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_808515A4 -/* 1F394 808515A4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 1F398 808515A8 AFBF002C */ sw $ra, 0x002C($sp) -/* 1F39C 808515AC AFB00028 */ sw $s0, 0x0028($sp) -/* 1F3A0 808515B0 AFA40038 */ sw $a0, 0x0038($sp) -/* 1F3A4 808515B4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1F3A8 808515B8 AFA60040 */ sw $a2, 0x0040($sp) -/* 1F3AC 808515BC 0C20CCAE */ jal func_808332B8 -/* 1F3B0 808515C0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1F3B4 808515C4 10400007 */ beq $v0, $zero, .L808515E4 -/* 1F3B8 808515C8 3C068085 */ lui $a2, %hi(D_80853D34) ## $a2 = 80850000 -/* 1F3BC 808515CC 8FA40038 */ lw $a0, 0x0038($sp) -/* 1F3C0 808515D0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1F3C4 808515D4 0C2144DA */ jal func_80851368 -/* 1F3C8 808515D8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 1F3CC 808515DC 10000026 */ beq $zero, $zero, .L80851678 -/* 1F3D0 808515E0 8FBF002C */ lw $ra, 0x002C($sp) -.L808515E4: -/* 1F3D4 808515E4 920E015B */ lbu $t6, 0x015B($s0) ## 0000015B -/* 1F3D8 808515E8 92020446 */ lbu $v0, 0x0446($s0) ## 00000446 -/* 1F3DC 808515EC 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 1F3E0 808515F0 000E7880 */ sll $t7, $t6, 2 -/* 1F3E4 808515F4 00CF3021 */ addu $a2, $a2, $t7 -/* 1F3E8 808515F8 10410004 */ beq $v0, $at, .L8085160C -/* 1F3EC 808515FC 8CC63D34 */ lw $a2, %lo(D_80853D34)($a2) -/* 1F3F0 80851600 2401002E */ addiu $at, $zero, 0x002E ## $at = 0000002E -/* 1F3F4 80851604 14410006 */ bne $v0, $at, .L80851620 -/* 1F3F8 80851608 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8085160C: -/* 1F3FC 8085160C 8FA40038 */ lw $a0, 0x0038($sp) -/* 1F400 80851610 0C20C899 */ jal func_80832264 -/* 1F404 80851614 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1F408 80851618 10000014 */ beq $zero, $zero, .L8085166C -/* 1F40C 8085161C 00000000 */ nop -.L80851620: -/* 1F410 80851620 0C20CB6C */ jal func_80832DB0 -/* 1F414 80851624 AFA60034 */ sw $a2, 0x0034($sp) -/* 1F418 80851628 0C028800 */ jal SkelAnime_GetFrameCount - -/* 1F41C 8085162C 8FA40034 */ lw $a0, 0x0034($sp) -/* 1F420 80851630 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 1F424 80851634 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 1F428 80851638 44815000 */ mtc1 $at, $f10 ## $f10 = -4.00 -/* 1F42C 8085163C 46803220 */ cvt.s.w $f8, $f6 -/* 1F430 80851640 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 1F434 80851644 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 -/* 1F438 80851648 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 1F43C 8085164C 8FA60034 */ lw $a2, 0x0034($sp) -/* 1F440 80851650 8FA40038 */ lw $a0, 0x0038($sp) -/* 1F444 80851654 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 1F448 80851658 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1F44C 8085165C AFA00018 */ sw $zero, 0x0018($sp) -/* 1F450 80851660 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 1F454 80851664 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 1F458 80851668 E7A40010 */ swc1 $f4, 0x0010($sp) -.L8085166C: -/* 1F45C 8085166C 0C20C884 */ jal func_80832210 -/* 1F460 80851670 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F464 80851674 8FBF002C */ lw $ra, 0x002C($sp) -.L80851678: -/* 1F468 80851678 8FB00028 */ lw $s0, 0x0028($sp) -/* 1F46C 8085167C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 1F470 80851680 03E00008 */ jr $ra -/* 1F474 80851684 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851688.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851688.s deleted file mode 100644 index 1cded6c2ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851688.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80851688 -/* 1F478 80851688 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1F47C 8085168C AFBF001C */ sw $ra, 0x001C($sp) -/* 1F480 80851690 AFB10018 */ sw $s1, 0x0018($sp) -/* 1F484 80851694 AFB00014 */ sw $s0, 0x0014($sp) -/* 1F488 80851698 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1F48C 8085169C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 1F490 808516A0 0C212CF3 */ jal func_8084B3CC -/* 1F494 808516A4 AFA60028 */ sw $a2, 0x0028($sp) -/* 1F498 808516A8 54400025 */ bnel $v0, $zero, .L80851740 -/* 1F49C 808516AC 8FBF001C */ lw $ra, 0x001C($sp) -/* 1F4A0 808516B0 920E0444 */ lbu $t6, 0x0444($s0) ## 00000444 -/* 1F4A4 808516B4 24010031 */ addiu $at, $zero, 0x0031 ## $at = 00000031 -/* 1F4A8 808516B8 15C1000A */ bne $t6, $at, .L808516E4 -/* 1F4AC 808516BC 00000000 */ nop -/* 1F4B0 808516C0 922F1D6C */ lbu $t7, 0x1D6C($s1) ## 00001D6C -/* 1F4B4 808516C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1F4B8 808516C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1F4BC 808516CC 15E00005 */ bne $t7, $zero, .L808516E4 -/* 1F4C0 808516D0 00000000 */ nop -/* 1F4C4 808516D4 0C00B7D5 */ jal func_8002DF54 -/* 1F4C8 808516D8 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 1F4CC 808516DC 10000018 */ beq $zero, $zero, .L80851740 -/* 1F4D0 808516E0 8FBF001C */ lw $ra, 0x001C($sp) -.L808516E4: -/* 1F4D4 808516E4 0C20CCAE */ jal func_808332B8 -/* 1F4D8 808516E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F4DC 808516EC 10400007 */ beq $v0, $zero, .L8085170C -/* 1F4E0 808516F0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1F4E4 808516F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1F4E8 808516F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1F4EC 808516FC 0C2144EF */ jal func_808513BC -/* 1F4F0 80851700 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 1F4F4 80851704 1000000E */ beq $zero, $zero, .L80851740 -/* 1F4F8 80851708 8FBF001C */ lw $ra, 0x001C($sp) -.L8085170C: -/* 1F4FC 8085170C 0C028EF0 */ jal func_800A3BC0 -/* 1F500 80851710 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1F504 80851714 0C023C4A */ jal func_8008F128 -/* 1F508 80851718 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F50C 8085171C 14400005 */ bne $v0, $zero, .L80851734 -/* 1F510 80851720 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F514 80851724 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 1F518 80851728 33190800 */ andi $t9, $t8, 0x0800 ## $t9 = 00000000 -/* 1F51C 8085172C 53200004 */ beql $t9, $zero, .L80851740 -/* 1F520 80851730 8FBF001C */ lw $ra, 0x001C($sp) -.L80851734: -/* 1F524 80851734 0C20D99C */ jal func_80836670 -/* 1F528 80851738 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 1F52C 8085173C 8FBF001C */ lw $ra, 0x001C($sp) -.L80851740: -/* 1F530 80851740 8FB00014 */ lw $s0, 0x0014($sp) -/* 1F534 80851744 8FB10018 */ lw $s1, 0x0018($sp) -/* 1F538 80851748 03E00008 */ jr $ra -/* 1F53C 8085174C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851750.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851750.s deleted file mode 100644 index d622b5a643..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851750.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80851750 -/* 1F540 80851750 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1F544 80851754 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1F548 80851758 AFA5001C */ sw $a1, 0x001C($sp) -/* 1F54C 8085175C AFA60020 */ sw $a2, 0x0020($sp) -/* 1F550 80851760 0C028EF0 */ jal func_800A3BC0 -/* 1F554 80851764 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1F558 80851768 3C058085 */ lui $a1, %hi(D_80855188) ## $a1 = 80850000 -/* 1F55C 8085176C 24A55188 */ addiu $a1, $a1, %lo(D_80855188) ## $a1 = 80855188 -/* 1F560 80851770 0C20CA49 */ jal func_80832924 -/* 1F564 80851774 8FA4001C */ lw $a0, 0x001C($sp) -/* 1F568 80851778 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1F56C 8085177C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1F570 80851780 03E00008 */ jr $ra -/* 1F574 80851784 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851788.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851788.s deleted file mode 100644 index 34967caf18..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851788.s +++ /dev/null @@ -1,50 +0,0 @@ -.late_rodata -glabel D_8085554C - .float 0.1 - -.text -glabel func_80851788 -/* 1F578 80851788 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1F57C 8085178C AFBF0014 */ sw $ra, 0x0014($sp) -/* 1F580 80851790 AFA40018 */ sw $a0, 0x0018($sp) -/* 1F584 80851794 AFA5001C */ sw $a1, 0x001C($sp) -/* 1F588 80851798 AFA60020 */ sw $a2, 0x0020($sp) -/* 1F58C 8085179C 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C -/* 1F590 808517A0 3C01FDFF */ lui $at, 0xFDFF ## $at = FDFF0000 -/* 1F594 808517A4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FDFFFFFF -/* 1F598 808517A8 01C17824 */ and $t7, $t6, $at -/* 1F59C 808517AC 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 1F5A0 808517B0 ACAF067C */ sw $t7, 0x067C($a1) ## 0000067C -/* 1F5A4 808517B4 24A40024 */ addiu $a0, $a1, 0x0024 ## $a0 = 00000024 -/* 1F5A8 808517B8 24A50450 */ addiu $a1, $a1, 0x0450 ## $a1 = 00000450 -/* 1F5AC 808517BC 0C01E01A */ jal Math_Vec3f_Yaw - -/* 1F5B0 808517C0 AFA6001C */ sw $a2, 0x001C($sp) -/* 1F5B4 808517C4 8FA6001C */ lw $a2, 0x001C($sp) -/* 1F5B8 808517C8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 1F5BC 808517CC 3C014020 */ lui $at, 0x4020 ## $at = 40200000 -/* 1F5C0 808517D0 C4C00838 */ lwc1 $f0, 0x0838($a2) ## 00000838 -/* 1F5C4 808517D4 A4C20032 */ sh $v0, 0x0032($a2) ## 00000032 -/* 1F5C8 808517D8 A4C200B6 */ sh $v0, 0x00B6($a2) ## 000000B6 -/* 1F5CC 808517DC 4604003E */ c.le.s $f0, $f4 -/* 1F5D0 808517E0 A4C2083C */ sh $v0, 0x083C($a2) ## 0000083C -/* 1F5D4 808517E4 45020006 */ bc1fl .L80851800 -/* 1F5D8 808517E8 44811000 */ mtc1 $at, $f2 ## $f2 = 2.50 -/* 1F5DC 808517EC 3C018085 */ lui $at, %hi(D_8085554C) ## $at = 80850000 -/* 1F5E0 808517F0 C426554C */ lwc1 $f6, %lo(D_8085554C)($at) -/* 1F5E4 808517F4 10000008 */ beq $zero, $zero, .L80851818 -/* 1F5E8 808517F8 E4C60838 */ swc1 $f6, 0x0838($a2) ## 00000838 -/* 1F5EC 808517FC 44811000 */ mtc1 $at, $f2 ## $f2 = -0.00 -.L80851800: -/* 1F5F0 80851800 00000000 */ nop -/* 1F5F4 80851804 4600103C */ c.lt.s $f2, $f0 -/* 1F5F8 80851808 00000000 */ nop -/* 1F5FC 8085180C 45020003 */ bc1fl .L8085181C -/* 1F600 80851810 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1F604 80851814 E4C20838 */ swc1 $f2, 0x0838($a2) ## 00000838 -.L80851818: -/* 1F608 80851818 8FBF0014 */ lw $ra, 0x0014($sp) -.L8085181C: -/* 1F60C 8085181C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1F610 80851820 03E00008 */ jr $ra -/* 1F614 80851824 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851828.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851828.s deleted file mode 100644 index 1f42e0b1aa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851828.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80851828 -/* 1F618 80851828 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1F61C 8085182C 3C014020 */ lui $at, 0x4020 ## $at = 40200000 -/* 1F620 80851830 44812000 */ mtc1 $at, $f4 ## $f4 = 2.50 -/* 1F624 80851834 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1F628 80851838 AFA60028 */ sw $a2, 0x0028($sp) -/* 1F62C 8085183C AFA40020 */ sw $a0, 0x0020($sp) -/* 1F630 80851840 27A6001C */ addiu $a2, $sp, 0x001C ## $a2 = FFFFFFFC -/* 1F634 80851844 AFA50024 */ sw $a1, 0x0024($sp) -/* 1F638 80851848 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 1F63C 8085184C 0C2116E8 */ jal func_80845BA0 -/* 1F640 80851850 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 1F644 80851854 8FA30020 */ lw $v1, 0x0020($sp) -/* 1F648 80851858 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 1F64C 8085185C 8FA50024 */ lw $a1, 0x0024($sp) -/* 1F650 80851860 846E00A4 */ lh $t6, 0x00A4($v1) ## 000000A4 -/* 1F654 80851864 55C10011 */ bnel $t6, $at, .L808518AC -/* 1F658 80851868 84B80850 */ lh $t8, 0x0850($a1) ## 00000850 -/* 1F65C 8085186C 84AF0850 */ lh $t7, 0x0850($a1) ## 00000850 -/* 1F660 80851870 246420D8 */ addiu $a0, $v1, 0x20D8 ## $a0 = 000020D8 -/* 1F664 80851874 15E00008 */ bne $t7, $zero, .L80851898 -/* 1F668 80851878 00000000 */ nop -/* 1F66C 8085187C 246420D8 */ addiu $a0, $v1, 0x20D8 ## $a0 = 000020D8 -/* 1F670 80851880 0C042F6F */ jal func_8010BDBC -/* 1F674 80851884 AFA50024 */ sw $a1, 0x0024($sp) -/* 1F678 80851888 14400007 */ bne $v0, $zero, .L808518A8 -/* 1F67C 8085188C 8FA50024 */ lw $a1, 0x0024($sp) -/* 1F680 80851890 1000000F */ beq $zero, $zero, .L808518D0 -/* 1F684 80851894 8FBF0014 */ lw $ra, 0x0014($sp) -.L80851898: -/* 1F688 80851898 0C042F6F */ jal func_8010BDBC -/* 1F68C 8085189C AFA50024 */ sw $a1, 0x0024($sp) -/* 1F690 808518A0 1440000A */ bne $v0, $zero, .L808518CC -/* 1F694 808518A4 8FA50024 */ lw $a1, 0x0024($sp) -.L808518A8: -/* 1F698 808518A8 84B80850 */ lh $t8, 0x0850($a1) ## 00000850 -.L808518AC: -/* 1F69C 808518AC 2409000B */ addiu $t1, $zero, 0x000B ## $t1 = 0000000B -/* 1F6A0 808518B0 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 1F6A4 808518B4 A4B90850 */ sh $t9, 0x0850($a1) ## 00000850 -/* 1F6A8 808518B8 84A80850 */ lh $t0, 0x0850($a1) ## 00000850 -/* 1F6AC 808518BC 29010015 */ slti $at, $t0, 0x0015 -/* 1F6B0 808518C0 54200003 */ bnel $at, $zero, .L808518D0 -/* 1F6B4 808518C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1F6B8 808518C8 A0A90444 */ sb $t1, 0x0444($a1) ## 00000444 -.L808518CC: -/* 1F6BC 808518CC 8FBF0014 */ lw $ra, 0x0014($sp) -.L808518D0: -/* 1F6C0 808518D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1F6C4 808518D4 03E00008 */ jr $ra -/* 1F6C8 808518D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808518DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808518DC.s deleted file mode 100644 index 5b7b935173..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808518DC.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_808518DC -/* 1F6CC 808518DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1F6D0 808518E0 AFA5001C */ sw $a1, 0x001C($sp) -/* 1F6D4 808518E4 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 1F6D8 808518E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1F6DC 808518EC AFA40018 */ sw $a0, 0x0018($sp) -/* 1F6E0 808518F0 8FA4001C */ lw $a0, 0x001C($sp) -/* 1F6E4 808518F4 0C20F3AB */ jal func_8083CEAC -/* 1F6E8 808518F8 AFA60020 */ sw $a2, 0x0020($sp) -/* 1F6EC 808518FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1F6F0 80851900 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1F6F4 80851904 03E00008 */ jr $ra -/* 1F6F8 80851908 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085190C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085190C.s deleted file mode 100644 index 02484dd012..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085190C.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_8085190C -/* 1F6FC 8085190C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1F700 80851910 AFBF001C */ sw $ra, 0x001C($sp) -/* 1F704 80851914 AFB00018 */ sw $s0, 0x0018($sp) -/* 1F708 80851918 AFA40020 */ sw $a0, 0x0020($sp) -/* 1F70C 8085191C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1F710 80851920 AFA60028 */ sw $a2, 0x0028($sp) -/* 1F714 80851924 0C2144C5 */ jal func_80851314 -/* 1F718 80851928 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1F71C 8085192C 860E0850 */ lh $t6, 0x0850($s0) ## 00000850 -/* 1F720 80851930 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1F724 80851934 8FA40020 */ lw $a0, 0x0020($sp) -/* 1F728 80851938 11C00010 */ beq $t6, $zero, .L8085197C -/* 1F72C 8085193C 00000000 */ nop -/* 1F730 80851940 0C028EF0 */ jal func_800A3BC0 -/* 1F734 80851944 8FA40020 */ lw $a0, 0x0020($sp) -/* 1F738 80851948 10400008 */ beq $v0, $zero, .L8085196C -/* 1F73C 8085194C 00000000 */ nop -/* 1F740 80851950 0C20CD39 */ jal func_808334E4 -/* 1F744 80851954 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F748 80851958 8FA40020 */ lw $a0, 0x0020($sp) -/* 1F74C 8085195C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1F750 80851960 0C20C8A1 */ jal func_80832284 -/* 1F754 80851964 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 1F758 80851968 A6000850 */ sh $zero, 0x0850($s0) ## 00000850 -.L8085196C: -/* 1F75C 8085196C 0C20CF0F */ jal func_80833C3C -/* 1F760 80851970 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F764 80851974 10000004 */ beq $zero, $zero, .L80851988 -/* 1F768 80851978 8FBF001C */ lw $ra, 0x001C($sp) -.L8085197C: -/* 1F76C 8085197C 0C21006C */ jal func_808401B0 -/* 1F770 80851980 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1F774 80851984 8FBF001C */ lw $ra, 0x001C($sp) -.L80851988: -/* 1F778 80851988 8FB00018 */ lw $s0, 0x0018($sp) -/* 1F77C 8085198C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1F780 80851990 03E00008 */ jr $ra -/* 1F784 80851994 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851998.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851998.s deleted file mode 100644 index 558480556f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851998.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80851998 -/* 1F788 80851998 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1F78C 8085199C AFBF001C */ sw $ra, 0x001C($sp) -/* 1F790 808519A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 1F794 808519A4 AFA00014 */ sw $zero, 0x0014($sp) -/* 1F798 808519A8 0C211659 */ jal func_80845964 -/* 1F79C 808519AC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 1F7A0 808519B0 8FBF001C */ lw $ra, 0x001C($sp) -/* 1F7A4 808519B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1F7A8 808519B8 03E00008 */ jr $ra -/* 1F7AC 808519BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808519C0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808519C0.s deleted file mode 100644 index 40996a7dbf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808519C0.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_808519C0 -/* 1F7B0 808519C0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1F7B4 808519C4 AFBF001C */ sw $ra, 0x001C($sp) -/* 1F7B8 808519C8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 1F7BC 808519CC AFAE0014 */ sw $t6, 0x0014($sp) -/* 1F7C0 808519D0 AFA00010 */ sw $zero, 0x0010($sp) -/* 1F7C4 808519D4 0C211659 */ jal func_80845964 -/* 1F7C8 808519D8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 1F7CC 808519DC 8FBF001C */ lw $ra, 0x001C($sp) -/* 1F7D0 808519E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1F7D4 808519E4 03E00008 */ jr $ra -/* 1F7D8 808519E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808519EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808519EC.s deleted file mode 100644 index f583f8435c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808519EC.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_808519EC -/* 1F7DC 808519EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1F7E0 808519F0 AFA40018 */ sw $a0, 0x0018($sp) -/* 1F7E4 808519F4 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 1F7E8 808519F8 24A40024 */ addiu $a0, $a1, 0x0024 ## $a0 = 00000024 -/* 1F7EC 808519FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 1F7F0 80851A00 3C058085 */ lui $a1, %hi(D_80855198) ## $a1 = 80850000 -/* 1F7F4 80851A04 AFA60020 */ sw $a2, 0x0020($sp) -/* 1F7F8 80851A08 24A55198 */ addiu $a1, $a1, %lo(D_80855198) ## $a1 = 80855198 -/* 1F7FC 80851A0C 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 1F800 80851A10 AFA7001C */ sw $a3, 0x001C($sp) -/* 1F804 80851A14 8FA5001C */ lw $a1, 0x001C($sp) -/* 1F808 80851A18 240E8000 */ addiu $t6, $zero, 0x8000 ## $t6 = FFFF8000 -/* 1F80C 80851A1C 8CAF0678 */ lw $t7, 0x0678($a1) ## 00000678 -/* 1F810 80851A20 A4AE00B6 */ sh $t6, 0x00B6($a1) ## 000000B6 -/* 1F814 80851A24 8FA40018 */ lw $a0, 0x0018($sp) -/* 1F818 80851A28 0C20C8B4 */ jal func_808322D0 -/* 1F81C 80851A2C 8DE6009C */ lw $a2, 0x009C($t7) ## 0000009C -/* 1F820 80851A30 8FA5001C */ lw $a1, 0x001C($sp) -/* 1F824 80851A34 8FA40018 */ lw $a0, 0x0018($sp) -/* 1F828 80851A38 0C20CBD5 */ jal func_80832F54 -/* 1F82C 80851A3C 2406028F */ addiu $a2, $zero, 0x028F ## $a2 = 0000028F -/* 1F830 80851A40 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1F834 80851A44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1F838 80851A48 03E00008 */ jr $ra -/* 1F83C 80851A4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851A50.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851A50.s deleted file mode 100644 index 43ee7cf391..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851A50.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_80851A50 -/* 1F840 80851A50 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 1F844 80851A54 AFB00018 */ sw $s0, 0x0018($sp) -/* 1F848 80851A58 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1F84C 80851A5C AFBF001C */ sw $ra, 0x001C($sp) -/* 1F850 80851A60 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1F854 80851A64 AFA60038 */ sw $a2, 0x0038($sp) -/* 1F858 80851A68 0C028EF0 */ jal func_800A3BC0 -/* 1F85C 80851A6C AFA50024 */ sw $a1, 0x0024($sp) -/* 1F860 80851A70 3C078016 */ lui $a3, %hi(gSaveContext) -/* 1F864 80851A74 24E7E660 */ addiu $a3, %lo(gSaveContext) -/* 1F868 80851A78 8CE30004 */ lw $v1, 0x0004($a3) ## 8015E664 -/* 1F86C 80851A7C 8FA40024 */ lw $a0, 0x0024($sp) -/* 1F870 80851A80 14600007 */ bne $v1, $zero, .L80851AA0 -/* 1F874 80851A84 00000000 */ nop -/* 1F878 80851A88 0C02914C */ jal func_800A4530 -/* 1F87C 80851A8C 3C05428C */ lui $a1, 0x428C ## $a1 = 428C0000 -/* 1F880 80851A90 3C078016 */ lui $a3, %hi(gSaveContext) -/* 1F884 80851A94 14400009 */ bne $v0, $zero, .L80851ABC -/* 1F888 80851A98 24E7E660 */ addiu $a3, %lo(gSaveContext) -/* 1F88C 80851A9C 8CE30004 */ lw $v1, 0x0004($a3) ## 8015E664 -.L80851AA0: -/* 1F890 80851AA0 10600026 */ beq $v1, $zero, .L80851B3C -/* 1F894 80851AA4 8FA40024 */ lw $a0, 0x0024($sp) -/* 1F898 80851AA8 0C02914C */ jal func_800A4530 -/* 1F89C 80851AAC 3C0542AE */ lui $a1, 0x42AE ## $a1 = 42AE0000 -/* 1F8A0 80851AB0 3C078016 */ lui $a3, %hi(gSaveContext) -/* 1F8A4 80851AB4 10400021 */ beq $v0, $zero, .L80851B3C -/* 1F8A8 80851AB8 24E7E660 */ addiu $a3, %lo(gSaveContext) -.L80851ABC: -/* 1F8AC 80851ABC 8E190438 */ lw $t9, 0x0438($s0) ## 00000438 -/* 1F8B0 80851AC0 8CEE0004 */ lw $t6, 0x0004($a3) ## 8015E664 -/* 1F8B4 80851AC4 3C188085 */ lui $t8, %hi(D_808551A4) ## $t8 = 80850000 -/* 1F8B8 80851AC8 AF300118 */ sw $s0, 0x0118($t9) ## 00000118 -/* 1F8BC 80851ACC 8CE30004 */ lw $v1, 0x0004($a3) ## 8015E664 -/* 1F8C0 80851AD0 271851A4 */ addiu $t8, $t8, %lo(D_808551A4) ## $t8 = 808551A4 -/* 1F8C4 80851AD4 000E7880 */ sll $t7, $t6, 2 -/* 1F8C8 80851AD8 10600004 */ beq $v1, $zero, .L80851AEC -/* 1F8CC 80851ADC 01F83021 */ addu $a2, $t7, $t8 -/* 1F8D0 80851AE0 3C028012 */ lui $v0, %hi(D_80125DE8) -/* 1F8D4 80851AE4 10000003 */ beq $zero, $zero, .L80851AF4 -/* 1F8D8 80851AE8 24425DE8 */ addiu $v0, %lo(D_80125DE8) -.L80851AEC: -/* 1F8DC 80851AEC 3C028012 */ lui $v0, %hi(D_80125E18) -/* 1F8E0 80851AF0 24425E18 */ addiu $v0, %lo(D_80125E18) -.L80851AF4: -/* 1F8E4 80851AF4 00034080 */ sll $t0, $v1, 2 -/* 1F8E8 80851AF8 01024821 */ addu $t1, $t0, $v0 -/* 1F8EC 80851AFC AE090164 */ sw $t1, 0x0164($s0) ## 00000164 -/* 1F8F0 80851B00 94C50000 */ lhu $a1, 0x0000($a2) ## 00000000 -/* 1F8F4 80851B04 AFA6002C */ sw $a2, 0x002C($sp) -/* 1F8F8 80851B08 0C00BDF7 */ jal func_8002F7DC -/* 1F8FC 80851B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F900 80851B10 3C078016 */ lui $a3, %hi(gSaveContext) -/* 1F904 80851B14 24E7E660 */ addiu $a3, %lo(gSaveContext) -/* 1F908 80851B18 8CEA0004 */ lw $t2, 0x0004($a3) ## 8015E664 -/* 1F90C 80851B1C 8FA6002C */ lw $a2, 0x002C($sp) -/* 1F910 80851B20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F914 80851B24 51400016 */ beql $t2, $zero, .L80851B80 -/* 1F918 80851B28 8FBF001C */ lw $ra, 0x001C($sp) -/* 1F91C 80851B2C 0C20C9A6 */ jal func_80832698 -/* 1F920 80851B30 94C50002 */ lhu $a1, 0x0002($a2) ## 00000002 -/* 1F924 80851B34 10000012 */ beq $zero, $zero, .L80851B80 -/* 1F928 80851B38 8FBF001C */ lw $ra, 0x001C($sp) -.L80851B3C: -/* 1F92C 80851B3C 8CEB0004 */ lw $t3, 0x0004($a3) ## 00000004 -/* 1F930 80851B40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F934 80851B44 3C058085 */ lui $a1, %hi(D_808551AC) ## $a1 = 80850000 -/* 1F938 80851B48 1560000A */ bne $t3, $zero, .L80851B74 -/* 1F93C 80851B4C 00000000 */ nop -/* 1F940 80851B50 8FA40024 */ lw $a0, 0x0024($sp) -/* 1F944 80851B54 0C02914C */ jal func_800A4530 -/* 1F948 80851B58 3C054284 */ lui $a1, 0x4284 ## $a1 = 42840000 -/* 1F94C 80851B5C 10400007 */ beq $v0, $zero, .L80851B7C -/* 1F950 80851B60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F954 80851B64 0C20C9A6 */ jal func_80832698 -/* 1F958 80851B68 24056801 */ addiu $a1, $zero, 0x6801 ## $a1 = 00006801 -/* 1F95C 80851B6C 10000004 */ beq $zero, $zero, .L80851B80 -/* 1F960 80851B70 8FBF001C */ lw $ra, 0x001C($sp) -.L80851B74: -/* 1F964 80851B74 0C20CA49 */ jal func_80832924 -/* 1F968 80851B78 24A551AC */ addiu $a1, $a1, %lo(D_808551AC) ## $a1 = 000051AC -.L80851B7C: -/* 1F96C 80851B7C 8FBF001C */ lw $ra, 0x001C($sp) -.L80851B80: -/* 1F970 80851B80 8FB00018 */ lw $s0, 0x0018($sp) -/* 1F974 80851B84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 1F978 80851B88 03E00008 */ jr $ra -/* 1F97C 80851B8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s deleted file mode 100644 index 0c8d966506..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80851B90 -/* 1F980 80851B90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1F984 80851B94 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 1F988 80851B98 44810000 */ mtc1 $at, $f0 ## $f0 = 12.00 -/* 1F98C 80851B9C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 1F990 80851BA0 AFA60030 */ sw $a2, 0x0030($sp) -/* 1F994 80851BA4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1F998 80851BA8 AFA5002C */ sw $a1, 0x002C($sp) -/* 1F99C 80851BAC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1F9A0 80851BB0 3C07BF2A */ lui $a3, 0xBF2A ## $a3 = BF2A0000 -/* 1F9A4 80851BB4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 1F9A8 80851BB8 AFAE0018 */ sw $t6, 0x0018($sp) -/* 1F9AC 80851BBC 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = BF2AAAAB -/* 1F9B0 80851BC0 24C62860 */ addiu $a2, $a2, 0x2860 ## $a2 = 04002860 -/* 1F9B4 80851BC4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1F9B8 80851BC8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 1F9BC 80851BCC E7A00014 */ swc1 $f0, 0x0014($sp) -/* 1F9C0 80851BD0 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 1F9C4 80851BD4 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 1F9C8 80851BD8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 1F9CC 80851BDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1F9D0 80851BE0 03E00008 */ jr $ra -/* 1F9D4 80851BE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s deleted file mode 100644 index 8c7b549792..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80851BE8 -/* 1F9D8 80851BE8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 1F9DC 80851BEC AFB00028 */ sw $s0, 0x0028($sp) -/* 1F9E0 80851BF0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1F9E4 80851BF4 AFBF002C */ sw $ra, 0x002C($sp) -/* 1F9E8 80851BF8 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1F9EC 80851BFC AFA40038 */ sw $a0, 0x0038($sp) -/* 1F9F0 80851C00 AFA60040 */ sw $a2, 0x0040($sp) -/* 1F9F4 80851C04 0C028EF0 */ jal func_800A3BC0 -/* 1F9F8 80851C08 AFA50030 */ sw $a1, 0x0030($sp) -/* 1F9FC 80851C0C 860E0850 */ lh $t6, 0x0850($s0) ## 00000850 -/* 1FA00 80851C10 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 1FA04 80851C14 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 -/* 1FA08 80851C18 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 1FA0C 80851C1C 286100B4 */ slti $at, $v1, 0x00B4 -/* 1FA10 80851C20 1420001B */ bne $at, $zero, .L80851C90 -/* 1FA14 80851C24 240100B4 */ addiu $at, $zero, 0x00B4 ## $at = 000000B4 -/* 1FA18 80851C28 14610015 */ bne $v1, $at, .L80851C80 -/* 1FA1C 80851C2C 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 -/* 1FA20 80851C30 0C028800 */ jal SkelAnime_GetFrameCount - -/* 1FA24 80851C34 24843298 */ addiu $a0, $a0, 0x3298 ## $a0 = 04003298 -/* 1FA28 80851C38 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 1FA2C 80851C3C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 1FA30 80851C40 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 1FA34 80851C44 46803220 */ cvt.s.w $f8, $f6 -/* 1FA38 80851C48 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 1FA3C 80851C4C 44815000 */ mtc1 $at, $f10 ## $f10 = -8.00 -/* 1FA40 80851C50 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1FA44 80851C54 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 -/* 1FA48 80851C58 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 1FA4C 80851C5C AFB80018 */ sw $t8, 0x0018($sp) -/* 1FA50 80851C60 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 1FA54 80851C64 24C63298 */ addiu $a2, $a2, 0x3298 ## $a2 = 04003298 -/* 1FA58 80851C68 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 1FA5C 80851C6C 8FA40038 */ lw $a0, 0x0038($sp) -/* 1FA60 80851C70 8FA50030 */ lw $a1, 0x0030($sp) -/* 1FA64 80851C74 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 1FA68 80851C78 0C028FC2 */ jal SkelAnime_ChangeLinkAnim -/* 1FA6C 80851C7C E7AA001C */ swc1 $f10, 0x001C($sp) -.L80851C80: -/* 1FA70 80851C80 3C058085 */ lui $a1, %hi(D_808551B4) ## $a1 = 80850000 -/* 1FA74 80851C84 24A551B4 */ addiu $a1, $a1, %lo(D_808551B4) ## $a1 = 808551B4 -/* 1FA78 80851C88 0C20CA49 */ jal func_80832924 -/* 1FA7C 80851C8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80851C90: -/* 1FA80 80851C90 8FBF002C */ lw $ra, 0x002C($sp) -/* 1FA84 80851C94 8FB00028 */ lw $s0, 0x0028($sp) -/* 1FA88 80851C98 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 1FA8C 80851C9C 03E00008 */ jr $ra -/* 1FA90 80851CA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851CA4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851CA4.s deleted file mode 100644 index 0724379239..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851CA4.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80851CA4 -/* 1FA94 80851CA4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1FA98 80851CA8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1FA9C 80851CAC 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 1FAA0 80851CB0 AFA40018 */ sw $a0, 0x0018($sp) -/* 1FAA4 80851CB4 AFA60020 */ sw $a2, 0x0020($sp) -/* 1FAA8 80851CB8 AFA7001C */ sw $a3, 0x001C($sp) -/* 1FAAC 80851CBC 0C028EF0 */ jal func_800A3BC0 -/* 1FAB0 80851CC0 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1FAB4 80851CC4 10400010 */ beq $v0, $zero, .L80851D08 -/* 1FAB8 80851CC8 8FA7001C */ lw $a3, 0x001C($sp) -/* 1FABC 80851CCC 84EE0850 */ lh $t6, 0x0850($a3) ## 00000850 -/* 1FAC0 80851CD0 55C0000E */ bnel $t6, $zero, .L80851D0C -/* 1FAC4 80851CD4 84E80850 */ lh $t0, 0x0850($a3) ## 00000850 -/* 1FAC8 80851CD8 94EF0088 */ lhu $t7, 0x0088($a3) ## 00000088 -/* 1FACC 80851CDC 8FA40018 */ lw $a0, 0x0018($sp) -/* 1FAD0 80851CE0 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 1FAD4 80851CE4 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 1FAD8 80851CE8 13000007 */ beq $t8, $zero, .L80851D08 -/* 1FADC 80851CEC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1FAE0 80851CF0 24C62DB8 */ addiu $a2, $a2, 0x2DB8 ## $a2 = 04002DB8 -/* 1FAE4 80851CF4 0C20C899 */ jal func_80832264 -/* 1FAE8 80851CF8 AFA7001C */ sw $a3, 0x001C($sp) -/* 1FAEC 80851CFC 8FA7001C */ lw $a3, 0x001C($sp) -/* 1FAF0 80851D00 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 1FAF4 80851D04 A4F90850 */ sh $t9, 0x0850($a3) ## 00000850 -.L80851D08: -/* 1FAF8 80851D08 84E80850 */ lh $t0, 0x0850($a3) ## 00000850 -.L80851D0C: -/* 1FAFC 80851D0C 51000004 */ beql $t0, $zero, .L80851D20 -/* 1FB00 80851D10 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1FB04 80851D14 0C20DC87 */ jal func_8083721C -/* 1FB08 80851D18 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 1FB0C 80851D1C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80851D20: -/* 1FB10 80851D20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1FB14 80851D24 03E00008 */ jr $ra -/* 1FB18 80851D28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D2C.s deleted file mode 100644 index 11959bf08e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D2C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80851D2C -/* 1FB1C 80851D2C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1FB20 80851D30 AFA60028 */ sw $a2, 0x0028($sp) -/* 1FB24 80851D34 AFBF001C */ sw $ra, 0x001C($sp) -/* 1FB28 80851D38 AFB00018 */ sw $s0, 0x0018($sp) -/* 1FB2C 80851D3C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1FB30 80851D40 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1FB34 80851D44 0C2143C7 */ jal func_80850F1C -/* 1FB38 80851D48 24C630A0 */ addiu $a2, $a2, 0x30A0 ## $a2 = 040030A0 -/* 1FB3C 80851D4C 0C212D26 */ jal func_8084B498 -/* 1FB40 80851D50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1FB44 80851D54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1FB48 80851D58 0C023A7E */ jal func_8008E9F8 -/* 1FB4C 80851D5C 82050154 */ lb $a1, 0x0154($s0) ## 00000154 -/* 1FB50 80851D60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1FB54 80851D64 0C023ACB */ jal func_8008EB2C -/* 1FB58 80851D68 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 1FB5C 80851D6C 8FBF001C */ lw $ra, 0x001C($sp) -/* 1FB60 80851D70 8FB00018 */ lw $s0, 0x0018($sp) -/* 1FB64 80851D74 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1FB68 80851D78 03E00008 */ jr $ra -/* 1FB6C 80851D7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D80.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D80.s deleted file mode 100644 index 98e1ef88db..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D80.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80851D80 -/* 1FB70 80851D80 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1FB74 80851D84 AFA60028 */ sw $a2, 0x0028($sp) -/* 1FB78 80851D88 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1FB7C 80851D8C AFA50024 */ sw $a1, 0x0024($sp) -/* 1FB80 80851D90 24A601B4 */ addiu $a2, $a1, 0x01B4 ## $a2 = 000001B4 -/* 1FB84 80851D94 AFA40020 */ sw $a0, 0x0020($sp) -/* 1FB88 80851D98 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001B4 -/* 1FB8C 80851D9C 0C028EF0 */ jal func_800A3BC0 -/* 1FB90 80851DA0 AFA6001C */ sw $a2, 0x001C($sp) -/* 1FB94 80851DA4 8FA4001C */ lw $a0, 0x001C($sp) -/* 1FB98 80851DA8 0C02914C */ jal func_800A4530 -/* 1FB9C 80851DAC 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 1FBA0 80851DB0 10400007 */ beq $v0, $zero, .L80851DD0 -/* 1FBA4 80851DB4 8FA40024 */ lw $a0, 0x0024($sp) -/* 1FBA8 80851DB8 8FA40020 */ lw $a0, 0x0020($sp) -/* 1FBAC 80851DBC 8FA50024 */ lw $a1, 0x0024($sp) -/* 1FBB0 80851DC0 0C2119C8 */ jal func_80846720 -/* 1FBB4 80851DC4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 1FBB8 80851DC8 10000005 */ beq $zero, $zero, .L80851DE0 -/* 1FBBC 80851DCC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80851DD0: -/* 1FBC0 80851DD0 3C058085 */ lui $a1, %hi(D_808551B8) ## $a1 = 80850000 -/* 1FBC4 80851DD4 0C20CA49 */ jal func_80832924 -/* 1FBC8 80851DD8 24A551B8 */ addiu $a1, $a1, %lo(D_808551B8) ## $a1 = 808551B8 -/* 1FBCC 80851DDC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80851DE0: -/* 1FBD0 80851DE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1FBD4 80851DE4 03E00008 */ jr $ra -/* 1FBD8 80851DE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851DEC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851DEC.s deleted file mode 100644 index c4fbaac43e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851DEC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80851DEC -/* 1FBDC 80851DEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1FBE0 80851DF0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1FBE4 80851DF4 AFA5001C */ sw $a1, 0x001C($sp) -/* 1FBE8 80851DF8 AFA60020 */ sw $a2, 0x0020($sp) -/* 1FBEC 80851DFC 0C028EF0 */ jal func_800A3BC0 -/* 1FBF0 80851E00 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1FBF4 80851E04 8FA4001C */ lw $a0, 0x001C($sp) -/* 1FBF8 80851E08 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1FBFC 80851E0C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 1FC00 80851E10 0C01DE5F */ jal Math_ApproxS - -/* 1FC04 80851E14 248400BA */ addiu $a0, $a0, 0x00BA ## $a0 = 000000BA -/* 1FC08 80851E18 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1FC0C 80851E1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1FC10 80851E20 03E00008 */ jr $ra -/* 1FC14 80851E24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E28.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E28.s deleted file mode 100644 index 09021b3876..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E28.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80851E28 -/* 1FC18 80851E28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1FC1C 80851E2C AFBF0014 */ sw $ra, 0x0014($sp) -/* 1FC20 80851E30 AFA5001C */ sw $a1, 0x001C($sp) -/* 1FC24 80851E34 AFA60020 */ sw $a2, 0x0020($sp) -/* 1FC28 80851E38 0C028EF0 */ jal func_800A3BC0 -/* 1FC2C 80851E3C 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1FC30 80851E40 8FA4001C */ lw $a0, 0x001C($sp) -/* 1FC34 80851E44 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 1FC38 80851E48 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 1FC3C 80851E4C 0C01DE5F */ jal Math_ApproxS - -/* 1FC40 80851E50 248400BA */ addiu $a0, $a0, 0x00BA ## $a0 = 000000BA -/* 1FC44 80851E54 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1FC48 80851E58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1FC4C 80851E5C 03E00008 */ jr $ra -/* 1FC50 80851E60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E64.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E64.s deleted file mode 100644 index 30b1b6c2ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E64.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80851E64 -/* 1FC54 80851E64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1FC58 80851E68 AFA60020 */ sw $a2, 0x0020($sp) -/* 1FC5C 80851E6C AFBF0014 */ sw $ra, 0x0014($sp) -/* 1FC60 80851E70 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1FC64 80851E74 24C63318 */ addiu $a2, $a2, 0x3318 ## $a2 = 04003318 -/* 1FC68 80851E78 0C20CC19 */ jal func_80833064 -/* 1FC6C 80851E7C 24070098 */ addiu $a3, $zero, 0x0098 ## $a3 = 00000098 -/* 1FC70 80851E80 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1FC74 80851E84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1FC78 80851E88 03E00008 */ jr $ra -/* 1FC7C 80851E8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E90.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E90.s deleted file mode 100644 index 0d53896b19..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E90.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80851E90 -/* 1FC80 80851E90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1FC84 80851E94 AFA60020 */ sw $a2, 0x0020($sp) -/* 1FC88 80851E98 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1FC8C 80851E9C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1FC90 80851EA0 AFA5001C */ sw $a1, 0x001C($sp) -/* 1FC94 80851EA4 24C62408 */ addiu $a2, $a2, 0x2408 ## $a2 = 04002408 -/* 1FC98 80851EA8 0C20CC0F */ jal func_8083303C -/* 1FC9C 80851EAC 2407009C */ addiu $a3, $zero, 0x009C ## $a3 = 0000009C -/* 1FCA0 80851EB0 8FA4001C */ lw $a0, 0x001C($sp) -/* 1FCA4 80851EB4 0C20C9A6 */ jal func_80832698 -/* 1FCA8 80851EB8 24056813 */ addiu $a1, $zero, 0x6813 ## $a1 = 00006813 -/* 1FCAC 80851EBC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1FCB0 80851EC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1FCB4 80851EC4 03E00008 */ jr $ra -/* 1FCB8 80851EC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851ECC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851ECC.s deleted file mode 100644 index 918af4b17d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851ECC.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80851ECC -/* 1FCBC 80851ECC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1FCC0 80851ED0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1FCC4 80851ED4 AFA5001C */ sw $a1, 0x001C($sp) -/* 1FCC8 80851ED8 AFA40018 */ sw $a0, 0x0018($sp) -/* 1FCCC 80851EDC AFA60020 */ sw $a2, 0x0020($sp) -/* 1FCD0 80851EE0 0C028EF0 */ jal func_800A3BC0 -/* 1FCD4 80851EE4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1FCD8 80851EE8 10400006 */ beq $v0, $zero, .L80851F04 -/* 1FCDC 80851EEC 8FA40018 */ lw $a0, 0x0018($sp) -/* 1FCE0 80851EF0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1FCE4 80851EF4 24C62428 */ addiu $a2, $a2, 0x2428 ## $a2 = 04002428 -/* 1FCE8 80851EF8 8FA5001C */ lw $a1, 0x001C($sp) -/* 1FCEC 80851EFC 0C20CC3B */ jal func_808330EC -/* 1FCF0 80851F00 2407009C */ addiu $a3, $zero, 0x009C ## $a3 = 0000009C -.L80851F04: -/* 1FCF4 80851F04 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1FCF8 80851F08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1FCFC 80851F0C 03E00008 */ jr $ra -/* 1FD00 80851F10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F14.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F14.s deleted file mode 100644 index 056c3e02f7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F14.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80851F14 -/* 1FD04 80851F14 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1FD08 80851F18 AFB00018 */ sw $s0, 0x0018($sp) -/* 1FD0C 80851F1C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1FD10 80851F20 AFBF001C */ sw $ra, 0x001C($sp) -/* 1FD14 80851F24 AFA40020 */ sw $a0, 0x0020($sp) -/* 1FD18 80851F28 AFA60028 */ sw $a2, 0x0028($sp) -/* 1FD1C 80851F2C AFA7002C */ sw $a3, 0x002C($sp) -/* 1FD20 80851F30 0C028EF0 */ jal func_800A3BC0 -/* 1FD24 80851F34 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1FD28 80851F38 10400007 */ beq $v0, $zero, .L80851F58 -/* 1FD2C 80851F3C 8FA40020 */ lw $a0, 0x0020($sp) -/* 1FD30 80851F40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1FD34 80851F44 0C20C8A9 */ jal func_808322A4 -/* 1FD38 80851F48 8FA60028 */ lw $a2, 0x0028($sp) -/* 1FD3C 80851F4C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 1FD40 80851F50 10000007 */ beq $zero, $zero, .L80851F70 -/* 1FD44 80851F54 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -.L80851F58: -/* 1FD48 80851F58 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 -/* 1FD4C 80851F5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1FD50 80851F60 55E00004 */ bnel $t7, $zero, .L80851F74 -/* 1FD54 80851F64 8FBF001C */ lw $ra, 0x001C($sp) -/* 1FD58 80851F68 0C20CA49 */ jal func_80832924 -/* 1FD5C 80851F6C 8FA5002C */ lw $a1, 0x002C($sp) -.L80851F70: -/* 1FD60 80851F70 8FBF001C */ lw $ra, 0x001C($sp) -.L80851F74: -/* 1FD64 80851F74 8FB00018 */ lw $s0, 0x0018($sp) -/* 1FD68 80851F78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1FD6C 80851F7C 03E00008 */ jr $ra -/* 1FD70 80851F80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F84.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F84.s deleted file mode 100644 index 80c8690333..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F84.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80851F84 -/* 1FD74 80851F84 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1FD78 80851F88 AFA60020 */ sw $a2, 0x0020($sp) -/* 1FD7C 80851F8C AFBF0014 */ sw $ra, 0x0014($sp) -/* 1FD80 80851F90 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1FD84 80851F94 ACA000C0 */ sw $zero, 0x00C0($a1) ## 000000C0 -/* 1FD88 80851F98 0C21444D */ jal func_80851134 -/* 1FD8C 80851F9C 24C62420 */ addiu $a2, $a2, 0x2420 ## $a2 = 04002420 -/* 1FD90 80851FA0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1FD94 80851FA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1FD98 80851FA8 03E00008 */ jr $ra -/* 1FD9C 80851FAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851FB0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851FB0.s deleted file mode 100644 index 8f4f0ee315..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851FB0.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80851FB0 -/* 1FDA0 80851FB0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1FDA4 80851FB4 AFB00018 */ sw $s0, 0x0018($sp) -/* 1FDA8 80851FB8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1FDAC 80851FBC AFBF001C */ sw $ra, 0x001C($sp) -/* 1FDB0 80851FC0 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1FDB4 80851FC4 AFA40028 */ sw $a0, 0x0028($sp) -/* 1FDB8 80851FC8 AFA60030 */ sw $a2, 0x0030($sp) -/* 1FDBC 80851FCC 0C028EF0 */ jal func_800A3BC0 -/* 1FDC0 80851FD0 AFA50024 */ sw $a1, 0x0024($sp) -/* 1FDC4 80851FD4 10400009 */ beq $v0, $zero, .L80851FFC -/* 1FDC8 80851FD8 8FA40028 */ lw $a0, 0x0028($sp) -/* 1FDCC 80851FDC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1FDD0 80851FE0 24C62430 */ addiu $a2, $a2, 0x2430 ## $a2 = 04002430 -/* 1FDD4 80851FE4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1FDD8 80851FE8 0C20CC3B */ jal func_808330EC -/* 1FDDC 80851FEC 2407009C */ addiu $a3, $zero, 0x009C ## $a3 = 0000009C -/* 1FDE0 80851FF0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 1FDE4 80851FF4 1000000F */ beq $zero, $zero, .L80852034 -/* 1FDE8 80851FF8 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -.L80851FFC: -/* 1FDEC 80851FFC 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 -/* 1FDF0 80852000 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1FDF4 80852004 3C058085 */ lui $a1, %hi(D_808551BC) ## $a1 = 80850000 -/* 1FDF8 80852008 55E0000B */ bnel $t7, $zero, .L80852038 -/* 1FDFC 8085200C 8FBF001C */ lw $ra, 0x001C($sp) -/* 1FE00 80852010 0C20CA49 */ jal func_80832924 -/* 1FE04 80852014 24A551BC */ addiu $a1, $a1, %lo(D_808551BC) ## $a1 = 808551BC -/* 1FE08 80852018 8FA40024 */ lw $a0, 0x0024($sp) -/* 1FE0C 8085201C 0C02914C */ jal func_800A4530 -/* 1FE10 80852020 3C054370 */ lui $a1, 0x4370 ## $a1 = 43700000 -/* 1FE14 80852024 10400003 */ beq $v0, $zero, .L80852034 -/* 1FE18 80852028 3C188003 */ lui $t8, %hi(ActorShadow_DrawFunc_Teardrop) -/* 1FE1C 8085202C 2718B8C4 */ addiu $t8, %lo(ActorShadow_DrawFunc_Teardrop) -/* 1FE20 80852030 AE1800C0 */ sw $t8, 0x00C0($s0) ## 000000C0 -.L80852034: -/* 1FE24 80852034 8FBF001C */ lw $ra, 0x001C($sp) -.L80852038: -/* 1FE28 80852038 8FB00018 */ lw $s0, 0x0018($sp) -/* 1FE2C 8085203C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1FE30 80852040 03E00008 */ jr $ra -/* 1FE34 80852044 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852048.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852048.s deleted file mode 100644 index fd7b888b5c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852048.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80852048 -/* 1FE38 80852048 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1FE3C 8085204C AFBF0014 */ sw $ra, 0x0014($sp) -/* 1FE40 80852050 AFA5001C */ sw $a1, 0x001C($sp) -/* 1FE44 80852054 AFA60020 */ sw $a2, 0x0020($sp) -/* 1FE48 80852058 0C028EF0 */ jal func_800A3BC0 -/* 1FE4C 8085205C 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1FE50 80852060 3C058085 */ lui $a1, %hi(D_808551C8) ## $a1 = 80850000 -/* 1FE54 80852064 24A551C8 */ addiu $a1, $a1, %lo(D_808551C8) ## $a1 = 808551C8 -/* 1FE58 80852068 0C20CA49 */ jal func_80832924 -/* 1FE5C 8085206C 8FA4001C */ lw $a0, 0x001C($sp) -/* 1FE60 80852070 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1FE64 80852074 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1FE68 80852078 03E00008 */ jr $ra -/* 1FE6C 8085207C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852080.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852080.s deleted file mode 100644 index 897aee86e3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852080.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80852080 -/* 1FE70 80852080 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1FE74 80852084 AFA60020 */ sw $a2, 0x0020($sp) -/* 1FE78 80852088 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1FE7C 8085208C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1FE80 80852090 AFA5001C */ sw $a1, 0x001C($sp) -/* 1FE84 80852094 24C62340 */ addiu $a2, $a2, 0x2340 ## $a2 = 04002340 -/* 1FE88 80852098 0C20CC19 */ jal func_80833064 -/* 1FE8C 8085209C 2407009D */ addiu $a3, $zero, 0x009D ## $a3 = 0000009D -/* 1FE90 808520A0 8FA4001C */ lw $a0, 0x001C($sp) -/* 1FE94 808520A4 0C20C9A6 */ jal func_80832698 -/* 1FE98 808520A8 24056808 */ addiu $a1, $zero, 0x6808 ## $a1 = 00006808 -/* 1FE9C 808520AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1FEA0 808520B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1FEA4 808520B4 03E00008 */ jr $ra -/* 1FEA8 808520B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808520BC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808520BC.s deleted file mode 100644 index b074688244..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808520BC.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_808520BC -/* 1FEAC 808520BC 8CCE000C */ lw $t6, 0x000C($a2) ## 0000000C -/* 1FEB0 808520C0 8CD90018 */ lw $t9, 0x0018($a2) ## 00000018 -/* 1FEB4 808520C4 8CCF0010 */ lw $t7, 0x0010($a2) ## 00000010 -/* 1FEB8 808520C8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 1FEBC 808520CC 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 1FEC0 808520D0 8CD80014 */ lw $t8, 0x0014($a2) ## 00000014 -/* 1FEC4 808520D4 46802020 */ cvt.s.w $f0, $f4 -/* 1FEC8 808520D8 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 1FECC 808520DC 8CC8001C */ lw $t0, 0x001C($a2) ## 0000001C -/* 1FED0 808520E0 8CC90020 */ lw $t1, 0x0020($a2) ## 00000020 -/* 1FED4 808520E4 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 1FED8 808520E8 46805120 */ cvt.s.w $f4, $f10 -/* 1FEDC 808520EC 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 1FEE0 808520F0 94C20002 */ lhu $v0, 0x0002($a2) ## 00000002 -/* 1FEE4 808520F4 948A1D74 */ lhu $t2, 0x1D74($a0) ## 00001D74 -/* 1FEE8 808520F8 94CC0004 */ lhu $t4, 0x0004($a2) ## 00000004 -/* 1FEEC 808520FC 468030A0 */ cvt.s.w $f2, $f6 -/* 1FEF0 80852100 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 -/* 1FEF4 80852104 01425823 */ subu $t3, $t2, $v0 -/* 1FEF8 80852108 01826823 */ subu $t5, $t4, $v0 -/* 1FEFC 8085210C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 1FF00 80852110 46804320 */ cvt.s.w $f12, $f8 -/* 1FF04 80852114 46002381 */ sub.s $f14, $f4, $f0 -/* 1FF08 80852118 46805120 */ cvt.s.w $f4, $f10 -/* 1FF0C 8085211C 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -/* 1FF10 80852120 46803220 */ cvt.s.w $f8, $f6 -/* 1FF14 80852124 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 1FF18 80852128 460C2481 */ sub.s $f18, $f4, $f12 -/* 1FF1C 8085212C 46024401 */ sub.s $f16, $f8, $f2 -/* 1FF20 80852130 46805120 */ cvt.s.w $f4, $f10 -/* 1FF24 80852134 46803220 */ cvt.s.w $f8, $f6 -/* 1FF28 80852138 46044183 */ div.s $f6, $f8, $f4 -/* 1FF2C 8085213C 46067282 */ mul.s $f10, $f14, $f6 -/* 1FF30 80852140 E7A60004 */ swc1 $f6, 0x0004($sp) -/* 1FF34 80852144 46005200 */ add.s $f8, $f10, $f0 -/* 1FF38 80852148 E4A80024 */ swc1 $f8, 0x0024($a1) ## 00000024 -/* 1FF3C 8085214C C7A40004 */ lwc1 $f4, 0x0004($sp) -/* 1FF40 80852150 46048182 */ mul.s $f6, $f16, $f4 -/* 1FF44 80852154 46023280 */ add.s $f10, $f6, $f2 -/* 1FF48 80852158 E4AA0028 */ swc1 $f10, 0x0028($a1) ## 00000028 -/* 1FF4C 8085215C C7A80004 */ lwc1 $f8, 0x0004($sp) -/* 1FF50 80852160 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 1FF54 80852164 46089102 */ mul.s $f4, $f18, $f8 -/* 1FF58 80852168 460C2180 */ add.s $f6, $f4, $f12 -/* 1FF5C 8085216C 03E00008 */ jr $ra -/* 1FF60 80852170 E4A6002C */ swc1 $f6, 0x002C($a1) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852174.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852174.s deleted file mode 100644 index deeea0d19d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852174.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80852174 -/* 1FF64 80852174 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1FF68 80852178 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1FF6C 8085217C AFA40018 */ sw $a0, 0x0018($sp) -/* 1FF70 80852180 0C21482F */ jal func_808520BC -/* 1FF74 80852184 AFA5001C */ sw $a1, 0x001C($sp) -/* 1FF78 80852188 8FA5001C */ lw $a1, 0x001C($sp) -/* 1FF7C 8085218C 8FA40018 */ lw $a0, 0x0018($sp) -/* 1FF80 80852190 0C028EF0 */ jal func_800A3BC0 -/* 1FF84 80852194 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1FF88 80852198 3C058085 */ lui $a1, %hi(D_808551D8) ## $a1 = 80850000 -/* 1FF8C 8085219C 24A551D8 */ addiu $a1, $a1, %lo(D_808551D8) ## $a1 = 808551D8 -/* 1FF90 808521A0 0C20CA49 */ jal func_80832924 -/* 1FF94 808521A4 8FA4001C */ lw $a0, 0x001C($sp) -/* 1FF98 808521A8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1FF9C 808521AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1FFA0 808521B0 03E00008 */ jr $ra -/* 1FFA4 808521B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808521B8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808521B8.s deleted file mode 100644 index a2de23f234..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808521B8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_808521B8 -/* 1FFA8 808521B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1FFAC 808521BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 1FFB0 808521C0 AFA40018 */ sw $a0, 0x0018($sp) -/* 1FFB4 808521C4 10C00003 */ beq $a2, $zero, .L808521D4 -/* 1FFB8 808521C8 AFA5001C */ sw $a1, 0x001C($sp) -/* 1FFBC 808521CC 0C21482F */ jal func_808520BC -/* 1FFC0 808521D0 00000000 */ nop -.L808521D4: -/* 1FFC4 808521D4 8FA5001C */ lw $a1, 0x001C($sp) -/* 1FFC8 808521D8 8FA40018 */ lw $a0, 0x0018($sp) -/* 1FFCC 808521DC 0C028EF0 */ jal func_800A3BC0 -/* 1FFD0 808521E0 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1FFD4 808521E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 1FFD8 808521E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 1FFDC 808521EC 03E00008 */ jr $ra -/* 1FFE0 808521F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808521F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808521F4.s deleted file mode 100644 index 1f82f38695..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808521F4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_808521F4 -/* 1FFE4 808521F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1FFE8 808521F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 1FFEC 808521FC AFA60020 */ sw $a2, 0x0020($sp) -/* 1FFF0 80852200 90AE015B */ lbu $t6, 0x015B($a1) ## 0000015B -/* 1FFF4 80852204 3C068085 */ lui $a2, %hi(D_80853D34) ## $a2 = 80850000 -/* 1FFF8 80852208 AFA5001C */ sw $a1, 0x001C($sp) -/* 1FFFC 8085220C 000E7880 */ sll $t7, $t6, 2 -/* 20000 80852210 00CF3021 */ addu $a2, $a2, $t7 -/* 20004 80852214 0C20CAC3 */ jal func_80832B0C -/* 20008 80852218 8CC63D34 */ lw $a2, %lo(D_80853D34)($a2) -/* 2000C 8085221C 0C20C884 */ jal func_80832210 -/* 20010 80852220 8FA4001C */ lw $a0, 0x001C($sp) -/* 20014 80852224 8FBF0014 */ lw $ra, 0x0014($sp) -/* 20018 80852228 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 2001C 8085222C 03E00008 */ jr $ra -/* 20020 80852230 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852234.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852234.s deleted file mode 100644 index f3ec25eabf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852234.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80852234 -/* 20024 80852234 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 20028 80852238 AFBF0014 */ sw $ra, 0x0014($sp) -/* 2002C 8085223C AFA5001C */ sw $a1, 0x001C($sp) -/* 20030 80852240 AFA60020 */ sw $a2, 0x0020($sp) -/* 20034 80852244 0C028EF0 */ jal func_800A3BC0 -/* 20038 80852248 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 2003C 8085224C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 20040 80852250 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 20044 80852254 03E00008 */ jr $ra -/* 20048 80852258 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085225C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085225C.s deleted file mode 100644 index 98bb8aa2f9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085225C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_8085225C -/* 2004C 8085225C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 20050 80852260 AFBF0014 */ sw $ra, 0x0014($sp) -/* 20054 80852264 AFA60020 */ sw $a2, 0x0020($sp) -/* 20058 80852268 0C20CBD5 */ jal func_80832F54 -/* 2005C 8085226C 24060098 */ addiu $a2, $zero, 0x0098 ## $a2 = 00000098 -/* 20060 80852270 8FBF0014 */ lw $ra, 0x0014($sp) -/* 20064 80852274 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 20068 80852278 03E00008 */ jr $ra -/* 2006C 8085227C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852280.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852280.s deleted file mode 100644 index 04fc668121..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852280.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80852280 -/* 20070 80852280 3C0E8085 */ lui $t6, %hi(func_8084A5C4) ## $t6 = 80850000 -/* 20074 80852284 AFA40000 */ sw $a0, 0x0000($sp) -/* 20078 80852288 AFA60008 */ sw $a2, 0x0008($sp) -/* 2007C 8085228C 25CEA5C4 */ addiu $t6, $t6, %lo(func_8084A5C4) ## $t6 = 8084A5C4 -/* 20080 80852290 03E00008 */ jr $ra -/* 20084 80852294 ACAE0134 */ sw $t6, 0x0134($a1) ## 00000134 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852298.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852298.s deleted file mode 100644 index 1790dbe4b0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852298.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80852298 -/* 20088 80852298 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 2008C 8085229C AFB00018 */ sw $s0, 0x0018($sp) -/* 20090 808522A0 AFA60030 */ sw $a2, 0x0030($sp) -/* 20094 808522A4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 20098 808522A8 AFBF001C */ sw $ra, 0x001C($sp) -/* 2009C 808522AC 24A601B4 */ addiu $a2, $a1, 0x01B4 ## $a2 = 000001B4 -/* 200A0 808522B0 AFA40028 */ sw $a0, 0x0028($sp) -/* 200A4 808522B4 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001B4 -/* 200A8 808522B8 0C028EF0 */ jal func_800A3BC0 -/* 200AC 808522BC AFA60024 */ sw $a2, 0x0024($sp) -/* 200B0 808522C0 10400009 */ beq $v0, $zero, .L808522E8 -/* 200B4 808522C4 8FA60024 */ lw $a2, 0x0024($sp) -/* 200B8 808522C8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 200BC 808522CC 24C62378 */ addiu $a2, $a2, 0x2378 ## $a2 = 04002378 -/* 200C0 808522D0 8FA40028 */ lw $a0, 0x0028($sp) -/* 200C4 808522D4 0C20CC4F */ jal func_8083313C -/* 200C8 808522D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 200CC 808522DC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 200D0 808522E0 1000000C */ beq $zero, $zero, .L80852314 -/* 200D4 808522E4 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -.L808522E8: -/* 200D8 808522E8 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 -/* 200DC 808522EC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 200E0 808522F0 55E00009 */ bnel $t7, $zero, .L80852318 -/* 200E4 808522F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 200E8 808522F8 0C02914C */ jal func_800A4530 -/* 200EC 808522FC 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 200F0 80852300 10400004 */ beq $v0, $zero, .L80852314 -/* 200F4 80852304 8FA40028 */ lw $a0, 0x0028($sp) -/* 200F8 80852308 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 200FC 8085230C 0C2119C8 */ jal func_80846720 -/* 20100 80852310 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -.L80852314: -/* 20104 80852314 8FBF001C */ lw $ra, 0x001C($sp) -.L80852318: -/* 20108 80852318 8FB00018 */ lw $s0, 0x0018($sp) -/* 2010C 8085231C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 20110 80852320 03E00008 */ jr $ra -/* 20114 80852324 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852328.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852328.s deleted file mode 100644 index b7027982fe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852328.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80852328 -/* 20118 80852328 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 2011C 8085232C AFA60020 */ sw $a2, 0x0020($sp) -/* 20120 80852330 AFBF0014 */ sw $ra, 0x0014($sp) -/* 20124 80852334 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 20128 80852338 3C078085 */ lui $a3, %hi(D_808551E0) ## $a3 = 80850000 -/* 2012C 8085233C 24E751E0 */ addiu $a3, $a3, %lo(D_808551E0) ## $a3 = 808551E0 -/* 20130 80852340 0C2147C5 */ jal func_80851F14 -/* 20134 80852344 24C62770 */ addiu $a2, $a2, 0x2770 ## $a2 = 04002770 -/* 20138 80852348 8FBF0014 */ lw $ra, 0x0014($sp) -/* 2013C 8085234C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 20140 80852350 03E00008 */ jr $ra -/* 20144 80852354 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852358.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852358.s deleted file mode 100644 index 071eb057c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852358.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80852358 -/* 20148 80852358 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 2014C 8085235C AFA60020 */ sw $a2, 0x0020($sp) -/* 20150 80852360 AFBF0014 */ sw $ra, 0x0014($sp) -/* 20154 80852364 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 20158 80852368 3C078085 */ lui $a3, %hi(D_808551E8) ## $a3 = 80850000 -/* 2015C 8085236C 24E751E8 */ addiu $a3, $a3, %lo(D_808551E8) ## $a3 = 808551E8 -/* 20160 80852370 0C2147C5 */ jal func_80851F14 -/* 20164 80852374 24C62830 */ addiu $a2, $a2, 0x2830 ## $a2 = 04002830 -/* 20168 80852378 8FBF0014 */ lw $ra, 0x0014($sp) -/* 2016C 8085237C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 20170 80852380 03E00008 */ jr $ra -/* 20174 80852384 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852388.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852388.s deleted file mode 100644 index 5fb54074c2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852388.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80852388 -/* 20178 80852388 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 2017C 8085238C AFBF0014 */ sw $ra, 0x0014($sp) -/* 20180 80852390 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 20184 80852394 AFA40018 */ sw $a0, 0x0018($sp) -/* 20188 80852398 AFA60020 */ sw $a2, 0x0020($sp) -/* 2018C 8085239C AFA7001C */ sw $a3, 0x001C($sp) -/* 20190 808523A0 0C028EF0 */ jal func_800A3BC0 -/* 20194 808523A4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 20198 808523A8 1040000A */ beq $v0, $zero, .L808523D4 -/* 2019C 808523AC 8FA7001C */ lw $a3, 0x001C($sp) -/* 201A0 808523B0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 201A4 808523B4 24C62468 */ addiu $a2, $a2, 0x2468 ## $a2 = 04002468 -/* 201A8 808523B8 8FA40018 */ lw $a0, 0x0018($sp) -/* 201AC 808523BC 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 201B0 808523C0 0C20C8A9 */ jal func_808322A4 -/* 201B4 808523C4 AFA7001C */ sw $a3, 0x001C($sp) -/* 201B8 808523C8 8FA7001C */ lw $a3, 0x001C($sp) -/* 201BC 808523CC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 201C0 808523D0 A4EE0850 */ sh $t6, 0x0850($a3) ## 00000850 -.L808523D4: -/* 201C4 808523D4 84EF0850 */ lh $t7, 0x0850($a3) ## 00000850 -/* 201C8 808523D8 8FB80018 */ lw $t8, 0x0018($sp) -/* 201CC 808523DC 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 201D0 808523E0 51E00008 */ beql $t7, $zero, .L80852404 -/* 201D4 808523E4 A0E8015D */ sb $t0, 0x015D($a3) ## 0000015D -/* 201D8 808523E8 97191D74 */ lhu $t9, 0x1D74($t8) ## 00001D74 -/* 201DC 808523EC 2B210384 */ slti $at, $t9, 0x0384 -/* 201E0 808523F0 54200004 */ bnel $at, $zero, .L80852404 -/* 201E4 808523F4 A0E8015D */ sb $t0, 0x015D($a3) ## 0000015D -/* 201E8 808523F8 10000002 */ beq $zero, $zero, .L80852404 -/* 201EC 808523FC A0E0015D */ sb $zero, 0x015D($a3) ## 0000015D -/* 201F0 80852400 A0E8015D */ sb $t0, 0x015D($a3) ## 0000015D -.L80852404: -/* 201F4 80852404 8FBF0014 */ lw $ra, 0x0014($sp) -/* 201F8 80852408 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 201FC 8085240C 03E00008 */ jr $ra -/* 20200 80852410 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852414.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852414.s deleted file mode 100644 index 1d3ddb480a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852414.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80852414 -/* 20204 80852414 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 20208 80852418 AFBF0014 */ sw $ra, 0x0014($sp) -/* 2020C 8085241C AFA5001C */ sw $a1, 0x001C($sp) -/* 20210 80852420 0C2144A5 */ jal func_80851294 -/* 20214 80852424 AFA70024 */ sw $a3, 0x0024($sp) -/* 20218 80852428 8FA4001C */ lw $a0, 0x001C($sp) -/* 2021C 8085242C 848E0850 */ lh $t6, 0x0850($a0) ## 00000850 -/* 20220 80852430 55C00004 */ bnel $t6, $zero, .L80852444 -/* 20224 80852434 8FBF0014 */ lw $ra, 0x0014($sp) -/* 20228 80852438 0C20CA49 */ jal func_80832924 -/* 2022C 8085243C 8FA50024 */ lw $a1, 0x0024($sp) -/* 20230 80852440 8FBF0014 */ lw $ra, 0x0014($sp) -.L80852444: -/* 20234 80852444 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 20238 80852448 03E00008 */ jr $ra -/* 2023C 8085244C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852450.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852450.s deleted file mode 100644 index d3a9739a7e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852450.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80852450 -/* 20240 80852450 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 20244 80852454 AFA60020 */ sw $a2, 0x0020($sp) -/* 20248 80852458 AFBF0014 */ sw $ra, 0x0014($sp) -/* 2024C 8085245C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 20250 80852460 3C078085 */ lui $a3, %hi(D_808551F0) ## $a3 = 80850000 -/* 20254 80852464 24E751F0 */ addiu $a3, $a3, %lo(D_808551F0) ## $a3 = 808551F0 -/* 20258 80852468 0C214905 */ jal func_80852414 -/* 2025C 8085246C 24C62378 */ addiu $a2, $a2, 0x2378 ## $a2 = 04002378 -/* 20260 80852470 8FBF0014 */ lw $ra, 0x0014($sp) -/* 20264 80852474 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 20268 80852478 03E00008 */ jr $ra -/* 2026C 8085247C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852480.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852480.s deleted file mode 100644 index 819332452a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852480.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80852480 -/* 20270 80852480 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 20274 80852484 AFA60020 */ sw $a2, 0x0020($sp) -/* 20278 80852488 AFBF0014 */ sw $ra, 0x0014($sp) -/* 2027C 8085248C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 20280 80852490 3C078085 */ lui $a3, %hi(D_808551F8) ## $a3 = 80850000 -/* 20284 80852494 24E751F8 */ addiu $a3, $a3, %lo(D_808551F8) ## $a3 = 808551F8 -/* 20288 80852498 0C214905 */ jal func_80852414 -/* 2028C 8085249C 24C627D0 */ addiu $a2, $a2, 0x27D0 ## $a2 = 040027D0 -/* 20290 808524A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 20294 808524A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 20298 808524A8 03E00008 */ jr $ra -/* 2029C 808524AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808524B0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808524B0.s deleted file mode 100644 index 89f557b1d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808524B0.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_808524B0 -/* 202A0 808524B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 202A4 808524B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 202A8 808524B8 0C20DDC1 */ jal func_80837704 -/* 202AC 808524BC AFA60020 */ sw $a2, 0x0020($sp) -/* 202B0 808524C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 202B4 808524C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 202B8 808524C8 03E00008 */ jr $ra -/* 202BC 808524CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808524D0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808524D0.s deleted file mode 100644 index f3e920cb01..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808524D0.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_808524D0 -/* 202C0 808524D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 202C4 808524D4 3C028086 */ lui $v0, %hi(D_80858AB4) ## $v0 = 80860000 -/* 202C8 808524D8 8C428AB4 */ lw $v0, %lo(D_80858AB4)($v0) -/* 202CC 808524DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 202D0 808524E0 AFA40018 */ sw $a0, 0x0018($sp) -/* 202D4 808524E4 AFA5001C */ sw $a1, 0x001C($sp) -/* 202D8 808524E8 AFA60020 */ sw $a2, 0x0020($sp) -/* 202DC 808524EC 944E000C */ lhu $t6, 0x000C($v0) ## 8086000C -/* 202E0 808524F0 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 202E4 808524F4 8FA4001C */ lw $a0, 0x001C($sp) -/* 202E8 808524F8 35CF4000 */ ori $t7, $t6, 0x4000 ## $t7 = 00004000 -/* 202EC 808524FC 0C21139A */ jal func_80844E68 -/* 202F0 80852500 A44F000C */ sh $t7, 0x000C($v0) ## 8086000C -/* 202F4 80852504 8FBF0014 */ lw $ra, 0x0014($sp) -/* 202F8 80852508 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 202FC 8085250C 03E00008 */ jr $ra -/* 20300 80852510 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852514.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852514.s deleted file mode 100644 index 67b93f55e4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852514.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80852514 -/* 20304 80852514 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 20308 80852518 AFA5001C */ sw $a1, 0x001C($sp) -/* 2030C 8085251C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 20310 80852520 AFBF0014 */ sw $ra, 0x0014($sp) -/* 20314 80852524 AFA40018 */ sw $a0, 0x0018($sp) -/* 20318 80852528 8FA4001C */ lw $a0, 0x001C($sp) -/* 2031C 8085252C 0C21139A */ jal func_80844E68 -/* 20320 80852530 AFA60020 */ sw $a2, 0x0020($sp) -/* 20324 80852534 8FBF0014 */ lw $ra, 0x0014($sp) -/* 20328 80852538 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 2032C 8085253C 03E00008 */ jr $ra -/* 20330 80852540 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852544.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852544.s deleted file mode 100644 index d560e8a269..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852544.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80852544 -/* 20334 80852544 AFA40000 */ sw $a0, 0x0000($sp) -/* 20338 80852548 AFA50004 */ sw $a1, 0x0004($sp) -/* 2033C 8085254C 03E00008 */ jr $ra -/* 20340 80852550 AFA60008 */ sw $a2, 0x0008($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852554.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852554.s deleted file mode 100644 index 8a5fd88e9e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852554.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80852554 -/* 20344 80852554 AFA40000 */ sw $a0, 0x0000($sp) -/* 20348 80852558 AFA50004 */ sw $a1, 0x0004($sp) -/* 2034C 8085255C 03E00008 */ jr $ra -/* 20350 80852560 AFA60008 */ sw $a2, 0x0008($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852564.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852564.s deleted file mode 100644 index 0f0c75145d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852564.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80852564 -/* 20354 80852564 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 20358 80852568 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 2035C 8085256C 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 20360 80852570 AFBF0014 */ sw $ra, 0x0014($sp) -/* 20364 80852574 AFA60020 */ sw $a2, 0x0020($sp) -/* 20368 80852578 90AE0692 */ lbu $t6, 0x0692($a1) ## 00000692 -/* 2036C 8085257C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 20370 80852580 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 -/* 20374 80852584 35CF0002 */ ori $t7, $t6, 0x0002 ## $t7 = 00000002 -/* 20378 80852588 A0AF0692 */ sb $t7, 0x0692($a1) ## 00000692 -/* 2037C 8085258C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 20380 80852590 E4A40838 */ swc1 $f4, 0x0838($a1) ## 00000838 -/* 20384 80852594 E4A60060 */ swc1 $f6, 0x0060($a1) ## 00000060 -/* 20388 80852598 AFA5001C */ sw $a1, 0x001C($sp) -/* 2038C 8085259C 0C20C899 */ jal func_80832264 -/* 20390 808525A0 24C62DB0 */ addiu $a2, $a2, 0x2DB0 ## $a2 = 04002DB0 -/* 20394 808525A4 8FA4001C */ lw $a0, 0x001C($sp) -/* 20398 808525A8 0C20C9A6 */ jal func_80832698 -/* 2039C 808525AC 24056808 */ addiu $a1, $zero, 0x6808 ## $a1 = 00006808 -/* 203A0 808525B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 203A4 808525B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 203A8 808525B8 03E00008 */ jr $ra -/* 203AC 808525BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808525C0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808525C0.s deleted file mode 100644 index 71bd786626..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808525C0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_808525C0 -/* 203B0 808525C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 203B4 808525C4 AFA5001C */ sw $a1, 0x001C($sp) -/* 203B8 808525C8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 203BC 808525CC AFA40018 */ sw $a0, 0x0018($sp) -/* 203C0 808525D0 8FA4001C */ lw $a0, 0x001C($sp) -/* 203C4 808525D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 203C8 808525D8 AFA60020 */ sw $a2, 0x0020($sp) -/* 203CC 808525DC 848E0850 */ lh $t6, 0x0850($a0) ## 00000850 -/* 203D0 808525E0 3C198085 */ lui $t9, %hi(D_808551FC) ## $t9 = 80850000 -/* 203D4 808525E4 000E7880 */ sll $t7, $t6, 2 -/* 203D8 808525E8 032FC821 */ addu $t9, $t9, $t7 -/* 203DC 808525EC 8F3951FC */ lw $t9, %lo(D_808551FC)($t9) -/* 203E0 808525F0 0320F809 */ jalr $ra, $t9 -/* 203E4 808525F4 00000000 */ nop -/* 203E8 808525F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 203EC 808525FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 203F0 80852600 03E00008 */ jr $ra -/* 203F4 80852604 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852608.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852608.s deleted file mode 100644 index 5b4e96eb94..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852608.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80852608 -/* 203F8 80852608 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 203FC 8085260C AFBF0014 */ sw $ra, 0x0014($sp) -/* 20400 80852610 AFA60020 */ sw $a2, 0x0020($sp) -/* 20404 80852614 AFA40018 */ sw $a0, 0x0018($sp) -/* 20408 80852618 AFA5001C */ sw $a1, 0x001C($sp) -/* 2040C 8085261C 0C2119C8 */ jal func_80846720 -/* 20410 80852620 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 20414 80852624 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 20418 80852628 24C62838 */ addiu $a2, $a2, 0x2838 ## $a2 = 04002838 -/* 2041C 8085262C 8FA40018 */ lw $a0, 0x0018($sp) -/* 20420 80852630 0C20C8B4 */ jal func_808322D0 -/* 20424 80852634 8FA5001C */ lw $a1, 0x001C($sp) -/* 20428 80852638 8FBF0014 */ lw $ra, 0x0014($sp) -/* 2042C 8085263C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 20430 80852640 03E00008 */ jr $ra -/* 20434 80852644 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852648.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852648.s deleted file mode 100644 index 99637b5df2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852648.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80852648 -/* 20438 80852648 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 2043C 8085264C AFB00018 */ sw $s0, 0x0018($sp) -/* 20440 80852650 AFA60030 */ sw $a2, 0x0030($sp) -/* 20444 80852654 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 20448 80852658 AFBF001C */ sw $ra, 0x001C($sp) -/* 2044C 8085265C 24A601B4 */ addiu $a2, $a1, 0x01B4 ## $a2 = 000001B4 -/* 20450 80852660 AFA40028 */ sw $a0, 0x0028($sp) -/* 20454 80852664 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001B4 -/* 20458 80852668 0C028EF0 */ jal func_800A3BC0 -/* 2045C 8085266C AFA60020 */ sw $a2, 0x0020($sp) -/* 20460 80852670 8FA40020 */ lw $a0, 0x0020($sp) -/* 20464 80852674 0C02914C */ jal func_800A4530 -/* 20468 80852678 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 2046C 8085267C 10400016 */ beq $v0, $zero, .L808526D8 -/* 20470 80852680 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 20474 80852684 A2000154 */ sb $zero, 0x0154($s0) ## 00000154 -/* 20478 80852688 820E0154 */ lb $t6, 0x0154($s0) ## 00000154 -/* 2047C 8085268C A20F0152 */ sb $t7, 0x0152($s0) ## 00000152 -/* 20480 80852690 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 20484 80852694 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 20488 80852698 0C023A7E */ jal func_8008E9F8 -/* 2048C 8085269C A20E0151 */ sb $t6, 0x0151($s0) ## 00000151 -/* 20490 808526A0 3C188012 */ lui $t8, %hi(D_80125E08) -/* 20494 808526A4 27185E08 */ addiu $t8, %lo(D_80125E08) -/* 20498 808526A8 A2020159 */ sb $v0, 0x0159($s0) ## 00000159 -/* 2049C 808526AC A2020158 */ sb $v0, 0x0158($s0) ## 00000158 -/* 204A0 808526B0 AE180164 */ sw $t8, 0x0164($s0) ## 00000164 -/* 204A4 808526B4 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 204A8 808526B8 0C025E80 */ jal Inventory_ChangeEquipment -/* 204AC 808526BC 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 204B0 808526C0 2419003C */ addiu $t9, $zero, 0x003C ## $t9 = 0000003C -/* 204B4 808526C4 3C018016 */ lui $at, %hi(gSaveContext+0x68) -/* 204B8 808526C8 A039E6C8 */ sb $t9, %lo(gSaveContext+0x68)($at) -/* 204BC 808526CC 8FA40028 */ lw $a0, 0x0028($sp) -/* 204C0 808526D0 0C025E95 */ jal Inventory_DeleteEquipment -/* 204C4 808526D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -.L808526D8: -/* 204C8 808526D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 204CC 808526DC 8FB00018 */ lw $s0, 0x0018($sp) -/* 204D0 808526E0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 204D4 808526E4 03E00008 */ jr $ra -/* 204D8 808526E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808526EC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808526EC.s deleted file mode 100644 index 7e412463b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808526EC.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel func_808526EC -/* 204DC 808526EC 3C028016 */ lui $v0, %hi(gSaveContext+4) -/* 204E0 808526F0 8C42E664 */ lw $v0, %lo(gSaveContext+4)($v0) -/* 204E4 808526F4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 204E8 808526F8 AFA60058 */ sw $a2, 0x0058($sp) -/* 204EC 808526FC 3C068085 */ lui $a2, %hi(D_80855208) ## $a2 = 80850000 -/* 204F0 80852700 00027080 */ sll $t6, $v0, 2 -/* 204F4 80852704 AFBF002C */ sw $ra, 0x002C($sp) -/* 204F8 80852708 00CE3021 */ addu $a2, $a2, $t6 -/* 204FC 8085270C AFB00028 */ sw $s0, 0x0028($sp) -/* 20500 80852710 AFA40050 */ sw $a0, 0x0050($sp) -/* 20504 80852714 AFA50054 */ sw $a1, 0x0054($sp) -/* 20508 80852718 0C2144A5 */ jal func_80851294 -/* 2050C 8085271C 8CC65208 */ lw $a2, %lo(D_80855208)($a2) -/* 20510 80852720 8FA20054 */ lw $v0, 0x0054($sp) -/* 20514 80852724 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 20518 80852728 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 2051C 8085272C 904F015D */ lbu $t7, 0x015D($v0) ## 0000015D -/* 20520 80852730 3C198016 */ lui $t9, %hi(gSaveContext+4) -/* 20524 80852734 11E10003 */ beq $t7, $at, .L80852744 -/* 20528 80852738 00000000 */ nop -/* 2052C 8085273C 1000003A */ beq $zero, $zero, .L80852828 -/* 20530 80852740 A058015D */ sb $t8, 0x015D($v0) ## 0000015D -.L80852744: -/* 20534 80852744 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) -/* 20538 80852748 3C098085 */ lui $t1, %hi(D_80855210) ## $t1 = 80850000 -/* 2053C 8085274C 25295210 */ addiu $t1, $t1, %lo(D_80855210) ## $t1 = 80855210 -/* 20540 80852750 00194080 */ sll $t0, $t9, 2 -/* 20544 80852754 01194023 */ subu $t0, $t0, $t9 -/* 20548 80852758 00084080 */ sll $t0, $t0, 2 -/* 2054C 8085275C 01098021 */ addu $s0, $t0, $t1 -/* 20550 80852760 860A0006 */ lh $t2, 0x0006($s0) ## 00000006 -/* 20554 80852764 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 20558 80852768 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 2055C 8085276C 46802320 */ cvt.s.w $f12, $f4 -/* 20560 80852770 860B0000 */ lh $t3, 0x0000($s0) ## 00000000 -/* 20564 80852774 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 20568 80852778 00000000 */ nop -/* 2056C 8085277C 46803220 */ cvt.s.w $f8, $f6 -/* 20570 80852780 46080280 */ add.s $f10, $f0, $f8 -/* 20574 80852784 E7AA0034 */ swc1 $f10, 0x0034($sp) -/* 20578 80852788 860C0008 */ lh $t4, 0x0008($s0) ## 00000008 -/* 2057C 8085278C 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00 -/* 20580 80852790 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 20584 80852794 46808320 */ cvt.s.w $f12, $f16 -/* 20588 80852798 860D0002 */ lh $t5, 0x0002($s0) ## 00000002 -/* 2058C 8085279C 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00 -/* 20590 808527A0 00000000 */ nop -/* 20594 808527A4 46809120 */ cvt.s.w $f4, $f18 -/* 20598 808527A8 46040180 */ add.s $f6, $f0, $f4 -/* 2059C 808527AC E7A60038 */ swc1 $f6, 0x0038($sp) -/* 205A0 808527B0 860E000A */ lh $t6, 0x000A($s0) ## 0000000A -/* 205A4 808527B4 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 205A8 808527B8 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 205AC 808527BC 46804320 */ cvt.s.w $f12, $f8 -/* 205B0 808527C0 860F0004 */ lh $t7, 0x0004($s0) ## 00000004 -/* 205B4 808527C4 8FA40054 */ lw $a0, 0x0054($sp) -/* 205B8 808527C8 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFE4 -/* 205BC 808527CC 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 205C0 808527D0 27A60040 */ addiu $a2, $sp, 0x0040 ## $a2 = FFFFFFF0 -/* 205C4 808527D4 24840A20 */ addiu $a0, $a0, 0x0A20 ## $a0 = 00000A20 -/* 205C8 808527D8 46805420 */ cvt.s.w $f16, $f10 -/* 205CC 808527DC 46100480 */ add.s $f18, $f0, $f16 -/* 205D0 808527E0 0C029BBD */ jal SkinMatrix_Vec3fMtxFMultXYZ -/* 205D4 808527E4 E7B2003C */ swc1 $f18, 0x003C($sp) -/* 205D8 808527E8 3C068085 */ lui $a2, %hi(D_80855228) ## $a2 = 80850000 -/* 205DC 808527EC 3C188085 */ lui $t8, %hi(D_80855234) ## $t8 = 80850000 -/* 205E0 808527F0 3C198085 */ lui $t9, %hi(D_80855238) ## $t9 = 80850000 -/* 205E4 808527F4 24C65228 */ addiu $a2, $a2, %lo(D_80855228) ## $a2 = 80855228 -/* 205E8 808527F8 27395238 */ addiu $t9, $t9, %lo(D_80855238) ## $t9 = 80855238 -/* 205EC 808527FC 27185234 */ addiu $t8, $t8, %lo(D_80855234) ## $t8 = 80855234 -/* 205F0 80852800 24080258 */ addiu $t0, $zero, 0x0258 ## $t0 = 00000258 -/* 205F4 80852804 2409FFF6 */ addiu $t1, $zero, 0xFFF6 ## $t1 = FFFFFFF6 -/* 205F8 80852808 AFA9001C */ sw $t1, 0x001C($sp) -/* 205FC 8085280C AFA80018 */ sw $t0, 0x0018($sp) -/* 20600 80852810 AFB80010 */ sw $t8, 0x0010($sp) -/* 20604 80852814 AFB90014 */ sw $t9, 0x0014($sp) -/* 20608 80852818 00C03825 */ or $a3, $a2, $zero ## $a3 = 80855228 -/* 2060C 8085281C 8FA40050 */ lw $a0, 0x0050($sp) -/* 20610 80852820 0C00A2EC */ jal func_80028BB0 -/* 20614 80852824 27A50040 */ addiu $a1, $sp, 0x0040 ## $a1 = FFFFFFF0 -.L80852828: -/* 20618 80852828 8FBF002C */ lw $ra, 0x002C($sp) -/* 2061C 8085282C 8FB00028 */ lw $s0, 0x0028($sp) -/* 20620 80852830 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 20624 80852834 03E00008 */ jr $ra -/* 20628 80852838 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085283C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085283C.s deleted file mode 100644 index 8c3c71c634..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8085283C.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_8085283C -/* 2062C 8085283C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 20630 80852840 AFBF0014 */ sw $ra, 0x0014($sp) -/* 20634 80852844 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 20638 80852848 AFA40018 */ sw $a0, 0x0018($sp) -/* 2063C 8085284C AFA60020 */ sw $a2, 0x0020($sp) -/* 20640 80852850 AFA7001C */ sw $a3, 0x001C($sp) -/* 20644 80852854 0C028EF0 */ jal func_800A3BC0 -/* 20648 80852858 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 2064C 8085285C 10400007 */ beq $v0, $zero, .L8085287C -/* 20650 80852860 8FA7001C */ lw $a3, 0x001C($sp) -/* 20654 80852864 8FA40018 */ lw $a0, 0x0018($sp) -/* 20658 80852868 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 2065C 8085286C 0C214A51 */ jal func_80852944 -/* 20660 80852870 8FA60020 */ lw $a2, 0x0020($sp) -/* 20664 80852874 10000011 */ beq $zero, $zero, .L808528BC -/* 20668 80852878 8FBF0014 */ lw $ra, 0x0014($sp) -.L8085287C: -/* 2066C 8085287C 84EE0850 */ lh $t6, 0x0850($a3) ## 00000850 -/* 20670 80852880 8FA40018 */ lw $a0, 0x0018($sp) -/* 20674 80852884 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 20678 80852888 15C00009 */ bne $t6, $zero, .L808528B0 -/* 2067C 8085288C 00000000 */ nop -/* 20680 80852890 0C021344 */ jal Item_Give -/* 20684 80852894 AFA7001C */ sw $a3, 0x001C($sp) -/* 20688 80852898 8FA5001C */ lw $a1, 0x001C($sp) -/* 2068C 8085289C 8FA40018 */ lw $a0, 0x0018($sp) -/* 20690 808528A0 0C2119C8 */ jal func_80846720 -/* 20694 808528A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 20698 808528A8 10000004 */ beq $zero, $zero, .L808528BC -/* 2069C 808528AC 8FBF0014 */ lw $ra, 0x0014($sp) -.L808528B0: -/* 206A0 808528B0 0C213A62 */ jal func_8084E988 -/* 206A4 808528B4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 206A8 808528B8 8FBF0014 */ lw $ra, 0x0014($sp) -.L808528BC: -/* 206AC 808528BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 206B0 808528C0 03E00008 */ jr $ra -/* 206B4 808528C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808528C8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808528C8.s deleted file mode 100644 index a916158470..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808528C8.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_808528C8 -/* 206B8 808528C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 206BC 808528CC AFB00018 */ sw $s0, 0x0018($sp) -/* 206C0 808528D0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 206C4 808528D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 206C8 808528D8 AFA40020 */ sw $a0, 0x0020($sp) -/* 206CC 808528DC AFA60028 */ sw $a2, 0x0028($sp) -/* 206D0 808528E0 0C028EF0 */ jal func_800A3BC0 -/* 206D4 808528E4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 206D8 808528E8 1040000A */ beq $v0, $zero, .L80852914 -/* 206DC 808528EC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 206E0 808528F0 C60401C4 */ lwc1 $f4, 0x01C4($s0) ## 000001C4 -/* 206E4 808528F4 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 -/* 206E8 808528F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 206EC 808528FC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 206F0 80852900 46062201 */ sub.s $f8, $f4, $f6 -/* 206F4 80852904 3C0642C6 */ lui $a2, 0x42C6 ## $a2 = 42C60000 -/* 206F8 80852908 44074000 */ mfc1 $a3, $f8 -/* 206FC 8085290C 0C210A17 */ jal func_8084285C -/* 20700 80852910 00000000 */ nop -.L80852914: -/* 20704 80852914 820E0151 */ lb $t6, 0x0151($s0) ## 00000151 -/* 20708 80852918 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 2070C 8085291C 8FA40020 */ lw $a0, 0x0020($sp) -/* 20710 80852920 11C10003 */ beq $t6, $at, .L80852930 -/* 20714 80852924 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 20718 80852928 0C2119C8 */ jal func_80846720 -/* 2071C 8085292C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -.L80852930: -/* 20720 80852930 8FBF001C */ lw $ra, 0x001C($sp) -/* 20724 80852934 8FB00018 */ lw $s0, 0x0018($sp) -/* 20728 80852938 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 2072C 8085293C 03E00008 */ jr $ra -/* 20730 80852940 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852944.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852944.s deleted file mode 100644 index 56aef84bc4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852944.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80852944 -/* 20734 80852944 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 20738 80852948 AFB10018 */ sw $s1, 0x0018($sp) -/* 2073C 8085294C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 20740 80852950 AFBF001C */ sw $ra, 0x001C($sp) -/* 20744 80852954 AFB00014 */ sw $s0, 0x0014($sp) -/* 20748 80852958 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 2074C 8085295C AFA60028 */ sw $a2, 0x0028($sp) -/* 20750 80852960 0C20CCAE */ jal func_808332B8 -/* 20754 80852964 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 20758 80852968 10400009 */ beq $v0, $zero, .L80852990 -/* 2075C 8085296C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 20760 80852970 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 20764 80852974 0C20E3C6 */ jal func_80838F18 -/* 20768 80852978 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 2076C 8085297C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 20770 80852980 0C20C8D0 */ jal func_80832340 -/* 20774 80852984 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 20778 80852988 1000000B */ beq $zero, $zero, .L808529B8 -/* 2077C 8085298C A2000444 */ sb $zero, 0x0444($s0) ## 00000444 -.L80852990: -/* 20780 80852990 0C20F052 */ jal func_8083C148 -/* 20784 80852994 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 20788 80852998 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 2078C 8085299C 0C20ED91 */ jal func_8083B644 -/* 20790 808529A0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 20794 808529A4 14400003 */ bne $v0, $zero, .L808529B4 -/* 20798 808529A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 2079C 808529AC 0C20F96A */ jal func_8083E5A8 -/* 207A0 808529B0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L808529B4: -/* 207A4 808529B4 A2000444 */ sb $zero, 0x0444($s0) ## 00000444 -.L808529B8: -/* 207A8 808529B8 A20006AD */ sb $zero, 0x06AD($s0) ## 000006AD -/* 207AC 808529BC 8FBF001C */ lw $ra, 0x001C($sp) -/* 207B0 808529C0 8FB10018 */ lw $s1, 0x0018($sp) -/* 207B4 808529C4 8FB00014 */ lw $s0, 0x0014($sp) -/* 207B8 808529C8 03E00008 */ jr $ra -/* 207BC 808529CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808529D0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808529D0.s deleted file mode 100644 index 7d237b6112..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808529D0.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_808529D0 -/* 207C0 808529D0 8CCE000C */ lw $t6, 0x000C($a2) ## 0000000C -/* 207C4 808529D4 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 207C8 808529D8 3C198016 */ lui $t9, %hi(gSaveContext+4) -/* 207CC 808529DC 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 207D0 808529E0 00000000 */ nop -/* 207D4 808529E4 468021A0 */ cvt.s.w $f6, $f4 -/* 207D8 808529E8 E4A60024 */ swc1 $f6, 0x0024($a1) ## 00000024 -/* 207DC 808529EC 8CCF0010 */ lw $t7, 0x0010($a2) ## 00000010 -/* 207E0 808529F0 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 207E4 808529F4 00000000 */ nop -/* 207E8 808529F8 468042A0 */ cvt.s.w $f10, $f8 -/* 207EC 808529FC E4AA0028 */ swc1 $f10, 0x0028($a1) ## 00000028 -/* 207F0 80852A00 849800A4 */ lh $t8, 0x00A4($a0) ## 000000A4 -/* 207F4 80852A04 5701000B */ bnel $t8, $at, .L80852A34 -/* 207F8 80852A08 8CC80014 */ lw $t0, 0x0014($a2) ## 00000014 -/* 207FC 80852A0C 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) -/* 20800 80852A10 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 20804 80852A14 53200007 */ beql $t9, $zero, .L80852A34 -/* 20808 80852A18 8CC80014 */ lw $t0, 0x0014($a2) ## 00000014 -/* 2080C 80852A1C C4B00028 */ lwc1 $f16, 0x0028($a1) ## 00000028 -/* 20810 80852A20 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 20814 80852A24 00000000 */ nop -/* 20818 80852A28 46128101 */ sub.s $f4, $f16, $f18 -/* 2081C 80852A2C E4A40028 */ swc1 $f4, 0x0028($a1) ## 00000028 -/* 20820 80852A30 8CC80014 */ lw $t0, 0x0014($a2) ## 00000014 -.L80852A34: -/* 20824 80852A34 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 -/* 20828 80852A38 00000000 */ nop -/* 2082C 80852A3C 46803220 */ cvt.s.w $f8, $f6 -/* 20830 80852A40 E4A8002C */ swc1 $f8, 0x002C($a1) ## 0000002C -/* 20834 80852A44 84C20008 */ lh $v0, 0x0008($a2) ## 00000008 -/* 20838 80852A48 A4A200B6 */ sh $v0, 0x00B6($a1) ## 000000B6 -/* 2083C 80852A4C 03E00008 */ jr $ra -/* 20840 80852A50 A4A2083C */ sh $v0, 0x083C($a1) ## 0000083C diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852A54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852A54.s deleted file mode 100644 index f4ecb3a3d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852A54.s +++ /dev/null @@ -1,67 +0,0 @@ -glabel func_80852A54 -/* 20844 80852A54 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 20848 80852A58 AFBF0014 */ sw $ra, 0x0014($sp) -/* 2084C 80852A5C C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 20850 80852A60 C4AA0028 */ lwc1 $f10, 0x0028($a1) ## 00000028 -/* 20854 80852A64 8CCE000C */ lw $t6, 0x000C($a2) ## 0000000C -/* 20858 80852A68 4600218D */ trunc.w.s $f6, $f4 -/* 2085C 80852A6C C4A4002C */ lwc1 $f4, 0x002C($a1) ## 0000002C -/* 20860 80852A70 8CC80010 */ lw $t0, 0x0010($a2) ## 00000010 -/* 20864 80852A74 4600540D */ trunc.w.s $f16, $f10 -/* 20868 80852A78 44183000 */ mfc1 $t8, $f6 -/* 2086C 80852A7C 8CCC0014 */ lw $t4, 0x0014($a2) ## 00000014 -/* 20870 80852A80 4600218D */ trunc.w.s $f6, $f4 -/* 20874 80852A84 440A8000 */ mfc1 $t2, $f16 -/* 20878 80852A88 01D8C823 */ subu $t9, $t6, $t8 -/* 2087C 80852A8C 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 20880 80852A90 010A5823 */ subu $t3, $t0, $t2 -/* 20884 80852A94 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 20888 80852A98 468040A0 */ cvt.s.w $f2, $f8 -/* 2088C 80852A9C 440F3000 */ mfc1 $t7, $f6 -/* 20890 80852AA0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 20894 80852AA4 84B900B6 */ lh $t9, 0x00B6($a1) ## 000000B6 -/* 20898 80852AA8 018F7023 */ subu $t6, $t4, $t7 -/* 2089C 80852AAC 46809320 */ cvt.s.w $f12, $f18 -/* 208A0 80852AB0 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 208A4 80852AB4 46021282 */ mul.s $f10, $f2, $f2 -/* 208A8 80852AB8 84D80008 */ lh $t8, 0x0008($a2) ## 00000008 -/* 208AC 80852ABC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 208B0 80852AC0 460C6402 */ mul.s $f16, $f12, $f12 -/* 208B4 80852AC4 03191023 */ subu $v0, $t8, $t9 -/* 208B8 80852AC8 00021400 */ sll $v0, $v0, 16 -/* 208BC 80852ACC 00021403 */ sra $v0, $v0, 16 -/* 208C0 80852AD0 468043A0 */ cvt.s.w $f14, $f8 -/* 208C4 80852AD4 C4A80838 */ lwc1 $f8, 0x0838($a1) ## 00000838 -/* 208C8 80852AD8 46105480 */ add.s $f18, $f10, $f16 -/* 208CC 80852ADC 460E7102 */ mul.s $f4, $f14, $f14 -/* 208D0 80852AE0 46083032 */ c.eq.s $f6, $f8 -/* 208D4 80852AE4 46049000 */ add.s $f0, $f18, $f4 -/* 208D8 80852AE8 45000011 */ bc1f .L80852B30 -/* 208DC 80852AEC 46000004 */ sqrt.s $f0, $f0 -/* 208E0 80852AF0 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 208E4 80852AF4 00000000 */ nop -/* 208E8 80852AF8 4600503C */ c.lt.s $f10, $f0 -/* 208EC 80852AFC 00000000 */ nop -/* 208F0 80852B00 45010008 */ bc1t .L80852B24 -/* 208F4 80852B04 00000000 */ nop -/* 208F8 80852B08 04400003 */ bltz $v0, .L80852B18 -/* 208FC 80852B0C 00021823 */ subu $v1, $zero, $v0 -/* 20900 80852B10 10000001 */ beq $zero, $zero, .L80852B18 -/* 20904 80852B14 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80852B18: -/* 20908 80852B18 28614001 */ slti $at, $v1, 0x4001 -/* 2090C 80852B1C 54200005 */ bnel $at, $zero, .L80852B34 -/* 20910 80852B20 A0A001E9 */ sb $zero, 0x01E9($a1) ## 000001E9 -.L80852B24: -/* 20914 80852B24 0C214A74 */ jal func_808529D0 -/* 20918 80852B28 AFA5001C */ sw $a1, 0x001C($sp) -/* 2091C 80852B2C 8FA5001C */ lw $a1, 0x001C($sp) -.L80852B30: -/* 20920 80852B30 A0A001E9 */ sb $zero, 0x01E9($a1) ## 000001E9 -.L80852B34: -/* 20924 80852B34 0C20CB6C */ jal func_80832DB0 -/* 20928 80852B38 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 2092C 80852B3C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 20930 80852B40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 20934 80852B44 03E00008 */ jr $ra -/* 20938 80852B48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852B4C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852B4C.s deleted file mode 100644 index a337541ae6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852B4C.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80852B4C -/* 2093C 80852B4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 20940 80852B50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 20944 80852B54 80E20000 */ lb $v0, 0x0000($a3) ## 00000000 -/* 20948 80852B58 3C198085 */ lui $t9, %hi(D_80854AA4) ## $t9 = 80850000 -/* 2094C 80852B5C 18400009 */ blez $v0, .L80852B84 -/* 20950 80852B60 00027080 */ sll $t6, $v0, 2 -/* 20954 80852B64 032EC821 */ addu $t9, $t9, $t6 -/* 20958 80852B68 8F394AA4 */ lw $t9, %lo(D_80854AA4)($t9) -/* 2095C 80852B6C 8CE60004 */ lw $a2, 0x0004($a3) ## 00000004 -/* 20960 80852B70 AFA5001C */ sw $a1, 0x001C($sp) -/* 20964 80852B74 0320F809 */ jalr $ra, $t9 -/* 20968 80852B78 00000000 */ nop -/* 2096C 80852B7C 10000008 */ beq $zero, $zero, .L80852BA0 -/* 20970 80852B80 8FA5001C */ lw $a1, 0x001C($sp) -.L80852B84: -/* 20974 80852B84 04410006 */ bgez $v0, .L80852BA0 -/* 20978 80852B88 00000000 */ nop -/* 2097C 80852B8C AFA5001C */ sw $a1, 0x001C($sp) -/* 20980 80852B90 8CF90004 */ lw $t9, 0x0004($a3) ## 00000004 -/* 20984 80852B94 0320F809 */ jalr $ra, $t9 -/* 20988 80852B98 00000000 */ nop -/* 2098C 80852B9C 8FA5001C */ lw $a1, 0x001C($sp) -.L80852BA0: -/* 20990 80852BA0 3C038086 */ lui $v1, %hi(D_80858AA0) ## $v1 = 80860000 -/* 20994 80852BA4 24638AA0 */ addiu $v1, $v1, %lo(D_80858AA0) ## $v1 = 80858AA0 -/* 20998 80852BA8 8C6F0000 */ lw $t7, 0x0000($v1) ## 80858AA0 -/* 2099C 80852BAC 31F80004 */ andi $t8, $t7, 0x0004 ## $t8 = 00000000 -/* 209A0 80852BB0 53000013 */ beql $t8, $zero, .L80852C00 -/* 209A4 80852BB4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 209A8 80852BB8 90A801E9 */ lbu $t0, 0x01E9($a1) ## 000001E9 -/* 209AC 80852BBC 31090004 */ andi $t1, $t0, 0x0004 ## $t1 = 00000000 -/* 209B0 80852BC0 5520000F */ bnel $t1, $zero, .L80852C00 -/* 209B4 80852BC4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 209B8 80852BC8 8CA201D8 */ lw $v0, 0x01D8($a1) ## 000001D8 -/* 209BC 80852BCC 8CAB0678 */ lw $t3, 0x0678($a1) ## 00000678 -/* 209C0 80852BD0 844A0002 */ lh $t2, 0x0002($v0) ## 00000002 -/* 209C4 80852BD4 C5680008 */ lwc1 $f8, 0x0008($t3) ## 00000008 -/* 209C8 80852BD8 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 209CC 80852BDC 00000000 */ nop -/* 209D0 80852BE0 468021A0 */ cvt.s.w $f6, $f4 -/* 209D4 80852BE4 46083283 */ div.s $f10, $f6, $f8 -/* 209D8 80852BE8 4600540D */ trunc.w.s $f16, $f10 -/* 209DC 80852BEC 440D8000 */ mfc1 $t5, $f16 -/* 209E0 80852BF0 00000000 */ nop -/* 209E4 80852BF4 A44D0002 */ sh $t5, 0x0002($v0) ## 00000002 -/* 209E8 80852BF8 AC600000 */ sw $zero, 0x0000($v1) ## 80858AA0 -/* 209EC 80852BFC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80852C00: -/* 209F0 80852C00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 209F4 80852C04 03E00008 */ jr $ra -/* 209F8 80852C08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C0C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C0C.s deleted file mode 100644 index dd767b1f59..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C0C.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80852C0C -/* 209FC 80852C0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 20A00 80852C10 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 20A04 80852C14 10C1000A */ beq $a2, $at, .L80852C40 -/* 20A08 80852C18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 20A0C 80852C1C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 20A10 80852C20 10C10007 */ beq $a2, $at, .L80852C40 -/* 20A14 80852C24 24010031 */ addiu $at, $zero, 0x0031 ## $at = 00000031 -/* 20A18 80852C28 10C10005 */ beq $a2, $at, .L80852C40 -/* 20A1C 80852C2C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 20A20 80852C30 50C10004 */ beql $a2, $at, .L80852C44 -/* 20A24 80852C34 8FBF0014 */ lw $ra, 0x0014($sp) -/* 20A28 80852C38 0C20C8ED */ jal func_808323B4 -/* 20A2C 80852C3C 00000000 */ nop -.L80852C40: -/* 20A30 80852C40 8FBF0014 */ lw $ra, 0x0014($sp) -.L80852C44: -/* 20A34 80852C44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 20A38 80852C48 03E00008 */ jr $ra -/* 20A3C 80852C4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C50.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C50.s deleted file mode 100644 index bacad69cc7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C50.s +++ /dev/null @@ -1,135 +0,0 @@ -.rdata -glabel D_8085532C - .asciz "TOOL MODE=%d\n" - .balign 4 - -.text -glabel func_80852C50 -/* 20A40 80852C50 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 20A44 80852C54 AFBF001C */ sw $ra, 0x001C($sp) -/* 20A48 80852C58 AFB10018 */ sw $s1, 0x0018($sp) -/* 20A4C 80852C5C AFB00014 */ sw $s0, 0x0014($sp) -/* 20A50 80852C60 AFA40030 */ sw $a0, 0x0030($sp) -/* 20A54 80852C64 AFA60038 */ sw $a2, 0x0038($sp) -/* 20A58 80852C68 8C8F1D88 */ lw $t7, 0x1D88($a0) ## 00001D88 -/* 20A5C 80852C6C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 20A60 80852C70 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 20A64 80852C74 AFAF002C */ sw $t7, 0x002C($sp) -/* 20A68 80852C78 90981D6C */ lbu $t8, 0x1D6C($a0) ## 00001D6C -/* 20A6C 80852C7C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 20A70 80852C80 8FB9002C */ lw $t9, 0x002C($sp) -/* 20A74 80852C84 14D80008 */ bne $a2, $t8, .L80852CA8 -/* 20A78 80852C88 00000000 */ nop -/* 20A7C 80852C8C 0C00B7D5 */ jal func_8002DF54 -/* 20A80 80852C90 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 20A84 80852C94 A2200446 */ sb $zero, 0x0446($s1) ## 00000446 -/* 20A88 80852C98 0C20C884 */ jal func_80832210 -/* 20A8C 80852C9C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 20A90 80852CA0 10000058 */ beq $zero, $zero, .L80852E04 -/* 20A94 80852CA4 8FBF001C */ lw $ra, 0x001C($sp) -.L80852CA8: -/* 20A98 80852CA8 17200006 */ bne $t9, $zero, .L80852CC4 -/* 20A9C 80852CAC 8FAA002C */ lw $t2, 0x002C($sp) -/* 20AA0 80852CB0 8E280004 */ lw $t0, 0x0004($s1) ## 00000004 -/* 20AA4 80852CB4 2401FFBF */ addiu $at, $zero, 0xFFBF ## $at = FFFFFFBF -/* 20AA8 80852CB8 01014824 */ and $t1, $t0, $at -/* 20AAC 80852CBC 10000050 */ beq $zero, $zero, .L80852E00 -/* 20AB0 80852CC0 AE290004 */ sw $t1, 0x0004($s1) ## 00000004 -.L80852CC4: -/* 20AB4 80852CC4 95430000 */ lhu $v1, 0x0000($t2) ## 00000000 -/* 20AB8 80852CC8 92220446 */ lbu $v0, 0x0446($s1) ## 00000446 -/* 20ABC 80852CCC 3C078085 */ lui $a3, %hi(D_808547C4) ## $a3 = 80850000 -/* 20AC0 80852CD0 00E33821 */ addu $a3, $a3, $v1 -/* 20AC4 80852CD4 1062003B */ beq $v1, $v0, .L80852DC4 -/* 20AC8 80852CD8 00000000 */ nop -/* 20ACC 80852CDC 80E747C4 */ lb $a3, %lo(D_808547C4)($a3) -/* 20AD0 80852CE0 04E20012 */ bltzl $a3, .L80852D2C -/* 20AD4 80852CE4 922B01E9 */ lbu $t3, 0x01E9($s1) ## 000001E9 -/* 20AD8 80852CE8 10E60003 */ beq $a3, $a2, .L80852CF8 -/* 20ADC 80852CEC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 20AE0 80852CF0 14E10008 */ bne $a3, $at, .L80852D14 -/* 20AE4 80852CF4 8FA40030 */ lw $a0, 0x0030($sp) -.L80852CF8: -/* 20AE8 80852CF8 8FA40030 */ lw $a0, 0x0030($sp) -/* 20AEC 80852CFC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 20AF0 80852D00 8FA6002C */ lw $a2, 0x002C($sp) -/* 20AF4 80852D04 0C214A95 */ jal func_80852A54 -/* 20AF8 80852D08 AFA70024 */ sw $a3, 0x0024($sp) -/* 20AFC 80852D0C 10000006 */ beq $zero, $zero, .L80852D28 -/* 20B00 80852D10 8FA70024 */ lw $a3, 0x0024($sp) -.L80852D14: -/* 20B04 80852D14 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 20B08 80852D18 8FA6002C */ lw $a2, 0x002C($sp) -/* 20B0C 80852D1C 0C214A74 */ jal func_808529D0 -/* 20B10 80852D20 AFA70024 */ sw $a3, 0x0024($sp) -/* 20B14 80852D24 8FA70024 */ lw $a3, 0x0024($sp) -.L80852D28: -/* 20B18 80852D28 922B01E9 */ lbu $t3, 0x01E9($s1) ## 000001E9 -.L80852D2C: -/* 20B1C 80852D2C 3C018086 */ lui $at, %hi(D_80858AA0) ## $at = 80860000 -/* 20B20 80852D30 AFA70024 */ sw $a3, 0x0024($sp) -/* 20B24 80852D34 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 20B28 80852D38 0C20CB6F */ jal func_80832DBC -/* 20B2C 80852D3C AC2B8AA0 */ sw $t3, %lo(D_80858AA0)($at) -/* 20B30 80852D40 3C048085 */ lui $a0, %hi(D_8085532C) ## $a0 = 80850000 -/* 20B34 80852D44 8FA50024 */ lw $a1, 0x0024($sp) -/* 20B38 80852D48 0C00084C */ jal osSyncPrintf - -/* 20B3C 80852D4C 2484532C */ addiu $a0, $a0, %lo(D_8085532C) ## $a0 = 8085532C -/* 20B40 80852D50 8FA70024 */ lw $a3, 0x0024($sp) -/* 20B44 80852D54 8FA40030 */ lw $a0, 0x0030($sp) -/* 20B48 80852D58 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 20B4C 80852D5C 04E00003 */ bltz $a3, .L80852D6C -/* 20B50 80852D60 00078023 */ subu $s0, $zero, $a3 -/* 20B54 80852D64 10000001 */ beq $zero, $zero, .L80852D6C -/* 20B58 80852D68 00E08025 */ or $s0, $a3, $zero ## $s0 = 00000000 -.L80852D6C: -/* 20B5C 80852D6C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 20B60 80852D70 0C214B03 */ jal func_80852C0C -/* 20B64 80852D74 AFA70024 */ sw $a3, 0x0024($sp) -/* 20B68 80852D78 8FA70024 */ lw $a3, 0x0024($sp) -/* 20B6C 80852D7C 8FA40030 */ lw $a0, 0x0030($sp) -/* 20B70 80852D80 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 20B74 80852D84 04E00003 */ bltz $a3, .L80852D94 -/* 20B78 80852D88 8FA6002C */ lw $a2, 0x002C($sp) -/* 20B7C 80852D8C 10000002 */ beq $zero, $zero, .L80852D98 -/* 20B80 80852D90 00E08025 */ or $s0, $a3, $zero ## $s0 = 00000000 -.L80852D94: -/* 20B84 80852D94 00078023 */ subu $s0, $zero, $a3 -.L80852D98: -/* 20B88 80852D98 3C0D8085 */ lui $t5, %hi(D_80854B18) ## $t5 = 80850000 -/* 20B8C 80852D9C 25AD4B18 */ addiu $t5, $t5, %lo(D_80854B18) ## $t5 = 80854B18 -/* 20B90 80852DA0 001060C0 */ sll $t4, $s0, 3 -/* 20B94 80852DA4 0C214AD3 */ jal func_80852B4C -/* 20B98 80852DA8 018D3821 */ addu $a3, $t4, $t5 -/* 20B9C 80852DAC A6200850 */ sh $zero, 0x0850($s1) ## 00000850 -/* 20BA0 80852DB0 A220084F */ sb $zero, 0x084F($s1) ## 0000084F -/* 20BA4 80852DB4 8FAF002C */ lw $t7, 0x002C($sp) -/* 20BA8 80852DB8 95F80000 */ lhu $t8, 0x0000($t7) ## 00000000 -/* 20BAC 80852DBC A2380446 */ sb $t8, 0x0446($s1) ## 00000446 -/* 20BB0 80852DC0 330200FF */ andi $v0, $t8, 0x00FF ## $v0 = 00000000 -.L80852DC4: -/* 20BB4 80852DC4 3C078085 */ lui $a3, %hi(D_808547C4) ## $a3 = 80850000 -/* 20BB8 80852DC8 00E23821 */ addu $a3, $a3, $v0 -/* 20BBC 80852DCC 80E747C4 */ lb $a3, %lo(D_808547C4)($a3) -/* 20BC0 80852DD0 8FA40030 */ lw $a0, 0x0030($sp) -/* 20BC4 80852DD4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 20BC8 80852DD8 04E00003 */ bltz $a3, .L80852DE8 -/* 20BCC 80852DDC 8FA6002C */ lw $a2, 0x002C($sp) -/* 20BD0 80852DE0 10000002 */ beq $zero, $zero, .L80852DEC -/* 20BD4 80852DE4 00E08025 */ or $s0, $a3, $zero ## $s0 = 80850000 -.L80852DE8: -/* 20BD8 80852DE8 00078023 */ subu $s0, $zero, $a3 -.L80852DEC: -/* 20BDC 80852DEC 3C198085 */ lui $t9, %hi(D_80854E50) ## $t9 = 80850000 -/* 20BE0 80852DF0 27394E50 */ addiu $t9, $t9, %lo(D_80854E50) ## $t9 = 80854E50 -/* 20BE4 80852DF4 001070C0 */ sll $t6, $s0, 3 -/* 20BE8 80852DF8 0C214AD3 */ jal func_80852B4C -/* 20BEC 80852DFC 01D93821 */ addu $a3, $t6, $t9 -.L80852E00: -/* 20BF0 80852E00 8FBF001C */ lw $ra, 0x001C($sp) -.L80852E04: -/* 20BF4 80852E04 8FB00014 */ lw $s0, 0x0014($sp) -/* 20BF8 80852E08 8FB10018 */ lw $s1, 0x0018($sp) -/* 20BFC 80852E0C 03E00008 */ jr $ra -/* 20C00 80852E10 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852E14.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852E14.s deleted file mode 100644 index 9e180490de..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852E14.s +++ /dev/null @@ -1,54 +0,0 @@ -.rdata -glabel D_8085533C - .asciz "DEMO MODE=%d\n" - .balign 4 - -.text -glabel func_80852E14 -/* 20C04 80852E14 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 20C08 80852E18 AFBF001C */ sw $ra, 0x001C($sp) -/* 20C0C 80852E1C AFB00018 */ sw $s0, 0x0018($sp) -/* 20C10 80852E20 AFA50024 */ sw $a1, 0x0024($sp) -/* 20C14 80852E24 908E0445 */ lbu $t6, 0x0445($a0) ## 00000445 -/* 20C18 80852E28 90820444 */ lbu $v0, 0x0444($a0) ## 00000444 -/* 20C1C 80852E2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 20C20 80852E30 11C20018 */ beq $t6, $v0, .L80852E94 -/* 20C24 80852E34 00000000 */ nop -/* 20C28 80852E38 908F01E9 */ lbu $t7, 0x01E9($a0) ## 000001E9 -/* 20C2C 80852E3C 3C018086 */ lui $at, %hi(D_80858AA0) ## $at = 80860000 -/* 20C30 80852E40 0C20CB6F */ jal func_80832DBC -/* 20C34 80852E44 AC2F8AA0 */ sw $t7, %lo(D_80858AA0)($at) -/* 20C38 80852E48 92050444 */ lbu $a1, 0x0444($s0) ## 00000444 -/* 20C3C 80852E4C 3C048085 */ lui $a0, %hi(D_8085533C) ## $a0 = 80850000 -/* 20C40 80852E50 2484533C */ addiu $a0, $a0, %lo(D_8085533C) ## $a0 = 8085533C -/* 20C44 80852E54 0C00084C */ jal osSyncPrintf - -/* 20C48 80852E58 A2050445 */ sb $a1, 0x0445($s0) ## 00000445 -/* 20C4C 80852E5C 8FA40024 */ lw $a0, 0x0024($sp) -/* 20C50 80852E60 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 20C54 80852E64 0C214B03 */ jal func_80852C0C -/* 20C58 80852E68 92060444 */ lbu $a2, 0x0444($s0) ## 00000444 -/* 20C5C 80852E6C 92180444 */ lbu $t8, 0x0444($s0) ## 00000444 -/* 20C60 80852E70 3C088085 */ lui $t0, %hi(D_80854B18) ## $t0 = 80850000 -/* 20C64 80852E74 25084B18 */ addiu $t0, $t0, %lo(D_80854B18) ## $t0 = 80854B18 -/* 20C68 80852E78 0018C8C0 */ sll $t9, $t8, 3 -/* 20C6C 80852E7C 03283821 */ addu $a3, $t9, $t0 -/* 20C70 80852E80 8FA40024 */ lw $a0, 0x0024($sp) -/* 20C74 80852E84 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 20C78 80852E88 0C214AD3 */ jal func_80852B4C -/* 20C7C 80852E8C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 20C80 80852E90 92020444 */ lbu $v0, 0x0444($s0) ## 00000444 -.L80852E94: -/* 20C84 80852E94 3C0A8085 */ lui $t2, %hi(D_80854E50) ## $t2 = 80850000 -/* 20C88 80852E98 254A4E50 */ addiu $t2, $t2, %lo(D_80854E50) ## $t2 = 80854E50 -/* 20C8C 80852E9C 000248C0 */ sll $t1, $v0, 3 -/* 20C90 80852EA0 012A3821 */ addu $a3, $t1, $t2 -/* 20C94 80852EA4 8FA40024 */ lw $a0, 0x0024($sp) -/* 20C98 80852EA8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 20C9C 80852EAC 0C214AD3 */ jal func_80852B4C -/* 20CA0 80852EB0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 20CA4 80852EB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 20CA8 80852EB8 8FB00018 */ lw $s0, 0x0018($sp) -/* 20CAC 80852EBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 20CB0 80852EC0 03E00008 */ jr $ra -/* 20CB4 80852EC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EC8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EC8.s deleted file mode 100644 index 9f3d2ea1fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EC8.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80852EC8 -/* 20CB8 80852EC8 8C831C44 */ lw $v1, 0x1C44($a0) ## 00001C44 -/* 20CBC 80852ECC 3C0F8085 */ lui $t7, %hi(func_8084EFC0) ## $t7 = 80850000 -/* 20CC0 80852ED0 25EFEFC0 */ addiu $t7, $t7, %lo(func_8084EFC0) ## $t7 = 8084EFC0 -/* 20CC4 80852ED4 8C6E0674 */ lw $t6, 0x0674($v1) ## 00000674 -/* 20CC8 80852ED8 01CF1026 */ xor $v0, $t6, $t7 -/* 20CCC 80852EDC 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 20CD0 80852EE0 10400004 */ beq $v0, $zero, .L80852EF4 -/* 20CD4 80852EE4 00000000 */ nop -/* 20CD8 80852EE8 80620154 */ lb $v0, 0x0154($v1) ## 00000154 -/* 20CDC 80852EEC 3842001F */ xori $v0, $v0, 0x001F ## $v0 = 0000001F -/* 20CE0 80852EF0 2C420001 */ sltiu $v0, $v0, 0x0001 -.L80852EF4: -/* 20CE4 80852EF4 03E00008 */ jr $ra -/* 20CE8 80852EF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EFC.s deleted file mode 100644 index db47b08d61..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EFC.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80852EFC -/* 20CEC 80852EFC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 20CF0 80852F00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 20CF4 80852F04 8C851C44 */ lw $a1, 0x1C44($a0) ## 00001C44 -/* 20CF8 80852F08 AFA40020 */ sw $a0, 0x0020($sp) -/* 20CFC 80852F0C 0C20C959 */ jal func_80832564 -/* 20D00 80852F10 AFA5001C */ sw $a1, 0x001C($sp) -/* 20D04 80852F14 8FA40020 */ lw $a0, 0x0020($sp) -/* 20D08 80852F18 8FA5001C */ lw $a1, 0x001C($sp) -/* 20D0C 80852F1C 0C20D7D1 */ jal func_80835F44 -/* 20D10 80852F20 24060059 */ addiu $a2, $zero, 0x0059 ## $a2 = 00000059 -/* 20D14 80852F24 8FBF0014 */ lw $ra, 0x0014($sp) -/* 20D18 80852F28 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 20D1C 80852F2C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 20D20 80852F30 03E00008 */ jr $ra -/* 20D24 80852F34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852F38.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852F38.s deleted file mode 100644 index 1e8de07940..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852F38.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80852F38 -/* 20D28 80852F38 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 20D2C 80852F3C AFBF001C */ sw $ra, 0x001C($sp) -/* 20D30 80852F40 AFB00018 */ sw $s0, 0x0018($sp) -/* 20D34 80852F44 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 20D38 80852F48 0C023A37 */ jal func_8008E8DC -/* 20D3C 80852F4C AFA40020 */ sw $a0, 0x0020($sp) -/* 20D40 80852F50 54400025 */ bnel $v0, $zero, .L80852FE8 -/* 20D44 80852F54 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 20D48 80852F58 820E0A78 */ lb $t6, 0x0A78($s0) ## 00000A78 -/* 20D4C 80852F5C 05C20022 */ bltzl $t6, .L80852FE8 -/* 20D50 80852F60 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 20D54 80852F64 0C023C4A */ jal func_8008F128 -/* 20D58 80852F68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 20D5C 80852F6C 5440001E */ bnel $v0, $zero, .L80852FE8 -/* 20D60 80852F70 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 20D64 80852F74 920F0692 */ lbu $t7, 0x0692($s0) ## 00000692 -/* 20D68 80852F78 8FA40020 */ lw $a0, 0x0020($sp) -/* 20D6C 80852F7C 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 -/* 20D70 80852F80 57000019 */ bnel $t8, $zero, .L80852FE8 -/* 20D74 80852F84 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 20D78 80852F88 0C20C959 */ jal func_80832564 -/* 20D7C 80852F8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 20D80 80852F90 3C068085 */ lui $a2, %hi(func_8084F308) ## $a2 = 80850000 -/* 20D84 80852F94 24C6F308 */ addiu $a2, $a2, %lo(func_8084F308) ## $a2 = 8084F308 -/* 20D88 80852F98 8FA40020 */ lw $a0, 0x0020($sp) -/* 20D8C 80852F9C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 20D90 80852FA0 0C20D716 */ jal func_80835C58 -/* 20D94 80852FA4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 20D98 80852FA8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 20D9C 80852FAC 24C63120 */ addiu $a2, $a2, 0x3120 ## $a2 = 04003120 -/* 20DA0 80852FB0 8FA40020 */ lw $a0, 0x0020($sp) -/* 20DA4 80852FB4 0C20C899 */ jal func_80832264 -/* 20DA8 80852FB8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 20DAC 80852FBC 8E190680 */ lw $t9, 0x0680($s0) ## 00000680 -/* 20DB0 80852FC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 20DB4 80852FC4 37280080 */ ori $t0, $t9, 0x0080 ## $t0 = 00000080 -/* 20DB8 80852FC8 0C20C889 */ jal func_80832224 -/* 20DBC 80852FCC AE080680 */ sw $t0, 0x0680($s0) ## 00000680 -/* 20DC0 80852FD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 20DC4 80852FD4 0C20C9A6 */ jal func_80832698 -/* 20DC8 80852FD8 2405680D */ addiu $a1, $zero, 0x680D ## $a1 = 0000680D -/* 20DCC 80852FDC 10000002 */ beq $zero, $zero, .L80852FE8 -/* 20DD0 80852FE0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 20DD4 80852FE4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80852FE8: -/* 20DD8 80852FE8 8FBF001C */ lw $ra, 0x001C($sp) -/* 20DDC 80852FEC 8FB00018 */ lw $s0, 0x0018($sp) -/* 20DE0 80852FF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 20DE4 80852FF4 03E00008 */ jr $ra -/* 20DE8 80852FF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852FFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852FFC.s deleted file mode 100644 index d8a193babc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80852FFC.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80852FFC -/* 20DEC 80852FFC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 20DF0 80853000 AFBF001C */ sw $ra, 0x001C($sp) -/* 20DF4 80853004 AFB00018 */ sw $s0, 0x0018($sp) -/* 20DF8 80853008 AFA50024 */ sw $a1, 0x0024($sp) -/* 20DFC 8085300C AFA60028 */ sw $a2, 0x0028($sp) -/* 20E00 80853010 8C901C44 */ lw $s0, 0x1C44($a0) ## 00001C44 -/* 20E04 80853014 AFA40020 */ sw $a0, 0x0020($sp) -/* 20E08 80853018 0C023A37 */ jal func_8008E8DC -/* 20E0C 8085301C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 20E10 80853020 14400011 */ bne $v0, $zero, .L80853068 -/* 20E14 80853024 8FA40020 */ lw $a0, 0x0020($sp) -/* 20E18 80853028 0C20C959 */ jal func_80832564 -/* 20E1C 8085302C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 20E20 80853030 3C068085 */ lui $a2, %hi(func_80852E14) ## $a2 = 80850000 -/* 20E24 80853034 24C62E14 */ addiu $a2, $a2, %lo(func_80852E14) ## $a2 = 80852E14 -/* 20E28 80853038 8FA40020 */ lw $a0, 0x0020($sp) -/* 20E2C 8085303C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 20E30 80853040 0C20D716 */ jal func_80835C58 -/* 20E34 80853044 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 20E38 80853048 8FAE0028 */ lw $t6, 0x0028($sp) -/* 20E3C 8085304C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 20E40 80853050 A20E0444 */ sb $t6, 0x0444($s0) ## 00000444 -/* 20E44 80853054 8FAF0024 */ lw $t7, 0x0024($sp) -/* 20E48 80853058 0C20C889 */ jal func_80832224 -/* 20E4C 8085305C AE0F0448 */ sw $t7, 0x0448($s0) ## 00000448 -/* 20E50 80853060 10000002 */ beq $zero, $zero, .L8085306C -/* 20E54 80853064 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80853068: -/* 20E58 80853068 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L8085306C: -/* 20E5C 8085306C 8FBF001C */ lw $ra, 0x001C($sp) -/* 20E60 80853070 8FB00018 */ lw $s0, 0x0018($sp) -/* 20E64 80853074 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 20E68 80853078 03E00008 */ jr $ra -/* 20E6C 8085307C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80853080.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80853080.s deleted file mode 100644 index 1c1d3d6986..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80853080.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80853080 -/* 20E70 80853080 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 20E74 80853084 AFB00018 */ sw $s0, 0x0018($sp) -/* 20E78 80853088 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 20E7C 8085308C AFBF001C */ sw $ra, 0x001C($sp) -/* 20E80 80853090 AFA50024 */ sw $a1, 0x0024($sp) -/* 20E84 80853094 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 20E88 80853098 3C068084 */ lui $a2, %hi(func_80840BC8) ## $a2 = 80840000 -/* 20E8C 8085309C 24C60BC8 */ addiu $a2, $a2, %lo(func_80840BC8) ## $a2 = 80840BC8 -/* 20E90 808530A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 20E94 808530A4 0C20D716 */ jal func_80835C58 -/* 20E98 808530A8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 20E9C 808530AC 0C20CCCE */ jal func_80833338 -/* 20EA0 808530B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 20EA4 808530B4 8FA40024 */ lw $a0, 0x0024($sp) -/* 20EA8 808530B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 20EAC 808530BC 0C20CAC3 */ jal func_80832B0C -/* 20EB0 808530C0 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 20EB4 808530C4 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 20EB8 808530C8 A60E083C */ sh $t6, 0x083C($s0) ## 0000083C -/* 20EBC 808530CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 20EC0 808530D0 8FB00018 */ lw $s0, 0x0018($sp) -/* 20EC4 808530D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 20EC8 808530D8 03E00008 */ jr $ra -/* 20ECC 808530DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808530E0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808530E0.s deleted file mode 100644 index 5e01a93988..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808530E0.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_808530E0 -/* 20ED0 808530E0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 20ED4 808530E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 20ED8 808530E8 AFA50024 */ sw $a1, 0x0024($sp) -/* 20EDC 808530EC 8C851C44 */ lw $a1, 0x1C44($a0) ## 00001C44 -/* 20EE0 808530F0 AFA40020 */ sw $a0, 0x0020($sp) -/* 20EE4 808530F4 0C023A37 */ jal func_8008E8DC -/* 20EE8 808530F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 20EEC 808530FC 8FA40020 */ lw $a0, 0x0020($sp) -/* 20EF0 80853100 1440000C */ bne $v0, $zero, .L80853134 -/* 20EF4 80853104 8FA5001C */ lw $a1, 0x001C($sp) -/* 20EF8 80853108 8FA60024 */ lw $a2, 0x0024($sp) -/* 20EFC 8085310C 0C20DEC6 */ jal func_80837B18 -/* 20F00 80853110 AFA5001C */ sw $a1, 0x001C($sp) -/* 20F04 80853114 14400007 */ bne $v0, $zero, .L80853134 -/* 20F08 80853118 8FA5001C */ lw $a1, 0x001C($sp) -/* 20F0C 8085311C 8CAE0680 */ lw $t6, 0x0680($a1) ## 00000680 -/* 20F10 80853120 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 20F14 80853124 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 20F18 80853128 01C17824 */ and $t7, $t6, $at -/* 20F1C 8085312C 10000002 */ beq $zero, $zero, .L80853138 -/* 20F20 80853130 ACAF0680 */ sw $t7, 0x0680($a1) ## 00000680 -.L80853134: -/* 20F24 80853134 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80853138: -/* 20F28 80853138 8FBF0014 */ lw $ra, 0x0014($sp) -/* 20F2C 8085313C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 20F30 80853140 03E00008 */ jr $ra -/* 20F34 80853144 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80853148.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80853148.s deleted file mode 100644 index fc0ddd824b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80853148.s +++ /dev/null @@ -1,196 +0,0 @@ -glabel func_80853148 -/* 20F38 80853148 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 20F3C 8085314C AFBF001C */ sw $ra, 0x001C($sp) -/* 20F40 80853150 AFB00018 */ sw $s0, 0x0018($sp) -/* 20F44 80853154 AFA40030 */ sw $a0, 0x0030($sp) -/* 20F48 80853158 8C901C44 */ lw $s0, 0x1C44($a0) ## 00001C44 -/* 20F4C 8085315C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 20F50 80853160 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 20F54 80853164 8E0F0694 */ lw $t7, 0x0694($s0) ## 00000694 -/* 20F58 80853168 55E0000B */ bnel $t7, $zero, .L80853198 -/* 20F5C 8085316C 8CE90004 */ lw $t1, 0x0004($a3) ## 00000004 -/* 20F60 80853170 8E18068C */ lw $t8, 0x068C($s0) ## 0000068C -/* 20F64 80853174 50B80008 */ beql $a1, $t8, .L80853198 -/* 20F68 80853178 8CE90004 */ lw $t1, 0x0004($a3) ## 00000004 -/* 20F6C 8085317C 8CB90004 */ lw $t9, 0x0004($a1) ## 00000004 -/* 20F70 80853180 3C020004 */ lui $v0, 0x0004 ## $v0 = 00040000 -/* 20F74 80853184 34420001 */ ori $v0, $v0, 0x0001 ## $v0 = 00040001 -/* 20F78 80853188 03224024 */ and $t0, $t9, $v0 -/* 20F7C 8085318C 54480005 */ bnel $v0, $t0, .L808531A4 -/* 20F80 80853190 AE070694 */ sw $a3, 0x0694($s0) ## 00000694 -/* 20F84 80853194 8CE90004 */ lw $t1, 0x0004($a3) ## 00000004 -.L80853198: -/* 20F88 80853198 352A0100 */ ori $t2, $t1, 0x0100 ## $t2 = 00000100 -/* 20F8C 8085319C ACEA0004 */ sw $t2, 0x0004($a3) ## 00000004 -/* 20F90 808531A0 AE070694 */ sw $a3, 0x0694($s0) ## 00000694 -.L808531A4: -/* 20F94 808531A4 A2000693 */ sb $zero, 0x0693($s0) ## 00000693 -/* 20F98 808531A8 94EB010E */ lhu $t3, 0x010E($a3) ## 0000010E -/* 20F9C 808531AC 3401FFFF */ ori $at, $zero, 0xFFFF ## $at = 0000FFFF -/* 20FA0 808531B0 8FA40030 */ lw $a0, 0x0030($sp) -/* 20FA4 808531B4 1561000C */ bne $t3, $at, .L808531E8 -/* 20FA8 808531B8 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 20FAC 808531BC 0C00B7D5 */ jal func_8002DF54 -/* 20FB0 808531C0 AFA70034 */ sw $a3, 0x0034($sp) -/* 20FB4 808531C4 8FA70034 */ lw $a3, 0x0034($sp) -/* 20FB8 808531C8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 20FBC 808531CC 8CEC0004 */ lw $t4, 0x0004($a3) ## 00000004 -/* 20FC0 808531D0 358D0100 */ ori $t5, $t4, 0x0100 ## $t5 = 00000100 -/* 20FC4 808531D4 ACED0004 */ sw $t5, 0x0004($a3) ## 00000004 -/* 20FC8 808531D8 0C20C94A */ jal func_80832528 -/* 20FCC 808531DC 8FA40030 */ lw $a0, 0x0030($sp) -/* 20FD0 808531E0 10000075 */ beq $zero, $zero, .L808533B8 -/* 20FD4 808531E4 8E030694 */ lw $v1, 0x0694($s0) ## 00000694 -.L808531E8: -/* 20FD8 808531E8 8E020004 */ lw $v0, 0x0004($s0) ## 00000004 -/* 20FDC 808531EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 20FE0 808531F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 20FE4 808531F4 304E0100 */ andi $t6, $v0, 0x0100 ## $t6 = 00000000 -/* 20FE8 808531F8 11C00003 */ beq $t6, $zero, .L80853208 -/* 20FEC 808531FC 344F0100 */ ori $t7, $v0, 0x0100 ## $t7 = 00000100 -/* 20FF0 80853200 10000004 */ beq $zero, $zero, .L80853214 -/* 20FF4 80853204 A600010E */ sh $zero, 0x010E($s0) ## 0000010E -.L80853208: -/* 20FF8 80853208 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 20FFC 8085320C 94F8010E */ lhu $t8, 0x010E($a3) ## 0000010E -/* 21000 80853210 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -.L80853214: -/* 21004 80853214 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C -/* 21008 80853218 00194200 */ sll $t0, $t9, 8 -/* 2100C 8085321C 0501000B */ bgez $t0, .L8085324C -/* 21010 80853220 00000000 */ nop -/* 21014 80853224 86090850 */ lh $t1, 0x0850($s0) ## 00000850 -/* 21018 80853228 8FA40030 */ lw $a0, 0x0030($sp) -/* 2101C 8085322C 0C20C94A */ jal func_80832528 -/* 21020 80853230 AFA90024 */ sw $t1, 0x0024($sp) -/* 21024 80853234 8FA40030 */ lw $a0, 0x0030($sp) -/* 21028 80853238 0C20E8BE */ jal func_8083A2F8 -/* 2102C 8085323C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 21030 80853240 8FAA0024 */ lw $t2, 0x0024($sp) -/* 21034 80853244 10000056 */ beq $zero, $zero, .L808533A0 -/* 21038 80853248 A60A0850 */ sh $t2, 0x0850($s0) ## 00000850 -.L8085324C: -/* 2103C 8085324C 0C20CCAE */ jal func_808332B8 -/* 21040 80853250 AFA70034 */ sw $a3, 0x0034($sp) -/* 21044 80853254 1040000D */ beq $v0, $zero, .L8085328C -/* 21048 80853258 8FA70034 */ lw $a3, 0x0034($sp) -/* 2104C 8085325C 3C068084 */ lui $a2, %hi(func_8083A2F8) ## $a2 = 80840000 -/* 21050 80853260 24C6A2F8 */ addiu $a2, $a2, %lo(func_8083A2F8) ## $a2 = 8083A2F8 -/* 21054 80853264 8FA40030 */ lw $a0, 0x0030($sp) -/* 21058 80853268 0C20DA26 */ jal func_80836898 -/* 2105C 8085326C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 21060 80853270 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 21064 80853274 24C63328 */ addiu $a2, $a2, 0x3328 ## $a2 = 04003328 -/* 21068 80853278 8FA40030 */ lw $a0, 0x0030($sp) -/* 2106C 8085327C 0C20CB1B */ jal func_80832C6C -/* 21070 80853280 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 21074 80853284 1000003D */ beq $zero, $zero, .L8085337C -/* 21078 80853288 8E0F01BC */ lw $t7, 0x01BC($s0) ## 000001BC -.L8085328C: -/* 2107C 8085328C 90EB0002 */ lbu $t3, 0x0002($a3) ## 00000002 -/* 21080 80853290 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 21084 80853294 8FA40030 */ lw $a0, 0x0030($sp) -/* 21088 80853298 15610006 */ bne $t3, $at, .L808532B4 -/* 2108C 8085329C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 21090 808532A0 820C0151 */ lb $t4, 0x0151($s0) ## 00000151 -/* 21094 808532A4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 21098 808532A8 3C068084 */ lui $a2, %hi(func_8083A2F8) ## $a2 = 80840000 -/* 2109C 808532AC 1581001F */ bne $t4, $at, .L8085332C -/* 210A0 808532B0 24C6A2F8 */ addiu $a2, $a2, %lo(func_8083A2F8) ## $a2 = 8083A2F8 -.L808532B4: -/* 210A4 808532B4 0C20E8BE */ jal func_8083A2F8 -/* 210A8 808532B8 AFA70034 */ sw $a3, 0x0034($sp) -/* 210AC 808532BC 0C023A71 */ jal func_8008E9C4 -/* 210B0 808532C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 210B4 808532C4 1440002C */ bne $v0, $zero, .L80853378 -/* 210B8 808532C8 8FA70034 */ lw $a3, 0x0034($sp) -/* 210BC 808532CC 8E0D068C */ lw $t5, 0x068C($s0) ## 0000068C -/* 210C0 808532D0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 210C4 808532D4 10ED000D */ beq $a3, $t5, .L8085330C -/* 210C8 808532D8 00000000 */ nop -/* 210CC 808532DC C4E40090 */ lwc1 $f4, 0x0090($a3) ## 00000090 -/* 210D0 808532E0 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 210D4 808532E4 8FA40030 */ lw $a0, 0x0030($sp) -/* 210D8 808532E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 210DC 808532EC 4606203C */ c.lt.s $f4, $f6 -/* 210E0 808532F0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 210E4 808532F4 45000005 */ bc1f .L8085330C -/* 210E8 808532F8 00000000 */ nop -/* 210EC 808532FC 0C20C8B4 */ jal func_808322D0 -/* 210F0 80853300 24C62DF0 */ addiu $a2, $a2, 0x2DF0 ## $a2 = 04002DF0 -/* 210F4 80853304 1000001D */ beq $zero, $zero, .L8085337C -/* 210F8 80853308 8E0F01BC */ lw $t7, 0x01BC($s0) ## 000001BC -.L8085330C: -/* 210FC 8085330C 0C20CCCE */ jal func_80833338 -/* 21100 80853310 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 21104 80853314 8FA40030 */ lw $a0, 0x0030($sp) -/* 21108 80853318 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 2110C 8085331C 0C20C8A1 */ jal func_80832284 -/* 21110 80853320 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 21114 80853324 10000015 */ beq $zero, $zero, .L8085337C -/* 21118 80853328 8E0F01BC */ lw $t7, 0x01BC($s0) ## 000001BC -.L8085332C: -/* 2111C 8085332C 8FA40030 */ lw $a0, 0x0030($sp) -/* 21120 80853330 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 21124 80853334 0C20DA26 */ jal func_80836898 -/* 21128 80853338 AFA70034 */ sw $a3, 0x0034($sp) -/* 2112C 8085333C 8FA70034 */ lw $a3, 0x0034($sp) -/* 21130 80853340 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 21134 80853344 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 21138 80853348 C4E80090 */ lwc1 $f8, 0x0090($a3) ## 00000090 -/* 2113C 8085334C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 21140 80853350 24C631A0 */ addiu $a2, $a2, 0x31A0 ## $a2 = 040031A0 -/* 21144 80853354 460A403C */ c.lt.s $f8, $f10 -/* 21148 80853358 8FA40030 */ lw $a0, 0x0030($sp) -/* 2114C 8085335C 45000004 */ bc1f .L80853370 -/* 21150 80853360 00000000 */ nop -/* 21154 80853364 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 21158 80853368 10000001 */ beq $zero, $zero, .L80853370 -/* 2115C 8085336C 24C62DF0 */ addiu $a2, $a2, 0x2DF0 ## $a2 = 04002DF0 -.L80853370: -/* 21160 80853370 0C20C8B4 */ jal func_808322D0 -/* 21164 80853374 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L80853378: -/* 21168 80853378 8E0F01BC */ lw $t7, 0x01BC($s0) ## 000001BC -.L8085337C: -/* 2116C 8085337C 3C0E0400 */ lui $t6, 0x0400 ## $t6 = 04000000 -/* 21170 80853380 25CE2DF0 */ addiu $t6, $t6, 0x2DF0 ## $t6 = 04002DF0 -/* 21174 80853384 15CF0004 */ bne $t6, $t7, .L80853398 -/* 21178 80853388 8FA40030 */ lw $a0, 0x0030($sp) -/* 2117C 8085338C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 21180 80853390 0C20CBD5 */ jal func_80832F54 -/* 21184 80853394 24060019 */ addiu $a2, $zero, 0x0019 ## $a2 = 00000019 -.L80853398: -/* 21188 80853398 0C20C889 */ jal func_80832224 -/* 2118C 8085339C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808533A0: -/* 21190 808533A0 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 21194 808533A4 3C012000 */ lui $at, 0x2000 ## $at = 20000000 -/* 21198 808533A8 34210040 */ ori $at, $at, 0x0040 ## $at = 20000040 -/* 2119C 808533AC 0301C825 */ or $t9, $t8, $at ## $t9 = 20000040 -/* 211A0 808533B0 AE19067C */ sw $t9, 0x067C($s0) ## 0000067C -/* 211A4 808533B4 8E030694 */ lw $v1, 0x0694($s0) ## 00000694 -.L808533B8: -/* 211A8 808533B8 8E02068C */ lw $v0, 0x068C($s0) ## 0000068C -/* 211AC 808533BC 5462000D */ bnel $v1, $v0, .L808533F4 -/* 211B0 808533C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 211B4 808533C4 9468010E */ lhu $t0, 0x010E($v1) ## 0000010E -/* 211B8 808533C8 24010200 */ addiu $at, $zero, 0x0200 ## $at = 00000200 -/* 211BC 808533CC 3109FF00 */ andi $t1, $t0, 0xFF00 ## $t1 = 00000000 -/* 211C0 808533D0 51210008 */ beql $t1, $at, .L808533F4 -/* 211C4 808533D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 211C8 808533D8 8C4A0004 */ lw $t2, 0x0004($v0) ## 00000004 -/* 211CC 808533DC 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B -/* 211D0 808533E0 354B0100 */ ori $t3, $t2, 0x0100 ## $t3 = 00000100 -/* 211D4 808533E4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 211D8 808533E8 0C20D7A9 */ jal func_80835EA4 -/* 211DC 808533EC 8FA40030 */ lw $a0, 0x0030($sp) -/* 211E0 808533F0 8FBF001C */ lw $ra, 0x001C($sp) -.L808533F4: -/* 211E4 808533F4 8FB00018 */ lw $s0, 0x0018($sp) -/* 211E8 808533F8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 211EC 808533FC 03E00008 */ jr $ra -/* 211F0 80853400 00000000 */ nop -/* 211F4 80853404 00000000 */ nop -/* 211F8 80853408 00000000 */ nop -/* 211FC 8085340C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s index 6ba7a383b9..89e71a6de8 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s @@ -116,10 +116,10 @@ glabel func_809AC42C /* 002BC 809AC58C 01EE7821 */ addu $t7, $t7, $t6 /* 002C0 809AC590 8DEF17B4 */ lw $t7, 0x17B4($t7) ## 000117B4 /* 002C4 809AC594 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 002C8 809AC598 3C088012 */ lui $t0, %hi(D_80125F98) +/* 002C8 809AC598 3C088012 */ lui $t0, %hi(gCullBackDList) /* 002CC 809AC59C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 002D0 809AC5A0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 002D4 809AC5A4 25085F98 */ addiu $t0, %lo(D_80125F98) +/* 002D4 809AC5A4 25085F98 */ addiu $t0, %lo(gCullBackDList) /* 002D8 809AC5A8 37390030 */ ori $t9, $t9, 0x0030 ## $t9 = DB060030 /* 002DC 809AC5AC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 002E0 809AC5B0 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 diff --git a/data/overlays/actors/z_player.bss.s b/data/overlays/actors/z_player.bss.s deleted file mode 100644 index ea7619f5c6..0000000000 --- a/data/overlays/actors/z_player.bss.s +++ /dev/null @@ -1,30 +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 .bss - -.balign 16 - -glabel D_80858AA0 - .space 0x04 -glabel D_80858AA4 - .space 0x04 -glabel D_80858AA8 - .space 0x0C -glabel D_80858AB4 - .space 0x04 -glabel D_80858AB8 - .space 0x04 -glabel D_80858ABC - .space 0x04 -glabel D_80858AC0 - .space 0x08 -glabel D_80858AC8 - .space 0x10 -glabel D_80858AD8 - .space 0x98 - \ No newline at end of file diff --git a/data/overlays/actors/z_player.data.s b/data/overlays/actors/z_player.data.s deleted file mode 100644 index cce1d1ed43..0000000000 --- a/data/overlays/actors/z_player.data.s +++ /dev/null @@ -1,827 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_80853410 - .word 0x00000000, 0x00000000, 0x00000101, 0x01010101, 0x01010101, 0x01010000 -glabel D_80853428 - .word 0x42600000, 0x42B40000, 0x3F800000, 0x42DE0000, 0x428C0000, 0x429ECCCD, 0x426C0000, 0x42240000, 0x41980000, 0x42100000, 0x42333333, 0x42600000, 0x42880000, 0x428C0000, 0x41900000, 0x41700000, 0x428C0000, 0x0009123F, 0x01670008, 0x1256017C, 0x000917EA, 0x01670008, 0x1256017C, 0x000917EA, 0x01670009, 0x17EA0167, 0x00091E0D, 0x017C0009, 0x17EA0167, 0x00091E0D, 0x017C0008, 0x1256017C, 0x000917EA, 0x0167F9C8, 0x1256017C, 0xF9C917EA, 0x01670000, 0x00800000, 0x04002718, 0x04002720, 0x04002838, 0x04002E70, 0x04002E78, 0x04002E80, 0x04002E88, 0x04002D90, 0x04002D98, 0x04002D70, 0x04002D78, 0x04002E50, 0x04002E58, 0x04002E68, 0x04002E60, 0x42200000, 0x42700000, 0x3F25A5A6, 0x428E0000, 0x42480000, 0x423C0000, 0x421C0000, 0x41D80000, 0x41980000, 0x41B00000, 0x41ECCCCD, 0x42000000, 0x42400000, 0x42352D2E, 0x41600000, 0x41400000, 0x425C0000, 0xFFE80DED, 0x036CFFE8, 0x0D92035E, 0xFFE81371, 0x03A90008, 0x1256017C, 0x000917EA, 0x0167FFE8, 0x137103A9, 0xFFE8195F, 0x03A90009, 0x17EA0167, 0x00091E0D, 0x017C0008, 0x1256017C, 0x000917EA, 0x0167F9C8, 0x1256017C, 0xF9C917EA, 0x01670020, 0x00000000, 0x04002318, 0x04002360, 0x040023A8, 0x040023E0, 0x040023E8, 0x040023F0, 0x040023F8, 0x04002D90, 0x04002D98, 0x04002D70, 0x04002D78, 0x040023C0, 0x040023C8, 0x040023D8, 0x040023D0 -glabel D_808535D0 - .word 0x00000000 -glabel D_808535D4 - .word 0x00000000 -glabel D_808535D8 - .word 0x00000000 -glabel D_808535DC - .word 0x00000000 -glabel D_808535E0 - .word 0x00000000 -glabel D_808535E4 - .word 0x00000000 -glabel D_808535E8 - .word 0x3F800000 -glabel D_808535EC - .word 0x3F800000 -glabel D_808535F0 - .word 0x00000000 -glabel D_808535F4 - .word 0x00000000 -glabel D_808535F8 - .word 0x00000000 -glabel D_808535FC - .word 0x00000000 -glabel D_80853600 - .word 0x00000000 -glabel D_80853604 - .word 0x00000000 -glabel D_80853608 - .word 0x00000000 -glabel D_8085360C - .word 0x00000000 -glabel D_80853610 - .word 0x00000000 -glabel D_80853614 - .word 0x00000000 -glabel D_80853618 - .word 0x00000000 -glabel D_8085361C - .word 0x680F680E, 0x68116808 -glabel D_80853624 - .word 0x8E59E032, 0x00CE8C0C, 0xEE3400BB, 0x0980D833, 0x00D90380, 0x353100E9, 0x06803330, 0x00E70E80, 0x343500E8, 0x000DE537, 0x00C70A80, 0x2D3600DD, 0x0B802E4F, 0x00DD0F80, 0x363900EA, 0x23803B69, 0x00EF0880, 0x2F3A00DE, 0x11804138, 0x00F62F80, 0x5E020109, 0x14800142, 0x00C61580, 0x384300EB, 0x16803744, 0x00EB1780, 0x394500EB, 0x18800146, 0x00C61A80, 0x309800DF, 0x1B804599, 0x010B1080, 0xC24800F3, 0x25804F10, 0x01362680, 0x32110135, 0x22804448, 0x01092480, 0x31120134, 0x27805013, 0x01372B80, 0x51170138, 0x2D802901, 0x00DA2E80, 0x44480109, 0x30805403, 0x01413180, 0x53040140, 0x32804005, 0x00F53380, 0x56080143, 0x34805709, 0x01463580, 0x5A0D0149, 0x3680520E, 0x013F3780, 0x550A0142, 0x3B8074A4, 0x018D3D80, 0x434B00F8, 0x3EA0E34C, 0x00CB3FA0, 0xD44D00DC, 0x40803A4E, 0x00EE42A0, 0x3C5000F2, 0x43A03D51, 0x00F24580, 0x47530118, 0x46805F54, 0x01574B80, 0x165600BE, 0x4C801757, 0x00BE4D80, 0x185800BF, 0x4E801959, 0x00BF4F80, 0x1A5A00BF, 0x5180495B, 0x012D5280, 0x4A5C012D, 0x53802ACD, 0x00DB5480, 0x2BCE00DB, 0x6F802168, 0x00C87080, 0x247B00D7, 0x0780463A, 0x010E5850, 0xB8DC0119, 0x728013C6, 0x00BD7A80, 0x14C200BD, 0x74800AC7, 0x00B97580, 0x0B6700B8, 0x76801C66, 0x00C87780, 0xFE6000AA, 0x786FE252, 0x00CD796E, 0xE15200CD, 0x5680225E, 0x00D15780, 0x235F00D1, 0x2180299A, 0x00DA8380, 0x095500B7, 0x9248DBE6, 0x00D89349, 0xDAE600D8, 0x944AD9E6, 0x00D88400, 0x936F017F -glabel D_808537EC - .word 0x850192CC, 0x017F8602, 0x91F0017F, 0x728013C6, 0x00BD8280, 0x309800DF, 0x28805B14, 0x01502980, 0x5C150151, 0x2A805D16, 0x01525080, 0x58790147, 0x87148FF1, 0x017F8813, 0x8EF2017F, 0x3D80430C, 0x00F80480, 0x60700158, 0x0C806171, 0x01581280, 0x62720158, 0x71809DB4, 0x015C0580, 0x64AD015D, 0x0D8065AE, 0x015D1380, 0x66AF015D, 0x47806C07, 0x017B4880, 0x6C07017B, 0x8A0DE537, 0x00C78B0D, 0xE53700C7, 0x8C0CEE34, 0x00BB8D0C, 0xEE3400BB, 0x0259E032, 0x00CE8F59, 0xE03200CE, 0x9059E032, 0x00CE9159, 0xE03200CE, 0x9550B8DC, 0x01199680, 0xD83300D9, 0x9780D833, 0x00D91980, 0x3F4700F4, 0x1D80687A, 0x01741C80, 0x675D0173, 0x20806A97, 0x01761E80, 0x70F90176, 0x7780FEF3, 0x00AA8400, 0x93F4017F, 0x850192F5, 0x017F8602, 0x91F6017F, 0x87148FF7, 0x017F7A80, 0x14FA00BD, 0x9880E590, 0x00C79980, 0xE59100C7, 0x9A80EEA7, 0x00BB9B80, 0xEEA800BB, 0x4980736C, 0x017BFF00, 0x00000000, 0xFF000000, 0x00000000 -glabel D_80853914 - .word 0x04003240, 0x04003238, 0x04003238, 0x04002BE0, 0x04003240, 0x04003240 -glabel D_8085392C - .word 0x04003290, 0x04003268, 0x04003268, 0x04002BF8, 0x04003290, 0x04003290 -glabel D_80853944 - .word 0x04003140, 0x04002B38, 0x04003138, 0x04002B40, 0x04003140, 0x04003140 -glabel D_8085395C - .word 0x04002E98, 0x040029E8, 0x04002E98, 0x040029F0, 0x04002E98, 0x04002E98 -glabel D_80853974 - .word 0x04002FB0, 0x04002FA8, 0x04002FB0, 0x04002A40, 0x04002FB0, 0x04002FB0 -glabel D_8085398C - .word 0x04003220, 0x04002590, 0x04002590, 0x04002BC0, 0x04003220, 0x04003220 -glabel D_808539A4 - .word 0x04003230, 0x040025D0, 0x040025D0, 0x04002BD0, 0x04003230, 0x04003230 -glabel D_808539BC - .word 0x04002BB0, 0x040031F8, 0x040031F8, 0x04002BB0, 0x04002BB0, 0x04002BB0, 0x04003088, 0x04002A70, 0x04002A70, 0x04003088, 0x04003088, 0x04003088 -glabel D_808539EC - .word 0x04002750, 0x04002748, 0x04002748, 0x04002750, 0x04002750, 0x04002750 -glabel D_80853A04 - .word 0x04002330, 0x04002330, 0x04002330, 0x04002330, 0x04002330, 0x04002330 -glabel D_80853A1C - .word 0x04002760, 0x04002758, 0x04002758, 0x04002760, 0x04002760, 0x04002760 -glabel D_80853A34 - .word 0x04002338, 0x04002338, 0x04002338, 0x04002338, 0x04002338, 0x04002338 -glabel D_80853A4C - .word 0x04002E08, 0x04002E00, 0x04002E00, 0x04002E08, 0x04002E08, 0x04002E08 -glabel D_80853A64 - .word 0x04003028, 0x04003020, 0x04003020, 0x04003028, 0x04003028, 0x04003028 -glabel D_80853A7C - .word 0x04003170, 0x04003168, 0x04003168, 0x04003170, 0x04003170, 0x04003170 -glabel D_80853A94 - .word 0x04003038, 0x04003030, 0x04003030, 0x04002A68, 0x04003038, 0x04003038 -glabel D_80853AAC - .word 0x04002FC0, 0x04002FB8, 0x04002FB8, 0x04002FC8, 0x04002FC0, 0x04002FC0 -glabel D_80853AC4 - .word 0x04003278, 0x04003270, 0x04003270, 0x04002BE8, 0x04003278, 0x04003278 -glabel D_80853ADC - .word 0x04003288, 0x04003280, 0x04003280, 0x04002BF0, 0x04003288, 0x04003288 -glabel D_80853AF4 - .word 0x04002EB8, 0x04002EA0, 0x04002EA0, 0x04002EB8, 0x040026C8, 0x04002EB8 -glabel D_80853B0C - .word 0x04002ED8, 0x04002ED0, 0x04002ED0, 0x04002ED8, 0x040026D0, 0x04002ED8 -glabel D_80853B24 - .word 0x04002EB0, 0x04002EA8, 0x04002EA8, 0x04002EB0, 0x04002EB0, 0x04002EB0 -glabel D_80853B3C - .word 0x04003190, 0x04003188, 0x04003188, 0x04002B68, 0x04003190, 0x04003190 -glabel D_80853B54 - .word 0x04003178, 0x04002568, 0x04002568, 0x04002B58, 0x04003178, 0x04003178 -glabel D_80853B6C - .word 0x04003180, 0x04002570, 0x04002570, 0x04002B60, 0x04003180, 0x04003180 -glabel D_80853B84 - .word 0x04002D60, 0x04002D58, 0x04002D58, 0x04002D60, 0x04002D60, 0x04002D60 -glabel D_80853B9C - .word 0x04002BB8, 0x04003218, 0x04003218, 0x04002BB8, 0x04002BB8, 0x04002BB8 -glabel D_80853BB4 - .word 0x04002BC8, 0x04003228, 0x04003228, 0x04002BC8, 0x04002BC8, 0x04002BC8 -glabel D_80853BCC - .word 0x040031C8, 0x040031C0, 0x040031C0, 0x040031C8, 0x040031C8, 0x040031C8 -glabel D_80853BE4 - .word 0x04003118, 0x04003110, 0x04003110, 0x04003118, 0x04003118, 0x04003118 -glabel D_80853BFC - .word 0x04002DE8, 0x04002DE8, 0x04002DE8, 0x04002DE8, 0x04002DE8, 0x04002DE8 -glabel D_80853C14 - .word 0x04002E30, 0x04002E18, 0x04002E18, 0x04002E30, 0x04002E30, 0x04002E30 -glabel D_80853C2C - .word 0x04002E40, 0x04002E38, 0x04002E38, 0x04002E40, 0x04002E40, 0x04002E40 -glabel D_80853C44 - .word 0x04002E28, 0x04002E20, 0x04002E20, 0x04002E28, 0x04002E28, 0x04002E28 -glabel D_80853C5C - .word 0x040030C8, 0x040030C0, 0x040030C0, 0x040030C8, 0x040030C8, 0x040030C8 -glabel D_80853C74 - .word 0x040030D8, 0x040030D0, 0x040030D0, 0x040030D8, 0x040030D8, 0x040030D8 -glabel D_80853C8C - .word 0x040030B8, 0x040030B0, 0x040030B0, 0x040030B8, 0x040030B8, 0x040030B8 -glabel D_80853CA4 - .word 0x04002F20, 0x04002F18, 0x04002F18, 0x04002F20, 0x04002F20, 0x04002F20 -glabel D_80853CBC - .word 0x04002FF0, 0x04002FE8, 0x04002FE8, 0x04002FF0, 0x04002FF0, 0x04002FF0 -glabel D_80853CD4 - .word 0x04003010, 0x04003008, 0x04003008, 0x04003010, 0x04003010, 0x04003010 -glabel D_80853CEC - .word 0x04003000, 0x04002FF8, 0x04002FF8, 0x04003000, 0x04003000, 0x04003000 -glabel D_80853D04 - .word 0x04002EF0, 0x04002EE8, 0x04002EE8, 0x04002EF8, 0x04002EF0, 0x04002EF0 -glabel D_80853D1C - .word 0x040031E0, 0x040031D8, 0x040031D8, 0x040031E8, 0x040031E0, 0x040031E0 -glabel D_80853D34 - .word 0x04003468, 0x04003438, 0x04003438, 0x04003468, 0x04003468, 0x04003468 -glabel D_80853D4C - .word 0x04002A28 -glabel D_80853D50 - .word 0x04002A38 -glabel D_80853D54 - .word 0x04002A30, 0x04002950, 0x04002960, 0x04002958, 0x040029D0, 0x040029E0, 0x040029D8, 0x04002988, 0x04002998, 0x04002990 -glabel D_80853D7C - .word 0x04003248, 0x04003200, 0x04003258, 0x04003210, 0x04003250, 0x04003208, 0x04003250, 0x04003208, 0x04003430, 0x040033F0, 0x04003430, 0x040033F0, 0x04003430, 0x040033F0, 0x040033F8, 0x040033D0, 0x04003400, 0x040033D8, 0x04003420, 0x04003420, 0x04003408, 0x040033E0, 0x04003410, 0x040033E8, 0x04003418, 0x04003418, 0x04003428, 0x04003428 -glabel D_80853DEC - .word 0x680EDFF8 -glabel D_80853DF0 - .word 0x680FDFEE -glabel D_80853DF4 - .word 0x6809DFF3 -glabel D_80853DF8 - .word 0x6809DFF6 -glabel D_80853DFC - .word 0x0871082C, 0x08710830, 0x08710834, 0x08710838, 0x0871F7C4 -glabel D_80853E10 - .word 0x00004019, 0x0000401E, 0x0000402C, 0x00004030, 0x00004034, 0x0000BFC8 -glabel D_80853E28 - .word 0x181F0810, 0x181F0814, 0x181FF7BA -glabel D_80853E34 - .word 0x1812080A, 0x6814200A, 0x18010816, 0x6800DFEA -glabel D_80853E44 - .word 0x18010827, 0x6800DFD9 -glabel D_80853E4C - .word 0x6811DFEC -.word D_80853DEC -.word D_80853DF0 -.word D_80853DF4 -.word D_80853DF8 -.word D_80853DFC -.word D_80853E10 -.word D_80853E28 -.word D_80853E34 -.word D_80853E44 -.word D_80853E4C -.word 0x00000000 -glabel D_80853E7C - .word 0x00000101, 0x02020202, 0x0A0A0A0A, 0x0A0A0303, 0x04040808, 0x05050606, 0x07070909, 0x00000000 -glabel D_80853E9C - .word 0x061B1208, 0x091A0F1C, 0x1D131011, 0x0A181442, 0x2E070B19, 0x1E252726, 0x2A1F2824, 0x20212329, 0x222C2D2B, 0x3A3B3C3D, 0x3E3F4041, 0x032F3031, 0x32333435, 0x36373839, 0x090A0B04, 0x03050000 -glabel D_80853EDC - .word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_808349DC -.word func_808349DC -.word func_808349DC -.word func_8083485C -.word func_8083485C -.word func_8083501C -.word func_8083501C -.word func_8083501C -.word func_8083501C -.word func_8083501C -.word func_8083501C -.word func_8083501C -.word func_8083501C -.word func_8083501C -.word func_8083501C -.word func_808356E8 -.word func_808356E8 -.word func_80835800 -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -.word func_8083485C -glabel D_80853FE8 - .word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_8083377C -.word func_80833790 -.word func_8083379C -.word func_8083379C -.word func_8083379C -.word func_8083379C -.word func_8083379C -.word func_8083379C -.word func_8083379C -.word func_8083379C -.word func_80833910 -.word func_80833910 -.word func_808337D4 -.word func_808337D4 -.word func_80833984 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -.word func_80833770 -glabel D_808540F4 - .word 0x04002F50, 0x0C000000, 0x04003080, 0x06000000, 0x04002C68, 0x08000000, 0x04003090, 0x08000000, 0x04002A20, 0x08000000, 0x04002F30, 0x0A000000, 0x04002C58, 0x07000000, 0x04002C60, 0x0B000000, 0x04002F50, 0x0C000000, 0x04003078, 0x04000000, 0x04003058, 0x04000000, 0x04002F38, 0x04000000, 0x040024E0, 0x05000000, 0x04002F48, 0x0D000000 -glabel D_80854164 - .word 0x08FBFDFA, 0x080B0500, 0xFF040509, 0x03010002, 0x030906FC, 0xFE07060A, 0x08FBFDFA, 0x080B08FB, 0xFDFA080B -glabel D_80854188 - .word 0x02000010, 0x090000DA -glabel D_80854190 - .word 0x04002A80, 0x04002A90, 0x04002A88, 0x01040000, 0x040028C0, 0x040028C8, 0x04002498, 0x01040000, 0x04002A98, 0x04002AA0, 0x04002540, 0x00050000, 0x040028D0, 0x040028D8, 0x040024A0, 0x01070000, 0x04002968, 0x04002970, 0x040024C0, 0x01040000, 0x04002880, 0x04002888, 0x04002478, 0x00050000, 0x04002978, 0x04002980, 0x040024C8, 0x02080000, 0x04002890, 0x04002898, 0x04002480, 0x03080000, 0x040029A0, 0x040029A8, 0x040024D0, 0x00040000, 0x040028A0, 0x040028A8, 0x04002488, 0x00050000, 0x040029B0, 0x040029B8, 0x040024D8, 0x00060000, 0x040028B0, 0x040028B8, 0x04002490, 0x01050000, 0x04002AA8, 0x04002AB0, 0x04002548, 0x00030000, 0x040028E0, 0x040028E8, 0x040024A8, 0x00030000, 0x04002AB8, 0x04002AC0, 0x04002550, 0x01090000, 0x040028F0, 0x040028F8, 0x040024B0, 0x01080000 -glabel D_80854290 - .word 0x04002A60, 0x04002A50, 0x04002A50, 0x010A0000 -glabel D_808542A0 - .word 0x04002900, 0x04002910, 0x04002910, 0x010B0000, 0x04002A50, 0x04002A58, 0x04002A58, 0x01020000, 0x04002910, 0x04002908, 0x04002908, 0x01020000 -glabel D_808542D0 - .word 0x04002B80, 0x04002B88, 0x04002B88, 0x01050000, 0x04002B70, 0x04002B78, 0x04002B78, 0x01040000, 0x04002C40, 0x04002C50, 0x04002C48, 0x030A0000, 0x04002C70, 0x04002C80, 0x04002C78, 0x020B0000, 0x04002B28, 0x04002B30, 0x04002560, 0x000C0000, 0x04002940, 0x04002948, 0x040024B8, 0x000F0000, 0x040029C0, 0x040029C8, 0x04002560, 0x00100000, 0x040029C0, 0x040029C8, 0x040024B8, 0x00100000 -glabel D_80854350 - .word 0x04002AE8, 0x04002920 -glabel D_80854358 - .word 0x04002AE0, 0x04002920 -glabel D_80854360 - .word 0x04002AF0, 0x04002928 -glabel D_80854368 - .word 0x04002AF8, 0x04002930 -glabel D_80854370 - .word 0x04002B00, 0x04002938 -glabel D_80854378 - .word 0x04002AD8, 0x04002918 -glabel D_80854380 - .word 0x18190000 -glabel D_80854384 - .word 0x1A1B0000 -glabel D_80854388 - .word 0x40000002, 0x00040001 -glabel D_80854390 - .byte 0x0C, 0x18, 0x18, 0x0C, 0x18 -glabel D_80854395 - .byte 0x0C -glabel D_80854396 - .byte 0x00, 0x00, 0x18, 0x07, 0x18, 0x21, 0x18, 0x27, 0x00, 0x00 -glabel D_808543A0 - .word 0x04040800 -glabel D_808543A4 - .word 0x040025C0, 0x040025C8 -glabel D_808543AC - .word 0x04002580, 0x04002588 -glabel D_808543B4 - .word 0x04002510, 0x04002518 -glabel D_808543BC - .word 0x04002510, 0x04002520 -glabel D_808543C4 - .word 0x04002EC0, 0x04002A08 -glabel D_808543CC - .word 0x040026F0, 0x04002CC8 -glabel D_808543D4 - .byte 0x04, 0x00, 0x26, 0xC0, 0x04, 0x00 -glabel D_808543DA - .byte 0x2C, 0xC0, 0x18, 0x30, 0x18, 0x35 -glabel D_808543E0 - .word 0x0D020409, 0x0A0B08F9 -glabel D_808543E8 - .word 0x0D010205, 0x0304090A, 0x0B0708FA -glabel D_808543F4 - .word 0x0D010203, 0x04090A0B, 0x0807FA00 -glabel D_80854400 - .word 0x0D020409, 0x0A0B08F9 -glabel D_80854408 - .word 0x0D020409, 0x0A0B0C08, 0xF9000000 -glabel D_80854414 - .word 0xF9000000 -glabel D_80854418 - .word 0x000B0102, 0x03050409, 0x0807FA00 -glabel D_80854424 - .word 0x000B0102, 0x030C0504, 0x090807FA -glabel D_80854430 - .word 0x0D010203, 0x0C050409, 0x0A0B0807, 0xFA000000 -glabel D_80854440 - .word 0x0A08F900 -glabel D_80854444 - .word 0x000C05FC -glabel D_80854448 - .word func_8083B998 -.word func_80839800 -.word func_8083E5A8 -.word func_8083E0FC -.word func_8083B644 -.word func_8083F7BC -.word func_8083C1DC -.word func_80850224 -.word func_8083C544 -.word func_8083EB44 -.word func_8083BDBC -.word func_8083C2B0 -.word func_80838A14 -.word func_8083B040 -glabel D_80854480 - .word 0x0C040408 -glabel D_80854484 - .word 0x16171617 -glabel D_80854488 - .word 0x00000200 -glabel D_8085448C - .word 0x08000000, 0x00000100, 0x02000000, 0x00000400, 0x04000000, 0x00000002, 0x08000000, 0x00000040, 0x40000000 -glabel D_808544B0 - .word 0x04002F80, 0x04002F78, 0x04002DE0, 0x04002DD8 -glabel D_808544C0 - .word 0x04002F70, 0x04002528, 0x04002DC8, 0x040024F0 -glabel D_808544D0 - .word 0x02010100 -glabel D_808544D4 - .word 0x44F90000, 0x43C98000, 0xC5568000, 0x00000000 -glabel D_808544E4 - .word 0x44960000, 0xC4A7E000, 0x4570A000, 0x00000000 -glabel D_808544F4 - .word 0x783C0000 -glabel D_808544F8 - .word 0x045B0482, 0x0340044B, 0x02A20201, 0x03B804EE, 0x03C00463, 0x01CD0394, 0x0340057C -glabel D_80854514 - .word 0x0B090305, 0x07000000 -glabel D_8085451C - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00 -glabel D_80854527 - .byte 0x00 -glabel D_80854528 - .word 0x0B471916, 0x1D1E0E1F, 0x20212223, 0x24252617, 0x181A1B1C, 0x51525315, 0x15151515, 0x15000000 -glabel D_80854548 - .word 0x04002F88, 0x04002690, 0x04003198 -glabel D_80854554 - .word 0x04002648, 0x04002640, 0x02030000, 0x04002680, 0x04002678, 0x05030000 -glabel D_8085456C - .word 0x00000000, 0x42C80000, 0x42200000 -glabel D_80854578 - .word 0x04003398, 0x420CAE14, 0x40D3851E, 0x040033A8, 0xC208A3D7, 0x40FD1EB8 -glabel D_80854590 - .word 0x04002EE0, 0x040031D0, 0xFFDB0871, 0xF8310000, 0x00940470, 0xF3980000, 0xFFB504A9, 0x0C9F0000, 0x08010402 -glabel D_808545B4 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_808545C0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_808545CC - .word 0x04002B10, 0x04002B20, 0x04002B08, 0x04002B18 -glabel D_808545DC - .word 0x00004014, 0x0000BFE2 -glabel D_808545E4 - .word 0x00000000, 0x00000000, 0x40A00000 -glabel D_808545F0 - .word 0x0850103C, 0x0000408C, 0x000040A4, 0x0000BF56 -glabel D_80854600 - .word 0xF8B42864, 0x681AF0FF, 0x8C96681A -glabel D_8085460C - .word 0x68002001, 0x08001806, 0x083C0806, 0x0000D7EE -glabel D_8085461C - .word 0x68012031, 0x6800DF1A -glabel D_80854624 - .word 0x05001139, 0x08010000, 0x01000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x000C003C, 0x00000000, 0x00000000 -glabel D_80854650 - .word 0x0A090000, 0x08030000, 0x02000000, 0x00000100, 0x00010000, 0xFFCFFFFF, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_808546A0 - .word 0x09091500, 0x08030000, 0x02000000, 0x00100000, 0x00000000, 0xDFCFFFFF, 0x00000000, 0x01010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_808546F0 - .word 0x3C3B0000 -glabel D_808546F4 - .word 0xBF800000, 0x428A0000, 0x41A00000 -glabel D_80854700 - .word 0x009E00F4, 0x009F0000 -glabel D_80854708 - .word 0x304C01F4 -glabel D_8085470C - .word 0x00000000, 0x00080000, 0xFFFFFFFF, 0xFFFFFF40, 0xFFFFFF00, 0xFFFFFF00, 0x04000200, 0x00000000, 0x00000000 -glabel D_80854730 - .word 0xFFC70D31, 0x00000000 -glabel D_80854738 - .word func_80846648 -.word func_808467D4 -.word func_80846660 -.word func_808468A8 -.word func_808468E8 -.word func_808469BC -.word func_80846A68 -.word func_80846978 -.word func_8083CA54 -.word func_8083CA54 -.word func_8083CA54 -.word func_8083CA54 -.word func_8083CA54 -.word func_8083CA20 -.word func_8083CA54 -.word func_8083CA9C -glabel D_80854778 - .word 0x00000000, 0x42480000, 0x00000000 -glabel D_80854784 - .word 0x42F00000, 0x43700000, 0x43B40000 -glabel D_80854790 - .word 0x15161718, 0x191A1B1C -glabel D_80854798 - .word 0x00000000 -glabel D_8085479C - .word 0x41900000 -glabel D_808547A0 - .word 0x00000000 -glabel D_808547A4 - .word 0x00000000, 0x3F000000, 0x00000000 -glabel D_808547B0 - .word 0x00000000, 0x3F000000, 0x00000000 -glabel D_808547BC - .word 0xFFFF64FF -glabel D_808547C0 - .word 0xFF320000 -glabel D_808547C4 - .word 0x00030305, 0x0408090D, 0x0E0F1011, 0x12EA1718, 0x191A1B1C, 0x1D1F2021, 0x22DD1E24, 0x26D9D8D7, 0x2A2B2D2E, 0x00000043, 0x302FCE33, 0xCCCB3637, 0x38393A3B, 0x3C3D3E3F, 0x40BFBE44, 0x0B454647, 0x08084849, 0x4E4F5059, 0x5A5B5C4D, 0x135E0000 -glabel D_80854814 - .word 0x00000000, 0x00000000, 0x43480000 -glabel D_80854820 - .word 0x40000000, 0x40800000, 0x40E00000 -glabel D_8085482C - .word 0x3F000000, 0x3F800000, 0x40400000 -glabel D_80854838 - .word 0x00000000, 0x00000000 -glabel D_80854840 - .word 0xC1F00000, 0x0602B060, 0x0602AD40, 0x0602AF70, 0x0602CA38, 0x0602B350, 0x0602B580, 0x0602B788, 0x0602B1F0 -glabel D_80854864 - .word 0x00000000, 0x00000000 -glabel D_8085486C - .word 0x000000FF -glabel D_80854870 - .word 0x08401003, 0x0840EFEB -glabel D_80854878 - .word 0x08401004, 0x0840EFE8 -glabel D_80854880 - .word 0x00000000, 0x41D00000, 0xC2200000 -glabel D_8085488C - .word 0x00000000 -glabel D_80854890 - .word 0x00000000, 0x41D00000 -glabel D_80854898 - .word 0x41200000, 0x41A00000 -glabel D_808548A0 - .word 0x42200000, 0x42480000 -glabel D_808548A8 - .word 0x080A080A, 0x080A0814, 0x080AF7E2 -glabel D_808548B4 - .word 0x00003028, 0x00003030, 0x00003038, 0x00003040, 0x00003048, 0x00003050, 0x00003058, 0x00003060, 0x0000CF98 -glabel D_808548D8 - .word 0x0000300A, 0x00003012, 0x0000301A, 0x00003022, 0x00003034, 0x0000303C, 0x00003044, 0x0000304C, 0x0000CFAC -glabel D_808548FC - .word 0x42200000, 0x00000000, 0x00000000, 0xC2200000, 0x00000000, 0x00000000 -glabel D_80854914 - .word 0x42700000, 0x41A00000, 0x00000000, 0xC2700000, 0x41A00000, 0x00000000 -glabel D_8085492C - .word 0x42700000, 0xC1A00000, 0x00000000, 0xC2700000 -glabel D_8085493C - .word 0xC1A00000, 0x00000000, 0x04003370, 0x04003368, 0x04003380, 0x04003358, 0x04003338, 0x04003348, 0x04003350 -glabel D_80854960 - .word 0x00000000, 0x00000000, 0x04003388, 0x04003388, 0x04003388, 0x04003360, 0x04003340, 0x04003340, 0x04003340, 0x00000000, 0x00000000 -glabel D_8085498C - .word 0x040033C8, 0x040033B8, 0x040033C0 -glabel D_80854998 - .word 0x203A192A -glabel D_8085499C - .word 0xFFBB1BEA, 0xFEF60000 -glabel D_808549A4 - .word 0x08710830, 0x0871083A, 0x08710844, 0x0872085C, 0x0872086E, 0x0872087E, 0x08720884, 0x0872F778 -glabel D_808549C4 - .word 0x00002800, 0x0833080A, 0x0830F7E7 -glabel D_808549D0 - .word 0x0839F800 -glabel D_808549D4 - .byte 0x06, 0x00, 0x04 -glabel D_808549D7 - .byte 0xF6, 0x06, 0x04, 0x01, 0xF1, 0x05, 0x68, 0x05, 0xF4 -glabel D_808549E0 - .word 0x00003857, 0x68042057, 0x68142045, 0x0000D785 -glabel D_808549F0 - .word 0x184EF7C4 -glabel D_808549F4 - .byte 0x68, 0x14, 0x20, 0x05, 0x00, 0x00, 0xD7, 0xF1, 0x01, 0x03, 0x02, 0x04, 0x04, 0x00 -glabel D_80854A02 - .byte 0x00, 0x00 -glabel D_80854A04 - .word 0x0018182A, 0x46000021, 0x191F4700, 0x00F01C20, 0x5D000020, 0x1D217A00 -glabel D_80854A1C - .word 0x00000000, 0x00000000, 0x40A00000 -glabel D_80854A28 - .word 0x00210000, 0x00F00000, 0x00200002 -glabel D_80854A34 - .word 0x68142026, 0x286CF7D8 -glabel D_80854A3C - .word 0x0877F7E2 -glabel D_80854A40 - .word 0x00000000, 0x42200000, 0x42340000 -glabel D_80854A4C - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80854A58 - .word 0x04002CF8, 0x04002CE0, 0x04002D10 -glabel D_80854A64 - .word 0x04002D00, 0x04002CE8, 0x04002D18 -glabel D_80854A70 - .word 0x04002D08, 0x04002CF0, 0x04002D20 -glabel D_80854A7C - .word 0x460A0A00 -glabel D_80854A80 - .word 0x083D0814, 0x68002014, 0x0000CFE6 -glabel D_80854A8C - .word 0x00004014, 0x6817DFE2, 0x00004014, 0x6815DFD4, 0x681C2014, 0x1818F7EC -glabel D_80854AA4 - .word 0x00000000 -.word func_80851008 -.word func_80851030 -.word func_80851094 -.word func_808510B4 -.word func_808510D4 -.word func_808510F4 -.word func_80851114 -.word func_80851134 -.word func_80851154 -.word func_80851174 -.word func_808511D4 -.word func_808511FC -.word func_80851294 -.word func_80851050 -.word func_80851194 -.word func_808511B4 -.word func_80851248 -.word func_808512E0 -glabel D_80854AF0 - .word 0x00002822, 0x0871082D, 0x08710833, 0x0871F7C0 -glabel D_80854B00 - .word 0x68162003, 0x0000300F, 0x00003018, 0x0000301E, 0x6808DFE1 -glabel D_80854B14 - .word 0x0000CFF6 -glabel D_80854B18 - .word 0x00000000, 0x00000000, 0xFF000000 -.word func_808515A4 -.word 0x02000000, 0x04002790, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03000000, 0x04002740, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFF000000 -.word func_808515A4 -.word 0x02000000, 0x04002778, 0xFF000000 -.word func_80851788 -.word 0x03000000, 0x04002860, 0xFF000000 -.word func_808518DC -.word 0x07000000, 0x04002348, 0x05000000, 0x04002350, 0x05000000, 0x04002358, 0x05000000, 0x040023B0, 0x07000000, 0x040023B8, 0xFF000000 -.word func_808519EC -.word 0x02000000, 0x04002728, 0x02000000, 0x04002738, 0x00000000, 0x00000000, 0xFF000000 -.word func_80851B90 -.word 0x03000000, 0x040027A8, 0x09000000, 0x04002DB0, 0x02000000, 0x04002DC0, 0xFF000000 -.word func_80851D2C -.word 0x02000000, 0x04003098, 0x03000000, 0x04002780, 0xFF000000 -.word func_808515A4 -.word 0x02000000, 0x04003088, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x05000000, 0x04002320, 0xFF000000 -.word func_80851368 -.word 0xFF000000 -.word func_80851E64 -.word 0x05000000, 0x04002328, 0x10000000, 0x04002F90, 0xFF000000 -.word func_80851F84 -.word 0xFF000000 -.word func_80851E90 -.word 0x06000000, 0x04002410, 0x06000000, 0x04002418, 0xFF000000 -.word func_80852080 -.word 0x05000000, 0x04002390, 0xFF000000 -.word func_808521F4 -.word 0xFF000000 -.word func_8085225C -.word 0xFF000000 -.word func_80852280 -.word 0x05000000, 0x040023A0, 0x05000000, 0x04002368, 0xFF000000 -.word func_808515A4 -.word 0x05000000, 0x04002370, 0x05000000, 0x040027B0, 0x05000000, 0x040027B8, 0x05000000, 0x040027C0, 0x03000000, 0x04002768, 0x03000000, 0x040027D8, 0x04000000, 0x040027E0, 0x03000000, 0x04002380, 0x03000000, 0x04002828, 0x06000000, 0x04002470, 0x06000000, 0x040032A8, 0x0E000000, 0x040032A0, 0x03000000, 0x040032A0, 0x05000000, 0x04002AE8, 0x10000000, 0x04002450, 0x0F000000, 0x04002460, 0x0F000000, 0x04002458, 0x03000000, 0x04002440, 0x03000000, 0x04002438, 0x03000000, 0x04002C88, 0x06000000, 0x04003450, 0x06000000, 0x04003448, 0x06000000, 0x04003460, 0x06000000, 0x04003440, 0x03000000, 0x04002798, 0x03000000, 0x04002818, 0x04000000, 0x04002848, 0x03000000, 0x04002850, 0x03000000, 0x040034E0, 0x03000000, 0x040034D8, 0x06000000, 0x040034C8, 0x03000000, 0x04003470, 0x03000000, 0x04003478, 0x03000000, 0x040034C0, 0x03000000, 0x04003480, 0x03000000, 0x04003490, 0x03000000, 0x04003488, 0x03000000, 0x04003498, 0x03000000, 0x040034B0, 0xFF000000 -.word func_808524B0 -.word 0x03000000, 0x04003420, 0xFF000000 -.word func_80852544 -.word 0xFF000000 -.word func_80852564 -.word 0x03000000, 0x04003250, 0xFF000000 -.word func_80852608 -.word 0x03000000, 0x04002810, 0x03000000, 0x04002838, 0x03000000, 0x04002CD0, 0x03000000, 0x04002CD8, 0x03000000, 0x04002868, 0x03000000, 0x040027E8, 0x03000000, 0x040027F8, 0x03000000, 0x04002800 -glabel D_80854E50 - .word 0x00000000, 0x00000000, 0xFF000000 -.word func_808514C0 -.word 0xFF000000 -.word func_8085157C -.word 0xFF000000 -.word func_80851998 -.word 0xFF000000 -.word func_808519C0 -.word 0x0B000000, 0x00000000, 0xFF000000 -.word func_80852C50 -.word 0xFF000000 -.word func_80852944 -.word 0xFF000000 -.word func_80851688 -.word 0xFF000000 -.word func_80851750 -.word 0xFF000000 -.word func_80851828 -.word 0xFF000000 -.word func_808521B8 -.word 0xFF000000 -.word func_8085190C -.word 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0x12000000 -.word D_80854AF0 -.word 0x0B000000, 0x00000000, 0xFF000000 -.word func_80851A50 -.word 0x0C000000, 0x04002730, 0x0B000000, 0x00000000, 0x00000000, 0x00000000, 0xFF000000 -.word func_80851BE8 -.word 0x0B000000, 0x00000000, 0xFF000000 -.word func_80851CA4 -.word 0x0B000000, 0x00000000, 0x11000000, 0x040030A8, 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0xFF000000 -.word func_80851D80 -.word 0xFF000000 -.word func_80851DEC -.word 0xFF000000 -.word func_80851E28 -.word 0x12000000 -.word D_80854B00 -.word 0xFF000000 -.word func_808513BC -.word 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0xFF000000 -.word func_80851ECC -.word 0xFF000000 -.word func_80851FB0 -.word 0xFF000000 -.word func_80852048 -.word 0xFF000000 -.word func_80852174 -.word 0x0D000000, 0x04002398, 0xFF000000 -.word func_80852234 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0B000000, 0x00000000, 0xFF000000 -.word func_80852450 -.word 0xFF000000 -.word func_80851688 -.word 0xFF000000 -.word func_80852298 -.word 0x0D000000, 0x040027D0, 0xFF000000 -.word func_80852480 -.word 0x0D000000, 0x040027C8, 0xFF000000 -.word func_80852328 -.word 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0x0C000000, 0x04002388, 0xFF000000 -.word func_80852358 -.word 0x0B000000, 0x00000000, 0x12000000 -.word D_80854B14 -.word 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0xFF000000 -.word func_80852388 -.word 0x11000000, 0x04002450, 0x0C000000, 0x04002448, 0x0C000000, 0x04002450, 0x0B000000, 0x00000000, 0xFF000000 -.word func_808526EC -.word 0x11000000, 0x04003468, 0xFF000000 -.word func_808526EC -.word 0x11000000, 0x04003468, 0x0C000000, 0x040027A0, 0x0C000000, 0x04002820, 0x0B000000, 0x00000000, 0x0C000000, 0x04002858, 0x0C000000, 0x040034D0, 0x0D000000, 0x040034F0, 0x0C000000, 0x040034E8, 0x0C000000, 0x040034A8, 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0xFF000000 -.word func_80852648 -.word 0x0B000000, 0x00000000, 0x0C000000, 0x040034A0, 0xFF000000 -.word func_808524D0 -.word 0xFF000000 -.word func_80852514 -.word 0xFF000000 -.word func_80852554 -.word 0xFF000000 -.word func_808525C0 -.word 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0x0B000000, 0x00000000, 0xFF000000 -.word func_8085283C -.word 0xFF000000 -.word func_808528C8 -.word 0xFF000000 -.word func_808528C8 -.word 0x0C000000, 0x04002870, 0x0C000000, 0x040027F0, 0x0C000000, 0x04002808, 0x0C000000, 0x04002450 -glabel D_80855188 - .word 0x0000302A, 0x0000CFD0, 0x04002720, 0x04002360 -glabel D_80855198 - .word 0xBF800000, 0x428C0000, 0x41A00000 -glabel D_808551A4 - .word 0x182D0000, 0x18366800 -glabel D_808551AC - .word 0x0000401D, 0x0000BFD9 -glabel D_808551B4 - .word 0x0000D7E2 -glabel D_808551B8 - .word 0x1803F7F4 -glabel D_808551BC - .word 0x68112023, 0x083008EC, 0x0830F700 -glabel D_808551C8 - .word 0x082A0843, 0x00004854, 0x0000485A, 0x0000B7A0 -glabel D_808551D8 - .word 0x08501014, 0x0850EFE2 -glabel D_808551E0 - .word 0x0000300A, 0x0000CFE8 -glabel D_808551E8 - .word 0x0000400F, 0x0000BFDD -glabel D_808551F0 - .word 0x0000300F, 0x0000CFDF -glabel D_808551F8 - .word 0x0870F7B2 -glabel D_808551FC - .word func_8084377C -.word func_80843954 -.word func_80843A38 -glabel D_80855208 - .word 0x040034B8, 0x04003458 -glabel D_80855210 - .word 0xFF3802BC, 0x00640320, 0x02580320, 0xFF3801F4, 0x00000258, 0x01900258 -glabel D_80855228 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80855234 - .word 0xFFFFFF00 -glabel D_80855238 - .word 0x00808000, 0x00000000 - diff --git a/data/z_player_lib.bss.s b/data/z_player_lib.bss.s deleted file mode 100644 index 745b547f09..0000000000 --- a/data/z_player_lib.bss.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purpose registers - -.section .bss - -.balign 16 - -glabel D_80160000 - .space 0x1 - -glabel D_80160001 - .space 0x3 - -glabel D_80160004 - .space 0x1 - -glabel D_80160005 - .space 0x1 - -glabel D_80160006 - .space 0x2 - -glabel D_80160008 - .space 0x8 - -glabel D_80160010 - .space 0x4 - -glabel D_80160014 - .space 0x4 - -glabel D_80160018 - .space 0x8 diff --git a/data/z_player_lib.data.s b/data/z_player_lib.data.s deleted file mode 100644 index 1fc5af1e9e..0000000000 --- a/data/z_player_lib.data.s +++ /dev/null @@ -1,277 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_80125B70 - .incbin "baserom.z64", 0xB9CD10, 0x8 - -glabel D_80125B78 - .incbin "baserom.z64", 0xB9CD18, 0xCC - -glabel D_80125C44 - .incbin "baserom.z64", 0xB9CDE4, 0x44 - -glabel D_80125C88 - .incbin "baserom.z64", 0xB9CE28, 0x10 - -glabel D_80125C98 - .incbin "baserom.z64", 0xB9CE38, 0x1 - -glabel D_80125C99 - .incbin "baserom.z64", 0xB9CE39, 0x1 - -glabel D_80125C9A - .incbin "baserom.z64", 0xB9CE3A, 0x1 - -glabel D_80125C9B - .incbin "baserom.z64", 0xB9CE3B, 0x1 - -glabel D_80125C9C - .incbin "baserom.z64", 0xB9CE3C, 0x4C - -glabel D_80125CE8 - .incbin "baserom.z64", 0xB9CE88, 0x40 - -glabel D_80125D28 - .incbin "baserom.z64", 0xB9CEC8, 0x40 - -glabel D_80125D68 - .incbin "baserom.z64", 0xB9CF08, 0x20 - -glabel D_80125D88 - .incbin "baserom.z64", 0xB9CF28, 0x60 - -glabel D_80125DE8 - .incbin "baserom.z64", 0xB9CF88, 0x20 - -glabel D_80125E08 - .incbin "baserom.z64", 0xB9CFA8, 0x10 - -glabel D_80125E18 - .incbin "baserom.z64", 0xB9CFB8, 0x10 - -glabel D_80125E28 - .incbin "baserom.z64", 0xB9CFC8, 0x10 - -glabel D_80125E38 - .incbin "baserom.z64", 0xB9CFD8, 0x10 - -glabel D_80125E48 - .incbin "baserom.z64", 0xB9CFE8, 0x10 - -glabel D_80125E58 - .incbin "baserom.z64", 0xB9CFF8, 0x10 - -glabel D_80125E68 - .incbin "baserom.z64", 0xB9D008, 0x10 - -glabel D_80125E78 - .incbin "baserom.z64", 0xB9D018, 0x10 - -glabel D_80125E88 - .incbin "baserom.z64", 0xB9D028, 0x10 - -glabel D_80125E98 - .incbin "baserom.z64", 0xB9D038, 0x10 - -glabel D_80125EA8 - .incbin "baserom.z64", 0xB9D048, 0x10 - -glabel D_80125EB8 - .incbin "baserom.z64", 0xB9D058, 0x10 - -glabel D_80125EC8 - .incbin "baserom.z64", 0xB9D068, 0x10 - -glabel D_80125ED8 - .incbin "baserom.z64", 0xB9D078, 0x10 - -glabel D_80125EE8 - .incbin "baserom.z64", 0xB9D088, 0x10 - -glabel D_80125EF8 - .incbin "baserom.z64", 0xB9D098, 0x10 - -glabel D_80125F08 - .incbin "baserom.z64", 0xB9D0A8, 0x10 - -glabel D_80125F18 - .incbin "baserom.z64", 0xB9D0B8, 0x8 - -glabel D_80125F20 - .incbin "baserom.z64", 0xB9D0C0, 0x8 - -glabel D_80125F28 - .incbin "baserom.z64", 0xB9D0C8, 0x8 - -glabel D_80125F30 - .incbin "baserom.z64", 0xB9D0D0, 0x8 - -glabel D_80125F38 - .incbin "baserom.z64", 0xB9D0D8, 0x8 - -glabel D_80125F40 - .word D_80125E08 - .word D_80125E18 - .word D_80125E38 - .word D_80125E28 - .word D_80125DE8 - .word D_80125EE8 - .word D_80125EF8 - .word D_80125F08 - .word D_80125E48 - .word D_80125E58 - .word D_80125CE8 - .word D_80125E68 - .word D_80125EA8 - .word D_80125EB8 - .word D_80125EC8 - .word D_80125ED8 - .word D_80125E78 - .word D_80125E88 - .word D_80125D28 - .word D_80125D88 - .word D_80125E98 - .word 0x00000000 - -glabel D_80125F98 - .incbin "baserom.z64", 0xB9D138, 0x10 - -glabel D_80125FA8 - .incbin "baserom.z64", 0xB9D148, 0x10 - -glabel D_80125FB8 - .incbin "baserom.z64", 0xB9D158, 0x1 - -glabel D_80125FB9 - .incbin "baserom.z64", 0xB9D159, 0x1F - -glabel D_80125FD8 - .incbin "baserom.z64", 0xB9D178, 0x20 - -glabel D_80125FF8 - .incbin "baserom.z64", 0xB9D198, 0x10 - -glabel D_80126008 - .incbin "baserom.z64", 0xB9D1A8, 0xC - -glabel D_80126014 - .incbin "baserom.z64", 0xB9D1B4, 0x8 - -glabel D_8012601C - .incbin "baserom.z64", 0xB9D1BC, 0x10 - -glabel D_8012602C - .incbin "baserom.z64", 0xB9D1CC, 0xC - -glabel D_80126038 - .incbin "baserom.z64", 0xB9D1D8, 0x18 - -glabel D_80126050 - .incbin "baserom.z64", 0xB9D1F0, 0x8 - -glabel D_80126058 - .incbin "baserom.z64", 0xB9D1F8, 0x8 - -glabel D_80126060 - .incbin "baserom.z64", 0xB9D200, 0x8 - -glabel D_80126068 - .incbin "baserom.z64", 0xB9D208, 0x8 - -glabel D_80126070 - .incbin "baserom.z64", 0xB9D210, 0xC - -glabel D_8012607C - .incbin "baserom.z64", 0xB9D21C, 0x4 - -glabel D_80126080 - .incbin "baserom.z64", 0xB9D220, 0xC - -glabel D_8012608C - .incbin "baserom.z64", 0xB9D22C, 0xC - -glabel D_80126098 - .incbin "baserom.z64", 0xB9D238, 0xC - -glabel D_801260A4 - .incbin "baserom.z64", 0xB9D244, 0xC - -glabel D_801260B0 - .incbin "baserom.z64", 0xB9D250, 0xC - -glabel D_801260BC - .incbin "baserom.z64", 0xB9D25C, 0xC - -glabel D_801260C8 - .incbin "baserom.z64", 0xB9D268, 0x8 - -glabel D_801260D0 - .incbin "baserom.z64", 0xB9D270, 0x4 - -glabel D_801260D4 - .incbin "baserom.z64", 0xB9D274, 0xC - -glabel D_801260E0 - .incbin "baserom.z64", 0xB9D280, 0x18 - -glabel D_801260F8 - .incbin "baserom.z64", 0xB9D298, 0x8 - -glabel D_80126100 - .incbin "baserom.z64", 0xB9D2A0, 0x28 - -glabel D_80126128 - .incbin "baserom.z64", 0xB9D2C8, 0xC - -glabel D_80126134 - .incbin "baserom.z64", 0xB9D2D4, 0x20 - -glabel D_80126154 - .incbin "baserom.z64", 0xB9D2F4, 0x30 - -glabel D_80126184 - .incbin "baserom.z64", 0xB9D324, 0xC - -glabel D_80126190 - .incbin "baserom.z64", 0xB9D330, 0xC - -glabel D_8012619C - .incbin "baserom.z64", 0xB9D33C, 0x30 - -glabel D_801261CC - .incbin "baserom.z64", 0xB9D36C, 0xC - -glabel D_801261D8 - .incbin "baserom.z64", 0xB9D378, 0x8 - -glabel D_801261E0 - .incbin "baserom.z64", 0xB9D380, 0x17 - -glabel D_801261F7 - .incbin "baserom.z64", 0xB9D397, 0x9 - -glabel D_80126200 - .incbin "baserom.z64", 0xB9D3A0, 0x10 - -glabel D_80126210 - .incbin "baserom.z64", 0xB9D3B0, 0x8 - -glabel D_80126218 - .incbin "baserom.z64", 0xB9D3B8, 0x10 - -glabel D_80126228 - .incbin "baserom.z64", 0xB9D3C8, 0xC - -glabel D_80126234 - .incbin "baserom.z64", 0xB9D3D4, 0xC - -glabel D_80126240 - .incbin "baserom.z64", 0xB9D3E0, 0x10 diff --git a/include/functions.h b/include/functions.h index 42482d45ce..1d9bafbb04 100644 --- a/include/functions.h +++ b/include/functions.h @@ -221,7 +221,7 @@ void func_80028990(GlobalContext* globalCtx, f32 randScale, Vec3f* srcPos); void func_80028A54(GlobalContext* globalCtx, f32 randScale, Vec3f* srcPos); UNK_TYPE func_80028B18(GlobalContext* globalCtx, Vec3f*, Vec3f*, Vec3f*); void func_80028B74(GlobalContext*, Vec3f*, UNK_PTR, UNK_PTR, Color_RGB8*, Color_RGB8*); -// ? func_80028BB0(?); +void func_80028BB0(GlobalContext*, Vec3f*, Vec3f*, Vec3f*, Color_RGB8*, Color_RGB8*, s32, s32); // ? func_80028CEC(?); void EffectSsBomb2_SpawnLayered(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep); @@ -247,7 +247,7 @@ void func_8002949C(GlobalContext* globalCtx, Vec3f* pos, u32, u32, u32, u32); // ? func_80029694(?); // ? func_80029724(?); void func_800297A4(GlobalContext* globalCtx, Vec3f* vec, f32, s32, s32, s32, s32, s32, s32, s32); -// ? func_800298EC(?); +void func_800298EC(GlobalContext* globalCtx, Vec3f* vec, s16); // ? func_8002993C(?); void func_800299AC(GlobalContext* globalCtx, Vec3f* v); // ? func_80029B30(?); @@ -265,13 +265,13 @@ void func_80029E8C(GlobalContext* globalCtx, Vec3f* burstDepthY, Vec3f* burstDep void EffectSsSolderSrchBall_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 arg4, s16* linkDetected); // ? func_80029F44(?); -// ? func_80029FAC(?); +void func_80029FAC(GlobalContext* globalCtx, Vec3f*, f32); // ? func_8002A140(?); // ? func_8002A1DC(?); // ? func_8002A2A4(?); // ? func_8002A32C(?); // ? func_8002A3C4(?); -// ? func_8002A484(?); +void func_8002A484(GlobalContext*, f32, s16, f32); // ? func_8002A4D4(?); void EffectSsExtra_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scoreIdx); void func_8002A65C(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, s16 arg3, s16 arg4); @@ -292,7 +292,7 @@ void ActorShadow_DrawFunc_Circle(Actor* actor, Lights* lights, GlobalContext* gl void ActorShadow_DrawFunc_WhiteCircle(Actor* actor, Lights* lights, GlobalContext* globalCtx); void ActorShadow_DrawFunc_Squiggly(Actor* actor, Lights* lights, GlobalContext* globalCtx); void ActorShadow_DrawFunc_Teardrop(Actor* actor, Lights* lights, GlobalContext* globalCtx); -void func_8002BDB0(Actor* actor, s32 arg1, s32 arg2, UNK_PTR arg3, s32 arg4, UNK_PTR arg5); +void func_8002BDB0(Actor* actor, s32 arg1, s32 arg2, Vec3f* arg3, s32 arg4, Vec3f* arg5); void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx); s32 Flags_GetSwitch(GlobalContext* globalCtx, s32 flag); void Flags_SetSwitch(GlobalContext* globalCtx, s32 flag); @@ -310,9 +310,9 @@ void Flags_SetTempClear(GlobalContext* globalCtx, s32 flag); void Flags_UnsetTempClear(GlobalContext* globalCtx, s32 flag); s32 Flags_GetCollectible(GlobalContext* globalCtx, s32 flag); void Flags_SetCollectible(GlobalContext* globalCtx, s32 flag); -void TitleCard_InitBossName(GlobalContext* globalCtx, TitleCardContext* titleCtx, u32 texture, s16 arg3, s16 arg4, +void TitleCard_InitBossName(GlobalContext* globalCtx, TitleCardContext* titleCtx, void* texture, s16 arg3, s16 arg4, u8 arg5, u8 arg6); -void TitleCard_InitPlaceName(GlobalContext* globalCtx, TitleCardContext* titleCtx, u32 texture, s32 arg3, s32 arg4, +void TitleCard_InitPlaceName(GlobalContext* globalCtx, TitleCardContext* titleCtx, void* texture, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7); s32 func_8002D53C(GlobalContext* globalCtx, TitleCardContext* titleCtx); void Actor_Kill(Actor* actor); @@ -342,10 +342,10 @@ s32 func_8002DDE4(GlobalContext* globalCtx); s32 func_8002DDF4(GlobalContext* globalCtx); void func_8002DE04(GlobalContext* globalCtx, Actor* actorA, Actor* actorB); void func_8002DE74(GlobalContext* globalCtx, Player* player); -void func_8002DECC(GlobalContext* globalCtx, Player* player, Actor* actor); +void func_8002DECC(GlobalContext* globalCtx, Player* player, Actor* horse); s32 func_8002DEEC(Player* player); void func_8002DF18(GlobalContext* globalCtx, Player* player); -u32 func_8002DF38(GlobalContext* globalCtx, Actor* actor, u8 newAction); +s32 func_8002DF38(GlobalContext* globalCtx, Actor* actor, u8 csMode); s32 func_8002DF54(GlobalContext* globalCtx, Actor* actor, u8 arg2); void func_8002DF90(DynaPolyActor* dynaActor); void func_8002DFA4(DynaPolyActor* dynaActor, f32 arg1, s16 arg2); @@ -378,7 +378,7 @@ u32 Actor_HasNoParent(Actor* actor, GlobalContext* globalCtx); void func_8002F5C4(Actor* actorA, Actor* actorB, GlobalContext* globalCtx); void func_8002F5F0(Actor* actor, GlobalContext* globalCtx); u32 Actor_HasChild(GlobalContext* globalCtx, Actor* actor); -u32 func_8002F63C(GlobalContext* globalCtx, Actor* actor, s32 arg2); +u32 func_8002F63C(GlobalContext* globalCtx, Actor* horse, s32 arg2); u32 Actor_HasNoChild(GlobalContext* globalCtx, Actor* actor); void func_8002F698(GlobalContext* globalCtx, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6); void func_8002F6D4(GlobalContext* globalCtx, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5); @@ -393,7 +393,7 @@ void func_8002F91C(Actor* actor, u16 sfxId); void func_8002F948(Actor* actor, u16 sfxId); void func_8002F974(Actor* actor, u16 sfxId); void func_8002F994(Actor* actor, s32 arg1); -s32 func_8002F9EC(GlobalContext* globalCtx, Actor* actor, UNK_TYPE arg2, UNK_TYPE arg3, UNK_TYPE arg4); +s32 func_8002F9EC(GlobalContext* globalCtx, Actor* actor, CollisionPoly* arg2, u32 arg3, Vec3f* arg4); void func_800304B0(GlobalContext* globalCtx); void func_800304DC(GlobalContext* globalCtx, ActorContext* actorCtx, ActorEntry* actorEntry); void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx); @@ -516,6 +516,7 @@ f32 func_80038B7C(CollisionPoly*, Vec3f*); // ? T_BGCheck_getBGDataInfo(?); // ? func_8003C55C(?); // ? func_8003C614(?); +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*); @@ -594,6 +595,7 @@ struct_80041C10_ret* func_80041C10(CollisionContext* colCtx, s32, s32); // ? func_80041EC8(?); // ? func_80041F10(?); u16 func_80041F34(CollisionContext*, CollisionPoly*, u8); +s32 func_80041FA0(CollisionContext*, CollisionPoly*, u32); // ? func_80042048(?); // ? func_80042108(?); s32 func_8004213C(GlobalContext*, CollisionContext*, f32, f32, f32*, UNK_PTR); @@ -615,8 +617,13 @@ void func_80042FC4(GlobalContext*, CollisionContext*); void DynaPolyInfo_SetActorMove(DynaPolyActor* actor, DynaPolyMoveFlag flags); void func_800434A0(DynaPolyActor* dynaActor); void func_800434A8(DynaPolyActor* actor); -void func_80043538(DynaPolyActor* dynaActor); +void func_800434C8(CollisionContext* colCtx, u32 floorPolySource); +void func_80043508(CollisionContext* colCtx, u32 floorPolySource); +void func_80043538(DynaPolyActor* actor); +s32 func_80043548(DynaPolyActor* dynaActor); s32 func_8004356C(DynaPolyActor* dynaActor); +s32 func_80043590(DynaPolyActor* dynaActor); +s32 func_800435B4(DynaPolyActor* dynaActor); f32 func_800437F0(f32, f32); // ? func_8004389C(?); // ? func_800438DC(?); @@ -683,7 +690,8 @@ void Camera_ChangeStatus(Camera* camera, s16 status); void func_80059EC8(Camera* camera); // ? func_8005A02C(?); // ? Camera_ChangeMode(?); -// ? func_8005A444(?); +s32 func_8005A444(Camera* camera, s16 arg1); +s32 func_8005A470(Camera* camera, s16 arg1); // ? Camera_ChangeSetting(?); s32 func_8005A77C(Camera* camera, s16 button); // ? func_8005A7A8(?); @@ -696,12 +704,13 @@ s32 Camera_SetParam(Camera*, s32, void*); // ? func_8005AC48(?); // ? func_8005AC60(?); // ? func_8005AC6C(?); -// ? func_8005AD40(?); +s32 func_8005AD40(Camera* camera, Actor* doorActor, s16 arg2, f32 arg3, s16 arg4, s16 arg5, s16 arg6); // ? func_8005AE64(?); Vec3f* func_8005AFB4(Vec3f* dst, Camera* camera); +void Camera_SetCameraData(Camera*, s16, CutsceneCameraPoint*, CutsceneCameraPoint*, s16, s16, s32); // ? func_8005B044(?); s32 func_8005B198(); -// ? func_8005B1A4(?); +s16 func_8005B1A4(Camera* camera); DamageTable* DamageTable_Get(s32 index); // ? func_8005B280(?); void func_8005B2AC(GraphicsContext* gfx, Vec3f* vA, Vec3f* vB, Vec3f* vC, u8 r, u8 g, u8 b); @@ -789,8 +798,6 @@ s32 Collider_QuadSetOC(GlobalContext* globalCtx, Collider* collider); s32 func_8005D218(GlobalContext* globalCtx, ColliderQuad* quad, Vec3f* arg2); s32 Collider_InitOcLine(GlobalContext* globalCtx, OcLine* line); s32 Collider_DestroyOcLine(GlobalContext* globalCtx, OcLine* line); -// ? func_8005D334(?); -// ? func_8005D3A4(?); void func_8005D3BC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx); void CollisionCheck_DestroyContext(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx); void CollisionCheck_InitContext(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx); @@ -805,10 +812,7 @@ s32 CollisionCheck_SetAC_SAC(GlobalContext* globalCtx, CollisionCheckContext* co s32 CollisionCheck_SetOC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider); s32 CollisionCheck_SetOC_SAC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider, s32 index); s32 CollisionCheck_SetOCLine(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, OcLine* collider); -// ? func_8005DF2C(?); -// ? func_8005DF50(?); -// ? func_8005DF74(?); -// ? func_8005E2EC(?); +void func_8005DFAC(GlobalContext* globalCtx, Collider* collider, Vec3f* v); // ? func_8005E4F8(?); // ? func_8005E604(?); // ? func_8005E800(?); @@ -833,7 +837,7 @@ s32 CollisionCheck_GeneralLineOcCheck(GlobalContext* globalCtx, CollisionCheckCo // ? func_800626B0(?); void Collider_CylinderUpdate(Actor* actor, ColliderCylinder* collider); void func_80062718(ColliderCylinder* collider, Vec3s* pos); -// ? func_80062734(?); +void func_80062734(ColliderQuad* collider, Vec3f* a, Vec3f* b, Vec3f* c, Vec3f* d); void func_800627A0(ColliderTris* collider, s32 index, Vec3f* a, Vec3f* b, Vec3f* c); void func_800628A4(s32 arg0, ColliderJntSph* collider); void func_80062A28(GlobalContext*, Vec3f*); @@ -845,7 +849,7 @@ void func_80062E14(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2); s32 func_80062ECC(f32, f32, f32, Vec3f*, Vec3f*, Vec3f*, Vec3f*, Vec3f*); void SaveContext_Init(void); // ? func_800636C0(?); -void func_8006375C(s32 arg0, s32 arg1, float* d_80855320); +void func_8006375C(s32 arg0, s32 arg1, const char* text); // ? func_8006376C(?); // ? func_80063828(?); void func_8006390C(Input* input); @@ -940,15 +944,17 @@ void func_800775D8(); s32 func_800775E4(); void func_800775F0(u16); // ? func_80077600(?); +void func_800776E4(GlobalContext* globalCtx); void Lib_MemSet(u8* dest, size_t size, u8 val); f32 Math_Coss(s16 angle); f32 Math_Sins(s16 angle); -s32 Math_ApproxUpdateScaledS(s16* fp, s16 target, s16 step); -s32 Math_ApproxS(s16* fp, s16 target, s16 step); -s32 Math_ApproxF(f32* fp, f32 target, f32 step); -s32 func_80077AF8(s16* fp, s16 target, s16 step); -s32 func_80077B58(s16* fp, s16 target, s16 step); -s32 func_80077C6C(f32* fp, f32 target, f32 incrStep, f32 decrStep); +s32 Math_ApproxUpdateScaledS(s16* pValue, s16 target, s16 step); +s32 Math_ApproxS(s16* pValue, s16 target, s16 step); +s32 Math_ApproxF(f32* pValue, f32 target, f32 step); +s32 func_80077AF8(s16* pValue, s16 target, s16 step); +s32 func_80077B58(s16* pValue, s16 target, s16 step); +s32 func_80077C6C(f32* pValue, f32 target, f32 incrStep, f32 decrStep); +void func_80077D10(f32* arg0, s16* arg1, Input* input); s16 Math_Rand_S16Offset(s16 base, s16 range); void Math_Vec3f_Copy(Vec3f* dest, Vec3f* src); void Math_Vec3s_ToVec3f(Vec3f* dest, Vec3s* src); @@ -975,6 +981,7 @@ void Health_InitData(GlobalContext* globalCtx); void Health_UpdateData(GlobalContext* globalCtx); void Health_Draw(GlobalContext* globalCtx); void Health_HandleCriticalAlarm(GlobalContext* globalCtx); +u32 Health_IsCritical(void); void Lights_PointSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius, s32 type); void Lights_PointNoGlowSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius); void Lights_PointGlowSetInfo(LightInfo* info, s16 x, s16 y, s16 z, u8 r, u8 g, u8 b, s16 radius); @@ -1039,7 +1046,7 @@ Vec3f* OLib_Vec3fDiffRad(Vec3f* dest, Vec3f* a, Vec3f* b); // ? func_8007FFE0(?); // ? func_80080024(?); s16 func_800800F8(GlobalContext* globalCtx, s16 arg1, s16 arg2, Actor* actor, s16 arg4); -UNK_TYPE func_800803F0(GlobalContext* globalCtx, s16 arg1); +void func_800803F0(GlobalContext* globalCtx, s16 camId); // ? func_80080480(?); void func_80080788(UNK_TYPE, UNK_TYPE); void Map_SavePlayerInitialInfo(GlobalContext* globalCtx); @@ -1076,6 +1083,7 @@ void func_80087680(GlobalContext* globalCtx); void func_800876C8(GlobalContext* globalCtx); s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2); void func_80088AA0(s16 seconds); +void func_80088AF0(GlobalContext* globalCtx); void func_80088B34(s16 arg0); void Interface_Draw(GlobalContext* globalCtx); void Interface_Update(GlobalContext* globalCtx); @@ -1084,50 +1092,54 @@ f32 Path_OrientAndGetDistSq(Actor* actor, Path* path, s16 waypoint, s16* yaw); void Path_CopyLastPoint(Path* path, Vec3f* dest); // ? func_8008E6A0(?); // ? func_8008E6AC(?); -// ? func_8008E750(?); -s32 func_8008E8DC(GlobalContext*, Player*); -s32 func_8008E988(GlobalContext*); +void Player_SetBootData(GlobalContext* globalCtx, Player* player); +s32 Player_InBlockingCsMode(GlobalContext* globalCtx, Player* player); +s32 Player_InCsMode(GlobalContext* globalCtx); s32 func_8008E9C4(Player* player); -s32 func_8008E9D0(Player* player); -// ? func_8008E9F8(?); -// ? func_8008EA40(?); -// ? func_8008EB2C(?); -// ? func_8008EC04(?); -void func_8008ECAC(GlobalContext*, Player* player); -void func_8008EDF0(Player*); -// ? func_8008EE08(?); -s32 func_8008EF44(GlobalContext*, s32); -s32 func_8008EF5C(GlobalContext* globalCtx, Vec3f* pos, f32 radius, f32 arg3); -// ? func_8008F034(?); -u8 func_8008F080(GlobalContext*); -Player* func_8008F08C(GlobalContext*); -s32 func_8008F098(GlobalContext*); -s32 func_8008F0AC(GlobalContext*); -s32 func_8008F0D8(Player* player, s32); -s32 func_8008F104(Player* player); +s32 Player_IsChildWithHylianShield(Player* player); +s32 Player_ActionToModelGroup(Player* player, s32 actionParam); +void Player_SetModelsForHoldingShield(Player* player); +void Player_SetModels(Player* player, s32 modelGroup); +void Player_SetModelGroup(Player* player, s32 modelGroup); +void func_8008EC70(Player* player); +void Player_SetEquipmentData(GlobalContext* globalCtx, Player* player); +void Player_UpdateBottleHeld(GlobalContext* globalCtx, Player* player, s32 item, s32 actionParam); +void func_8008EDF0(Player* player); +void func_8008EE08(Player* player); +s32 func_8008EF44(GlobalContext* globalCtx, s32 ammo); +s32 Player_IsBurningStickInRange(GlobalContext* globalCtx, Vec3f* pos, f32 radius, f32 arg3); +s32 Player_GetStrength(void); +u8 Player_GetMask(GlobalContext* globalCtx); +Player* Player_UnsetMask(GlobalContext* globalCtx); +s32 Player_HasMirrorShieldEquipped(GlobalContext* globalCtx); +s32 Player_HasMirrorShieldSetToDraw(GlobalContext* globalCtx); +s32 Player_ActionToMagicSpell(Player* player, s32 actionParam); +s32 Player_HoldsHookshot(Player* player); s32 func_8008F128(Player* player); -s32 func_8008F158(s32); -void func_8008F180(Player* player); -s32 func_8008F1A0(Player* player); -// ? func_8008F1CC(?); -s32 func_8008F224(Player* player, s32); -void func_8008F250(Player* player); -s32 func_8008F270(Player* player, s32); -s32 func_8008F29C(Player* player); -s32 func_8008F2F8(GlobalContext*); -// ? func_8008F470(?); -// ? func_8008F87C(?); -// ? func_8008FCC8(?); -// ? func_800902F0(?); -// ? func_80090440(?); -u8 func_80090480(GlobalContext* globalCtx, Collider* collider, Struct_80090480_arg2* arg2, Vec3f* arg3, Vec3f* arg4); -// ? func_80090604(?); -// ? func_800906D4(?); -// ? func_800907E4(?); -// ? func_80090A28(?); -// ? func_80090AFC(?); -// ? func_80091880(?); -// ? func_80091A24(?); +s32 Player_ActionToSword(s32 actionParam); +s32 Player_GetSwordHeld(Player* player); +s32 Player_HoldsTwoHandedWeapon(Player* player); +s32 Player_HoldsBrokenKnife(Player* player); +s32 Player_ActionToBottle(Player* player, s32 actionParam); +s32 Player_GetBottleHeld(Player* player); +s32 Player_ActionToExplosive(Player* player, s32 actionParam); +s32 Player_GetExplosiveHeld(Player* player); +s32 func_8008F2BC(Player* player, s32 actionParam); +s32 func_8008F2F8(GlobalContext* globalCtx); +void func_8008F470(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limbDrawTable, s32 dListCount, s32 lod, + s32 tunic, s32 boots, s32 face, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, + void* arg); +s32 func_8008FCC8(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor); +s32 func_80090014(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor); +void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor); +s32 func_800902F0(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor); +s32 func_80090440(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor); +u8 func_80090480(GlobalContext* globalCtx, ColliderQuad* collider, WeaponInfo* weaponDim, Vec3f* newTip, + Vec3f* newBase); +void Player_DrawGetItem(GlobalContext* globalCtx, Player* player); +u32 func_80091738(GlobalContext* globalCtx, u8* segment, SkelAnime* skelAnime); +void func_8009214C(GlobalContext* globalCtx, u8* segment, struct_80091A24_arg3* arg2, Vec3f* pos, Vec3s* rot, f32 scale, + s32 sword, s32 tunic, s32 shield, s32 boots); void PreNMI_Init(PreNMIContext* prenmiCtx); Vec3f* Quake_AddVec(Vec3f* dst, Vec3f* arg1, VecSph* arg2); void Quake_UpdateShakeInfo(QuakeRequest* req, ShakeInfo* shake, f32 y, f32 x); @@ -1238,7 +1250,7 @@ void SkelAnime_LoadAnimationType5(GlobalContext* globalCtx, Actor* actor, SkelAn void func_800A390C(GlobalContext* globalCtx, AnimationContext* animationCtx); void SkelAnime_InitLinkAnimetion(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, LinkAnimetionEntry* linkAnimetionEntrySeg, s32 flags, Vec3s* limbDrawTable, - Vec3s* arg6, s32 limbBufCount); + Vec3s* transitionDrawTbl, s32 limbBufCount); void func_800A3B8C(SkelAnime* skelAnime); s32 func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime); void func_800A3C9C(GlobalContext* globalCtx, SkelAnime* skelAnime); @@ -2126,7 +2138,7 @@ void Audio_InitSequencePlayers(void); // ? func_800ECDF8(?); // ? func_800ED200(?); // ? func_800ED458(?); -// ? func_800ED858(?); +void func_800ED858(u8); // ? func_800ED93C(?); // ? func_800EDA3C(?); // ? func_800EDD68(?); @@ -2168,11 +2180,15 @@ void Audio_InitSequencePlayers(void); // ? func_800F3ED4(?); // ? func_800F3F3C(?); // ? func_800F3F84(?); -// ? func_800F4010(?); +void func_800F4010(Vec3f*, u16, f32); +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(?); // ? func_800F4784(?); +void func_800F47BC(void); +void func_800F47FC(void); // ? func_800F491C(?); // ? func_800F4A70(?); void func_800F4C58(Vec3f*, u16, u8); @@ -2185,22 +2201,25 @@ void func_800F574C(f32 arg0, UNK_TYPE arg2); void func_800F595C(u16); void func_800F59E8(u16); // ? func_800F5ACC(?); -// ? func_800F5C64(?); +void func_800F5C64(u16); // ? func_800F5CF8(?); // ? func_800F5E18(?); -// ? func_800F5E90(?); +void func_800F5E90(u8); +void func_800F6114(f32); void func_800F6268(f32, UNK_TYPE); void func_800F6584(UNK_TYPE); // ? func_800F64E0(?); void func_800F6584(UNK_TYPE); // ? func_800F66C0(?); +void func_800F66DC(s8); // ? func_800F6700(?); -// ? func_800F67A0(?); +void func_800F67A0(u8); // ? func_800F6828(?); void func_800F68BC(s8); // ? func_800F68D4(?); // ? func_800F691C(?); void func_800F6964(u16); +void func_800F6AB0(u8); // ? func_800F6B68(?); // ? func_800F6BB8(?); void func_800F6C14(); @@ -2224,7 +2243,7 @@ void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* a1, u32 a2, u32* a3, u32* a4, u32* // ? func_800F87A0(?); // ? func_800F8884(?); void func_800F89E8(Vec3f*); -void func_800F8D04(u32 a0); +void func_800F8D04(u16 arg0); // ? func_800F8D04(?); // ? func_800F8E3C(?); // ? func_800F8F34(?); @@ -2316,10 +2335,10 @@ void SystemArena_Check(); void SystemArena_Init(void* start, u32 size); void SystemArena_Cleanup(); u8 SystemArena_IsInitalized(); -u32 Math_Rand_Next(); +u32 Math_Rand_Next(void); void Math_Rand_Seed(u32 seed); -f32 Math_Rand_ZeroOne(); -f32 Math_Rand_Centered(); +f32 Math_Rand_ZeroOne(void); +f32 Math_Rand_Centered(void); void Math_Rand_Seed_Variable(u32* rndNum, u32 seed); u32 Math_Rand_Next_Variable(u32* rndNum); f32 Math_Rand_ZeroOne_Variable(u32* rndNum); diff --git a/include/macros.h b/include/macros.h index 1f3edf3c7c..7d370507c0 100644 --- a/include/macros.h +++ b/include/macros.h @@ -45,6 +45,16 @@ #define CHECK_QUEST_ITEM(item) (gBitFlags[item] & gSaveContext.questItems) +#define B_BTN_ITEM ((gSaveContext.buttonStatus[0] == ITEM_NONE) \ + ? ITEM_NONE \ + : (gSaveContext.equips.buttonItems[0] == ITEM_SWORD_KNIFE) \ + ? ITEM_SWORD_BGS \ + : gSaveContext.equips.buttonItems[0]) + +#define C_BTN_ITEM(button) ((gSaveContext.buttonStatus[button + 1] != BTN_DISABLED) \ + ? gSaveContext.equips.buttonItems[button + 1] \ + : ITEM_NONE) + #define CHECK_PAD(state, combo) (~(state.in.button | ~(combo)) == 0) #define LOG(exp, value, format, file, line) \ diff --git a/include/variables.h b/include/variables.h index 7e8a0a1cf4..627fe1a489 100644 --- a/include/variables.h +++ b/include/variables.h @@ -27,10 +27,12 @@ extern u8 D_02003AC0[]; extern u32 D_0201DA50; extern u32 D_0300AA48; extern u32 D_03012B20; -//extern ? D_040020D0; -//extern ? D_04002160; -//extern ? D_04002280; -//extern ? D_04003238; +extern Vec3s D_04002040[]; +extern Vec3s D_040020D0[]; +extern Vec3s D_04002160[]; +extern Vec3s D_040021F0[]; +extern Vec3s D_04002280[]; +extern LinkAnimetionEntry D_04003238; extern u32 D_04004298; extern u8 D_04006020[]; extern Gfx D_0400C820[]; @@ -56,16 +58,16 @@ extern u32 D_04049AD0; //extern ? D_0404D1C0; extern Gfx D_0404D450[]; //extern ? D_0500CA70; -//extern ? D_06006CC0; -//extern ? D_06016118; -//extern ? D_06025218; -//extern ? D_060252D8; -//extern ? D_06025438; -//extern ? D_06025598; -//extern ? D_06025658; -//extern ? D_060257B8; -//extern ? D_0602A738; -//extern ? D_0602CB48; +extern Gfx D_06006CC0[]; +extern Gfx D_06016118[]; +extern Gfx D_06025218[]; +extern Gfx D_060252D8[]; +extern Gfx D_06025438[]; +extern Gfx D_06025598[]; +extern Gfx D_06025658[]; +extern Gfx D_060257B8[]; +extern Gfx D_0602A738[]; +extern Gfx D_0602CB48[]; //extern ? D_070380D4; //extern ? D_0703811C; extern u8 D_080895C0[]; @@ -408,50 +410,18 @@ extern s16 D_80120130; //extern ? D_80123978; //extern ? D_801239D4; extern MapData gMapDataTable; -//extern ? D_80125870; extern s16 gSpoilingItems[3]; extern s16 gSpoilingItemReverts[3]; -//extern ? D_80125B78; -//extern ? D_80125C88; -//extern ? D_80125C98; -//extern ? D_80125D68; -//extern ? D_80125E08; -//extern ? D_80125E18; -//extern ? D_80125E58; -//extern ? D_80125F40; -//extern ? D_80125F98; -//extern ? D_80126008; -//extern ? D_80126014; -//extern ? D_8012601C; -//extern ? D_8012602C; -//extern ? D_80126038; -//extern ? D_80126070; -//extern ? D_80126080; -//extern ? D_8012608C; -//extern ? D_80126098; -//extern ? D_801260A4; -//extern ? D_801260B0; -//extern ? D_801260BC; -//extern ? D_801260C8; -//extern ? D_801260D4; -//extern ? D_80126100; -//extern ? D_80126128; -//extern ? D_80126134; -//extern ? D_80126154; -//extern ? D_80126184; -//extern ? D_80126190; -//extern ? D_8012619C; -//extern ? D_801261CC; -//extern ? D_801261D8; -//extern ? D_801261E0; -//extern ? D_80126200; -//extern ? D_80126210; -//extern ? D_80126218; -//extern ? D_80126228; -//extern ? D_80126234; -//extern ? D_80126240; -//extern ? D_80126250; -//extern ? D_80126254; +extern SkeletonHeader* gPlayerSkelHeaders[2]; +extern u8 gPlayerModelTypes[][5]; +extern Gfx* D_80125D68[]; +extern Gfx* D_80125DE8[]; +extern Gfx* D_80125E08[]; +extern Gfx* D_80125E18[]; +extern Gfx* D_80125E58[]; +extern Gfx* D_80125EF8[]; +extern Gfx gCullBackDList[]; +extern Gfx gCullFrontDList[]; extern Gfx gEmptyDL[]; extern u32 gBitFlags[32]; extern u16 gEquipMasks[4]; @@ -3403,14 +3373,6 @@ extern u8 D_8015FD70; //extern ? D_8015FDB0; //extern ? D_8015FDF8; extern MapData* gMapData; -//extern ? D_80160001; -//extern ? D_80160004; -//extern ? D_80160005; -//extern ? D_80160006; -//extern ? D_80160008; -//extern ? D_80160010; -//extern ? D_80160014; -//extern ? D_80160018; //extern ? D_80160020; //extern ? D_801600C0; extern u8 D_80161010; diff --git a/include/z64.h b/include/z64.h index e5e42d2f59..28e3866550 100644 --- a/include/z64.h +++ b/include/z64.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -109,13 +110,13 @@ typedef struct { /* 0x0032 */ s8 magicLevel; /* 0x0033 */ s8 magic; /* 0x0034 */ s16 rupees; - /* 0x0036 */ u16 bgsHitsLeft; + /* 0x0036 */ u16 swordHealth; /* 0x0038 */ u16 naviTimer; /* 0x003A */ u8 magicAcquired; /* 0x003B */ char unk_3B[0x0001]; /* 0x003C */ u8 doubleMagic; /* 0x003D */ u8 doubleDefense; - /* 0x003E */ s8 bgsFlag; + /* 0x003E */ u8 bgsFlag; /* 0x0040 */ ItemEquips childEquips; /* 0x004A */ ItemEquips adultEquips; /* 0x0054 */ char unk_54[0x0014]; @@ -162,9 +163,12 @@ typedef struct { /* 0x1360 */ s32 sceneSetupIndex; /* 0x1364 */ s32 respawnFlag; // "restart_flag" /* 0x1368 */ RespawnData respawn[3]; // "restart_data" - /* 0x13BC */ char unk_13BC[0x0008]; + /* 0x13BC */ f32 unk_13BC; + /* 0x13C0 */ u16 unk_13C0; + /* 0x13C2 */ char unk_13C2[0x0001]; + /* 0x13C3 */ u8 unk_13C3; /* 0x13C4 */ s16 dogParams; - /* 0x13C6 */ u8 unk_13C6; + /* 0x13C6 */ u8 textTriggerFlags; /* 0x13C7 */ u8 unk_13C7; /* 0x13C8 */ s16 nayrusLoveTimer; /* 0x13CA */ char unk_13CA[0x0002]; @@ -606,7 +610,7 @@ typedef struct { } TargetContext; // size = 0x98 typedef struct { - /* 0x00 */ u32 texture; + /* 0x00 */ u8* texture; /* 0x04 */ s16 unk_4; /* 0x06 */ s16 unk_6; /* 0x08 */ u8 unk_8; @@ -618,7 +622,7 @@ typedef struct { } TitleCardContext; // size = 0x10 typedef struct { - /* 0x00 */ u32 length; // number of actors loaded of this type + /* 0x00 */ s32 length; // number of actors loaded of this type /* 0x04 */ Actor* first; // pointer to first actor of this type } ActorListEntry; // size = 0x08 @@ -1103,10 +1107,10 @@ typedef struct { } ActorEntry; // size = 0x10 typedef struct { - /* 0x00 */ s8 frontRoom; // Room to switch to when triggered from the front of the object - /* 0x01 */ s8 frontEffects; // How the camera reacts during the front transition - /* 0x02 */ s8 backRoom; // Room to switch to when triggered from the back of the object - /* 0x03 */ s8 backEffects; // How the camera reacts during the back transition + struct { + s8 room; // Room to switch to + s8 effects; // How the camera reacts during the transition + } /* 0x00 */ sides[2]; // 0 = front, 1 = back /* 0x04 */ s16 id; /* 0x06 */ Vec3s pos; /* 0x0C */ s16 rotY; @@ -1178,7 +1182,6 @@ typedef struct { typedef struct SelectContext { /* 0x0000 */ GameState state; - /* 0x00A4 */ s32 unk_A4; /* 0x00A8 */ View view; /* 0x01D0 */ s32 count; /* 0x01D4 */ SceneSelectEntry* scenes; @@ -1224,7 +1227,6 @@ typedef struct GlobalContext { /* 0x000A6 */ u8 sceneConfig; /* 0x000A7 */ char unk_A7[0x9]; /* 0x000B0 */ void* sceneSegment; - /* 0x000B4 */ char unk_B4[0x4]; /* 0x000B8 */ View view; /* 0x001E0 */ Camera mainCamera; /* 0x001E0 */ Camera subCameras[3]; @@ -1252,11 +1254,15 @@ typedef struct GlobalContext { /* 0x11D30 */ s16 unk_11D30[2]; /* 0x11D34 */ u8 nbTransitionActors; /* 0x11D38 */ TransitionActorEntry* transitionActorList; - /* 0x11D3C */ char unk_11D3C[0x10]; - /* 0x11D4C */ s32 (*unk_11D4C)(struct GlobalContext*, Actor*); - /* 0x11D50 */ char unk_11D50[0x8]; - /* 0x11D58 */ void (*unk_11D58)(struct GlobalContext*, s32); - /* 0x11D5C */ void (*unk_11D5C)(struct GlobalContext*, Actor*); + /* 0x11D3C */ void (*playerInit)(Player* player, struct GlobalContext* globalCtx, SkeletonHeader* skelHeader); + /* 0x11D40 */ void (*playerUpdate)(Player* player, struct GlobalContext* globalCtx, Input* input); + /* 0x11D44 */ s32 (*isPlayerDroppingFish)(struct GlobalContext* globalCtx); + /* 0x11D48 */ s32 (*startPlayerFishing)(struct GlobalContext* globalCtx); + /* 0x11D4C */ s32 (*grabPlayer)(struct GlobalContext* globalCtx, Player* player); + /* 0x11D50 */ s32 (*startPlayerCutscene)(struct GlobalContext* globalCtx, Actor* actor, s32 mode); + /* 0x11D54 */ void (*func_11D54)(Player* player, struct GlobalContext* globalCtx); + /* 0x11D58 */ s32 (*damagePlayer)(struct GlobalContext* globalCtx, s32 damage); + /* 0x11D5C */ void (*talkWithPlayer)(struct GlobalContext* globalCtx, Actor* actor); /* 0x11D60 */ MtxF mf_11D60; /* 0x11DA0 */ MtxF mf_11DA0; /* 0x11DE0 */ Mtx* unk_11DE0; @@ -1271,7 +1277,7 @@ typedef struct GlobalContext { /* 0x11DF8 */ ActorEntry* setupActorList; /* 0x11DFC */ UNK_PTR unk_11DFC; /* 0x11E00 */ EntranceEntry* setupEntranceList; - /* 0x11E04 */ UNK_PTR setupExitList; + /* 0x11E04 */ s16* setupExitList; /* 0x11E08 */ Path* setupPathList; /* 0x11E0C */ ElfMessage* cUpElfMsgs; /* 0x11E10 */ char unk_11E10[0x4]; @@ -1301,7 +1307,6 @@ typedef struct GlobalContext { typedef struct { /* 0x0000 */ GameState state; - /* 0x00A4 */ char unk_A4[4]; /* 0x00A8 */ View view; } OpeningContext; // size = 0x1D0 @@ -2027,4 +2032,13 @@ typedef struct { /* 0x04 */ const char* name; } FlagSetEntry; // size = 0x08 +typedef struct { + /* 0x00 */ u8 limbCount; + /* 0x01 */ char unk_01[0x01]; + /* 0x02 */ u8 dListCount; + /* 0x04 */ Skeleton* skeleton; + /* 0x08 */ char unk_08[0x18]; + /* 0x20 */ Vec3s* limbDrawTable; +} struct_80091A24_arg3; // size >= 0x24 + #endif diff --git a/include/z64actor.h b/include/z64actor.h index 620d3b535b..a9b43a1aab 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -1,6 +1,7 @@ #ifndef _Z64ACTOR_H_ #define _Z64ACTOR_H_ +#include #include #include #include @@ -96,7 +97,7 @@ typedef struct { typedef struct { /* 0x00 */ Vec3s rot; // Current actor shape rotation - /* 0x06 */ u8 unk_06; + /* 0x06 */ s16 unk_06; /* 0x08 */ f32 unk_08; // Model y axis offset. Represents model space units. collision mesh related /* 0x0C */ void (*shadowDrawFunc)(struct Actor*, struct Lights*, struct GlobalContext*); /* 0x10 */ f32 unk_10; @@ -190,12 +191,6 @@ typedef struct { /* 0x162 */ s16 unk_162; } DynaPolyActor; // size = 0x164 -typedef struct { - /* 0x00 */ s32 active; - /* 0x04 */ Vec3f tip; - /* 0x10 */ Vec3f base; -} Struct_80090480_arg2; - typedef struct { /* 0x00 */ MtxF* unk_00; /* 0x04 */ s16* unk_04; @@ -206,163 +201,6 @@ typedef struct { /* 0x14 */ s32 unk_14; } struct_80032E24; -struct Player; - -typedef void (*PlayerActionFunc)(struct Player*, struct GlobalContext*); - -typedef struct Player { - /* 0x0000 */ Actor actor; - /* 0x014C */ s8 currentTunic; - /* 0x014D */ s8 currentSword; - /* 0x014E */ s8 currentShield; - /* 0x014F */ s8 currentBoots; - /* 0x0150 */ s8 heldItemCButtonIdx; - /* 0x0151 */ s8 heldItemActionParam; - /* 0x0152 */ s8 unk_152; - /* 0x0153 */ s8 unk_153; - /* 0x0154 */ s8 unk_154; - /* 0x0155 */ char unk_155[0x003]; - /* 0x0158 */ s8 unk_158; - /* 0x0159 */ char unk_159[0x002]; - /* 0x015B */ u8 unk_15B; - /* 0x015C */ u8 unk_15C; - /* 0x015D */ u8 unk_15D; - /* 0x015E */ u8 unk_15E; - /* 0x015F */ u8 currentMask; - /* 0x0160 */ UNK_PTR unk_160; - /* 0x0164 */ UNK_PTR unk_164; - /* 0x0168 */ UNK_PTR unk_168; - /* 0x016C */ UNK_PTR unk_16C; - /* 0x0170 */ u8 unk_170; - /* 0x0171 */ char unk_171[0x023]; - /* 0x0194 */ OSMesgQueue unk_194; - /* 0x01AC */ char unk_1AC[0x004]; - /* 0x01B0 */ void* getItemModel; // Pointer to the space where the get item model is allocated - /* 0x01B4 */ SkelAnime skelAnime; - /* 0x01F8 */ char unk_1F8[0x1B4]; - /* 0x03AC */ Actor* heldActor; - /* 0x03B0 */ Vec3f unk_3B0; // related to links hands - /* 0x03BC */ char unk_3BC[0x00C]; - /* 0x03C8 */ Vec3f unk_3C8; - /* 0x03D4 */ char unk_3D4[0x058]; - /* 0x042C */ s8 unk_42C; - /* 0x042D */ s8 unk_42D; - /* 0x042E */ s16 unk_42E; - /* 0x0430 */ Actor* unk_430; - /* 0x0434 */ u8 getItemId; - /* 0x0435 */ char unk_435[0x001]; - /* 0x0436 */ u16 getItemDirection; - /* 0x0438 */ Actor* interactRangeActor; - /* 0x043C */ s8 unk_43C; - /* 0x043D */ char unk_43D[0x003]; - /* 0x0440 */ Actor* rideActor; - /* 0x0444 */ u8 action; - /* 0x0445 */ char unk_445[0x003]; - /* 0x0448 */ Actor* unk_448; - /* 0x044C */ char unk_44C[0x004]; - /* 0x0450 */ Vec3f unk_450; - /* 0x045C */ char unk_45C[0x00E]; - /* 0x046A */ u16 unk_46A; - /* 0x046C */ char unk_46C[0x06E]; - /* 0x04DA */ s16 unk_4DA; - /* 0x04DC */ char unk_4DC[0x008]; - /* 0x04E4 */ Collider unk_4E4; // TODO determine type - /* 0x04FC */ char unk_4FC[0x068]; - /* 0x0564 */ Collider unk_564; // TODO determine type - /* 0x057C */ char unk_57C[0x07C]; - /* 0x05F8 */ u8 unk_5F8; - /* 0x05F9 */ char unk_5F9[0x06B]; - /* 0x0664 */ Actor* unk_664; - /* 0x0668 */ char unk_668[0x004]; - /* 0x066C */ s32 unk_66C; - /* 0x0670 */ u32 swordEffectId; - /* 0x0674 */ PlayerActionFunc actionFunc; - /* 0x0678 */ u32 ageProperties; - /* 0x067C */ u32 stateFlags1; - /* 0x0680 */ u32 stateFlags2; - /* 0x0684 */ Actor* unk_684; - /* 0x0688 */ char unk_688[0x004]; - /* 0x068C */ Actor* navi; - /* 0x0690 */ s16 naviMessageId; - /* 0x0692 */ u8 unk_692; - /* 0x0693 */ s8 exchangeItemId; - /* 0x0694 */ Actor* naviTargetActor; - /* 0x0698 */ f32 targetActorDistance; - /* 0x069C */ char unk_69C[0x008]; - /* 0x06A4 */ f32 unk_6A4; - /* 0x06A8 */ Actor* unk_6A8; - /* 0x06AC */ char unk_6AC[0x001]; - /* 0x06AD */ u8 unk_6AD; - /* 0x06AE */ char unk_6AE[0x2]; - /* 0x06B0 */ s16 unk_6B0; - /* 0x06B2 */ char unk_6B4[0x4]; - /* 0x06B6 */ Vec3s unk_6B6; - /* 0x06BC */ s16 unk_6BC; - /* 0x06BE */ s16 unk_6BE; - /* 0x06C0 */ s16 unk_6C0; - /* 0x06C2 */ s16 unk_6C2; - /* 0x06C4 */ f32 unk_6C4; - /* 0x06C8 */ SkelAnime skelAnime2; - /* 0x070C */ char unk_70C[0x128]; - /* 0x0834 */ s16 unk_834; - /* 0x0836 */ char unk_836[0x002]; - /* 0x0838 */ f32 linearVelocity; - /* 0x083C */ s16 currentYaw; - /* 0x083E */ s16 targetYaw; - /* 0x0840 */ u16 unk_840; - /* 0x0842 */ s8 swordAnimation; - /* 0x0843 */ s8 swordState; - /* 0x0844 */ u8 unk_844; - /* 0x0845 */ u8 unk_845; - /* 0x0846 */ u8 unk_846; - /* 0x0847 */ char unk_847[0x004]; - /* 0x084B */ s8 unk_84B[4]; - /* 0x084F */ s8 unk_84F; - /* 0x0850 */ s16 unk_850; - /* 0x0852 */ char unk_852[0x00A]; - /* 0x085C */ f32 stickLength; - /* 0x0860 */ s16 stickFlameTimer; - /* 0x0862 */ s8 overheadItemId; - /* 0x0863 */ char unk_863[0x021]; - - /* 0x0884 */ f32 ledgeDistance; // The distance from link to a grabbable ledge - // Only updates if pushing against a wall with a grabbable ledge above - // If the ledge is too high to grab the value is 399.96f - - /* 0x0888 */ f32 wallDistance; // Only updates if pushing against a wall with a grabbable ledge above - /* 0x088C */ char unk_88C[0x008]; - /* 0x0894 */ s16 dropY; // Truncated copy of y position that does not update while falling - /* 0x0896 */ s16 fallY; // The truncated y distance link has moved in that frame, positive is down, negative is up - /* 0x0898 */ char unk_898[0x008]; - /* 0x08A0 */ u8 unk_8A0; - /* 0x08A1 */ u8 unk_8A1; - /* 0x08A2 */ u16 unk_8A2; - /* 0x08A4 */ f32 unk_8A4; - /* 0x08A8 */ f32 unk_8A8; - /* 0x08AC */ f32 fanWindSpeed; - /* 0x08B0 */ s16 fanWindDirection; - /* 0x08B2 */ char unk_8B2[0x002]; - /* 0x08B4 */ Struct_80090480_arg2 swordDimensions; // Trail active, tip, base? - /* 0x08D0 */ Struct_80090480_arg2 unk_8D0; - /* 0x08EC */ Struct_80090480_arg2 unk_8EC; - /* 0x0908 */ char unk_908[0x04]; - /* 0x090C */ f32 unk_90C; - /* 0x0910 */ char unk_910[0x4C]; - /* 0x095C */ Vec3f unk_95C; - /* 0x0968 */ char unk_968[0x78]; - /* 0x09E0 */ MtxF mf_9E0; - /* 0x0A20 */ MtxF mf_A20; - /* 0x0A60 */ char unk_A60[0x08]; - /* 0x0A68 */ s8 unk_A68; - /* 0x0A69 */ char unk_A6A[0x0F]; - - /* 0x0A78 */ s8 invincibilityTimer; // Take no damage if this value is nonzero - // Positive induces red flashing, negative does not - // Counts towards zero each frame - - /* 0x0A79 */ char unk_A79[0x1B]; -} Player; // size = 0xA94 - typedef enum { /* 0x00 */ ITEM00_RUPEE_GREEN, /* 0x01 */ ITEM00_RUPEE_BLUE, diff --git a/include/z64collision_check.h b/include/z64collision_check.h index d3d7e35ac5..a510b0c9df 100644 --- a/include/z64collision_check.h +++ b/include/z64collision_check.h @@ -73,20 +73,20 @@ typedef struct { } ColliderInit_Actor; // size = 0x08 typedef struct { - /* 0x00 */ s32 flags; // Toucher Attack ID Flags + /* 0x00 */ u32 flags; // Toucher Attack ID Flags /* 0x04 */ u8 effect; /* 0x05 */ u8 damage; // Damage or Stun Timer } ColliderTouch; // size = 0x08 typedef struct { - /* 0x00 */ s32 flags; // Collision Exclusion Mask + /* 0x00 */ u32 flags; // Collision Exclusion Mask /* 0x04 */ u8 effect; // Damage Effect (Knockback, Fire, etc.) /* 0x05 */ u8 defense; // Damage Resistance /* 0x06 */ Vec3s unk_06; } ColliderBump; // size = 0x0C typedef struct { - /* 0x00 */ s32 flags; // Collision Exclusion Mask + /* 0x00 */ u32 flags; // Collision Exclusion Mask /* 0x04 */ u8 effect; // Damage Effect (Knockback, Fire, etc.) /* 0x05 */ u8 defense; } ColliderBumpInit; // size = 0x08 diff --git a/include/z64dma.h b/include/z64dma.h index b4e4607f68..4c2beb37a4 100755 --- a/include/z64dma.h +++ b/include/z64dma.h @@ -20,4 +20,5 @@ typedef struct { /* 0x08 */ u32 romStart; /* 0x0C */ u32 romEnd; } DmaEntry; + #endif diff --git a/include/z64item.h b/include/z64item.h index 90d61de836..167d09ea70 100644 --- a/include/z64item.h +++ b/include/z64item.h @@ -238,12 +238,17 @@ typedef enum { /* 0x99 */ ITEM_STICK_UPGRADE_30, /* 0x9A */ ITEM_NUT_UPGRADE_30, /* 0x9B */ ITEM_NUT_UPGRADE_40, + /* 0xFC */ ITEM_LAST_USED = 0xFC, + /* 0xFE */ ITEM_NONE_FE = 0xFE, /* 0xFF */ ITEM_NONE = 0xFF } ItemID; +#define ITEM_TRADE_CHILD ITEM_WEIRD_EGG +#define ITEM_TRADE_ADULT ITEM_POCKET_EGG + // Get Item result may vary depending on context (chest/shop/scrub/drop) typedef enum { - /* 0x00 */ GI_INVALID, // Link picks up chest and it sends him flying upwards + /* 0x00 */ GI_NONE, /* 0x01 */ GI_BOMBS_5, /* 0x02 */ GI_NUTS_5, /* 0x03 */ GI_BOMBCHUS_10, @@ -278,7 +283,7 @@ typedef enum { /* 0x20 */ GI_ODD_POTION, /* 0x21 */ GI_SAW, /* 0x22 */ GI_SWORD_BROKEN, - /* 0x23 */ GI_PERSCRIPTION, + /* 0x23 */ GI_PRESCRIPTION, /* 0x24 */ GI_FROG, /* 0x25 */ GI_EYEDROPS, /* 0x26 */ GI_CLAIM_CHECK, @@ -368,9 +373,42 @@ typedef enum { /* 0x7A */ GI_NUT_UPGRADE_40, /* 0x7B */ GI_BULLET_BAG_50, /* 0x7C */ GI_ICE_TRAP, // freezes link when opened from a chest - /* 0x7D */ GI_TEXT_0 // no model appears over Link, shows text id 0 (pocket egg) + /* 0x7D */ GI_TEXT_0, // no model appears over Link, shows text id 0 (pocket egg) + /* 0x7E */ GI_MAX } GetItemID; -#define ITEM_TRADE_ADULT ITEM_POCKET_EGG +typedef enum { + /* 0x00 */ EXCH_ITEM_NONE, + /* 0x01 */ EXCH_ITEM_LETTER_ZELDA, + /* 0x02 */ EXCH_ITEM_WEIRD_EGG, + /* 0x03 */ EXCH_ITEM_CHICKEN, + /* 0x04 */ EXCH_ITEM_BEAN, + /* 0x05 */ EXCH_ITEM_POCKET_EGG, + /* 0x06 */ EXCH_ITEM_POCKET_CUCCO, + /* 0x07 */ EXCH_ITEM_COJIRO, + /* 0x08 */ EXCH_ITEM_ODD_MUSHROOM, + /* 0x09 */ EXCH_ITEM_ODD_POTION, + /* 0x0A */ EXCH_ITEM_SAW, + /* 0x0B */ EXCH_ITEM_SWORD_BROKEN, + /* 0x0C */ EXCH_ITEM_PRESCRIPTION, + /* 0x0D */ EXCH_ITEM_FROG, + /* 0x0E */ EXCH_ITEM_EYEDROPS, + /* 0x0F */ EXCH_ITEM_CLAIM_CHECK, + /* 0x10 */ EXCH_ITEM_MASK_SKULL, + /* 0x11 */ EXCH_ITEM_MASK_SPOOKY, + /* 0x12 */ EXCH_ITEM_MASK_KEATON, + /* 0x13 */ EXCH_ITEM_MASK_BUNNY, + /* 0x14 */ EXCH_ITEM_MASK_TRUTH, + /* 0x15 */ EXCH_ITEM_MASK_GORON, + /* 0x16 */ EXCH_ITEM_MASK_ZORA, + /* 0x17 */ EXCH_ITEM_MASK_GERUDO, + /* 0x18 */ EXCH_ITEM_FISH, + /* 0x19 */ EXCH_ITEM_BLUE_FIRE, + /* 0x1A */ EXCH_ITEM_BUG, + /* 0x1B */ EXCH_ITEM_POE, + /* 0x1C */ EXCH_ITEM_BIG_POE, + /* 0x1D */ EXCH_ITEM_LETTER_RUTO, + /* 0x1E */ EXCH_ITEM_MAX +} ExchangeItemID; #endif diff --git a/include/z64player.h b/include/z64player.h new file mode 100644 index 0000000000..083cbf5c0f --- /dev/null +++ b/include/z64player.h @@ -0,0 +1,377 @@ +#ifndef _Z64PLAYER_H_ +#define _Z64PLAYER_H_ + +#include + +struct Player; + +typedef enum { + /* 0x00 */ PLAYER_SHIELD_NONE, + /* 0x01 */ PLAYER_SHIELD_DEKU, + /* 0x02 */ PLAYER_SHIELD_HYLIAN, + /* 0x03 */ PLAYER_SHIELD_MIRROR, + /* 0x04 */ PLAYER_SHIELD_MAX +} PlayerShield; + +typedef enum { + /* 0x00 */ PLAYER_TUNIC_KOKIRI, + /* 0x01 */ PLAYER_TUNIC_GORON, + /* 0x02 */ PLAYER_TUNIC_ZORA, + /* 0x03 */ PLAYER_TUNIC_MAX +} PlayerTunic; + +typedef enum { + /* 0x00 */ PLAYER_BOOTS_NORMAL, + /* 0x01 */ PLAYER_BOOTS_IRON, + /* 0x02 */ PLAYER_BOOTS_HOVER, + /* Values below are only relevant when setting regs in Player_SetBootData */ + /* 0x03 */ PLAYER_BOOTS_INDOOR, + /* 0x04 */ PLAYER_BOOTS_IRON_UNDERWATER, + /* 0x05 */ PLAYER_BOOTS_NORMAL_CHILD, + /* 0x06 */ PLAYER_BOOTS_MAX +} PlayerBoots; + +typedef enum { + /* 0x00 */ PLAYER_STR_NONE, + /* 0x01 */ PLAYER_STR_BRACELET, + /* 0x02 */ PLAYER_STR_SILVER_G, + /* 0x03 */ PLAYER_STR_GOLD_G, + /* 0x04 */ PLAYER_STR_MAX +} PlayerStrength; + +typedef enum { + /* 0x00 */ PLAYER_MASK_NONE, + /* 0x01 */ PLAYER_MASK_KEATON, + /* 0x02 */ PLAYER_MASK_SKULL, + /* 0x03 */ PLAYER_MASK_SPOOKY, + /* 0x04 */ PLAYER_MASK_BUNNY, + /* 0x05 */ PLAYER_MASK_GORON, + /* 0x06 */ PLAYER_MASK_ZORA, + /* 0x07 */ PLAYER_MASK_GERUDO, + /* 0x08 */ PLAYER_MASK_TRUTH, + /* 0x09 */ PLAYER_MASK_MAX +} PlayerMask; + +typedef enum { + /* 0x00 */ PLAYER_AP_NONE, + /* 0x01 */ PLAYER_AP_LAST_USED, + /* 0x02 */ PLAYER_AP_FISHING_POLE, + /* 0x03 */ PLAYER_AP_SWORD_MASTER, + /* 0x04 */ PLAYER_AP_SWORD_KOKIRI, + /* 0x05 */ PLAYER_AP_SWORD_BGS, + /* 0x06 */ PLAYER_AP_STICK, + /* 0x07 */ PLAYER_AP_HAMMER, + /* 0x08 */ PLAYER_AP_BOW, + /* 0x09 */ PLAYER_AP_BOW_FIRE, + /* 0x0A */ PLAYER_AP_BOW_ICE, + /* 0x0B */ PLAYER_AP_BOW_LIGHT, + /* 0x0C */ PLAYER_AP_BOW_0C, + /* 0x0D */ PLAYER_AP_BOW_0D, + /* 0x0E */ PLAYER_AP_BOW_0E, + /* 0x0F */ PLAYER_AP_SLINGSHOT, + /* 0x10 */ PLAYER_AP_HOOKSHOT, + /* 0x11 */ PLAYER_AP_LONGSHOT, + /* 0x12 */ PLAYER_AP_BOMB, + /* 0x13 */ PLAYER_AP_BOMBCHU, + /* 0x14 */ PLAYER_AP_BOOMERANG, + /* 0x15 */ PLAYER_AP_MAGIC_SPELL_15, + /* 0x16 */ PLAYER_AP_MAGIC_SPELL_16, + /* 0x17 */ PLAYER_AP_MAGIC_SPELL_17, + /* 0x18 */ PLAYER_AP_FARORES_WIND, + /* 0x19 */ PLAYER_AP_NAYRUS_LOVE, + /* 0x1A */ PLAYER_AP_DINS_FIRE, + /* 0x1B */ PLAYER_AP_NUT, + /* 0x1C */ PLAYER_AP_OCARINA_FAIRY, + /* 0x1D */ PLAYER_AP_OCARINA_TIME, + /* 0x1E */ PLAYER_AP_BOTTLE, + /* 0x1F */ PLAYER_AP_BOTTLE_FISH, + /* 0x20 */ PLAYER_AP_BOTTLE_FIRE, + /* 0x21 */ PLAYER_AP_BOTTLE_BUG, + /* 0x22 */ PLAYER_AP_BOTTLE_POE, + /* 0x23 */ PLAYER_AP_BOTTLE_BIG_POE, + /* 0x24 */ PLAYER_AP_BOTTLE_LETTER, + /* 0x25 */ PLAYER_AP_BOTTLE_POTION_RED, + /* 0x26 */ PLAYER_AP_BOTTLE_POTION_BLUE, + /* 0x27 */ PLAYER_AP_BOTTLE_POTION_GREEN, + /* 0x28 */ PLAYER_AP_BOTTLE_MILK, + /* 0x29 */ PLAYER_AP_BOTTLE_MILK_HALF, + /* 0x2A */ PLAYER_AP_BOTTLE_FAIRY, + /* 0x2B */ PLAYER_AP_LETTER_ZELDA, + /* 0x2C */ PLAYER_AP_WEIRD_EGG, + /* 0x2D */ PLAYER_AP_CHICKEN, + /* 0x2E */ PLAYER_AP_BEAN, + /* 0x2F */ PLAYER_AP_POCKET_EGG, + /* 0x30 */ PLAYER_AP_POCKET_CUCCO, + /* 0x31 */ PLAYER_AP_COJIRO, + /* 0x32 */ PLAYER_AP_ODD_MUSHROOM, + /* 0x33 */ PLAYER_AP_ODD_POTION, + /* 0x34 */ PLAYER_AP_SAW, + /* 0x35 */ PLAYER_AP_SWORD_BROKEN, + /* 0x36 */ PLAYER_AP_PRESCRIPTION, + /* 0x37 */ PLAYER_AP_FROG, + /* 0x38 */ PLAYER_AP_EYEDROPS, + /* 0x39 */ PLAYER_AP_CLAIM_CHECK, + /* 0x3A */ PLAYER_AP_MASK_KEATON, + /* 0x3B */ PLAYER_AP_MASK_SKULL, + /* 0x3C */ PLAYER_AP_MASK_SPOOKY, + /* 0x3D */ PLAYER_AP_MASK_BUNNY, + /* 0x3E */ PLAYER_AP_MASK_GORON, + /* 0x3F */ PLAYER_AP_MASK_ZORA, + /* 0x40 */ PLAYER_AP_MASK_GERUDO, + /* 0x41 */ PLAYER_AP_MASK_TRUTH, + /* 0x42 */ PLAYER_AP_LENS, + /* 0x43 */ PLAYER_AP_MAX +} PlayerActionParam; + +typedef enum { + /* 0x00 */ PLAYER_LIMB_NONE, + /* 0x01 */ PLAYER_LIMB_ROOT, + /* 0x02 */ PLAYER_LIMB_WAIST, + /* 0x03 */ PLAYER_LIMB_LOWER, + /* 0x04 */ PLAYER_LIMB_R_THIGH, + /* 0x05 */ PLAYER_LIMB_R_SHIN, + /* 0x06 */ PLAYER_LIMB_R_FOOT, + /* 0x07 */ PLAYER_LIMB_L_THIGH, + /* 0x08 */ PLAYER_LIMB_L_SHIN, + /* 0x09 */ PLAYER_LIMB_L_FOOT, + /* 0x0A */ PLAYER_LIMB_UPPER, + /* 0x0B */ PLAYER_LIMB_HEAD, + /* 0x0C */ PLAYER_LIMB_HAT, + /* 0x0D */ PLAYER_LIMB_COLLAR, + /* 0x0E */ PLAYER_LIMB_L_SHOULDER, + /* 0x0F */ PLAYER_LIMB_L_FOREARM, + /* 0x10 */ PLAYER_LIMB_L_HAND, + /* 0x11 */ PLAYER_LIMB_R_SHOULDER, + /* 0x12 */ PLAYER_LIMB_R_FOREARM, + /* 0x13 */ PLAYER_LIMB_R_HAND, + /* 0x14 */ PLAYER_LIMB_SHEATH, + /* 0x15 */ PLAYER_LIMB_TORSO, + /* 0x16 */ PLAYER_LIMB_MAX +} PlayerLimb; + +#define PLAYER_LIMB_BUF_COUNT PLAYER_LIMB_MAX + 2 // 2 extra entries in limb buffers? + +typedef struct { + /* 0x00 */ f32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ f32 unk_28; + /* 0x2C */ f32 unk_2C; + /* 0x30 */ f32 unk_30; + /* 0x34 */ f32 unk_34; + /* 0x38 */ f32 unk_38; + /* 0x3C */ f32 unk_3C; + /* 0x40 */ f32 unk_40; + /* 0x44 */ Vec3s unk_44; + /* 0x4A */ Vec3s unk_4A[4]; + /* 0x62 */ Vec3s unk_62[4]; + /* 0x7A */ Vec3s unk_7A[2]; + /* 0x86 */ Vec3s unk_86[2]; + /* 0x92 */ u16 unk_92; + /* 0x94 */ u16 unk_94; + /* 0x98 */ LinkAnimetionEntry* unk_98; + /* 0x9C */ LinkAnimetionEntry* unk_9C; + /* 0xA0 */ LinkAnimetionEntry* unk_A0; + /* 0xA4 */ LinkAnimetionEntry* unk_A4; + /* 0xA8 */ LinkAnimetionEntry* unk_A8; + /* 0xAC */ LinkAnimetionEntry* unk_AC[4]; + /* 0xBC */ LinkAnimetionEntry* unk_BC[2]; + /* 0xC4 */ LinkAnimetionEntry* unk_C4[2]; + /* 0xCC */ LinkAnimetionEntry* unk_CC[2]; +} PlayerAgeProperties; // size = 0xD4 + +typedef struct { + /* 0x00 */ s32 active; + /* 0x04 */ Vec3f tip; + /* 0x10 */ Vec3f base; +} WeaponInfo; // size = 0x1C + +typedef void (*PlayerFunc674)(struct Player*, struct GlobalContext*); +typedef s32 (*PlayerFunc82C)(struct Player*, struct GlobalContext*); +typedef void (*PlayerFuncA74)(struct GlobalContext*, struct Player*); + +typedef struct Player { + /* 0x0000 */ Actor actor; + /* 0x014C */ s8 currentTunic; // current tunic from `PlayerTunic` + /* 0x014D */ s8 currentSword; // current sword Item ID + /* 0x014E */ s8 currentShield; // current shield from `PlayerShield` + /* 0x014F */ s8 currentBoots; // current boots from `PlayerBoots` + /* 0x0150 */ s8 heldItemButton; // Button index for the item currently used + /* 0x0151 */ s8 heldItemActionParam; // Action param for the item currently used + /* 0x0152 */ u8 heldItemId; // Item id for the item currently used + /* 0x0153 */ s8 prevBoots; // previous boots from `PlayerBoots` + /* 0x0154 */ s8 itemActionParam; // the difference between this and heldItemActionParam is unclear + /* 0x0155 */ char unk_155[0x003]; + /* 0x0158 */ u8 modelGroup; + /* 0x0159 */ u8 nextModelGroup; + /* 0x015A */ s8 unk_15A; + /* 0x015B */ u8 modelAnimType; + /* 0x015C */ u8 leftHandType; + /* 0x015D */ u8 rightHandType; + /* 0x015E */ u8 sheathType; + /* 0x015F */ u8 currentMask; // current mask equipped from `PlayerMask` + /* 0x0160 */ Gfx** rightHandDLists; + /* 0x0164 */ Gfx** leftHandDLists; + /* 0x0168 */ Gfx** sheathDLists; + /* 0x016C */ Gfx** waistDLists; + /* 0x0170 */ u8 giObjectLoading; + /* 0x0174 */ DmaRequest giObjectDmaRequest; + /* 0x0194 */ OSMesgQueue giObjectLoadQueue; + /* 0x01AC */ OSMesg giObjectLoadMsg; + /* 0x01B0 */ void* giObjectSegment; // also used for title card textures + /* 0x01B4 */ SkelAnime skelAnime; + /* 0x01F8 */ Vec3s limbDrawTable[PLAYER_LIMB_BUF_COUNT]; + /* 0x0288 */ Vec3s transitionDrawTable[PLAYER_LIMB_BUF_COUNT]; + /* 0x0318 */ Vec3s unk_318[PLAYER_LIMB_BUF_COUNT]; + /* 0x03A8 */ s16 unk_3A8[2]; + /* 0x03AC */ Actor* heldActor; + /* 0x03B0 */ Vec3f leftHandPos; + /* 0x03BC */ Vec3s unk_3BC; + /* 0x03C4 */ Actor* unk_3C4; + /* 0x03C8 */ Vec3f unk_3C8; + /* 0x03D4 */ char unk_3D4[0x058]; + /* 0x042C */ s8 doorType; + /* 0x042D */ s8 doorDirection; + /* 0x042E */ s16 doorTimer; + /* 0x0430 */ Actor* doorActor; + /* 0x0434 */ s8 getItemId; + /* 0x0436 */ u16 getItemDirection; + /* 0x0438 */ Actor* interactRangeActor; + /* 0x043C */ s8 unk_43C; + /* 0x043D */ char unk_43D[0x003]; + /* 0x0440 */ Actor* rideActor; + /* 0x0444 */ u8 csMode; + /* 0x0445 */ u8 prevCsMode; + /* 0x0446 */ u8 unk_446; + /* 0x0447 */ u8 unk_447; + /* 0x0448 */ Actor* unk_448; + /* 0x044C */ char unk_44C[0x004]; + /* 0x0450 */ Vec3f unk_450; + /* 0x045C */ Vec3f unk_45C; + /* 0x0468 */ char unk_468[0x002]; + /* 0x046A */ s16 unk_46A; + /* 0x046C */ s16 unk_46C; + /* 0x046E */ char unk_46E[0x02A]; + /* 0x0498 */ ColliderCylinder cylinder; + /* 0x04E4 */ ColliderQuad swordQuads[2]; + /* 0x05E4 */ ColliderQuad shieldQuad; + /* 0x0664 */ Actor* unk_664; + /* 0x0668 */ char unk_668[0x004]; + /* 0x066C */ s32 unk_66C; + /* 0x0670 */ s32 swordEffectIndex; + /* 0x0674 */ PlayerFunc674 func_674; + /* 0x0678 */ PlayerAgeProperties* ageProperties; + /* 0x067C */ u32 stateFlags1; + /* 0x0680 */ u32 stateFlags2; + /* 0x0684 */ Actor* unk_684; + /* 0x0688 */ Actor* boomerangActor; + /* 0x068C */ Actor* naviActor; + /* 0x0690 */ s16 naviMessageId; + /* 0x0692 */ u8 stateFlags3; + /* 0x0693 */ s8 exchangeItemId; + /* 0x0694 */ Actor* targetActor; + /* 0x0698 */ f32 targetActorDistance; + /* 0x069C */ char unk_69C[0x004]; + /* 0x06A0 */ f32 unk_6A0; + /* 0x06A4 */ f32 unk_6A4; + /* 0x06A8 */ Actor* unk_6A8; + /* 0x06AC */ s8 unk_6AC; + /* 0x06AD */ u8 unk_6AD; + /* 0x06AE */ u16 unk_6AE; + /* 0x06B0 */ s16 unk_6B0; + /* 0x06B2 */ char unk_6B4[0x004]; + /* 0x06B6 */ s16 unk_6B6; + /* 0x06B8 */ s16 unk_6B8; + /* 0x06BA */ s16 unk_6BA; + /* 0x06BC */ s16 unk_6BC; + /* 0x06BE */ s16 unk_6BE; + /* 0x06C0 */ s16 unk_6C0; + /* 0x06C2 */ s16 unk_6C2; + /* 0x06C4 */ f32 unk_6C4; + /* 0x06C8 */ SkelAnime skelAnime2; + /* 0x070C */ Vec3s limbDrawTable2[PLAYER_LIMB_BUF_COUNT]; + /* 0x079C */ Vec3s transitionDrawTable2[PLAYER_LIMB_BUF_COUNT]; + /* 0x082C */ PlayerFunc82C func_82C; + /* 0x0830 */ f32 unk_830; + /* 0x0834 */ s16 unk_834; + /* 0x0836 */ s8 unk_836; + /* 0x0837 */ u8 unk_837; + /* 0x0838 */ f32 linearVelocity; + /* 0x083C */ s16 currentYaw; + /* 0x083E */ s16 targetYaw; + /* 0x0840 */ u16 unk_840; + /* 0x0842 */ s8 swordAnimation; + /* 0x0843 */ s8 swordState; + /* 0x0844 */ s8 unk_844; + /* 0x0845 */ u8 unk_845; + /* 0x0846 */ u8 unk_846; + /* 0x0847 */ s8 unk_847[4]; + /* 0x084B */ s8 unk_84B[4]; + /* 0x084F */ s8 unk_84F; + /* 0x0850 */ s16 unk_850; // multipurpose timer + /* 0x0854 */ f32 unk_854; + /* 0x0858 */ f32 unk_858; + /* 0x085C */ f32 unk_85C; // stick length among other things + /* 0x0860 */ s16 unk_860; // stick flame timer among other things + /* 0x0862 */ s8 unk_862; // get item draw ID + 1 + /* 0x0864 */ f32 unk_864; + /* 0x0868 */ f32 unk_868; + /* 0x086C */ f32 unk_86C; + /* 0x0870 */ f32 unk_870; + /* 0x0874 */ f32 unk_874; + /* 0x0878 */ f32 unk_878; + /* 0x087C */ s16 unk_87C; + /* 0x087E */ s16 unk_87E; + /* 0x0880 */ f32 unk_880; + /* 0x0884 */ f32 wallHeight; // height used to determine whether link can climb or grab a ledge at the top + /* 0x0888 */ f32 wallDistance; // distance to the colliding wall plane + /* 0x088C */ u8 unk_88C; + /* 0x088D */ u8 unk_88D; + /* 0x088E */ u8 unk_88E; + /* 0x088F */ u8 unk_88F; + /* 0x0890 */ u8 unk_890; + /* 0x0891 */ u8 shockTimer; + /* 0x0892 */ u8 unk_892; + /* 0x0893 */ u8 unk_893; + /* 0x0894 */ s16 fallStartHeight; // last truncated Y position before falling + /* 0x0896 */ s16 fallDistance; // truncated Y distance the player has fallen so far (positive is down) + /* 0x0898 */ s16 unk_898; + /* 0x089A */ s16 unk_89A; + /* 0x089C */ s16 unk_89C; + /* 0x089E */ u16 unk_89E; + /* 0x08A0 */ u8 unk_8A0; + /* 0x08A1 */ u8 unk_8A1; + /* 0x08A2 */ s16 unk_8A2; + /* 0x08A4 */ f32 unk_8A4; + /* 0x08A8 */ f32 unk_8A8; + /* 0x08AC */ f32 windSpeed; + /* 0x08B0 */ s16 windDirection; + /* 0x08B4 */ WeaponInfo swordInfo[3]; + /* 0x0908 */ Vec3f bodyPartsPos[18]; + /* 0x09E0 */ MtxF mf_9E0; + /* 0x0A20 */ MtxF shieldMf; + /* 0x0A60 */ u8 isBurning; + /* 0x0A61 */ u8 flameTimers[18]; // one flame per body part + /* 0x0A73 */ u8 unk_A73; + /* 0x0A74 */ PlayerFuncA74 func_A74; + /* 0x0A78 */ s8 invincibilityTimer; // prevents damage when nonzero (positive = visible, counts towards zero each frame) + /* 0x0A79 */ u8 unk_A79; + /* 0x0A7A */ u8 unk_A7A; + /* 0x0A7B */ u8 unk_A7B; + /* 0x0A7C */ f32 unk_A7C; + /* 0x0A80 */ s16 unk_A80; + /* 0x0A82 */ u16 unk_A82; + /* 0x0A84 */ s16 unk_A84; + /* 0x0A86 */ s8 unk_A86; + /* 0x0A87 */ u8 unk_A87; + /* 0x0A88 */ Vec3f unk_A88; // previous body part 0 position +} Player; // size = 0xA94 + +#endif diff --git a/spec b/spec index b4c6eb0f0d..03295993cb 100644 --- a/spec +++ b/spec @@ -334,8 +334,6 @@ beginseg include "build/src/code/z_path.o" include "build/src/code/code_8008E6A0.o" include "build/src/code/z_player_lib.o" - include "build/data/z_player_lib.data.o" - include "build/data/z_player_lib.bss.o" include "build/src/code/z_prenmi.o" include "build/src/code/z_quake.o" include "build/src/code/z_rcp.o" @@ -585,9 +583,11 @@ endseg beginseg name "ovl_player_actor" include "build/src/overlays/actors/ovl_player_actor/z_player.o" - include "build/data/overlays/actors/z_player.data.o" - include "build/data/overlays/actors/z_player.bss.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_player_actor/ovl_player_actor_reloc.o" +#else include "build/data/overlays/actors/z_player.reloc.o" +#endif endseg beginseg diff --git a/src/code/code_80097A00.c b/src/code/code_80097A00.c index cdf78e9d5e..882d422d1a 100644 --- a/src/code/code_80097A00.c +++ b/src/code/code_80097A00.c @@ -97,7 +97,7 @@ u8 Inventory_DeleteEquipment(GlobalContext* globalCtx, s16 equipment) { gSaveContext.infTable[29] = 1; } - func_8008ECAC(globalCtx, player); + Player_SetEquipmentData(globalCtx, player); globalCtx->pauseCtx.unk_238 = 10; } diff --git a/src/code/code_800A9F30.c b/src/code/code_800A9F30.c index ea56f9243f..f7d16a56a2 100644 --- a/src/code/code_800A9F30.c +++ b/src/code/code_800A9F30.c @@ -27,7 +27,7 @@ void func_800A9F6C(f32 a, u8 b, u8 c, u8 d) { } } -void func_800AA000(float a, u8 b, u8 c, u8 d) { +void func_800AA000(f32 a, u8 b, u8 c, u8 d) { s32 temp1; s32 temp2; s32 i; diff --git a/src/code/code_800FD970.c b/src/code/code_800FD970.c index f5b61740ce..ae2d5916d1 100644 --- a/src/code/code_800FD970.c +++ b/src/code/code_800FD970.c @@ -10,7 +10,7 @@ static u32 sRandFloat; /** * Gets the next integer in the sequence of pseudo-random numbers. */ -u32 Math_Rand_Next() { +u32 Math_Rand_Next(void) { return sRandInt = (sRandInt * 1664525) + 1013904223; } @@ -26,7 +26,7 @@ void Math_Rand_Seed(u32 seed) { * the next integer and masking it to an IEEE-754 compliant floating-point number * between 1.0f and 2.0f, returning the result subtract 1.0f. */ -f32 Math_Rand_ZeroOne() { +f32 Math_Rand_ZeroOne(void) { sRandInt = (sRandInt * 1664525) + 1013904223; sRandFloat = ((sRandInt >> 9) | 0x3F800000); return *((f32*)&sRandFloat) - 1.0f; @@ -36,7 +36,7 @@ f32 Math_Rand_ZeroOne() { * Returns a pseudo-random floating-point number between -0.5f and 0.5f by the same * manner in which Math_Rand_ZeroOne generates its result. */ -f32 Math_Rand_Centered() { +f32 Math_Rand_Centered(void) { sRandInt = (sRandInt * 1664525) + 1013904223; sRandFloat = ((sRandInt >> 9) | 0x3F800000); return *((f32*)&sRandFloat) - 1.5f; diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 8835072be7..3db868799d 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -213,7 +213,7 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, Lights* lights, GlobalContext* #pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/ActorShadow_DrawFunc_Teardrop.s") #endif -void func_8002BDB0(Actor* actor, s32 arg1, s32 arg2, UNK_PTR arg3, s32 arg4, UNK_PTR arg5) { +void func_8002BDB0(Actor* actor, s32 arg1, s32 arg2, Vec3f* arg3, s32 arg4, Vec3f* arg5) { if (arg1 == arg2) { Matrix_MultVec3f(arg3, &actor->unk_CC[0]); } else if (arg1 == arg4) { @@ -667,7 +667,7 @@ void func_8002CDE4(GlobalContext* globalCtx, TitleCardContext* titleCtx) { titleCtx->delayA = titleCtx->delayB = titleCtx->unk_E = titleCtx->unk_C = 0; } -void TitleCard_InitBossName(GlobalContext* globalCtx, TitleCardContext* titleCtx, u32 texture, s16 arg3, s16 arg4, +void TitleCard_InitBossName(GlobalContext* globalCtx, TitleCardContext* titleCtx, void* texture, s16 arg3, s16 arg4, u8 arg5, u8 arg6) { titleCtx->texture = texture; titleCtx->unk_4 = arg3; @@ -678,7 +678,7 @@ void TitleCard_InitBossName(GlobalContext* globalCtx, TitleCardContext* titleCtx titleCtx->delayB = 0; } -void TitleCard_InitPlaceName(GlobalContext* globalCtx, TitleCardContext* titleCtx, u32 texture, s32 arg3, s32 arg4, +void TitleCard_InitPlaceName(GlobalContext* globalCtx, TitleCardContext* titleCtx, void* texture, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) { Scene* loadedScene = globalCtx->loadedScene; u32 size = loadedScene->titleFile.vromEnd - loadedScene->titleFile.vromStart; @@ -886,9 +886,9 @@ void func_8002D9A4(Actor* actor, f32 arg1) { actor->velocity.y = -Math_Sins(actor->posRot.rot.x) * arg1; } -void func_8002D9F8(Actor* actor, UNK_PTR arg1) { +void func_8002D9F8(Actor* actor, SkelAnime* skelAnime) { Vec3f sp1C; - func_800A54FC(arg1, &sp1C, actor->shape.rot.y); + func_800A54FC(skelAnime, &sp1C, actor->shape.rot.y); actor->posRot.pos.x += sp1C.x * actor->scale.x; actor->posRot.pos.y += sp1C.y * actor->scale.y; actor->posRot.pos.z += sp1C.z * actor->scale.z; @@ -984,16 +984,19 @@ s32 func_8002DD78(Player* player) { s32 func_8002DDA8(GlobalContext* globalCtx) { Player* player = PLAYER; + return (player->stateFlags1 & 0x800) || func_8002DD78(player); } s32 func_8002DDE4(GlobalContext* globalCtx) { Player* player = PLAYER; + return player->stateFlags2 & 0x8; } s32 func_8002DDF4(GlobalContext* globalCtx) { Player* player = PLAYER; + return player->stateFlags2 & 0x1000; } @@ -1015,32 +1018,34 @@ void func_8002DE74(GlobalContext* globalCtx, Player* player) { } } -void func_8002DECC(GlobalContext* globalCtx, Player* player, Actor* actor) { - player->rideActor = actor; +void func_8002DECC(GlobalContext* globalCtx, Player* player, Actor* horse) { + player->rideActor = horse; player->stateFlags1 |= 0x800000; - actor->child = &player->actor; + horse->child = &player->actor; } s32 func_8002DEEC(Player* player) { - return (player->stateFlags1 & 0x20000080) || player->action; + return (player->stateFlags1 & 0x20000080) || (player->csMode != 0); } void func_8002DF18(GlobalContext* globalCtx, Player* player) { func_8006DC68(globalCtx, player); } -u32 func_8002DF38(GlobalContext* globalCtx, Actor* actor, u8 newAction) { +s32 func_8002DF38(GlobalContext* globalCtx, Actor* actor, u8 csMode) { Player* player = PLAYER; - player->action = newAction; + + player->csMode = csMode; player->unk_448 = actor; player->unk_46A = 0; return 1; } -s32 func_8002DF54(GlobalContext* globalCtx, Actor* actor, u8 arg2) { +s32 func_8002DF54(GlobalContext* globalCtx, Actor* actor, u8 csMode) { Player* player = PLAYER; - func_8002DF38(globalCtx, actor, arg2); + + func_8002DF38(globalCtx, actor, csMode); player->unk_46A = 1; return 1; @@ -1475,30 +1480,30 @@ u32 func_8002F194(Actor* actor, GlobalContext* globalCtx) { return 0; } -s32 func_8002F1C4(Actor* actor, GlobalContext* globalCtx, f32 arg2, f32 arg3, u32 arg4) { +s32 func_8002F1C4(Actor* actor, GlobalContext* globalCtx, f32 arg2, f32 arg3, u32 exchangeItemId) { Player* player = PLAYER; // This is convoluted but it seems like it must be a single if statement to match - if ((player->actor.flags & 0x100) || ((arg4 != 0) && func_8008E988(globalCtx)) || + if ((player->actor.flags & 0x100) || ((exchangeItemId != EXCH_ITEM_NONE) && Player_InCsMode(globalCtx)) || ((actor->unk_10C == 0) && ((arg3 < fabsf(actor->yDistFromLink)) || (player->targetActorDistance < actor->xzDistFromLink) || (arg2 < actor->xzDistFromLink)))) { return 0; } - player->naviTargetActor = actor; + player->targetActor = actor; player->targetActorDistance = actor->xzDistFromLink; - player->exchangeItemId = arg4; + player->exchangeItemId = exchangeItemId; return 1; } -s32 func_8002F298(Actor* actor, GlobalContext* globalCtx, f32 arg2, u32 arg3) { - return func_8002F1C4(actor, globalCtx, arg2, arg2, arg3); +s32 func_8002F298(Actor* actor, GlobalContext* globalCtx, f32 arg2, u32 exchangeItemId) { + return func_8002F1C4(actor, globalCtx, arg2, arg2, exchangeItemId); } s32 func_8002F2CC(Actor* actor, GlobalContext* globalCtx, f32 arg2) { - return func_8002F298(actor, globalCtx, arg2, 0); + return func_8002F298(actor, globalCtx, arg2, EXCH_ITEM_NONE); } s32 func_8002F2F4(Actor* actor, GlobalContext* globalCtx) { @@ -1516,6 +1521,7 @@ u32 func_8002F334(Actor* actor, GlobalContext* globalCtx) { s8 func_8002F368(GlobalContext* globalCtx) { Player* player = PLAYER; + return player->exchangeItemId; } @@ -1538,20 +1544,20 @@ u32 Actor_HasParent(Actor* actor, GlobalContext* globalCtx) { s32 func_8002F434(Actor* actor, GlobalContext* globalCtx, s32 getItemId, f32 xzRange, f32 yRange) { Player* player = PLAYER; - s16 var; - s32 abs_var; + s16 yawDiff; + s32 absYawDiff; - if (!(player->stateFlags1 & 0x3C7080) && func_8008F29C(player) < 0) { - if ((((player->heldActor != NULL) || (actor == player->naviTargetActor)) && (getItemId > 0) && - (getItemId < 0x7E)) || + if (!(player->stateFlags1 & 0x3C7080) && Player_GetExplosiveHeld(player) < 0) { + if ((((player->heldActor != NULL) || (actor == player->targetActor)) && (getItemId > GI_NONE) && + (getItemId < GI_MAX)) || (!(player->stateFlags1 & 0x20000800))) { if ((actor->xzDistFromLink < xzRange) && (fabsf(actor->yDistFromLink) < yRange)) { - var = actor->yawTowardsLink - player->actor.shape.rot.y; - abs_var = ABS(var); - if ((getItemId != 0) || (player->getItemDirection < abs_var)) { + yawDiff = actor->yawTowardsLink - player->actor.shape.rot.y; + absYawDiff = ABS(yawDiff); + if ((getItemId != GI_NONE) || (player->getItemDirection < absYawDiff)) { player->getItemId = getItemId; player->interactRangeActor = actor; - player->getItemDirection = abs_var; + player->getItemDirection = absYawDiff; return 1; } } @@ -1566,7 +1572,7 @@ void func_8002F554(Actor* actor, GlobalContext* globalCtx, s32 getItemId) { } void func_8002F580(Actor* actor, GlobalContext* globalCtx) { - func_8002F554(actor, globalCtx, 0); + func_8002F554(actor, globalCtx, GI_NONE); } u32 Actor_HasNoParent(Actor* actor, GlobalContext* globalCtx) { @@ -1607,11 +1613,11 @@ u32 Actor_HasChild(GlobalContext* globalCtx, Actor* actor) { } } -u32 func_8002F63C(GlobalContext* globalCtx, Actor* actor, s32 arg2) { +u32 func_8002F63C(GlobalContext* globalCtx, Actor* horse, s32 arg2) { Player* player = PLAYER; if (!(player->stateFlags1 & 0x003C7880)) { - player->rideActor = actor; + player->rideActor = horse; player->unk_43C = arg2; return 1; } @@ -1629,6 +1635,7 @@ u32 Actor_HasNoChild(GlobalContext* globalCtx, Actor* actor) { void func_8002F698(GlobalContext* globalCtx, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6) { Player* player = PLAYER; + player->unk_8A0 = arg6; player->unk_8A1 = arg5; player->unk_8A2 = arg3; @@ -1712,7 +1719,7 @@ void func_8002F994(Actor* actor, s32 arg1) { } } -s32 func_8002F9EC(GlobalContext* globalCtx, Actor* actor, UNK_TYPE arg2, UNK_TYPE arg3, UNK_TYPE arg4) { +s32 func_8002F9EC(GlobalContext* globalCtx, Actor* actor, CollisionPoly* arg2, u32 arg3, Vec3f* arg4) { if (func_80041D4C(&globalCtx->colCtx, arg2, arg3) == 8) { globalCtx->unk_11D30[0] = 1; func_8005DFAC(globalCtx, 0, arg4); @@ -2028,7 +2035,7 @@ void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx) { } if ((player->stateFlags1 & 0x40) && ((player->actor.textId & 0xFF00) != 0x600)) { - sp74 = player->naviTargetActor; + sp74 = player->targetActor; } for (i = 0; i < ARRAY_COUNT(actorCtx->actorList); i++, sp80++) { @@ -2053,7 +2060,7 @@ void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx) { Actor_Kill(actor); actor = actor->next; } else if ((unkFlag && !(actor->flags & unkFlag)) || - (!unkFlag && unkCondition && (sp74 != actor) && (actor != player->navi) && + (!unkFlag && unkCondition && (sp74 != actor) && (actor != player->naviActor) && (actor != player->heldActor) && (&player->actor != actor->parent))) { func_80061E8C(&actor->colChkInfo); actor = actor->next; @@ -2415,7 +2422,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { if ((HREG(64) != 1) || (HREG(72) != 0)) { if (globalCtx->actorCtx.unk_03 != 0) { func_8003115C(globalCtx, invisibleActorCounter, invisibleActors); - if ((globalCtx->csCtx.state != 0) || func_8008E988(globalCtx)) { + if ((globalCtx->csCtx.state != 0) || Player_InCsMode(globalCtx)) { func_800304B0(globalCtx); } } @@ -2800,12 +2807,12 @@ void Actor_SpawnTransitionActors(GlobalContext* globalCtx, ActorContext* actorCt for (i = 0; i < nbTransitionActors; i++) { if (transitionActor->id >= 0) { - if (((transitionActor->frontRoom >= 0) && - ((transitionActor->frontRoom == globalCtx->roomCtx.curRoom.num) || - (transitionActor->frontRoom == globalCtx->roomCtx.prevRoom.num))) || - ((transitionActor->backRoom >= 0) && - ((transitionActor->backRoom == globalCtx->roomCtx.curRoom.num) || - (transitionActor->backRoom == globalCtx->roomCtx.prevRoom.num)))) { + if (((transitionActor->sides[0].room >= 0) && + ((transitionActor->sides[0].room == globalCtx->roomCtx.curRoom.num) || + (transitionActor->sides[0].room == globalCtx->roomCtx.prevRoom.num))) || + ((transitionActor->sides[1].room >= 0) && + ((transitionActor->sides[1].room == globalCtx->roomCtx.curRoom.num) || + (transitionActor->sides[1].room == globalCtx->roomCtx.prevRoom.num)))) { Actor_Spawn(actorCtx, globalCtx, (s16)(transitionActor->id & 0x1FFF), transitionActor->pos.x, transitionActor->pos.y, transitionActor->pos.z, 0, transitionActor->rotY, 0, (i << 0xA) + transitionActor->params); @@ -2955,7 +2962,7 @@ Actor* func_80032AF0(GlobalContext* globalCtx, ActorContext* actorCtx, Actor** a D_8015BBF0 = D_8015BBF4 = FLT_MAX; D_8015BBF8 = 0x7FFFFFFF; - if (!func_8008E988(globalCtx)) { + if (!Player_InCsMode(globalCtx)) { entry = &D_801160A0[0]; actorCtx->targetCtx.unk_90 = NULL; @@ -3376,6 +3383,7 @@ s16 func_800339B8(Actor* actor, GlobalContext* globalCtx, f32 arg2, s16 arg3) { s32 func_80033A84(GlobalContext* globalCtx, Actor* actor) { Player* player = PLAYER; + if ((player->stateFlags1 & 0x10) && (actor->unk_10C != 0)) { return 1; } else { @@ -3385,6 +3393,7 @@ s32 func_80033A84(GlobalContext* globalCtx, Actor* actor) { s32 func_80033AB8(GlobalContext* globalCtx, Actor* actor) { Player* player = PLAYER; + if ((player->stateFlags1 & 0x10) && (actor->unk_10C == 0)) { return 1; } else { @@ -3904,6 +3913,7 @@ s32 func_80035124(Actor* actor, GlobalContext* globalCtx) { u8 func_800353E8(GlobalContext* globalCtx) { Player* player = PLAYER; + return player->unk_845; } @@ -4007,11 +4017,11 @@ void func_80035650(Actor* actor, ColliderBody* colBody, s32 freezeFlag) { actor->unk_116 = 0x04; } else if (colBody->acHitItem->toucher.flags & 0x8000) { actor->unk_116 = 0x08; - } else if ((colBody->acHitItem->toucher.flags << 0xF) < 0) { + } else if (colBody->acHitItem->toucher.flags & 0x10000) { actor->unk_116 = 0x10; } else if (colBody->acHitItem->toucher.flags & 0x2000) { actor->unk_116 = 0x20; - } else if ((colBody->acHitItem->toucher.flags << 0xC) < 0) { + } else if (colBody->acHitItem->toucher.flags & 0x80000) { if (freezeFlag) { actor->freezeTimer = colBody->acHitItem->toucher.damage; } @@ -4107,9 +4117,9 @@ void func_800359B8(Actor* actor, s16 arg1, Vec3s* arg2) { if (actor->floorPoly != NULL) { floorPoly = actor->floorPoly; - sp44 = floorPoly->norm.x * (1.f / 32767); - sp40 = floorPoly->norm.y * (1.f / 32767); - sp3C = floorPoly->norm.z * (1.f / 32767); + sp44 = floorPoly->norm.x * (1.0f / 32767); + sp40 = floorPoly->norm.y * (1.0f / 32767); + sp3C = floorPoly->norm.z * (1.0f / 32767); sp38 = Math_Sins(arg1); sp34 = Math_Coss(arg1); diff --git a/src/code/z_camera.c b/src/code/z_camera.c index a2da2a2ec7..75c536b9f7 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -1907,9 +1907,9 @@ s32 func_80043D18(Camera* camera, Vec3f* arg1, struct_80043D18* arg2) { arg2->unk_24 = sp44; } - arg2->unk_0C.x = arg2->unk_18->norm.x * (1.f / 32767); - arg2->unk_0C.y = arg2->unk_18->norm.y * (1.f / 32767); - arg2->unk_0C.z = arg2->unk_18->norm.z * (1.f / 32767); + arg2->unk_0C.x = arg2->unk_18->norm.x * (1.0f / 32767.0f); + arg2->unk_0C.y = arg2->unk_18->norm.y * (1.0f / 32767.0f); + arg2->unk_0C.z = arg2->unk_18->norm.z * (1.0f / 32767.0f); arg2->unk_00.x = arg2->unk_0C.x + sp68.x; arg2->unk_00.y = arg2->unk_0C.y + sp68.y; arg2->unk_00.z = arg2->unk_0C.z + sp68.z; @@ -1965,9 +1965,9 @@ f32 func_80044434(Camera* camera, Vec3f* arg1, Vec3f* arg2, s32* arg3) { arg1->z = 0.0f; arg1->y = 1.0f; } else { - arg1->x = sp28->norm.x * (1.f / 32767); - arg1->y = sp28->norm.y * (1.f / 32767); - arg1->z = sp28->norm.z * (1.f / 32767); + arg1->x = sp28->norm.x * (1.f / 32767.0f); + arg1->y = sp28->norm.y * (1.f / 32767.0f); + arg1->z = sp28->norm.z * (1.f / 32767.0f); } return temp_ret; @@ -3369,7 +3369,7 @@ void func_80059EC8(Camera* camera) { player->actor.freezeTimer = 0; player->stateFlags1 &= ~0x20000000; - if (player->action != 0) { + if (player->csMode != 0) { func_8002DF54(camera->globalCtx, &player->actor, 7); osSyncPrintf("camera: player demo end!!\n"); } @@ -3545,8 +3545,8 @@ s32 Camera_ChangeMode(Camera* camera, s16 mode, u8 arg2) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/Camera_ChangeMode.s") #endif -void func_8005A444(Camera* camera, s16 arg1) { - Camera_ChangeMode(camera, arg1, 0); +s32 func_8005A444(Camera* camera, s16 arg1) { + return Camera_ChangeMode(camera, arg1, 0); } s32 func_8005A470(Camera* camera, s16 arg1) { @@ -3927,7 +3927,7 @@ Vec3f* func_8005AFB4(Vec3f* dst, Camera* camera) { } void Camera_SetCameraData(Camera* camera, s16 arg1, CutsceneCameraPoint* atPoints, CutsceneCameraPoint* eyePoints, - s16 relativeToPlayer, s16 arg5) { + s16 relativeToPlayer, s16 arg5, s32 arg6) { if (arg1 & 0x1) { camera->atPoints = atPoints; } diff --git a/src/code/z_debug.c b/src/code/z_debug.c index 41f63005c7..21e0eae031 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -54,7 +54,7 @@ void func_800636C0() { // Called when free movement is active. // 8011D394 to enable camera debugger -void func_8006375C(s32 arg0, s32 arg1, float* d_80855320) { +void func_8006375C(s32 arg0, s32 arg1, const char* text) { } // Copy Camera Debugger Text diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 8fe0c4689f..35dc743ff6 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -258,7 +258,7 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* break; case 15: if (sp3F != 0) { - TitleCard_InitPlaceName(globalCtx, &globalCtx->actorCtx.titleCtx, player->getItemModel, 0xA0, 0x78, + TitleCard_InitPlaceName(globalCtx, &globalCtx->actorCtx.titleCtx, player->giObjectSegment, 0xA0, 0x78, 0x90, 0x18, 0x14); } break; @@ -882,9 +882,9 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt break; case 71: gSaveContext.equips.equipment |= 0x0100; - func_8008ECAC(globalCtx, player); + Player_SetEquipmentData(globalCtx, player); gSaveContext.equips.equipment |= 0x1000; - func_8008ECAC(globalCtx, player); + Player_SetEquipmentData(globalCtx, player); globalCtx->linkAgeOnLoad = 1; globalCtx->nextEntranceIndex = 0x0053; globalCtx->sceneLoadFlag = 0x14; @@ -1925,7 +1925,7 @@ void func_80068DC0(GlobalContext* globalCtx, CutsceneContext* csCtx) { void func_80068ECC(GlobalContext* globalCtx, CutsceneContext* csCtx) { u8 i; - if ((gSaveContext.cutsceneTrigger != 0) && (csCtx->state == CS_STATE_IDLE) && !func_8008E988(globalCtx)) { + if ((gSaveContext.cutsceneTrigger != 0) && (csCtx->state == CS_STATE_IDLE) && !Player_InCsMode(globalCtx)) { gSaveContext.cutsceneIndex = 0xFFFD; } diff --git a/src/code/z_face_reaction.c b/src/code/z_face_reaction.c index 906835e333..8bc9c6685d 100644 --- a/src/code/z_face_reaction.c +++ b/src/code/z_face_reaction.c @@ -1,7 +1,7 @@ #include #include -u16 sReactionTextIds[][9] = { +u16 sReactionTextIds[][PLAYER_MASK_MAX] = { { 0x0000, 0x7124, 0x7127, 0x7126, 0x7125, 0x7127, 0x7124, 0x7125, 0x7127 }, { 0x0000, 0x7128, 0x7129, 0x7128, 0x7128, 0x7128, 0x7128, 0x712A, 0x712B }, { 0x0000, 0x7128, 0x712B, 0x7128, 0x7128, 0x7129, 0x7128, 0x712B, 0x7128 }, @@ -65,6 +65,6 @@ u16 sReactionTextIds[][9] = { }; u16 Text_GetFaceReaction(GlobalContext* globalCtx, u32 reactionSet) { - u8 currentMask = func_8008F080(globalCtx); + u8 currentMask = Player_GetMask(globalCtx); return sReactionTextIds[reactionSet][currentMask]; } diff --git a/src/code/z_lib.c b/src/code/z_lib.c index d59cf7374c..01ea0ef866 100644 --- a/src/code/z_lib.c +++ b/src/code/z_lib.c @@ -167,20 +167,14 @@ s32 func_80077C6C(f32* pValue, f32 target, f32 incrStep, f32 decrStep) { return 0; } -typedef struct { - /* 0x00 */ char unk_00[0x14]; - /* 0x14 */ s8 unk_14; - /* 0x14 */ s8 unk_15; -} struct_80077D10; +void func_80077D10(f32* arg0, s16* arg1, Input* input) { + f32 relX = input->rel.in.x; + f32 relY = input->rel.in.y; -void func_80077D10(f32* arg0, s16* arg1, struct_80077D10* arg2) { - f32 var1 = arg2->unk_14; - f32 var2 = arg2->unk_15; - - *arg0 = sqrtf(SQ(var1) + SQ(var2)); + *arg0 = sqrtf(SQ(relX) + SQ(relY)); *arg0 = (60.0f < *arg0) ? 60.0f : *arg0; - *arg1 = atan2s(var2, -var1); + *arg1 = atan2s(relY, -relX); } s16 Math_Rand_S16Offset(s16 base, s16 range) { diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index ce770af1b9..9faf690260 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -176,7 +176,7 @@ s32 func_80078E84(GlobalContext* globalCtx) { if (interfaceCtx->unk_226 <= 0) { interfaceCtx->unk_226 = 0; - globalCtx->unk_11D58(globalCtx, -(gSaveContext.health + 1)); + globalCtx->damagePlayer(globalCtx, -(gSaveContext.health + 1)); return 1; } } @@ -381,8 +381,6 @@ void Health_Draw(GlobalContext* globalCtx) { CLOSE_DISPS(gfxCtx, "../z_lifemeter.c", 606); } -u32 Health_IsCritical(void); - void Health_HandleCriticalAlarm(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; @@ -391,7 +389,7 @@ void Health_HandleCriticalAlarm(GlobalContext* globalCtx) { if (interfaceCtx->unk_22A <= 0) { interfaceCtx->unk_22A = 0; interfaceCtx->unk_22C = 0; - if (!func_8008E988(globalCtx) && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && + if (!Player_InCsMode(globalCtx) && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && Health_IsCritical() && !Gameplay_InCsMode(globalCtx)) { func_80078884(NA_SE_SY_HITPOINT_ALARM); } diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 51e802fafd..ca8fc1d22d 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1240,8 +1240,8 @@ void Interface_InitHorsebackArchery(GlobalContext* globalCtx) { } void func_800849EC(GlobalContext* globalCtx) { - gSaveContext.equipment |= gBitFlags[2] << gEquipShifts[0]; - gSaveContext.equipment ^= 8 << gEquipShifts[0]; + gSaveContext.equipment |= gBitFlags[2] << gEquipShifts[EQUIP_SWORD]; + gSaveContext.equipment ^= 8 << gEquipShifts[EQUIP_SWORD]; if (gBitFlags[3] & gSaveContext.equipment) { gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KNIFE; @@ -1380,7 +1380,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { gSaveContext.equipment |= gBitFlags[item - ITEM_SWORD_KOKIRI] << gEquipShifts[EQUIP_SWORD]; if (item == ITEM_SWORD_BGS) { - gSaveContext.bgsHitsLeft = 8; + gSaveContext.swordHealth = 8; if (ALL_EQUIP_VALUE(EQUIP_SWORD) == 0xF) { gSaveContext.equipment ^= 8 << gEquipShifts[EQUIP_SWORD]; @@ -1997,24 +1997,24 @@ s32 Inventory_HasSpecificBottle(u8 bottleItem) { } } -void Inventory_UpdateBottleItem(GlobalContext* globalCtx, u8 item, u8 cButton) { - osSyncPrintf("item_no=%x, c_no=%x, Pt=%x Item_Register=%x\n", item, cButton, - gSaveContext.equips.cButtonSlots[cButton - 1], - gSaveContext.items[gSaveContext.equips.cButtonSlots[cButton - 1]]); +void Inventory_UpdateBottleItem(GlobalContext* globalCtx, u8 item, u8 button) { + osSyncPrintf("item_no=%x, c_no=%x, Pt=%x Item_Register=%x\n", item, button, + gSaveContext.equips.cButtonSlots[button - 1], + gSaveContext.items[gSaveContext.equips.cButtonSlots[button - 1]]); // Special case to only empty half of a Lon Lon Milk Bottle - if ((gSaveContext.items[gSaveContext.equips.cButtonSlots[cButton - 1]] == ITEM_MILK_BOTTLE) && + if ((gSaveContext.items[gSaveContext.equips.cButtonSlots[button - 1]] == ITEM_MILK_BOTTLE) && (item == ITEM_BOTTLE)) { item = ITEM_MILK_HALF; } - gSaveContext.items[gSaveContext.equips.cButtonSlots[cButton - 1]] = item; - gSaveContext.equips.buttonItems[cButton] = item; + gSaveContext.items[gSaveContext.equips.cButtonSlots[button - 1]] = item; + gSaveContext.equips.buttonItems[button] = item; - Interface_LoadItemIcon1(globalCtx, cButton); + Interface_LoadItemIcon1(globalCtx, button); globalCtx->pauseCtx.unk_23E = item; - gSaveContext.buttonStatus[cButton] = BTN_ENABLED; + gSaveContext.buttonStatus[button] = BTN_ENABLED; } s32 Inventory_ConsumeFairy(GlobalContext* globalCtx) { @@ -3605,7 +3605,7 @@ void Interface_Draw(GlobalContext* globalCtx) { gSaveContext.timer1State = 10; if (D_80125A5C != 0) { gSaveContext.health = 0; - globalCtx->unk_11D58(globalCtx, -(gSaveContext.health + 2)); + globalCtx->damagePlayer(globalCtx, -(gSaveContext.health + 2)); } D_80125A5C = 0; } else if (gSaveContext.timer1Value > 60) { @@ -4156,7 +4156,7 @@ void Interface_Update(GlobalContext* globalCtx) { if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && (msgCtx->msgMode == 0) && (globalCtx->sceneLoadFlag == 0) && (globalCtx->unk_10A20 == 0) && (globalCtx->transitionMode == 0) && - ((globalCtx->csCtx.state == 0) || !func_8008E988(globalCtx))) { + ((globalCtx->csCtx.state == 0) || !Player_InCsMode(globalCtx))) { if ((gSaveContext.magicAcquired != 0) && (gSaveContext.magicLevel == 0)) { gSaveContext.magicLevel = gSaveContext.doubleMagic + 1; gSaveContext.unk_13F0 = 8; diff --git a/src/code/z_play.c b/src/code/z_play.c index 5422448e45..20b04d86ce 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -178,7 +178,7 @@ void Gameplay_Destroy(GlobalContext* globalCtx) { if (gSaveContext.linkAge != globalCtx->linkAgeOnLoad) { Inventory_SwapAgeEquipment(); - func_8008ECAC(globalCtx, player); + Player_SetEquipmentData(globalCtx, player); } func_80031C3C(&globalCtx->actorCtx, globalCtx); @@ -925,7 +925,7 @@ void Gameplay_Update(GlobalContext* globalCtx) { if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.flag != 0)) { // Translates to: "Changing viewpoint is prohibited due to the kaleidoscope" osSyncPrintf(VT_FGCOL(CYAN) "カレイドスコープ中につき視点変更を禁止しております\n" VT_RST); - } else if (func_8008E988(globalCtx)) { + } else if (Player_InCsMode(globalCtx)) { // Translates to: "Changing viewpoint is prohibited during the cutscene" osSyncPrintf(VT_FGCOL(CYAN) "デモ中につき視点変更を禁止しております\n" VT_RST); } else if (YREG(15) == 0x10) { @@ -1372,7 +1372,7 @@ void Gameplay_Main(GlobalContext* globalCtx) { // original name: "Game_play_demo_mode_check" s32 Gameplay_InCsMode(GlobalContext* globalCtx) { - return (globalCtx->csCtx.state != 0) || func_8008E988(globalCtx); + return (globalCtx->csCtx.state != 0) || Player_InCsMode(globalCtx); } f32 func_800BFCB8(GlobalContext* globalCtx, MtxF* mf, Vec3f* vec) { @@ -1801,18 +1801,20 @@ s32 func_800C0D28(GlobalContext* globalCtx) { s32 func_800C0D34(GlobalContext* globalCtx, Actor* actor, s16* yaw) { TransitionActorEntry* transitionActor; + s32 frontRoom; if (actor->type != ACTORTYPE_DOOR) { return 0; } transitionActor = &globalCtx->transitionActorList[(u16)actor->params >> 10]; + frontRoom = transitionActor->sides[0].room; - if (transitionActor->backRoom == transitionActor->frontRoom) { + if (frontRoom == transitionActor->sides[1].room) { return 0; } - if (actor->room == transitionActor->frontRoom) { + if (frontRoom == actor->room) { *yaw = actor->shape.rot.y; } else { *yaw = actor->shape.rot.y + 0x8000; diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index f352be4245..e408cc9890 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -1,24 +1,26 @@ #include +#define FLAGS 0x06000035 + void (*sPlayerCallInitFunc)(Actor* thisx, GlobalContext* globalCtx); void (*sPlayerCallDestroyFunc)(Actor* thisx, GlobalContext* globalCtx); void (*sPlayerCallUpdateFunc)(Actor* thisx, GlobalContext* globalCtx); void (*sPlayerCallDrawFunc)(Actor* thisx, GlobalContext* globalCtx); -void func_80846CD8(Actor* thisx, GlobalContext* globalCtx); -void func_8084AB54(Actor* thisx, GlobalContext* globalCtx); -void func_80849EA8(Actor* thisx, GlobalContext* globalCtx); -void func_8084A5C4(Actor* thisx, GlobalContext* globalCtx); - void PlayerCall_Init(Actor* thisx, GlobalContext* globalCtx); void PlayerCall_Destroy(Actor* thisx, GlobalContext* globalCtx); void PlayerCall_Update(Actor* thisx, GlobalContext* globalCtx); void PlayerCall_Draw(Actor* thisx, GlobalContext* globalCtx); +void Player_Init(Actor* thisx, GlobalContext* globalCtx); +void Player_Destroy(Actor* thisx, GlobalContext* globalCtx); +void Player_Update(Actor* thisx, GlobalContext* globalCtx); +void Player_Draw(Actor* thisx, GlobalContext* globalCtx); + const ActorInit Player_InitVars = { ACTOR_PLAYER, ACTORTYPE_PLAYER, - 0x6000035, + FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(Player), (ActorFunc)PlayerCall_Init, @@ -28,10 +30,10 @@ const ActorInit Player_InitVars = { }; void PlayerCall_InitFuncPtrs() { - sPlayerCallInitFunc = KaleidoManager_GetRamAddr(func_80846CD8); - sPlayerCallDestroyFunc = KaleidoManager_GetRamAddr(func_8084AB54); - sPlayerCallUpdateFunc = KaleidoManager_GetRamAddr(func_80849EA8); - sPlayerCallDrawFunc = KaleidoManager_GetRamAddr(func_8084A5C4); + sPlayerCallInitFunc = KaleidoManager_GetRamAddr(Player_Init); + sPlayerCallDestroyFunc = KaleidoManager_GetRamAddr(Player_Destroy); + sPlayerCallUpdateFunc = KaleidoManager_GetRamAddr(Player_Update); + sPlayerCallDrawFunc = KaleidoManager_GetRamAddr(Player_Draw); } void PlayerCall_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index ea71bae7aa..ba65241a60 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -2,551 +2,1074 @@ #include typedef struct { - u8 unk_0; - u16 unk_2; -} Struct_8008F2F8; + /* 0x00 */ u8 flag; + /* 0x02 */ u16 textId; +} TextTriggerEntry; // size = 0x04 -// TODO decompile data +typedef struct { + /* 0x00 */ void* dList; + /* 0x04 */ Vec3f pos; +} BowStringData; // size = 0x10 -extern SkeletonHeader* D_80125B70[]; +SkeletonHeader* gPlayerSkelHeaders[] = { 0x060377F4, 0x0602CF6C }; -extern s16 D_80125B78[]; +s16 sBootData[PLAYER_BOOTS_MAX][17] = { + { 200, 1000, 300, 700, 550, 270, 600, 350, 800, 600, -100, 600, 590, 750, 125, 200, 130 }, + { 200, 1000, 300, 700, 550, 270, 1000, 0, 800, 300, -160, 600, 590, 750, 125, 200, 130 }, + { 200, 1000, 300, 700, 550, 270, 600, 600, 800, 550, -100, 600, 540, 270, 25, 0, 130 }, + { 200, 1000, 300, 700, 380, 400, 0, 300, 800, 500, -100, 600, 590, 750, 125, 200, 130 }, + { 80, 800, 150, 700, 480, 270, 600, 50, 800, 550, -40, 400, 540, 270, 25, 0, 80 }, + { 200, 1000, 300, 800, 500, 400, 800, 400, 800, 550, -100, 600, 540, 750, 125, 400, 200 }, +}; -extern u8 D_80125C44[]; +// Used to map action params to model groups +u8 sActionModelGroups[] = { + 3, 15, 10, 2, 2, 5, 10, 11, 6, 6, 6, 6, 6, 6, 6, 6, 9, 9, 7, 7, 8, 3, 3, 6, 3, 3, 3, 3, 12, 13, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, +}; -extern Struct_8008F2F8 D_80125C88[]; +TextTriggerEntry sTextTriggers[] = { + { 1, 0x3040 }, + { 2, 0x401D }, + { 0, 0x0000 }, + { 2, 0x401D }, +}; -extern u8 D_80125C98[]; +// Used to map model groups to model types for [animation, left hand, right hand, sheath, waist] +u8 gPlayerModelTypes[][5] = { + { 2, 0, 10, 16, 20 }, { 1, 2, 9, 19, 20 }, { 1, 2, 10, 17, 20 }, { 0, 0, 8, 18, 20 }, + { 0, 0, 8, 18, 20 }, { 3, 4, 9, 19, 20 }, { 4, 1, 11, 18, 20 }, { 5, 0, 8, 18, 20 }, + { 0, 6, 8, 18, 20 }, { 4, 0, 15, 18, 20 }, { 3, 1, 9, 18, 20 }, { 3, 5, 9, 18, 20 }, + { 0, 0, 13, 18, 20 }, { 0, 0, 14, 18, 20 }, { 0, 7, 8, 18, 20 }, { 0, 2, 8, 19, 20 }, +}; -extern UNK_TYPE D_80125F18[]; +Gfx* D_80125CE8[] = { + 0x060226E0, 0x06014320, 0x06027690, 0x06016620, 0x060226E0, 0x06014440, 0x06027690, 0x06016740, + 0x06022970, 0x06014320, 0x06027918, 0x06016620, 0x060241C0, 0x06014320, 0x06028B40, 0x06016620, +}; -extern UNK_TYPE D_80125F20[]; +Gfx* D_80125D28[] = { + 0x06023160, 0x06015248, 0x06027F00, 0x06017360, 0x06023160, 0x06014D68, 0x06027F00, 0x06016EE8, + 0x06020A78, 0x060148A8, 0x06025FB8, 0x06016A98, 0x060211B8, 0x06015248, 0x060264F0, 0x06017360, +}; -extern UNK_TYPE D_80125F28[]; +Gfx* D_80125D68[] = { + NULL, NULL, NULL, NULL, NULL, 0x06022688, NULL, 0x06022688, +}; -extern UNK_TYPE D_80125F30[]; +Gfx* D_80125D88[] = { + 0x060249D8, 0x06015408, 0x06028150, 0x06017500, 0x060249D8, 0x06015010, 0x06028150, 0x06017150, + 0x06020E70, 0x06014B40, 0x060262B8, 0x06016CF8, 0x060216B0, 0x06015408, 0x06026910, 0x06017500, + NULL, NULL, NULL, NULL, 0x060249D8, 0x06022688, 0x060249D8, 0x06022688, +}; -extern UNK_TYPE D_80125F38[]; +Gfx* D_80125DE8[] = { + 0x060238C8, 0x06015540, 0x060286B8, 0x06015540, 0x06023D50, 0x06015540, 0x060291E8, 0x06015540, +}; -extern UNK_PTR D_80125F40[]; +Gfx* D_80125E08[] = { + 0x06021AA8, + 0x06013CB0, + 0x06026C58, + 0x06016280, +}; -extern u8 D_8012607C[]; +Gfx* D_80125E18[] = { + 0x06021CE8, + 0x06013E18, + 0x06026DF0, + 0x060163C0, +}; -extern f32 D_801260D0; +Gfx* D_80125E28[] = { + 0x06021F78, + 0x06013F38, + 0x06027078, + 0x06017630, +}; -extern Vec3f D_801260A4; -extern Vec3f D_801260B0; -extern Vec3f D_801260BC; -extern Vec3f D_801260C8; +Gfx* D_80125E38[] = { + 0x06021F78, + 0x06013F38, + 0x06027078, + 0x06017630, +}; -extern Vec3f D_80126080; -extern Vec3f D_8012608C; -extern Vec3f D_80126098; +Gfx* D_80125E48[] = { + 0x06022498, + 0x060141C0, + 0x060274F8, + 0x060164E0, +}; -// TODO decompile bss +Gfx* D_80125E58[] = { + 0x060226E0, + 0x06014320, + 0x06027690, + 0x06016620, +}; -extern u8 D_80160008[]; // TODO check type +Gfx* D_80125E68[] = { + 0x06022DA8, + 0x06015DF0, + 0x06027B88, + 0x06017D38, +}; -// Segment Addresses +Gfx* D_80125E78[] = { + 0x06023160, + 0x06015248, + 0x06027F00, + 0x06017360, +}; -extern LinkAnimetionEntry D_04003238; -extern UNK_TYPE D_0602A738; -extern UNK_TYPE D_0602CB48; +Gfx* D_80125E88[] = { + 0x060249D8, + 0x06015408, + 0x06028150, + 0x06017500, +}; -void func_8008E750(GlobalContext* globalCtx, Player* player) { +Gfx* D_80125E98[] = { + 0x06035330, + 0x060202A8, + 0x0602F530, + 0x0601AEC8, +}; + +Gfx* D_80125EA8[] = { + 0x06022DA8, + 0x06015DF0, + 0x06027B88, + 0x06017D38, +}; + +Gfx* D_80125EB8[] = { + 0x06024698, + 0x06015BA8, + 0x06028F58, + 0x06017AF0, +}; + +Gfx* D_80125EC8[] = { + 0x06024698, + 0x06015958, + 0x06028F58, + 0x060178A0, +}; + +Gfx* D_80125ED8[] = { + 0x06024D70, + 0x060141C0, + 0x06024D70, + 0x060164E0, +}; + +Gfx* D_80125EE8[] = { + 0x060233E0, + 0x06013CB0, + 0x06028288, + 0x06016280, +}; + +Gfx* D_80125EF8[] = { + 0x06021AA8, + 0x06014660, + 0x06026C58, + 0x06016908, +}; + +Gfx* D_80125F08[] = { + 0x06024B58, + 0x06015FD0, + 0x06024B58, + 0x06015FD0, +}; + +Gfx* D_80125F18[] = { + 0x06029918, + NULL, +}; + +Gfx* D_80125F20[] = { + 0x06029C20, + NULL, +}; + +Gfx* D_80125F28[] = { + 0x06036E58, + 0x06021AE8, +}; + +Gfx* D_80125F30[] = { + 0x06029FA0, + NULL, +}; + +Gfx* D_80125F38[] = { + 0x0602A248, + 0x06018048, +}; + +// Indexed by model types (left hand, right hand, sheath or waist) +Gfx** sPlayerDListGroups[] = { + D_80125E08, D_80125E18, D_80125E38, D_80125E28, D_80125DE8, D_80125EE8, D_80125EF8, + D_80125F08, D_80125E48, D_80125E58, D_80125CE8, D_80125E68, D_80125EA8, D_80125EB8, + D_80125EC8, D_80125ED8, D_80125E78, D_80125E88, D_80125D28, D_80125D88, D_80125E98, +}; + +Gfx gCullBackDList[] = { + gsSPSetGeometryMode(G_CULL_BACK), + gsSPEndDisplayList(), +}; + +Gfx gCullFrontDList[] = { + gsSPSetGeometryMode(G_CULL_FRONT), + gsSPEndDisplayList(), +}; + +Vec3f* D_80160000; +s32 sDListsLodOffset; +Vec3f sGetItemRefPos; +s32 D_80160014; +s32 D_80160018; + +void Player_SetBootData(GlobalContext* globalCtx, Player* this) { s32 currentBoots; - s16* temp_var; + s16* bootRegs; - REG(27) = 0x7D0; - REG(48) = 0x172; + REG(27) = 2000; + REG(48) = 370; - currentBoots = player->currentBoots; - if (currentBoots == 0) { + currentBoots = this->currentBoots; + if (currentBoots == PLAYER_BOOTS_NORMAL) { if (LINK_IS_CHILD) { - currentBoots = 5; + currentBoots = PLAYER_BOOTS_NORMAL_CHILD; } - } else if (currentBoots == 1) { - if ((s32)(player->stateFlags1 * 0x10) < 0) { - currentBoots = 4; + } else if (currentBoots == PLAYER_BOOTS_IRON) { + if (this->stateFlags1 & 0x8000000) { + currentBoots = PLAYER_BOOTS_IRON_UNDERWATER; } - REG(27) = 0x1F4; - REG(48) = 0x64; + REG(27) = 500; + REG(48) = 100; } - temp_var = (s16*)&D_80125B78 + (currentBoots * 0x11); - REG(19) = temp_var[0]; - REG(30) = temp_var[1]; - REG(32) = temp_var[2]; - REG(34) = temp_var[3]; - REG(35) = temp_var[4]; - REG(36) = temp_var[5]; - REG(37) = temp_var[6]; - REG(38) = temp_var[7]; - REG(43) = temp_var[8]; - REG(45) = temp_var[9]; - REG(68) = temp_var[10]; - REG(69) = temp_var[11]; - IREG(66) = temp_var[12]; - IREG(67) = temp_var[13]; - IREG(68) = temp_var[14]; - IREG(69) = temp_var[15]; - MREG(95) = temp_var[16]; + bootRegs = sBootData[currentBoots]; + REG(19) = bootRegs[0]; + REG(30) = bootRegs[1]; + REG(32) = bootRegs[2]; + REG(34) = bootRegs[3]; + REG(35) = bootRegs[4]; + REG(36) = bootRegs[5]; + REG(37) = bootRegs[6]; + REG(38) = bootRegs[7]; + REG(43) = bootRegs[8]; + REG(45) = bootRegs[9]; + REG(68) = bootRegs[10]; + REG(69) = bootRegs[11]; + IREG(66) = bootRegs[12]; + IREG(67) = bootRegs[13]; + IREG(68) = bootRegs[14]; + IREG(69) = bootRegs[15]; + MREG(95) = bootRegs[16]; + if (globalCtx->roomCtx.curRoom.unk_03 == 2) { - REG(45) = 0x1F4; + REG(45) = 500; } } -s32 func_8008E8DC(GlobalContext* globalCtx, Player* player) { - return (player->stateFlags1 & 0x20000080 || player->action || globalCtx->sceneLoadFlag == 0x14 || - player->stateFlags1 & 1 || player->unk_692 & 0x80 || - (gSaveContext.unk_13F0 && func_8008F0D8(player, player->unk_154) >= 0)); +s32 Player_InBlockingCsMode(GlobalContext* globalCtx, Player* this) { + return (this->stateFlags1 & 0x20000080) || (this->csMode != 0) || (globalCtx->sceneLoadFlag == 0x14) || + (this->stateFlags1 & 1) || (this->stateFlags3 & 0x80) || + ((gSaveContext.unk_13F0 != 0) && (Player_ActionToMagicSpell(this, this->itemActionParam) >= 0)); } -s32 func_8008E988(GlobalContext* globalCtx) { - Player* player = PLAYER; - return func_8008E8DC(globalCtx, player) || player->unk_6AD == 4; +s32 Player_InCsMode(GlobalContext* globalCtx) { + Player* this = PLAYER; + + return Player_InBlockingCsMode(globalCtx, this) || (this->unk_6AD == 4); } -s32 func_8008E9C4(Player* player) { - return player->stateFlags1 & 0x10; +s32 func_8008E9C4(Player* this) { + return (this->stateFlags1 & 0x10); } -s32 func_8008E9D0(Player* player) { - return LINK_IS_CHILD && player->currentShield == 2; +s32 Player_IsChildWithHylianShield(Player* this) { + return LINK_IS_CHILD && (this->currentShield == PLAYER_SHIELD_HYLIAN); } -s32 func_8008E9F8(Player* player, s32 arg1) { - s32 temp_v1 = D_80125C44[arg1]; +s32 Player_ActionToModelGroup(Player* this, s32 actionParam) { + s32 modelGroup = sActionModelGroups[actionParam]; - if (temp_v1 == 2 && func_8008E9D0(player) != 0) { + if ((modelGroup == 2) && Player_IsChildWithHylianShield(this)) { return 1; } else { - return temp_v1; + return modelGroup; } } -#ifdef NON_MATCHING -// Regalloc only -void func_8008EA40(Player* player) { - if (player->stateFlags1 & 0x400000) { - if ((player->unk_154 < 0) || (player->heldItemActionParam == player->unk_154)) { - if (func_8008F1A0(player) == 0 && func_8008E9D0(player) == 0) { - player->unk_15D = 0xA; - player->unk_160 = gSaveContext.linkAge + &D_80125F40[10]; - if (player->unk_15E == 0x12) { - player->unk_15E = 0x10; - } else if (player->unk_15E == 0x13) { - player->unk_15E = 0x11; - } - player->unk_168 = gSaveContext.linkAge + &D_80125F40[player->unk_15E]; - player->unk_15B = 2; - player->unk_154 = -1; +void Player_SetModelsForHoldingShield(Player* this) { + if ((this->stateFlags1 & 0x400000) && + ((this->itemActionParam < 0) || (this->itemActionParam == this->heldItemActionParam))) { + if (!Player_HoldsTwoHandedWeapon(this) && !Player_IsChildWithHylianShield(this)) { + this->rightHandType = 10; + this->rightHandDLists = &sPlayerDListGroups[10][(void)0, gSaveContext.linkAge]; + if (this->sheathType == 18) { + this->sheathType = 16; + } else if (this->sheathType == 19) { + this->sheathType = 17; } + this->sheathDLists = &sPlayerDListGroups[this->sheathType][(void)0, gSaveContext.linkAge]; + this->modelAnimType = 2; + this->itemActionParam = -1; } } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008EA40.s") -#endif -#ifdef NON_MATCHING -// Regalloc, gSaveContext and D_80125F40 hi/lo pairs swapped -void func_8008EB2C(Player* player, s32 arg1) { - player->unk_15C = D_80125C98[(arg1 * 5) + 1]; - player->unk_15D = D_80125C98[(arg1 * 5) + 2]; - player->unk_15E = D_80125C98[(arg1 * 5) + 3]; - player->unk_164 = gSaveContext.linkAge + &D_80125F40[D_80125C98[(arg1 * 5) + 1]]; - player->unk_160 = gSaveContext.linkAge + &D_80125F40[D_80125C98[(arg1 * 5) + 2]]; - player->unk_168 = gSaveContext.linkAge + &D_80125F40[D_80125C98[(arg1 * 5) + 3]]; - player->unk_16C = gSaveContext.linkAge + &D_80125F40[D_80125C98[(arg1 * 5) + 4]]; - func_8008EA40(player); +void Player_SetModels(Player* this, s32 modelGroup) { + this->leftHandType = gPlayerModelTypes[modelGroup][1]; + this->rightHandType = gPlayerModelTypes[modelGroup][2]; + this->sheathType = gPlayerModelTypes[modelGroup][3]; + + this->leftHandDLists = &sPlayerDListGroups[gPlayerModelTypes[modelGroup][1]][(void)0, gSaveContext.linkAge]; + this->rightHandDLists = &sPlayerDListGroups[gPlayerModelTypes[modelGroup][2]][(void)0, gSaveContext.linkAge]; + this->sheathDLists = &sPlayerDListGroups[gPlayerModelTypes[modelGroup][3]][(void)0, gSaveContext.linkAge]; + this->waistDLists = &sPlayerDListGroups[gPlayerModelTypes[modelGroup][4]][(void)0, gSaveContext.linkAge]; + + Player_SetModelsForHoldingShield(this); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008EB2C.s") -#endif -void func_8008EC04(Player* player, s32 arg1) { - player->unk_158 = arg1; - if (arg1 == 1) { - player->unk_15B = 0; +void Player_SetModelGroup(Player* this, s32 modelGroup) { + this->modelGroup = modelGroup; + + if (modelGroup == 1) { + this->modelAnimType = 0; } else { - player->unk_15B = D_80125C98[arg1 * 5]; + this->modelAnimType = gPlayerModelTypes[modelGroup][0]; } - if (player->unk_15B < 3 && player->currentShield == 0) { - player->unk_15B = 0; + + if ((this->modelAnimType < 3) && (this->currentShield == PLAYER_SHIELD_NONE)) { + this->modelAnimType = 0; } - func_8008EB2C(player, arg1); + + Player_SetModels(this, modelGroup); } -void func_8008EC70(Player* player) { - player->unk_154 = player->heldItemActionParam; - func_8008EC04(player, func_8008E9F8(player, player->heldItemActionParam)); - player->unk_6AD = 0; +void func_8008EC70(Player* this) { + this->itemActionParam = this->heldItemActionParam; + Player_SetModelGroup(this, Player_ActionToModelGroup(this, this->heldItemActionParam)); + this->unk_6AD = 0; } -void func_8008ECAC(GlobalContext* globalCtx, Player* player) { - s32 sword; - - if (player->action != 0x56) { - player->currentShield = CUR_EQUIP_VALUE(EQUIP_SHIELD); - player->currentTunic = CUR_EQUIP_VALUE(EQUIP_TUNIC) - 1; - player->currentBoots = CUR_EQUIP_VALUE(EQUIP_BOOTS) - 1; - - if (gSaveContext.buttonStatus[EQUIP_SWORD] == ITEM_NONE) { - sword = ITEM_NONE; - player->currentSword = sword; - } else { - if (gSaveContext.equips.buttonItems[EQUIP_SWORD] == ITEM_SWORD_KNIFE) { - sword = ITEM_SWORD_BGS; - } else { - sword = gSaveContext.equips.buttonItems[EQUIP_SWORD]; - } - player->currentSword = sword; - } - - func_8008EC04(player, func_8008E9F8(player, player->heldItemActionParam)); - func_8008E750(globalCtx, player); +void Player_SetEquipmentData(GlobalContext* globalCtx, Player* this) { + if (this->csMode != 0x56) { + this->currentShield = CUR_EQUIP_VALUE(EQUIP_SHIELD); + this->currentTunic = CUR_EQUIP_VALUE(EQUIP_TUNIC) - 1; + this->currentBoots = CUR_EQUIP_VALUE(EQUIP_BOOTS) - 1; + this->currentSword = B_BTN_ITEM; + Player_SetModelGroup(this, Player_ActionToModelGroup(this, this->heldItemActionParam)); + Player_SetBootData(globalCtx, this); } } -void func_8008ED9C(GlobalContext* globalCtx, Player* player, s32 item, s32 arg2) { - Inventory_UpdateBottleItem(globalCtx, item, player->heldItemCButtonIdx); +void Player_UpdateBottleHeld(GlobalContext* globalCtx, Player* this, s32 item, s32 actionParam) { + Inventory_UpdateBottleItem(globalCtx, item, this->heldItemButton); + if (item != ITEM_BOTTLE) { - player->unk_152 = item; - player->heldItemActionParam = arg2; + this->heldItemId = item; + this->heldItemActionParam = actionParam; } - player->unk_154 = arg2; + + this->itemActionParam = actionParam; } -void func_8008EDF0(Player* player) { - player->unk_664 = NULL; - player->stateFlags2 &= ~0x2000; +void func_8008EDF0(Player* this) { + this->unk_664 = NULL; + this->stateFlags2 &= ~0x2000; } -void func_8008EE08(Player* player) { - if ((player->actor.bgCheckFlags & 1) || (player->stateFlags1 & 0x8A00000) || - ((player->stateFlags1 & 0xC0000) == 0 && (player->actor.posRot.pos.y - player->actor.groundY) < 100.0f)) { - player->stateFlags1 &= 0xBFF07FFF; - } else if ((player->stateFlags1 & 0x2C0000) == 0) { - player->stateFlags1 |= 0x80000; +void func_8008EE08(Player* this) { + if ((this->actor.bgCheckFlags & 1) || (this->stateFlags1 & 0x8A00000) || + (!(this->stateFlags1 & 0xC0000) && ((this->actor.posRot.pos.y - this->actor.groundY) < 100.0f))) { + this->stateFlags1 &= ~0x400F8000; + } else if (!(this->stateFlags1 & 0x2C0000)) { + this->stateFlags1 |= 0x80000; } - func_8008EDF0(player); + + func_8008EDF0(this); } -void func_8008EEAC(GlobalContext* globalCtx, Actor* arg1) { - Player* player; +void func_8008EEAC(GlobalContext* globalCtx, Actor* actor) { + Player* this = PLAYER; - player = PLAYER; - func_8008EE08(player); - player->unk_664 = arg1; - player->unk_684 = arg1; - player->stateFlags1 |= 0x10000; - Camera_SetParam(Gameplay_GetCamera(globalCtx, 0), 8, arg1); + func_8008EE08(this); + this->unk_664 = actor; + this->unk_684 = actor; + this->stateFlags1 |= 0x10000; + Camera_SetParam(Gameplay_GetCamera(globalCtx, 0), 8, actor); func_8005A444(Gameplay_GetCamera(globalCtx, 0), 2); } s32 func_8008EF30(GlobalContext* globalCtx) { - Player* player = PLAYER; - return player->stateFlags1 & 0x800000; + Player* this = PLAYER; + + return (this->stateFlags1 & 0x800000); } -s32 func_8008EF44(GlobalContext* globalCtx, s32 arg1) { - globalCtx->unk_11E5C = (arg1 + 1); +s32 func_8008EF44(GlobalContext* globalCtx, s32 ammo) { + globalCtx->unk_11E5C = ammo + 1; return 1; } -s32 func_8008EF5C(GlobalContext* globalCtx, Vec3f* pos, f32 radius, f32 arg3) { - s32 pad; +s32 Player_IsBurningStickInRange(GlobalContext* globalCtx, Vec3f* pos, f32 xzRange, f32 yRange) { + Player* this = PLAYER; Vec3f diff; - Player* player; + s32 pad; - player = PLAYER; - if ((player->heldItemActionParam == 6) && (player->stickFlameTimer != 0)) { - Math_Vec3f_Diff(&player->swordDimensions.tip, pos, &diff); - return ((diff.x * diff.x) + (diff.z * diff.z)) <= (radius * radius) && 0.0f <= diff.y && diff.y <= arg3; + if ((this->heldItemActionParam == PLAYER_AP_STICK) && (this->unk_860 != 0)) { + Math_Vec3f_Diff(&this->swordInfo[0].tip, pos, &diff); + return ((SQ(diff.x) + SQ(diff.z)) <= SQ(xzRange)) && (0.0f <= diff.y) && (diff.y <= yRange); } else { return false; } } -s32 func_8008F034() { - s32 temp_v1; +s32 Player_GetStrength(void) { + s32 strengthUpgrade = CUR_UPG_VALUE(UPG_STRENGTH); - temp_v1 = (s32)(gSaveContext.upgrades & gUpgradeMasks[2]) >> gUpgradeShifts[2]; if (LINK_IS_ADULT) { - return temp_v1; - } else if (temp_v1 != 0) { + return strengthUpgrade; + } else if (strengthUpgrade != 0) { + return PLAYER_STR_BRACELET; + } else { + return PLAYER_STR_NONE; + } +} + +u8 Player_GetMask(GlobalContext* globalCtx) { + Player* this = PLAYER; + + return this->currentMask; +} + +Player* Player_UnsetMask(GlobalContext* globalCtx) { + Player* this = PLAYER; + + this->currentMask = PLAYER_MASK_NONE; + + return this; +} + +s32 Player_HasMirrorShieldEquipped(GlobalContext* globalCtx) { + Player* this = PLAYER; + + return (this->currentShield == PLAYER_SHIELD_MIRROR); +} + +s32 Player_HasMirrorShieldSetToDraw(GlobalContext* globalCtx) { + Player* this = PLAYER; + + return (this->rightHandType == 10) && (this->currentShield == PLAYER_SHIELD_MIRROR); +} + +s32 Player_ActionToMagicSpell(Player* this, s32 actionParam) { + s32 magicSpell = actionParam - PLAYER_AP_MAGIC_SPELL_15; + + if ((magicSpell >= 0) && (magicSpell < 6)) { + return magicSpell; + } else { + return -1; + } +} + +s32 Player_HoldsHookshot(Player* this) { + return (this->heldItemActionParam == PLAYER_AP_HOOKSHOT) || (this->heldItemActionParam == PLAYER_AP_LONGSHOT); +} + +s32 func_8008F128(Player* this) { + return Player_HoldsHookshot(this) && (this->heldActor == NULL); +} + +s32 Player_ActionToSword(s32 actionParam) { + s32 sword = actionParam - PLAYER_AP_FISHING_POLE; + + if ((sword > 0) && (sword < 6)) { + return sword; + } else { + return 0; + } +} + +s32 Player_GetSwordHeld(Player* this) { + return Player_ActionToSword(this->heldItemActionParam); +} + +s32 Player_HoldsTwoHandedWeapon(Player* this) { + if ((this->heldItemActionParam >= PLAYER_AP_SWORD_BGS) && (this->heldItemActionParam <= PLAYER_AP_HAMMER)) { return 1; } else { return 0; } } -u8 func_8008F080(GlobalContext* globalCtx) { - Player* player = PLAYER; - return player->currentMask; +s32 Player_HoldsBrokenKnife(Player* this) { + return (this->heldItemActionParam == PLAYER_AP_SWORD_BGS) && (gSaveContext.swordHealth <= 0.0f); } -Player* func_8008F08C(GlobalContext* globalCtx) { - Player* player = PLAYER; - player->currentMask = 0; - return player; -} +s32 Player_ActionToBottle(Player* this, s32 actionParam) { + s32 bottle = actionParam - PLAYER_AP_BOTTLE; -s32 func_8008F098(GlobalContext* globalCtx) { - Player* player = PLAYER; - return player->currentShield == 3; -} - -s32 func_8008F0AC(GlobalContext* globalCtx) { - Player* player = PLAYER; - return player->unk_15D == 0xa && player->currentShield == 3; -} - -s32 func_8008F0D8(Player* player, s32 arg1) { - s32 temp_v0 = arg1 - 0x15; - if (temp_v0 >= 0 && temp_v0 < 6) { - return temp_v0; + if ((bottle >= 0) && (bottle < 13)) { + return bottle; + } else { + return -1; } +} + +s32 Player_GetBottleHeld(Player* this) { + return Player_ActionToBottle(this, this->heldItemActionParam); +} + +s32 Player_ActionToExplosive(Player* this, s32 actionParam) { + s32 explosive = actionParam - PLAYER_AP_BOMB; + + if ((explosive >= 0) && (explosive < 2)) { + return explosive; + } else { + return -1; + } +} + +s32 Player_GetExplosiveHeld(Player* this) { + return Player_ActionToExplosive(this, this->heldItemActionParam); +} + +s32 func_8008F2BC(Player* this, s32 actionParam) { + s32 sword = 0; + + if (actionParam != PLAYER_AP_LAST_USED) { + sword = actionParam - PLAYER_AP_SWORD_MASTER; + if ((sword < 0) || (sword >= 3)) { + goto return_neg; + } + } + + return sword; + +return_neg: return -1; } -s32 func_8008F104(Player* player) { - return player->heldItemActionParam == 0x10 || player->heldItemActionParam == 0x11; -} - -s32 func_8008F128(Player* player) { - return func_8008F104(player) && player->heldActor == NULL; -} - -s32 func_8008F158(s32 arg0) { - s32 temp_v0 = arg0 - 2; - if (temp_v0 > 0 && temp_v0 < 6) { - return temp_v0; - } - return 0; -} - -void func_8008F180(Player* player) { - func_8008F158(player->heldItemActionParam); -} - -s32 func_8008F1A0(Player* player) { - if (player->heldItemActionParam >= 5 && player->heldItemActionParam < 8) { - return 1; - } - return 0; -} - -s32 func_8008F1CC(Player* player) { - return player->heldItemActionParam == 5 && gSaveContext.bgsHitsLeft <= 0.0f; -} - -s32 func_8008F224(Player* player, s32 arg1) { - s32 temp_v0 = arg1 - 0x1E; - if (temp_v0 >= 0 && temp_v0 < 0xD) { - return temp_v0; - } - return -1; -} - -void func_8008F250(Player* player) { - func_8008F224(player, player->heldItemActionParam); -} - -s32 func_8008F270(Player* player, s32 arg1) { - s32 temp_v0 = arg1 - 0x12; - if (temp_v0 >= 0 && temp_v0 < 2) { - return temp_v0; - } - return -1; -} - -s32 func_8008F29C(Player* player) { - return func_8008F270(player, player->heldItemActionParam); -} - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008F2BC.s") - s32 func_8008F2F8(GlobalContext* globalCtx) { - Player* player; - Struct_8008F2F8* temp_a3; - s32 phi_v1; + Player* this = PLAYER; + TextTriggerEntry* triggerEntry; + s32 var; - player = PLAYER; - if (globalCtx->roomCtx.curRoom.unk_02 == 3) { - phi_v1 = 0; - } else if (((s32)player->unk_840 >= 0x51) && (player->currentBoots == 1 || (s32)player->unk_840 >= 0x12C)) { - phi_v1 = (player->currentBoots == 1 && (player->actor.bgCheckFlags & 1)) ? 1 : 3; - } else if (((s32)player->stateFlags1 * 0x10) < 0) { - phi_v1 = 2; + if (globalCtx->roomCtx.curRoom.unk_02 == 3) { // Room is hot + var = 0; + } else if ((this->unk_840 > 80) && + ((this->currentBoots == PLAYER_BOOTS_IRON) || (this->unk_840 >= 300))) { // Deep underwater + var = ((this->currentBoots == PLAYER_BOOTS_IRON) && (this->actor.bgCheckFlags & 1)) ? 1 : 3; + } else if (this->stateFlags1 & 0x8000000) { // Swimming + var = 2; } else { return 0; } - if (func_8008E988(globalCtx) == 0) { - temp_a3 = &D_80125C88[phi_v1]; - if (!temp_a3) {} - if (temp_a3->unk_0 != 0 && !(gSaveContext.unk_13C6 & temp_a3->unk_0) && - ((phi_v1 == 0 && player->currentTunic != 1) || - ((phi_v1 == 1 || phi_v1 == 3) && player->currentBoots == 1 && player->currentTunic != 2))) { - func_8010B680(globalCtx, temp_a3->unk_2, NULL); - gSaveContext.unk_13C6 |= temp_a3->unk_0; + + // Trigger general textboxes under certain conditions, like "It's so hot in here!" + if (!Player_InCsMode(globalCtx)) { + triggerEntry = &sTextTriggers[var]; + + if (0) {} + + if ((triggerEntry->flag != 0) && !(gSaveContext.textTriggerFlags & triggerEntry->flag) && + (((var == 0) && (this->currentTunic != PLAYER_TUNIC_GORON)) || + (((var == 1) || (var == 3)) && (this->currentBoots == PLAYER_BOOTS_IRON) && + (this->currentTunic != PLAYER_TUNIC_ZORA)))) { + func_8010B680(globalCtx, triggerEntry->textId, NULL); + gSaveContext.textTriggerFlags |= triggerEntry->flag; } } - return phi_v1 + 1; + + return var + 1; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008F470.s") +u8 sEyeMouthIndexes[][2] = { + { 0, 0 }, { 1, 0 }, { 2, 0 }, { 0, 0 }, { 1, 0 }, { 2, 0 }, { 4, 0 }, { 5, 1 }, + { 7, 2 }, { 0, 2 }, { 3, 0 }, { 4, 0 }, { 2, 2 }, { 1, 1 }, { 0, 2 }, { 0, 0 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008F87C.s") +u8* sEyeTextures[] = { + 0x06000000, 0x06000800, 0x06001000, 0x06001800, 0x06002000, 0x06002800, 0x06003000, 0x06003800, +}; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008FCC8.s") +u8* sMouthTextures[] = { + 0x06004000, + 0x06004400, + 0x06004800, + 0x06004C00, +}; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_80090014.s") +Color_RGB8 sTunicColors[] = { + { 30, 105, 27 }, + { 100, 20, 0 }, + { 0, 60, 100 }, +}; -#ifdef NON_MATCHING -// Regalloc only -s32 func_800902F0(s32 arg0, s32 arg1, UNK_PTR** arg2, s32 arg3, s32 arg4, Player* player) { - if (func_8008FCC8(arg0, arg1, arg2, arg3, arg4, player) == 0) { - if (player->unk_6AD != 2) { - *arg2 = NULL; +Color_RGB8 sGauntletColors[] = { + { 255, 255, 255 }, + { 254, 207, 15 }, +}; + +Gfx* sBootDListGroups[][2] = { + { 0x06025918, 0x06025A60 }, + { 0x06025BA8, 0x06025DB0 }, +}; + +void func_8008F470(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limbDrawTable, s32 dListCount, s32 lod, + s32 tunic, s32 boots, s32 face, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, + void* arg) { + Color_RGB8* color; + s32 eyeIndex = (limbDrawTable[22].x & 0xF) - 1; + s32 mouthIndex = (limbDrawTable[22].x >> 4) - 1; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 1721); + + if (eyeIndex < 0) { + eyeIndex = sEyeMouthIndexes[face][0]; + } + + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[eyeIndex])); + + if (mouthIndex < 0) { + mouthIndex = sEyeMouthIndexes[face][1]; + } + + gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[mouthIndex])); + + color = &sTunicColors[tunic]; + gDPSetEnvColor(oGfxCtx->polyOpa.p++, color->r, color->g, color->b, 0); + + sDListsLodOffset = lod * 2; + + SkelAnime_LodDrawSV(globalCtx, skeleton, limbDrawTable, dListCount, overrideLimbDraw, postLimbDraw, arg, lod); + + if ((overrideLimbDraw != func_800902F0) && (overrideLimbDraw != func_80090440) && (gSaveContext.gameMode != 3)) { + if (LINK_IS_ADULT) { + s32 strengthUpgrade = CUR_UPG_VALUE(UPG_STRENGTH); + + if (strengthUpgrade >= PLAYER_STR_SILVER_G) { + gDPPipeSync(oGfxCtx->polyOpa.p++); + + color = &sGauntletColors[strengthUpgrade - PLAYER_STR_SILVER_G]; + gDPSetEnvColor(oGfxCtx->polyOpa.p++, color->r, color->g, color->b, 0); + + gSPDisplayList(oGfxCtx->polyOpa.p++, D_06025218); + gSPDisplayList(oGfxCtx->polyOpa.p++, D_06025598); + gSPDisplayList(oGfxCtx->polyOpa.p++, (D_80160014 == 0) ? D_060252D8 : D_06025438); + gSPDisplayList(oGfxCtx->polyOpa.p++, (D_80160018 == 8) ? D_06025658 : D_060257B8); + } + + if (boots != 0) { + Gfx** bootDLists = sBootDListGroups[boots - 1]; + gSPDisplayList(oGfxCtx->polyOpa.p++, bootDLists[0]); + gSPDisplayList(oGfxCtx->polyOpa.p++, bootDLists[1]); + } } else { - if (arg1 == 0xF) { - *arg2 = D_80125F18[gSaveContext.linkAge]; - } else if (arg1 == 0x10) { - *arg2 = D_80125F20[gSaveContext.linkAge]; - } else if (arg1 == 0x11) { - *arg2 = D_80125F28[gSaveContext.linkAge]; - } else if (arg1 == 0x12) { - *arg2 = D_80125F30[gSaveContext.linkAge]; - } else if (arg1 == 0x13) { - *arg2 = func_8008F104(player) ? &D_0602A738 : D_80125F38[gSaveContext.linkAge]; - } else { - *arg2 = NULL; + if (Player_GetStrength() > PLAYER_STR_NONE) { + gSPDisplayList(oGfxCtx->polyOpa.p++, D_06016118); } } } - return 0; -} -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_800902F0.s") -#endif -s32 func_80090440(s32 arg0, s32 arg1, UNK_PTR** arg2, s32 arg3, s32 arg4, Player* player) { - if (func_8008FCC8(arg0, arg1, arg2, arg3, arg4, player) == 0) { - *arg2 = NULL; - } - return 0; + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 1803); } -u8 func_80090480(GlobalContext* globalCtx, Collider* collider, Struct_80090480_arg2* arg2, Vec3f* arg3, Vec3f* arg4) { - if (arg2->active == 0) { - if (collider != NULL) { - Collider_QuadSetAT(globalCtx, collider); +Vec3f D_8012602C = { 0.0f, 0.0f, 0.0f }; + +Vec3f D_80126038[] = { + { 1304.0f, 0.0f, 0.0f }, + { 695.0f, 0.0f, 0.0f }, +}; + +f32 D_80126050[] = { 1265.0f, 826.0f }; +f32 D_80126058[] = { 170.0415955f, 48.30249786f }; +f32 D_80126060[] = { 10.019104f, -19.92510223f }; +f32 D_80126068[] = { 5.0f, 3.0f }; + +Vec3f D_80126070 = { 0.0f, -300.0f, 0.0f }; + +void func_8008F87C(GlobalContext* globalCtx, Player* this, SkelAnime* skelAnime, Vec3f* pos, Vec3s* rot, + s32 thighLimbIndex, s32 shinLimbIndex, s32 footLimbIndex) { + Vec3f spA4; + Vec3f sp98; + Vec3f sp8C; + CollisionPoly* sp88; + UNK_TYPE sp84; + f32 sp80; + f32 sp7C; + f32 sp78; + f32 sp74; + f32 sp70; + f32 sp6C; + f32 sp68; + f32 sp64; + f32 sp60; + f32 sp5C; + f32 sp58; + f32 sp54; + f32 sp50; + s16 temp1; + s16 temp2; + s32 temp3; + + if ((this->actor.scale.y >= 0.0f) && !(this->stateFlags1 & 0x80) && + (Player_ActionToMagicSpell(this, this->itemActionParam) < 0)) { + s32 pad; + + sp7C = D_80126058[(void)0, gSaveContext.linkAge]; + sp78 = D_80126060[(void)0, gSaveContext.linkAge]; + sp74 = D_80126068[(void)0, gSaveContext.linkAge] - this->unk_6C4; + + Matrix_Push(); + Matrix_JointPosition(pos, rot); + Matrix_MultVec3f(&D_8012602C, &spA4); + Matrix_JointPosition(&D_80126038[(void)0, gSaveContext.linkAge], &skelAnime->limbDrawTbl[shinLimbIndex]); + Matrix_Translate(D_80126050[(void)0, gSaveContext.linkAge], 0.0f, 0.0f, MTXMODE_APPLY); + Matrix_MultVec3f(&D_8012602C, &sp98); + Matrix_MultVec3f(&D_80126070, &sp8C); + Matrix_Pull(); + + sp8C.y += 15.0f; + + sp80 = func_8003C9A4(&globalCtx->colCtx, &sp88, &sp84, &this->actor, &sp8C) + sp74; + + if (sp98.y < sp80) { + sp70 = sp98.x - spA4.x; + sp6C = sp98.y - spA4.y; + sp68 = sp98.z - spA4.z; + + sp64 = sqrtf(SQ(sp70) + SQ(sp6C) + SQ(sp68)); + sp60 = (SQ(sp64) + sp78) / (2.0f * sp64); + + sp58 = sp7C - SQ(sp60); + sp58 = (sp7C < SQ(sp60)) ? 0.0f : sqrtf(sp58); + + sp54 = Math_atan2f(sp58, sp60); + + sp6C = sp80 - spA4.y; + + sp64 = sqrtf(SQ(sp70) + SQ(sp6C) + SQ(sp68)); + sp60 = (SQ(sp64) + sp78) / (2.0f * sp64); + sp5C = sp64 - sp60; + + sp58 = sp7C - SQ(sp60); + sp58 = (sp7C < SQ(sp60)) ? 0.0f : sqrtf(sp58); + + sp50 = Math_atan2f(sp58, sp60); + + temp1 = (M_PI - (Math_atan2f(sp5C, sp58) + ((M_PI / 2) - sp50))) * 10430.378f; + temp1 = temp1 - skelAnime->limbDrawTbl[shinLimbIndex].z; + + if ((s16)(ABS(skelAnime->limbDrawTbl[shinLimbIndex].x) + ABS(skelAnime->limbDrawTbl[shinLimbIndex].y)) < + 0) { + temp1 += 0x8000; + } + + temp2 = (sp50 - sp54) * 10430.378f; + rot->z -= temp2; + + skelAnime->limbDrawTbl[thighLimbIndex].z = skelAnime->limbDrawTbl[thighLimbIndex].z - temp2; + skelAnime->limbDrawTbl[shinLimbIndex].z = skelAnime->limbDrawTbl[shinLimbIndex].z + temp1; + skelAnime->limbDrawTbl[footLimbIndex].z = skelAnime->limbDrawTbl[footLimbIndex].z + temp2 - temp1; + + temp3 = func_80041D4C(&globalCtx->colCtx, sp88, sp84); + + if ((temp3 >= 2) && (temp3 < 4) && !func_80042108(&globalCtx->colCtx, sp88, sp84)) { + sp8C.y = sp80; + func_80029568(globalCtx, &sp8C); + } + } + } +} + +s32 func_8008FCC8(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor) { + Player* this = (Player*)actor; + + if (limbIndex == PLAYER_LIMB_ROOT) { + D_80160014 = this->leftHandType; + D_80160018 = this->rightHandType; + D_80160000 = &this->swordInfo[2].base; + + if (LINK_IS_CHILD) { + if (!(this->skelAnime.flags & 4) || (this->skelAnime.flags & 1)) { + pos->x *= 0.64f; + pos->z *= 0.64f; + } + + if (!(this->skelAnime.flags & 4) || (this->skelAnime.flags & 2)) { + pos->y *= 0.64f; + } + } + + pos->y -= this->unk_6C4; + + if (this->unk_6C2 != 0) { + Matrix_Translate(pos->x, ((Math_Coss(this->unk_6C2) - 1.0f) * 200.0f) + pos->y, pos->z, MTXMODE_APPLY); + Matrix_RotateX(this->unk_6C2 * (M_PI / 32768), MTXMODE_APPLY); + Matrix_RotateRPY(rot->x, rot->y, rot->z, MTXMODE_APPLY); + pos->x = pos->y = pos->z = 0.0f; + rot->x = rot->y = rot->z = 0; } - Math_Vec3f_Copy(&arg2->tip, arg3); - Math_Vec3f_Copy(&arg2->base, arg4); - arg2->active = 1; - return 1; } else { - if (arg2->tip.x == arg3->x && arg2->tip.y == arg3->y && arg2->tip.z == arg3->z && arg2->base.x == arg4->x && - arg2->base.y == arg4->y && arg2->base.z == arg4->z) { - if (collider != NULL) { - Collider_QuadSetAT(globalCtx, collider); + if (*dList != NULL) { + D_80160000++; + } + + if (limbIndex == PLAYER_LIMB_HEAD) { + rot->x += this->unk_6BA; + rot->y -= this->unk_6B8; + rot->z += this->unk_6B6; + } else if (limbIndex == PLAYER_LIMB_UPPER) { + if (this->unk_6B0 != 0) { + Matrix_RotateZ(0.10546118f, MTXMODE_APPLY); + Matrix_RotateY(this->unk_6B0 * (M_PI / 32768), MTXMODE_APPLY); } + if (this->unk_6BE != 0) { + Matrix_RotateY(this->unk_6BE * (M_PI / 32768), MTXMODE_APPLY); + } + if (this->unk_6BC != 0) { + Matrix_RotateX(this->unk_6BC * (M_PI / 32768), MTXMODE_APPLY); + } + if (this->unk_6C0 != 0) { + Matrix_RotateZ(this->unk_6C0 * (M_PI / 32768), MTXMODE_APPLY); + } + } else if (limbIndex == PLAYER_LIMB_L_THIGH) { + func_8008F87C(globalCtx, this, &this->skelAnime, pos, rot, PLAYER_LIMB_L_THIGH, PLAYER_LIMB_L_SHIN, + PLAYER_LIMB_L_FOOT); + } else if (limbIndex == PLAYER_LIMB_R_THIGH) { + func_8008F87C(globalCtx, this, &this->skelAnime, pos, rot, PLAYER_LIMB_R_THIGH, PLAYER_LIMB_R_SHIN, + PLAYER_LIMB_R_FOOT); + return 0; + } else { return 0; } - if (collider != NULL) { - func_80062734(collider, arg4, arg3, &arg2->base, &arg2->tip); - CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, collider); + } + + return 0; +} + +s32 func_80090014(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor) { + Player* this = (Player*)actor; + + if (func_8008FCC8(globalCtx, limbIndex, dList, pos, rot, actor) == 0) { + if (limbIndex == PLAYER_LIMB_L_HAND) { + Gfx** dLists = this->leftHandDLists; + + if ((D_80160014 == 4) && (gSaveContext.swordHealth <= 0.0f)) { + dLists += 4; + } else if ((D_80160014 == 6) && (this->stateFlags1 & 0x2000000)) { + dLists = &D_80125E08[gSaveContext.linkAge]; + D_80160014 = 0; + } else if ((this->leftHandType == 0) && (this->actor.speedXZ > 2.0f) && !(this->stateFlags1 & 0x8000000)) { + dLists = &D_80125E18[gSaveContext.linkAge]; + D_80160014 = 1; + } + + *dList = dLists[sDListsLodOffset]; + } else if (limbIndex == PLAYER_LIMB_R_HAND) { + Gfx** dLists = this->rightHandDLists; + + if (D_80160018 == 10) { + dLists += this->currentShield * 4; + } else if ((this->rightHandType == 8) && (this->actor.speedXZ > 2.0f) && !(this->stateFlags1 & 0x8000000)) { + dLists = &D_80125E58[gSaveContext.linkAge]; + D_80160018 = 9; + } + + *dList = dLists[sDListsLodOffset]; + } else if (limbIndex == PLAYER_LIMB_SHEATH) { + Gfx** dLists = this->sheathDLists; + + if ((this->sheathType == 18) || (this->sheathType == 19)) { + dLists += this->currentShield * 4; + if ((LINK_IS_CHILD) && (this->currentShield < PLAYER_SHIELD_HYLIAN) && + (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI)) { + dLists += 16; + } + } else if ((LINK_IS_CHILD) && ((this->sheathType == 16) || (this->sheathType == 17)) && + (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI)) { + dLists = D_80125D68; + } + + *dList = dLists[sDListsLodOffset]; + } else if (limbIndex == PLAYER_LIMB_WAIST) { + *dList = this->waistDLists[sDListsLodOffset]; } - Math_Vec3f_Copy(&arg2->base, arg4); - Math_Vec3f_Copy(&arg2->tip, arg3); - arg2->active = 1; + } + + return 0; +} + +s32 func_800902F0(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor) { + Player* this = (Player*)actor; + + if (func_8008FCC8(globalCtx, limbIndex, dList, pos, rot, actor) == 0) { + if (this->unk_6AD != 2) { + *dList = NULL; + } else if (limbIndex == PLAYER_LIMB_L_FOREARM) { + *dList = D_80125F18[(void)0, gSaveContext.linkAge]; + } else if (limbIndex == PLAYER_LIMB_L_HAND) { + *dList = D_80125F20[(void)0, gSaveContext.linkAge]; + } else if (limbIndex == PLAYER_LIMB_R_SHOULDER) { + *dList = D_80125F28[(void)0, gSaveContext.linkAge]; + } else if (limbIndex == PLAYER_LIMB_R_FOREARM) { + *dList = D_80125F30[(void)0, gSaveContext.linkAge]; + } else if (limbIndex == PLAYER_LIMB_R_HAND) { + *dList = Player_HoldsHookshot(this) ? D_0602A738 : D_80125F38[(void)0, gSaveContext.linkAge]; + } else { + *dList = NULL; + } + } + + return 0; +} + +s32 func_80090440(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor) { + if (func_8008FCC8(globalCtx, limbIndex, dList, pos, rot, actor) == 0) { + *dList = NULL; + } + + return 0; +} + +u8 func_80090480(GlobalContext* globalCtx, ColliderQuad* collider, WeaponInfo* weaponInfo, Vec3f* newTip, + Vec3f* newBase) { + if (weaponInfo->active == 0) { + if (collider != NULL) { + Collider_QuadSetAT(globalCtx, &collider->base); + } + Math_Vec3f_Copy(&weaponInfo->tip, newTip); + Math_Vec3f_Copy(&weaponInfo->base, newBase); + weaponInfo->active = 1; + return 1; + } else if ((weaponInfo->tip.x == newTip->x) && (weaponInfo->tip.y == newTip->y) && + (weaponInfo->tip.z == newTip->z) && (weaponInfo->base.x == newBase->x) && + (weaponInfo->base.y == newBase->y) && (weaponInfo->base.z == newBase->z)) { + if (collider != NULL) { + Collider_QuadSetAT(globalCtx, &collider->base); + } + return 0; + } else { + if (collider != NULL) { + func_80062734(collider, newBase, newTip, &weaponInfo->base, &weaponInfo->tip); + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &collider->base); + } + Math_Vec3f_Copy(&weaponInfo->base, newBase); + Math_Vec3f_Copy(&weaponInfo->tip, newTip); + weaponInfo->active = 1; return 1; } } -void func_80090604(GlobalContext* globalCtx, Player* player, ColliderQuad* collider, ColliderQuadDimInit* quadInit) { - Vec3f d; - Vec3f c; - Vec3f b; - Vec3f a; +void func_80090604(GlobalContext* globalCtx, Player* this, ColliderQuad* collider, Vec3f* quadSrc) { + static u8 shieldColTypes[PLAYER_SHIELD_MAX] = { + COLTYPE_METAL_SHIELD, + COLTYPE_WOODEN_SHIELD, + COLTYPE_METAL_SHIELD, + COLTYPE_METAL_SHIELD, + }; + + if (this->stateFlags1 & 0x400000) { + Vec3f quadDest[4]; + + this->shieldQuad.base.type = shieldColTypes[this->currentShield]; + + Matrix_MultVec3f(&quadSrc[0], &quadDest[0]); + Matrix_MultVec3f(&quadSrc[1], &quadDest[1]); + Matrix_MultVec3f(&quadSrc[2], &quadDest[2]); + Matrix_MultVec3f(&quadSrc[3], &quadDest[3]); + func_80062734(collider, &quadDest[0], &quadDest[1], &quadDest[2], &quadDest[3]); - if ((s32)(player->stateFlags1 << 9) < 0) { - player->unk_5F8 = D_8012607C[player->currentShield]; - Matrix_MultVec3f(&quadInit->quad[0], &a); - Matrix_MultVec3f(&quadInit->quad[1], &b); - Matrix_MultVec3f(&quadInit->quad[2], &c); - Matrix_MultVec3f(&quadInit->quad[3], &d); - func_80062734(collider, &a, &b, &c, &d); CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &collider->base); CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &collider->base); } } -void func_800906D4(GlobalContext* globalCtx, Player* player, ColliderTrisItemDimInit* trisInit) { - Vec3f sp44; - Vec3f sp38; - Vec3f sp2C; +Vec3f D_80126080 = { 5000.0f, 400.0f, 0.0f }; +Vec3f D_8012608C = { 5000.0f, -400.0f, 1000.0f }; +Vec3f D_80126098 = { 5000.0f, 1400.0f, -1000.0f }; - Matrix_MultVec3f(&D_801260A4, &sp2C); - Matrix_MultVec3f(&D_801260B0, &sp38); - Matrix_MultVec3f(&D_801260BC, &sp44); - if (func_80090480(globalCtx, NULL, &player->swordDimensions, &trisInit->vtx[0], &sp2C) != 0 && - (s32)(player->stateFlags1 << 9) >= 0) { - EffectBlure_AddVertex(Effect_GetByIndex(player->swordEffectId), &player->swordDimensions.tip, - &player->swordDimensions.base); +Vec3f D_801260A4[3] = { + { 0.0f, 400.0f, 0.0f }, + { 0.0f, 1400.0f, -1000.0f }, + { 0.0f, -400.0f, 1000.0f }, +}; + +void func_800906D4(GlobalContext* globalCtx, Player* this, Vec3f* newTipPos) { + Vec3f newBasePos[3]; + + Matrix_MultVec3f(&D_801260A4[0], &newBasePos[0]); + Matrix_MultVec3f(&D_801260A4[1], &newBasePos[1]); + Matrix_MultVec3f(&D_801260A4[2], &newBasePos[2]); + + if (func_80090480(globalCtx, NULL, &this->swordInfo[0], &newTipPos[0], &newBasePos[0]) && + !(this->stateFlags1 & 0x400000)) { + EffectBlure_AddVertex(Effect_GetByIndex(this->swordEffectIndex), &this->swordInfo[0].tip, + &this->swordInfo[0].base); } - if (player->swordState > 0 && ((player->swordAnimation < 0x18) || ((s32)(player->stateFlags2 << 0xE) < 0))) { - func_80090480(globalCtx, &player->unk_4E4, &player->unk_8D0, &trisInit->vtx[1], &sp38); - func_80090480(globalCtx, &player->unk_564, &player->unk_8EC, &trisInit->vtx[2], &sp44); + + if ((this->swordState > 0) && ((this->swordAnimation < 0x18) || (this->stateFlags2 & 0x20000))) { + func_80090480(globalCtx, &this->swordQuads[0], &this->swordInfo[1], &newTipPos[1], &newBasePos[1]); + func_80090480(globalCtx, &this->swordQuads[1], &this->swordInfo[2], &newTipPos[2], &newBasePos[2]); } } -void func_800907E4(GlobalContext* globalCtx, Player* player, Vec3f* arg2, s32 arg3) { - f32 sp4C; +void Player_DrawGetItemImpl(GlobalContext* globalCtx, Player* this, Vec3f* refPos, s32 drawIdPlusOne) { + f32 height = (this->exchangeItemId != EXCH_ITEM_NONE) ? 6.0f : 14.0f; - sp4C = (player->exchangeItemId != 0) ? 6.0f : 14.0f; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 0x961); - gSegments[6] = VIRTUAL_TO_PHYSICAL(player->getItemModel); + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2401); - gSPSegment(oGfxCtx->polyOpa.p++, 0x06, player->getItemModel); - gSPSegment(oGfxCtx->polyXlu.p++, 0x06, player->getItemModel); + gSegments[6] = VIRTUAL_TO_PHYSICAL(this->giObjectSegment); - Matrix_Translate(arg2->x + (Math_Sins(player->actor.shape.rot.y) * 3.3f), arg2->y + sp4C, - arg2->z + ((3.3f + (IREG(90) / 10.0f)) * Math_Coss(player->actor.shape.rot.y)), MTXMODE_NEW); + gSPSegment(oGfxCtx->polyOpa.p++, 0x06, this->giObjectSegment); + gSPSegment(oGfxCtx->polyXlu.p++, 0x06, this->giObjectSegment); + + Matrix_Translate(refPos->x + (3.3f * Math_Sins(this->actor.shape.rot.y)), refPos->y + height, + refPos->z + ((3.3f + (IREG(90) / 10.0f)) * Math_Coss(this->actor.shape.rot.y)), MTXMODE_NEW); Matrix_RotateRPY(0, globalCtx->gameplayFrames * 1000, 0, MTXMODE_APPLY); Matrix_Scale(0.2f, 0.2f, 0.2f, MTXMODE_APPLY); - func_800694A0(globalCtx, arg3 - 1); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 0x975); + + func_800694A0(globalCtx, drawIdPlusOne - 1); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2421); } -void func_800909B4(GlobalContext* globalCtx, Player* player) { - if ((player->unk_170 == 0) || !osRecvMesg(&player->unk_194, NULL, OS_MESG_NOBLOCK)) { - player->unk_170 = 0; - func_800907E4(globalCtx, player, &D_80160008, ABS(player->overheadItemId)); +void Player_DrawGetItem(GlobalContext* globalCtx, Player* this) { + if (!this->giObjectLoading || !osRecvMesg(&this->giObjectLoadQueue, NULL, OS_MESG_NOBLOCK)) { + this->giObjectLoading = false; + Player_DrawGetItemImpl(globalCtx, this, &sGetItemRefPos, ABS(this->unk_862)); } } -void func_80090A28(Player* player, ColliderTrisItemDimInit* trisInit) { +void func_80090A28(Player* this, Vec3f* vecs) { D_8012608C.x = D_80126080.x; - if (player->unk_845 >= 3) { - player->unk_845 += 1; - D_8012608C.x *= (1.0f + ((9 - player->unk_845) * 0.10000000149011612f)); + + if (this->unk_845 >= 3) { + this->unk_845 += 1; + D_8012608C.x *= 1.0f + ((9 - this->unk_845) * 0.1f); } + D_8012608C.x += 1200.0f; D_80126098.x = D_8012608C.x; - Matrix_MultVec3f(&D_80126080, &trisInit->vtx[0]); - Matrix_MultVec3f(&D_8012608C, &trisInit->vtx[1]); - Matrix_MultVec3f(&D_80126098, &trisInit->vtx[2]); + + Matrix_MultVec3f(&D_80126080, &vecs[0]); + Matrix_MultVec3f(&D_8012608C, &vecs[1]); + Matrix_MultVec3f(&D_80126098, &vecs[2]); } -#ifdef NON_MATCHING -// This function needs a bit of work still, but should be functionally equivalent. -// The biggest differences are in loads/stores of .data variables, -// also regalloc past Matrix_NewMtx and a minor stack difference. -void func_80090AFC(GlobalContext* globalCtx, Player* player, f32 arg2) { +void func_80090AFC(GlobalContext* globalCtx, Player* this, f32 arg2) { + static Vec3f D_801260C8 = { -500.0f, -100.0f, 0.0f }; f32 sp9C; f32 sp98; Vec3f sp8C; @@ -556,41 +1079,488 @@ void func_80090AFC(GlobalContext* globalCtx, Player* player, f32 arg2) { f32 sp64; f32 sp60; - D_801260D0 = 0.0f; + D_801260C8.z = 0.0f; Matrix_MultVec3f(&D_801260C8, &sp8C); - D_801260D0 = arg2; + D_801260C8.z = arg2; Matrix_MultVec3f(&D_801260C8, &sp80); - if (func_8003E188(&globalCtx->colCtx, &sp8C, &sp80, &sp74, &sp9C, 1, 1, 1, 1, &sp98) != 0) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 0xA0C); + if (1) {} - oGfxCtx->overlay.p = Gfx_CallSetupDL(oGfxCtx->overlay.p, 7); + if (func_8003E188(&globalCtx->colCtx, &sp8C, &sp80, &sp74, &sp9C, 1, 1, 1, 1, &sp98) != 0) { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2572); + + oGfxCtx->overlay.p = Gfx_CallSetupDL(oGfxCtx->overlay.p, 0x07); SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->mf_11D60, &sp74, &sp68, &sp64); - sp60 = (sp64 < 200.0f) ? 0.07999999821186066f : (sp64 / 200.0f) * 0.07999999821186066f; + sp60 = (sp64 < 200.0f) ? 0.08f : (sp64 / 200.0f) * 0.08f; Matrix_Translate(sp74.x, sp74.y, sp74.z, MTXMODE_NEW); Matrix_Scale(sp60, sp60, sp60, MTXMODE_APPLY); - gSPMatrix(oGfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 0xA1B), + gSPMatrix(oGfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2587), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->overlay.p++, 0x06, globalCtx->objectCtx.status[player->actor.objBankIndex].segment); - gSPDisplayList(oGfxCtx->overlay.p++, &D_0602CB48); + gSPSegment(oGfxCtx->overlay.p++, 0x06, globalCtx->objectCtx.status[this->actor.objBankIndex].segment); + gSPDisplayList(oGfxCtx->overlay.p++, D_0602CB48); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 0xA20); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2592); + } +} + +Vec3f D_801260D4 = { 1100.0f, -700.0f, 0.0f }; + +f32 sSwordLengths[] = { + 0.0f, 4000.0f, 3000.0f, 5500.0f, 0.0f, 2500.0f, +}; + +Gfx* sBottleDLists[] = { 0x0602AD58, 0x06018478 }; + +Color_RGB8 sBottleColors[] = { + { 255, 255, 255 }, { 80, 80, 255 }, { 255, 100, 255 }, { 0, 0, 255 }, { 255, 0, 255 }, + { 255, 0, 255 }, { 200, 200, 100 }, { 255, 0, 0 }, { 0, 0, 255 }, { 0, 255, 0 }, + { 255, 255, 255 }, { 255, 255, 255 }, { 80, 80, 255 }, +}; + +Vec3f D_80126128 = { 398.0f, 1419.0f, 244.0f }; + +BowStringData sBowStringData[] = { + { 0x0602B108, { 0.0f, -360.4f, 0.0f } }, // bow + { 0x060221A8, { 606.0f, 236.0f, 0.0f } }, // slingshot +}; + +Vec3f D_80126154[] = { + { -4500.0f, -3000.0f, -600.0f }, + { 1500.0f, -3000.0f, -600.0f }, + { -4500.0f, 3000.0f, -600.0f }, + { 1500.0f, 3000.0f, -600.0f }, +}; + +Vec3f D_80126184 = { 100.0f, 1500.0f, 0.0f }; +Vec3f D_80126190 = { 100.0f, 1640.0f, 0.0f }; + +Vec3f D_8012619C[] = { + { -3000.0f, -3000.0f, -900.0f }, + { 3000.0f, -3000.0f, -900.0f }, + { -3000.0f, 3000.0f, -900.0f }, + { 3000.0f, 3000.0f, -900.0f }, +}; + +Vec3f D_801261CC = { 630.0f, 100.0f, -30.0f }; +Vec3s D_801261D8 = { 0, 0, 0x7FFF }; + +Vec3f D_801261E0[] = { + { 200.0f, 300.0f, 0.0f }, + { 200.0f, 200.0f, 0.0f }, +}; + +#ifdef NON_MATCHING +// regalloc differences +void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor) { + Player* this = (Player*)actor; + + if (*dList != NULL) { + Matrix_MultVec3f(&D_8012602C, D_80160000); + } + + if (limbIndex == PLAYER_LIMB_L_HAND) { + MtxF sp14C; + Actor* hookedActor; // sp+0x148 + + Math_Vec3f_Copy(&this->leftHandPos, D_80160000); + + if (this->itemActionParam == PLAYER_AP_STICK) { + Vec3f sp124[3]; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2633); + + if (this->actor.scale.y >= 0.0f) { + D_80126080.x = this->unk_85C * 5000.0f; + func_80090A28(this, sp124); + if (this->swordState != 0) { + func_800906D4(globalCtx, this, sp124); + } else { + Math_Vec3f_Copy(&this->swordInfo[0].tip, &sp124[0]); + } + } + + Matrix_Translate(-428.26f, 267.2f, -33.82f, MTXMODE_APPLY); + Matrix_RotateRPY(-0x8000, 0, 0x4000, MTXMODE_APPLY); + Matrix_Scale(1.0f, this->unk_85C, 1.0f, MTXMODE_APPLY); + + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2653), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(oGfxCtx->polyOpa.p++, D_06006CC0); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2656); + } else if ((this->actor.scale.y >= 0.0f) && (this->swordState != 0)) { + Vec3f spE4[3]; + + if (Player_HoldsBrokenKnife(this)) { + D_80126080.x = 1500.0f; + } else { + D_80126080.x = sSwordLengths[Player_GetSwordHeld(this)]; + } + + func_80090A28(this, spE4); + func_800906D4(globalCtx, this, spE4); + } else if ((*dList != NULL) && (this->leftHandType == 7)) { + Color_RGB8* bottleColor = &sBottleColors[Player_ActionToBottle(this, this->itemActionParam)]; // sp+0xE0 + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2710); + + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2712), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, bottleColor->r, bottleColor->g, bottleColor->b, 0); + gSPDisplayList(oGfxCtx->polyXlu.p++, sBottleDLists[gSaveContext.linkAge]); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2717); + } + + if (this->actor.scale.y >= 0.0f) { + if (!Player_HoldsHookshot(this) && ((hookedActor = this->heldActor) != NULL)) { + if (this->stateFlags1 & 0x200) { + Matrix_MultVec3f(&D_80126128, &hookedActor->posRot.pos); + Matrix_RotateRPY(0x69E8, -0x5708, 0x458E, MTXMODE_APPLY); + Matrix_Get(&sp14C); + func_800D20CC(&sp14C, &hookedActor->posRot.rot, 0); + hookedActor->shape.rot = hookedActor->posRot.rot; + } else if (this->stateFlags1 & 0x800) { + Vec3s spB8; + + Matrix_Get(&sp14C); + func_800D20CC(&sp14C, &spB8, 0); + + if (hookedActor->flags & 0x20000) { + hookedActor->posRot.rot.x = hookedActor->shape.rot.x = spB8.x - this->unk_3BC.x; + } else { + hookedActor->posRot.rot.y = hookedActor->shape.rot.y = + this->actor.shape.rot.y + this->unk_3BC.y; + } + } + } else { + Matrix_Get(&this->mf_9E0); + func_800D20CC(&this->mf_9E0, &this->unk_3BC, 0); + } + } + } else if (limbIndex == PLAYER_LIMB_R_HAND) { + Actor* heldActor = this->heldActor; // sp+0xB4 + + if (this->rightHandType == 0xFF) { + Matrix_Get(&this->shieldMf); + } else if ((this->rightHandType == 11) || (this->rightHandType == 12)) { + BowStringData* stringData = &sBowStringData[gSaveContext.linkAge]; // sp+0xB0 + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2783); + + Matrix_Push(); + Matrix_Translate(stringData->pos.x, stringData->pos.y, stringData->pos.z, MTXMODE_APPLY); + + if ((this->stateFlags1 & 0x200) && (this->unk_860 >= 0) && (this->unk_834 <= 10)) { + Vec3f sp90; + f32 distXYZ; + + Matrix_MultVec3f(&D_8012602C, &sp90); + distXYZ = Math_Vec3f_DistXYZ(D_80160000, &sp90); + + this->unk_858 = distXYZ - 3.0f; + if (distXYZ < 3.0f) { + this->unk_858 = 0.0f; + } else { + this->unk_858 *= 1.6f; + if (this->unk_858 > 1.0f) { + this->unk_858 = 1.0f; + } + } + + this->unk_85C = -0.5f; + } + + Matrix_Scale(1.0f, this->unk_858, 1.0f, MTXMODE_APPLY); + + if (LINK_IS_CHILD) { + Matrix_RotateZ(this->unk_858 * -0.2f, MTXMODE_APPLY); + } + + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2804), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(oGfxCtx->polyXlu.p++, stringData->dList); + + Matrix_Pull(); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2809); + } else if ((this->actor.scale.y >= 0.0f) && (this->rightHandType == 10)) { + Matrix_Get(&this->shieldMf); + func_80090604(globalCtx, this, &this->shieldQuad, D_80126154); + } + + if (this->actor.scale.y >= 0.0f) { + if ((this->heldItemActionParam == PLAYER_AP_HOOKSHOT) || + (this->heldItemActionParam == PLAYER_AP_LONGSHOT)) { + Matrix_MultVec3f(&D_80126184, &this->unk_3C8); + + if (heldActor != NULL) { + MtxF sp44; + s32 pad; + + Matrix_MultVec3f(&D_80126190, &heldActor->posRot.pos); + Matrix_RotateRPY(0, -0x4000, -0x4000, MTXMODE_APPLY); + Matrix_Get(&sp44); + func_800D20CC(&sp44, &heldActor->posRot.rot, 0); + heldActor->shape.rot = heldActor->posRot.rot; + + if (func_8002DD78(this) != 0) { + Matrix_Translate(500.0f, 300.0f, 0.0f, MTXMODE_APPLY); + func_80090AFC(globalCtx, this, + (this->heldItemActionParam == PLAYER_AP_HOOKSHOT) ? 38600.0f : 77600.0f); + } + } + } + + if ((this->unk_862 != 0) || ((func_8002DD6C(this) == 0) && (heldActor != NULL))) { + if (!(this->stateFlags1 & 0x400) && (this->unk_862 != 0) && (this->exchangeItemId != EXCH_ITEM_NONE)) { + Math_Vec3f_Copy(&sGetItemRefPos, &this->leftHandPos); + } else { + sGetItemRefPos.x = (this->bodyPartsPos[15].x + this->leftHandPos.x) * 0.5f; + sGetItemRefPos.y = (this->bodyPartsPos[15].y + this->leftHandPos.y) * 0.5f; + sGetItemRefPos.z = (this->bodyPartsPos[15].z + this->leftHandPos.z) * 0.5f; + } + + if (this->unk_862 == 0) { + Math_Vec3f_Copy(&heldActor->posRot.pos, &sGetItemRefPos); + } + } + } + } else if (this->actor.scale.y >= 0.0f) { + if (limbIndex == PLAYER_LIMB_SHEATH) { + if ((this->rightHandType != 10) && (this->rightHandType != 0xFF)) { + if (Player_IsChildWithHylianShield(this)) { + func_80090604(globalCtx, this, &this->shieldQuad, D_8012619C); + } + + Matrix_JointPosition(&D_801261CC, &D_801261D8); + Matrix_Get(&this->shieldMf); + } + } else if (limbIndex == PLAYER_LIMB_HEAD) { + Matrix_MultVec3f(&D_801260D4, &this->actor.posRot2.pos); + } else { + Vec3f* vec = &D_801261E0[gSaveContext.linkAge]; + + func_8002BDB0(&this->actor, limbIndex, PLAYER_LIMB_L_FOOT, vec, PLAYER_LIMB_R_FOOT, vec); + } } } #else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_80090AFC.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_80090D20.s") #endif -#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_80090D20.s") +u32 func_80091738(GlobalContext* globalCtx, u8* segment, SkelAnime* skelAnime) { + s16 linkObjectId; + u32 size; + void* ptr; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_80091738.s") + linkObjectId = gLinkObjectIds[(void)0, gSaveContext.linkAge]; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_80091880.s") + size = gObjectTable[OBJECT_GAMEPLAY_KEEP].vromEnd - gObjectTable[OBJECT_GAMEPLAY_KEEP].vromStart; + ptr = segment + 0x3800; + DmaMgr_SendRequest1(ptr, gObjectTable[OBJECT_GAMEPLAY_KEEP].vromStart, size, "../z_player_lib.c", 2982); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_80091A24.s") + size = gObjectTable[linkObjectId].vromEnd - gObjectTable[linkObjectId].vromStart; + ptr = segment + 0x8800; + DmaMgr_SendRequest1(ptr, gObjectTable[linkObjectId].vromStart, size, "../z_player_lib.c", 2988); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8009214C.s") + ptr = (void*)ALIGN16((u32)ptr + size); + + gSegments[4] = VIRTUAL_TO_PHYSICAL(segment + 0x3800); + gSegments[6] = VIRTUAL_TO_PHYSICAL(segment + 0x8800); + + SkelAnime_InitLinkAnimetion(globalCtx, skelAnime, gPlayerSkelHeaders[(void)0, gSaveContext.linkAge], &D_04003238, 9, + ptr, ptr, PLAYER_LIMB_MAX); + + return size + 0x8890; +} + +u8 D_801261F8[] = { 2, 2, 5 }; + +s32 func_80091880(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* pos, Vec3s* rot, void* arg) { + u8* ptr = arg; + u8 modelGroup = D_801261F8[ptr[0] - 1]; + s32 type; + s32 dListOffset = 0; + Gfx** dLists; + + if ((modelGroup == 2) && LINK_IS_CHILD && (ptr[1] == 2)) { + modelGroup = 1; + } + + if (limbIndex == PLAYER_LIMB_L_HAND) { + type = gPlayerModelTypes[modelGroup][1]; + D_80160014 = type; + if ((type == 4) && (gSaveContext.swordHealth <= 0.0f)) { + dListOffset = 4; + } + } else if (limbIndex == PLAYER_LIMB_R_HAND) { + type = gPlayerModelTypes[modelGroup][2]; + D_80160018 = type; + if (type == 10) { + dListOffset = ptr[1] * 4; + } + } else if (limbIndex == PLAYER_LIMB_SHEATH) { + type = gPlayerModelTypes[modelGroup][3]; + if ((type == 18) || (type == 19)) { + dListOffset = ptr[1] * 4; + } + } else if (limbIndex == PLAYER_LIMB_WAIST) { + type = gPlayerModelTypes[modelGroup][4]; + } else { + return 0; + } + + dLists = &sPlayerDListGroups[type][(void)0, gSaveContext.linkAge]; + *dList = dLists[dListOffset]; + + return 0; +} + +void func_80091A24(GlobalContext* globalCtx, void* seg04, void* seg06, struct_80091A24_arg3* arg3, Vec3f* pos, + Vec3s* rot, f32 scale, s32 sword, s32 tunic, s32 shield, s32 boots, s32 width, s32 height, + Vec3f* eye, Vec3f* at, f32 fovy, void* img1, void* img2) { + static Vp viewport = { 128, 224, 511, 0, 128, 224, 511, 0 }; + static Lights1 lights1 = gdSPDefLights1(80, 80, 80, 255, 255, 255, 84, 84, 172); + static Vec3f lightDir = { 89.8f, 0.0f, 89.8f }; + u8 sp12C[2]; + Gfx* opaRef; + Gfx* xluRef; + u16 perspNorm; + Mtx* perspMtx; + Mtx* lookAtMtx; + + perspMtx = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx)); + lookAtMtx = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx)); + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 3129); + + { s32 pad[2]; } + + opaRef = oGfxCtx->polyOpa.p; + oGfxCtx->polyOpa.p++; + + xluRef = oGfxCtx->polyXlu.p; + oGfxCtx->polyXlu.p++; + + gSPDisplayList(oGfxCtx->work.p++, oGfxCtx->polyOpa.p); + gSPDisplayList(oGfxCtx->work.p++, oGfxCtx->polyXlu.p); + + gSPSegment(oGfxCtx->polyOpa.p++, 0x00, NULL); + + gDPPipeSync(oGfxCtx->polyOpa.p++); + + gSPLoadGeometryMode(oGfxCtx->polyOpa.p++, 0); + gSPTexture(oGfxCtx->polyOpa.p++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF); + gDPSetCombineMode(oGfxCtx->polyOpa.p++, G_CC_SHADE, G_CC_SHADE); + gDPSetOtherMode(oGfxCtx->polyOpa.p++, + G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_FILL | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_NOOP | G_RM_NOOP2); + gSPLoadGeometryMode(oGfxCtx->polyOpa.p++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH); + gDPSetScissorFrac(oGfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, width * 4.0f, height * 4.0f); + gSPClipRatio(oGfxCtx->polyOpa.p++, FRUSTRATIO_1); + + gDPSetColorImage(oGfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, img2); + gDPSetCycleType(oGfxCtx->polyOpa.p++, G_CYC_FILL); + gDPSetRenderMode(oGfxCtx->polyOpa.p++, G_RM_NOOP, G_RM_NOOP2); + gDPSetFillColor(oGfxCtx->polyOpa.p++, (GPACK_RGBA5551(255, 255, 240, 0) << 16) | GPACK_RGBA5551(255, 255, 240, 0)); + gDPFillRectangle(oGfxCtx->polyOpa.p++, 0, 0, width - 1, height - 1); + + gDPPipeSync(oGfxCtx->polyOpa.p++); + + gDPSetColorImage(oGfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, img1); + gDPSetCycleType(oGfxCtx->polyOpa.p++, G_CYC_FILL); + gDPSetRenderMode(oGfxCtx->polyOpa.p++, G_RM_NOOP, G_RM_NOOP2); + gDPSetFillColor(oGfxCtx->polyOpa.p++, (GPACK_RGBA5551(0, 0, 0, 1) << 16) | GPACK_RGBA5551(0, 0, 0, 1)); + gDPFillRectangle(oGfxCtx->polyOpa.p++, 0, 0, width - 1, height - 1); + + gDPPipeSync(oGfxCtx->polyOpa.p++); + + gDPSetDepthImage(oGfxCtx->polyOpa.p++, img2); + + viewport.vp.vscale[0] = viewport.vp.vtrans[0] = width * 2; + viewport.vp.vscale[1] = viewport.vp.vtrans[1] = height * 2; + gSPViewport(oGfxCtx->polyOpa.p++, &viewport); + + guPerspective(perspMtx, &perspNorm, fovy, (f32)width / (f32)height, 10.0f, 4000.0f, 1.0f); + + gSPPerspNormalize(oGfxCtx->polyOpa.p++, perspNorm); + gSPMatrix(oGfxCtx->polyOpa.p++, perspMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + + guLookAt(lookAtMtx, eye->x, eye->y, eye->z, at->x, at->y, at->z, 0.0f, 1.0f, 0.0f); + + gSPMatrix(oGfxCtx->polyOpa.p++, lookAtMtx, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + + sp12C[0] = sword; + sp12C[1] = shield; + + func_800D1694(pos->x, pos->y, pos->z, rot); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + + gSPSegment(oGfxCtx->polyOpa.p++, 0x04, seg04); + gSPSegment(oGfxCtx->polyOpa.p++, 0x06, seg06); + + gSPSetLights1(oGfxCtx->polyOpa.p++, lights1); + + func_80093C80(globalCtx); + + oGfxCtx->polyOpa.p = Gfx_SetFog2(oGfxCtx->polyOpa.p++, 0, 0, 0, 0, 997, 1000); + + func_8002EABC(pos, &globalCtx->view.eye, &lightDir, globalCtx->state.gfxCtx); + + gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, gCullBackDList); + + func_8008F470(globalCtx, arg3->skeleton, arg3->limbDrawTable, arg3->dListCount, 0, tunic, boots, 0, func_80091880, + NULL, &sp12C); + + gSPEndDisplayList(oGfxCtx->polyOpa.p++); + gSPEndDisplayList(oGfxCtx->polyXlu.p++); + + gSPBranchList(opaRef, oGfxCtx->polyOpa.p); + gSPBranchList(xluRef, oGfxCtx->polyXlu.p); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 3288); +} + +void func_8009214C(GlobalContext* globalCtx, u8* segment, struct_80091A24_arg3* arg2, Vec3f* pos, Vec3s* rot, f32 scale, + s32 sword, s32 tunic, s32 shield, s32 boots) { + static Vec3f eye = { 0.0f, 0.0f, -400.0f }; + static Vec3f at = { 0.0f, 0.0f, 0.0f }; + Vec3s* destTable; + Vec3s* srcTable; + s32 i; + + gSegments[4] = VIRTUAL_TO_PHYSICAL(segment + 0x3800); + gSegments[6] = VIRTUAL_TO_PHYSICAL(segment + 0x8800); + + if (LINK_IS_CHILD) { + if (shield == PLAYER_SHIELD_DEKU) { + srcTable = D_040020D0; + } else { + srcTable = D_04002040; + } + } else { + if (sword == 3) { + srcTable = D_04002160; + } else if (shield != PLAYER_SHIELD_NONE) { + srcTable = D_04002280; + } else { + srcTable = D_040021F0; + } + } + + srcTable = SEGMENTED_TO_VIRTUAL(srcTable); + destTable = arg2->limbDrawTable; + for (i = 0; i < arg2->limbCount; i++) { + *destTable++ = *srcTable++; + } + + func_80091A24(globalCtx, segment + 0x3800, segment + 0x8800, arg2, pos, rot, scale, sword, tunic, shield, boots, 64, + 112, &eye, &at, 60.0f, globalCtx->state.gfxCtx->curFrameBuffer, + globalCtx->state.gfxCtx->curFrameBuffer + 0x1C00); +} diff --git a/src/code/z_room.c b/src/code/z_room.c index 7a25609d48..388c41b742 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -519,8 +519,8 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) { LOG_NUM("game_play->room_rom_address.num", globalCtx->nbRooms, "../z_room.c", 912); for (j = 0; j < globalCtx->nbTransitionActors; j++) { - s8 frontRoom = transitionActor->frontRoom; - s8 backRoom = transitionActor->backRoom; + s8 frontRoom = transitionActor->sides[0].room; + s8 backRoom = transitionActor->sides[1].room; u32 frontRoomSize = (frontRoom < 0) ? 0 : roomList[frontRoom].vromEnd - roomList[frontRoom].vromStart; u32 backRoomSize = (backRoom < 0) ? 0 : roomList[backRoom].vromEnd - roomList[backRoom].vromStart; u32 cumulRoomSize = (frontRoom != backRoom) ? frontRoomSize + backRoomSize : frontRoomSize; @@ -599,7 +599,7 @@ s32 func_800973FC(GlobalContext* globalCtx, RoomContext* roomCtx) { gSegments[3] = VIRTUAL_TO_PHYSICAL(roomCtx->unk_34); Scene_ExecuteCommands(globalCtx, roomCtx->curRoom.segment); - func_8008E750(globalCtx, PLAYER); + Player_SetBootData(globalCtx, PLAYER); Actor_SpawnTransitionActors(globalCtx, &globalCtx->actorCtx); return 1; diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index d1fa131e1b..2c124b0d76 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -77,7 +77,7 @@ void ArmsHook_Wait(ArmsHook* this, GlobalContext* globalCtx) { if (this->actor.parent == NULL) { player = PLAYER; // get correct timer length for hookshot or longshot - length = (player->heldItemActionParam == 0x10) ? 13 : 26; + length = (player->heldItemActionParam == PLAYER_AP_HOOKSHOT) ? 13 : 26; ArmsHook_SetupAction(this, ArmsHook_Shoot); func_8002D9A4(&this->actor, 20.0f); @@ -111,8 +111,8 @@ void ArmsHook_DetachHookFromActor(ArmsHook* this) { s32 ArmsHook_CheckForCancel(ArmsHook* this) { Player* player = (Player*)this->actor.parent; - if (func_8008F104(player)) { - if ((player->unk_154 != player->heldItemActionParam) || ((player->actor.flags & 0x100)) || + if (Player_HoldsHookshot(player)) { + if ((player->itemActionParam != player->heldItemActionParam) || ((player->actor.flags & 0x100)) || ((player->stateFlags1 & 0x4000080))) { this->timer = 0; ArmsHook_DetachHookFromActor(this); @@ -151,7 +151,7 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) { f32 velocity; s32 pad1; - if ((this->actor.parent == NULL) || (!func_8008F104(player))) { + if ((this->actor.parent == NULL) || (!Player_HoldsHookshot(player))) { ArmsHook_DetachHookFromActor(this); Actor_Kill(&this->actor); return; @@ -310,21 +310,21 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) { f32 sp58; if (player->actor.draw != NULL) { - if (player->unk_15D == 0xF) { + if (player->rightHandType == 15) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_arms_hook.c", 850); if ((ArmsHook_Shoot != this->actionFunc) || (this->timer <= 0)) { Matrix_MultVec3f(&D_80865B70, &this->unk_1E8); Matrix_MultVec3f(&D_80865B88, &sp6C); Matrix_MultVec3f(&D_80865B94, &sp60); - this->unk_1CC = 0; + this->hookInfo.active = 0; } else { Matrix_MultVec3f(&D_80865B7C, &this->unk_1E8); Matrix_MultVec3f(&D_80865BA0, &sp6C); Matrix_MultVec3f(&D_80865BAC, &sp60); } - func_80090480(globalCtx, &this->collider.base, &this->unk_1CC, &sp6C, &sp60); + func_80090480(globalCtx, &this->collider, &this->hookInfo, &sp6C, &sp60); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arms_hook.c", 895), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h index 1c0add000e..e0793716e6 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h @@ -11,8 +11,7 @@ typedef void (*ArmsHookActionFunc)(struct ArmsHook*, GlobalContext*); typedef struct ArmsHook { /* 0x0000 */ Actor actor; /* 0x014C */ ColliderQuad collider; - /* 0x01CC */ s32 unk_1CC; - /* 0x01D0 */ char unk_1D0[0x18]; + /* 0x01CC */ WeaponInfo hookInfo; /* 0x01E8 */ Vec3f unk_1E8; /* 0x01F4 */ Vec3f unk_1F4; /* 0x0200 */ Actor* grabbed; diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index 5c2fadc328..97c7664e66 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -363,7 +363,7 @@ void func_8086C874(BgBdanObjects* this, GlobalContext* globalCtx) { if (this->unk_168 == 0) { do { } while (0); - func_8005A77C(globalCtx->cameraPtrs[0], (s16)this->unk_1B8); + func_8005A77C(globalCtx->cameraPtrs[0], this->unk_1B8); func_8005ACFC(globalCtx->cameraPtrs[0], 4); } } diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index bdc1a2146e..815a6a9261 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -479,7 +479,7 @@ void BgBdanSwitch_Update(Actor* thisx, GlobalContext* globalCtx) { this->unk_1D8 -= 1; return; } - if (!func_8008E988(globalCtx) && this->unk_1D8 > 0) { + if (!Player_InCsMode(globalCtx) && this->unk_1D8 > 0) { this->unk_1D8 -= 1; } temp = this->collider.base.acFlags; diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 7226eeac98..75925e63cd 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -200,7 +200,7 @@ void func_808801B8(BgHakaTrap* this, GlobalContext* globalCtx) { static UNK_TYPE D_80881018 = 0; Player* player = PLAYER; - if ((D_80880F30 == 0) && (func_8008E988(globalCtx) == 0)) { + if ((D_80880F30 == 0) && (!Player_InCsMode(globalCtx))) { if (!Math_ApproxF(&this->dyna.actor.posRot.pos.x, this->dyna.actor.initPosRot.pos.x, 0.5f)) { func_8002F974(&this->dyna.actor, NA_SE_EV_TRAP_OBJ_SLIDE - SFX_FLAG); } else if (this->dyna.actor.params == HAKA_TRAP_SPIKED_WALL) { @@ -403,9 +403,10 @@ void func_808809E4(BgHakaTrap* this, GlobalContext* globalCtx, s16 arg2) { func_8002DBD0(&this->dyna.actor, &sp18, &player->actor.posRot.pos); - if ((fabsf(sp18.x) < 70.0f) && (fabsf(sp18.y) < 100.0f) && (sp18.z < 500.0f) && (PLAYER->currentBoots != 1)) { - player->fanWindSpeed = ((500.0f - sp18.z) * 0.06f + 5.0f) * arg2 * (1.0f / 14848.0f) * (2.0f / 3.0f); - player->fanWindDirection = this->dyna.actor.shape.rot.y; + if ((fabsf(sp18.x) < 70.0f) && (fabsf(sp18.y) < 100.0f) && (sp18.z < 500.0f) && + (PLAYER->currentBoots != PLAYER_BOOTS_IRON)) { + player->windSpeed = ((500.0f - sp18.z) * 0.06f + 5.0f) * arg2 * (1.0f / 14848.0f) * (2.0f / 3.0f); + player->windDirection = this->dyna.actor.shape.rot.y; } } diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index 7ff3e58ca3..3b84378c81 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -499,7 +499,7 @@ void BgHeavyBlock_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_heavy_block.c", 904); if (BgHeavyBlock_LiftedUp == this->actionFunc) { - func_800D1694(player->unk_3B0.x, player->unk_3B0.y, player->unk_3B0.z, &thisx->shape.rot); + func_800D1694(player->leftHandPos.x, player->leftHandPos.y, player->leftHandPos.z, &thisx->shape.rot); Matrix_Translate(-this->unk_164.x, -this->unk_164.y, -this->unk_164.z, MTXMODE_APPLY); } else if ((thisx->gravity == 0.0f) && (BgHeavyBlock_Land == this->actionFunc)) { func_800D1694(thisx->initPosRot.pos.x, thisx->initPosRot.pos.y, thisx->initPosRot.pos.z, &thisx->shape.rot); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index 7918129625..52c344cc12 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -90,7 +90,7 @@ void BgHidanDalm_Destroy(Actor* thisx, GlobalContext* globalCtx) { void BgHidanDalm_WaitInteraction(BgHidanDalm* this, GlobalContext* globalCtx) { Player* player = PLAYER; - if ((this->collider.base.acFlags & 2) && !func_8008E988(globalCtx) && + if ((this->collider.base.acFlags & 2) && !Player_InCsMode(globalCtx) && (player->swordAnimation == 22 || player->swordAnimation == 23)) { this->collider.base.acFlags &= ~2; if (this->collider.list[0].body.bumperFlags & 2 || this->collider.list[1].body.bumperFlags & 2) { diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c index 0372a74e91..6fcb235663 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c @@ -59,7 +59,7 @@ void BgMizuUzu_Destroy(Actor* thisx, GlobalContext* globalCtx) { void func_8089F788(BgMizuUzu* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; - if (PLAYER->currentBoots == 1) { + if (PLAYER->currentBoots == PLAYER_BOOTS_IRON) { func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } else { func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 65c00ca567..f2277a98e2 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -128,7 +128,7 @@ void DoorAna_WaitOpen(DoorAna* this, GlobalContext* globalCtx) { globalCtx->nextEntranceIndex = entrances[destinationIdx]; DoorAna_SetupAction(this, DoorAna_GrabLink); } else { - if (!func_8008E988(globalCtx) && !(player->stateFlags1 & 0x8800000) && + if (!Player_InCsMode(globalCtx) && !(player->stateFlags1 & 0x8800000) && this->actor.xzDistFromLink <= 15.0f && -50.0f <= this->actor.yDistFromLink && this->actor.yDistFromLink <= 15.0f) { player->stateFlags1 |= 0x80000000; 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 aeecac36ac..a24114dd06 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c @@ -86,7 +86,7 @@ s32 func_80994750(DoorGerudo* this, GlobalContext* globalCtx) { f32 temp_f0; s16 rotYDiff; - if (!func_8008E988(globalCtx)) { + if (!Player_InCsMode(globalCtx)) { temp_f0 = func_809946BC(globalCtx, this, 0.0f, 20.0f, 15.0f); if (fabsf(temp_f0) < 40.0f) { rotYDiff = player->actor.shape.rot.y - this->dyna.actor.shape.rot.y; @@ -102,27 +102,26 @@ s32 func_80994750(DoorGerudo* this, GlobalContext* globalCtx) { } void func_8099485C(DoorGerudo* this, GlobalContext* globalCtx) { - s32 temp_v0; - Player* player; - if (this->unk_164 != 0) { this->actionFunc = func_8099496C; gSaveContext.dungeonKeys[gSaveContext.mapIndex] -= 1; Flags_SetSwitch(globalCtx, this->dyna.actor.params & 0x3F); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_CHAIN_KEY_UNLOCK); } else { - temp_v0 = func_80994750(this, globalCtx); - if (temp_v0 != 0) { - player = PLAYER; + s32 direction = func_80994750(this, globalCtx); + + if (direction != 0) { + Player* player = PLAYER; + if (gSaveContext.dungeonKeys[gSaveContext.mapIndex] <= 0) { player->naviMessageId = -0x203; } else if (!Flags_GetCollectible(globalCtx, (this->dyna.actor.params >> 8) & 0x1F)) { player->naviMessageId = -0x225; } else { - player->unk_42C = 2; - player->unk_42D = temp_v0; - player->unk_430 = &this->dyna.actor; - player->unk_42E = 10; + player->doorType = 2; + player->doorDirection = direction; + player->doorActor = &this->dyna.actor; + player->doorTimer = 10; } } } diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h index 637ff1dbfa..67c2885ba8 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h @@ -8,7 +8,9 @@ struct DoorShutter; typedef struct DoorShutter { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x2C]; + /* 0x014C */ char unk_14C[0x18]; + /* 0x0164 */ s16 unk_164; + /* 0x0166 */ char unk_166[0x12]; } DoorShutter; // size = 0x0178 extern const ActorInit Door_Shutter_InitVars; 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 b3d4ae76be..8f5584c501 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -173,7 +173,7 @@ s32 ElfMsg_GetMessageId(ElfMsg* this) { void ElfMsg_CallNaviCuboid(ElfMsg* this, GlobalContext* globalCtx) { Player* player = PLAYER; - EnElf* navi = (EnElf*)player->navi; + EnElf* navi = (EnElf*)player->naviActor; if ((fabsf(player->actor.posRot.pos.x - this->actor.posRot.pos.x) < (100.0f * this->actor.scale.x)) && (this->actor.posRot.pos.y <= player->actor.posRot.pos.y) && @@ -190,7 +190,7 @@ s32 ElfMsg_WithinXZDistance(Vec3f* pos1, Vec3f* pos2, f32 distance) { void ElfMsg_CallNaviCylinder(ElfMsg* this, GlobalContext* globalCtx) { Player* player = PLAYER; - EnElf* navi = (EnElf*)player->navi; + EnElf* navi = (EnElf*)player->naviActor; 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) && diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index ea2b01072b..25fcbe8563 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -246,7 +246,7 @@ void EnBom_Update(Actor* thisx, GlobalContext* globalCtx) { } else { // if a lit stick touches the bomb, set timer to 100 // these bombs never have a timer over 70, so this isnt used - if ((this->timer > 100) && func_8008EF5C(globalCtx, &thisx->posRot.pos, 30.0f, 50.0f)) { + if ((this->timer > 100) && Player_IsBurningStickInRange(globalCtx, &thisx->posRot.pos, 30.0f, 50.0f)) { this->timer = 100; } } diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 617987e671..f62dac934f 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -158,7 +158,7 @@ void EnBombf_GrowBomb(EnBombf* this, GlobalContext* globalCtx) { } } } else { - if (func_8008EF5C(globalCtx, &this->actor.posRot.pos, 30.0f, 50.0f)) { + if (Player_IsBurningStickInRange(globalCtx, &this->actor.posRot.pos, 30.0f, 50.0f)) { bombFlower = (EnBombf*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOMBF, this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 0); @@ -347,7 +347,7 @@ void EnBombf_Update(Actor* thisx, GlobalContext* globalCtx) { this->timer = 0; } else { // if a lit stick touches the bomb, set timer to 100 - if ((this->timer > 100) && func_8008EF5C(globalCtx, &thisx->posRot.pos, 30.0f, 50.0f)) { + if ((this->timer > 100) && Player_IsBurningStickInRange(globalCtx, &thisx->posRot.pos, 30.0f, 50.0f)) { this->timer = 100; } } diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index 5d73c06aae..246660c8fe 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -251,7 +251,7 @@ void EnBoom_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_MultVec3f(&sMultVec1, &vec1); Matrix_MultVec3f(&sMultVec2, &vec2); - if (func_80090480(globalCtx, &this->collider, &this->unk_1DC, &vec1, &vec2) != 0) { + if (func_80090480(globalCtx, &this->collider, &this->boomerangInfo, &vec1, &vec2) != 0) { EffectBlure_AddVertex(Effect_GetByIndex(this->effectIndex), &vec1, &vec2); } diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.h b/src/overlays/actors/ovl_En_Boom/z_en_boom.h index 9934edcd8b..80a84a7f88 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.h +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.h @@ -16,7 +16,7 @@ typedef struct EnBoom { /* 0x01D4 */ u8 returnTimer; // returns to Link when 0 /* 0x01D5 */ u8 activeTimer; // increments once every update /* 0x01D8 */ u32 effectIndex; // set by Effect_Add - /* 0x01DC */ Struct_80090480_arg2 unk_1DC; + /* 0x01DC */ WeaponInfo boomerangInfo; /* 0x01F8 */ EnBoomActionFunc actionFunc; } EnBoom; // size = 0x01FC diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.h b/src/overlays/actors/ovl_En_Box/z_en_box.h index 39f136a196..7b847af326 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.h +++ b/src/overlays/actors/ovl_En_Box/z_en_box.h @@ -8,7 +8,9 @@ struct EnBox; typedef struct EnBox { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xB0]; + /* 0x014C */ char unk_14C[0xA8]; + /* 0x01F4 */ s16 unk_1F4; + /* 0x01F6 */ char unk_1F6[0x06]; } EnBox; // size = 0x01FC extern const ActorInit En_Box_InitVars; diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index d5fb040f9f..ef65cf0e71 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -138,11 +138,11 @@ void EnBx_Update(Actor* thisx, GlobalContext* globalCtx) { } if ((&player->actor != this->collider.base.at) && (&player->actor != this->collider.base.ac) && (&player->actor != this->colliderQuad.base.at) && (player->invincibilityTimer <= 0)) { - if (player->invincibilityTimer < -0x27) { + if (player->invincibilityTimer < -39) { player->invincibilityTimer = 0; } else { player->invincibilityTimer = 0; - globalCtx->unk_11D58(globalCtx, -4); + globalCtx->damagePlayer(globalCtx, -4); } } func_8002F71C(globalCtx, &this->actor, 6.0f, tmp32, 6.0f); diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index ae96c3ca4d..106a071b42 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -146,7 +146,7 @@ void func_809ECA50(EnDha* this, GlobalContext* globalCtx) { this->unk_1D6.x = this->unk_1D0.y; if (Math_Vec3f_DistXYZ(&playerPos, &this->unk_1DC) <= 12.0f) { if (this->unk_1CC == 0) { - if (globalCtx->unk_11D4C(globalCtx, player) != 0) { + if (globalCtx->grabPlayer(globalCtx, player) != 0) { this->unk_1CA = 0; this->unk_1CC++; if (this->actor.parent != NULL) { diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.h b/src/overlays/actors/ovl_En_Door/z_en_door.h index 93ef234ca6..1d43b30247 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.h +++ b/src/overlays/actors/ovl_En_Door/z_en_door.h @@ -8,7 +8,10 @@ struct EnDoor; typedef struct EnDoor { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x8C]; + /* 0x014C */ char unk_14C[0x44]; + /* 0x0190 */ u8 unk_190; + /* 0x0191 */ u8 unk_191; + /* 0x0192 */ char unk_192[0x46]; } EnDoor; // size = 0x01D8 extern const ActorInit En_Door_InitVars; diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index 9c13f555e3..dea5061fe1 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -149,7 +149,7 @@ void EnDs_OfferOddPotion(EnDs* this, GlobalContext* globalCtx) { this->brewTimer = 60; Flags_SetSwitch(globalCtx, 0x3F); globalCtx->msgCtx.msgMode = 0x37; - player->exchangeItemId = 0; + player->exchangeItemId = EXCH_ITEM_NONE; break; case 1: // no func_8010B720(globalCtx, 0x504C); @@ -209,7 +209,7 @@ void EnDs_Wait(EnDs* this, GlobalContext* globalCtx) { s16 yawDiff; if (func_8002F194(&this->actor, globalCtx) != 0) { - if (func_8002F368(globalCtx) == 8) { + if (func_8002F368(globalCtx) == EXCH_ITEM_ODD_MUSHROOM) { Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); player->actor.textId = 0x504A; this->actionFunc = EnDs_OfferOddPotion; @@ -229,7 +229,7 @@ void EnDs_Wait(EnDs* this, GlobalContext* globalCtx) { this->actor.textId = 0x5048; if ((ABS(yawDiff) < 0x2151) && (this->actor.xzDistFromLink < 200.0f)) { - func_8002F298(this, globalCtx, 100.0f, 8); + func_8002F298(this, globalCtx, 100.0f, EXCH_ITEM_ODD_MUSHROOM); this->unk_1E8 |= 1; } } diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 39e93759ea..31326f4ad1 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -721,9 +721,9 @@ void EnFloormas_JumpAtLink(EnFloormas* this, GlobalContext* globalCtx) { this->actor.speedXZ = 0.0f; Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLOORMASTER_SM_LAND); EnFloormas_SetupLand(this); - } else if ((this->actor.yDistFromLink < -10.0f) && this->collider.base.maskA & 2 && + } else if ((this->actor.yDistFromLink < -10.0f) && (this->collider.base.maskA & 2) && (&player->actor == this->collider.base.oc)) { - globalCtx->unk_11D4C(globalCtx, player); + globalCtx->grabPlayer(globalCtx, player); EnFloormas_SetupGrabLink(this, player); } } @@ -785,7 +785,7 @@ void EnFloormas_GrabLink(EnFloormas* this, GlobalContext* globalCtx) { } else { func_8002F7DC(&player->actor, NA_SE_VO_LI_DAMAGE_S); } - globalCtx->unk_11D58(globalCtx, -8); + globalCtx->damagePlayer(globalCtx, -8); } } diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index b01c7d59d0..d4af67f4a3 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -148,9 +148,9 @@ ShopItemEntry D_80A3C674[] = { func_80A3BB6C }, { 0x00DA, 0x0028, func_8002EBCC, 0x0064, 0x0001, 0x00AE, 0x0099, GI_WEIRD_EGG, func_80A3B2AC, func_80A3B968, func_80A3BB6C }, - { 0x00DF, 0x002F, func_80A3C498, 0x2710, 0x0001, 0x00B4, 0x0085, GI_INVALID, func_80A3B308, func_80A3B9A4, + { 0x00DF, 0x002F, func_80A3C498, 0x2710, 0x0001, 0x00B4, 0x0085, GI_NONE, func_80A3B308, func_80A3B9A4, func_80A3BB6C }, - { 0x00DA, 0x0028, func_8002EBCC, 0x2710, 0x0001, 0x00B5, 0x0085, GI_INVALID, func_80A3B318, func_80A3B9D4, + { 0x00DA, 0x0028, func_8002EBCC, 0x2710, 0x0001, 0x00B5, 0x0085, GI_NONE, func_80A3B318, func_80A3B9D4, func_80A3BB6C }, { 0x00D9, 0x0027, func_8002EBCC, 0x0064, 0x000A, 0x00BC, 0x008C, GI_BOMBCHUS_10, func_80A3B328, NULL, func_80A3BC6C }, @@ -658,7 +658,7 @@ void func_80A3B780(GlobalContext* globalCtx, EnGirlA* this) { void func_80A3B7BC(GlobalContext* globalCtx, EnGirlA* this) { func_800849EC(globalCtx); - gSaveContext.bgsHitsLeft = 8; + gSaveContext.swordHealth = 8; Rupees_ChangeBy(-this->unk_1C8); } @@ -868,7 +868,7 @@ s32 func_80A3BF54(EnGirlA* this, GlobalContext* globalCtx) { if ((this->actor.params >= 30) && (this->actor.params < 38)) { params = this->actor.params - 30; - if (INV_CONTENT(ITEM_WEIRD_EGG) == D_80A3C658[params]) { + if (INV_CONTENT(ITEM_TRADE_CHILD) == D_80A3C658[params]) { func_80A3BEAC(globalCtx, this); } else { func_80A3BD8C(globalCtx, this); 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 a1ad9dda7b..410e08ce3d 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -145,7 +145,7 @@ void func_80A4E648(EnGs* this, GlobalContext* globalCtx) { func_8002F374(globalCtx, &this->actor, &sp26, &sp24); if ((sp26 >= 0) && (sp26 <= SCREEN_WIDTH) && (sp24 >= 0) && (sp24 <= SCREEN_HEIGHT) && (this->unk_19C != 3)) { if (func_8002F2CC(&this->actor, globalCtx, 40.0f) == 1) { - if (func_8008F080(globalCtx) == 8) { + if (Player_GetMask(globalCtx) == PLAYER_MASK_TRUTH) { this->actor.textId = 0x2054; } else { this->actor.textId = 0x2053; diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index 738ba28273..fb7ba8712c 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -350,7 +350,7 @@ void func_80A5399C(EnHeishi2* this, GlobalContext* globalCtx) { var = 0; if (gSaveContext.infTable[7] & 0x40) { if (!(gSaveContext.infTable[7] & 0x80)) { - if (func_8008F080(globalCtx) == 1) { + if (Player_GetMask(globalCtx) == PLAYER_MASK_KEATON) { if (this->unk_309 == 0) { this->actor.textId = 0x200A; // "Wha-ha-ha-hah! Do you think you're in disguise, Mr. Hero?" } else { @@ -401,19 +401,19 @@ void func_80A53AD4(EnHeishi2* this, GlobalContext* globalCtx) { this->unk_300 = 6; if (func_8002F194(&this->actor, globalCtx) != 0) { exchangeItemId = func_8002F368(globalCtx); - if (exchangeItemId == 1) { // exchangeItemId = zelda's letter + if (exchangeItemId == EXCH_ITEM_LETTER_ZELDA) { func_80078884(NA_SE_SY_CORRECT_CHIME); player->actor.textId = 0x2010; // "Oh, this is...this is surely Princess Zelda's handwriting!" this->unk_300 = 5; this->actionFunc = func_80A53C0C; - } else if (exchangeItemId != 0) { // exchangeItemId != nothing + } else if (exchangeItemId != EXCH_ITEM_NONE) { player->actor.textId = 0x200F; // "I don't want that!" } } else { yawDiffTemp = this->actor.yawTowardsLink - this->actor.shape.rot.y; yawDiff = ABS(yawDiffTemp); if (!(120.0f < this->actor.xzDistFromLink) && (yawDiff < 0x4300)) { - func_8002F298(&this->actor, globalCtx, 100.0f, 1); + func_8002F298(&this->actor, globalCtx, 100.0f, EXCH_ITEM_LETTER_ZELDA); } } } @@ -539,7 +539,7 @@ void func_80A540C0(EnHeishi2* this, GlobalContext* globalCtx) { case 0: this->actor.textId = 0x2020; // "My boy will be very happy with this!.." func_8010B720(globalCtx, this->actor.textId); - func_8008F08C(globalCtx); + Player_UnsetMask(globalCtx); gSaveContext.infTable[7] |= 0x80; gSaveContext.itemGetInf[3] |= 0x100; Item_Give(globalCtx, ITEM_SOLD_OUT); diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.h b/src/overlays/actors/ovl_En_Horse/z_en_horse.h index 80289094c2..16791b6d89 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.h +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.h @@ -7,10 +7,39 @@ struct EnHorse; typedef struct EnHorse { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x2B0]; + /* 0x000 */ Actor actor; + /* 0x014C */ s32 unk_14C; + /* 0x0150 */ char unk_150[0x0A0]; + /* 0x01F0 */ u32 unk_1F0; + /* 0x01F4 */ char unk_1F4[0x01C]; + /* 0x0210 */ s32 unk_210; + /* 0x0214 */ f32 unk_214; + /* 0x0218 */ char unk_218[0x040]; + /* 0x0258 */ Vec3f unk_258; + /* 0x0264 */ char unk_264[0x198]; } EnHorse; // size = 0x03FC +#define EN_HORSE_CHECK_1(horseActor) \ + (((horseActor)->unk_1F0 & 0x40) \ + ? true \ + : false) + +#define EN_HORSE_CHECK_2(horseActor) \ + (((horseActor)->unk_1F0 & 0x100) \ + ? true \ + : false) + +#define EN_HORSE_CHECK_3(horseActor) \ + (((horseActor)->unk_1F0 & 0x200) \ + ? true \ + : false) + +#define EN_HORSE_CHECK_4(horseActor) \ + (((((horseActor)->unk_14C == 5) || ((horseActor)->unk_14C == 0) || ((horseActor)->unk_14C == 6)) && \ + !((horseActor)->unk_1F0 & 0x80000) && !((horseActor)->unk_1F0 & 0x2000000)) \ + ? true \ + : false) + extern const ActorInit En_Horse_InitVars; #endif diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index 93b8c81df0..a404fbd2ed 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -61,7 +61,7 @@ u16 EnKz_GetTextNoMaskChild(GlobalContext* globalCtx, EnKz* this) { } else if (gSaveContext.eventChkInf[3] & 8) { return 0x401C; } else { - player->exchangeItemId = 0x1D; + player->exchangeItemId = EXCH_ITEM_LETTER_RUTO; return 0x401A; } } @@ -80,7 +80,7 @@ u16 EnKz_GetTextNoMaskAdult(GlobalContext* globalCtx, EnKz* this) { return CHECK_QUEST_ITEM(QUEST_SONG_SERENADE) ? 0x4045 : 0x401A; } } else { - player->exchangeItemId = 0xC; + player->exchangeItemId = EXCH_ITEM_PRESCRIPTION; return 0x4012; } } @@ -219,8 +219,8 @@ void func_80A9CB18(EnKz* this, GlobalContext* globalCtx) { Player* player = PLAYER; if (func_80A9C95C(globalCtx, this, &this->unk_1E0.unk_00, 340.0f, EnKz_GetText, func_80A9C6C0) != 0) { - if ((this->actor.textId == 0x401A) && (!(gSaveContext.eventChkInf[3] & 8))) { - if (func_8002F368(globalCtx) == 0x1D) { + if ((this->actor.textId == 0x401A) && !(gSaveContext.eventChkInf[3] & 8)) { + if (func_8002F368(globalCtx) == EXCH_ITEM_LETTER_RUTO) { this->actor.textId = 0x401B; this->sfxPlayed = false; } else { @@ -229,22 +229,25 @@ void func_80A9CB18(EnKz* this, GlobalContext* globalCtx) { player->actor.textId = this->actor.textId; return; } + if (LINK_IS_ADULT) { - if ((INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_PRESCRIPTION) && (func_8002F368(globalCtx) == 0xC)) { + if ((INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_PRESCRIPTION) && + (func_8002F368(globalCtx) == EXCH_ITEM_PRESCRIPTION)) { this->actor.textId = 0x4014; this->sfxPlayed = false; player->actor.textId = this->actor.textId; this->isTrading = true; return; } + this->isTrading = false; if (gSaveContext.infTable[19] & 0x200) { this->actor.textId = CHECK_QUEST_ITEM(QUEST_SONG_SERENADE) ? 0x4045 : 0x401A; player->actor.textId = this->actor.textId; - return; + } else { + this->actor.textId = CHECK_OWNED_EQUIP(EQUIP_TUNIC, 2) ? 0x401F : 0x4012; + player->actor.textId = this->actor.textId; } - this->actor.textId = CHECK_OWNED_EQUIP(EQUIP_TUNIC, 2) ? 0x401F : 0x4012; - player->actor.textId = this->actor.textId; } } } diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 26e9118b0d..d60e9db362 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -124,7 +124,7 @@ void func_80AB9210(EnNiwGirl* this, GlobalContext* globalCtx) { this->actor.posRot.rot.y = this->actor.shape.rot.y; // Only allow Link to talk to her when she is playing the jumping animation - if ((this->jumpTimer == 0) || (func_8008F080(globalCtx) != 0)) { + if ((this->jumpTimer == 0) || (Player_GetMask(globalCtx) != PLAYER_MASK_NONE)) { this->jumpTimer = 60; this->actionFunc = EnNiwGirl_Talk; } @@ -137,21 +137,21 @@ void EnNiwGirl_Talk(EnNiwGirl* this, GlobalContext* globalCtx) { if ((gSaveContext.eventChkInf[8] & 1) && (this->unk_27A == 0)) { this->actor.textId = 0x70EA; } - switch (func_8008F080(globalCtx)) { - case 1: + switch (Player_GetMask(globalCtx)) { + case PLAYER_MASK_KEATON: this->actor.textId = 0x7118; break; - case 3: + case PLAYER_MASK_SPOOKY: this->actor.textId = 0x7119; break; - case 4: - case 6: - case 7: + case PLAYER_MASK_BUNNY: + case PLAYER_MASK_ZORA: + case PLAYER_MASK_GERUDO: this->actor.textId = 0x711A; break; - case 2: - case 5: - case 8: + case PLAYER_MASK_SKULL: + case PLAYER_MASK_GORON: + case PLAYER_MASK_TRUTH: this->actor.textId = 0x711B; break; } diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 1100e2f41e..01a04ca037 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -90,14 +90,15 @@ void func_80ABBBA8(EnNutsball* this, GlobalContext* globalCtx) { (this->collider.base.acFlags & 2) || (this->collider.base.maskA & 2)) { // Checking if the player is using a shield that reflects projectiles // And if so, reflects the projectile on impact - if ((player->currentShield == 1) || ((player->currentShield == 2) && LINK_IS_ADULT)) { + if ((player->currentShield == PLAYER_SHIELD_DEKU) || + ((player->currentShield == PLAYER_SHIELD_HYLIAN) && LINK_IS_ADULT)) { if ((this->collider.base.atFlags & 2) && (this->collider.base.atFlags & 0x10) && (this->collider.base.atFlags & 4)) { this->collider.base.atFlags &= ~0x16; this->collider.base.atFlags |= 0x08; this->collider.body.toucher.flags = 2; - func_800D20CC(&player->mf_A20, &sp4C, 0); + func_800D20CC(&player->shieldMf, &sp4C, 0); this->actor.posRot.rot.y = sp4C.y + 0x8000; this->timer = 30; return; diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index ba13ce69f8..1929f6b3e2 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -1577,7 +1577,7 @@ s32 func_80AEE394(EnRu1* this, GlobalContext* globalCtx) { this->actor.floorPolySource; // necessary match, can't move this out of this block unfortunately dynaActor = DynaPolyInfo_GetActor(colCtx, floorPolySource); if ((dynaActor != NULL) && (dynaActor->actor.id == ACTOR_BG_BDAN_OBJECTS) && (dynaActor->actor.params == 0) && - (!func_8008E988(globalCtx)) && (globalCtx->msgCtx.unk_E300 == 0)) { + (!Player_InCsMode(globalCtx)) && (globalCtx->msgCtx.unk_E300 == 0)) { func_80AEE02C(this); globalCtx->csCtx.segment = &D_80AF10A4; gSaveContext.cutsceneTrigger = 1; @@ -1641,7 +1641,7 @@ s32 func_80AEE6D0(EnRu1* this, GlobalContext* globalCtx) { s8 curRoomNum = globalCtx->roomCtx.curRoom.num; if ((!(gSaveContext.infTable[20] & 0x10)) && (func_80AEB124(globalCtx) != 0)) { - if (func_8008E988(globalCtx) == 0) { + if (!Player_InCsMode(globalCtx)) { SkelAnime_ChangeAnim(&this->skelAnime, &D_06004648, 1.0f, 0, SkelAnime_GetFrameCount(&D_06004350.genericHeader), 0, -8.0f); func_80AED600(this); diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index 3d556dfcdc..2a30c3b3b6 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -77,7 +77,7 @@ void func_80AFB768(EnSi* this, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, this->actor.scale.x); this->actor.shape.rot.y += 0x400; - if (func_8008E988(globalCtx) == 0) { + if (!Player_InCsMode(globalCtx)) { func_80AFB748(this, globalCtx); if (this->collider.base.maskB & 0x1) { diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index 31ddc027e8..2a656883c9 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -264,7 +264,7 @@ void EnSt_CheckBodyStickHit(EnSt* this, GlobalContext* globalCtx) { ColliderBody* body = &this->colCylinder[0].body; Player* player = PLAYER; - if (player->stickFlameTimer != 0) { + if (player->unk_860 != 0) { body->bumper.flags |= 2; this->colCylinder[1].body.bumper.flags &= ~2; this->colCylinder[2].body.bumper.flags &= ~2; @@ -358,7 +358,7 @@ s32 EnSt_CheckHitLink(EnSt* this, GlobalContext* globalCtx) { } this->gaveDamageSpinTimer = 30; - globalCtx->unk_11D58(globalCtx, -8); + globalCtx->damagePlayer(globalCtx, -8); Audio_PlayActorSound2(&player->actor, NA_SE_PL_BODY_HIT); func_8002F71C(globalCtx, &this->actor, 4.0f, this->actor.yawTowardsLink, 6.0f); return true; diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index fd6fbdec27..752a678e69 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -8,7 +8,7 @@ #define FLAGS 0x00000035 -#define THIS ((EnTorch2*)thisx) +#define THIS ((Player*)thisx) void EnTorch2_Init(Actor* thisx, GlobalContext* globalCtx); void EnTorch2_Destroy(Actor* thisx, GlobalContext* globalCtx); @@ -21,7 +21,7 @@ const ActorInit En_Torch2_InitVars = { ACTORTYPE_BOSS, FLAGS, OBJECT_TORCH2, - sizeof(EnTorch2), + sizeof(Player), (ActorFunc)EnTorch2_Init, (ActorFunc)EnTorch2_Destroy, (ActorFunc)EnTorch2_Update, diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h index 8ef8d000b3..a3136641ac 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h @@ -4,12 +4,7 @@ #include #include -struct EnTorch2; - -typedef struct EnTorch2 { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x948]; -} EnTorch2; // size = 0x0A94 +// Uses the Player struct (from z64player.h) extern const ActorInit En_Torch2_InitVars; diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 0b3313ad48..2232a84de5 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -265,11 +265,9 @@ void EnWallmas_SetupStun(EnWallmas* this) { } void EnWallmas_WaitToDrop(EnWallmas* this, GlobalContext* globalCtx) { - Vec3f* playerPos; - Player* player; + Player* player = PLAYER; + Vec3f* playerPos = &player->actor.posRot.pos; - player = PLAYER; - playerPos = &player->actor.posRot.pos; this->actor.posRot.pos = *playerPos; this->actor.groundY = player->actor.groundY; this->actor.floorPoly = player->actor.floorPoly; @@ -278,8 +276,7 @@ void EnWallmas_WaitToDrop(EnWallmas* this, GlobalContext* globalCtx) { this->timer--; } - if (((s32)(player->stateFlags1 << 0xB) < 0) || ((s32)(player->stateFlags1 << 4) < 0) || - ((player->actor.bgCheckFlags & 1) == 0) || + if ((player->stateFlags1 & 0x100000) || (player->stateFlags1 & 0x8000000) || !(player->actor.bgCheckFlags & 1) || ((this->actor.params == 1) && (320.0f < Math_Vec3f_DistXZ(&this->actor.initPosRot.pos, playerPos)))) { func_800F8D04(NA_SE_EN_FALL_AIM); this->timer = 0x82; @@ -296,9 +293,10 @@ void EnWallmas_WaitToDrop(EnWallmas* this, GlobalContext* globalCtx) { void EnWallmas_Drop(EnWallmas* this, GlobalContext* globalCtx) { Player* player = PLAYER; - if (!func_8008E988(globalCtx) && (player->stateFlags2 & 0x10) == 0 && (player->invincibilityTimer >= 0) && + + if (!Player_InCsMode(globalCtx) && !(player->stateFlags2 & 0x10) && (player->invincibilityTimer >= 0) && (this->actor.xzDistFromLink < 30.0f) && (this->actor.yDistFromLink < -5.0f) && - (-(f32)(player->unk_4DA + 0xA) < this->actor.yDistFromLink)) { + (-(f32)(player->cylinder.dim.height + 10) < this->actor.yDistFromLink)) { EnWallmas_SetupTakePlayer(this, globalCtx); } } @@ -396,9 +394,8 @@ void EnWallmas_Die(EnWallmas* this, GlobalContext* globalCtx) { } void EnWallmas_TakePlayer(EnWallmas* this, GlobalContext* globalCtx) { - Player* player; + Player* player = PLAYER; - player = PLAYER; if (func_800A56C8(&this->skelAnime, 1.0f) != 0) { if (LINK_IS_CHILD) { func_8002F7DC(&this->actor, NA_SE_VO_LI_DAMAGE_S_KID); diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index 1231c142f6..636eca1455 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -167,7 +167,7 @@ void func_80B3A15C(EnWonderTalk2* this, GlobalContext* globalCtx) { } this->unk_158 = 0; - func_8002F1C4(&this->actor, globalCtx, this->unk_15C + 50.0f, 100.0f, 0); + func_8002F1C4(&this->actor, globalCtx, this->unk_15C + 50.0f, 100.0f, EXCH_ITEM_NONE); } } } diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index 877a209fdc..23326aaddb 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -504,7 +504,7 @@ void func_80B4BF2C(EnZl1* this, GlobalContext* globalCtx) { case 1: if ((func_8010BDBC(msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { this->actor.textId = 0xFFFF; - globalCtx->unk_11D5C(globalCtx, &this->actor); + globalCtx->talkWithPlayer(globalCtx, &this->actor); func_8002F434(&this->actor, globalCtx, GI_LETTER_ZELDA, 120.0f, 10.0f); globalCtx->msgCtx.msgMode = 0x36; globalCtx->msgCtx.unk_E3E7 = 4; diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index b07cbd09f8..91fc259add 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -591,8 +591,8 @@ void EnZl2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve { Player* player = PLAYER; Matrix_Push(); - if (player->unk_15D == 0xFF) { - Matrix_Put(&player->mf_A20); + if (player->rightHandType == 0xFF) { + Matrix_Put(&player->shieldMf); Matrix_Translate(180.0f, 979.0f, -375.0f, MTXMODE_APPLY); Matrix_RotateRPY(-0x5DE7, -0x53E9, 0x3333, MTXMODE_APPLY); Matrix_Scale(1.2f, 1.2f, 1.2f, MTXMODE_APPLY); diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.c b/src/overlays/actors/ovl_End_Title/z_end_title.c index 62990363d9..a65a95c6ef 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -52,6 +52,7 @@ void EndTitle_Draw(Actor* thisx, GlobalContext* globalCtx) { EndTitle* this = THIS; s32 frameCount = globalCtx->csCtx.frames; Player* player = PLAYER; + mf = &player->mf_9E0; OPEN_DISPS(globalCtx->state.gfxCtx, "../z_end_title.c", 403); diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index cef3268d68..c2567242c3 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -49,7 +49,7 @@ static s16 sDrawItemIndexes[] = { static s16 sGetItemIds[] = { GI_BOTTLE, GI_LETTER_RUTO, GI_SHIELD_HYLIAN, GI_QUIVER_40, GI_SCALE_SILVER, GI_SCALE_GOLD, GI_KEY_SMALL, - GI_ARROW_FIRE, GI_INVALID, GI_INVALID, GI_INVALID, GI_INVALID, GI_INVALID, GI_INVALID, + GI_ARROW_FIRE, GI_NONE, GI_NONE, GI_NONE, GI_NONE, GI_NONE, GI_NONE, }; void ItemEtcetera_SetupAction(ItemEtcetera* this, ItemEtceteraActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index f128b7d8e0..38cc79dfe2 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -82,7 +82,7 @@ void MagicDark_Update(Actor* thisx, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, thisx->scale.x); } else if (this->unk_14C < 55) { Actor_SetScale(&this->actor, thisx->scale.x * 0.9f); - Math_SmoothScaleMaxMinF(&this->unk_154, player->unk_90C, 0.5f, 3.0f, 1.0f); + Math_SmoothScaleMaxMinF(&this->unk_154, player->bodyPartsPos[0].y, 0.5f, 3.0f, 1.0f); if (this->unk_14C >= 49) { func_80B8772C(globalCtx, (54 - this->unk_14C) * 0.2f); } diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index 256568bb2e..32ae0ea2da 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -144,10 +144,9 @@ void MagicWind_Init(Actor* thisx, GlobalContext* globalCtx) { case 1: SkelCurve_SetAnim(&this->skelCurve, &sTransformUpdIdx, 60.0f, 0.0f, 60.0f, -1.0f); MagicWind_SetupAction(this, MagicWind_Shrink); - // "Indicates start" = %s // Means start LOG_STRING("表示開始", "../z_magic_wind.c", 486); - func_8002F7DC(player, NA_SE_PL_MAGIC_WIND_WARP); + func_8002F7DC(&player->actor, NA_SE_PL_MAGIC_WIND_WARP); break; } } diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index 0cc44be673..2bc500d698 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -72,8 +72,8 @@ void OceffSpot_Destroy(Actor* thisx, GlobalContext* globalCtx) { LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode1); LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode2); func_800876C8(globalCtx); - if (gSaveContext.nayrusLoveTimer && globalCtx->actorCtx.actorList[ACTORTYPE_PLAYER].length) { - player->unk_692 |= 0x40; + if ((gSaveContext.nayrusLoveTimer != 0) && (globalCtx->actorCtx.actorList[ACTORTYPE_PLAYER].length != 0)) { + player->stateFlags3 |= 0x40; } } diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index f9b5cd2a66..f45981a59e 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -64,8 +64,8 @@ void OceffStorm_Destroy(Actor* thisx, GlobalContext* globalCtx) { Player* player = PLAYER; func_800876C8(globalCtx); - if (gSaveContext.nayrusLoveTimer) { - player->unk_692 |= 0x40; + if (gSaveContext.nayrusLoveTimer != 0) { + player->stateFlags3 |= 0x40; } } diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index 26fa5b95de..29fbd18e02 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -48,8 +48,8 @@ void OceffWipe_Destroy(Actor* thisx, GlobalContext* globalCtx) { Player* player = PLAYER; func_800876C8(globalCtx); - if (gSaveContext.nayrusLoveTimer) { - player->unk_692 |= 0x40; + if (gSaveContext.nayrusLoveTimer != 0) { + player->stateFlags3 |= 0x40; } } diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index a39642bbe0..e68d3943c0 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -43,8 +43,8 @@ void OceffWipe2_Destroy(Actor* thisx, GlobalContext* globalCtx) { Player* player = PLAYER; func_800876C8(globalCtx); - if (gSaveContext.nayrusLoveTimer) { - player->unk_692 |= 0x40; + if (gSaveContext.nayrusLoveTimer != 0) { + player->stateFlags3 |= 0x40; } } diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index 4757518c9f..a3614affa4 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -44,8 +44,8 @@ void OceffWipe3_Destroy(Actor* thisx, GlobalContext* globalCtx) { Player* player = PLAYER; func_800876C8(globalCtx); - if (gSaveContext.nayrusLoveTimer) { - player->unk_692 |= 0x40; + if (gSaveContext.nayrusLoveTimer != 0) { + player->stateFlags3 |= 0x40; } } 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 d34cc9001f..14be022822 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -172,9 +172,9 @@ void ShotSun_UpdateHyliaSun(ShotSun* this, GlobalContext* globalCtx) { Actor_Kill(&this->actor); } else { if (!(120.0f < this->actor.xzDistFromLink) && gSaveContext.dayTime >= 0x4555 && gSaveContext.dayTime < 0x5000) { - cylinderPos.x = player->unk_95C.x + globalCtx->envCtx.unk_04.x * 0.16666667f; - cylinderPos.y = player->unk_95C.y - 30.0f + globalCtx->envCtx.unk_04.y * 0.16666667f; - cylinderPos.z = player->unk_95C.z + globalCtx->envCtx.unk_04.z * 0.16666667f; + cylinderPos.x = player->bodyPartsPos[7].x + globalCtx->envCtx.unk_04.x * 0.16666667f; + cylinderPos.y = player->bodyPartsPos[7].y - 30.0f + globalCtx->envCtx.unk_04.y * 0.16666667f; + cylinderPos.z = player->bodyPartsPos[7].z + globalCtx->envCtx.unk_04.z * 0.16666667f; this->hitboxPos = cylinderPos; diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index d54f10f0c0..591501a446 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -7,1096 +7,13996 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832210.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832224.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083224C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808322FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832318.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832340.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808323B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832440.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832528.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832564.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832594.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832630.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083264C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832698.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808326F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083275C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832770.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808327A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808327C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808327F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832854.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808328A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808328EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832924.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832CFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832D20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832DBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832E48.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832F54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083303C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833064.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083308C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808330EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833114.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083313C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083315C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808332B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808332E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808332F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833338.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833350.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808333FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833438.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808334B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808334E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833528.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083356C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808335B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808335F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833638.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833664.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833724.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833770.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083377C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833790.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083379C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808337D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833910.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833984.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083399C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833A20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833B54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833BCC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C3C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833C98.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833CDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80833DF8.s") - +#include "overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h" +#include "overlays/actors/ovl_Door_Shutter/z_door_shutter.h" +#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_Horse/z_en_horse.h" + +#define THIS ((Player*)thisx) + +typedef struct { + /* 0x00 */ u8 itemId; + /* 0x01 */ u8 field; // various bit-packed data + /* 0x02 */ s8 gi; // defines the draw id and chest opening animation + /* 0x03 */ u8 textId; + /* 0x04 */ u16 objectId; +} GetItemEntry; // size = 0x06 + +#define GET_ITEM(itemId, objectId, drawId, textId, field, chestAnim) \ + { itemId, field, (chestAnim != 0 ? 1 : -1) * (drawId + 1), textId, objectId } + +#define CHEST_ANIM_SHORT 0 +#define CHEST_ANIM_LONG 1 + +typedef struct { + /* 0x00 */ u8 itemId; + /* 0x02 */ s16 actorId; +} ExplosiveInfo; // size = 0x04 + +typedef struct { + /* 0x00 */ s16 actorId; + /* 0x02 */ u8 itemId; + /* 0x03 */ u8 actionParam; + /* 0x04 */ u8 textId; +} BottleCatchInfo; // size = 0x06 + +typedef struct { + /* 0x00 */ s16 actorId; + /* 0x02 */ s16 actorParams; +} BottleDropInfo; // size = 0x04 + +typedef struct { + /* 0x00 */ s8 damage; + /* 0x01 */ u8 unk_01; + /* 0x02 */ u8 unk_02; + /* 0x03 */ u8 unk_03; + /* 0x04 */ u16 sfxId; +} FallImpactInfo; // size = 0x06 + +typedef struct { + /* 0x00 */ Vec3f pos; + /* 0x0C */ s16 yaw; +} SpecialRespawnInfo; // size = 0x10 + +typedef struct { + /* 0x00 */ u16 sfxId; + /* 0x02 */ s16 field; +} struct_80832924; // size = 0x04 + +typedef struct { + /* 0x00 */ u16 unk_00; + /* 0x02 */ s16 unk_02; +} struct_808551A4; // size = 0x04 + +typedef struct { + /* 0x00 */ LinkAnimetionEntry* anim; + /* 0x04 */ u8 unk_04; +} struct_808540F4; // size = 0x08 + +typedef struct { + /* 0x00 */ LinkAnimetionEntry* unk_00; + /* 0x04 */ LinkAnimetionEntry* unk_04; + /* 0x08 */ u8 unk_08; + /* 0x09 */ u8 unk_09; +} struct_80854554; // size = 0x0C + +typedef struct { + /* 0x00 */ LinkAnimetionEntry* unk_00; + /* 0x04 */ LinkAnimetionEntry* unk_04; + /* 0x08 */ LinkAnimetionEntry* unk_08; + /* 0x0C */ u8 unk_0C; + /* 0x0D */ u8 unk_0D; +} struct_80854190; // size = 0x10 + +typedef struct { + /* 0x00 */ LinkAnimetionEntry* anim; + /* 0x04 */ f32 unk_04; + /* 0x04 */ f32 unk_08; +} struct_80854578; // size = 0x0C + +typedef struct { + /* 0x00 */ s8 type; + /* 0x04 */ union { + void* ptr; + void (*func)(GlobalContext*, Player*, CsCmdActorAction*); + }; +} struct_80854B18; // size = 0x08 + +void func_80833770(GlobalContext* globalCtx, Player* this); +void func_80833790(GlobalContext* globalCtx, Player* this); +void func_8083379C(GlobalContext* globalCtx, Player* this); +void func_8083377C(GlobalContext* globalCtx, Player* this); +void func_808337D4(GlobalContext* globalCtx, Player* this); +void func_80833910(GlobalContext* globalCtx, Player* this); +void func_80833984(GlobalContext* globalCtx, Player* this); +void func_8083399C(GlobalContext* globalCtx, Player* this, s8 actionParam); +s32 func_8083485C(Player* this, GlobalContext* globalCtx); +s32 func_808349DC(Player* this, GlobalContext* globalCtx); +s32 func_80834A2C(Player* this, GlobalContext* globalCtx); +s32 func_80834B5C(Player* this, GlobalContext* globalCtx); +s32 func_80834C74(Player* this, GlobalContext* globalCtx); +s32 func_8083501C(Player* this, GlobalContext* globalCtx); +s32 func_808351D4(Player* this, GlobalContext* globalCtx); +s32 func_808353D8(Player* this, GlobalContext* globalCtx); +s32 func_80835588(Player* this, GlobalContext* globalCtx); +s32 func_808356E8(Player* this, GlobalContext* globalCtx); +s32 func_80835800(Player* this, GlobalContext* globalCtx); +s32 func_80835884(Player* this, GlobalContext* globalCtx); +s32 func_808358F0(Player* this, GlobalContext* globalCtx); +s32 func_808359FC(Player* this, GlobalContext* globalCtx); +s32 func_80835B60(Player* this, GlobalContext* globalCtx); +s32 func_80835C08(Player* this, GlobalContext* globalCtx); +void func_80835F44(GlobalContext* globalCtx, Player* this, s32 item); +void func_80839F90(Player* this, GlobalContext* globalCtx); +s32 func_80838A14(Player* this, GlobalContext* globalCtx); +s32 func_80839800(Player* this, GlobalContext* globalCtx); +s32 func_8083B040(Player* this, GlobalContext* globalCtx); +s32 func_8083B998(Player* this, GlobalContext* globalCtx); +s32 func_8083B644(Player* this, GlobalContext* globalCtx); +s32 func_8083BDBC(Player* this, GlobalContext* globalCtx); +s32 func_8083C1DC(Player* this, GlobalContext* globalCtx); +s32 func_8083C2B0(Player* this, GlobalContext* globalCtx); +s32 func_8083C544(Player* this, GlobalContext* globalCtx); +s32 func_8083C61C(GlobalContext* globalCtx, Player* this); +void func_8083CA20(GlobalContext* globalCtx, Player* this); +void func_8083CA54(GlobalContext* globalCtx, Player* this); +void func_8083CA9C(GlobalContext* globalCtx, Player* this); +s32 func_8083E0FC(Player* this, GlobalContext* globalCtx); +s32 func_8083E5A8(Player* this, GlobalContext* globalCtx); +s32 func_8083EB44(Player* this, GlobalContext* globalCtx); +s32 func_8083F7BC(Player* this, GlobalContext* globalCtx); +void func_80840450(Player* this, GlobalContext* globalCtx); +void func_808407CC(Player* this, GlobalContext* globalCtx); +void func_80840BC8(Player* this, GlobalContext* globalCtx); +void func_80840DE4(Player* this, GlobalContext* globalCtx); +void func_808414F8(Player* this, GlobalContext* globalCtx); +void func_8084170C(Player* this, GlobalContext* globalCtx); +void func_808417FC(Player* this, GlobalContext* globalCtx); +void func_8084193C(Player* this, GlobalContext* globalCtx); +void func_80841BA8(Player* this, GlobalContext* globalCtx); +void func_80842180(Player* this, GlobalContext* globalCtx); +void func_8084227C(Player* this, GlobalContext* globalCtx); +void func_8084279C(Player* this, GlobalContext* globalCtx); +void func_808423EC(Player* this, GlobalContext* globalCtx); +void func_8084251C(Player* this, GlobalContext* globalCtx); +void func_80843188(Player* this, GlobalContext* globalCtx); +void func_808435C4(Player* this, GlobalContext* globalCtx); +void func_8084370C(Player* this, GlobalContext* globalCtx); +void func_8084377C(Player* this, GlobalContext* globalCtx); +void func_80843954(Player* this, GlobalContext* globalCtx); +void func_80843A38(Player* this, GlobalContext* globalCtx); +void func_80843CEC(Player* this, GlobalContext* globalCtx); +void func_8084411C(Player* this, GlobalContext* globalCtx); +void func_80844708(Player* this, GlobalContext* globalCtx); +void func_80844A44(Player* this, GlobalContext* globalCtx); +void func_80844AF4(Player* this, GlobalContext* globalCtx); +void func_80844E68(Player* this, GlobalContext* globalCtx); +void func_80845000(Player* this, GlobalContext* globalCtx); +void func_80845308(Player* this, GlobalContext* globalCtx); +void func_80845668(Player* this, GlobalContext* globalCtx); +void func_808458D0(Player* this, GlobalContext* globalCtx); +void func_80845CA4(Player* this, GlobalContext* globalCtx); +void func_80845EF8(Player* this, GlobalContext* globalCtx); +void func_80846050(Player* this, GlobalContext* globalCtx); +void func_80846120(Player* this, GlobalContext* globalCtx); +void func_80846260(Player* this, GlobalContext* globalCtx); +void func_80846358(Player* this, GlobalContext* globalCtx); +void func_80846408(Player* this, GlobalContext* globalCtx); +void func_808464B0(Player* this, GlobalContext* globalCtx); +void func_80846578(Player* this, GlobalContext* globalCtx); +void func_80846648(GlobalContext* globalCtx, Player* this); +void func_80846660(GlobalContext* globalCtx, Player* this); +void func_808467D4(GlobalContext* globalCtx, Player* this); +void func_808468A8(GlobalContext* globalCtx, Player* this); +void func_808468E8(GlobalContext* globalCtx, Player* this); +void func_80846978(GlobalContext* globalCtx, Player* this); +void func_808469BC(GlobalContext* globalCtx, Player* this); +void func_80846A68(GlobalContext* globalCtx, Player* this); +void func_8084B1D8(Player* this, GlobalContext* globalCtx); +void func_8084B530(Player* this, GlobalContext* globalCtx); +void func_8084B78C(Player* this, GlobalContext* globalCtx); +void func_8084B898(Player* this, GlobalContext* globalCtx); +void func_8084B9E4(Player* this, GlobalContext* globalCtx); +void func_8084BBE4(Player* this, GlobalContext* globalCtx); +void func_8084BDFC(Player* this, GlobalContext* globalCtx); +void func_8084BF1C(Player* this, GlobalContext* globalCtx); +void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input); +void func_8084C5F8(Player* this, GlobalContext* globalCtx); +void func_8084C760(Player* this, GlobalContext* globalCtx); +void func_8084C81C(Player* this, GlobalContext* globalCtx); +void func_8084CC98(Player* this, GlobalContext* globalCtx); +void func_8084D3E4(Player* this, GlobalContext* globalCtx); +void func_8084D610(Player* this, GlobalContext* globalCtx); +void func_8084D7C4(Player* this, GlobalContext* globalCtx); +void func_8084D84C(Player* this, GlobalContext* globalCtx); +void func_8084DAB4(Player* this, GlobalContext* globalCtx); +void func_8084DC48(Player* this, GlobalContext* globalCtx); +void func_8084E1EC(Player* this, GlobalContext* globalCtx); +void func_8084E30C(Player* this, GlobalContext* globalCtx); +void func_8084E368(Player* this, GlobalContext* globalCtx); +void func_8084E3C4(Player* this, GlobalContext* globalCtx); +void func_8084E604(Player* this, GlobalContext* globalCtx); +void func_8084E6D4(Player* this, GlobalContext* globalCtx); +void func_8084E9AC(Player* this, GlobalContext* globalCtx); +void func_8084EAC0(Player* this, GlobalContext* globalCtx); +void func_8084ECA4(Player* this, GlobalContext* globalCtx); +void func_8084EED8(Player* this, GlobalContext* globalCtx); +void func_8084EFC0(Player* this, GlobalContext* globalCtx); +void func_8084F104(Player* this, GlobalContext* globalCtx); +void func_8084F390(Player* this, GlobalContext* globalCtx); +void func_8084F608(Player* this, GlobalContext* globalCtx); +void func_8084F698(Player* this, GlobalContext* globalCtx); +void func_8084F710(Player* this, GlobalContext* globalCtx); +void func_8084F88C(Player* this, GlobalContext* globalCtx); +void func_8084F9A0(Player* this, GlobalContext* globalCtx); +void func_8084F9C0(Player* this, GlobalContext* globalCtx); +void func_8084FA54(Player* this, GlobalContext* globalCtx); +void func_8084FB10(Player* this, GlobalContext* globalCtx); +void func_8084FBF4(Player* this, GlobalContext* globalCtx); +s32 func_8084FCAC(Player* this, GlobalContext* globalCtx); +void func_8084FF7C(Player* this); +void func_8085002C(Player* this); +s32 func_80850224(Player* this, GlobalContext* globalCtx); +void func_808502D0(Player* this, GlobalContext* globalCtx); +void func_808505DC(Player* this, GlobalContext* globalCtx); +void func_8085063C(Player* this, GlobalContext* globalCtx); +void func_8085076C(Player* this, GlobalContext* globalCtx); +void func_808507F4(Player* this, GlobalContext* globalCtx); +void func_80850AEC(Player* this, GlobalContext* globalCtx); +void func_80850C68(Player* this, GlobalContext* globalCtx); +void func_80850E84(Player* this, GlobalContext* globalCtx); +void func_80851008(GlobalContext* globalCtx, Player* this, void* anim); +void func_80851030(GlobalContext* globalCtx, Player* this, void* anim); +void func_80851050(GlobalContext* globalCtx, Player* this, void* anim); +void func_80851094(GlobalContext* globalCtx, Player* this, void* anim); +void func_808510B4(GlobalContext* globalCtx, Player* this, void* anim); +void func_808510D4(GlobalContext* globalCtx, Player* this, void* anim); +void func_808510F4(GlobalContext* globalCtx, Player* this, void* anim); +void func_80851114(GlobalContext* globalCtx, Player* this, void* anim); +void func_80851134(GlobalContext* globalCtx, Player* this, void* anim); +void func_80851154(GlobalContext* globalCtx, Player* this, void* anim); +void func_80851174(GlobalContext* globalCtx, Player* this, void* anim); +void func_80851194(GlobalContext* globalCtx, Player* this, void* anim); +void func_808511B4(GlobalContext* globalCtx, Player* this, void* anim); +void func_808511D4(GlobalContext* globalCtx, Player* this, void* anim); +void func_808511FC(GlobalContext* globalCtx, Player* this, void* anim); +void func_80851248(GlobalContext* globalCtx, Player* this, void* anim); +void func_80851294(GlobalContext* globalCtx, Player* this, void* anim); +void func_808512E0(GlobalContext* globalCtx, Player* this, void* arg2); +void func_80851368(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_808513BC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_808514C0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_8085157C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_808515A4(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851688(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851750(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851788(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851828(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_808518DC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_8085190C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851998(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_808519C0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_808519EC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851A50(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851B90(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851BE8(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851CA4(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851D2C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851D80(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851DEC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851E28(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851E64(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851E90(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851ECC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851F84(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80851FB0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852048(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852080(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852174(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_808521B8(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_808521F4(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852234(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_8085225C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852280(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852358(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852388(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852298(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852328(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852480(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852450(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_808524B0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_808524D0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852514(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852544(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852554(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852564(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_808525C0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852608(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852648(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_808526EC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_8085283C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_808528C8(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852944(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_808529D0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852C50(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2); +void func_80852E14(Player* this, GlobalContext* globalCtx); +s32 Player_IsDroppingFish(GlobalContext* globalCtx); +s32 Player_StartFishing(GlobalContext* globalCtx); +s32 func_80852F38(GlobalContext* globalCtx, Player* this); +s32 func_80852FFC(GlobalContext* globalCtx, Actor* actor, s32 csMode); +void func_80853080(Player* this, GlobalContext* globalCtx); +s32 Player_InflictDamage(GlobalContext* globalCtx, s32 damage); +void func_80853148(GlobalContext* globalCtx, Actor* actor); + +// .bss part 1 +s32 D_80858AA0; +s32 D_80858AA4; +Vec3f D_80858AA8; +Input* sControlInput; + +// .data + +u8 D_80853410[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; + +PlayerAgeProperties sAgeProperties[] = { + { + 56.0f, + 90.0f, + 1.0f, + 111.0f, + 70.0f, + 79.4f, + 59.0f, + 41.0f, + 19.0f, + 36.0f, + 44.8f, + 56.0f, + 68.0f, + 70.0f, + 18.0f, + 15.0f, + 70.0f, + { 9, 4671, 359 }, + { + { 8, 4694, 380 }, + { 9, 6122, 359 }, + { 8, 4694, 380 }, + { 9, 6122, 359 }, + }, + { + { 9, 6122, 359 }, + { 9, 7693, 380 }, + { 9, 6122, 359 }, + { 9, 7693, 380 }, + }, + { + { 8, 4694, 380 }, + { 9, 6122, 359 }, + }, + { + { -1592, 4694, 380 }, + { -1591, 6122, 359 }, + }, + 0, + 0x80, + 0x04002718, + 0x04002720, + 0x04002838, + 0x04002E70, + 0x04002E78, + { 0x04002E80, 0x04002E88, 0x04002D90, 0x04002D98 }, + { 0x04002D70, 0x04002D78 }, + { 0x04002E50, 0x04002E58 }, + { 0x04002E68, 0x04002E60 }, + }, + { + 40.0f, + 60.0f, + 0.6470588446f, + 71.0f, + 50.0f, + 47.0f, + 39.0f, + 27.0f, + 19.0f, + 22.0f, + 29.6f, + 32.0f, + 48.0f, + 45.29412079f, + 14.0f, + 12.0f, + 55.0f, + { -24, 3565, 876 }, + { + { -24, 3474, 862 }, + { -24, 4977, 937 }, + { 8, 4694, 380 }, + { 9, 6122, 359 }, + }, + { + { -24, 4977, 937 }, + { -24, 6495, 937 }, + { 9, 6122, 359 }, + { 9, 7693, 380 }, + }, + { + { 8, 4694, 380 }, + { 9, 6122, 359 }, + }, + { + { -1592, 4694, 380 }, + { -1591, 6122, 359 }, + }, + 0x20, + 0, + 0x04002318, + 0x04002360, + 0x040023A8, + 0x040023E0, + 0x040023E8, + { 0x040023F0, 0x040023F8, 0x04002D90, 0x04002D98 }, + { 0x04002D70, 0x04002D78 }, + { 0x040023C0, 0x040023C8 }, + { 0x040023D8, 0x040023D0 }, + }, +}; + +u32 D_808535D0 = false; +f32 D_808535D4 = 0.0f; +s16 D_808535D8 = 0; +s16 D_808535DC = 0; +s32 D_808535E0 = 0; +s32 D_808535E4 = 0; +f32 D_808535E8 = 1.0f; +f32 D_808535EC = 1.0f; +u32 D_808535F0 = 0; +u32 D_808535F4 = 0; +s16 D_808535F8 = 0; +s16 D_808535FC = 0; +f32 D_80853600 = 0.0f; +s32 D_80853604 = 0; +s32 D_80853608 = 0; +s32 D_8085360C = 0; +s16 D_80853610 = 0; +s32 D_80853614 = 0; +s32 D_80853618 = 0; + +u16 D_8085361C[] = { + NA_SE_VO_LI_SWEAT, + NA_SE_VO_LI_SNEEZE, + NA_SE_VO_LI_RELAX, + NA_SE_VO_LI_FALL_L, +}; + +GetItemEntry sGetItemTable[] = { + GET_ITEM(ITEM_BOMBS_5, OBJECT_GI_BOMB_1, 0x1F, 0x32, 0x59, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_NUTS_5, OBJECT_GI_NUTS, 0x11, 0x34, 0x0C, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_BOMBCHU, OBJECT_GI_BOMB_2, 0x27, 0x33, 0x80, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_BOW, OBJECT_GI_BOW, 0x34, 0x31, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_SLINGSHOT, OBJECT_GI_PACHINKO, 0x32, 0x30, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOOMERANG, OBJECT_GI_BOOMERANG, 0x33, 0x35, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_STICK, OBJECT_GI_STICK, 0x1A, 0x37, 0x0D, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_HOOKSHOT, OBJECT_GI_HOOKSHOT, 0x2C, 0x36, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_LONGSHOT, OBJECT_GI_HOOKSHOT, 0x2D, 0x4F, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_LENS, OBJECT_GI_GLASSES, 0x35, 0x39, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_LETTER_ZELDA, OBJECT_GI_LETTER, 0x3A, 0x69, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_OCARINA_TIME, OBJECT_GI_OCARINA, 0x2E, 0x3A, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_HAMMER, OBJECT_GI_HAMMER, 0x40, 0x38, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_COJIRO, OBJECT_GI_NIWATORI, 0x5D, 0x02, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOTTLE, OBJECT_GI_BOTTLE, 0x00, 0x42, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_POTION_RED, OBJECT_GI_LIQUID, 0x37, 0x43, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_POTION_GREEN, OBJECT_GI_LIQUID, 0x36, 0x44, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_POTION_BLUE, OBJECT_GI_LIQUID, 0x38, 0x45, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_FAIRY, OBJECT_GI_BOTTLE, 0x00, 0x46, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_MILK_BOTTLE, OBJECT_GI_MILK, 0x2F, 0x98, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_LETTER_RUTO, OBJECT_GI_BOTTLE_LETTER, 0x44, 0x99, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BEAN, OBJECT_GI_BEAN, 0x3D, 0x48, 0x80, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_MASK_SKULL, OBJECT_GI_SKJ_MASK, 0x4E, 0x10, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_MASK_SPOOKY, OBJECT_GI_REDEAD_MASK, 0x31, 0x11, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_CHICKEN, OBJECT_GI_NIWATORI, 0x43, 0x48, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_MASK_KEATON, OBJECT_GI_KI_TAN_MASK, 0x30, 0x12, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_MASK_BUNNY, OBJECT_GI_RABIT_MASK, 0x4F, 0x13, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_MASK_TRUTH, OBJECT_GI_TRUTH_MASK, 0x50, 0x17, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_POCKET_EGG, OBJECT_GI_EGG, 0x28, 0x01, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_POCKET_CUCCO, OBJECT_GI_NIWATORI, 0x43, 0x48, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_ODD_MUSHROOM, OBJECT_GI_MUSHROOM, 0x53, 0x03, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_ODD_POTION, OBJECT_GI_POWDER, 0x52, 0x04, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_SAW, OBJECT_GI_SAW, 0x3F, 0x05, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_SWORD_BROKEN, OBJECT_GI_BROKENSWORD, 0x55, 0x08, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_PRESCRIPTION, OBJECT_GI_PRESCRIPTION, 0x56, 0x09, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_FROG, OBJECT_GI_FROG, 0x59, 0x0D, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_EYEDROPS, OBJECT_GI_EYE_LOTION, 0x51, 0x0E, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_CLAIM_CHECK, OBJECT_GI_TICKETSTONE, 0x54, 0x0A, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_SWORD_KOKIRI, OBJECT_GI_SWORD_1, 0x73, 0xA4, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_SWORD_BGS, OBJECT_GI_LONGSWORD, 0x42, 0x4B, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_SHIELD_DEKU, OBJECT_GI_SHIELD_1, 0x1C, 0x4C, 0xA0, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_SHIELD_HYLIAN, OBJECT_GI_SHIELD_2, 0x2B, 0x4D, 0xA0, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_SHIELD_MIRROR, OBJECT_GI_SHIELD_3, 0x39, 0x4E, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_TUNIC_GORON, OBJECT_GI_CLOTHES, 0x3B, 0x50, 0xA0, CHEST_ANIM_LONG), + GET_ITEM(ITEM_TUNIC_ZORA, OBJECT_GI_CLOTHES, 0x3C, 0x51, 0xA0, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOOTS_IRON, OBJECT_GI_BOOTS_2, 0x46, 0x53, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOOTS_HOVER, OBJECT_GI_HOVERBOOTS, 0x5E, 0x54, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_QUIVER_40, OBJECT_GI_ARROWCASE, 0x15, 0x56, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_QUIVER_50, OBJECT_GI_ARROWCASE, 0x16, 0x57, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOMB_BAG_20, OBJECT_GI_BOMBPOUCH, 0x17, 0x58, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOMB_BAG_30, OBJECT_GI_BOMBPOUCH, 0x18, 0x59, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BOMB_BAG_40, OBJECT_GI_BOMBPOUCH, 0x19, 0x5A, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_GAUNTLETS_SILVER, OBJECT_GI_GLOVES, 0x48, 0x5B, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_GAUNTLETS_GOLD, OBJECT_GI_GLOVES, 0x49, 0x5C, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_SCALE_SILVER, OBJECT_GI_SCALE, 0x29, 0xCD, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_SCALE_GOLDEN, OBJECT_GI_SCALE, 0x2A, 0xCE, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_STONE_OF_AGONY, OBJECT_GI_MAP, 0x20, 0x68, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_GERUDO_CARD, OBJECT_GI_GERUDO, 0x23, 0x7B, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_OCARINA_FAIRY, OBJECT_GI_OCARINA_0, 0x45, 0x3A, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_SEEDS, OBJECT_GI_SEED, 0x47, 0xDC, 0x50, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_HEART_CONTAINER, OBJECT_GI_HEARTS, 0x12, 0xC6, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_HEART_PIECE_2, OBJECT_GI_HEARTS, 0x13, 0xC2, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_KEY_BOSS, OBJECT_GI_BOSSKEY, 0x09, 0xC7, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_COMPASS, OBJECT_GI_COMPASS, 0x0A, 0x67, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_DUNGEON_MAP, OBJECT_GI_MAP, 0x1B, 0x66, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_KEY_SMALL, OBJECT_GI_KEY, 0x01, 0x60, 0x80, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_MAGIC_SMALL, OBJECT_GI_MAGICPOT, 0x1D, 0x52, 0x6F, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_MAGIC_LARGE, OBJECT_GI_MAGICPOT, 0x1E, 0x52, 0x6E, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_WALLET_ADULT, OBJECT_GI_PURSE, 0x21, 0x5E, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_WALLET_GIANT, OBJECT_GI_PURSE, 0x22, 0x5F, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_WEIRD_EGG, OBJECT_GI_EGG, 0x28, 0x9A, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_HEART, OBJECT_GI_HEART, 0x08, 0x55, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_ARROWS_SMALL, OBJECT_GI_ARROW, 0x24, 0xE6, 0x48, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_ARROWS_MEDIUM, OBJECT_GI_ARROW, 0x25, 0xE6, 0x49, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_ARROWS_LARGE, OBJECT_GI_ARROW, 0x26, 0xE6, 0x4A, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_RUPEE_GREEN, OBJECT_GI_RUPY, 0x6C, 0x6F, 0x00, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_RUPEE_BLUE, OBJECT_GI_RUPY, 0x6D, 0xCC, 0x01, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_RUPEE_RED, OBJECT_GI_RUPY, 0x6E, 0xF0, 0x02, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_HEART_CONTAINER, OBJECT_GI_HEARTS, 0x12, 0xC6, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_MILK, OBJECT_GI_MILK, 0x2F, 0x98, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_MASK_GORON, OBJECT_GI_GOLONMASK, 0x5A, 0x14, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_MASK_ZORA, OBJECT_GI_ZORAMASK, 0x5B, 0x15, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_MASK_GERUDO, OBJECT_GI_GERUDOMASK, 0x5C, 0x16, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BRACELET, OBJECT_GI_BRACELET, 0x57, 0x79, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_RUPEE_PURPLE, OBJECT_GI_RUPY, 0x70, 0xF1, 0x14, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_RUPEE_GOLD, OBJECT_GI_RUPY, 0x71, 0xF2, 0x13, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_SWORD_BGS, OBJECT_GI_LONGSWORD, 0x42, 0x0C, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_ARROW_FIRE, OBJECT_GI_M_ARROW, 0x5F, 0x70, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_ARROW_ICE, OBJECT_GI_M_ARROW, 0x60, 0x71, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_ARROW_LIGHT, OBJECT_GI_M_ARROW, 0x61, 0x72, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_SKULL_TOKEN, OBJECT_GI_SUTARU, 0x62, 0xB4, 0x80, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_DINS_FIRE, OBJECT_GI_GODDESS, 0x63, 0xAD, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_FARORES_WIND, OBJECT_GI_GODDESS, 0x64, 0xAE, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_NAYRUS_LOVE, OBJECT_GI_GODDESS, 0x65, 0xAF, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BULLET_BAG_30, OBJECT_GI_DEKUPOUCH, 0x6B, 0x07, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BULLET_BAG_40, OBJECT_GI_DEKUPOUCH, 0x6B, 0x07, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_STICKS_5, OBJECT_GI_STICK, 0x1A, 0x37, 0x0D, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_STICKS_10, OBJECT_GI_STICK, 0x1A, 0x37, 0x0D, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_NUTS_5, OBJECT_GI_NUTS, 0x11, 0x34, 0x0C, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_NUTS_10, OBJECT_GI_NUTS, 0x11, 0x34, 0x0C, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_BOMB, OBJECT_GI_BOMB_1, 0x1F, 0x32, 0x59, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_BOMBS_10, OBJECT_GI_BOMB_1, 0x1F, 0x32, 0x59, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_BOMBS_20, OBJECT_GI_BOMB_1, 0x1F, 0x32, 0x59, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_BOMBS_30, OBJECT_GI_BOMB_1, 0x1F, 0x32, 0x59, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_SEEDS_30, OBJECT_GI_SEED, 0x47, 0xDC, 0x50, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_BOMBCHUS_5, OBJECT_GI_BOMB_2, 0x27, 0x33, 0x80, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_BOMBCHUS_20, OBJECT_GI_BOMB_2, 0x27, 0x33, 0x80, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_FISH, OBJECT_GI_FISH, 0x3E, 0x47, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BUG, OBJECT_GI_INSECT, 0x67, 0x7A, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BLUE_FIRE, OBJECT_GI_FIRE, 0x66, 0x5D, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_POE, OBJECT_GI_GHOST, 0x69, 0x97, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_BIG_POE, OBJECT_GI_GHOST, 0x6F, 0xF9, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_KEY_SMALL, OBJECT_GI_KEY, 0x01, 0xF3, 0x80, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_RUPEE_GREEN, OBJECT_GI_RUPY, 0x6C, 0xF4, 0x00, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_RUPEE_BLUE, OBJECT_GI_RUPY, 0x6D, 0xF5, 0x01, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_RUPEE_RED, OBJECT_GI_RUPY, 0x6E, 0xF6, 0x02, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_RUPEE_PURPLE, OBJECT_GI_RUPY, 0x70, 0xF7, 0x14, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_HEART_PIECE_2, OBJECT_GI_HEARTS, 0x13, 0xFA, 0x80, CHEST_ANIM_LONG), + GET_ITEM(ITEM_STICK_UPGRADE_20, OBJECT_GI_STICK, 0x1A, 0x90, 0x80, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_STICK_UPGRADE_30, OBJECT_GI_STICK, 0x1A, 0x91, 0x80, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_NUT_UPGRADE_30, OBJECT_GI_NUTS, 0x11, 0xA7, 0x80, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_NUT_UPGRADE_40, OBJECT_GI_NUTS, 0x11, 0xA8, 0x80, CHEST_ANIM_SHORT), + GET_ITEM(ITEM_BULLET_BAG_50, OBJECT_GI_DEKUPOUCH, 0x72, 0x6C, 0x80, CHEST_ANIM_LONG), + { ITEM_NONE }, + { ITEM_NONE }, +}; + +LinkAnimetionEntry* D_80853914[] = { + 0x04003240, 0x04003238, 0x04003238, 0x04002BE0, 0x04003240, 0x04003240, +}; + +LinkAnimetionEntry* D_8085392C[] = { + 0x04003290, 0x04003268, 0x04003268, 0x04002BF8, 0x04003290, 0x04003290, +}; + +LinkAnimetionEntry* D_80853944[] = { + 0x04003140, 0x04002B38, 0x04003138, 0x04002B40, 0x04003140, 0x04003140, +}; + +LinkAnimetionEntry* D_8085395C[] = { + 0x04002E98, 0x040029E8, 0x04002E98, 0x040029F0, 0x04002E98, 0x04002E98, +}; + +LinkAnimetionEntry* D_80853974[] = { + 0x04002FB0, 0x04002FA8, 0x04002FB0, 0x04002A40, 0x04002FB0, 0x04002FB0, +}; + +LinkAnimetionEntry* D_8085398C[] = { + 0x04003220, 0x04002590, 0x04002590, 0x04002BC0, 0x04003220, 0x04003220, +}; + +LinkAnimetionEntry* D_808539A4[] = { + 0x04003230, 0x040025D0, 0x040025D0, 0x04002BD0, 0x04003230, 0x04003230, +}; + +LinkAnimetionEntry* D_808539BC[] = { + 0x04002BB0, 0x040031F8, 0x040031F8, 0x04002BB0, 0x04002BB0, 0x04002BB0, +}; + +LinkAnimetionEntry* D_808539D4[] = { + 0x04003088, 0x04002A70, 0x04002A70, 0x04003088, 0x04003088, 0x04003088, +}; + +LinkAnimetionEntry* D_808539EC[] = { + 0x04002750, 0x04002748, 0x04002748, 0x04002750, 0x04002750, 0x04002750, +}; + +LinkAnimetionEntry* D_80853A04[] = { + 0x04002330, 0x04002330, 0x04002330, 0x04002330, 0x04002330, 0x04002330, +}; + +LinkAnimetionEntry* D_80853A1C[] = { + 0x04002760, 0x04002758, 0x04002758, 0x04002760, 0x04002760, 0x04002760, +}; + +LinkAnimetionEntry* D_80853A34[] = { + 0x04002338, 0x04002338, 0x04002338, 0x04002338, 0x04002338, 0x04002338, +}; + +LinkAnimetionEntry* D_80853A4C[] = { + 0x04002E08, 0x04002E00, 0x04002E00, 0x04002E08, 0x04002E08, 0x04002E08, +}; + +LinkAnimetionEntry* D_80853A64[] = { + 0x04003028, 0x04003020, 0x04003020, 0x04003028, 0x04003028, 0x04003028, +}; + +LinkAnimetionEntry* D_80853A7C[] = { + 0x04003170, 0x04003168, 0x04003168, 0x04003170, 0x04003170, 0x04003170, +}; + +LinkAnimetionEntry* D_80853A94[] = { + 0x04003038, 0x04003030, 0x04003030, 0x04002A68, 0x04003038, 0x04003038, +}; + +LinkAnimetionEntry* D_80853AAC[] = { + 0x04002FC0, 0x04002FB8, 0x04002FB8, 0x04002FC8, 0x04002FC0, 0x04002FC0, +}; + +LinkAnimetionEntry* D_80853AC4[] = { + 0x04003278, 0x04003270, 0x04003270, 0x04002BE8, 0x04003278, 0x04003278, +}; + +LinkAnimetionEntry* D_80853ADC[] = { + 0x04003288, 0x04003280, 0x04003280, 0x04002BF0, 0x04003288, 0x04003288, +}; + +LinkAnimetionEntry* D_80853AF4[] = { + 0x04002EB8, 0x04002EA0, 0x04002EA0, 0x04002EB8, 0x040026C8, 0x04002EB8, +}; + +LinkAnimetionEntry* D_80853B0C[] = { + 0x04002ED8, 0x04002ED0, 0x04002ED0, 0x04002ED8, 0x040026D0, 0x04002ED8, +}; + +LinkAnimetionEntry* D_80853B24[] = { + 0x04002EB0, 0x04002EA8, 0x04002EA8, 0x04002EB0, 0x04002EB0, 0x04002EB0, +}; + +LinkAnimetionEntry* D_80853B3C[] = { + 0x04003190, 0x04003188, 0x04003188, 0x04002B68, 0x04003190, 0x04003190, +}; + +LinkAnimetionEntry* D_80853B54[] = { + 0x04003178, 0x04002568, 0x04002568, 0x04002B58, 0x04003178, 0x04003178, +}; + +LinkAnimetionEntry* D_80853B6C[] = { + 0x04003180, 0x04002570, 0x04002570, 0x04002B60, 0x04003180, 0x04003180, +}; + +LinkAnimetionEntry* D_80853B84[] = { + 0x04002D60, 0x04002D58, 0x04002D58, 0x04002D60, 0x04002D60, 0x04002D60, +}; + +LinkAnimetionEntry* D_80853B9C[] = { + 0x04002BB8, 0x04003218, 0x04003218, 0x04002BB8, 0x04002BB8, 0x04002BB8, +}; + +LinkAnimetionEntry* D_80853BB4[] = { + 0x04002BC8, 0x04003228, 0x04003228, 0x04002BC8, 0x04002BC8, 0x04002BC8, +}; + +LinkAnimetionEntry* D_80853BCC[] = { + 0x040031C8, 0x040031C0, 0x040031C0, 0x040031C8, 0x040031C8, 0x040031C8, +}; + +LinkAnimetionEntry* D_80853BE4[] = { + 0x04003118, 0x04003110, 0x04003110, 0x04003118, 0x04003118, 0x04003118, +}; + +LinkAnimetionEntry* D_80853BFC[] = { + 0x04002DE8, 0x04002DE8, 0x04002DE8, 0x04002DE8, 0x04002DE8, 0x04002DE8, +}; + +LinkAnimetionEntry* D_80853C14[] = { + 0x04002E30, 0x04002E18, 0x04002E18, 0x04002E30, 0x04002E30, 0x04002E30, +}; + +LinkAnimetionEntry* D_80853C2C[] = { + 0x04002E40, 0x04002E38, 0x04002E38, 0x04002E40, 0x04002E40, 0x04002E40, +}; + +LinkAnimetionEntry* D_80853C44[] = { + 0x04002E28, 0x04002E20, 0x04002E20, 0x04002E28, 0x04002E28, 0x04002E28, +}; + +LinkAnimetionEntry* D_80853C5C[] = { + 0x040030C8, 0x040030C0, 0x040030C0, 0x040030C8, 0x040030C8, 0x040030C8, +}; + +LinkAnimetionEntry* D_80853C74[] = { + 0x040030D8, 0x040030D0, 0x040030D0, 0x040030D8, 0x040030D8, 0x040030D8, +}; + +LinkAnimetionEntry* D_80853C8C[] = { + 0x040030B8, 0x040030B0, 0x040030B0, 0x040030B8, 0x040030B8, 0x040030B8, +}; + +LinkAnimetionEntry* D_80853CA4[] = { + 0x04002F20, 0x04002F18, 0x04002F18, 0x04002F20, 0x04002F20, 0x04002F20, +}; + +LinkAnimetionEntry* D_80853CBC[] = { + 0x04002FF0, 0x04002FE8, 0x04002FE8, 0x04002FF0, 0x04002FF0, 0x04002FF0, +}; + +LinkAnimetionEntry* D_80853CD4[] = { + 0x04003010, 0x04003008, 0x04003008, 0x04003010, 0x04003010, 0x04003010, +}; + +LinkAnimetionEntry* D_80853CEC[] = { + 0x04003000, 0x04002FF8, 0x04002FF8, 0x04003000, 0x04003000, 0x04003000, +}; + +LinkAnimetionEntry* D_80853D04[] = { + 0x04002EF0, 0x04002EE8, 0x04002EE8, 0x04002EF8, 0x04002EF0, 0x04002EF0, +}; + +LinkAnimetionEntry* D_80853D1C[] = { + 0x040031E0, 0x040031D8, 0x040031D8, 0x040031E8, 0x040031E0, 0x040031E0, +}; + +LinkAnimetionEntry* D_80853D34[] = { + 0x04003468, 0x04003438, 0x04003438, 0x04003468, 0x04003468, 0x04003468, +}; + +LinkAnimetionEntry* D_80853D4C[][3] = { + { 0x04002A28, 0x04002A38, 0x04002A30 }, + { 0x04002950, 0x04002960, 0x04002958 }, + { 0x040029D0, 0x040029E0, 0x040029D8 }, + { 0x04002988, 0x04002998, 0x04002990 }, +}; + +LinkAnimetionEntry* D_80853D7C[] = { + 0x04003248, 0x04003200, 0x04003258, 0x04003210, 0x04003250, 0x04003208, 0x04003250, + 0x04003208, 0x04003430, 0x040033F0, 0x04003430, 0x040033F0, 0x04003430, 0x040033F0, + 0x040033F8, 0x040033D0, 0x04003400, 0x040033D8, 0x04003420, 0x04003420, 0x04003408, + 0x040033E0, 0x04003410, 0x040033E8, 0x04003418, 0x04003418, 0x04003428, 0x04003428, +}; + +struct_80832924 D_80853DEC[] = { + { NA_SE_VO_LI_SNEEZE, -0x2008 }, +}; + +struct_80832924 D_80853DF0[] = { + { NA_SE_VO_LI_SWEAT, -0x2012 }, +}; + +struct_80832924 D_80853DF4[] = { + { NA_SE_VO_LI_BREATH_REST, -0x200D }, +}; + +struct_80832924 D_80853DF8[] = { + { NA_SE_VO_LI_BREATH_REST, -0x200A }, +}; + +struct_80832924 D_80853DFC[] = { + { NA_SE_PL_CALM_HIT, 0x82C }, { NA_SE_PL_CALM_HIT, 0x830 }, { NA_SE_PL_CALM_HIT, 0x834 }, + { NA_SE_PL_CALM_HIT, 0x838 }, { NA_SE_PL_CALM_HIT, -0x83C }, +}; + +struct_80832924 D_80853E10[] = { + { 0, 0x4019 }, { 0, 0x401E }, { 0, 0x402C }, { 0, 0x4030 }, { 0, 0x4034 }, { 0, -0x4038 }, +}; + +struct_80832924 D_80853E28[] = { + { NA_SE_IT_SHIELD_POSTURE, 0x810 }, + { NA_SE_IT_SHIELD_POSTURE, 0x814 }, + { NA_SE_IT_SHIELD_POSTURE, -0x846 }, +}; + +struct_80832924 D_80853E34[] = { + { NA_SE_IT_HAMMER_SWING, 0x80A }, + { NA_SE_VO_LI_AUTO_JUMP, 0x200A }, + { NA_SE_IT_SWORD_SWING, 0x816 }, + { NA_SE_VO_LI_SWORD_N, -0x2016 }, +}; + +struct_80832924 D_80853E44[] = { + { NA_SE_IT_SWORD_SWING, 0x827 }, + { NA_SE_VO_LI_SWORD_N, -0x2027 }, +}; + +struct_80832924 D_80853E4C[] = { + { NA_SE_VO_LI_RELAX, -0x2014 }, +}; + +struct_80832924* D_80853E50[] = { + D_80853DEC, D_80853DF0, D_80853DF4, D_80853DF8, D_80853DFC, D_80853E10, + D_80853E28, D_80853E34, D_80853E44, D_80853E4C, NULL, +}; + +u8 D_80853E7C[] = { + 0, 0, 1, 1, 2, 2, 2, 2, 10, 10, 10, 10, 10, 10, 3, 3, 4, 4, 8, 8, 5, 5, 6, 6, 7, 7, 9, 9, 0, +}; + +// Used to map item IDs to action params +s8 sItemActionParams[] = { + PLAYER_AP_STICK, + PLAYER_AP_NUT, + PLAYER_AP_BOMB, + PLAYER_AP_BOW, + PLAYER_AP_BOW_FIRE, + PLAYER_AP_DINS_FIRE, + PLAYER_AP_SLINGSHOT, + PLAYER_AP_OCARINA_FAIRY, + PLAYER_AP_OCARINA_TIME, + PLAYER_AP_BOMBCHU, + PLAYER_AP_HOOKSHOT, + PLAYER_AP_LONGSHOT, + PLAYER_AP_BOW_ICE, + PLAYER_AP_FARORES_WIND, + PLAYER_AP_BOOMERANG, + PLAYER_AP_LENS, + PLAYER_AP_BEAN, + PLAYER_AP_HAMMER, + PLAYER_AP_BOW_LIGHT, + PLAYER_AP_NAYRUS_LOVE, + PLAYER_AP_BOTTLE, + PLAYER_AP_BOTTLE_POTION_RED, + PLAYER_AP_BOTTLE_POTION_GREEN, + PLAYER_AP_BOTTLE_POTION_BLUE, + PLAYER_AP_BOTTLE_FAIRY, + PLAYER_AP_BOTTLE_FISH, + PLAYER_AP_BOTTLE_MILK, + PLAYER_AP_BOTTLE_LETTER, + PLAYER_AP_BOTTLE_FIRE, + PLAYER_AP_BOTTLE_BUG, + PLAYER_AP_BOTTLE_BIG_POE, + PLAYER_AP_BOTTLE_MILK_HALF, + PLAYER_AP_BOTTLE_POE, + PLAYER_AP_WEIRD_EGG, + PLAYER_AP_CHICKEN, + PLAYER_AP_LETTER_ZELDA, + PLAYER_AP_MASK_KEATON, + PLAYER_AP_MASK_SKULL, + PLAYER_AP_MASK_SPOOKY, + PLAYER_AP_MASK_BUNNY, + PLAYER_AP_MASK_GORON, + PLAYER_AP_MASK_ZORA, + PLAYER_AP_MASK_GERUDO, + PLAYER_AP_MASK_TRUTH, + PLAYER_AP_SWORD_MASTER, + PLAYER_AP_POCKET_EGG, + PLAYER_AP_POCKET_CUCCO, + PLAYER_AP_COJIRO, + PLAYER_AP_ODD_MUSHROOM, + PLAYER_AP_ODD_POTION, + PLAYER_AP_SAW, + PLAYER_AP_SWORD_BROKEN, + PLAYER_AP_PRESCRIPTION, + PLAYER_AP_FROG, + PLAYER_AP_EYEDROPS, + PLAYER_AP_CLAIM_CHECK, + PLAYER_AP_BOW_FIRE, + PLAYER_AP_BOW_ICE, + PLAYER_AP_BOW_LIGHT, + PLAYER_AP_SWORD_KOKIRI, + PLAYER_AP_SWORD_MASTER, + PLAYER_AP_SWORD_BGS, +}; + +s32 (*D_80853EDC[])(Player* this, GlobalContext* globalCtx) = { + func_8083485C, func_8083485C, func_8083485C, func_808349DC, func_808349DC, func_808349DC, func_8083485C, + func_8083485C, func_8083501C, func_8083501C, func_8083501C, func_8083501C, func_8083501C, func_8083501C, + func_8083501C, func_8083501C, func_8083501C, func_8083501C, func_808356E8, func_808356E8, func_80835800, + func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, + func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, + func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, + func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, + func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, + func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, + func_8083485C, func_8083485C, func_8083485C, func_8083485C, +}; + +void (*D_80853FE8[])(GlobalContext* globalCtx, Player* this) = { + func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_8083377C, + func_80833790, func_8083379C, func_8083379C, func_8083379C, func_8083379C, func_8083379C, func_8083379C, + func_8083379C, func_8083379C, func_80833910, func_80833910, func_808337D4, func_808337D4, func_80833984, + func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, + func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, + func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, + func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, + func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, + func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, + func_80833770, func_80833770, func_80833770, func_80833770, +}; + +struct_808540F4 D_808540F4[] = { + { 0x04002F50, 12 }, { 0x04003080, 6 }, { 0x04002C68, 8 }, { 0x04003090, 8 }, { 0x04002A20, 8 }, + { 0x04002F30, 10 }, { 0x04002C58, 7 }, { 0x04002C60, 11 }, { 0x04002F50, 12 }, { 0x04003078, 4 }, + { 0x04003058, 4 }, { 0x04002F38, 4 }, { 0x040024E0, 5 }, { 0x04002F48, 13 }, +}; + +s8 D_80854164[][6] = { + { 8, -5, -3, -6, 8, 11 }, { 5, 0, -1, 4, 5, 9 }, { 3, 1, 0, 2, 3, 9 }, + { 6, -4, -2, 7, 6, 10 }, { 8, -5, -3, -6, 8, 11 }, { 8, -5, -3, -6, 8, 11 }, +}; + +ExplosiveInfo sExplosiveInfos[] = { + { ITEM_BOMB, ACTOR_EN_BOM }, + { ITEM_BOMBCHU, ACTOR_EN_BOM_CHU }, +}; + +struct_80854190 D_80854190[] = { + { 0x04002A80, 0x04002A90, 0x04002A88, 1, 4 }, { 0x040028C0, 0x040028C8, 0x04002498, 1, 4 }, + { 0x04002A98, 0x04002AA0, 0x04002540, 0, 5 }, { 0x040028D0, 0x040028D8, 0x040024A0, 1, 7 }, + { 0x04002968, 0x04002970, 0x040024C0, 1, 4 }, { 0x04002880, 0x04002888, 0x04002478, 0, 5 }, + { 0x04002978, 0x04002980, 0x040024C8, 2, 8 }, { 0x04002890, 0x04002898, 0x04002480, 3, 8 }, + { 0x040029A0, 0x040029A8, 0x040024D0, 0, 4 }, { 0x040028A0, 0x040028A8, 0x04002488, 0, 5 }, + { 0x040029B0, 0x040029B8, 0x040024D8, 0, 6 }, { 0x040028B0, 0x040028B8, 0x04002490, 1, 5 }, + { 0x04002AA8, 0x04002AB0, 0x04002548, 0, 3 }, { 0x040028E0, 0x040028E8, 0x040024A8, 0, 3 }, + { 0x04002AB8, 0x04002AC0, 0x04002550, 1, 9 }, { 0x040028F0, 0x040028F8, 0x040024B0, 1, 8 }, + { 0x04002A60, 0x04002A50, 0x04002A50, 1, 10 }, { 0x04002900, 0x04002910, 0x04002910, 1, 11 }, + { 0x04002A50, 0x04002A58, 0x04002A58, 1, 2 }, { 0x04002910, 0x04002908, 0x04002908, 1, 2 }, + { 0x04002B80, 0x04002B88, 0x04002B88, 1, 5 }, { 0x04002B70, 0x04002B78, 0x04002B78, 1, 4 }, + { 0x04002C40, 0x04002C50, 0x04002C48, 3, 10 }, { 0x04002C70, 0x04002C80, 0x04002C78, 2, 11 }, + { 0x04002B28, 0x04002B30, 0x04002560, 0, 12 }, { 0x04002940, 0x04002948, 0x040024B8, 0, 15 }, + { 0x040029C0, 0x040029C8, 0x04002560, 0, 16 }, { 0x040029C0, 0x040029C8, 0x040024B8, 0, 16 }, +}; + +LinkAnimetionEntry* D_80854350[] = { + 0x04002AE8, + 0x04002920, +}; + +LinkAnimetionEntry* D_80854358[] = { + 0x04002AE0, + 0x04002920, +}; + +LinkAnimetionEntry* D_80854360[] = { + 0x04002AF0, + 0x04002928, +}; + +LinkAnimetionEntry* D_80854368[] = { + 0x04002AF8, + 0x04002930, +}; + +LinkAnimetionEntry* D_80854370[] = { + 0x04002B00, + 0x04002938, +}; + +LinkAnimetionEntry* D_80854378[] = { + 0x04002AD8, + 0x04002918, +}; + +u8 D_80854380[2] = { 0x18, 0x19 }; +u8 D_80854384[2] = { 0x1A, 0x1B }; + +u16 D_80854388[] = { B_BUTTON, L_CBUTTONS, D_CBUTTONS, R_CBUTTONS }; + +u8 sMagicSpellCosts[] = { 12, 24, 24, 12, 24, 12 }; + +u16 D_80854398[] = { NA_SE_IT_BOW_DRAW, NA_SE_IT_SLING_DRAW, NA_SE_IT_HOOKSHOT_READY }; + +u8 sMagicArrowCosts[] = { 4, 4, 8 }; + +LinkAnimetionEntry* D_808543A4[] = { + 0x040025C0, + 0x040025C8, +}; + +LinkAnimetionEntry* D_808543AC[] = { + 0x04002580, + 0x04002588, +}; + +LinkAnimetionEntry* D_808543B4[] = { + 0x04002510, + 0x04002518, +}; + +LinkAnimetionEntry* D_808543BC[] = { + 0x04002510, + 0x04002520, +}; + +LinkAnimetionEntry* D_808543C4[] = { + 0x04002EC0, + 0x04002A08, +}; + +LinkAnimetionEntry* D_808543CC[] = { + 0x040026F0, + 0x04002CC8, +}; + +LinkAnimetionEntry* D_808543D4[] = { + 0x040026C0, + 0x04002CC0, +}; + +// external segments +extern LinkAnimetionEntry D_04002340; +extern LinkAnimetionEntry D_04002378; +extern LinkAnimetionEntry D_04002400; +extern LinkAnimetionEntry D_04002408; +extern LinkAnimetionEntry D_04002420; +extern LinkAnimetionEntry D_04002428; +extern LinkAnimetionEntry D_04002430; +extern LinkAnimetionEntry D_04002468; +extern LinkAnimetionEntry D_040024E8; +extern LinkAnimetionEntry D_040024F8; +extern LinkAnimetionEntry D_04002538; +extern LinkAnimetionEntry D_040025F8; +extern LinkAnimetionEntry D_04002600; +extern LinkAnimetionEntry D_04002608; +extern LinkAnimetionEntry D_04002618; +extern LinkAnimetionEntry D_04002620; +extern LinkAnimetionEntry D_04002628; +extern LinkAnimetionEntry D_04002630; +extern LinkAnimetionEntry D_04002638; +extern LinkAnimetionEntry D_04002650; +extern LinkAnimetionEntry D_04002660; +extern LinkAnimetionEntry D_04002668; +extern LinkAnimetionEntry D_04002670; +extern LinkAnimetionEntry D_04002688; +extern LinkAnimetionEntry D_04002698; +extern LinkAnimetionEntry D_040026A0; +extern LinkAnimetionEntry D_040026B0; +extern LinkAnimetionEntry D_040026B8; +extern LinkAnimetionEntry D_040026E8; +extern LinkAnimetionEntry D_04002700; +extern LinkAnimetionEntry D_04002708; +extern LinkAnimetionEntry D_04002770; +extern LinkAnimetionEntry D_04002780; +extern LinkAnimetionEntry D_04002788; +extern LinkAnimetionEntry D_040027D0; +extern LinkAnimetionEntry D_04002830; +extern LinkAnimetionEntry D_04002838; +extern LinkAnimetionEntry D_04002860; +extern LinkAnimetionEntry D_04002878; +extern LinkAnimetionEntry D_04002908; +extern LinkAnimetionEntry D_04002AC8; +extern LinkAnimetionEntry D_04002C00; +extern LinkAnimetionEntry D_04002C08; +extern LinkAnimetionEntry D_04002C10; +extern LinkAnimetionEntry D_04002C18; +extern LinkAnimetionEntry D_04002C20; +extern LinkAnimetionEntry D_04002C28; +extern LinkAnimetionEntry D_04002C30; +extern LinkAnimetionEntry D_04002C38; +extern LinkAnimetionEntry D_04002C90; +extern LinkAnimetionEntry D_04002C98; +extern LinkAnimetionEntry D_04002CA0; +extern LinkAnimetionEntry D_04002D28; +extern LinkAnimetionEntry D_04002D38; +extern LinkAnimetionEntry D_04002D40; +extern LinkAnimetionEntry D_04002D48; +extern LinkAnimetionEntry D_04002D68; +extern LinkAnimetionEntry D_04002D80; +extern LinkAnimetionEntry D_04002D88; +extern LinkAnimetionEntry D_04002DA0; +extern LinkAnimetionEntry D_04002DA8; +extern LinkAnimetionEntry D_04002DB0; +extern LinkAnimetionEntry D_04002DB8; +extern LinkAnimetionEntry D_04002DC0; +extern LinkAnimetionEntry D_04002DD0; +extern LinkAnimetionEntry D_04002DF0; +extern LinkAnimetionEntry D_04002DF8; +extern LinkAnimetionEntry D_04002E10; +extern LinkAnimetionEntry D_04002E48; +extern LinkAnimetionEntry D_04002E90; +extern LinkAnimetionEntry D_04002EC8; +extern LinkAnimetionEntry D_04002F00; +extern LinkAnimetionEntry D_04002F08; +extern LinkAnimetionEntry D_04002F10; +extern LinkAnimetionEntry D_04002F28; +extern LinkAnimetionEntry D_04002F30; +extern LinkAnimetionEntry D_04002F40; +extern LinkAnimetionEntry D_04002F58; +extern LinkAnimetionEntry D_04002F60; +extern LinkAnimetionEntry D_04002F68; +extern LinkAnimetionEntry D_04002F98; +extern LinkAnimetionEntry D_04002FA0; +extern LinkAnimetionEntry D_04002FD0; +extern LinkAnimetionEntry D_04002FE0; +extern LinkAnimetionEntry D_04003000; +extern LinkAnimetionEntry D_04003020; +extern LinkAnimetionEntry D_04003040; +extern LinkAnimetionEntry D_04003048; +extern LinkAnimetionEntry D_04003050; +extern LinkAnimetionEntry D_04003060; +extern LinkAnimetionEntry D_04003068; +extern LinkAnimetionEntry D_04003070; +extern LinkAnimetionEntry D_04003098; +extern LinkAnimetionEntry D_040030A0; +extern LinkAnimetionEntry D_040030A8; +extern LinkAnimetionEntry D_040030E0; +extern LinkAnimetionEntry D_040030F0; +extern LinkAnimetionEntry D_040030F8; +extern LinkAnimetionEntry D_04003100; +extern LinkAnimetionEntry D_04003108; +extern LinkAnimetionEntry D_04003120; +extern LinkAnimetionEntry D_04003128; +extern LinkAnimetionEntry D_04003148; +extern LinkAnimetionEntry D_04003150; +extern LinkAnimetionEntry D_04003158; +extern LinkAnimetionEntry D_04003160; +extern LinkAnimetionEntry D_040031A0; +extern LinkAnimetionEntry D_040031A8; +extern LinkAnimetionEntry D_04003298; +extern LinkAnimetionEntry D_040032B0; +extern LinkAnimetionEntry D_040032B8; +extern LinkAnimetionEntry D_040032C0; +extern LinkAnimetionEntry D_040032C8; +extern LinkAnimetionEntry D_040032D0; +extern LinkAnimetionEntry D_040032D8; +extern LinkAnimetionEntry D_040032E0; +extern LinkAnimetionEntry D_040032E8; +extern LinkAnimetionEntry D_040032F0; +extern LinkAnimetionEntry D_04003300; +extern LinkAnimetionEntry D_04003308; +extern LinkAnimetionEntry D_04003310; +extern LinkAnimetionEntry D_04003318; +extern LinkAnimetionEntry D_04003320; +extern LinkAnimetionEntry D_04003328; +extern LinkAnimetionEntry D_04003330; +extern LinkAnimetionEntry D_04003380; +extern LinkAnimetionEntry D_04003390; +extern LinkAnimetionEntry D_040033A0; +extern LinkAnimetionEntry D_040033B0; +extern LinkAnimetionEntry D_040033B8; +extern LinkAnimetionEntry D_040033C8; +extern Gfx D_04037E30[]; +extern Gfx D_04033EE0[]; + +// return type can't be void due to regalloc in func_8084FCAC +s32 func_80832210(Player* this) { + this->actor.speedXZ = 0.0f; + this->linearVelocity = 0.0f; +} + +// return type can't be void due to regalloc in func_8083F72C +s32 func_80832224(Player* this) { + func_80832210(this); + this->unk_6AD = 0; +} + +s32 func_8083224C(GlobalContext* globalCtx) { + Player* this = PLAYER; + + return (this->actor.flags & 0x100) == 0x100; +} + +void func_80832264(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + SkelAnime_ChangeLinkAnimDefaultStop(globalCtx, &this->skelAnime, anim); +} + +void func_80832284(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + SkelAnime_ChangeLinkAnimDefaultRepeat(globalCtx, &this->skelAnime, anim); +} + +void func_808322A4(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + SkelAnime_ChangeLinkAnimPlaybackRepeat(globalCtx, &this->skelAnime, anim, 2.0f / 3.0f); +} + +void func_808322D0(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + SkelAnime_ChangeLinkAnimPlaybackStop(globalCtx, &this->skelAnime, anim, 2.0f / 3.0f); +} + +void func_808322FC(Player* this) { + this->actor.shape.rot.y += this->skelAnime.limbDrawTbl[1].y; + this->skelAnime.limbDrawTbl[1].y = 0; +} + +void func_80832318(Player* this) { + this->stateFlags2 &= ~0x20000; + this->swordState = 0; + this->swordInfo[0].active = this->swordInfo[1].active = this->swordInfo[2].active = 0; +} + +void func_80832340(GlobalContext* globalCtx, Player* this) { + Camera* camera; + + if (this->unk_46C != -1) { + camera = globalCtx->cameraPtrs[this->unk_46C]; + if ((camera != NULL) && (camera->unk_168 == 1100)) { + func_800803F0(globalCtx, this->unk_46C); + this->unk_46C = -1; + } + } + + this->stateFlags2 &= ~0xC00; +} + +void func_808323B4(GlobalContext* globalCtx, Player* this) { + Actor* heldActor = this->heldActor; + + if ((heldActor != NULL) && !Player_HoldsHookshot(this)) { + this->actor.child = NULL; + this->heldActor = NULL; + this->interactRangeActor = NULL; + heldActor->parent = NULL; + this->stateFlags1 &= ~0x800; + } + + if (Player_GetExplosiveHeld(this) >= 0) { + func_8083399C(globalCtx, this, PLAYER_AP_NONE); + this->heldItemId = ITEM_NONE_FE; + } +} + +void func_80832440(GlobalContext* globalCtx, Player* this) { + if ((this->stateFlags1 & 0x800) && (this->heldActor == NULL)) { + if (this->interactRangeActor != NULL) { + if (this->getItemId == GI_NONE) { + this->stateFlags1 &= ~0x800; + this->interactRangeActor = NULL; + } + } else { + this->stateFlags1 &= ~0x800; + } + } + + func_80832318(this); + this->unk_6AD = 0; + + func_80832340(globalCtx, this); + func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); + + this->stateFlags1 &= ~0x306000; + this->stateFlags2 &= ~0x40090; + + this->actor.shape.rot.x = 0; + this->actor.shape.unk_08 = 0.0f; + + this->unk_845 = this->unk_844 = 0; +} + +s32 func_80832528(GlobalContext* globalCtx, Player* this) { + if (this->heldItemActionParam >= PLAYER_AP_FISHING_POLE) { + func_80835F44(globalCtx, this, ITEM_NONE); + return 1; + } else { + return 0; + } +} + +void func_80832564(GlobalContext* globalCtx, Player* this) { + func_80832440(globalCtx, this); + func_808323B4(globalCtx, this); +} + +s32 func_80832594(Player* this, s32 arg1, s32 arg2) { + s16 temp = this->unk_A80 - D_808535D8; + + this->unk_850 += arg1 + (s16)(ABS(temp) * fabsf(D_808535D4) * 2.5415802156203426e-06f); + + if (sControlInput->press.in.button & (A_BUTTON | B_BUTTON)) { + this->unk_850 += 5; + } + + return this->unk_850 > arg2; +} + +void func_80832630(GlobalContext* globalCtx) { + if (globalCtx->actorCtx.unk_00 == 0) { + globalCtx->actorCtx.unk_00 = 1; + } +} + +void func_8083264C(Player* this, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { + if (this->actor.type == ACTORTYPE_PLAYER) { + func_800AA000(arg4, arg1, arg2, arg3); + } +} + +void func_80832698(Player* this, u16 sfxId) { + if (this->actor.type == ACTORTYPE_PLAYER) { + func_8002F7DC(&this->actor, sfxId + this->ageProperties->unk_92); + } else { + func_800F4190(&this->actor.projectedPos, sfxId); + } +} + +void func_808326F0(Player* this) { + u16* entry = &D_8085361C[0]; + s32 i; + + for (i = 0; i < 4; i++) { + func_800F8D04(*entry + this->ageProperties->unk_92); + entry++; + } +} + +u16 func_8083275C(Player* this, u16 sfxId) { + return sfxId + this->unk_89E; +} + +void func_80832770(Player* this, u16 sfxId) { + func_8002F7DC(&this->actor, func_8083275C(this, sfxId)); +} + +u16 func_808327A4(Player* this, u16 sfxId) { + return sfxId + this->unk_89E + this->ageProperties->unk_94; +} + +void func_808327C4(Player* this, u16 sfxId) { + func_8002F7DC(&this->actor, func_808327A4(this, sfxId)); +} + +void func_808327F8(Player* this, f32 arg1) { + s32 sfxId; + + if (this->currentBoots == PLAYER_BOOTS_IRON) { + sfxId = NA_SE_PL_WALK_HEAVYBOOTS; + } else { + sfxId = func_808327A4(this, NA_SE_PL_WALK_GROUND); + } + + func_800F4010(&this->actor.projectedPos, sfxId, arg1); +} + +void func_80832854(Player* this) { + s32 sfxId; + + if (this->currentBoots == PLAYER_BOOTS_IRON) { + sfxId = NA_SE_PL_JUMP_HEAVYBOOTS; + } else { + sfxId = func_808327A4(this, NA_SE_PL_JUMP); + } + + func_8002F7DC(&this->actor, sfxId); +} + +void func_808328A0(Player* this) { + s32 sfxId; + + if (this->currentBoots == PLAYER_BOOTS_IRON) { + sfxId = NA_SE_PL_LAND_HEAVYBOOTS; + } else { + sfxId = func_808327A4(this, NA_SE_PL_LAND); + } + + func_8002F7DC(&this->actor, sfxId); +} + +void func_808328EC(Player* this, u16 sfxId) { + func_8002F7DC(&this->actor, sfxId); + this->stateFlags2 |= 8; +} + +void func_80832924(Player* this, struct_80832924* entry) { + s32 data; + s32 flags; + u32 cont; + s32 pad; + + do { + data = ABS(entry->field); + flags = data & 0x7800; + if (func_800A4530(&this->skelAnime, fabsf(data & 0x7FF))) { + if (flags == 0x800) { + func_8002F7DC(&this->actor, entry->sfxId); + } else if (flags == 0x1000) { + func_80832770(this, entry->sfxId); + } else if (flags == 0x1800) { + func_808327C4(this, entry->sfxId); + } else if (flags == 0x2000) { + func_80832698(this, entry->sfxId); + } else if (flags == 0x2800) { + func_808328A0(this); + } else if (flags == 0x3000) { + func_808327F8(this, 6.0f); + } else if (flags == 0x3800) { + func_80832854(this); + } else if (flags == 0x4000) { + func_808327F8(this, 0.0f); + } else if (flags == 0x4800) { + func_800F4010(&this->actor.projectedPos, this->ageProperties->unk_94 + NA_SE_PL_WALK_LADDER, 0.0f); + } + } + cont = (entry->field >= 0); + entry++; + } while (cont); +} + +void func_80832B0C(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, anim, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&anim->genericHeader), 2, -6.0f); +} + +void func_80832B78(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, anim, 2.0f / 3.0f, 0.0f, + SkelAnime_GetFrameCount(&anim->genericHeader), 2, -6.0f); +} + +void func_80832BE8(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, anim, 1.0f, 0.0f, 0.0f, 0, -6.0f); +} + +void func_80832C2C(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, anim, 1.0f, 0.0f, 0.0f, 2, 0.0f); +} + +void func_80832C6C(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, anim, 1.0f, 0.0f, 0.0f, 0, -16.0f); +} + +s32 func_80832CB0(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80832284(globalCtx, this, anim); + return 1; + } else { + return 0; + } +} + +void func_80832CFC(Player* this) { + this->skelAnime.prevFramePos = this->skelAnime.unk_3E; + this->skelAnime.prevFrameRot = this->actor.shape.rot.y; +} + +void func_80832D20(Player* this) { + func_80832CFC(this); + this->skelAnime.prevFramePos.x *= this->ageProperties->unk_08; + this->skelAnime.prevFramePos.y *= this->ageProperties->unk_08; + this->skelAnime.prevFramePos.z *= this->ageProperties->unk_08; +} + +void func_80832DB0(Player* this) { + this->skelAnime.limbDrawTbl[1].y = 0; +} + +void func_80832DBC(Player* this) { + if (this->skelAnime.flags != 0) { + func_808322FC(this); + this->skelAnime.limbDrawTbl[0].x = this->skelAnime.unk_3E.x; + this->skelAnime.limbDrawTbl[0].z = this->skelAnime.unk_3E.z; + if (this->skelAnime.flags & 8) { + if (this->skelAnime.flags & 2) { + this->skelAnime.limbDrawTbl[0].y = this->skelAnime.prevFramePos.y; + } + } else { + this->skelAnime.limbDrawTbl[0].y = this->skelAnime.unk_3E.y; + } + func_80832CFC(this); + this->skelAnime.flags = 0; + } +} + +void func_80832E48(Player* this, s32 flags) { + Vec3f pos; + + this->skelAnime.flags = flags; + this->skelAnime.prevFramePos = this->skelAnime.unk_3E; + func_800A54FC(&this->skelAnime, &pos, this->actor.shape.rot.y); + + if (flags & 1) { + if (LINK_IS_CHILD) { + pos.x *= 0.64f; + pos.z *= 0.64f; + } + this->actor.posRot.pos.x += pos.x * this->actor.scale.x; + this->actor.posRot.pos.z += pos.z * this->actor.scale.z; + } + + if (flags & 2) { + if (!(flags & 4)) { + pos.y *= this->ageProperties->unk_08; + } + this->actor.posRot.pos.y += pos.y * this->actor.scale.y; + } + + func_808322FC(this); +} + +void func_80832F54(GlobalContext* globalCtx, Player* this, s32 flags) { + if (flags & 0x200) { + func_80832D20(this); + } else if ((flags & 0x100) || (this->skelAnime.flags != 0)) { + func_80832CFC(this); + } else { + this->skelAnime.prevFramePos = this->skelAnime.limbDrawTbl[0]; + this->skelAnime.prevFrameRot = this->actor.shape.rot.y; + } + + this->skelAnime.flags = flags; + func_80832210(this); + func_800A3310(globalCtx); +} + +void func_80832FFC(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim, s32 flags, f32 playbackSpeed) { + SkelAnime_ChangeLinkAnimPlaybackStop(globalCtx, &this->skelAnime, anim, playbackSpeed); + func_80832F54(globalCtx, this, flags); +} + +void func_8083303C(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim, s32 flags) { + func_80832FFC(globalCtx, this, anim, flags, 1.0f); +} + +void func_80833064(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim, s32 flags) { + func_80832FFC(globalCtx, this, anim, flags, 2.0f / 3.0f); +} + +void func_8083308C(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + func_80833064(globalCtx, this, anim, 0x1C); +} + +void func_808330AC(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim, s32 flags, f32 playbackSpeed) { + SkelAnime_ChangeLinkAnimPlaybackRepeat(globalCtx, &this->skelAnime, anim, playbackSpeed); + func_80832F54(globalCtx, this, flags); +} + +void func_808330EC(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim, s32 flags) { + func_808330AC(globalCtx, this, anim, flags, 1.0f); +} + +void func_80833114(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim, s32 flags) { + func_808330AC(globalCtx, this, anim, flags, 2.0f / 3.0f); +} + +void func_8083313C(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + func_80833114(globalCtx, this, anim, 0x1C); +} + +void func_8083315C(GlobalContext* globalCtx, Player* this) { + s8 phi_v1; + s8 phi_v0; + + this->unk_A7C = D_808535D4; + this->unk_A80 = D_808535D8; + + func_80077D10(&D_808535D4, &D_808535D8, sControlInput); + + D_808535DC = func_8005A948(ACTIVE_CAM) + D_808535D8; + + this->unk_846 = (this->unk_846 + 1) % 4; + + if (D_808535D4 < 55.0f) { + phi_v0 = -1; + phi_v1 = -1; + } else { + phi_v1 = (u16)(D_808535D8 + 0x2000) >> 9; + phi_v0 = (u16)((s16)(D_808535DC - this->actor.shape.rot.y) + 0x2000) >> 14; + } + + this->unk_847[this->unk_846] = phi_v1; + this->unk_84B[this->unk_846] = phi_v0; +} + +void func_8083328C(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* linkAnim) { + SkelAnime_ChangeLinkAnimPlaybackStop(globalCtx, &this->skelAnime, linkAnim, D_808535E8); +} + +s32 func_808332B8(Player* this) { + return (this->stateFlags1 & 0x8000000) && (this->currentBoots != PLAYER_BOOTS_IRON); +} + +s32 func_808332E4(Player* this) { + return (this->stateFlags1 & 0x1000000); +} + +void func_808332F4(Player* this, GlobalContext* globalCtx) { + GetItemEntry* giEntry = &sGetItemTable[this->getItemId - 1]; + + this->unk_862 = ABS(giEntry->gi); +} + +LinkAnimetionEntry* func_80833338(Player* this) { + return D_80853914[this->modelAnimType]; +} + +s32 func_80833350(Player* this) { + LinkAnimetionEntry** entry; + s32 i; + + if (func_80833338(this) != this->skelAnime.linkAnimetionSeg) { + entry = &D_80853D7C[0]; + for (i = 0; i < 28; i++) { + if (this->skelAnime.linkAnimetionSeg == *entry) { + return i + 1; + } + entry++; + } + return 0; + } + + return -1; +} + +void func_808333FC(Player* this, s32 arg1) { + if (D_80853E7C[arg1] != 0) { + func_80832924(this, D_80853E50[D_80853E7C[arg1] - 1]); + } +} + +LinkAnimetionEntry* func_80833438(Player* this) { + if (this->unk_890 != 0) { + return D_8085395C[this->modelAnimType]; + } else if (!(this->stateFlags1 & 0x28000000) && (this->currentBoots == PLAYER_BOOTS_IRON)) { + return D_80853974[this->modelAnimType]; + } else { + return D_80853944[this->modelAnimType]; + } +} + +s32 func_808334B4(Player* this) { + return func_808332E4(this) && (this->unk_834 != 0); +} + +LinkAnimetionEntry* func_808334E4(Player* this) { + if (func_808334B4(this)) { + return &D_04002638; + } else { + return D_808539A4[this->modelAnimType]; + } +} + +LinkAnimetionEntry* func_80833528(Player* this) { + if (func_808334B4(this)) { + return &D_04002630; + } else { + return D_8085398C[this->modelAnimType]; + } +} + +LinkAnimetionEntry* func_8083356C(Player* this) { + if (func_8002DD78(this)) { + return &D_040026E8; + } else { + return D_80853B3C[this->modelAnimType]; + } +} + +LinkAnimetionEntry* func_808335B0(Player* this) { + if (func_808334B4(this)) { + return &D_04002620; + } else { + return D_80853B6C[this->modelAnimType]; + } +} + +LinkAnimetionEntry* func_808335F4(Player* this) { + if (func_808334B4(this)) { + return &D_04002618; + } else { + return D_80853B54[this->modelAnimType]; + } +} + +void func_80833638(Player* this, PlayerFunc82C arg1) { + this->func_82C = arg1; + this->unk_836 = 0; + this->unk_830 = 0.0f; + func_808326F0(this); +} + +void func_80833664(GlobalContext* globalCtx, Player* this, s8 actionParam) { + LinkAnimetionEntry* current = this->skelAnime.linkAnimetionSeg; + LinkAnimetionEntry** iter = &D_80853914[this->modelAnimType]; + u32 i; + + this->stateFlags1 &= ~0x1000008; + + for (i = 0; i < 45; i++) { + if (current == *iter) { + break; + } + iter += 6; + } + + func_8083399C(globalCtx, this, actionParam); + + if (i < 45) { + this->skelAnime.linkAnimetionSeg = D_80853914[i * 6 + this->modelAnimType]; + } +} + +s8 Player_ItemToActionParam(s32 item) { + if (item >= ITEM_NONE_FE) { + return PLAYER_AP_NONE; + } else if (item == ITEM_LAST_USED) { + return PLAYER_AP_LAST_USED; + } else if (item == ITEM_FISHING_POLE) { + return PLAYER_AP_FISHING_POLE; + } else { + return sItemActionParams[item]; + } +} + +void func_80833770(GlobalContext* globalCtx, Player* this) { +} + +void func_8083377C(GlobalContext* globalCtx, Player* this) { + this->unk_85C = 1.0f; +} + +void func_80833790(GlobalContext* globalCtx, Player* this) { +} + +void func_8083379C(GlobalContext* globalCtx, Player* this) { + this->stateFlags1 |= 8; + + if (this->heldItemActionParam != PLAYER_AP_SLINGSHOT) { + this->unk_860 = -1; + } else { + this->unk_860 = -2; + } +} + +void func_808337D4(GlobalContext* globalCtx, Player* this) { + s32 explosiveType; + ExplosiveInfo* explosiveInfo; + Actor* spawnedActor; + + if (this->stateFlags1 & 0x800) { + func_80832528(globalCtx, this); + return; + } + + explosiveType = Player_GetExplosiveHeld(this); + explosiveInfo = &sExplosiveInfos[explosiveType]; + + spawnedActor = Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, explosiveInfo->actorId, + this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, + this->actor.shape.rot.y, 0, 0); + if (spawnedActor != NULL) { + if ((explosiveType != 0) && (globalCtx->bombchuBowlingAmmo != 0)) { + globalCtx->bombchuBowlingAmmo--; + if (globalCtx->bombchuBowlingAmmo == 0) { + globalCtx->bombchuBowlingAmmo = -1; + } + } else { + Inventory_ChangeAmmo(explosiveInfo->itemId, -1); + } + + this->interactRangeActor = spawnedActor; + this->heldActor = spawnedActor; + this->getItemId = GI_NONE; + this->unk_3BC.y = spawnedActor->shape.rot.y - this->actor.shape.rot.y; + this->stateFlags1 |= 0x800; + } +} + +void func_80833910(GlobalContext* globalCtx, Player* this) { + this->stateFlags1 |= 8; + this->unk_860 = -3; + + this->heldActor = + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_ARMS_HOOK, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.shape.rot.y, 0, 0); +} + +void func_80833984(GlobalContext* globalCtx, Player* this) { + this->stateFlags1 |= 0x1000000; +} + +void func_8083399C(GlobalContext* globalCtx, Player* this, s8 actionParam) { + this->unk_860 = 0; + this->unk_85C = 0.0f; + this->unk_858 = 0.0f; + + this->heldItemActionParam = this->itemActionParam = actionParam; + this->modelGroup = this->nextModelGroup; + + this->stateFlags1 &= ~0x1000008; + + D_80853FE8[actionParam](globalCtx, this); + + Player_SetModelGroup(this, this->modelGroup); +} + +void func_80833A20(Player* this, s32 newSwordState) { + u16 itemSfx; + u16 voiceSfx; + + if (this->swordState == 0) { + if ((this->heldItemActionParam == PLAYER_AP_SWORD_BGS) && (gSaveContext.swordHealth > 0.0f)) { + itemSfx = NA_SE_IT_HAMMER_SWING; + } else { + itemSfx = NA_SE_IT_SWORD_SWING; + } + + voiceSfx = NA_SE_VO_LI_SWORD_N; + if (this->heldItemActionParam == PLAYER_AP_HAMMER) { + itemSfx = NA_SE_IT_HAMMER_SWING; + } else if (this->swordAnimation >= 0x18) { + itemSfx = 0; + voiceSfx = NA_SE_VO_LI_SWORD_L; + } else if (this->unk_845 >= 3) { + itemSfx = NA_SE_IT_SWORD_SWING_HARD; + voiceSfx = NA_SE_VO_LI_SWORD_L; + } + + if (itemSfx != 0) { + func_808328EC(this, itemSfx); + } + + if ((this->swordAnimation < 0x10) || (this->swordAnimation >= 0x14)) { + func_80832698(this, voiceSfx); + } + } + + this->swordState = newSwordState; +} + +s32 func_80833B2C(Player* this) { + if (this->stateFlags1 & 0x40030000) { + return 1; + } else { + return 0; + } +} + +s32 func_80833B54(Player* this) { + if ((this->unk_664 != NULL) && ((this->unk_664->flags & 5) == 5)) { + this->stateFlags1 |= 0x10; + return 1; + } + + if (this->stateFlags1 & 0x10) { + this->stateFlags1 &= ~0x10; + if (this->linearVelocity == 0.0f) { + this->currentYaw = this->actor.shape.rot.y; + } + } + + return 0; +} + +s32 func_80833BCC(Player* this) { + return func_8008E9C4(this) || func_80833B2C(this); +} + +s32 func_80833C04(Player* this) { + return func_80833B54(this) || func_80833B2C(this); +} + +void func_80833C3C(Player* this) { + this->unk_870 = this->unk_874 = 0.0f; +} + +s32 func_80833C50(Player* this, s32 item) { + if ((item < ITEM_NONE_FE) && (Player_ItemToActionParam(item) == this->itemActionParam)) { + return 1; + } else { + return 0; + } +} + +s32 func_80833C98(s32 item1, s32 actionParam) { + if ((item1 < ITEM_NONE_FE) && (Player_ItemToActionParam(item1) == actionParam)) { + return 1; + } else { + return 0; + } +} + +s32 func_80833CDC(GlobalContext* globalCtx, s32 index) { + if (index >= 4) { + return ITEM_NONE; + } else if (globalCtx->bombchuBowlingAmmo != 0) { + return (globalCtx->bombchuBowlingAmmo > 0) ? ITEM_BOMBCHU : ITEM_NONE; + } else if (index == 0) { + return B_BTN_ITEM; + } else if (index == 1) { + return C_BTN_ITEM(0); + } else if (index == 2) { + return C_BTN_ITEM(1); + } else { + return C_BTN_ITEM(2); + } +} + +void func_80833DF8(Player* this, GlobalContext* globalCtx) { + s32 maskActionParam; + s32 item; + s32 i; + + if (this->currentMask != PLAYER_MASK_NONE) { + maskActionParam = this->currentMask - 1 + PLAYER_AP_MASK_KEATON; + if (!func_80833C98(C_BTN_ITEM(0), maskActionParam) && !func_80833C98(C_BTN_ITEM(1), maskActionParam) && + !func_80833C98(C_BTN_ITEM(2), maskActionParam)) { + this->currentMask = PLAYER_MASK_NONE; + } + } + + if (!(this->stateFlags1 & 0x20000800) && !func_8008F128(this)) { + if (this->itemActionParam >= PLAYER_AP_FISHING_POLE) { + if (!func_80833C50(this, B_BTN_ITEM) && !func_80833C50(this, C_BTN_ITEM(0)) && + !func_80833C50(this, C_BTN_ITEM(1)) && !func_80833C50(this, C_BTN_ITEM(2))) { + func_80835F44(globalCtx, this, ITEM_NONE); + return; + } + } + + for (i = 0; i < ARRAY_COUNT(D_80854388); i++) { + if (CHECK_PAD(sControlInput->press, D_80854388[i])) { + break; + } + } + + item = func_80833CDC(globalCtx, i); + if (item >= ITEM_NONE_FE) { + for (i = 0; i < ARRAY_COUNT(D_80854388); i++) { + if (CHECK_PAD(sControlInput->cur, D_80854388[i])) { + break; + } + } + + item = func_80833CDC(globalCtx, i); + if ((item < ITEM_NONE_FE) && (Player_ItemToActionParam(item) == this->heldItemActionParam)) { + D_80853618 = true; + } + } else { + this->heldItemButton = i; + func_80835F44(globalCtx, this, item); + } + } +} + +#ifdef NON_MATCHING +// ordering and deduplication differences +void func_808340DC(Player* this, GlobalContext* globalCtx) { + LinkAnimetionEntry* sp4C; + f32 phi_f2; + f32 phi_f12; + f32 phi_f14; + f32 phi_f0; + s32 sp38; + s8 sp37; + s32 temp; + + sp37 = Player_ItemToActionParam(this->heldItemId); + func_80833638(this, func_80834A2C); + + temp = gPlayerModelTypes[this->nextModelGroup][0]; + sp38 = D_80854164[gPlayerModelTypes[this->modelGroup][0]][temp]; + if ((sp37 == PLAYER_AP_BOTTLE) || (sp37 == PLAYER_AP_BOOMERANG) || + ((sp37 == PLAYER_AP_NONE) && + ((this->heldItemActionParam == PLAYER_AP_BOTTLE) || (this->heldItemActionParam == PLAYER_AP_BOOMERANG)))) { + sp38 = (sp37 == PLAYER_AP_NONE) ? -13 : 13; + } + + this->unk_15A = ABS(sp38); + + sp4C = D_808540F4[this->unk_15A].anim; + if ((sp4C == &D_04002F30) && (this->currentShield == PLAYER_SHIELD_NONE)) { + sp4C = &D_04002F40; + } + + phi_f2 = SkelAnime_GetFrameCount(&sp4C->genericHeader); + + if (sp38 >= 0) { + phi_f12 = 0.0f; + phi_f14 = phi_f2; + phi_f0 = 1.2f; + } else { + phi_f12 = phi_f2; + phi_f14 = 0.0f; + phi_f0 = -1.2f; + } + + if (sp37 != PLAYER_AP_NONE) { + phi_f0 *= 2.0f; + } + + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime2, sp4C, phi_f0, phi_f12, phi_f14, 2, 0.0f); + + this->stateFlags1 &= ~0x100; +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834298.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834380.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083442C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834594.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834644.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808346C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083485C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808348EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083499C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808349DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834A2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834B5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834E7C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834EB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834F2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80834FBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083501C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808350A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80835588.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808355DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80835644.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808357E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80835800.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808359FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80835C58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80835DE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80835E44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80835EFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80835F44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80836448.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808365C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80836898.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808368EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808369C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80836AB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80836BEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80836FAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083721C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80837268.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80837348.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808374A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80837530.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808375D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808377DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80837818.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80837918.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80837948.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80837AFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80837B9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80837C0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80838144.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083816C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083819C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083821C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80838280.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808382BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80838940.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808389E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80838E70.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80838F5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80838FB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80839034.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808395DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80839680.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808396F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083973C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80839768.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80839800.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80839E88.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F30.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80839F90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80839FFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A060.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A098.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A0F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A2F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A360.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A388.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A3B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A40C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A434.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A4A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A5C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A6AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AA10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AD4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083ADD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AE40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B010.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B040.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B644.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B8F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083B998.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BA90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BB20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BBA0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC7C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BCD0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BDBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C0E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C148.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C1DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C484.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C50C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C544.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C61C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C6B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C858.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C8DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C910.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CA9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CB94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CC9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CE0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CEAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CF5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CFA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D0A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D12C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D330.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D36C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D53C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083D6EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DB98.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DC54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DDC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DF68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083DFE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E0FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E298.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E318.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E4C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083E5A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EA94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EAF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EB44.s") - +#endif + +void func_80834298(Player* this, GlobalContext* globalCtx) { + if ((this->actor.type == ACTORTYPE_PLAYER) && !(this->stateFlags1 & 0x100) && + ((this->heldItemActionParam == this->itemActionParam) || (this->stateFlags1 & 0x400000)) && + (gSaveContext.health != 0) && (globalCtx->csCtx.state == 0) && (this->csMode == 0) && + (globalCtx->unk_11E5C == 0) && (globalCtx->activeCamera == 0) && (globalCtx->sceneLoadFlag != 0x14) && + (gSaveContext.timer1State != 10)) { + func_80833DF8(this, globalCtx); + } + + if (this->stateFlags1 & 0x100) { + func_808340DC(this, globalCtx); + } +} + +s32 func_80834380(GlobalContext* globalCtx, Player* this, s32* itemPtr, s32* typePtr) { + if (LINK_IS_ADULT) { + *itemPtr = ITEM_BOW; + if (this->stateFlags1 & 0x800000) { + *typePtr = 1; + } else { + *typePtr = this->heldItemActionParam - 6; + } + } else { + *itemPtr = ITEM_SLINGSHOT; + *typePtr = 9; + } + + if (gSaveContext.minigameState == 1) { + return globalCtx->interfaceCtx.hbaAmmo; + } else if (globalCtx->unk_11E5C != 0) { + return globalCtx->unk_11E5C; + } else { + return AMMO(*itemPtr); + } +} + +s32 func_8083442C(Player* this, GlobalContext* globalCtx) { + s32 item; + s32 arrowType; + s32 magicArrowType; + + if ((this->heldItemActionParam >= PLAYER_AP_BOW_FIRE) && (this->heldItemActionParam <= PLAYER_AP_BOW_0E) && + (gSaveContext.unk_13F0 != 0)) { + func_80078884(NA_SE_SY_ERROR); + } else { + func_80833638(this, func_808351D4); + + this->stateFlags1 |= 0x200; + this->unk_834 = 14; + + if (this->unk_860 >= 0) { + func_8002F7DC(&this->actor, D_80854398[ABS(this->unk_860) - 1]); + + if (!Player_HoldsHookshot(this) && (func_80834380(globalCtx, this, &item, &arrowType) > 0)) { + magicArrowType = arrowType - 3; + + if (this->unk_860 >= 0) { + if ((magicArrowType >= 0) && (magicArrowType < 3) && + !func_80087708(globalCtx, sMagicArrowCosts[magicArrowType], 0)) { + arrowType = 2; + } + + this->heldActor = Actor_SpawnAsChild( + &globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ARROW, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.shape.rot.y, 0, arrowType); + } + } + } + + return 1; + } + + return 0; +} + +void func_80834594(GlobalContext* globalCtx, Player* this) { + if (this->heldItemActionParam != PLAYER_AP_NONE) { + if (func_8008F2BC(this, this->heldItemActionParam) >= 0) { + func_808328EC(this, NA_SE_IT_SWORD_PUTAWAY); + } else { + func_808328EC(this, NA_SE_PL_CHANGE_ARMS); + } + } + + func_80835F44(globalCtx, this, this->heldItemId); + + if (func_8008F2BC(this, this->heldItemActionParam) >= 0) { + func_808328EC(this, NA_SE_IT_SWORD_PICKOUT); + } else if (this->heldItemActionParam != PLAYER_AP_NONE) { + func_808328EC(this, NA_SE_PL_CHANGE_ARMS); + } +} + +void func_80834644(GlobalContext* globalCtx, Player* this) { + if (func_80834A2C == this->func_82C) { + func_80834594(globalCtx, this); + } + + func_80833638(this, D_80853EDC[this->heldItemActionParam]); + this->unk_834 = 0; + this->unk_6AC = 0; + func_808323B4(globalCtx, this); + this->stateFlags1 &= ~0x100; +} + +LinkAnimetionEntry* func_808346C4(GlobalContext* globalCtx, Player* this) { + func_80833638(this, func_80834B5C); + func_808323B4(globalCtx, this); + + if (this->unk_870 < 0.5f) { + return D_808543A4[Player_HoldsTwoHandedWeapon(this)]; + } else { + return D_808543AC[Player_HoldsTwoHandedWeapon(this)]; + } +} + +s32 func_80834758(GlobalContext* globalCtx, Player* this) { + LinkAnimetionEntry* anim; + f32 frame; + + if (!(this->stateFlags1 & 0x20C00000) && (globalCtx->unk_11E5C == 0) && + (this->heldItemActionParam == this->itemActionParam) && (this->currentShield != PLAYER_SHIELD_NONE) && + !Player_IsChildWithHylianShield(this) && func_80833BCC(this) && CHECK_PAD(sControlInput->cur, R_TRIG)) { + + anim = func_808346C4(globalCtx, this); + frame = SkelAnime_GetFrameCount(&anim->genericHeader); + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime2, anim, 1.0f, frame, frame, 2, 0.0f); + func_8002F7DC(&this->actor, NA_SE_IT_SHIELD_POSTURE); + + return 1; + } else { + return 0; + } +} + +s32 func_8083485C(Player* this, GlobalContext* globalCtx) { + if (func_80834758(globalCtx, this)) { + return 1; + } else { + return 0; + } +} + +void func_80834894(Player* this) { + func_80833638(this, func_80834C74); + + if (this->itemActionParam < 0) { + func_8008EC70(this); + } + + SkelAnime_AnimReverse(&this->skelAnime2); + func_8002F7DC(&this->actor, NA_SE_IT_SHIELD_REMOVE); +} + +void func_808348EC(GlobalContext* globalCtx, Player* this) { + struct_808540F4* ptr = &D_808540F4[this->unk_15A]; + f32 temp; + + temp = ptr->unk_04; + temp = (this->skelAnime2.animPlaybackSpeed < 0.0f) ? temp - 1.0f : temp; + + if (func_800A4530(&this->skelAnime2, temp)) { + func_80834594(globalCtx, this); + } + + func_80833B54(this); +} + +s32 func_8083499C(Player* this, GlobalContext* globalCtx) { + if (this->stateFlags1 & 0x100) { + func_808340DC(this, globalCtx); + } else { + return 0; + } + + return 1; +} + +s32 func_808349DC(Player* this, GlobalContext* globalCtx) { + if (func_80834758(globalCtx, this) || func_8083499C(this, globalCtx)) { + return 1; + } else { + return 0; + } +} + +s32 func_80834A2C(Player* this, GlobalContext* globalCtx) { + if (func_800A3BC0(globalCtx, &this->skelAnime2) || + ((Player_ItemToActionParam(this->heldItemId) == this->heldItemActionParam) && + (D_80853614 = (D_80853614 || ((this->modelAnimType != 3) && (globalCtx->unk_11E5C == 0)))))) { + func_80833638(this, D_80853EDC[this->heldItemActionParam]); + this->unk_834 = 0; + this->unk_6AC = 0; + D_80853618 = D_80853614; + return this->func_82C(this, globalCtx); + } + + if (func_80833350(this) != 0) { + func_808348EC(globalCtx, this); + func_80832264(globalCtx, this, func_80833338(this)); + this->unk_6AC = 0; + } else { + func_808348EC(globalCtx, this); + } + + return 1; +} + +s32 func_80834B5C(Player* this, GlobalContext* globalCtx) { + func_800A3BC0(globalCtx, &this->skelAnime2); + + if (!CHECK_PAD(sControlInput->cur, R_TRIG)) { + func_80834894(this); + return 1; + } else { + this->stateFlags1 |= 0x400000; + Player_SetModelsForHoldingShield(this); + return 1; + } +} + +s32 func_80834BD4(Player* this, GlobalContext* globalCtx) { + LinkAnimetionEntry* anim; + f32 frame; + + if (func_800A3BC0(globalCtx, &this->skelAnime2)) { + anim = func_808346C4(globalCtx, this); + frame = SkelAnime_GetFrameCount(&anim->genericHeader); + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime2, anim, 1.0f, frame, frame, 2, 0.0f); + } + + this->stateFlags1 |= 0x400000; + Player_SetModelsForHoldingShield(this); + + return 1; +} + +s32 func_80834C74(Player* this, GlobalContext* globalCtx) { + D_80853614 = D_80853618; + + if (D_80853614 || func_800A3BC0(globalCtx, &this->skelAnime2)) { + func_80833638(this, D_80853EDC[this->heldItemActionParam]); + SkelAnime_ChangeLinkAnimDefaultRepeat(globalCtx, &this->skelAnime2, D_80853914[this->modelAnimType]); + this->unk_6AC = 0; + this->func_82C(this, globalCtx); + return 0; + } + + return 1; +} + +s32 func_80834D2C(Player* this, GlobalContext* globalCtx) { + LinkAnimetionEntry* anim; + + if (this->heldItemActionParam != PLAYER_AP_BOOMERANG) { + if (!func_8083442C(this, globalCtx)) { + return 0; + } + + if (!Player_HoldsHookshot(this)) { + anim = &D_040026A0; + } else { + anim = &D_04002CA0; + } + SkelAnime_ChangeLinkAnimDefaultStop(globalCtx, &this->skelAnime2, anim); + } else { + func_80833638(this, func_80835884); + this->unk_834 = 10; + SkelAnime_ChangeLinkAnimDefaultStop(globalCtx, &this->skelAnime2, &D_04002628); + } + + if (this->stateFlags1 & 0x800000) { + func_80832284(globalCtx, this, &D_04003380); + } else if ((this->actor.bgCheckFlags & 1) && !func_80833B54(this)) { + func_80832284(globalCtx, this, D_80853914[this->modelAnimType]); + } + + return 1; +} + +s32 func_80834E44(GlobalContext* globalCtx) { + return (globalCtx->unk_11E5C > 0) && CHECK_PAD(sControlInput->press, B_BUTTON); +} + +s32 func_80834E7C(GlobalContext* globalCtx) { + return (globalCtx->unk_11E5C != 0) && + ((globalCtx->unk_11E5C < 0) || + (sControlInput->cur.in.button & (A_BUTTON | B_BUTTON | U_CBUTTONS | L_CBUTTONS | R_CBUTTONS | D_CBUTTONS))); +} + +s32 func_80834EB8(Player* this, GlobalContext* globalCtx) { + if ((this->unk_6AD == 0) || (this->unk_6AD == 2)) { + if (func_80833BCC(this) || (func_8005A470(Gameplay_GetCamera(globalCtx, 0), 7) == 0)) { + return 1; + } + this->unk_6AD = 2; + } + + return 0; +} + +s32 func_80834F2C(Player* this, GlobalContext* globalCtx) { + if ((this->doorType == 0) && !(this->stateFlags1 & 0x2000000)) { + if (D_80853614 || func_80834E44(globalCtx)) { + if (func_80834D2C(this, globalCtx)) { + return func_80834EB8(this, globalCtx); + } + } + } + + return 0; +} + +s32 func_80834FBC(Player* this) { + if (this->actor.child != NULL) { + if (this->heldActor == NULL) { + this->heldActor = this->actor.child; + func_8083264C(this, 255, 10, 250, 0); + func_8002F7DC(&this->actor, NA_SE_IT_HOOKSHOT_RECEIVE); + } + + return 1; + } + + return 0; +} + +s32 func_8083501C(Player* this, GlobalContext* globalCtx) { + if (this->unk_860 >= 0) { + this->unk_860 = -this->unk_860; + } + + if ((!Player_HoldsHookshot(this) || func_80834FBC(this)) && !func_80834758(globalCtx, this) && + !func_80834F2C(this, globalCtx)) { + return 0; + } + + return 1; +} + +s32 func_808350A4(GlobalContext* globalCtx, Player* this) { + s32 item; + s32 arrowType; + + if (this->heldActor != NULL) { + if (!Player_HoldsHookshot(this)) { + func_80834380(globalCtx, this, &item, &arrowType); + + if (gSaveContext.minigameState == 1) { + globalCtx->interfaceCtx.hbaAmmo--; + } else if (globalCtx->unk_11E5C != 0) { + globalCtx->unk_11E5C--; + } else { + Inventory_ChangeAmmo(item, -1); + } + + if (globalCtx->unk_11E5C == 1) { + globalCtx->unk_11E5C = -10; + } + + func_8083264C(this, 150, 10, 150, 0); + } else { + func_8083264C(this, 255, 20, 150, 0); + } + + this->unk_A73 = 4; + this->heldActor->parent = NULL; + this->actor.child = NULL; + this->heldActor = NULL; + + return 1; + } + + return 0; +} + +u16 D_808543DC[] = { NA_SE_IT_BOW_FLICK, NA_SE_IT_SLING_FLICK }; + +s32 func_808351D4(Player* this, GlobalContext* globalCtx) { + s32 sp2C; + + if (!Player_HoldsHookshot(this)) { + sp2C = 0; + } else { + sp2C = 1; + } + + Math_ApproxUpdateScaledS(&this->unk_6C0, 1200, 400); + this->unk_6AE |= 0x100; + + if ((this->unk_836 == 0) && (func_80833350(this) == 0) && (this->skelAnime.linkAnimetionSeg == &D_040026E8)) { + SkelAnime_ChangeLinkAnimDefaultStop(globalCtx, &this->skelAnime2, D_808543CC[sp2C]); + this->unk_836 = -1; + } else if (func_800A3BC0(globalCtx, &this->skelAnime2)) { + SkelAnime_ChangeLinkAnimDefaultRepeat(globalCtx, &this->skelAnime2, D_808543D4[sp2C]); + this->unk_836 = 1; + } else if (this->unk_836 == 1) { + this->unk_836 = 2; + } + + if (this->unk_834 > 10) { + this->unk_834--; + } + + func_80834EB8(this, globalCtx); + + if ((this->unk_836 > 0) && ((this->unk_860 < 0) || (!D_80853618 && !func_80834E7C(globalCtx)))) { + func_80833638(this, func_808353D8); + if (this->unk_860 >= 0) { + if (sp2C == 0) { + if (!func_808350A4(globalCtx, this)) { + func_8002F7DC(&this->actor, D_808543DC[ABS(this->unk_860) - 1]); + } + } else if (this->actor.bgCheckFlags & 1) { + func_808350A4(globalCtx, this); + } + } + this->unk_834 = 10; + func_80832210(this); + } else { + this->stateFlags1 |= 0x200; + } + + return 1; +} + +s32 func_808353D8(Player* this, GlobalContext* globalCtx) { + func_800A3BC0(globalCtx, &this->skelAnime2); + + if (Player_HoldsHookshot(this) && !func_80834FBC(this)) { + return 1; + } + + if (!func_80834758(globalCtx, this) && + (D_80853614 || ((this->unk_860 < 0) && D_80853618) || func_80834E44(globalCtx))) { + this->unk_860 = ABS(this->unk_860); + + if (func_8083442C(this, globalCtx)) { + if (Player_HoldsHookshot(this)) { + this->unk_836 = 1; + } else { + SkelAnime_ChangeLinkAnimDefaultStop(globalCtx, &this->skelAnime2, &D_040026B8); + } + } + } else { + if (this->unk_834 != 0) { + this->unk_834--; + } + + if (func_80833BCC(this) || (this->unk_6AD != 0) || (this->stateFlags1 & 0x100000)) { + if (this->unk_834 == 0) { + this->unk_834++; + } + return 1; + } + + if (Player_HoldsHookshot(this)) { + func_80833638(this, func_8083501C); + } else { + func_80833638(this, func_80835588); + SkelAnime_ChangeLinkAnimDefaultStop(globalCtx, &this->skelAnime2, &D_040026B0); + } + + this->unk_834 = 0; + } + + return 1; +} + +s32 func_80835588(Player* this, GlobalContext* globalCtx) { + if (!(this->actor.bgCheckFlags & 1) || func_800A3BC0(globalCtx, &this->skelAnime2)) { + func_80833638(this, func_8083501C); + } + + return 1; +} + +void func_808355DC(Player* this) { + this->stateFlags1 |= 0x20000; + + if (!(this->skelAnime.flags & 0x80) && (this->actor.bgCheckFlags & 0x200) && (D_80853608 < 0x2000)) { + this->currentYaw = this->actor.shape.rot.y = this->actor.wallPolyRot + 0x8000; + } + + this->targetYaw = this->actor.shape.rot.y; +} + +s32 func_80835644(GlobalContext* globalCtx, Player* this, Actor* arg2) { + if (arg2 == NULL) { + func_80832564(globalCtx, this); + func_80839F90(this, globalCtx); + return 1; + } + + return 0; +} + +void func_80835688(Player* this, GlobalContext* globalCtx) { + if (!func_80835644(globalCtx, this, this->heldActor)) { + func_80833638(this, func_808356E8); + SkelAnime_ChangeLinkAnimDefaultRepeat(globalCtx, &this->skelAnime2, &D_04002E10); + } +} + +s32 func_808356E8(Player* this, GlobalContext* globalCtx) { + Actor* heldActor = this->heldActor; + + if (heldActor == NULL) { + func_80834644(globalCtx, this); + } + + if (func_80834758(globalCtx, this)) { + return 1; + } + + if (this->stateFlags1 & 0x800) { + if (func_800A3BC0(globalCtx, &this->skelAnime2)) { + SkelAnime_ChangeLinkAnimDefaultRepeat(globalCtx, &this->skelAnime2, &D_04002E10); + } + + if ((heldActor->id == ACTOR_EN_NIW) && (this->actor.velocity.y <= 0.0f)) { + this->actor.minVelocityY = -2.0f; + this->actor.gravity = -0.5f; + this->fallStartHeight = this->actor.posRot.pos.y; + } + + return 1; + } + + return func_8083485C(this, globalCtx); +} + +void func_808357E8(Player* this, Gfx** dLists) { + this->leftHandDLists = &dLists[gSaveContext.linkAge]; +} + +s32 func_80835800(Player* this, GlobalContext* globalCtx) { + if (func_80834758(globalCtx, this)) { + return 1; + } + + if (this->stateFlags1 & 0x2000000) { + func_80833638(this, func_80835B60); + } else if (func_80834F2C(this, globalCtx)) { + return 1; + } + + return 0; +} + +s32 func_80835884(Player* this, GlobalContext* globalCtx) { + if (func_800A3BC0(globalCtx, &this->skelAnime2)) { + func_80833638(this, func_808358F0); + SkelAnime_ChangeLinkAnimDefaultRepeat(globalCtx, &this->skelAnime2, &D_04002638); + } + + func_80834EB8(this, globalCtx); + + return 1; +} + +s32 func_808358F0(Player* this, GlobalContext* globalCtx) { + LinkAnimetionEntry* animSeg = this->skelAnime.linkAnimetionSeg; + + if ((func_808334E4(this) == animSeg) || (func_80833528(this) == animSeg) || (func_808335B0(this) == animSeg) || + (func_808335F4(this) == animSeg)) { + SkelAnime_LoadAnimationType1(globalCtx, this->skelAnime.limbCount, this->skelAnime2.limbDrawTbl, + this->skelAnime.limbDrawTbl); + } else { + func_800A3BC0(globalCtx, &this->skelAnime2); + } + + func_80834EB8(this, globalCtx); + + if (!D_80853618) { + func_80833638(this, func_808359FC); + SkelAnime_ChangeLinkAnimDefaultStop(globalCtx, &this->skelAnime2, + (this->unk_870 < 0.5f) ? &D_04002608 : &D_04002600); + } + + return 1; +} + +s32 func_808359FC(Player* this, GlobalContext* globalCtx) { + if (func_800A3BC0(globalCtx, &this->skelAnime2)) { + func_80833638(this, func_80835B60); + this->unk_834 = 0; + } else if (func_800A4530(&this->skelAnime2, 6.0f)) { + f32 posX = (Math_Sins(this->actor.shape.rot.y) * 10.0f) + this->actor.posRot.pos.x; + f32 posZ = (Math_Coss(this->actor.shape.rot.y) * 10.0f) + this->actor.posRot.pos.z; + s32 yaw = (this->unk_664 != NULL) ? this->actor.shape.rot.y + 14000 : this->actor.shape.rot.y; + EnBoom* boomerang = + (EnBoom*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOOM, posX, this->actor.posRot.pos.y + 30.0f, + posZ, this->actor.posRot2.rot.x, yaw, 0, 0); + + this->boomerangActor = &boomerang->actor; + if (boomerang != NULL) { + boomerang->moveTo = this->unk_664; + boomerang->returnTimer = 20; + this->stateFlags1 |= 0x2000000; + if (!func_8008E9C4(this)) { + func_808355DC(this); + } + this->unk_A73 = 4; + func_8002F7DC(&this->actor, NA_SE_IT_BOOMERANG_THROW); + func_80832698(this, NA_SE_VO_LI_SWORD_N); + } + } + + return 1; +} + +s32 func_80835B60(Player* this, GlobalContext* globalCtx) { + if (func_80834758(globalCtx, this)) { + return 1; + } + + if (!(this->stateFlags1 & 0x2000000)) { + func_80833638(this, func_80835C08); + SkelAnime_ChangeLinkAnimDefaultStop(globalCtx, &this->skelAnime2, &D_040025F8); + func_808357E8(this, D_80125EF8); + func_8002F7DC(&this->actor, NA_SE_PL_CATCH_BOOMERANG); + func_80832698(this, NA_SE_VO_LI_SWORD_N); + return 1; + } + + return 0; +} + +s32 func_80835C08(Player* this, GlobalContext* globalCtx) { + if (!func_80835800(this, globalCtx) && func_800A3BC0(globalCtx, &this->skelAnime2)) { + func_80833638(this, func_80835800); + } + + return 1; +} + +s32 func_80835C58(GlobalContext* globalCtx, Player* this, PlayerFunc674 func, s32 flags) { + if (func == this->func_674) { + return 0; + } + + if (func_8084E3C4 == this->func_674) { + func_800ED858(0); + this->stateFlags2 &= ~0x3000000; + } else if (func_808507F4 == this->func_674) { + func_80832340(globalCtx, this); + } + + this->func_674 = func; + + if ((this->itemActionParam != this->heldItemActionParam) && (!(flags & 1) || !(this->stateFlags1 & 0x400000))) { + func_8008EC70(this); + } + + if (!(flags & 1) && (!(this->stateFlags1 & 0x800))) { + func_80834644(globalCtx, this); + this->stateFlags1 &= ~0x400000; + } + + func_80832DBC(this); + this->stateFlags1 &= ~0xB4000044; + this->stateFlags2 &= ~0x18080000; + this->stateFlags3 &= ~0x8A; + this->unk_84F = 0; + this->unk_850 = 0; + this->unk_6AC = 0; + func_808326F0(this); + + return 1; +} + +void func_80835DAC(GlobalContext* globalCtx, Player* this, PlayerFunc674 func, s32 flags) { + s32 temp; + + temp = this->skelAnime.flags; + this->skelAnime.flags = 0; + func_80835C58(globalCtx, this, func, flags); + this->skelAnime.flags = temp; +} + +void func_80835DE4(GlobalContext* globalCtx, Player* this, PlayerFunc674 func, s32 flags) { + s32 temp; + + if (this->itemActionParam >= 0) { + temp = this->itemActionParam; + this->itemActionParam = this->heldItemActionParam; + func_80835C58(globalCtx, this, func, flags); + this->itemActionParam = temp; + Player_SetModels(this, Player_ActionToModelGroup(this, this->itemActionParam)); + } +} + +void func_80835E44(GlobalContext* globalCtx, s16 arg1) { + if (!func_800C0CB8(globalCtx)) { + if (arg1 == 0x2F) { + Interface_ChangeAlpha(2); + } + } else { + func_8005A77C(Gameplay_GetCamera(globalCtx, 0), arg1); + } +} + +void func_80835EA4(GlobalContext* globalCtx, s32 arg1) { + func_80835E44(globalCtx, 0x38); + Camera_SetCameraData(Gameplay_GetCamera(globalCtx, 0), 4, 0, 0, arg1, 0, 0); +} + +void func_80835EFC(Player* this) { + if (Player_HoldsHookshot(this)) { + Actor* heldActor = this->heldActor; + + if (heldActor != NULL) { + Actor_Kill(heldActor); + this->actor.child = NULL; + this->heldActor = NULL; + } + } +} + +void func_80835F44(GlobalContext* globalCtx, Player* this, s32 item) { + s8 actionParam; + s32 temp; + s32 nextType; + + actionParam = Player_ItemToActionParam(item); + + if (((this->heldItemActionParam == this->itemActionParam) && + (!(this->stateFlags1 & 0x400000) || (Player_ActionToSword(actionParam) != 0) || + (actionParam == PLAYER_AP_NONE))) || + ((this->itemActionParam < 0) && + ((Player_ActionToSword(actionParam) != 0) || (actionParam == PLAYER_AP_NONE)))) { + + if ((actionParam == PLAYER_AP_NONE) || !(this->stateFlags1 & 0x8000000) || + ((this->actor.bgCheckFlags & 1) && + ((actionParam == PLAYER_AP_HOOKSHOT) || (actionParam == PLAYER_AP_LONGSHOT)))) { + + if ((globalCtx->bombchuBowlingAmmo == 0) && + (((actionParam == PLAYER_AP_STICK) && (AMMO(ITEM_STICK) == 0)) || + ((actionParam == PLAYER_AP_BEAN) && (AMMO(ITEM_BEAN) == 0)) || + (temp = Player_ActionToExplosive(this, actionParam), + ((temp >= 0) && ((AMMO(sExplosiveInfos[temp].itemId) == 0) || + (globalCtx->actorCtx.actorList[ACTORTYPE_EXPLOSIVES].length >= 3)))))) { + func_80078884(NA_SE_SY_ERROR); + return; + } + + if (actionParam == PLAYER_AP_LENS) { + if (func_80087708(globalCtx, 0, 3)) { + if (globalCtx->actorCtx.unk_03 != 0) { + func_800304B0(globalCtx); + } else { + globalCtx->actorCtx.unk_03 = 1; + } + func_80078884((globalCtx->actorCtx.unk_03 != 0) ? NA_SE_SY_GLASSMODE_ON : NA_SE_SY_GLASSMODE_OFF); + } else { + func_80078884(NA_SE_SY_ERROR); + } + return; + } + + if (actionParam == PLAYER_AP_NUT) { + if (AMMO(ITEM_NUT) != 0) { + func_8083C61C(globalCtx, this); + } else { + func_80078884(NA_SE_SY_ERROR); + } + return; + } + + temp = Player_ActionToMagicSpell(this, actionParam); + if (temp >= 0) { + if (((actionParam == PLAYER_AP_FARORES_WIND) && (gSaveContext.respawn[RESPAWN_MODE_TOP].data > 0)) || + ((gSaveContext.unk_13F4 != 0) && (gSaveContext.unk_13F0 == 0) && + (gSaveContext.magic >= sMagicSpellCosts[temp]))) { + this->itemActionParam = actionParam; + this->unk_6AD = 4; + } else { + func_80078884(NA_SE_SY_ERROR); + } + return; + } + + if (actionParam >= PLAYER_AP_MASK_KEATON) { + if (this->currentMask != PLAYER_MASK_NONE) { + this->currentMask = PLAYER_MASK_NONE; + } else { + this->currentMask = actionParam - PLAYER_AP_MASK_KEATON + 1; + } + func_808328EC(this, NA_SE_PL_CHANGE_ARMS); + return; + } + + if (((actionParam >= PLAYER_AP_OCARINA_FAIRY) && (actionParam <= PLAYER_AP_OCARINA_TIME)) || + (actionParam >= PLAYER_AP_BOTTLE_FISH)) { + if (!func_8008E9C4(this) || + ((actionParam >= PLAYER_AP_BOTTLE_POTION_RED) && (actionParam <= PLAYER_AP_BOTTLE_FAIRY))) { + func_8002D53C(globalCtx, &globalCtx->actorCtx.titleCtx); + this->unk_6AD = 4; + this->itemActionParam = actionParam; + } + return; + } + + if ((actionParam != this->heldItemActionParam) || + ((this->heldActor == 0) && (Player_ActionToExplosive(this, actionParam) >= 0))) { + this->nextModelGroup = Player_ActionToModelGroup(this, actionParam); + nextType = gPlayerModelTypes[this->nextModelGroup][0]; + if ((this->heldItemActionParam >= 0) && (Player_ActionToMagicSpell(this, actionParam) < 0) && + (item != this->heldItemId) && (D_80854164[gPlayerModelTypes[this->modelGroup][0]][nextType] != 0)) { + this->heldItemId = item; + this->stateFlags1 |= 0x100; + } else { + func_80835EFC(this); + func_808323B4(globalCtx, this); + func_80833664(globalCtx, this, actionParam); + } + return; + } + + D_80853614 = D_80853618 = true; + } + } +} + +void func_80836448(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + s32 cond = func_808332B8(this); + + func_80832564(globalCtx, this); + + func_80835C58(globalCtx, this, cond ? func_8084E368 : func_80843CEC, 0); + + this->stateFlags1 |= 0x80; + + func_80832264(globalCtx, this, anim); + if (anim == &D_04002878) { + this->skelAnime.animFrameCount = 84.0f; + } + + func_80832224(this); + func_80832698(this, NA_SE_VO_LI_DOWN); + + if (this->actor.type == ACTORTYPE_PLAYER) { + func_800F47BC(); + + if (Inventory_ConsumeFairy(globalCtx)) { + globalCtx->unk_10A20 = 20; + this->unk_84F = 1; + } else { + globalCtx->unk_10A20 = 1; + func_800F6AB0(0); + func_800F5C64(0x20); + gSaveContext.seqIndex = 0xFF; + gSaveContext.nightSeqIndex = 0xFF; + } + + func_800800F8(globalCtx, 0x264E, cond ? 120 : 60, &this->actor, 0); + ShrinkWindow_SetVal(0x20); + } +} + +s32 func_808365C8(Player* this) { + return (!(func_808458D0 == this->func_674) || + ((this->stateFlags1 & 0x100) && + ((this->heldItemId == ITEM_LAST_USED) || (this->heldItemId == ITEM_NONE)))) && + (!(func_80834A2C == this->func_82C) || + (Player_ItemToActionParam(this->heldItemId) == this->heldItemActionParam)); +} + +s32 func_80836670(Player* this, GlobalContext* globalCtx) { + if (!(this->stateFlags1 & 0x800000) && (this->actor.parent != NULL) && Player_HoldsHookshot(this)) { + func_80835C58(globalCtx, this, func_80850AEC, 1); + this->stateFlags3 |= 0x80; + func_80832264(globalCtx, this, &D_04002C90); + func_80832F54(globalCtx, this, 0x9B); + func_80832224(this); + this->currentYaw = this->actor.shape.rot.y; + this->actor.bgCheckFlags &= ~1; + this->unk_893 = 0; + this->unk_6AE |= 0x43; + func_80832698(this, NA_SE_VO_LI_LASH); + return 1; + } + + if (func_808365C8(this)) { + func_80834298(this, globalCtx); + if (func_8084E604 == this->func_674) { + return 1; + } + } + + if (!this->func_82C(this, globalCtx)) { + return 0; + } + + if (this->unk_830 != 0.0f) { + if ((func_80833350(this) == 0) || (this->linearVelocity != 0.0f)) { + SkelAnime_LoadAnimationType4(globalCtx, this->skelAnime.limbCount, this->skelAnime2.limbDrawTbl, + this->skelAnime.limbDrawTbl, D_80853410); + } + Math_ApproxF(&this->unk_830, 0.0f, 0.25f); + SkelAnime_LoadAnimationType2(globalCtx, this->skelAnime.limbCount, this->skelAnime.limbDrawTbl, + this->skelAnime2.limbDrawTbl, 1.0f - this->unk_830); + } else if ((func_80833350(this) == 0) || (this->linearVelocity != 0.0f)) { + SkelAnime_LoadAnimationType3(globalCtx, this->skelAnime.limbCount, this->skelAnime.limbDrawTbl, + this->skelAnime2.limbDrawTbl, D_80853410); + } else { + SkelAnime_LoadAnimationType1(globalCtx, this->skelAnime.limbCount, this->skelAnime.limbDrawTbl, + this->skelAnime2.limbDrawTbl); + } + + return 1; +} + +s32 func_80836898(GlobalContext* globalCtx, Player* this, PlayerFuncA74 func) { + this->func_A74 = func; + func_80835C58(globalCtx, this, func_808458D0, 0); + this->stateFlags2 |= 0x40; + return func_80832528(globalCtx, this); +} + +void func_808368EC(Player* this, GlobalContext* globalCtx) { + s16 previousYaw = this->actor.shape.rot.y; + + if (!(this->stateFlags2 & 0x60)) { + if ((this->unk_664 != NULL) && + ((globalCtx->actorCtx.targetCtx.unk_4B != 0) || (this->actor.type != ACTORTYPE_PLAYER))) { + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, + Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->unk_664->posRot2.pos), 4000); + } else if ((this->stateFlags1 & 0x20000) && !(this->stateFlags2 & 0x60)) { + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->targetYaw, 4000); + } + } else if (!(this->stateFlags2 & 0x40)) { + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->currentYaw, 2000); + } + + this->unk_87C = this->actor.shape.rot.y - previousYaw; +} + +s32 func_808369C8(s16* pValue, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5) { + s16 temp1; + s16 temp2; + s16 temp3; + + temp1 = temp2 = arg4 - *pValue; + temp2 = CLAMP(temp2, -arg5, arg5); + *pValue += (s16)(temp1 - temp2); + + Math_ApproxUpdateScaledS(pValue, arg1, arg2); + + temp3 = *pValue; + if (*pValue < -arg3) { + *pValue = -arg3; + } else if (*pValue > arg3) { + *pValue = arg3; + } + return temp3 - *pValue; +} + +s32 func_80836AB8(Player* this, s32 arg1) { + s16 sp36; + s16 var; + + var = this->actor.shape.rot.y; + if (arg1 != 0) { + var = this->actor.posRot2.rot.y; + this->unk_6BC = this->actor.posRot2.rot.x; + this->unk_6AE |= 0x41; + } else { + func_808369C8( + &this->unk_6BC, + func_808369C8(&this->unk_6B6, this->actor.posRot2.rot.x, 600, 10000, this->actor.posRot2.rot.x, 0), 200, + 4000, this->unk_6B6, 10000); + sp36 = this->actor.posRot2.rot.y - var; + func_808369C8(&sp36, 0, 200, 24000, this->unk_6BE, 8000); + var = this->actor.posRot2.rot.y - sp36; + func_808369C8(&this->unk_6B8, sp36 - this->unk_6BE, 200, 8000, sp36, 8000); + func_808369C8(&this->unk_6BE, sp36, 200, 8000, this->unk_6B8, 8000); + this->unk_6AE |= 0xD9; + } + + return var; +} + +void func_80836BEC(Player* this, GlobalContext* globalCtx) { + s32 sp1C = 0; + s32 zTrigPressed = CHECK_PAD(sControlInput->cur, Z_TRIG); + Actor* actorToTarget; + s32 pad; + s32 holdTarget; + s32 cond; + + if (!zTrigPressed) { + this->stateFlags1 &= ~0x40000000; + } + + if ((globalCtx->csCtx.state != 0) || (this->csMode != 0) || (this->stateFlags1 & 0x20000080) || + (this->stateFlags3 & 0x80)) { + this->unk_66C = 0; + } else if (zTrigPressed || (this->stateFlags2 & 0x2000) || (this->unk_684 != NULL)) { + if (this->unk_66C <= 5) { + this->unk_66C = 5; + } else { + this->unk_66C--; + } + } else if (this->stateFlags1 & 0x20000) { + this->unk_66C = 0; + } else if (this->unk_66C != 0) { + this->unk_66C--; + } + + if (this->unk_66C >= 6) { + sp1C = 1; + } + + cond = func_8083224C(globalCtx); + if (cond || (this->unk_66C != 0) || (this->stateFlags1 & 0x2001000)) { + if (!cond) { + if (!(this->stateFlags1 & 0x2000000) && + ((this->heldItemActionParam != PLAYER_AP_FISHING_POLE) || (this->unk_860 == 0)) && + CHECK_PAD(sControlInput->press, Z_TRIG)) { + + if (this->actor.type == ACTORTYPE_PLAYER) { + actorToTarget = globalCtx->actorCtx.targetCtx.arrowPointedActor; + } else { + actorToTarget = &PLAYER->actor; + } + + holdTarget = (gSaveContext.zTargetingSetting != 0) || (this->actor.type != ACTORTYPE_PLAYER); + this->stateFlags1 |= 0x8000; + + if ((actorToTarget != NULL) && !(actorToTarget->flags & 0x8000000)) { + if ((actorToTarget == this->unk_664) && (this->actor.type == ACTORTYPE_PLAYER)) { + actorToTarget = globalCtx->actorCtx.targetCtx.unk_94; + } + + if (actorToTarget != this->unk_664) { + if (!holdTarget) { + this->stateFlags2 |= 0x2000; + } + this->unk_664 = actorToTarget; + this->unk_66C = 15; + this->stateFlags2 &= ~0x200002; + } else { + if (!holdTarget) { + func_8008EDF0(this); + } + } + + this->stateFlags1 &= ~0x40000000; + } else { + if (!(this->stateFlags1 & 0x40020000)) { + func_808355DC(this); + } + } + } + + if (this->unk_664 != NULL) { + if ((this->actor.type == ACTORTYPE_PLAYER) && (this->unk_664 != this->unk_684) && + func_8002F0C8(this->unk_664, this, sp1C)) { + func_8008EDF0(this); + this->stateFlags1 |= 0x40000000; + } else if (this->unk_664 != NULL) { + this->unk_664->unk_10D = 40; + } + } else if (this->unk_684 != NULL) { + this->unk_664 = this->unk_684; + } + } + + if (this->unk_664 != NULL) { + this->stateFlags1 &= ~0x30000; + if ((this->stateFlags1 & 0x800) || ((this->unk_664->flags & 5) != 5)) { + this->stateFlags1 |= 0x10000; + } + } else { + if (this->stateFlags1 & 0x20000) { + this->stateFlags2 &= ~0x2000; + } else { + func_8008EE08(this); + } + } + } else { + func_8008EE08(this); + } +} + +s32 func_80836FAC(GlobalContext* globalCtx, Player* this, f32* arg2, s16* arg3, f32 arg4) { + f32 temp_f2; + f32 temp_f0; + f32 temp_f14; + f32 temp_f12; + + if ((this->unk_6AD != 0) || (globalCtx->sceneLoadFlag == 0x14) || (this->stateFlags1 & 1)) { + *arg2 = 0.0f; + *arg3 = this->actor.shape.rot.y; + } else { + *arg2 = D_808535D4; + *arg3 = D_808535D8; + + if (arg4 != 0.0f) { + *arg2 -= 20.0f; + if (*arg2 < 0.0f) { + *arg2 = 0.0f; + } else { + temp_f2 = 1.0f - Math_Coss(*arg2 * 450.0f); + *arg2 = ((temp_f2 * temp_f2) * 30.0f) + 7.0f; + } + } else { + *arg2 *= 0.8f; + } + + if (D_808535D4 != 0.0f) { + temp_f0 = Math_Sins(this->unk_898); + temp_f12 = this->unk_880; + temp_f14 = CLAMP(temp_f0, 0.0f, 0.6f); + + if (this->unk_6C4 != 0.0f) { + temp_f12 = temp_f12 - (this->unk_6C4 * 0.008f); + if (temp_f12 < 2.0f) { + temp_f12 = 2.0f; + } + } + + *arg2 = (*arg2 * 0.14f) - (8.0f * temp_f14 * temp_f14); + *arg2 = CLAMP(*arg2, 0.0f, temp_f12); + + return 1; + } + } + + return 0; +} + +s32 func_8083721C(Player* this) { + return Math_ApproxF(&this->linearVelocity, 0.0f, REG(43) / 100.0f); +} + +s32 func_80837268(Player* this, f32* arg1, s16* arg2, f32 arg3, GlobalContext* globalCtx) { + if (!func_80836FAC(globalCtx, this, arg1, arg2, arg3)) { + *arg2 = this->actor.shape.rot.y; + + if (this->unk_664 != NULL) { + if ((globalCtx->actorCtx.targetCtx.unk_4B != 0) && !(this->stateFlags2 & 0x40)) { + *arg2 = Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->unk_664->posRot2.pos); + return 0; + } + } else if (func_80833B2C(this)) { + *arg2 = this->targetYaw; + } + + return 0; + } else { + *arg2 += func_8005A948(ACTIVE_CAM); + return 1; + } +} + +s8 D_808543E0[] = { 13, 2, 4, 9, 10, 11, 8, -7 }; +s8 D_808543E8[] = { 13, 1, 2, 5, 3, 4, 9, 10, 11, 7, 8, -6 }; +s8 D_808543F4[] = { 13, 1, 2, 3, 4, 9, 10, 11, 8, 7, -6 }; +s8 D_80854400[] = { 13, 2, 4, 9, 10, 11, 8, -7 }; +s8 D_80854408[] = { 13, 2, 4, 9, 10, 11, 12, 8, -7 }; +s8 D_80854414[] = { -7 }; +s8 D_80854418[] = { 0, 11, 1, 2, 3, 5, 4, 9, 8, 7, -6 }; +s8 D_80854424[] = { 0, 11, 1, 2, 3, 12, 5, 4, 9, 8, 7, -6 }; +s8 D_80854430[] = { 13, 1, 2, 3, 12, 5, 4, 9, 10, 11, 8, 7, -6 }; +s8 D_80854440[] = { 10, 8, -7 }; +s8 D_80854444[] = { 0, 12, 5, -4 }; + +s32 (*D_80854448[])(Player* this, GlobalContext* globalCtx) = { + func_8083B998, func_80839800, func_8083E5A8, func_8083E0FC, func_8083B644, func_8083F7BC, func_8083C1DC, + func_80850224, func_8083C544, func_8083EB44, func_8083BDBC, func_8083C2B0, func_80838A14, func_8083B040, +}; + +s32 func_80837348(GlobalContext* globalCtx, Player* this, s8* arg2, s32 arg3) { + s32 i; + + if (!(this->stateFlags1 & 0x20000081)) { + if (arg3 != 0) { + D_808535E0 = func_80836670(this, globalCtx); + if (func_8084E604 == this->func_674) { + return 1; + } + } + + if (func_8008F128(this)) { + this->unk_6AE |= 0x41; + return 1; + } + + if (!(this->stateFlags1 & 0x100) && (func_80834A2C != this->func_82C)) { + while (*arg2 >= 0) { + if (D_80854448[*arg2](this, globalCtx)) { + return 1; + } + arg2++; + } + + if (D_80854448[-(*arg2)](this, globalCtx)) { + return 1; + } + } + } + + return 0; +} + +s32 func_808374A0(GlobalContext* globalCtx, Player* this, SkelAnime* skelAnime, f32 arg3) { + f32 sp24; + s16 sp22; + + if ((skelAnime->animFrameCount - arg3) <= skelAnime->animCurrentFrame) { + if (func_80837348(globalCtx, this, D_80854418, 1)) { + return 0; + } + + if (func_80837268(this, &sp24, &sp22, 0.018f, globalCtx)) { + return 1; + } + } + + return -1; +} + +void func_80837530(GlobalContext* globalCtx, Player* this, s32 arg2) { + if (arg2 != 0) { + this->unk_858 = 0.0f; + } else { + this->unk_858 = 0.5f; + } + + this->stateFlags1 |= 0x1000; + + if (this->actor.type == ACTORTYPE_PLAYER) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_M_THUNDER, this->bodyPartsPos[0].x, + this->bodyPartsPos[0].y, this->bodyPartsPos[0].z, 0, 0, 0, Player_GetSwordHeld(this) | arg2); + } +} + +s32 func_808375D8(Player* this) { + s8 sp3C[4]; + s8* iter; + s8* iter2; + s8 temp1; + s8 temp2; + s32 i; + + if ((this->heldItemActionParam == PLAYER_AP_STICK) || Player_HoldsBrokenKnife(this)) { + return 0; + } + + iter = &this->unk_847[0]; + iter2 = &sp3C[0]; + for (i = 0; i < 4; i++, iter++, iter2++) { + if ((*iter2 = *iter) < 0) { + return 0; + } + *iter2 *= 2; + } + + temp1 = sp3C[0] - sp3C[1]; + if (ABS(temp1) < 10) { + return 0; + } + + iter2 = &sp3C[1]; + for (i = 1; i < 3; i++, iter2++) { + temp2 = *iter2 - *(iter2 + 1); + if ((ABS(temp2) < 10) || (temp2 * temp1 < 0)) { + return 0; + } + } + + return 1; +} + +void func_80837704(GlobalContext* globalCtx, Player* this) { + LinkAnimetionEntry* anim; + + if ((this->swordAnimation >= 4) && (this->swordAnimation < 8)) { + anim = D_80854358[Player_HoldsTwoHandedWeapon(this)]; + } else { + anim = D_80854350[Player_HoldsTwoHandedWeapon(this)]; + } + + func_80832318(this); + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, anim, 1.0f, 8.0f, + SkelAnime_GetFrameCount(&anim->genericHeader), 2, -9.0f); + func_80837530(globalCtx, this, 0x200); +} + +void func_808377DC(GlobalContext* globalCtx, Player* this) { + func_80835C58(globalCtx, this, func_80844E68, 1); + func_80837704(globalCtx, this); +} + +s8 D_80854480[] = { 12, 4, 4, 8 }; +s8 D_80854484[] = { 22, 23, 22, 23 }; + +s32 func_80837818(Player* this) { + s32 sp1C = this->unk_84B[this->unk_846]; + s32 sp18; + + if (this->heldItemActionParam == PLAYER_AP_HAMMER) { + if (sp1C < 0) { + sp1C = 0; + } + sp18 = D_80854484[sp1C]; + this->unk_845 = 0; + } else { + if (func_808375D8(this)) { + sp18 = 24; + } else { + if (sp1C < 0) { + if (func_80833BCC(this)) { + sp18 = 0; + } else { + sp18 = 4; + } + } else { + sp18 = D_80854480[sp1C]; + if (sp18 == 12) { + this->stateFlags2 |= 0x40000000; + if (!func_80833BCC(this)) { + sp18 = 0; + } + } + } + if (this->heldItemActionParam == PLAYER_AP_STICK) { + sp18 = 0; + } + } + if (Player_HoldsTwoHandedWeapon(this)) { + sp18++; + } + } + + return sp18; +} + +void func_80837918(Player* this, s32 quadIndex, u32 flags) { + this->swordQuads[quadIndex].body.toucher.flags = flags; + + if (flags == 2) { + this->swordQuads[quadIndex].body.toucherFlags = 0x15; + } else { + this->swordQuads[quadIndex].body.toucherFlags = 5; + } +} + +u32 D_80854488[][2] = { + { 0x00000200, 0x08000000 }, { 0x00000100, 0x02000000 }, { 0x00000400, 0x04000000 }, + { 0x00000002, 0x08000000 }, { 0x00000040, 0x40000000 }, +}; + +void func_80837948(GlobalContext* globalCtx, Player* this, s32 arg2) { + s32 pad; + u32 flags; + s32 temp; + + func_80835C58(globalCtx, this, func_808502D0, 0); + this->unk_844 = 8; + if ((arg2 < 18) || (arg2 >= 20)) { + func_80832318(this); + } + + if ((arg2 != this->swordAnimation) || !(this->unk_845 < 3)) { + this->unk_845 = 0; + } + + this->unk_845++; + if (this->unk_845 >= 3) { + arg2 += 2; + } + + this->swordAnimation = arg2; + + func_808322D0(globalCtx, this, D_80854190[arg2].unk_00); + if ((arg2 != 16) && (arg2 != 17)) { + func_80832F54(globalCtx, this, 0x209); + } + + this->currentYaw = this->actor.shape.rot.y; + + if (Player_HoldsBrokenKnife(this)) { + temp = 1; + } else { + temp = Player_GetSwordHeld(this) - 1; + } + + if ((arg2 >= 16) && (arg2 < 20)) { + flags = D_80854488[temp][1]; + } else { + flags = D_80854488[temp][0]; + } + + func_80837918(this, 0, flags); + func_80837918(this, 1, flags); +} + +void func_80837AE0(Player* this, s32 timer) { + if (this->invincibilityTimer >= 0) { + this->invincibilityTimer = timer; + this->unk_88F = 0; + } +} + +void func_80837AFC(Player* this, s32 timer) { + if (this->invincibilityTimer > timer) { + this->invincibilityTimer = timer; + } + this->unk_88F = 0; +} + +s32 func_80837B18(GlobalContext* globalCtx, Player* this, s32 damage) { + if ((this->invincibilityTimer != 0) || (this->actor.type != ACTORTYPE_PLAYER)) { + return 1; + } + + return Health_ChangeBy(globalCtx, damage); +} + +void func_80837B60(Player* this) { + this->skelAnime.prevFramePos = this->skelAnime.limbDrawTbl[0]; + func_80832E48(this, 3); +} + +void func_80837B9C(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_8084411C, 0); + func_80832284(globalCtx, this, &D_04003040); + this->unk_850 = 1; + if (this->unk_6AD != 3) { + this->unk_6AD = 0; + } +} + +LinkAnimetionEntry* D_808544B0[] = { + 0x04002F80, 0x04002F78, 0x04002DE0, 0x04002DD8, 0x04002F70, 0x04002528, 0x04002DC8, 0x040024F0, +}; + +void func_80837C0C(GlobalContext* globalCtx, Player* this, s32 arg2, f32 arg3, f32 arg4, s16 arg5, s32 arg6) { + LinkAnimetionEntry* sp2C = NULL; + LinkAnimetionEntry** sp28; + + if (this->stateFlags1 & 0x2000) { + func_80837B60(this); + } + + this->unk_890 = 0; + + func_8002F7DC(&this->actor, NA_SE_PL_DAMAGE); + + if (!func_80837B18(globalCtx, this, 0 - this->actor.colChkInfo.damage)) { + this->stateFlags2 &= ~0x80; + if (!(this->actor.bgCheckFlags & 1) && !(this->stateFlags1 & 0x8000000)) { + func_80837B9C(this, globalCtx); + } + return; + } + + func_80837AE0(this, arg6); + + if (arg2 == 3) { + func_80835C58(globalCtx, this, func_8084FB10, 0); + + sp2C = &D_04002FD0; + + func_80832224(this); + func_8083264C(this, 255, 10, 40, 0); + + func_8002F7DC(&this->actor, NA_SE_PL_FREEZE_S); + func_80832698(this, NA_SE_VO_LI_FREEZE); + } else if (arg2 == 4) { + func_80835C58(globalCtx, this, func_8084FBF4, 0); + + func_8083264C(this, 255, 80, 150, 0); + + func_808322A4(globalCtx, this, &D_04002F00); + func_80832224(this); + + this->unk_850 = 20; + } else { + arg5 -= this->actor.shape.rot.y; + if (this->stateFlags1 & 0x8000000) { + func_80835C58(globalCtx, this, func_8084E30C, 0); + func_8083264C(this, 180, 20, 50, 0); + + this->linearVelocity = 4.0f; + this->actor.velocity.y = 0.0f; + + sp2C = &D_04003320; + + func_80832698(this, NA_SE_VO_LI_DAMAGE_S); + } else if ((arg2 == 1) || (arg2 == 2) || !(this->actor.bgCheckFlags & 1) || (this->stateFlags1 & 0x206000)) { + func_80835C58(globalCtx, this, func_8084377C, 0); + + this->stateFlags3 |= 2; + + func_8083264C(this, 255, 20, 150, 0); + func_80832224(this); + + if (arg2 == 2) { + this->unk_850 = 4; + + this->actor.speedXZ = 3.0f; + this->linearVelocity = 3.0f; + this->actor.velocity.y = 6.0f; + + func_80832C2C(globalCtx, this, D_8085395C[this->modelAnimType]); + func_80832698(this, NA_SE_VO_LI_DAMAGE_S); + } else { + this->actor.speedXZ = arg3; + this->linearVelocity = arg3; + this->actor.velocity.y = arg4; + + if (ABS(arg5) > 0x4000) { + sp2C = &D_04002F58; + } else { + sp2C = &D_04002DB0; + } + + if ((this->actor.type != ACTORTYPE_PLAYER) && (this->actor.colChkInfo.health == 0)) { + func_80832698(this, NA_SE_VO_BL_DOWN); + } else { + func_80832698(this, NA_SE_VO_LI_FALL_L); + } + } + + this->unk_893 = 0; + this->actor.bgCheckFlags &= ~1; + } else { + if ((this->linearVelocity > 4.0f) && !func_8008E9C4(this)) { + this->unk_890 = 20; + func_8083264C(this, 120, 20, 10, 0); + func_80832698(this, NA_SE_VO_LI_DAMAGE_S); + return; + } + + sp28 = D_808544B0; + + func_80835C58(globalCtx, this, func_8084370C, 0); + func_80833C3C(this); + + if (this->actor.colChkInfo.damage < 5) { + func_8083264C(this, 120, 20, 10, 0); + } else { + func_8083264C(this, 180, 20, 100, 0); + this->linearVelocity = 23.0f; + sp28 += 4; + } + + if (ABS(arg5) <= 0x4000) { + sp28 += 2; + } + + if (func_8008E9C4(this)) { + sp28 += 1; + } + + sp2C = *sp28; + + func_80832698(this, NA_SE_VO_LI_DAMAGE_S); + } + + this->actor.shape.rot.y += arg5; + this->currentYaw = this->actor.shape.rot.y; + this->actor.posRot.rot.y = this->actor.shape.rot.y; + if (ABS(arg5) > 0x4000) { + this->actor.shape.rot.y += 0x8000; + } + } + + func_80832564(globalCtx, this); + + this->stateFlags1 |= 0x4000000; + + if (sp2C != NULL) { + func_808322D0(globalCtx, this, sp2C); + } +} + +s32 func_80838144(s32 arg0) { + s32 temp = arg0 - 2; + + if ((temp >= 0) && (temp < 2)) { + return temp; + } else { + return -1; + } +} + +s32 func_8083816C(s32 arg0) { + return (arg0 == 4) || (arg0 == 7) || (arg0 == 12); +} + +void func_8083819C(Player* this, GlobalContext* globalCtx) { + if (this->currentShield == PLAYER_SHIELD_DEKU) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_ITEM_SHIELD, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 1); + Inventory_DeleteEquipment(globalCtx, EQUIP_SHIELD); + func_8010B680(globalCtx, 0x305F, NULL); // "Your shield is gone!" + } +} + +void func_8083821C(Player* this) { + s32 i; + + // clang-format off + for (i = 0; i < 18; i++) { this->flameTimers[i] = Math_Rand_S16Offset(0, 200); } + // clang-format on + + this->isBurning = true; +} + +void func_80838280(Player* this) { + if (this->actor.colChkInfo.acHitEffect == 1) { + func_8083821C(this); + } + func_80832698(this, NA_SE_VO_LI_FALL_L); +} + +void func_808382BC(Player* this) { + if ((this->invincibilityTimer >= 0) && (this->invincibilityTimer < 20)) { + this->invincibilityTimer = 20; + } +} + +s32 func_808382DC(Player* this, GlobalContext* globalCtx) { + s32 pad; + s32 sp68 = false; + s32 sp64; + + if (this->unk_A86 != 0) { + if (!Player_InBlockingCsMode(globalCtx, this)) { + Player_InflictDamage(globalCtx, -16); + this->unk_A86 = 0; + } + } else { + sp68 = ((Player_GetCameraYOffset(this) - 8.0f) < (this->unk_6C4 * this->actor.scale.y)); + + if (sp68 || (this->actor.bgCheckFlags & 0x100) || (D_808535E4 == 9) || (this->stateFlags2 & 0x80000000)) { + func_80832698(this, NA_SE_VO_LI_DAMAGE_S); + + if (sp68) { + Gameplay_TriggerRespawn(globalCtx); + func_800994A0(globalCtx); + } else { + // Special case for getting crushed in Forest Temple's Checkboard Ceiling Hall or Shadow Temple's + // Falling Spike Trap Room, to respawn the player in a specific place + if (((globalCtx->sceneNum == SCENE_BMORI1) && (globalCtx->roomCtx.curRoom.num == 15)) || + ((globalCtx->sceneNum == SCENE_HAKADAN) && (globalCtx->roomCtx.curRoom.num == 10))) { + static SpecialRespawnInfo checkboardCeilingRespawn = { { 1992.0f, 403.0f, -3432.0f }, 0 }; + static SpecialRespawnInfo fallingSpikeTrapRespawn = { { 1200.0f, -1343.0f, 3850.0f }, 0 }; + SpecialRespawnInfo* respawnInfo; + + if (globalCtx->sceneNum == SCENE_BMORI1) { + respawnInfo = &checkboardCeilingRespawn; + } else { + respawnInfo = &fallingSpikeTrapRespawn; + } + + Gameplay_SetupRespawnPoint(globalCtx, RESPAWN_MODE_DOWN, 0xDFF); + gSaveContext.respawn[RESPAWN_MODE_DOWN].pos = respawnInfo->pos; + gSaveContext.respawn[RESPAWN_MODE_DOWN].yaw = respawnInfo->yaw; + } + + Gameplay_TriggerVoidOut(globalCtx); + } + + func_80832698(this, NA_SE_VO_LI_TAKEN_AWAY); + globalCtx->unk_11DE9 = 1; + func_80078884(NA_SE_OC_ABYSS); + } else if ((this->unk_8A1 != 0) && ((this->unk_8A1 >= 2) || (this->invincibilityTimer == 0))) { + u8 sp5C[] = { 2, 1, 1 }; + + func_80838280(this); + + if (this->unk_8A1 == 3) { + this->shockTimer = 40; + } + + this->actor.colChkInfo.damage += this->unk_8A0; + func_80837C0C(globalCtx, this, sp5C[this->unk_8A1 - 1], this->unk_8A4, this->unk_8A8, this->unk_8A2, 20); + } else { + sp64 = (this->shieldQuad.base.acFlags & 0x80) != 0; + + // @bug The second set of conditions here seems intended as a way for Link to "block" hits by rolling. + // However, `ColliderBody.atFlags` is a byte so the flag check at the end is incorrect and cannot work. + // Additionally, `ColliderBody.atHit` can never be set while already colliding as AC, so it's also bugged. + // This behavior was later fixed in MM, most likely by removing both the `atHit` and `atFlags` checks. + if (sp64 || ((this->invincibilityTimer < 0) && (this->cylinder.base.acFlags & 2) && + (this->cylinder.body.atHit != NULL) && (this->cylinder.body.atHit->atFlags & 0x20000000))) { + + func_8083264C(this, 180, 20, 100, 0); + + if (!Player_IsChildWithHylianShield(this)) { + if (this->invincibilityTimer >= 0) { + LinkAnimetionEntry* anim; + s32 sp54 = func_80843188 == this->func_674; + + if (!func_808332B8(this)) { + func_80835C58(globalCtx, this, func_808435C4, 0); + } + + if (!(this->unk_84F = sp54)) { + func_80833638(this, func_80834BD4); + + if (this->unk_870 < 0.5f) { + anim = D_808543BC[Player_HoldsTwoHandedWeapon(this)]; + } else { + anim = D_808543B4[Player_HoldsTwoHandedWeapon(this)]; + } + SkelAnime_ChangeLinkAnimDefaultStop(globalCtx, &this->skelAnime2, anim); + } else { + func_80832264(globalCtx, this, D_808543C4[Player_HoldsTwoHandedWeapon(this)]); + } + } + + if (!(this->stateFlags1 & 0x206000)) { + this->linearVelocity = -18.0f; + this->currentYaw = this->actor.shape.rot.y; + } + } + + if (sp64 && (this->shieldQuad.body.acHitItem->toucher.effect == 1)) { + func_8083819C(this, globalCtx); + } + + return 0; + } + + if ((this->unk_A87 != 0) || (this->invincibilityTimer > 0) || (this->stateFlags1 & 0x4000000) || + (this->csMode != 0) || (this->swordQuads[0].base.atFlags & 2) || + (this->swordQuads[1].base.atFlags & 2)) { + return 0; + } + + if (this->cylinder.base.acFlags & 2) { + Actor* ac = this->cylinder.base.ac; + s32 sp4C; + + if (ac->flags & 0x1000000) { + func_8002F7DC(&this->actor, NA_SE_PL_BODY_HIT); + } + + if (this->stateFlags1 & 0x8000000) { + sp4C = 0; + } else if (this->actor.colChkInfo.acHitEffect == 2) { + sp4C = 3; + } else if (this->actor.colChkInfo.acHitEffect == 3) { + sp4C = 4; + } else if (this->actor.colChkInfo.acHitEffect == 4) { + sp4C = 1; + } else { + func_80838280(this); + sp4C = 0; + } + + func_80837C0C(globalCtx, this, sp4C, 4.0f, 5.0f, func_8002DA78(ac, &this->actor), 20); + } else if (this->invincibilityTimer != 0) { + return 0; + } else { + static u8 D_808544F4[] = { 120, 60 }; + s32 sp48 = func_80838144(D_808535E4); + + if (((this->actor.wallPoly != NULL) && + func_80042108(&globalCtx->colCtx, this->actor.wallPoly, this->actor.wallPolySource)) || + ((sp48 >= 0) && + func_80042108(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource) && + (this->unk_A79 >= D_808544F4[sp48])) || + ((sp48 >= 0) && + ((this->currentTunic != PLAYER_TUNIC_GORON) || (this->unk_A79 >= D_808544F4[sp48])))) { + this->unk_A79 = 0; + this->actor.colChkInfo.damage = 4; + func_80837C0C(globalCtx, this, 0, 4.0f, 5.0f, this->actor.shape.rot.y, 20); + } else { + return 0; + } + } + } + } + + return 1; +} + +void func_80838940(Player* this, LinkAnimetionEntry* anim, f32 arg2, GlobalContext* globalCtx, u16 sfxId) { + func_80835C58(globalCtx, this, func_8084411C, 1); + + if (anim != NULL) { + func_808322D0(globalCtx, this, anim); + } + + this->actor.velocity.y = arg2 * D_808535E8; + this->unk_893 = 0; + this->actor.bgCheckFlags &= ~1; + + func_80832854(this); + func_80832698(this, sfxId); + + this->stateFlags1 |= 0x40000; +} + +void func_808389E8(Player* this, LinkAnimetionEntry* anim, f32 arg2, GlobalContext* globalCtx) { + func_80838940(this, anim, arg2, globalCtx, NA_SE_VO_LI_SWORD_N); +} + +s32 func_80838A14(Player* this, GlobalContext* globalCtx) { + s32 sp3C; + LinkAnimetionEntry* sp38; + f32 sp34; + f32 temp; + f32 sp2C; + f32 sp28; + f32 sp24; + + if (!(this->stateFlags1 & 0x800) && (this->unk_88C >= 2) && + (!(this->stateFlags1 & 0x8000000) || (this->ageProperties->unk_14 > this->wallHeight))) { + sp3C = 0; + + if (func_808332B8(this)) { + if (this->actor.waterY < 50.0f) { + if ((this->unk_88C < 2) || (this->wallHeight > this->ageProperties->unk_10)) { + return 0; + } + } else if ((this->currentBoots != PLAYER_BOOTS_IRON) || (this->unk_88C > 2)) { + return 0; + } + } else if (!(this->actor.bgCheckFlags & 1) || + ((this->ageProperties->unk_14 <= this->wallHeight) && (this->stateFlags1 & 0x8000000))) { + return 0; + } + + if ((this->actor.wallPolySource != 50) && (D_808535F0 & 0x40)) { + if (this->unk_88D >= 6) { + this->stateFlags2 |= 4; + if (CHECK_PAD(sControlInput->press, A_BUTTON)) { + sp3C = 1; + } + } + } else if ((this->unk_88D >= 6) || CHECK_PAD(sControlInput->press, A_BUTTON)) { + sp3C = 1; + } + + if (sp3C != 0) { + func_80835C58(globalCtx, this, func_80845668, 0); + + this->stateFlags1 |= 0x40000; + + sp34 = this->wallHeight; + + if (this->ageProperties->unk_14 <= sp34) { + sp38 = &D_04002D48; + this->linearVelocity = 1.0f; + } else { + sp2C = this->actor.wallPoly->norm.x * (1.0f / 32767.0f); + sp28 = this->actor.wallPoly->norm.z * (1.0f / 32767.0f); + sp24 = this->wallDistance + 0.5f; + + this->stateFlags1 |= 0x4000; + + if (func_808332B8(this)) { + sp38 = &D_040032E8; + sp34 -= (60.0f * this->ageProperties->unk_08); + this->stateFlags1 &= ~0x8000000; + } else if (this->ageProperties->unk_18 <= sp34) { + sp38 = &D_04002D40; + sp34 -= (59.0f * this->ageProperties->unk_08); + } else { + sp38 = &D_04002D38; + sp34 -= (41.0f * this->ageProperties->unk_08); + } + + this->actor.shape.unk_08 -= sp34 * 100.0f; + + this->actor.posRot.pos.x -= sp24 * sp2C; + this->actor.posRot.pos.y += this->wallHeight; + this->actor.posRot.pos.z -= sp24 * sp28; + + func_80832224(this); + } + + this->actor.bgCheckFlags |= 1; + + SkelAnime_ChangeLinkAnimPlaybackStop(globalCtx, &this->skelAnime, sp38, 1.3f); + func_800A3310(globalCtx); + + this->actor.shape.rot.y = this->currentYaw = this->actor.wallPolyRot + 0x8000; + + return 1; + } + } else if ((this->actor.bgCheckFlags & 1) && (this->unk_88C == 1) && (this->unk_88D >= 3)) { + temp = (this->wallHeight * 0.08f) + 5.5f; + func_808389E8(this, &D_04002FE0, temp, globalCtx); + this->linearVelocity = 2.5f; + + return 1; + } + + return 0; +} + +void func_80838E70(GlobalContext* globalCtx, Player* this, f32 arg2, s16 arg3) { + func_80835C58(globalCtx, this, func_80845CA4, 0); + func_80832440(globalCtx, this); + + this->unk_84F = 1; + this->unk_850 = 1; + + this->unk_450.x = (Math_Sins(arg3) * arg2) + this->actor.posRot.pos.x; + this->unk_450.z = (Math_Coss(arg3) * arg2) + this->actor.posRot.pos.z; + + func_80832264(globalCtx, this, func_80833338(this)); +} + +void func_80838F18(GlobalContext* globalCtx, Player* this) { + func_80835C58(globalCtx, this, func_8084D610, 0); + func_80832C6C(globalCtx, this, &D_04003328); +} + +void func_80838F5C(GlobalContext* globalCtx, Player* this) { + func_80835C58(globalCtx, this, func_8084F88C, 0); + + this->stateFlags1 |= 0xA0000000; + + func_8005A77C(Gameplay_GetCamera(globalCtx, 0), 0x21); +} + +s32 func_80838FB8(GlobalContext* globalCtx, Player* this) { + if ((globalCtx->sceneLoadFlag == 0) && (this->stateFlags1 & 0x80000000)) { + func_80838F5C(globalCtx, this); + func_80832284(globalCtx, this, &D_04003040); + func_80832698(this, NA_SE_VO_LI_FALL_S); + func_800788CC(NA_SE_OC_SECRET_WARP_IN); + return 1; + } + + return 0; +} + +s16 D_808544F8[] = { + 0x045B, 0x0482, 0x0340, 0x044B, 0x02A2, 0x0201, 0x03B8, 0x04EE, 0x03C0, 0x0463, 0x01CD, 0x0394, 0x0340, 0x057C, +}; + +u8 D_80854514[] = { 11, 9, 3, 5, 7 }; + +s32 func_80839034(GlobalContext* globalCtx, Player* this, CollisionPoly* arg2, u32 arg3) { + s32 sp3C; + s32 temp; + s32 sp34; + f32 linearVel; + s32 yaw; + + if (1) {} + + if (this->actor.type == ACTORTYPE_PLAYER) { + sp3C = 0; + + if (!(this->stateFlags1 & 0x80) && (globalCtx->sceneLoadFlag == 0) && (this->csMode == 0) && + !(this->stateFlags1 & 1) && + (((arg2 != NULL) && (sp3C = func_80041D28(&globalCtx->colCtx, arg2, arg3), sp3C != 0)) || + (func_8083816C(D_808535E4) && (this->unk_A7A == 12)))) { + + sp34 = this->unk_A84 - (s32)this->actor.posRot.pos.y; + + if (!(this->stateFlags1 & 0x28800000) && !(this->actor.bgCheckFlags & 1) && (sp34 < 100) && + (D_80853600 > 100.0f)) { + return 0; + } + + if (sp3C == 0) { + Gameplay_TriggerVoidOut(globalCtx); + func_800994A0(globalCtx); + } else { + globalCtx->nextEntranceIndex = globalCtx->setupExitList[sp3C - 1]; + if (globalCtx->nextEntranceIndex == 0x7FFF) { + gSaveContext.respawnFlag = 2; + globalCtx->nextEntranceIndex = gSaveContext.respawn[RESPAWN_MODE_RETURN].entranceIndex; + globalCtx->fadeTransition = 3; + gSaveContext.nextTransition = 3; + } else if (globalCtx->nextEntranceIndex >= 0x7FF9) { + globalCtx->nextEntranceIndex = + D_808544F8[D_80854514[globalCtx->nextEntranceIndex - 0x7FF9] + globalCtx->curSpawn]; + func_800994A0(globalCtx); + } else { + if (func_80041F7C(&globalCtx->colCtx, arg2, arg3) == 2) { + gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex = globalCtx->nextEntranceIndex; + Gameplay_TriggerVoidOut(globalCtx); + gSaveContext.respawnFlag = -2; + } + gSaveContext.unk_13C3 = 1; + func_800994A0(globalCtx); + } + globalCtx->sceneLoadFlag = 0x14; + } + + if (!(this->stateFlags1 & 0x20800000) && !(this->stateFlags2 & 0x40000) && !func_808332B8(this) && + (temp = func_80041D4C(&globalCtx->colCtx, arg2, arg3), (temp != 10)) && + ((sp34 < 100) || (this->actor.bgCheckFlags & 1))) { + + if (temp == 11) { + func_800788CC(NA_SE_OC_SECRET_HOLE_OUT); + func_800F6964(5); + gSaveContext.seqIndex = 0xFF; + gSaveContext.nightSeqIndex = 0xFF; + } else { + linearVel = this->linearVelocity; + + if (linearVel < 0.0f) { + this->actor.posRot.rot.y += 0x8000; + linearVel = -linearVel; + } + + if (linearVel > R_RUN_SPEED_LIMIT / 100.0f) { + gSaveContext.unk_13BC = R_RUN_SPEED_LIMIT / 100.0f; + } else { + gSaveContext.unk_13BC = linearVel; + } + + if (D_808535F4 != 0) { + yaw = D_808535FC; + } else { + yaw = this->actor.posRot.rot.y; + } + func_80838E70(globalCtx, this, 400.0f, yaw); + } + } else { + if (!(this->actor.bgCheckFlags & 1)) { + func_80832210(this); + } + } + + this->stateFlags1 |= 0x20000001; + + func_80835E44(globalCtx, 0x2F); + + return 1; + } else { + if (globalCtx->sceneLoadFlag == 0) { + + if ((this->actor.posRot.pos.y < -4000.0f) || + (((this->unk_A7A == 5) || (this->unk_A7A == 12)) && + ((D_80853600 < 100.0f) || (this->fallDistance > 400.0f) || + ((globalCtx->sceneNum != SCENE_HAKADAN) && (this->fallDistance > 200.0f)))) || + ((globalCtx->sceneNum == SCENE_GANON_FINAL) && (this->fallDistance > 320.0f))) { + + if (this->actor.bgCheckFlags & 1) { + if (this->unk_A7A == 5) { + Gameplay_TriggerRespawn(globalCtx); + } else { + Gameplay_TriggerVoidOut(globalCtx); + } + globalCtx->fadeTransition = 4; + func_80078884(NA_SE_OC_ABYSS); + } else { + func_80838F5C(globalCtx, this); + this->unk_850 = 9999; + if (this->unk_A7A == 5) { + this->unk_84F = -1; + } else { + this->unk_84F = 1; + } + } + } + + this->unk_A84 = this->actor.posRot.pos.y; + } + } + } + + return 0; +} + +void func_808395DC(Player* this, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3) { + f32 cos = Math_Coss(this->actor.shape.rot.y); + f32 sin = Math_Sins(this->actor.shape.rot.y); + + arg3->x = arg1->x + ((arg2->x * cos) + (arg2->z * sin)); + arg3->y = arg1->y + arg2->y; + arg3->z = arg1->z + ((arg2->z * cos) - (arg2->x * sin)); +} + +Actor* func_80839680(GlobalContext* globalCtx, Player* this, Vec3f* arg2, Vec3f* arg3, s32 type) { + Vec3f pos; + + func_808395DC(this, arg2, arg3, &pos); + + return Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, pos.x, pos.y, pos.z, 0, 0, 0, type); +} + +f32 func_808396F4(GlobalContext* globalCtx, Player* this, Vec3f* arg2, Vec3f* arg3, CollisionPoly** arg4, s32* arg5) { + func_808395DC(this, &this->actor.posRot.pos, arg2, arg3); + + func_8003C940(&globalCtx->colCtx, arg4, arg5, arg3); +} + +f32 func_8083973C(GlobalContext* globalCtx, Player* this, Vec3f* arg2, Vec3f* arg3) { + CollisionPoly* sp24; + s32 sp20; + + return func_808396F4(globalCtx, this, arg2, arg3, &sp24, &sp20); +} + +s32 func_80839768(GlobalContext* globalCtx, Player* this, Vec3f* arg2, CollisionPoly** arg3, u32* arg4, Vec3f* arg5) { + Vec3f sp44; + Vec3f sp38; + + sp44.x = this->actor.posRot.pos.x; + sp44.y = this->actor.posRot.pos.y + arg2->y; + sp44.z = this->actor.posRot.pos.z; + + func_808395DC(this, &this->actor.posRot.pos, arg2, &sp38); + + return func_8003DE84(&globalCtx->colCtx, &sp44, &sp38, arg5, arg3, 1, 0, 0, 1, arg4); +} + +s32 func_80839800(Player* this, GlobalContext* globalCtx) { + DoorShutter* doorShutter; + EnDoor* enDoor; + s32 sp7C; + f32 sp78; + f32 sp74; + Actor* doorActor; + f32 sp6C; + s32 pad3; + s32 frontRoom; + Actor* attachedActor; + LinkAnimetionEntry* sp5C; + CollisionPoly* sp58; + Vec3f sp4C; + + if ((this->doorType != 0) && + (!(this->stateFlags1 & 0x800) || ((this->heldActor != NULL) && (this->heldActor->id == ACTOR_EN_RU1)))) { + if (CHECK_PAD(sControlInput->press, A_BUTTON) || (func_8084F9A0 == this->func_674)) { + doorActor = this->doorActor; + + if (this->doorType < 0) { + doorActor->textId = 0xD0; // "It won't open!" + func_80853148(globalCtx, doorActor); + return 0; + } + + sp7C = this->doorDirection; + sp78 = Math_Coss(doorActor->shape.rot.y); + sp74 = Math_Sins(doorActor->shape.rot.y); + + if (this->doorType == 2) { + doorShutter = (DoorShutter*)doorActor; + + this->currentYaw = doorShutter->actor.initPosRot.rot.y; + if (sp7C > 0) { + this->currentYaw -= 0x8000; + } + this->actor.shape.rot.y = this->currentYaw; + + if (this->linearVelocity <= 0.0f) { + this->linearVelocity = 0.1f; + } + + func_80838E70(globalCtx, this, 50.0f, this->actor.shape.rot.y); + + this->unk_84F = 0; + this->unk_447 = this->doorType; + this->stateFlags1 |= 0x20000000; + + this->unk_450.x = this->actor.posRot.pos.x + ((sp7C * 20.0f) * sp74); + this->unk_450.z = this->actor.posRot.pos.z + ((sp7C * 20.0f) * sp78); + this->unk_45C.x = this->actor.posRot.pos.x + ((sp7C * -120.0f) * sp74); + this->unk_45C.z = this->actor.posRot.pos.z + ((sp7C * -120.0f) * sp78); + + doorShutter->unk_164 = 1; + func_80832224(this); + + if (this->doorTimer != 0) { + this->unk_850 = 0; + func_80832B0C(globalCtx, this, func_80833338(this)); + this->skelAnime.animFrameCount = 0.0f; + } else { + this->linearVelocity = 0.1f; + } + + if (doorShutter->actor.type == ACTORTYPE_DOOR) { + this->unk_46A = globalCtx->transitionActorList[(u16)doorShutter->actor.params >> 10] + .sides[(sp7C > 0) ? 0 : 1] + .effects; + + func_800304B0(globalCtx); + } + } else { + enDoor = (EnDoor*)doorActor; + + enDoor->unk_190 = (sp7C < 0.0f) ? ((LINK_IS_ADULT) ? 0 : 1) : ((LINK_IS_ADULT) ? 2 : 3); + + if (enDoor->unk_190 == 0) { + sp5C = D_808539EC[this->modelAnimType]; + } else if (enDoor->unk_190 == 1) { + sp5C = D_80853A04[this->modelAnimType]; + } else if (enDoor->unk_190 == 2) { + sp5C = D_80853A1C[this->modelAnimType]; + } else { + sp5C = D_80853A34[this->modelAnimType]; + } + + func_80835C58(globalCtx, this, func_80845EF8, 0); + func_80832528(globalCtx, this); + + if (sp7C < 0) { + this->actor.shape.rot.y = doorActor->shape.rot.y; + } else { + this->actor.shape.rot.y = doorActor->shape.rot.y - 0x8000; + } + + this->currentYaw = this->actor.shape.rot.y; + + sp6C = (sp7C * 22.0f); + this->actor.posRot.pos.x = doorActor->posRot.pos.x + sp6C * sp74; + this->actor.posRot.pos.z = doorActor->posRot.pos.z + sp6C * sp78; + + func_8083328C(globalCtx, this, sp5C); + + if (this->doorTimer != 0) { + this->skelAnime.animFrameCount = 0.0f; + } + + func_80832224(this); + func_80832F54(globalCtx, this, 0x28F); + + if (doorActor->parent != NULL) { + sp7C = -sp7C; + } + + enDoor->unk_191 = 1; + + if (this->doorType != 3) { + this->stateFlags1 |= 0x20000000; + func_800304B0(globalCtx); + + if (((doorActor->params >> 7) & 7) == 3) { + sp4C.x = doorActor->posRot.pos.x - (sp6C * sp74); + sp4C.y = doorActor->posRot.pos.y + 10.0f; + sp4C.z = doorActor->posRot.pos.z - (sp6C * sp78); + + func_8003C890(&globalCtx->colCtx, &sp58, &sp4C); + + if (func_80839034(globalCtx, this, sp58, 50)) { + gSaveContext.unk_13BC = 2.0f; + gSaveContext.unk_13C0 = NA_SE_OC_DOOR_OPEN; + } + } else { + func_8005AD40(Gameplay_GetCamera(globalCtx, 0), doorActor, + globalCtx->transitionActorList[(u16)doorActor->params >> 10] + .sides[(sp7C > 0) ? 0 : 1] + .effects, + 0, 38.0f * D_808535EC, 26.0f * D_808535EC, 10.0f * D_808535EC); + } + } + } + + if ((this->doorType != 3) && (doorActor->type == ACTORTYPE_DOOR)) { + frontRoom = globalCtx->transitionActorList[(u16)doorActor->params >> 10].sides[(sp7C > 0) ? 0 : 1].room; + + if ((frontRoom >= 0) && (frontRoom != globalCtx->roomCtx.curRoom.num)) { + func_8009728C(globalCtx, &globalCtx->roomCtx, frontRoom); + } + } + + doorActor->room = globalCtx->roomCtx.curRoom.num; + + if (((attachedActor = doorActor->child) != NULL) || ((attachedActor = doorActor->parent) != NULL)) { + attachedActor->room = globalCtx->roomCtx.curRoom.num; + } + + return 1; + } + } + + return 0; +} + +void func_80839E88(Player* this, GlobalContext* globalCtx) { + LinkAnimetionEntry* anim; + + func_80835C58(globalCtx, this, func_80840450, 1); + + if (this->unk_870 < 0.5f) { + anim = func_808334E4(this); + this->unk_870 = 0.0f; + } else { + anim = func_80833528(this); + this->unk_870 = 1.0f; + } + + this->unk_874 = this->unk_870; + func_80832284(globalCtx, this, anim); + this->currentYaw = this->actor.shape.rot.y; +} + +void func_80839F30(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_808407CC, 1); + func_80832B0C(globalCtx, this, func_80833338(this)); + this->currentYaw = this->actor.shape.rot.y; +} + +void func_80839F90(Player* this, GlobalContext* globalCtx) { + if (func_8008E9C4(this)) { + func_80839E88(this, globalCtx); + } else if (func_80833B2C(this)) { + func_80839F30(this, globalCtx); + } else { + func_80853080(this, globalCtx); + } +} + +void func_80839FFC(Player* this, GlobalContext* globalCtx) { + PlayerFunc674 func; + + if (func_8008E9C4(this)) { + func = func_80840450; + } else if (func_80833B2C(this)) { + func = func_808407CC; + } else { + func = func_80840BC8; + } + + func_80835C58(globalCtx, this, func, 1); +} + +void func_8083A060(Player* this, GlobalContext* globalCtx) { + func_80839FFC(this, globalCtx); + if (func_8008E9C4(this)) { + this->unk_850 = 1; + } +} + +void func_8083A098(Player* this, LinkAnimetionEntry* anim, GlobalContext* globalCtx) { + func_8083A060(this, globalCtx); + func_8083328C(globalCtx, this, anim); +} + +s32 func_8083A0D4(Player* this) { + return (this->interactRangeActor != NULL) && (this->heldActor == NULL); +} + +void func_8083A0F4(GlobalContext* globalCtx, Player* this) { + if (func_8083A0D4(this)) { + Actor* interactRangeActor = this->interactRangeActor; + s32 interactActorId = interactRangeActor->id; + + if (interactActorId == ACTOR_BG_TOKI_SWD) { + this->interactRangeActor->parent = &this->actor; + func_80835C58(globalCtx, this, func_8084F608, 0); + this->stateFlags1 |= 0x20000000; + } else { + LinkAnimetionEntry* anim; + + if (interactActorId == ACTOR_BG_HEAVY_BLOCK) { + func_80835C58(globalCtx, this, func_80846120, 0); + this->stateFlags1 |= 0x20000000; + anim = &D_04002F98; + } else if ((interactActorId == ACTOR_EN_ISHI) && ((interactRangeActor->params & 0xF) == 1)) { + func_80835C58(globalCtx, this, func_80846260, 0); + anim = &D_040032B0; + } else if (((interactActorId == ACTOR_EN_BOMBF) || (interactActorId == ACTOR_EN_KUSA)) && + (Player_GetStrength() <= PLAYER_STR_NONE)) { + func_80835C58(globalCtx, this, func_80846408, 0); + this->actor.posRot.pos.x = + (Math_Sins(interactRangeActor->yawTowardsLink) * 20.0f) + interactRangeActor->posRot.pos.x; + this->actor.posRot.pos.z = + (Math_Coss(interactRangeActor->yawTowardsLink) * 20.0f) + interactRangeActor->posRot.pos.z; + this->currentYaw = this->actor.shape.rot.y = interactRangeActor->yawTowardsLink + 0x8000; + anim = &D_04003060; + } else { + func_80835C58(globalCtx, this, func_80846050, 0); + anim = D_80853A4C[this->modelAnimType]; + } + + func_80832264(globalCtx, this, anim); + } + } else { + func_80839F90(this, globalCtx); + this->stateFlags1 &= ~0x800; + } +} + +void func_8083A2F8(GlobalContext* globalCtx, Player* this) { + func_80835DAC(globalCtx, this, func_8084B530, 0); + + this->stateFlags1 |= 0x20000040; + + if (this->actor.textId != 0) { + func_8010B680(globalCtx, this->actor.textId, this->targetActor); + this->unk_664 = this->targetActor; + } +} + +void func_8083A360(GlobalContext* globalCtx, Player* this) { + func_80835DAC(globalCtx, this, func_8084CC98, 0); +} + +void func_8083A388(GlobalContext* globalCtx, Player* this) { + func_80835C58(globalCtx, this, func_8084B78C, 0); +} + +void func_8083A3B0(GlobalContext* globalCtx, Player* this) { + s32 sp1C = this->unk_850; + s32 sp18 = this->unk_84F; + + func_80835DAC(globalCtx, this, func_8084BF1C, 0); + this->actor.velocity.y = 0.0f; + + this->unk_850 = sp1C; + this->unk_84F = sp18; +} + +void func_8083A40C(GlobalContext* globalCtx, Player* this) { + func_80835DAC(globalCtx, this, func_8084C760, 0); +} + +void func_8083A434(GlobalContext* globalCtx, Player* this) { + func_80835DAC(globalCtx, this, func_8084E6D4, 0); + + this->stateFlags1 |= 0x20000400; + + if (this->getItemId == GI_HEART_CONTAINER_2) { + this->unk_850 = 20; + } else if (this->getItemId >= 0) { + this->unk_850 = 1; + } else { + this->getItemId = -this->getItemId; + } +} + +s32 func_8083A4A8(Player* this, GlobalContext* globalCtx) { + s16 yawDiff; + LinkAnimetionEntry* anim; + f32 temp; + + yawDiff = this->currentYaw - this->actor.shape.rot.y; + + if ((ABS(yawDiff) < 0x1000) && (this->linearVelocity > 4.0f)) { + anim = &D_04003148; + } else { + anim = &D_04002FE0; + } + + if (this->linearVelocity > (IREG(66) / 100.0f)) { + temp = IREG(67) / 100.0f; + } else { + temp = (IREG(68) / 100.0f) + ((IREG(69) * this->linearVelocity) / 1000.0f); + } + + func_80838940(this, anim, temp, globalCtx, NA_SE_VO_LI_AUTO_JUMP); + this->unk_850 = 1; + + return 1; +} + +void func_8083A5C4(GlobalContext* globalCtx, Player* this, CollisionPoly* arg2, f32 arg3, LinkAnimetionEntry* arg4) { + f32 sp24 = arg2->norm.x * (1.0f / 32767.0f); + f32 sp20 = arg2->norm.z * (1.0f / 32767.0f); + + func_80835C58(globalCtx, this, func_8084BBE4, 0); + func_80832564(globalCtx, this); + func_80832264(globalCtx, this, arg4); + + this->actor.posRot.pos.x -= (arg3 + 1.0f) * sp24; + this->actor.posRot.pos.z -= (arg3 + 1.0f) * sp20; + this->actor.shape.rot.y = this->currentYaw = atan2s(sp20, sp24); + + func_80832224(this); + func_80832CFC(this); +} + +s32 func_8083A6AC(Player* this, GlobalContext* globalCtx) { + CollisionPoly* sp84; + u32 sp80; + Vec3f sp74; + Vec3f sp68; + f32 temp1; + + if ((this->actor.waterY < -80.0f) && (ABS(this->unk_898) < 2730) && (ABS(this->unk_89A) < 2730)) { + sp74.x = this->actor.pos4.x - this->actor.posRot.pos.x; + sp74.z = this->actor.pos4.z - this->actor.posRot.pos.z; + + temp1 = sqrtf(SQ(sp74.x) + SQ(sp74.z)); + if (temp1 != 0.0f) { + temp1 = 5.0f / temp1; + } else { + temp1 = 0.0f; + } + + sp74.x = this->actor.pos4.x + (sp74.x * temp1); + sp74.y = this->actor.posRot.pos.y; + sp74.z = this->actor.pos4.z + (sp74.z * temp1); + + if (func_8003DE84(&globalCtx->colCtx, &this->actor.posRot.pos, &sp74, &sp68, &sp84, 1, 0, 0, 1, &sp80) && + (ABS(sp84->norm.y) < 600)) { + f32 nx = sp84->norm.x * (1.0f / 32767.0f); + f32 ny = sp84->norm.y * (1.0f / 32767.0f); + f32 nz = sp84->norm.z * (1.0f / 32767.0f); + f32 sp54; + s32 sp50; + + sp54 = Math3D_UDistPlaneToPos(nx, ny, nz, sp84->dist, &this->actor.posRot.pos); + + sp50 = D_80853604 == 6; + if (!sp50 && (func_80041DB8(&globalCtx->colCtx, sp84, sp80) & 8)) { + sp50 = 1; + } + + func_8083A5C4(globalCtx, this, sp84, sp54, sp50 ? &D_04002D88 : &D_04002F10); + + if (sp50) { + func_80836898(globalCtx, this, func_8083A3B0); + + this->currentYaw += 0x8000; + this->actor.shape.rot.y = this->currentYaw; + + this->stateFlags1 |= 0x200000; + func_80832F54(globalCtx, this, 0x9F); + + this->unk_850 = -1; + this->unk_84F = sp50; + } else { + this->stateFlags1 |= 0x2000; + this->stateFlags1 &= ~0x20000; + } + + func_8002F7DC(&this->actor, NA_SE_PL_SLIPDOWN); + func_80832698(this, NA_SE_VO_LI_HANG); + return 1; + } + } + + return 0; +} + +void func_8083A9B8(Player* this, LinkAnimetionEntry* anim, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_8084BDFC, 0); + SkelAnime_ChangeLinkAnimPlaybackStop(globalCtx, &this->skelAnime, anim, 1.3f); +} + +Vec3f D_8085451C = { 0.0f, 0.0f, 100.0f }; + +void func_8083AA10(Player* this, GlobalContext* globalCtx) { + s32 sp5C; + CollisionPoly* sp58; + s32 sp54; + UNK_TYPE sp50; + Vec3f sp44; + f32 sp40; + f32 sp3C; + + this->fallDistance = this->fallStartHeight - (s32)this->actor.posRot.pos.y; + + if (!(this->stateFlags1 & 0x28000000) && !(this->actor.bgCheckFlags & 1)) { + if (!func_80838FB8(globalCtx, this)) { + if (D_80853604 == 8) { + this->actor.posRot.pos.x = this->actor.pos4.x; + this->actor.posRot.pos.z = this->actor.pos4.z; + return; + } + + if (!(this->stateFlags3 & 2) && !(this->skelAnime.flags & 0x80) && (func_8084411C != this->func_674) && + (func_80844A44 != this->func_674)) { + + if ((D_80853604 == 7) || (this->swordState != 0)) { + Math_Vec3f_Copy(&this->actor.posRot.pos, &this->actor.pos4); + func_80832210(this); + return; + } + + if (this->unk_893 != 0) { + this->actor.velocity.y = 1.0f; + D_80853604 = 9; + return; + } + + sp5C = (s16)(this->currentYaw - this->actor.shape.rot.y); + + func_80835C58(globalCtx, this, func_8084411C, 1); + func_80832440(globalCtx, this); + + this->unk_89E = this->unk_A82; + + if ((this->actor.bgCheckFlags & 4) && !(this->stateFlags1 & 0x8000000) && (D_80853604 != 6) && + (D_80853604 != 9) && (D_80853600 > 20.0f) && (this->swordState == 0) && (ABS(sp5C) < 0x2000) && + (this->linearVelocity > 3.0f)) { + + if ((D_80853604 == 11) && !(this->stateFlags1 & 0x800)) { + + sp40 = func_808396F4(globalCtx, this, &D_8085451C, &sp44, &sp58, &sp54); + sp3C = this->actor.posRot.pos.y; + + if (func_8004213C(globalCtx, &globalCtx->colCtx, sp44.x, sp44.z, &sp3C, &sp50) && + ((sp3C - sp40) > 50.0f)) { + func_808389E8(this, &D_04003158, 6.0f, globalCtx); + func_80835C58(globalCtx, this, func_80844A44, 0); + return; + } + } + + func_8083A4A8(this, globalCtx); + return; + } + + if ((D_80853604 == 9) || (D_80853600 <= this->ageProperties->unk_34) || + !func_8083A6AC(this, globalCtx)) { + func_80832284(globalCtx, this, &D_04003040); + return; + } + } + } + } else { + this->fallStartHeight = this->actor.posRot.pos.y; + } +} + +s32 func_8083AD4C(GlobalContext* globalCtx, Player* this) { + s32 sp1C; + + if (this->unk_6AD == 2) { + if (func_8002DD6C(this)) { + if (LINK_IS_ADULT) { + sp1C = 7; + } else { + sp1C = 11; + } + } else { + sp1C = 10; + } + } else { + sp1C = 6; + } + + return func_8005A444(Gameplay_GetCamera(globalCtx, 0), sp1C); +} + +s32 func_8083ADD4(GlobalContext* globalCtx, Player* this) { + if (this->unk_6AD == 3) { + func_80835C58(globalCtx, this, func_80852E14, 0); + if (this->unk_46A != 0) { + this->stateFlags1 |= 0x20000000; + } + func_80832318(this); + return 1; + } else { + return 0; + } +} + +void func_8083AE40(Player* this, s16 objectId) { + s32 pad; + u32 size; + + if (objectId != 0) { + this->giObjectLoading = true; + osCreateMesgQueue(&this->giObjectLoadQueue, &this->giObjectLoadMsg, 1); + + size = gObjectTable[objectId].vromEnd - gObjectTable[objectId].vromStart; + + LOG_HEX("size", size, "../z_player.c", 9090); + + if (size > 1024 * 8) { + __assert("size <= 1024 * 8", "../z_player.c", 9091); + } + + if (gObjectTable[objectId].vromEnd) {} + + DmaMgr_SendRequest2(&this->giObjectDmaRequest, (u32)this->giObjectSegment, gObjectTable[objectId].vromStart, + size, 0, &this->giObjectLoadQueue, NULL, "../z_player.c", 9099); + } +} + +void func_8083AF44(GlobalContext* globalCtx, Player* this, s32 magicSpell) { + func_80835DE4(globalCtx, this, func_808507F4, 0); + + this->unk_84F = magicSpell - 3; + func_80087708(globalCtx, sMagicSpellCosts[magicSpell], 4); + + SkelAnime_ChangeLinkAnimPlaybackStop(globalCtx, &this->skelAnime, &D_04002D28, 0.83f); + + if (magicSpell == 5) { + this->unk_46C = func_800800F8(globalCtx, 1100, -101, NULL, 0); + } else { + func_80835EA4(globalCtx, 10); + } +} + +void func_8083B010(Player* this) { + this->actor.posRot2.rot.x = this->actor.posRot2.rot.z = this->unk_6B6 = this->unk_6B8 = this->unk_6BA = + this->unk_6BC = this->unk_6BE = this->unk_6C0 = 0; + + this->actor.posRot2.rot.y = this->actor.shape.rot.y; +} + +u8 D_80854528[] = { + GI_LETTER_ZELDA, GI_WEIRD_EGG, GI_CHICKEN, GI_BEAN, GI_POCKET_EGG, GI_POCKET_CUCCO, + GI_COJIRO, GI_ODD_MUSHROOM, GI_ODD_POTION, GI_SAW, GI_SWORD_BROKEN, GI_PRESCRIPTION, + GI_FROG, GI_EYEDROPS, GI_CLAIM_CHECK, GI_MASK_SKULL, GI_MASK_SPOOKY, GI_MASK_KEATON, + GI_MASK_BUNNY, GI_MASK_TRUTH, GI_MASK_GORON, GI_MASK_ZORA, GI_MASK_GERUDO, GI_LETTER_RUTO, + GI_LETTER_RUTO, GI_LETTER_RUTO, GI_LETTER_RUTO, GI_LETTER_RUTO, GI_LETTER_RUTO, +}; + +LinkAnimetionEntry* D_80854548[] = { + 0x04002F88, + 0x04002690, + 0x04003198, +}; + +s32 func_8083B040(Player* this, GlobalContext* globalCtx) { + s32 sp2C; + s32 sp28; + GetItemEntry* giEntry; + Actor* targetActor; + + if ((this->unk_6AD != 0) && + (func_808332B8(this) || (this->actor.bgCheckFlags & 1) || (this->stateFlags1 & 0x800000))) { + + if (!func_8083ADD4(globalCtx, this)) { + if (this->unk_6AD == 4) { + sp2C = Player_ActionToMagicSpell(this, this->itemActionParam); + if (sp2C >= 0) { + if ((sp2C != 3) || (gSaveContext.respawn[RESPAWN_MODE_TOP].data <= 0)) { + func_8083AF44(globalCtx, this, sp2C); + } else { + func_80835C58(globalCtx, this, func_8085063C, 1); + this->stateFlags1 |= 0x30000000; + func_80832264(globalCtx, this, func_80833338(this)); + func_80835EA4(globalCtx, 4); + } + + func_80832224(this); + return 1; + } + + sp2C = this->itemActionParam - PLAYER_AP_LETTER_ZELDA; + if ((sp2C >= 0) || + (sp28 = Player_ActionToBottle(this, this->itemActionParam) - 1, + ((sp28 >= 0) && (sp28 < 6) && + ((this->itemActionParam > PLAYER_AP_BOTTLE_POE) || + ((this->targetActor != NULL) && + (((this->itemActionParam == PLAYER_AP_BOTTLE_POE) && (this->exchangeItemId == EXCH_ITEM_POE)) || + (this->exchangeItemId == EXCH_ITEM_BLUE_FIRE))))))) { + + if ((globalCtx->actorCtx.titleCtx.delayB == 0) && (globalCtx->actorCtx.titleCtx.unk_C == 0)) { + func_80835DE4(globalCtx, this, func_8084F104, 0); + + if (sp2C >= 0) { + giEntry = &sGetItemTable[D_80854528[sp2C] - 1]; + func_8083AE40(this, giEntry->objectId); + } + + this->stateFlags1 |= 0x30000040; + + if (sp2C >= 0) { + sp2C = sp2C + 1; + } else { + sp2C = sp28 + 0x18; + } + + targetActor = this->targetActor; + + if ((targetActor != NULL) && + ((this->exchangeItemId == sp2C) || (this->exchangeItemId == EXCH_ITEM_BLUE_FIRE) || + ((this->exchangeItemId == EXCH_ITEM_POE) && + (this->itemActionParam == PLAYER_AP_BOTTLE_BIG_POE)) || + ((this->exchangeItemId == EXCH_ITEM_BEAN) && + (this->itemActionParam == PLAYER_AP_BOTTLE_BUG))) && + ((this->exchangeItemId != EXCH_ITEM_BEAN) || (this->itemActionParam == PLAYER_AP_BEAN))) { + if (this->exchangeItemId == EXCH_ITEM_BEAN) { + Inventory_ChangeAmmo(ITEM_BEAN, -1); + func_80835DE4(globalCtx, this, func_8084279C, 0); + this->stateFlags1 |= 0x20000000; + this->unk_850 = 0x50; + this->unk_84F = -1; + } + targetActor->flags |= 0x100; + this->unk_664 = this->targetActor; + } else if (sp2C == EXCH_ITEM_LETTER_RUTO) { + this->unk_84F = 1; + this->actor.textId = 0x4005; // "There is something already inside this bottle..." + func_80835EA4(globalCtx, 1); + } else { + this->unk_84F = 2; + this->actor.textId = 0xCF; // "This item doesn't work here..." + func_80835EA4(globalCtx, 4); + } + + this->actor.flags |= 0x100; + this->exchangeItemId = sp2C; + + if (this->unk_84F < 0) { + func_80832B0C(globalCtx, this, D_80853C14[this->modelAnimType]); + } else { + func_80832264(globalCtx, this, D_80854548[this->unk_84F]); + } + + func_80832224(this); + } + return 1; + } + + sp2C = Player_ActionToBottle(this, this->itemActionParam); + if (sp2C >= 0) { + if (sp2C == 0xC) { + func_80835DE4(globalCtx, this, func_8084EED8, 0); + func_808322D0(globalCtx, this, &D_04002650); + func_80835EA4(globalCtx, 3); + } else if ((sp2C > 0) && (sp2C < 4)) { + func_80835DE4(globalCtx, this, func_8084EFC0, 0); + func_808322D0(globalCtx, this, &D_04002688); + func_80835EA4(globalCtx, (sp2C == 1) ? 1 : 5); + } else { + func_80835DE4(globalCtx, this, func_8084EAC0, 0); + func_80832B78(globalCtx, this, &D_04002668); + func_80835EA4(globalCtx, 2); + } + } else { + func_80835DE4(globalCtx, this, func_8084E3C4, 0); + func_808322D0(globalCtx, this, &D_040030A0); + this->stateFlags2 |= 0x8000000; + func_80835EA4(globalCtx, (this->unk_6A8 != NULL) ? 0x5B : 0x5A); + if (this->unk_6A8 != NULL) { + this->stateFlags2 |= 0x2000000; + Camera_SetParam(Gameplay_GetCamera(globalCtx, 0), 8, this->unk_6A8); + } + } + } else if (func_8083AD4C(globalCtx, this)) { + if (!(this->stateFlags1 & 0x800000)) { + func_80835C58(globalCtx, this, func_8084B1D8, 1); + this->unk_850 = 13; + func_8083B010(this); + } + this->stateFlags1 |= 0x100000; + func_80078884(NA_SE_SY_CAMERA_ZOOM_UP); + func_80832210(this); + return 1; + } else { + this->unk_6AD = 0; + func_80078884(NA_SE_SY_ERROR); + return 0; + } + + this->stateFlags1 |= 0x30000000; + } + + func_80832224(this); + return 1; + } + + return 0; +} + +s32 func_8083B644(Player* this, GlobalContext* globalCtx) { + Actor* sp34 = this->targetActor; + Actor* sp30 = this->unk_664; + Actor* sp2C = NULL; + s32 sp28 = 0; + s32 sp24; + + 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 (sp28 || !sp24) { + sp2C = this->naviActor; + if (sp28) { + sp30 = NULL; + sp34 = NULL; + } + } else { + sp2C = sp30; + } + } + + if ((sp34 != NULL) || (sp2C != NULL)) { + if ((sp30 == NULL) || (sp30 == sp34) || (sp30 == sp2C)) { + if (!(this->stateFlags1 & 0x800) || + ((this->heldActor != NULL) && (sp28 || (sp34 == this->heldActor) || (sp2C == this->heldActor) || + ((sp34 != NULL) && (sp34->flags & 0x10000))))) { + if ((this->actor.bgCheckFlags & 1) || (this->stateFlags1 & 0x800000) || + (func_808332B8(this) && !(this->stateFlags2 & 0x400))) { + + if (sp34 != NULL) { + this->stateFlags2 |= 2; + if (CHECK_PAD(sControlInput->press, A_BUTTON) || (sp34->flags & 0x10000)) { + sp2C = NULL; + } else if (sp2C == NULL) { + return 0; + } + } + + if (sp2C != NULL) { + if (!sp28) { + this->stateFlags2 |= 0x200000; + } + + if (!CHECK_PAD(sControlInput->press, U_CBUTTONS) && !sp28) { + return 0; + } + + sp34 = sp2C; + this->targetActor = NULL; + + if (sp28 || !sp24) { + if (this->naviMessageId >= 0) { + sp2C->textId = this->naviMessageId; + } else { + sp2C->textId = -this->naviMessageId; + } + } else { + if (sp2C->naviEnemyId != 0xFF) { + sp2C->textId = sp2C->naviEnemyId + 0x600; + } + } + } + + this->currentMask = D_80858AA4; + func_80853148(globalCtx, sp34); + return 1; + } + } + } + } + + return 0; +} + +s32 func_8083B8F4(Player* this, GlobalContext* globalCtx) { + if (!(this->stateFlags1 & 0x800800) && func_8005A470(Gameplay_GetCamera(globalCtx, 0), 6)) { + if ((this->actor.bgCheckFlags & 1) || + (func_808332B8(this) && (this->actor.waterY < this->ageProperties->unk_2C))) { + this->unk_6AD = 1; + return 1; + } + } + + return 0; +} + +s32 func_8083B998(Player* this, GlobalContext* globalCtx) { + if (this->unk_6AD != 0) { + func_8083B040(this, globalCtx); + return 1; + } + + 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_PAD(sControlInput->press, U_CBUTTONS) && + (YREG(15) != 0x10) && (YREG(15) != 0x20) && !func_8083B8F4(this, globalCtx)) { + func_80078884(NA_SE_SY_ERROR); + } + + return 0; +} + +void func_8083BA90(GlobalContext* globalCtx, Player* this, s32 arg2, f32 xzVelocity, f32 yVelocity) { + func_80837948(globalCtx, this, arg2); + func_80835C58(globalCtx, this, func_80844AF4, 0); + + this->stateFlags3 |= 2; + + this->currentYaw = this->actor.shape.rot.y; + this->linearVelocity = xzVelocity; + this->actor.velocity.y = yVelocity; + + this->actor.bgCheckFlags &= ~1; + this->unk_893 = 0; + + func_80832854(this); + func_80832698(this, NA_SE_VO_LI_SWORD_L); +} + +s32 func_8083BB20(Player* this) { + if (!(this->stateFlags1 & 0x400000) && (Player_GetSwordHeld(this) != 0)) { + if (D_80853614 || ((this->actor.type != ACTORTYPE_PLAYER) && CHECK_PAD(sControlInput->press, B_BUTTON))) { + return 1; + } + } + + return 0; +} + +s32 func_8083BBA0(Player* this, GlobalContext* globalCtx) { + if (func_8083BB20(this) && (D_808535E4 != 7)) { + func_8083BA90(globalCtx, this, 17, 3.0f, 4.5f); + return 1; + } + + return 0; +} + +void func_8083BC04(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_80844708, 0); + SkelAnime_ChangeLinkAnimPlaybackStop(globalCtx, &this->skelAnime, D_80853A94[this->modelAnimType], + 1.25f * D_808535E8); +} + +s32 func_8083BC7C(Player* this, GlobalContext* globalCtx) { + if ((this->unk_84B[this->unk_846] == 0) && (D_808535E4 != 7)) { + func_8083BC04(this, globalCtx); + return 1; + } + + return 0; +} + +void func_8083BCD0(Player* this, GlobalContext* globalCtx, s32 arg2) { + func_80838940(this, D_80853D4C[arg2][0], !(arg2 & 1) ? 5.8f : 3.5f, globalCtx, NA_SE_VO_LI_SWORD_N); + + if (arg2) {} + + this->unk_850 = 1; + this->unk_84F = arg2; + + this->currentYaw = this->actor.shape.rot.y + (arg2 << 0xE); + this->linearVelocity = !(arg2 & 1) ? 6.0f : 8.5f; + + this->stateFlags2 |= 0x80000; + + func_8002F7DC(&this->actor, ((arg2 << 0xE) == 0x8000) ? NA_SE_PL_ROLL : NA_SE_PL_SKIP); +} + +s32 func_8083BDBC(Player* this, GlobalContext* globalCtx) { + s32 sp2C; + + if (CHECK_PAD(sControlInput->press, A_BUTTON) && (globalCtx->roomCtx.curRoom.unk_03 != 2) && (D_808535E4 != 7) && + (func_80041F7C(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource) != 1)) { + sp2C = this->unk_84B[this->unk_846]; + + if (sp2C <= 0) { + if (func_80833BCC(this)) { + if (this->actor.type != ACTORTYPE_PLAYER) { + if (sp2C < 0) { + func_808389E8(this, &D_04002FE0, REG(69) / 100.0f, globalCtx); + } else { + func_8083BC04(this, globalCtx); + } + } else { + if (Player_GetSwordHeld(this) && func_808365C8(this)) { + func_8083BA90(globalCtx, this, 17, 5.0f, 5.0f); + } else { + func_8083BC04(this, globalCtx); + } + } + return 1; + } + } else { + func_8083BCD0(this, globalCtx, sp2C); + return 1; + } + } + + return 0; +} + +void func_8083BF50(Player* this, GlobalContext* globalCtx) { + LinkAnimetionEntry* anim; + f32 sp30; + + sp30 = this->unk_868 - 3.0f; + if (sp30 < 0.0f) { + sp30 += 29.0f; + } + + if (sp30 < 14.0f) { + anim = D_80853AC4[this->modelAnimType]; + sp30 = 11.0f - sp30; + if (sp30 < 0.0f) { + sp30 = 1.375f * -sp30; + } + sp30 /= 11.0f; + } else { + anim = D_80853ADC[this->modelAnimType]; + sp30 = 26.0f - sp30; + if (sp30 < 0.0f) { + sp30 = 2 * -sp30; + } + sp30 /= 12.0f; + } + + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, anim, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&anim->genericHeader), 2, 4.0f * sp30); + this->currentYaw = this->actor.shape.rot.y; +} + +void func_8083C0B8(Player* this, GlobalContext* globalCtx) { + func_80839FFC(this, globalCtx); + func_8083BF50(this, globalCtx); +} + +void func_8083C0E8(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_80840BC8, 1); + func_80832264(globalCtx, this, func_80833338(this)); + this->currentYaw = this->actor.shape.rot.y; +} + +void func_8083C148(Player* this, GlobalContext* globalCtx) { + if (!(this->stateFlags3 & 0x80)) { + func_8083B010(this); + if (this->stateFlags1 & 0x8000000) { + func_80838F18(globalCtx, this); + } else { + func_80839F90(this, globalCtx); + } + if (this->unk_6AD < 4) { + this->unk_6AD = 0; + } + } + + this->stateFlags1 &= ~0x106000; +} + +s32 func_8083C1DC(Player* this, GlobalContext* globalCtx) { + if (!func_80833B54(this) && (D_808535E0 == 0) && !(this->stateFlags1 & 0x800000) && + CHECK_PAD(sControlInput->press, A_BUTTON)) { + if (func_8083BC7C(this, globalCtx)) { + return 1; + } + if ((this->unk_837 == 0) && (this->heldItemActionParam >= PLAYER_AP_SWORD_MASTER)) { + func_80835F44(globalCtx, this, ITEM_NONE); + } else { + this->stateFlags2 ^= 0x100000; + } + } + + return 0; +} + +s32 func_8083C2B0(Player* this, GlobalContext* globalCtx) { + LinkAnimetionEntry* anim; + f32 frame; + + if ((globalCtx->unk_11E5C == 0) && (this->currentShield != PLAYER_SHIELD_NONE) && + CHECK_PAD(sControlInput->cur, R_TRIG) && + (Player_IsChildWithHylianShield(this) || (!func_80833B2C(this) && (this->unk_664 == NULL)))) { + + func_80832318(this); + func_808323B4(globalCtx, this); + + if (func_80835C58(globalCtx, this, func_80843188, 0)) { + this->stateFlags1 |= 0x400000; + + if (!Player_IsChildWithHylianShield(this)) { + Player_SetModelsForHoldingShield(this); + anim = D_80853AF4[this->modelAnimType]; + } else { + anim = &D_04002400; + } + + if (anim != this->skelAnime.linkAnimetionSeg) { + if (func_8008E9C4(this)) { + this->unk_86C = 1.0f; + } else { + this->unk_86C = 0.0f; + func_80833C3C(this); + } + this->unk_6BC = this->unk_6BE = this->unk_6C0 = 0; + } + + frame = SkelAnime_GetFrameCount(&anim->genericHeader); + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, anim, 1.0f, frame, frame, 2, 0.0f); + + if (Player_IsChildWithHylianShield(this)) { + func_80832F54(globalCtx, this, 4); + } + + func_8002F7DC(&this->actor, NA_SE_IT_SHIELD_POSTURE); + } + + return 1; + } + + return 0; +} + +s32 func_8083C484(Player* this, f32* arg1, s16* arg2) { + s16 yaw = this->currentYaw - *arg2; + + if (ABS(yaw) > 0x6000) { + if (func_8083721C(this)) { + *arg1 = 0.0f; + *arg2 = this->currentYaw; + } else { + return 1; + } + } + + return 0; +} + +void func_8083C50C(Player* this) { + if ((this->unk_844 > 0) && !CHECK_PAD(sControlInput->cur, B_BUTTON)) { + this->unk_844 = -this->unk_844; + } +} + +s32 func_8083C544(Player* this, GlobalContext* globalCtx) { + if (CHECK_PAD(sControlInput->cur, B_BUTTON)) { + if (!(this->stateFlags1 & 0x400000) && (Player_GetSwordHeld(this) != 0) && (this->unk_844 == 1) && + (this->heldItemActionParam != PLAYER_AP_STICK)) { + if ((this->heldItemActionParam != PLAYER_AP_SWORD_BGS) || (gSaveContext.swordHealth > 0.0f)) { + func_808377DC(globalCtx, this); + return 1; + } + } + } else { + func_8083C50C(this); + } + + return 0; +} + +s32 func_8083C61C(GlobalContext* globalCtx, Player* this) { + if ((globalCtx->roomCtx.curRoom.unk_03 != 2) && (this->actor.bgCheckFlags & 1) && (AMMO(ITEM_NUT) != 0)) { + func_80835C58(globalCtx, this, func_8084E604, 0); + func_80832264(globalCtx, this, &D_04003048); + this->unk_6AD = 0; + return 1; + } + + return 0; +} + +struct_80854554 D_80854554[] = { + { 0x04002648, 0x04002640, 2, 3 }, + { 0x04002680, 0x04002678, 5, 3 }, +}; + +s32 func_8083C6B8(GlobalContext* globalCtx, Player* this) { + Vec3f sp24; + + if (D_80853614) { + if (Player_GetBottleHeld(this) >= 0) { + func_80835C58(globalCtx, this, func_8084ECA4, 0); + + if (this->actor.waterY > 12.0f) { + this->unk_850 = 1; + } + + func_808322D0(globalCtx, this, D_80854554[this->unk_850].unk_00); + + func_8002F7DC(&this->actor, NA_SE_IT_SWORD_SWING); + func_80832698(this, NA_SE_VO_LI_AUTO_JUMP); + return 1; + } + + if (this->heldItemActionParam == PLAYER_AP_FISHING_POLE) { + sp24 = this->actor.posRot.pos; + sp24.y += 50.0f; + + if (!(this->actor.bgCheckFlags & 1) || (this->actor.posRot.pos.z > 1300.0f) || + func_8003E30C(&globalCtx->colCtx, &sp24, 20.0f)) { + func_80078884(NA_SE_SY_ERROR); + return 0; + } + + func_80835C58(globalCtx, this, func_80850C68, 0); + this->unk_860 = 1; + func_80832210(this); + func_80832264(globalCtx, this, &D_04002C30); + return 1; + } else { + return 0; + } + } + + return 0; +} + +void func_8083C858(Player* this, GlobalContext* globalCtx) { + PlayerFunc674 func; + + if (func_80833BCC(this)) { + func = func_8084227C; + } else { + func = func_80842180; + } + + func_80835C58(globalCtx, this, func, 1); + func_80832BE8(globalCtx, this, D_80853944[this->modelAnimType]); + + this->unk_89C = 0; + this->unk_864 = this->unk_868 = 0.0f; +} + +void func_8083C8DC(Player* this, GlobalContext* globalCtx, s16 arg2) { + this->actor.shape.rot.y = this->currentYaw = arg2; + func_8083C858(this, globalCtx); +} + +s32 func_8083C910(GlobalContext* globalCtx, Player* this, f32 arg2) { + UNK_TYPE sp2C; + f32 sp28; + + sp28 = this->actor.posRot.pos.y; + if (func_8004213C(globalCtx, &globalCtx->colCtx, this->actor.posRot.pos.x, this->actor.posRot.pos.z, &sp28, + &sp2C) != 0) { + sp28 -= this->actor.posRot.pos.y; + if (this->ageProperties->unk_24 <= sp28) { + func_80835C58(globalCtx, this, func_8084D7C4, 0); + func_80832C6C(globalCtx, this, &D_040032F0); + this->stateFlags1 |= 0x28000000; + this->unk_850 = 20; + this->linearVelocity = 2.0f; + Player_SetBootData(globalCtx, this); + return 0; + } + } + + func_80838E70(globalCtx, this, arg2, this->actor.shape.rot.y); + this->stateFlags1 |= 0x20000000; + return 1; +} + +void func_8083CA20(GlobalContext* globalCtx, Player* this) { + if (func_8083C910(globalCtx, this, 180.0f)) { + this->unk_850 = -20; + } +} + +void func_8083CA54(GlobalContext* globalCtx, Player* this) { + this->linearVelocity = 2.0f; + gSaveContext.unk_13BC = 2.0f; + if (func_8083C910(globalCtx, this, 120.0f)) { + this->unk_850 = -15; + } +} + +void func_8083CA9C(GlobalContext* globalCtx, Player* this) { + if (gSaveContext.unk_13BC < 0.1f) { + gSaveContext.unk_13BC = 0.1f; + } + + this->linearVelocity = gSaveContext.unk_13BC; + + if (func_8083C910(globalCtx, this, 800.0f)) { + this->unk_850 = -80 / this->linearVelocity; + if (this->unk_850 < -20) { + this->unk_850 = -20; + } + } +} + +void func_8083CB2C(Player* this, s16 yaw, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_808414F8, 1); + func_800A41FC(globalCtx, &this->skelAnime); + this->unk_864 = this->unk_868 = 0.0f; + this->currentYaw = yaw; +} + +void func_8083CB94(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_80840DE4, 1); + func_80832BE8(globalCtx, this, D_8085392C[this->modelAnimType]); +} + +void func_8083CBF0(Player* this, s16 yaw, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_808423EC, 1); + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, &D_040024F8, 2.2f, 0.0f, + SkelAnime_GetFrameCount(&D_040024F8.genericHeader), 2, -6.0f); + this->linearVelocity = 8.0f; + this->currentYaw = yaw; +} + +void func_8083CC9C(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_8084193C, 1); + func_80832BE8(globalCtx, this, D_80853B6C[this->modelAnimType]); + this->unk_868 = 0.0f; +} + +void func_8083CD00(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_8084251C, 1); + SkelAnime_ChangeLinkAnimPlaybackStop(globalCtx, &this->skelAnime, &D_040024E8, 2.0f); +} + +void func_8083CD54(GlobalContext* globalCtx, Player* this, s16 yaw) { + this->currentYaw = yaw; + func_80835C58(globalCtx, this, func_80841BA8, 1); + this->unk_87E = 1200; + this->unk_87E *= D_808535E8; + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, D_80853B84[this->modelAnimType], 1.0f, 0.0f, 0.0f, 0, -6.0f); +} + +void func_8083CE0C(Player* this, GlobalContext* globalCtx) { + LinkAnimetionEntry* anim; + + func_80835C58(globalCtx, this, func_80840BC8, 1); + + if (this->unk_870 < 0.5f) { + anim = D_80853BB4[this->modelAnimType]; + } else { + anim = D_80853B9C[this->modelAnimType]; + } + func_80832264(globalCtx, this, anim); + + this->currentYaw = this->actor.shape.rot.y; +} + +void func_8083CEAC(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_80840450, 1); + func_80832B0C(globalCtx, this, D_808539BC[this->modelAnimType]); + this->unk_850 = 1; +} + +void func_8083CF10(Player* this, GlobalContext* globalCtx) { + if (this->linearVelocity != 0.0f) { + func_8083C858(this, globalCtx); + } else { + func_8083CE0C(this, globalCtx); + } +} + +void func_8083CF5C(Player* this, GlobalContext* globalCtx) { + if (this->linearVelocity != 0.0f) { + func_8083C858(this, globalCtx); + } else { + func_80839F90(this, globalCtx); + } +} + +s32 func_8083CFA8(GlobalContext* globalCtx, Player* this, f32 arg2, s32 arg3) { + f32 sp3C = fabsf(arg2); + UNK_TYPE sp38; + f32 sp34; + Vec3f sp28; + s32 temp; + + if (sp3C > 2.0f) { + sp28.x = this->bodyPartsPos[0].x; + sp28.z = this->bodyPartsPos[0].z; + sp34 = this->actor.posRot.pos.y; + if (func_8004213C(globalCtx, &globalCtx->colCtx, sp28.x, sp28.z, &sp34, &sp38)) { + if ((sp34 - this->actor.posRot.pos.y) < 100.0f) { + temp = (sp3C <= 10.0f) ? 0 : 1; + sp28.y = sp34; + func_8002949C(globalCtx, &sp28, 0, 0, temp, arg3); + return 1; + } + } + } + + return 0; +} + +void func_8083D0A8(GlobalContext* globalCtx, Player* this, f32 arg2) { + this->stateFlags1 |= 0x40000; + this->stateFlags1 &= ~0x8000000; + + func_80832340(globalCtx, this); + if (func_8083CFA8(globalCtx, this, arg2, 500)) { + func_8002F7DC(&this->actor, NA_SE_EV_JUMP_OUT_WATER); + } + + Player_SetBootData(globalCtx, this); +} + +s32 func_8083D12C(GlobalContext* globalCtx, Player* this, Input* arg2) { + if (!(this->stateFlags1 & 0x400) && !(this->stateFlags2 & 0x400)) { + if ((arg2 == NULL) || (CHECK_PAD(arg2->press, A_BUTTON) && (ABS(this->unk_6C2) < 12000) && + (this->currentBoots != PLAYER_BOOTS_IRON))) { + + func_80835C58(globalCtx, this, func_8084DC48, 0); + func_80832264(globalCtx, this, &D_04003308); + + this->unk_6C2 = 0; + this->stateFlags2 |= 0x400; + this->actor.velocity.y = 0.0f; + + if (arg2 != NULL) { + this->stateFlags2 |= 0x800; + func_8002F7DC(&this->actor, NA_SE_PL_DIVE_BUBBLE); + } + + return 1; + } + } + + if ((this->stateFlags1 & 0x400) || (this->stateFlags2 & 0x400)) { + if (this->actor.velocity.y > 0.0f) { + if (this->actor.waterY < this->ageProperties->unk_30) { + + this->stateFlags2 &= ~0x400; + + if (arg2 != NULL) { + func_80835C58(globalCtx, this, func_8084E1EC, 1); + + if (this->stateFlags1 & 0x400) { + this->stateFlags1 |= 0x20000C00; + } + + this->unk_850 = 2; + } + + func_80832340(globalCtx, this); + func_80832B0C(globalCtx, this, (this->stateFlags1 & 0x800) ? &D_04003318 : &D_04003300); + + if (func_8083CFA8(globalCtx, this, this->actor.velocity.y, 500)) { + func_8002F7DC(&this->actor, NA_SE_PL_FACE_UP); + } + + return 1; + } + } + } + + return 0; +} + +void func_8083D330(GlobalContext* globalCtx, Player* this) { + func_80832284(globalCtx, this, &D_040032F0); + this->unk_6C2 = 16000; + this->unk_850 = 1; +} + +void func_8083D36C(GlobalContext* globalCtx, Player* this) { + if ((this->currentBoots != PLAYER_BOOTS_IRON) || !(this->actor.bgCheckFlags & 1)) { + func_80832564(globalCtx, this); + + if ((this->currentBoots != PLAYER_BOOTS_IRON) && (this->stateFlags2 & 0x400)) { + this->stateFlags2 &= ~0x400; + func_8083D12C(globalCtx, this, 0); + this->unk_84F = 1; + } else if (func_80844A44 == this->func_674) { + func_80835C58(globalCtx, this, func_8084DC48, 0); + func_8083D330(globalCtx, this); + } else { + func_80835C58(globalCtx, this, func_8084D610, 1); + func_80832B0C(globalCtx, this, (this->actor.bgCheckFlags & 1) ? &D_04003330 : &D_040032E0); + } + } + + if (!(this->stateFlags1 & 0x8000000) || (this->actor.waterY < this->ageProperties->unk_2C)) { + if (func_8083CFA8(globalCtx, this, this->actor.velocity.y, 500)) { + func_8002F7DC(&this->actor, NA_SE_EV_DIVE_INTO_WATER); + + if (this->fallDistance > 800.0f) { + func_80832698(this, NA_SE_VO_LI_CLIMB_END); + } + } + } + + this->stateFlags1 |= 0x8000000; + this->stateFlags2 |= 0x400; + this->stateFlags1 &= ~0xC0000; + this->unk_854 = 0.0f; + + Player_SetBootData(globalCtx, this); +} + +void func_8083D53C(GlobalContext* globalCtx, Player* this) { + if (this->actor.waterY < this->ageProperties->unk_2C) { + func_800F67A0(0); + this->unk_840 = 0; + } else { + func_800F67A0(32); + if (this->unk_840 < 300) { + this->unk_840++; + } + } + + if ((func_80845668 != this->func_674) && (func_8084BDFC != this->func_674)) { + if (this->ageProperties->unk_2C < this->actor.waterY) { + if (!(this->stateFlags1 & 0x8000000) || + (!((this->currentBoots == PLAYER_BOOTS_IRON) && (this->actor.bgCheckFlags & 1)) && + (func_8084E30C != this->func_674) && (func_8084E368 != this->func_674) && + (func_8084D610 != this->func_674) && (func_8084D84C != this->func_674) && + (func_8084DAB4 != this->func_674) && (func_8084DC48 != this->func_674) && + (func_8084E1EC != this->func_674) && (func_8084D7C4 != this->func_674))) { + func_8083D36C(globalCtx, this); + return; + } + } else if ((this->stateFlags1 & 0x8000000) && (this->actor.waterY < this->ageProperties->unk_24)) { + if ((this->skelAnime.flags == 0) && (this->currentBoots != PLAYER_BOOTS_IRON)) { + func_8083CD54(globalCtx, this, this->actor.shape.rot.y); + } + func_8083D0A8(globalCtx, this, this->actor.velocity.y); + } + } +} + +void func_8083D6EC(GlobalContext* globalCtx, Player* this) { + Vec3f sp5C; + f32 temp1; + f32 temp2; + f32 temp3; + f32 temp4; + + this->actor.minVelocityY = -20.0f; + this->actor.gravity = REG(68) / 100.0f; + + if (func_8083816C(D_808535E4)) { + temp1 = fabsf(this->linearVelocity) * 20.0f; + temp3 = 0.0f; + + if (D_808535E4 == 4) { + if (this->unk_6C4 > 1300.0f) { + temp2 = this->unk_6C4; + } else { + temp2 = 1300.0f; + } + if (this->currentBoots == PLAYER_BOOTS_HOVER) { + temp1 += temp1; + } else if (this->currentBoots == PLAYER_BOOTS_IRON) { + temp1 *= 0.3f; + } + } else { + temp2 = 20000.0f; + if (this->currentBoots != PLAYER_BOOTS_HOVER) { + temp1 += temp1; + } else if ((D_808535E4 == 7) || (this->currentBoots == PLAYER_BOOTS_IRON)) { + temp1 = 0; + } + } + + if (this->currentBoots != PLAYER_BOOTS_HOVER) { + temp3 = (temp2 - this->unk_6C4) * 0.02f; + temp3 = CLAMP(temp3, 0.0f, 300.0f); + if (this->currentBoots == PLAYER_BOOTS_IRON) { + temp3 += temp3; + } + } + + this->unk_6C4 += temp3 - temp1; + this->unk_6C4 = CLAMP(this->unk_6C4, 0.0f, temp2); + + this->actor.gravity -= this->unk_6C4 * 0.004f; + } else { + this->unk_6C4 = 0.0f; + } + + if (this->actor.bgCheckFlags & 0x20) { + if (this->actor.waterY < 50.0f) { + temp4 = fabsf(this->bodyPartsPos[0].x - this->unk_A88.x) + + fabsf(this->bodyPartsPos[0].y - this->unk_A88.y) + fabsf(this->bodyPartsPos[0].z - this->unk_A88.z); + if (temp4 > 4.0f) { + temp4 = 4.0f; + } + this->unk_854 += temp4; + + if (this->unk_854 > 15.0f) { + this->unk_854 = 0.0f; + + sp5C.x = (Math_Rand_ZeroOne() * 10.0f) + this->actor.posRot.pos.x; + sp5C.y = this->actor.posRot.pos.y + this->actor.waterY; + sp5C.z = (Math_Rand_ZeroOne() * 10.0f) + this->actor.posRot.pos.z; + func_80029444(globalCtx, &sp5C, 100, 500, 0); + + if ((this->linearVelocity > 4.0f) && !func_808332B8(this) && + ((this->actor.posRot.pos.y + this->actor.waterY) < this->bodyPartsPos[0].y)) { + func_8083CFA8(globalCtx, this, 20.0f, + (fabsf(this->linearVelocity) * 50.0f) + (this->actor.waterY * 5.0f)); + } + } + } + + if (this->actor.waterY > 40.0f) { + s32 sp48 = 0; + s32 i; + + if ((this->actor.velocity.y > -1.0f) || (this->actor.bgCheckFlags & 1)) { + if (Math_Rand_ZeroOne() < 0.2f) { + sp48 = 1; + } + } else { + sp48 = this->actor.velocity.y * -2.0f; + } + + for (i = 0; i < sp48; i++) { + func_800293E4(globalCtx, &this->actor.posRot.pos, 20.0f, 10.0f, 20.0f, 0.13f); + } + } + } +} + +s32 func_8083DB98(Player* this, s32 arg1) { + Actor* unk_664 = this->unk_664; + Vec3f sp30; + s16 sp2E; + s16 sp2C; + + sp30.x = this->actor.posRot.pos.x; + sp30.y = this->bodyPartsPos[7].y + 3.0f; + sp30.z = this->actor.posRot.pos.z; + sp2E = Math_Vec3f_Pitch(&sp30, &unk_664->posRot2.pos); + sp2C = Math_Vec3f_Yaw(&sp30, &unk_664->posRot2.pos); + Math_SmoothScaleMaxMinS(&this->actor.posRot2.rot.y, sp2C, 4, 10000, 0); + Math_SmoothScaleMaxMinS(&this->actor.posRot2.rot.x, sp2E, 4, 10000, 0); + this->unk_6AE |= 2; + + return func_80836AB8(this, arg1); +} + +Vec3f D_8085456C = { 0.0f, 100.0f, 40.0f }; + +void func_8083DC54(Player* this, GlobalContext* globalCtx) { + s16 sp46; + s16 temp2; + f32 temp1; + Vec3f sp34; + + if (this->unk_664 != NULL) { + if (func_8002DD78(this) || func_808334B4(this)) { + func_8083DB98(this, 1); + } else { + func_8083DB98(this, 0); + } + return; + } + + if (D_808535E4 == 11) { + Math_SmoothScaleMaxMinS(&this->actor.posRot2.rot.x, -20000, 10, 4000, 800); + } else { + sp46 = 0; + temp1 = func_8083973C(globalCtx, this, &D_8085456C, &sp34); + if (temp1 > -32000.0f) { + temp2 = atan2s(40.0f, this->actor.posRot.pos.y - temp1); + sp46 = CLAMP(temp2, -4000, 4000); + } + this->actor.posRot2.rot.y = this->actor.shape.rot.y; + Math_SmoothScaleMaxMinS(&this->actor.posRot2.rot.x, sp46, 14, 4000, 30); + } + + func_80836AB8(this, func_8002DD78(this) || func_808334B4(this)); +} + +void func_8083DDC8(Player* this, GlobalContext* globalCtx) { + s16 temp1; + s16 temp2; + + if (!func_8002DD78(this) && !func_808334B4(this) && (this->linearVelocity > 5.0f)) { + temp1 = this->linearVelocity * 200.0f; + temp2 = (s16)(this->currentYaw - this->actor.shape.rot.y) * this->linearVelocity * 0.1f; + temp1 = CLAMP(temp1, -4000, 4000); + temp2 = CLAMP(-temp2, -4000, 4000); + Math_ApproxUpdateScaledS(&this->unk_6BC, temp1, 900); + this->unk_6B6 = -(f32)this->unk_6BC * 0.5f; + Math_ApproxUpdateScaledS(&this->unk_6BA, temp2, 300); + Math_ApproxUpdateScaledS(&this->unk_6C0, temp2, 200); + this->unk_6AE |= 0x168; + } else { + func_8083DC54(this, globalCtx); + } +} + +void func_8083DF68(Player* this, f32 arg1, s16 arg2) { + func_80077C6C(&this->linearVelocity, arg1, REG(19) / 100.0f, 1.5f); + Math_ApproxUpdateScaledS(&this->currentYaw, arg2, REG(27)); +} + +void func_8083DFE0(Player* this, f32* arg1, s16* arg2) { + s16 yawDiff = this->currentYaw - *arg2; + + if (this->swordState == 0) { + this->linearVelocity = CLAMP(this->linearVelocity, -(R_RUN_SPEED_LIMIT / 100.0f), (R_RUN_SPEED_LIMIT / 100.0f)); + } + + if (ABS(yawDiff) > 0x6000) { + if (Math_ApproxF(&this->linearVelocity, 0.0f, 1.0f)) { + this->currentYaw = *arg2; + } + } else { + func_80077C6C(&this->linearVelocity, *arg1, 0.05f, 0.1f); + Math_ApproxUpdateScaledS(&this->currentYaw, *arg2, 200); + } +} + +struct_80854578 D_80854578[] = { + { 0x04003398, 35.16999817f, 6.609999657f }, + { 0x040033A8, -34.15999985f, 7.909999847f }, +}; + +s32 func_8083E0FC(Player* this, GlobalContext* globalCtx) { + EnHorse* rideActor = (EnHorse*)this->rideActor; + f32 unk_04; + f32 unk_08; + f32 sp38; + f32 sp34; + s32 temp; + + if ((rideActor != NULL) && CHECK_PAD(sControlInput->press, A_BUTTON)) { + sp38 = Math_Coss(rideActor->actor.shape.rot.y); + sp34 = Math_Sins(rideActor->actor.shape.rot.y); + + func_80836898(globalCtx, this, func_8083A360); + + this->stateFlags1 |= 0x800000; + this->actor.bgCheckFlags &= ~0x20; + + if (this->unk_43C < 0) { + temp = 0; + } else { + temp = 1; + } + + unk_04 = D_80854578[temp].unk_04; + unk_08 = D_80854578[temp].unk_08; + this->actor.posRot.pos.x = + rideActor->actor.posRot.pos.x + rideActor->unk_258.x + ((unk_04 * sp38) + (unk_08 * sp34)); + this->actor.posRot.pos.z = + rideActor->actor.posRot.pos.z + rideActor->unk_258.z + ((unk_08 * sp38) - (unk_04 * sp34)); + + this->unk_878 = rideActor->actor.posRot.pos.y - this->actor.posRot.pos.y; + this->currentYaw = this->actor.shape.rot.y = rideActor->actor.shape.rot.y; + + func_8002DECC(globalCtx, this, &rideActor->actor); + func_80832264(globalCtx, this, D_80854578[temp].anim); + func_80832F54(globalCtx, this, 0x9B); + this->actor.parent = this->rideActor; + func_80832224(this); + func_800304B0(globalCtx); + return 1; + } + + return 0; +} + +void func_8083E298(CollisionPoly* arg0, Vec3f* arg1, s16* arg2) { + arg1->x = arg0->norm.x * (1.0f / 32767.0f); + arg1->y = arg0->norm.y * (1.0f / 32767.0f); + arg1->z = arg0->norm.z * (1.0f / 32767.0f); + + *arg2 = atan2s(arg1->z, arg1->x); +} + +LinkAnimetionEntry* D_80854590[] = { + 0x04002EE0, + 0x040031D0, +}; + +s32 func_8083E318(GlobalContext* globalCtx, Player* this, CollisionPoly* arg2) { + s32 pad; + s16 sp4A; + Vec3f sp3C; + s16 sp3A; + f32 temp1; + f32 temp2; + s16 temp3; + + if (!Player_InBlockingCsMode(globalCtx, this) && (func_8084F390 != this->func_674) && + (func_80041F7C(&globalCtx->colCtx, arg2, this->actor.floorPolySource) == 1)) { + sp4A = atan2s(this->actor.velocity.z, this->actor.velocity.x); + func_8083E298(arg2, &sp3C, &sp3A); + temp3 = sp3A - sp4A; + + if (ABS(temp3) > 16000) { + temp1 = (1.0f - sp3C.y) * 40.0f; + temp2 = (temp1 * temp1) * 0.015f; + if (temp2 < 1.2f) { + temp2 = 1.2f; + } + this->windDirection = sp3A; + Math_ApproxF(&this->windSpeed, temp1, temp2); + } else { + func_80835C58(globalCtx, this, func_8084F390, 0); + func_80832564(globalCtx, this); + if (D_80853610 >= 0) { + this->unk_84F = 1; + } + func_80832BE8(globalCtx, this, D_80854590[this->unk_84F]); + this->linearVelocity = sqrtf(SQ(this->actor.velocity.x) + SQ(this->actor.velocity.z)); + this->currentYaw = sp4A; + return 1; + } + } + + return 0; +} + +// unknown data (unused) +s32 D_80854598[] = { + 0xFFDB0871, 0xF8310000, 0x00940470, 0xF3980000, 0xFFB504A9, 0x0C9F0000, 0x08010402, +}; + +void func_8083E4C4(GlobalContext* globalCtx, Player* this, GetItemEntry* giEntry) { + s32 sp1C = giEntry->field & 0x1F; + + if (!(giEntry->field & 0x80)) { + Item_DropCollectible(globalCtx, &this->actor.posRot.pos, sp1C | 0x8000); + if ((sp1C != 4) && (sp1C != 8) && (sp1C != 9) && (sp1C != 0xA) && (sp1C != 0) && (sp1C != 1) && (sp1C != 2) && + (sp1C != 0x14) && (sp1C != 0x13)) { + Item_Give(globalCtx, giEntry->itemId); + } + } else { + Item_Give(globalCtx, giEntry->itemId); + } + + func_80078884((this->getItemId < 0) ? NA_SE_SY_GET_BOXITEM : NA_SE_SY_GET_ITEM); +} + +s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) { + Actor* interactedActor; + + if (iREG(67) || (((interactedActor = this->interactRangeActor) != NULL) && + func_8002D53C(globalCtx, &globalCtx->actorCtx.titleCtx))) { + if (iREG(67) || (this->getItemId > GI_NONE)) { + if (iREG(67)) { + this->getItemId = iREG(68); + } + + if (this->getItemId < GI_MAX) { + GetItemEntry* giEntry = &sGetItemTable[this->getItemId - 1]; + + if ((interactedActor != &this->actor) && !iREG(67)) { + interactedActor->parent = &this->actor; + } + + iREG(67) = false; + + if ((Item_CheckObtainability(giEntry->itemId) == ITEM_NONE) || (globalCtx->sceneNum == SCENE_BOWLING)) { + func_808323B4(globalCtx, this); + func_8083AE40(this, giEntry->objectId); + + if (!(this->stateFlags2 & 0x400) || (this->currentBoots == PLAYER_BOOTS_IRON)) { + func_80836898(globalCtx, this, func_8083A434); + func_808322D0(globalCtx, this, &D_04002788); + func_80835EA4(globalCtx, 9); + } + + this->stateFlags1 |= 0x20000C00; + func_80832224(this); + return 1; + } + + func_8083E4C4(globalCtx, this, giEntry); + this->getItemId = GI_NONE; + } + } else if (CHECK_PAD(sControlInput->press, A_BUTTON) && !(this->stateFlags1 & 0x800) && + !(this->stateFlags2 & 0x400)) { + if (this->getItemId != GI_NONE) { + GetItemEntry* giEntry = &sGetItemTable[-this->getItemId - 1]; + EnBox* chest = (EnBox*)interactedActor; + + if (giEntry->itemId != ITEM_NONE) { + if (((Item_CheckObtainability(giEntry->itemId) == ITEM_NONE) && (giEntry->field & 0x40)) || + ((Item_CheckObtainability(giEntry->itemId) != ITEM_NONE) && (giEntry->field & 0x20))) { + this->getItemId = -GI_RUPEE_BLUE; + giEntry = &sGetItemTable[GI_RUPEE_BLUE - 1]; + } + } + + func_80836898(globalCtx, this, func_8083A434); + this->stateFlags1 |= 0x20000C00; + func_8083AE40(this, giEntry->objectId); + this->actor.posRot.pos.x = + chest->actor.posRot.pos.x - (Math_Sins(chest->actor.shape.rot.y) * 29.434299469f); + this->actor.posRot.pos.z = + chest->actor.posRot.pos.z - (Math_Coss(chest->actor.shape.rot.y) * 29.434299469f); + this->currentYaw = this->actor.shape.rot.y = chest->actor.shape.rot.y; + func_80832224(this); + + if ((giEntry->itemId != ITEM_NONE) && (giEntry->gi >= 0) && + (Item_CheckObtainability(giEntry->itemId) == ITEM_NONE)) { + func_808322D0(globalCtx, this, this->ageProperties->unk_98); + func_80832F54(globalCtx, this, 0x28F); + chest->unk_1F4 = 1; + func_8005A77C(Gameplay_GetCamera(globalCtx, 0), 0x28); + } else { + func_80832264(globalCtx, this, &D_04002DF8); + chest->unk_1F4 = -1; + } + + return 1; + } + + if ((this->heldActor == NULL) || Player_HoldsHookshot(this)) { + if ((interactedActor->id == ACTOR_BG_TOKI_SWD) && LINK_IS_ADULT) { + s32 sp24 = this->itemActionParam; + + this->itemActionParam = PLAYER_AP_NONE; + this->modelAnimType = 0; + this->heldItemActionParam = this->itemActionParam; + func_80836898(globalCtx, this, func_8083A0F4); + + if (sp24 == PLAYER_AP_SWORD_MASTER) { + this->nextModelGroup = Player_ActionToModelGroup(this, PLAYER_AP_LAST_USED); + func_8083399C(globalCtx, this, PLAYER_AP_LAST_USED); + } else { + func_80835F44(globalCtx, this, ITEM_LAST_USED); + } + } else { + s32 strength = Player_GetStrength(); + if ((interactedActor->id == ACTOR_EN_ISHI) && ((interactedActor->params & 0xF) == 1) && + (strength < PLAYER_STR_SILVER_G)) { + return 0; + } + + func_80836898(globalCtx, this, func_8083A0F4); + } + + func_80832224(this); + this->stateFlags1 |= 0x800; + return 1; + } + } + } + + return 0; +} + +void func_8083EA94(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_80846578, 1); + func_80832264(globalCtx, this, D_80853BCC[this->modelAnimType]); +} + +s32 func_8083EAF0(Player* this, Actor* actor) { + if ((actor != NULL) && !(actor->flags & 0x800000) && + ((this->linearVelocity < 1.1f) || (actor->id == ACTOR_EN_BOM_CHU))) { + return 0; + } + + return 1; +} + +s32 func_8083EB44(Player* this, GlobalContext* globalCtx) { + if ((this->stateFlags1 & 0x800) && (this->heldActor != NULL) && + (sControlInput->press.in.button & (A_BUTTON | B_BUTTON | L_CBUTTONS | R_CBUTTONS | D_CBUTTONS))) { + if (!func_80835644(globalCtx, this, this->heldActor)) { + if (!func_8083EAF0(this, this->heldActor)) { + func_80835C58(globalCtx, this, func_808464B0, 1); + func_80832264(globalCtx, this, D_80853BE4[this->modelAnimType]); + } else { + func_8083EA94(this, globalCtx); + } + } + return 1; + } + + return 0; +} + +#ifdef NON_MATCHING +// regalloc differences +s32 func_8083EC18(Player* this, GlobalContext* globalCtx, u32 arg2) { + if (this->wallHeight >= 79.0f) { + if (!(this->stateFlags1 & 0x8000000) || (this->currentBoots == PLAYER_BOOTS_IRON) || + (this->actor.waterY < this->ageProperties->unk_2C)) { + s32 sp8C = (arg2 & 8) ? 2 : 0; + + if ((sp8C != 0) || (arg2 & 2) || + func_80041E4C(&globalCtx->colCtx, this->actor.wallPoly, this->actor.wallPolySource)) { + s32 i; + CollisionPoly* sp84 = this->actor.wallPoly; + f32 sp80; + f32 sp7C; + f32 phi_f12; + f32 phi_f14; + Vec3f sp50[3]; + f32 phi_f20; + + phi_f20 = phi_f12 = 0.0f; + + if (sp8C != 0) { + sp80 = this->actor.posRot.pos.x; + sp7C = this->actor.posRot.pos.z; + } else { + f32 sp48; + Vec3f* sp44 = &sp50[0]; + s32 pad; + + func_80038C78(sp84, this->actor.wallPolySource, &globalCtx->colCtx, sp50); + + sp80 = phi_f12 = sp44->x; + sp7C = phi_f14 = sp44->z; + phi_f20 = sp44->y; + for (i = 1; i < 3; i++) { + sp44++; + if (sp80 > sp44->x) { + sp80 = sp44->x; + } else if (phi_f12 < sp44->x) { + phi_f12 = sp44->x; + } + + if (sp7C > sp44->z) { + sp7C = sp44->z; + } else if (phi_f14 < sp44->z) { + phi_f14 = sp44->z; + } + + if (phi_f20 > sp44->y) { + phi_f20 = sp44->y; + } + } + + sp80 = (sp80 + phi_f12) * 0.5f; + sp7C = (sp7C + phi_f14) * 0.5f; + + phi_f12 = ((this->actor.posRot.pos.x - sp80) * (sp84->norm.z * (1.0f / 32767.0f))) - + ((this->actor.posRot.pos.z - sp7C) * (sp84->norm.x * (1.0f / 32767.0f))); + sp48 = this->actor.posRot.pos.y - phi_f20; + + phi_f20 = ((f32)(s32)((sp48 / 15.000000223517418) + 0.5) * 15.000000223517418) - sp48; + phi_f12 = fabsf(phi_f12); + } + + if (phi_f12 < 8.0f) { + f32 sp3C = sp84->norm.x * (1.0f / 32767.0f); + f32 sp38 = sp84->norm.z * (1.0f / 32767.0f); + f32 sp34 = this->wallDistance; + LinkAnimetionEntry* sp30; + + func_80836898(globalCtx, this, func_8083A3B0); + this->stateFlags1 |= 0x200000; + this->stateFlags1 &= ~0x8000000; + + if ((sp8C != 0) || (arg2 & 2)) { + if ((this->unk_84F = sp8C) != 0) { + if (this->actor.bgCheckFlags & 1) { + sp30 = &D_04002D80; + } else { + sp30 = &D_04002D68; + } + sp34 = (this->ageProperties->unk_38 - 1.0f) - sp34; + } else { + sp30 = this->ageProperties->unk_A4; + sp34 = sp34 - 1.0f; + } + this->unk_850 = -2; + this->actor.posRot.pos.y += phi_f20; + this->actor.shape.rot.y = this->currentYaw = this->actor.wallPolyRot + 0x8000; + } else { + sp30 = this->ageProperties->unk_A8; + this->unk_850 = -4; + this->actor.shape.rot.y = this->currentYaw = this->actor.wallPolyRot; + } + + this->actor.posRot.pos.x = (sp34 * sp3C) + sp80; + this->actor.posRot.pos.z = (sp34 * sp38) + sp7C; + func_80832224(this); + Math_Vec3f_Copy(&this->actor.pos4, &this->actor.posRot.pos); + func_80832264(globalCtx, this, sp30); + func_80832F54(globalCtx, this, 0x9F); + + return 1; + } + } + } + } + + return 0; +} +#else +s32 func_8083EC18(Player* this, GlobalContext* globalCtx, u32 arg2); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083EC18.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s") +void func_8083F070(Player* this, LinkAnimetionEntry* anim, GlobalContext* globalCtx) { + func_80835DAC(globalCtx, this, func_8084C5F8, 0); + SkelAnime_ChangeLinkAnimPlaybackStop(globalCtx, &this->skelAnime, anim, (4.0f / 3.0f)); +} +#ifdef NON_MATCHING +// single regalloc difference +s32 func_8083F0C8(Player* this, GlobalContext* globalCtx, u32 arg2) { + CollisionPoly* wallPoly; + Vec3f sp50[3]; + f32 sp4C; + f32 phi_f2; + f32 sp44; + f32 phi_f12; + s32 i; + + if (LINK_IS_CHILD && !(this->stateFlags1 & 0x8000000) && (arg2 & 0x30)) { + wallPoly = this->actor.wallPoly; + func_80038C78(wallPoly, this->actor.wallPolySource, &globalCtx->colCtx, &sp50); + + sp4C = phi_f2 = sp50[0].x; + sp44 = phi_f12 = sp50[0].z; + for (i = 1; i < 3; i++) { + if (sp4C > sp50[i].x) { + sp4C = sp50[i].x; + } else if (phi_f2 < sp50[i].x) { + phi_f2 = sp50[i].x; + } + + if (sp44 > sp50[i].z) { + sp44 = sp50[i].z; + } else if (phi_f12 < sp50[i].z) { + phi_f12 = sp50[i].z; + } + } + + sp4C = (sp4C + phi_f2) * 0.5f; + sp44 = (sp44 + phi_f12) * 0.5f; + + if (fabsf(((this->actor.posRot.pos.x - sp4C) * (wallPoly->norm.z * (1.0f / 32767.0f))) - + ((this->actor.posRot.pos.z - sp44) * (wallPoly->norm.x * (1.0f / 32767.0f)))) < 8.0f) { + + this->stateFlags2 |= 0x10000; + + if (CHECK_PAD(sControlInput->press, A_BUTTON)) { + f32 sp38 = wallPoly->norm.x * (1.0f / 32767.0f); + f32 sp34 = wallPoly->norm.z * (1.0f / 32767.0f); + f32 sp30 = this->wallDistance; + + func_80836898(globalCtx, this, func_8083A40C); + this->stateFlags2 |= 0x40000; + this->actor.shape.rot.y = this->currentYaw = this->actor.wallPolyRot + 0x8000; + this->actor.posRot.pos.x = sp4C + (sp30 * sp38); + this->actor.posRot.pos.z = sp44 + (sp30 * sp34); + func_80832224(this); + this->actor.pos4 = this->actor.posRot.pos; + func_80832264(globalCtx, this, &D_04002708); + func_80832F54(globalCtx, this, 0x9D); + + return 1; + } + } + } + + return 0; +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F0C8.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F360.s") +s32 func_8083F360(GlobalContext* globalCtx, Player* this, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { + CollisionPoly* wallPoly; + u32 sp78; + Vec3f sp6C; + Vec3f sp60; + Vec3f sp54; + f32 yawCos; + f32 yawSin; + s32 temp; + f32 temp1; + f32 temp2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F524.s") + yawCos = Math_Coss(this->actor.shape.rot.y); + yawSin = Math_Sins(this->actor.shape.rot.y); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s") + sp6C.x = this->actor.posRot.pos.x + (arg4 * yawSin); + sp6C.z = this->actor.posRot.pos.z + (arg4 * yawCos); + sp60.x = this->actor.posRot.pos.x + (arg3 * yawSin); + sp60.z = this->actor.posRot.pos.z + (arg3 * yawCos); + sp60.y = sp6C.y = this->actor.posRot.pos.y + arg1; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F72C.s") + if (func_8003DE84(&globalCtx->colCtx, &sp6C, &sp60, &sp54, &this->actor.wallPoly, 1, 0, 0, 1, &sp78)) { + wallPoly = this->actor.wallPoly; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F7BC.s") + this->actor.bgCheckFlags |= 0x200; + this->actor.wallPolySource = sp78; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F9D0.s") + D_808535F0 = func_80041DB8(&globalCtx->colCtx, wallPoly, sp78); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FAB8.s") + temp1 = wallPoly->norm.x * (1.0f / 32767.0f); + temp2 = wallPoly->norm.z * (1.0f / 32767.0f); + temp = atan2s(-temp2, -temp1); + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, temp, 800); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB14.s") + this->currentYaw = this->actor.shape.rot.y; + this->actor.posRot.pos.x = sp54.x - (Math_Sins(this->actor.shape.rot.y) * arg2); + this->actor.posRot.pos.z = sp54.z - (Math_Coss(this->actor.shape.rot.y) * arg2); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FB7C.s") + return 1; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FBC0.s") + this->actor.bgCheckFlags &= ~0x200; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FC68.s") + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FD78.s") +s32 func_8083F524(GlobalContext* globalCtx, Player* this) { + return func_8083F360(globalCtx, this, 26.0f, this->ageProperties->unk_38 + 5.0f, 30.0f, 0.0f); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8083FFB8.s") +s32 func_8083F570(Player* this, GlobalContext* globalCtx) { + s16 temp; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80840058.s") + if ((this->linearVelocity != 0.0f) && (this->actor.bgCheckFlags & 8) && (D_808535F0 & 0x30)) { -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80840138.s") + temp = this->actor.shape.rot.y - this->actor.wallPolyRot; + if (this->linearVelocity < 0.0f) { + temp += 0x8000; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808401B0.s") + if (ABS(temp) > 0x4000) { + func_80835C58(globalCtx, this, func_8084C81C, 0); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084021C.s") + if (this->linearVelocity > 0.0f) { + this->actor.shape.rot.y = this->actor.wallPolyRot + 0x8000; + func_80832264(globalCtx, this, &D_04002700); + func_80832F54(globalCtx, this, 0x9D); + func_800800F8(globalCtx, 0x2581, 999, NULL, 0); + } else { + this->actor.shape.rot.y = this->actor.wallPolyRot; + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, &D_04002708, -1.0f, + SkelAnime_GetFrameCount(&D_04002708.genericHeader), 0.0f, 2, 0.0f); + func_80832F54(globalCtx, this, 0x9D); + func_800800F8(globalCtx, 0x2582, 999, NULL, 0); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084029C.s") + this->currentYaw = this->actor.shape.rot.y; + func_80832210(this); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80840450.s") + return 1; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808407CC.s") + return 0; +} +void func_8083F72C(Player* this, LinkAnimetionEntry* anim, GlobalContext* globalCtx) { + if (!func_80836898(globalCtx, this, func_8083A388)) { + func_80835C58(globalCtx, this, func_8084B78C, 0); + } + + func_80832264(globalCtx, this, anim); + func_80832224(this); + + this->actor.shape.rot.y = this->currentYaw = this->actor.wallPolyRot + 0x8000; +} + +s32 func_8083F7BC(Player* this, GlobalContext* globalCtx) { + DynaPolyActor* wallPolyActor; + + if (!(this->stateFlags1 & 0x800) && (this->actor.bgCheckFlags & 0x200) && (D_80853608 < 0x3000)) { + + if (((this->linearVelocity > 0.0f) && func_8083EC18(this, globalCtx, D_808535F0)) || + func_8083F0C8(this, globalCtx, D_808535F0)) { + return 1; + } + + if (!func_808332B8(this) && ((this->linearVelocity == 0.0f) || !(this->stateFlags2 & 4)) && + (D_808535F0 & 0x40) && (this->actor.bgCheckFlags & 1) && (this->wallHeight >= 39.0f)) { + + this->stateFlags2 |= 1; + + if (CHECK_PAD(sControlInput->cur, A_BUTTON)) { + + if ((this->actor.wallPolySource != 50) && + ((wallPolyActor = DynaPolyInfo_GetActor(&globalCtx->colCtx, this->actor.wallPolySource)) != NULL)) { + + if (wallPolyActor->actor.id == ACTOR_BG_HEAVY_BLOCK) { + if (Player_GetStrength() < PLAYER_STR_GOLD_G) { + return 0; + } + + func_80836898(globalCtx, this, func_8083A0F4); + this->stateFlags1 |= 0x800; + this->interactRangeActor = &wallPolyActor->actor; + this->getItemId = GI_NONE; + this->currentYaw = this->actor.wallPolyRot + 0x8000; + func_80832224(this); + + return 1; + } + + this->unk_3C4 = &wallPolyActor->actor; + } else { + this->unk_3C4 = NULL; + } + + func_8083F72C(this, &D_040030F8, globalCtx); + + return 1; + } + } + } + + return 0; +} + +s32 func_8083F9D0(GlobalContext* globalCtx, Player* this) { + if ((this->actor.bgCheckFlags & 0x200) && ((this->stateFlags2 & 0x10) || CHECK_PAD(sControlInput->cur, A_BUTTON))) { + DynaPolyActor* wallPolyActor = NULL; + + if (this->actor.wallPolySource != 50) { + wallPolyActor = DynaPolyInfo_GetActor(&globalCtx->colCtx, this->actor.wallPolySource); + } + + if (&wallPolyActor->actor == this->unk_3C4) { + if (this->stateFlags2 & 0x10) { + return 1; + } else { + return 0; + } + } + } + + func_80839FFC(this, globalCtx); + func_80832264(globalCtx, this, &D_04003100); + this->stateFlags2 &= ~0x10; + return 1; +} + +void func_8083FAB8(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_8084B898, 0); + this->stateFlags2 |= 0x10; + func_80832264(globalCtx, this, &D_040030F0); +} + +void func_8083FB14(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_8084B9E4, 0); + this->stateFlags2 |= 0x10; + func_80832264(globalCtx, this, D_80853C5C[this->modelAnimType]); +} + +void func_8083FB7C(Player* this, GlobalContext* globalCtx) { + this->stateFlags1 &= ~0x8200000; + func_80837B9C(this, globalCtx); + this->linearVelocity = -0.4f; +} + +s32 func_8083FBC0(Player* this, GlobalContext* globalCtx) { + if (!CHECK_PAD(sControlInput->press, A_BUTTON) && (this->actor.bgCheckFlags & 0x200) && + ((D_808535F0 & 8) || (D_808535F0 & 2) || + func_80041E4C(&globalCtx->colCtx, this->actor.wallPoly, this->actor.wallPolySource))) { + return 0; + } + + func_8083FB7C(this, globalCtx); + func_80832698(this, NA_SE_VO_LI_AUTO_JUMP); + return 1; +} + +s32 func_8083FC68(Player* this, f32 arg1, s16 arg2) { + f32 sp1C = (s16)(arg2 - this->actor.shape.rot.y); + f32 temp; + + if (this->unk_664 != NULL) { + func_8083DB98(this, func_8002DD78(this) || func_808334B4(this)); + } + + temp = fabsf(sp1C) / 32768.0f; + + if (arg1 > (((temp * temp) * 50.0f) + 6.0f)) { + return 1; + } else if (arg1 > (((1.0f - temp) * 10.0f) + 6.8f)) { + return -1; + } + + return 0; +} + +s32 func_8083FD78(Player* this, f32* arg1, s16* arg2, GlobalContext* globalCtx) { + s16 sp2E = *arg2 - this->targetYaw; + u16 sp2C = ABS(sp2E); + + if ((func_8002DD78(this) || func_808334B4(this)) && (this->unk_664 == NULL)) { + *arg1 *= Math_Sins(sp2C); + + if (*arg1 != 0.0f) { + *arg2 = (((sp2E >= 0) ? 1 : -1) << 0xE) + this->actor.shape.rot.y; + } else { + *arg2 = this->actor.shape.rot.y; + } + + if (this->unk_664 != NULL) { + func_8083DB98(this, 1); + } else { + Math_SmoothScaleMaxMinS(&this->actor.posRot2.rot.x, sControlInput->rel.in.y * 240.0f, 14, 4000, 30); + func_80836AB8(this, 1); + } + } else { + if (this->unk_664 != NULL) { + return func_8083FC68(this, *arg1, *arg2); + } else { + func_8083DC54(this, globalCtx); + if ((*arg1 != 0.0f) && (sp2C < 6000)) { + return 1; + } else if (*arg1 > Math_Sins((0x4000 - (sp2C >> 1))) * 200.0f) { + return -1; + } + } + } + + return 0; +} + +s32 func_8083FFB8(Player* this, f32* arg1, s16* arg2) { + s16 temp1 = *arg2 - this->actor.shape.rot.y; + u16 temp2 = ABS(temp1); + f32 temp3 = Math_Coss(temp2); + + *arg1 *= temp3; + + if (*arg1 != 0.0f) { + if (temp3 > 0) { + return 1; + } else { + return -1; + } + } + + return 0; +} + +s32 func_80840058(Player* this, f32* arg1, s16* arg2, GlobalContext* globalCtx) { + func_8083DC54(this, globalCtx); + + if ((*arg1 != 0.0f) || (ABS(this->unk_87C) > 400)) { + s16 temp1 = *arg2 - func_8005A948(ACTIVE_CAM); + u16 temp2 = (ABS(temp1) - 0x2000) & 0xFFFF; + + if ((temp2 < 0x4000) || (this->unk_87C != 0)) { + return -1; + } else { + return 1; + } + } + + return 0; +} + +void func_80840138(Player* this, f32 arg1, s16 arg2) { + s16 temp = arg2 - this->actor.shape.rot.y; + + if (arg1 > 0.0f) { + if (temp < 0) { + this->unk_874 = 0.0f; + } else { + this->unk_874 = 1.0f; + } + } + + Math_ApproxF(&this->unk_870, this->unk_874, 0.3f); +} + +void func_808401B0(GlobalContext* globalCtx, Player* this) { + func_800A431C(globalCtx, &this->skelAnime, func_808334E4(this), this->unk_868, func_80833528(this), this->unk_868, + this->unk_870, this->unk_318); +} + +s32 func_8084021C(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { + f32 temp; + + if ((arg3 == 0.0f) && (arg1 > 0.0f)) { + arg3 = arg2; + } + + temp = (arg0 + arg1) - arg3; + + if (((temp * arg1) >= 0.0f) && (((temp - arg1) * arg1) < 0.0f)) { + return 1; + } + + return 0; +} + +void func_8084029C(Player* this, f32 arg1) { + f32 updateScale = R_UPDATE_RATE * 0.5f; + + arg1 *= updateScale; + if (arg1 < -7.25) { + arg1 = -7.25; + } else if (arg1 > 7.25f) { + arg1 = 7.25f; + } + + if (1) {} + + if ((this->currentBoots == PLAYER_BOOTS_HOVER) && !(this->actor.bgCheckFlags & 1) && (this->unk_893 != 0)) { + func_8002F8F0(&this->actor, NA_SE_PL_HOBBERBOOTS_LV - SFX_FLAG); + } else if (func_8084021C(this->unk_868, arg1, 29.0f, 10.0f) || func_8084021C(this->unk_868, arg1, 29.0f, 24.0f)) { + func_808327F8(this, this->linearVelocity); + if (this->linearVelocity > 4.0f) { + this->stateFlags2 |= 8; + } + } + + this->unk_868 += arg1; + + if (this->unk_868 < 0.0f) { + this->unk_868 += 29.0f; + } else if (this->unk_868 >= 29.0f) { + this->unk_868 -= 29.0f; + } +} + +void func_80840450(Player* this, GlobalContext* globalCtx) { + f32 sp44; + s16 sp42; + s32 temp1; + u32 temp2; + s16 temp3; + s32 temp4; + + if (this->stateFlags3 & 8) { + if (Player_GetSwordHeld(this)) { + this->stateFlags2 |= 0x60; + } else { + this->stateFlags3 &= ~8; + } + } + + if (this->unk_850 != 0) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80832DBC(this); + func_80832284(globalCtx, this, func_808334E4(this)); + this->unk_850 = 0; + this->stateFlags3 &= ~8; + } + func_80833C3C(this); + } else { + func_808401B0(globalCtx, this); + } + + func_8083721C(this); + + if (!func_80837348(globalCtx, this, D_808543E0, 1)) { + if (!func_80833B54(this) && (!func_80833B2C(this) || (func_80834B5C != this->func_82C))) { + func_8083CF10(this, globalCtx); + return; + } + + func_80837268(this, &sp44, &sp42, 0.0f, globalCtx); + + temp1 = func_8083FC68(this, sp44, sp42); + + if (temp1 > 0) { + func_8083C8DC(this, globalCtx, sp42); + return; + } + + if (temp1 < 0) { + func_8083CBF0(this, sp42, globalCtx); + return; + } + + if (sp44 > 4.0f) { + func_8083CC9C(this, globalCtx); + return; + } + + func_8084029C(this, (this->linearVelocity * 0.3f) + 1.0f); + func_80840138(this, sp44, sp42); + + temp2 = this->unk_868; + if ((temp2 < 6) || ((temp2 - 0xE) < 6)) { + Math_ApproxF(&this->linearVelocity, 0.0f, 1.5f); + return; + } + + temp3 = sp42 - this->currentYaw; + temp4 = ABS(temp3); + + if (temp4 > 0x4000) { + if (Math_ApproxF(&this->linearVelocity, 0.0f, 1.5f)) { + this->currentYaw = sp42; + } + return; + } + + func_80077C6C(&this->linearVelocity, sp44 * 0.3f, 2.0f, 1.5f); + + if (!(this->stateFlags3 & 8)) { + Math_ApproxUpdateScaledS(&this->currentYaw, sp42, temp4 * 0.1f); + } + } +} + +void func_808407CC(Player* this, GlobalContext* globalCtx) { + f32 sp3C; + s16 sp3A; + s32 temp1; + s16 temp2; + s32 temp3; + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80832DBC(this); + func_80832264(globalCtx, this, func_80833338(this)); + } + + func_8083721C(this); + + if (!func_80837348(globalCtx, this, D_808543E8, 1)) { + if (func_80833B54(this)) { + func_8083CEAC(this, globalCtx); + return; + } + + if (!func_80833B2C(this)) { + func_80835DAC(globalCtx, this, func_80840BC8, 1); + this->currentYaw = this->actor.shape.rot.y; + return; + } + + if (func_80834B5C == this->func_82C) { + func_8083CEAC(this, globalCtx); + return; + } + + func_80837268(this, &sp3C, &sp3A, 0.0f, globalCtx); + + temp1 = func_8083FD78(this, &sp3C, &sp3A, globalCtx); + + if (temp1 > 0) { + func_8083C8DC(this, globalCtx, sp3A); + return; + } + + if (temp1 < 0) { + func_8083CB2C(this, sp3A, globalCtx); + return; + } + + if (sp3C > 4.9f) { + func_8083CC9C(this, globalCtx); + func_80833C3C(this); + return; + } + if (sp3C != 0.0f) { + func_8083CB94(this, globalCtx); + return; + } + + temp2 = sp3A - this->actor.shape.rot.y; + temp3 = ABS(temp2); + + if (temp3 > 800) { + func_8083CD54(globalCtx, this, sp3A); + } + } +} + +#ifdef NON_MATCHING +// regalloc differences +void func_808409CC(GlobalContext* globalCtx, Player* this) { + LinkAnimetionEntry* anim; + LinkAnimetionEntry** animPtr; + s32 heathIsCritical; + s32 sp38; + s32 sp34; + + if ((this->unk_664 != NULL) || + (!(heathIsCritical = Health_IsCritical()) && ((this->unk_6AC = (this->unk_6AC + 1) & 1) != 0))) { + this->stateFlags2 &= ~0x10000000; + anim = func_80833338(this); + } else { + this->stateFlags2 |= 0x10000000; + if (this->stateFlags1 & 0x800) { + anim = func_80833338(this); + } else { + sp38 = globalCtx->roomCtx.curRoom.unk_02; + if (heathIsCritical) { + if (this->unk_6AC >= 0) { + sp38 = 7; + this->unk_6AC = -1; + } else { + sp38 = 8; + } + } else { + sp34 = Math_Rand_ZeroOne() * 5.0f; + if (sp34 < 4) { + if (((sp34 != 0) && (sp34 != 3)) || + ((this->rightHandType == 10) && ((sp34 == 3) || Player_GetSwordHeld(this)))) { + if ((sp34 == 0) && Player_HoldsTwoHandedWeapon(this)) { + sp34 = 4; + } + sp38 = sp34 + 9; + } + } + } + animPtr = &D_80853D7C[sp38 * 2]; + if (this->modelAnimType != 1) { + animPtr++; + } + anim = *animPtr; + } + } + + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, anim, (2.0f / 3.0f) * D_808535E8, 0.0f, + SkelAnime_GetFrameCount(&anim->genericHeader), 2, -6.0f); +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80840BC8.s") +void func_80840BC8(Player* this, GlobalContext* globalCtx) { + s32 sp44; + s32 sp40; + f32 sp3C; + s16 sp3A; + s16 temp; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80840DE4.s") + sp44 = func_80833350(this); + sp40 = func_800A3BC0(globalCtx, &this->skelAnime); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80841138.s") + if (sp44 > 0) { + func_808333FC(this, sp44 - 1); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084140C.s") + if (sp40 != 0) { + if (this->unk_850 != 0) { + if (DECR(this->unk_850) == 0) { + this->skelAnime.animFrameCount = this->skelAnime.totalFrames - 1.0f; + } + this->skelAnime.limbDrawTbl[0].y = (this->skelAnime.limbDrawTbl[0].y + ((this->unk_850 & 1) * 0x50)) - 0x28; + } else { + func_80832DBC(this); + func_808409CC(globalCtx, this); + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80841458.s") + func_8083721C(this); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808414F8.s") + if (this->unk_850 == 0) { + if (!func_80837348(globalCtx, this, D_80854418, 1)) { + if (func_80833B54(this)) { + func_8083CEAC(this, globalCtx); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808416C0.s") + if (func_80833B2C(this)) { + func_80839F30(this, globalCtx); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084170C.s") + func_80837268(this, &sp3C, &sp3A, 0.018f, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808417FC.s") + if (sp3C != 0.0f) { + func_8083C8DC(this, globalCtx, sp3A); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80841860.s") + temp = sp3A - this->actor.shape.rot.y; + if (ABS(temp) > 800) { + func_8083CD54(globalCtx, this, sp3A); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084193C.s") + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, sp3A, 1200); + this->currentYaw = this->actor.shape.rot.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s") + if (func_80833338(this) == this->skelAnime.linkAnimetionSeg) { + func_8083DC54(this, globalCtx); + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80841CC4.s") +void func_80840DE4(Player* this, GlobalContext* globalCtx) { + f32 frames; + f32 coeff; + f32 sp44; + s16 sp42; + s32 temp1; + s16 temp2; + s32 temp3; + s32 direction; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80841EE4.s") + this->skelAnime.mode = 0; + func_800A3B8C(&this->skelAnime); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80842180.s") + this->skelAnime.linkAnimetionSeg = func_8083356C(this); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084227C.s") + if (this->skelAnime.linkAnimetionSeg == &D_040026E8) { + frames = 24.0f; + coeff = -(MREG(95) / 100.0f); + } else { + frames = 29.0f; + coeff = MREG(95) / 100.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808423EC.s") + this->skelAnime.totalFrames = frames; + this->skelAnime.animFrameCount = frames - 1.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084251C.s") + if ((s16)(this->currentYaw - this->actor.shape.rot.y) >= 0) { + direction = 1; + } else { + direction = -1; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084260C.s") + this->skelAnime.animPlaybackSpeed = direction * (this->linearVelocity * coeff); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084269C.s") + func_800A3BC0(globalCtx, &this->skelAnime); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084279C.s") + if (func_800A4530(&this->skelAnime, 0.0f) || func_800A4530(&this->skelAnime, frames * 0.5f)) { + func_808327F8(this, this->linearVelocity); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084285C.s") + if (!func_80837348(globalCtx, this, D_808543F4, 1)) { + if (func_80833B54(this)) { + func_8083CEAC(this, globalCtx); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808428D8.s") + if (!func_80833B2C(this)) { + func_80853080(this, globalCtx); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80842964.s") + func_80837268(this, &sp44, &sp42, 0.0f, globalCtx); + temp1 = func_8083FD78(this, &sp44, &sp42, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s") + if (temp1 > 0) { + func_8083C8DC(this, globalCtx, sp42); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A28.s") + if (temp1 < 0) { + func_8083CB2C(this, sp42, globalCtx); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80842A88.s") + if (sp44 > 4.9f) { + func_8083CC9C(this, globalCtx); + func_80833C3C(this); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80842AC4.s") + if ((sp44 == 0.0f) && (this->linearVelocity == 0.0f)) { + func_80839F30(this, globalCtx); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80842B7C.s") + temp2 = sp42 - this->currentYaw; + temp3 = ABS(temp2); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80842CF0.s") + if (temp3 > 0x4000) { + if (Math_ApproxF(&this->linearVelocity, 0.0f, 1.5f)) { + this->currentYaw = sp42; + } + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80842D20.s") + func_80077C6C(&this->linearVelocity, sp44 * 0.4f, 1.5f, 1.5f); + Math_ApproxUpdateScaledS(&this->currentYaw, sp42, temp3 * 0.1f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80842DF4.s") +void func_80841138(Player* this, GlobalContext* globalCtx) { + f32 temp1; + f32 temp2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s") + if (this->unk_864 < 1.0f) { + temp1 = R_UPDATE_RATE * 0.5f; + func_8084029C(this, REG(35) / 1000.0f); + func_800A42A0(globalCtx, &this->skelAnime, D_80853BFC[this->modelAnimType], this->unk_868); + this->unk_864 += 1 * temp1; + if (this->unk_864 >= 1.0f) { + this->unk_864 = 1.0f; + } + temp1 = this->unk_864; + } else { + temp2 = this->linearVelocity - (REG(48) / 100.0f); + if (temp2 < 0.0f) { + temp1 = 1.0f; + func_8084029C(this, (REG(35) / 1000.0f) + ((REG(36) / 1000.0f) * this->linearVelocity)); + func_800A42A0(globalCtx, &this->skelAnime, D_80853BFC[this->modelAnimType], this->unk_868); + } else { + temp1 = (REG(37) / 1000.0f) * temp2; + if (temp1 < 1.0f) { + func_8084029C(this, (REG(35) / 1000.0f) + ((REG(36) / 1000.0f) * this->linearVelocity)); + } else { + temp1 = 1.0f; + func_8084029C(this, 1.2f + ((REG(38) / 1000.0f) * temp2)); + } + func_800A425C(globalCtx, &this->skelAnime, D_80853BFC[this->modelAnimType], this->unk_868); + func_800A42A0(globalCtx, &this->skelAnime, &D_04002DD0, this->unk_868 * 0.551724135876f); + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s") + if (temp1 < 1.0f) { + func_800A42E4(globalCtx, &this->skelAnime, 1.0f - temp1); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084370C.s") +void func_8084140C(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_8084170C, 1); + func_80832B0C(globalCtx, this, &D_04002DA0); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084377C.s") +s32 func_80841458(Player* this, f32* arg1, s16* arg2, GlobalContext* globalCtx) { + if (this->linearVelocity > 6.0f) { + func_8084140C(this, globalCtx); + return 1; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80843954.s") + if (*arg1 != 0.0f) { + if (func_8083721C(this)) { + *arg1 = 0.0f; + *arg2 = this->currentYaw; + } else { + return 1; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80843A38.s") + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s") +void func_808414F8(Player* this, GlobalContext* globalCtx) { + f32 sp34; + s16 sp32; + s32 sp2C; + s16 sp2A; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80843CEC.s") + func_80841138(this, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E14.s") + if (!func_80837348(globalCtx, this, D_80854400, 1)) { + if (!func_80833C04(this)) { + func_8083C8DC(this, globalCtx, this->currentYaw); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80843E64.s") + func_80837268(this, &sp34, &sp32, 0.0f, globalCtx); + sp2C = func_8083FD78(this, &sp34, &sp32, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084409C.s") + if (sp2C >= 0) { + if (!func_80841458(this, &sp34, &sp32, globalCtx)) { + if (sp2C != 0) { + func_8083C858(this, globalCtx); + } else if (sp34 > 4.9f) { + func_8083CC9C(this, globalCtx); + } else { + func_8083CB94(this, globalCtx); + } + } + } else { + sp2A = sp32 - this->currentYaw; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s") + func_80077C6C(&this->linearVelocity, sp34 * 1.5f, 1.5f, 2.0f); + Math_ApproxUpdateScaledS(&this->currentYaw, sp32, sp2A * 0.1f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80844708.s") + if ((sp34 == 0.0f) && (this->linearVelocity == 0.0f)) { + func_80839F30(this, globalCtx); + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80844A44.s") +void func_808416C0(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_808417FC, 1); + func_80832264(globalCtx, this, &D_04002DA8); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80844AF4.s") +void func_8084170C(Player* this, GlobalContext* globalCtx) { + s32 sp34; + f32 sp30; + s16 sp2E; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80844BE4.s") + sp34 = func_800A3BC0(globalCtx, &this->skelAnime); + func_8083721C(this); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80844CF8.s") + if (!func_80837348(globalCtx, this, D_80854400, 1)) { + func_80837268(this, &sp30, &sp2E, 0.0f, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D30.s") + if (this->linearVelocity == 0.0f) { + this->currentYaw = this->actor.shape.rot.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80844D68.s") + if (func_8083FD78(this, &sp30, &sp2E, globalCtx) > 0) { + func_8083C858(this, globalCtx); + } else if ((sp30 != 0.0f) || (sp34 != 0)) { + func_808416C0(this, globalCtx); + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80844DC8.s") +void func_808417FC(Player* this, GlobalContext* globalCtx) { + s32 sp1C; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E3C.s") + sp1C = func_800A3BC0(globalCtx, &this->skelAnime); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80844E68.s") + if (!func_80837348(globalCtx, this, D_80854400, 1)) { + if (sp1C != 0) { + func_80839F30(this, globalCtx); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80845000.s") +void func_80841860(GlobalContext* globalCtx, Player* this) { + s32 pad; + LinkAnimetionEntry* sp38; + LinkAnimetionEntry* sp34; + f32 frame; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80845308.s") + sp38 = D_80853914[this->modelAnimType + 144]; + sp34 = D_80853914[this->modelAnimType + 150]; + this->skelAnime.linkAnimetionSeg = sp38; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80845668.s") + func_8084029C(this, (REG(30) / 1000.0f) + ((REG(32) / 1000.0f) * this->linearVelocity)); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808458D0.s") + frame = this->unk_868 * 0.551724135876f; + func_800A431C(globalCtx, &this->skelAnime, sp34, frame, sp38, frame, this->unk_870, this->unk_318); +} +void func_8084193C(Player* this, GlobalContext* globalCtx) { + f32 sp3C; + s16 sp3A; + s32 temp1; + s16 temp2; + s32 temp3; + + func_80841860(globalCtx, this); + + if (!func_80837348(globalCtx, this, D_80854408, 1)) { + if (!func_80833C04(this)) { + func_8083C858(this, globalCtx); + return; + } + + func_80837268(this, &sp3C, &sp3A, 0.0f, globalCtx); + + if (func_80833B2C(this)) { + temp1 = func_8083FD78(this, &sp3C, &sp3A, globalCtx); + } else { + temp1 = func_8083FC68(this, sp3C, sp3A); + } + + if (temp1 > 0) { + func_8083C858(this, globalCtx); + return; + } + + if (temp1 < 0) { + if (func_80833B2C(this)) { + func_8083CB2C(this, sp3A, globalCtx); + } else { + func_8083CBF0(this, sp3A, globalCtx); + } + return; + } + + if ((this->linearVelocity < 3.6f) && (sp3C < 4.0f)) { + if (!func_8008E9C4(this) && func_80833B2C(this)) { + func_8083CB94(this, globalCtx); + } else { + func_80839F90(this, globalCtx); + } + return; + } + + func_80840138(this, sp3C, sp3A); + + temp2 = sp3A - this->currentYaw; + temp3 = ABS(temp2); + + if (temp3 > 0x4000) { + if (Math_ApproxF(&this->linearVelocity, 0.0f, 3.0f) != 0) { + this->currentYaw = sp3A; + } + return; + } + + sp3C *= 0.9f; + func_80077C6C(&this->linearVelocity, sp3C, 2.0f, 3.0f); + Math_ApproxUpdateScaledS(&this->currentYaw, sp3A, temp3 * 0.1f); + } +} + +void func_80841BA8(Player* this, GlobalContext* globalCtx) { + f32 sp34; + s16 sp32; + + func_800A3BC0(globalCtx, &this->skelAnime); + + if (Player_HoldsTwoHandedWeapon(this)) { + SkelAnime_LoadLinkAnimetion(globalCtx, func_80833338(this), 0, this->skelAnime.limbCount, + this->skelAnime.transitionDrawTbl); + SkelAnime_LoadAnimationType3(globalCtx, this->skelAnime.limbCount, this->skelAnime.limbDrawTbl, + this->skelAnime.transitionDrawTbl, D_80853410); + } + + func_80837268(this, &sp34, &sp32, 0.018f, globalCtx); + + if (!func_80837348(globalCtx, this, D_80854414, 1)) { + if (sp34 != 0.0f) { + this->actor.shape.rot.y = sp32; + func_8083C858(this, globalCtx); + } else if (Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, sp32, this->unk_87E)) { + func_8083C0E8(this, globalCtx); + } + + this->currentYaw = this->actor.shape.rot.y; + } +} + +void func_80841CC4(Player* this, s32 arg1, GlobalContext* globalCtx) { + LinkAnimetionEntry* anim; + s16 target; + f32 rate; + + if (ABS(D_80853610) < 3640) { + target = 0; + } else { + target = CLAMP(D_80853610, -10922, 10922); + } + + Math_ApproxUpdateScaledS(&this->unk_89C, target, 400); + + if ((this->modelAnimType == 3) || ((this->unk_89C == 0) && (this->unk_6C4 <= 0.0f))) { + if (arg1 == 0) { + func_800A42A0(globalCtx, &this->skelAnime, D_8085392C[this->modelAnimType], this->unk_868); + } else { + func_800A425C(globalCtx, &this->skelAnime, D_8085392C[this->modelAnimType], this->unk_868); + } + return; + } + + if (this->unk_89C != 0) { + rate = this->unk_89C / 10922.0f; + } else { + rate = this->unk_6C4 * 0.0006f; + } + + rate *= fabsf(this->linearVelocity) * 0.5f; + + if (rate > 1.0f) { + rate = 1.0f; + } + + if (rate < 0.0f) { + anim = &D_04002E48; + rate = -rate; + } else { + anim = &D_04002E90; + } + + if (arg1 == 0) { + func_800A431C(globalCtx, &this->skelAnime, D_8085392C[this->modelAnimType], this->unk_868, anim, this->unk_868, + rate, this->unk_318); + } else { + func_800A43B8(globalCtx, &this->skelAnime, D_8085392C[this->modelAnimType], this->unk_868, anim, this->unk_868, + rate, this->unk_318); + } +} + +void func_80841EE4(Player* this, GlobalContext* globalCtx) { + f32 temp1; + f32 temp2; + + if (this->unk_864 < 1.0f) { + temp1 = R_UPDATE_RATE * 0.5f; + + func_8084029C(this, REG(35) / 1000.0f); + func_800A42A0(globalCtx, &this->skelAnime, D_8085392C[this->modelAnimType], this->unk_868); + + this->unk_864 += 1 * temp1; + if (this->unk_864 >= 1.0f) { + this->unk_864 = 1.0f; + } + + temp1 = this->unk_864; + } else { + temp2 = this->linearVelocity - (REG(48) / 100.0f); + + if (temp2 < 0.0f) { + temp1 = 1.0f; + func_8084029C(this, (REG(35) / 1000.0f) + ((REG(36) / 1000.0f) * this->linearVelocity)); + + func_80841CC4(this, 0, globalCtx); + } else { + temp1 = (REG(37) / 1000.0f) * temp2; + if (temp1 < 1.0f) { + func_8084029C(this, (REG(35) / 1000.0f) + ((REG(36) / 1000.0f) * this->linearVelocity)); + } else { + temp1 = 1.0f; + func_8084029C(this, 1.2f + ((REG(38) / 1000.0f) * temp2)); + } + + func_80841CC4(this, 1, globalCtx); + + func_800A42A0(globalCtx, &this->skelAnime, func_80833438(this), this->unk_868 * 0.689655185f); + } + } + + if (temp1 < 1.0f) { + func_800A42E4(globalCtx, &this->skelAnime, 1.0f - temp1); + } +} + +void func_80842180(Player* this, GlobalContext* globalCtx) { + f32 sp2C; + s16 sp2A; + + this->stateFlags2 |= 0x20; + func_80841EE4(this, globalCtx); + + if (!func_80837348(globalCtx, this, D_80854424, 1)) { + if (func_80833C04(this)) { + func_8083C858(this, globalCtx); + return; + } + + func_80837268(this, &sp2C, &sp2A, 0.018f, globalCtx); + + if (!func_8083C484(this, &sp2C, &sp2A)) { + func_8083DF68(this, sp2C, sp2A); + func_8083DDC8(this, globalCtx); + + if ((this->linearVelocity == 0.0f) && (sp2C == 0.0f)) { + func_8083C0B8(this, globalCtx); + } + } + } +} + +void func_8084227C(Player* this, GlobalContext* globalCtx) { + f32 sp2C; + s16 sp2A; + + this->stateFlags2 |= 0x20; + func_80841EE4(this, globalCtx); + + if (!func_80837348(globalCtx, this, D_80854430, 1)) { + if (!func_80833C04(this)) { + func_8083C858(this, globalCtx); + return; + } + + func_80837268(this, &sp2C, &sp2A, 0.0f, globalCtx); + + if (!func_8083C484(this, &sp2C, &sp2A)) { + if ((func_80833B2C(this) && (sp2C != 0.0f) && (func_8083FD78(this, &sp2C, &sp2A, globalCtx) <= 0)) || + (!func_80833B2C(this) && (func_8083FC68(this, sp2C, sp2A) <= 0))) { + func_80839F90(this, globalCtx); + return; + } + + func_8083DF68(this, sp2C, sp2A); + func_8083DDC8(this, globalCtx); + + if ((this->linearVelocity == 0) && (sp2C == 0)) { + func_80839F90(this, globalCtx); + } + } + } +} + +void func_808423EC(Player* this, GlobalContext* globalCtx) { + s32 sp34; + f32 sp30; + s16 sp2E; + + sp34 = func_800A3BC0(globalCtx, &this->skelAnime); + + if (!func_80837348(globalCtx, this, D_80854408, 1)) { + if (!func_80833C04(this)) { + func_8083C858(this, globalCtx); + return; + } + + func_80837268(this, &sp30, &sp2E, 0.0f, globalCtx); + + if ((this->skelAnime.transCurrentFrame == 0.0f) && (this->skelAnime.animCurrentFrame > 5.0f)) { + func_8083721C(this); + + if ((this->skelAnime.animCurrentFrame > 10.0f) && (func_8083FC68(this, sp30, sp2E) < 0)) { + func_8083CBF0(this, sp2E, globalCtx); + return; + } + + if (sp34 != 0) { + func_8083CD00(this, globalCtx); + } + } + } +} + +void func_8084251C(Player* this, GlobalContext* globalCtx) { + s32 sp34; + f32 sp30; + s16 sp2E; + + sp34 = func_800A3BC0(globalCtx, &this->skelAnime); + + func_8083721C(this); + + if (!func_80837348(globalCtx, this, D_80854440, 1)) { + func_80837268(this, &sp30, &sp2E, 0.0f, globalCtx); + + if (this->linearVelocity == 0.0f) { + this->currentYaw = this->actor.shape.rot.y; + + if (func_8083FC68(this, sp30, sp2E) > 0) { + func_8083C858(this, globalCtx); + return; + } + + if ((sp30 != 0.0f) || (sp34 != 0)) { + func_80839F90(this, globalCtx); + } + } + } +} + +void func_8084260C(Vec3f* src, Vec3f* dest, f32 arg2, f32 arg3, f32 arg4) { + dest->x = (Math_Rand_ZeroOne() * arg3) + src->x; + dest->y = (Math_Rand_ZeroOne() * arg4) + (src->y + arg2); + dest->z = (Math_Rand_ZeroOne() * arg3) + src->z; +} + +Vec3f D_808545B4 = { 0.0f, 0.0f, 0.0f }; +Vec3f D_808545C0 = { 0.0f, 0.0f, 0.0f }; + +s32 func_8084269C(GlobalContext* globalCtx, Player* this) { + Vec3f sp2C; + + if ((this->unk_89E == 0) || (this->unk_89E == 1)) { + func_8084260C(&this->actor.unk_CC[0], &sp2C, this->actor.groundY - this->actor.unk_CC[0].y, 7.0f, 5.0f); + func_800286CC(globalCtx, &sp2C, &D_808545B4, &D_808545C0, 50, 30); + func_8084260C(&this->actor.unk_CC[1], &sp2C, this->actor.groundY - this->actor.unk_CC[1].y, 7.0f, 5.0f); + func_800286CC(globalCtx, &this->actor.unk_CC[1], &D_808545B4, &D_808545C0, 50, 30); + return 1; + } + + return 0; +} + +void func_8084279C(Player* this, GlobalContext* globalCtx) { + func_80832CB0(globalCtx, this, D_80853C2C[this->modelAnimType]); + + if (DECR(this->unk_850) == 0) { + if (!func_8083B040(this, globalCtx)) { + func_8083A098(this, D_80853C44[this->modelAnimType], globalCtx); + } + + this->actor.flags &= ~0x100; + func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); + } +} + +s32 func_8084285C(Player* this, f32 arg1, f32 arg2, f32 arg3) { + if ((arg1 <= this->skelAnime.animCurrentFrame) && (this->skelAnime.animCurrentFrame <= arg3)) { + func_80833A20(this, (arg2 <= this->skelAnime.animCurrentFrame) ? 1 : -1); + return 1; + } + + func_80832318(this); + return 0; +} + +s32 func_808428D8(Player* this, GlobalContext* globalCtx) { + if (!Player_IsChildWithHylianShield(this) && Player_GetSwordHeld(this) && D_80853614) { + func_80832264(globalCtx, this, &D_04002EC8); + this->unk_84F = 1; + this->swordAnimation = 0xC; + this->currentYaw = this->actor.shape.rot.y + this->unk_6BE; + return 1; + } + + return 0; +} + +s32 func_80842964(Player* this, GlobalContext* globalCtx) { + return func_8083B040(this, globalCtx) || func_8083B644(this, globalCtx) || func_8083E5A8(this, globalCtx); +} + +void func_808429B4(GlobalContext* globalCtx, s32 speed, s32 y, s32 countdown) { + s32 quakeIdx = Quake_Add(Gameplay_GetCamera(globalCtx, 0), 3); + Quake_SetSpeed(quakeIdx, speed); + Quake_SetQuakeValues(quakeIdx, y, 0, 0, 0); + Quake_SetCountdown(quakeIdx, countdown); +} + +void func_80842A28(GlobalContext* globalCtx, Player* this) { + func_808429B4(globalCtx, 27767, 7, 20); + globalCtx->actorCtx.unk_02 = 4; + func_8083264C(this, 255, 20, 150, 0); + func_8002F7DC(&this->actor, NA_SE_IT_HAMMER_HIT); +} + +void func_80842A88(GlobalContext* globalCtx, Player* this) { + Inventory_ChangeAmmo(ITEM_STICK, -1); + func_80835F44(globalCtx, this, ITEM_NONE); +} + +s32 func_80842AC4(GlobalContext* globalCtx, Player* this) { + if ((this->heldItemActionParam == PLAYER_AP_STICK) && (this->unk_85C > 0.5f)) { + if (AMMO(ITEM_STICK) != 0) { + func_800298EC(globalCtx, &this->bodyPartsPos[15], this->actor.shape.rot.y + 0x8000); + this->unk_85C = 0.5f; + func_80842A88(globalCtx, this); + func_8002F7DC(&this->actor, NA_SE_IT_WOODSTICK_BROKEN); + } + + return 1; + } + + return 0; +} + +s32 func_80842B7C(GlobalContext* globalCtx, Player* this) { + if (this->heldItemActionParam == PLAYER_AP_SWORD_BGS) { + if ((gSaveContext.bgsFlag == 0) && (gSaveContext.swordHealth > 0.0f)) { + if ((gSaveContext.swordHealth -= 1.0f) <= 0.0f) { + func_800298EC(globalCtx, &this->bodyPartsPos[15], this->actor.shape.rot.y + 0x8000); + func_800849EC(globalCtx); + func_8002F7DC(&this->actor, NA_SE_IT_MAJIN_SWORD_BROKEN); + } + } + + return 1; + } + + return 0; +} + +void func_80842CF0(GlobalContext* globalCtx, Player* this) { + func_80842AC4(globalCtx, this); + func_80842B7C(globalCtx, this); +} + +LinkAnimetionEntry* D_808545CC[] = { + 0x04002B10, + 0x04002B20, + 0x04002B08, + 0x04002B18, +}; + +void func_80842D20(GlobalContext* globalCtx, Player* this) { + s32 pad; + s32 sp28; + + if (func_80843188 != this->func_674) { + func_80832440(globalCtx, this); + func_80835C58(globalCtx, this, func_808505DC, 0); + + if (func_8008E9C4(this)) { + sp28 = 2; + } else { + sp28 = 0; + } + + func_808322D0(globalCtx, this, D_808545CC[Player_HoldsTwoHandedWeapon(this) + sp28]); + } + + func_8083264C(this, 180, 20, 100, 0); + this->linearVelocity = -18.0f; + func_80842CF0(globalCtx, this); +} + +s32 func_80842DF4(GlobalContext* globalCtx, Player* this) { + f32 phi_f2; + CollisionPoly* sp78; + u32 sp74; + Vec3f sp68; + Vec3f sp5C; + Vec3f sp50; + s32 temp1; + s32 sp48; + + if (this->swordState > 0) { + if (this->swordAnimation < 0x18) { + if (!(this->swordQuads[0].base.atFlags & 4) && !(this->swordQuads[1].base.atFlags & 4)) { + if (this->skelAnime.animCurrentFrame >= 2.0f) { + + phi_f2 = Math_Vec3f_DistXYZAndStoreDiff(&this->swordInfo[0].tip, &this->swordInfo[0].base, &sp50); + if (phi_f2 != 0.0f) { + phi_f2 = (phi_f2 + 10.0f) / phi_f2; + } + + sp68.x = this->swordInfo[0].tip.x + (sp50.x * phi_f2); + sp68.y = this->swordInfo[0].tip.y + (sp50.y * phi_f2); + sp68.z = this->swordInfo[0].tip.z + (sp50.z * phi_f2); + + if ((func_8003DE84(&globalCtx->colCtx, &sp68, &this->swordInfo[0].tip, &sp5C, &sp78, 1, 0, 0, 1, + &sp74) != 0) && + (func_8004200C(&globalCtx->colCtx, sp78, sp74) == 0) && + (func_80041D4C(&globalCtx->colCtx, sp78, sp74) != 6) && + (func_8002F9EC(globalCtx, &this->actor, sp78, sp74, &sp5C) == 0)) { + + if (this->heldItemActionParam == PLAYER_AP_HAMMER) { + func_80832630(globalCtx); + func_80842A28(globalCtx, this); + func_80842D20(globalCtx, this); + return 1; + } + + if (this->linearVelocity >= 0.0f) { + sp48 = func_80041F10(&globalCtx->colCtx, sp78, sp74); + + if (sp48 == 0xA) { + func_80062E14(globalCtx, &sp5C, &this->actor.projectedPos); + } else { + func_80062CD4(globalCtx, &sp5C); + if (sp48 == 0xB) { + func_8002F7DC(&this->actor, NA_SE_IT_WALL_HIT_SOFT); + } else { + func_8002F7DC(&this->actor, NA_SE_IT_WALL_HIT_HARD); + } + } + + func_80842CF0(globalCtx, this); + this->linearVelocity = -14.0f; + func_8083264C(this, 180, 20, 100, 0); + } + } + } + } else { + func_80842D20(globalCtx, this); + func_80832630(globalCtx); + return 1; + } + } + + temp1 = (this->swordQuads[0].base.atFlags & 2) || (this->swordQuads[1].base.atFlags & 2); + + if (temp1) { + if (this->swordAnimation < 0x18) { + Actor* at = this->swordQuads[temp1 ? 1 : 0].base.at; + + if ((at != NULL) && (at->id != ACTOR_EN_KANBAN)) { + func_80832630(globalCtx); + } + } + + if ((func_80842AC4(globalCtx, this) == 0) && (this->heldItemActionParam != PLAYER_AP_HAMMER)) { + func_80842B7C(globalCtx, this); + + if (this->actor.colChkInfo.atHitEffect == 1) { + this->actor.colChkInfo.damage = 8; + func_80837C0C(globalCtx, this, 4, 0.0f, 0.0f, this->actor.shape.rot.y, 20); + return 1; + } + } + } + } + + return 0; +} + +void func_80843188(Player* this, GlobalContext* globalCtx) { + f32 sp54; + f32 sp50; + s16 sp4E; + s16 sp4C; + s16 sp4A; + s16 sp48; + s16 sp46; + f32 sp40; + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + if (!Player_IsChildWithHylianShield(this)) { + func_80832284(globalCtx, this, D_80853B0C[this->modelAnimType]); + } + this->unk_850 = 1; + this->unk_84F = 0; + } + + if (!Player_IsChildWithHylianShield(this)) { + this->stateFlags1 |= 0x400000; + func_80836670(this, globalCtx); + this->stateFlags1 &= ~0x400000; + } + + func_8083721C(this); + + if (this->unk_850 != 0) { + sp54 = sControlInput->rel.in.y * 100; + sp50 = sControlInput->rel.in.x * -120; + sp4E = this->actor.shape.rot.y - func_8005A948(ACTIVE_CAM); + + sp40 = Math_Coss(sp4E); + sp4C = (Math_Sins(sp4E) * sp50) + (sp54 * sp40); + sp40 = Math_Coss(sp4E); + sp4A = (sp50 * sp40) - (Math_Sins(sp4E) * sp54); + + if (sp4C > 3500) { + sp4C = 3500; + } + + sp48 = ABS(sp4C - this->actor.posRot2.rot.x) * 0.25f; + if (sp48 < 100) { + sp48 = 100; + } + + sp46 = ABS(sp4A - this->unk_6BE) * 0.25f; + if (sp46 < 50) { + sp46 = 50; + } + + Math_ApproxUpdateScaledS(&this->actor.posRot2.rot.x, sp4C, sp48); + this->unk_6BC = this->actor.posRot2.rot.x; + Math_ApproxUpdateScaledS(&this->unk_6BE, sp4A, sp46); + + if (this->unk_84F != 0) { + if (!func_80842DF4(globalCtx, this)) { + if (this->skelAnime.animCurrentFrame < 2.0f) { + func_80833A20(this, 1); + } + } else { + this->unk_850 = 1; + this->unk_84F = 0; + } + } else if (!func_80842964(this, globalCtx)) { + if (func_8083C2B0(this, globalCtx)) { + func_808428D8(this, globalCtx); + } else { + this->stateFlags1 &= ~0x400000; + func_80832318(this); + + if (Player_IsChildWithHylianShield(this)) { + func_8083A060(this, globalCtx); + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, &D_04002400, 1.0f, + SkelAnime_GetFrameCount(&D_04002400.genericHeader), 0.0f, 2, 0.0f); + func_80832F54(globalCtx, this, 4); + } else { + if (this->itemActionParam < 0) { + func_8008EC70(this); + } + func_8083A098(this, D_80853B24[this->modelAnimType], globalCtx); + } + + func_8002F7DC(&this->actor, NA_SE_IT_SHIELD_REMOVE); + return; + } + } else { + return; + } + } + + this->stateFlags1 |= 0x400000; + Player_SetModelsForHoldingShield(this); + + this->unk_6AE |= 0xC1; +} + +void func_808435C4(Player* this, GlobalContext* globalCtx) { + s32 temp; + LinkAnimetionEntry* anim; + f32 frames; + + func_8083721C(this); + + if (this->unk_84F == 0) { + D_808535E0 = func_80836670(this, globalCtx); + if ((func_80834B5C == this->func_82C) || (func_808374A0(globalCtx, this, &this->skelAnime2, 4.0f) > 0)) { + func_80835C58(globalCtx, this, func_80840450, 1); + } + } else { + temp = func_808374A0(globalCtx, this, &this->skelAnime, 4.0f); + if ((temp != 0) && ((temp > 0) || func_800A3BC0(globalCtx, &this->skelAnime))) { + func_80835C58(globalCtx, this, func_80843188, 1); + this->stateFlags1 |= 0x400000; + Player_SetModelsForHoldingShield(this); + anim = D_80853AF4[this->modelAnimType]; + frames = SkelAnime_GetFrameCount(&anim->genericHeader); + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, anim, 1.0f, frames, frames, 2, 0.0f); + } + } +} + +void func_8084370C(Player* this, GlobalContext* globalCtx) { + s32 sp1C; + + func_8083721C(this); + + sp1C = func_808374A0(globalCtx, this, &this->skelAnime, 16.0f); + if ((sp1C != 0) && (func_800A3BC0(globalCtx, &this->skelAnime) || (sp1C > 0))) { + func_80839F90(this, globalCtx); + } +} + +void func_8084377C(Player* this, GlobalContext* globalCtx) { + this->stateFlags2 |= 0x60; + + func_808382BC(this); + + if (!(this->stateFlags1 & 0x20000000) && (this->unk_850 == 0) && (this->unk_8A1 != 0)) { + s16 temp = this->actor.shape.rot.y - this->unk_8A2; + + this->currentYaw = this->actor.shape.rot.y = this->unk_8A2; + this->linearVelocity = this->unk_8A4; + + if (ABS(temp) > 0x4000) { + this->actor.shape.rot.y = this->unk_8A2 + 0x8000; + } + + if (this->actor.velocity.y < 0.0f) { + this->actor.gravity = 0.0f; + this->actor.velocity.y = 0.0f; + } + } + + if (func_800A3BC0(globalCtx, &this->skelAnime) && (this->actor.bgCheckFlags & 1)) { + if (this->unk_850 != 0) { + this->unk_850--; + if (this->unk_850 == 0) { + func_80853080(this, globalCtx); + } + } else if ((this->stateFlags1 & 0x20000000) || (!(this->cylinder.base.acFlags & 2) && (this->unk_8A1 == 0))) { + if (this->stateFlags1 & 0x20000000) { + this->unk_850++; + } else { + func_80835C58(globalCtx, this, func_80843954, 0); + this->stateFlags1 |= 0x4000000; + } + + func_80832264(globalCtx, this, (this->currentYaw != this->actor.shape.rot.y) ? &D_04002F60 : &D_04002DB8); + func_80832698(this, NA_SE_VO_LI_FREEZE); + } + } + + if (this->actor.bgCheckFlags & 2) { + func_80832770(this, NA_SE_PL_BOUND); + } +} + +void func_80843954(Player* this, GlobalContext* globalCtx) { + this->stateFlags2 |= 0x60; + func_808382BC(this); + + func_8083721C(this); + + if (func_800A3BC0(globalCtx, &this->skelAnime) && (this->linearVelocity == 0.0f)) { + if (this->stateFlags1 & 0x20000000) { + this->unk_850++; + } else { + func_80835C58(globalCtx, this, func_80843A38, 0); + this->stateFlags1 |= 0x4000000; + } + + func_808322D0(globalCtx, this, (this->currentYaw != this->actor.shape.rot.y) ? &D_04002F68 : &D_04002DC0); + this->currentYaw = this->actor.shape.rot.y; + } +} + +struct_80832924 D_808545DC[] = { + { 0, 0x4014 }, + { 0, -0x401E }, +}; + +void func_80843A38(Player* this, GlobalContext* globalCtx) { + s32 sp24; + + this->stateFlags2 |= 0x20; + func_808382BC(this); + + if (this->stateFlags1 & 0x20000000) { + func_800A3BC0(globalCtx, &this->skelAnime); + } else { + sp24 = func_808374A0(globalCtx, this, &this->skelAnime, 16.0f); + if ((sp24 != 0) && (func_800A3BC0(globalCtx, &this->skelAnime) || (sp24 > 0))) { + func_80839F90(this, globalCtx); + } + } + + func_80832924(this, D_808545DC); +} + +Vec3f D_808545E4 = { 0.0f, 0.0f, 5.0f }; + +void func_80843AE8(GlobalContext* globalCtx, Player* this) { + if (this->unk_850 != 0) { + if (this->unk_850 > 0) { + this->unk_850--; + if (this->unk_850 == 0) { + if (this->stateFlags1 & 0x8000000) { + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, &D_04003328, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_04003328.genericHeader), 2, -16.0f); + } else { + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, &D_04002878, 1.0f, 99.0f, + SkelAnime_GetFrameCount(&D_04002878.genericHeader), 2, 0.0f); + } + gSaveContext.healthAccumulator = 0x140; + this->unk_850 = -1; + } + } else if (gSaveContext.healthAccumulator == 0) { + this->stateFlags1 &= ~0x80; + if (this->stateFlags1 & 0x8000000) { + func_80838F18(globalCtx, this); + } else { + func_80853080(this, globalCtx); + } + this->unk_A87 = 20; + func_80837AFC(this, -20); + func_800F47FC(); + } + } else if (this->unk_84F != 0) { + this->unk_850 = 60; + func_80839680(globalCtx, this, &this->actor.posRot.pos, &D_808545E4, 5); + 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) { + globalCtx->unk_10A20 = 3; + } +} + +struct_80832924 D_808545F0[] = { + { NA_SE_PL_BOUND, 0x103C }, + { 0, 0x408C }, + { 0, 0x40A4 }, + { 0, -0x40AA }, +}; + +void func_80843CEC(Player* this, GlobalContext* globalCtx) { + if (this->currentTunic != PLAYER_TUNIC_GORON) { + if ((globalCtx->roomCtx.curRoom.unk_02 == 3) || (D_808535E4 == 9) || + ((func_80838144(D_808535E4) >= 0) && + !func_80042108(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource))) { + func_8083821C(this); + } + } + + func_8083721C(this); + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + if (this->actor.type == ACTORTYPE_PLAYER) { + func_80843AE8(globalCtx, this); + } + return; + } + + if (this->skelAnime.linkAnimetionSeg == &D_04002878) { + func_80832924(this, D_808545F0); + } else if (this->skelAnime.linkAnimetionSeg == &D_04002F08) { + if (func_800A4530(&this->skelAnime, 88.0f)) { + func_80832770(this, NA_SE_PL_BOUND); + } + } +} + +void func_80843E14(Player* this, u16 sfxId) { + func_80832698(this, sfxId); + + if ((this->heldActor != NULL) && (this->heldActor->id == ACTOR_EN_RU1)) { + Audio_PlayActorSound2(this->heldActor, NA_SE_VO_RT_FALL); + } +} + +FallImpactInfo D_80854600[] = { + { -8, 180, 40, 100, NA_SE_VO_LI_LAND_DAMAGE_S }, + { -16, 255, 140, 150, NA_SE_VO_LI_LAND_DAMAGE_S }, +}; + +s32 func_80843E64(GlobalContext* globalCtx, Player* this) { + s32 sp34; + + if ((D_808535E4 == 6) || (D_808535E4 == 9)) { + sp34 = 0; + } else { + sp34 = this->fallDistance; + } + + Math_ApproxF(&this->linearVelocity, 0.0f, 1.0f); + + this->stateFlags1 &= ~0xC0000; + + if (sp34 >= 400) { + s32 impactIndex; + FallImpactInfo* impactInfo; + + if (this->fallDistance < 800) { + impactIndex = 0; + } else { + impactIndex = 1; + } + + impactInfo = &D_80854600[impactIndex]; + + if (Player_InflictDamage(globalCtx, impactInfo->damage)) { + return -1; + } + + func_80837AE0(this, 40); + func_808429B4(globalCtx, 32967, 2, 30); + func_8083264C(this, impactInfo->unk_01, impactInfo->unk_02, impactInfo->unk_03, 0); + func_8002F7DC(&this->actor, NA_SE_PL_BODY_HIT); + func_80832698(this, impactInfo->sfxId); + + return impactIndex + 1; + } + + if (sp34 > 200) { + sp34 *= 2; + + if (sp34 > 255) { + sp34 = 255; + } + + func_8083264C(this, (u8)sp34, (u8)(sp34 * 0.1f), (u8)sp34, 0); + + if (D_808535E4 == 6) { + func_80832698(this, NA_SE_VO_LI_CLIMB_END); + } + } + + func_808328A0(this); + + return 0; +} + +void func_8084409C(GlobalContext* globalCtx, Player* this, f32 speedXZ, f32 velocityY) { + Actor* heldActor = this->heldActor; + + if (!func_80835644(globalCtx, this, heldActor)) { + heldActor->posRot.rot.y = this->actor.shape.rot.y; + heldActor->speedXZ = speedXZ; + heldActor->velocity.y = velocityY; + func_80834644(globalCtx, this); + func_8002F7DC(&this->actor, NA_SE_PL_THROW); + func_80832698(this, NA_SE_VO_LI_SWORD_N); + } +} + +void func_8084411C(Player* this, GlobalContext* globalCtx) { + f32 sp4C; + s16 sp4A; + + if (gSaveContext.respawn[RESPAWN_MODE_TOP].data > 40) { + this->actor.gravity = 0.0f; + } else if (func_8008E9C4(this)) { + this->actor.gravity = -1.2f; + } + + func_80837268(this, &sp4C, &sp4A, 0.0f, globalCtx); + + if (!(this->actor.bgCheckFlags & 1)) { + if (this->stateFlags1 & 0x800) { + Actor* heldActor = this->heldActor; + + if (!func_80835644(globalCtx, this, heldActor) && (heldActor->id == ACTOR_EN_NIW) && + (sControlInput->press.in.button & (A_BUTTON | B_BUTTON | L_CBUTTONS | R_CBUTTONS | D_CBUTTONS))) { + func_8084409C(globalCtx, this, this->linearVelocity + 2.0f, this->actor.velocity.y + 2.0f); + } + } + + func_800A3BC0(globalCtx, &this->skelAnime); + + if (!(this->stateFlags2 & 0x80000)) { + func_8083DFE0(this, &sp4C, &sp4A); + } + + func_80836670(this, globalCtx); + + if (((this->stateFlags2 & 0x80000) && (this->unk_84F == 2)) || !func_8083BBA0(this, globalCtx)) { + if (this->actor.velocity.y < 0.0f) { + if (this->unk_850 >= 0) { + if ((this->actor.bgCheckFlags & 8) || (this->unk_850 == 0) || (this->fallDistance > 0)) { + if ((D_80853600 > 800.0f) || (this->stateFlags1 & 4)) { + func_80843E14(this, NA_SE_VO_LI_FALL_S); + this->stateFlags1 &= ~4; + } + + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, &D_04003020, 1.0f, 0.0f, 0.0f, 2, 8.0f); + this->unk_850 = -1; + } + } else { + if ((this->unk_850 == -1) && (this->fallDistance > 120.0f) && (D_80853600 > 280.0f)) { + this->unk_850 = -2; + func_80843E14(this, NA_SE_VO_LI_FALL_L); + } + + if ((this->actor.bgCheckFlags & 0x200) && !(this->stateFlags2 & 0x80000) && + !(this->stateFlags1 & 0x8000800) && (this->linearVelocity > 0.0f)) { + if ((this->wallHeight >= 150.0f) && (this->unk_84B[this->unk_846] == 0)) { + func_8083EC18(this, globalCtx, D_808535F0); + } else if ((this->unk_88C >= 2) && (this->wallHeight < 150.0f) && + (((this->actor.posRot.pos.y - this->actor.groundY) + this->wallHeight) > + (70.0f * this->ageProperties->unk_08))) { + func_800A3310(globalCtx); + if (this->stateFlags1 & 4) { + func_80832698(this, NA_SE_VO_LI_HOOKSHOT_HANG); + } else { + func_80832698(this, NA_SE_VO_LI_HANG); + } + this->actor.posRot.pos.y += this->wallHeight; + func_8083A5C4(globalCtx, this, this->actor.wallPoly, this->wallDistance, + D_80853CBC[this->modelAnimType]); + this->actor.shape.rot.y = this->currentYaw += 0x8000; + this->stateFlags1 |= 0x2000; + } + } + } + } + } + } else { + LinkAnimetionEntry* anim = D_80853A64[this->modelAnimType]; + s32 sp3C; + + if (this->stateFlags2 & 0x80000) { + if (func_8008E9C4(this)) { + anim = D_80853D4C[this->unk_84F][2]; + } else { + anim = D_80853D4C[this->unk_84F][1]; + } + } else if (this->skelAnime.linkAnimetionSeg == &D_04003148) { + anim = &D_04003150; + } else if (func_8008E9C4(this)) { + anim = &D_04002538; + func_80833C3C(this); + } else if (this->fallDistance <= 80) { + anim = D_80853A7C[this->modelAnimType]; + } else if ((this->fallDistance < 800) && (this->unk_84B[this->unk_846] == 0) && !(this->stateFlags1 & 0x800)) { + func_8083BC04(this, globalCtx); + return; + } + + sp3C = func_80843E64(globalCtx, this); + + if (sp3C > 0) { + func_8083A098(this, D_80853A64[this->modelAnimType], globalCtx); + this->skelAnime.animFrameCount = 8.0f; + if (sp3C == 1) { + this->unk_850 = 10; + } else { + this->unk_850 = 20; + } + } else if (sp3C == 0) { + func_8083A098(this, anim, globalCtx); + } + } +} + +struct_80832924 D_8085460C[] = { + { NA_SE_VO_LI_SWORD_N, 0x2001 }, + { NA_SE_PL_WALK_GROUND, 0x1806 }, + { NA_SE_PL_ROLL, 0x806 }, + { 0, -0x2812 }, +}; + +void func_80844708(Player* this, GlobalContext* globalCtx) { + Actor* cylinderOc; + s32 temp; + s32 sp44; + DynaPolyActor* wallPolyActor; + s32 pad; + f32 sp38; + s16 sp36; + + this->stateFlags2 |= 0x20; + + cylinderOc = NULL; + sp44 = func_800A3BC0(globalCtx, &this->skelAnime); + + if (func_800A4530(&this->skelAnime, 8.0f)) { + func_80837AFC(this, -10); + } + + if (func_80842964(this, globalCtx) == 0) { + if (this->unk_850 != 0) { + Math_ApproxF(&this->linearVelocity, 0.0f, 2.0f); + + temp = func_808374A0(globalCtx, this, &this->skelAnime, 5.0f); + if ((temp != 0) && ((temp > 0) || sp44)) { + func_8083A060(this, globalCtx); + } + } else { + if (this->linearVelocity >= 7.0f) { + if (((this->actor.bgCheckFlags & 0x200) && (D_8085360C < 0x2000)) || + ((this->cylinder.base.maskA & 2) && + (cylinderOc = this->cylinder.base.oc, + ((cylinderOc->id == ACTOR_EN_WOOD02) && + (ABS((s16)(this->actor.posRot.rot.y - cylinderOc->yawTowardsLink)) > 0x6000))))) { + + if (cylinderOc != NULL) { + cylinderOc->initPosRot.rot.y = 1; + } else if (this->actor.wallPolySource != 50) { + wallPolyActor = DynaPolyInfo_GetActor(&globalCtx->colCtx, this->actor.wallPolySource); + if ((wallPolyActor != NULL) && (wallPolyActor->actor.id == ACTOR_OBJ_KIBAKO2)) { + wallPolyActor->actor.initPosRot.rot.z = 1; + } + } + + func_80832264(globalCtx, this, D_80853AAC[this->modelAnimType]); + this->linearVelocity = -this->linearVelocity; + func_808429B4(globalCtx, 33267, 3, 12); + func_8083264C(this, 255, 20, 150, 0); + func_8002F7DC(&this->actor, NA_SE_PL_BODY_HIT); + func_80832698(this, NA_SE_VO_LI_CLIMB_END); + this->unk_850 = 1; + return; + } + } + + if ((this->skelAnime.animCurrentFrame < 15.0f) || !func_80850224(this, globalCtx)) { + if (this->skelAnime.animCurrentFrame >= 20.0f) { + func_8083A060(this, globalCtx); + return; + } + + func_80837268(this, &sp38, &sp36, 0.018f, globalCtx); + + sp38 *= 1.5f; + if ((sp38 < 3.0f) || (this->unk_84B[this->unk_846] != 0)) { + sp38 = 3.0f; + } + + func_8083DF68(this, sp38, this->actor.shape.rot.y); + + if (func_8084269C(globalCtx, this)) { + func_8002F8F0(&this->actor, NA_SE_PL_ROLL_DUST - SFX_FLAG); + } + + func_80832924(this, D_8085460C); + } + } + } +} + +void func_80844A44(Player* this, GlobalContext* globalCtx) { + this->stateFlags2 |= 0x20; + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80832284(globalCtx, this, &D_04003160); + } + + Math_ApproxF(&this->linearVelocity, 0.0f, 0.05f); + + if (this->actor.bgCheckFlags & 1) { + this->actor.colChkInfo.damage = 0x10; + func_80837C0C(globalCtx, this, 1, 4.0f, 5.0f, this->actor.shape.rot.y, 20); + } +} + +void func_80844AF4(Player* this, GlobalContext* globalCtx) { + f32 sp2C; + s16 sp2A; + + this->stateFlags2 |= 0x20; + + this->actor.gravity = -1.2f; + func_800A3BC0(globalCtx, &this->skelAnime); + + if (!func_80842DF4(globalCtx, this)) { + func_8084285C(this, 6.0f, 7.0f, 99.0f); + + if (!(this->actor.bgCheckFlags & 1)) { + func_80837268(this, &sp2C, &sp2A, 0.0f, globalCtx); + func_8083DFE0(this, &sp2C, &this->currentYaw); + return; + } + + if (func_80843E64(globalCtx, this) >= 0) { + this->swordAnimation += 2; + func_80837948(globalCtx, this, this->swordAnimation); + this->unk_845 = 3; + func_808328A0(this); + } + } +} + +s32 func_80844BE4(Player* this, GlobalContext* globalCtx) { + s32 temp; + + if (func_8083ADD4(globalCtx, this)) { + this->stateFlags2 |= 0x20000; + } else { + if (!CHECK_PAD(sControlInput->cur, B_BUTTON)) { + if ((this->unk_858 >= 0.85f) || func_808375D8(this)) { + temp = D_80854384[Player_HoldsTwoHandedWeapon(this)]; + } else { + temp = D_80854380[Player_HoldsTwoHandedWeapon(this)]; + } + + func_80837948(globalCtx, this, temp); + func_80837AFC(this, -8); + + this->stateFlags2 |= 0x20000; + if (this->unk_84B[this->unk_846] == 0) { + this->stateFlags2 |= 0x40000000; + } + } else { + return 0; + } + } + + return 1; +} + +void func_80844CF8(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_80845000, 1); +} + +void func_80844D30(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_80845308, 1); +} + +void func_80844D68(Player* this, GlobalContext* globalCtx) { + func_80839FFC(this, globalCtx); + func_80832318(this); + func_80832B0C(globalCtx, this, D_80854368[Player_HoldsTwoHandedWeapon(this)]); + this->currentYaw = this->actor.shape.rot.y; +} + +void func_80844DC8(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_80844E68, 1); + this->unk_868 = 0.0f; + func_80832284(globalCtx, this, D_80854360[Player_HoldsTwoHandedWeapon(this)]); + this->unk_850 = 1; +} + +void func_80844E3C(Player* this) { + Math_ApproxF(&this->unk_858, 1.0f, 0.02f); +} + +void func_80844E68(Player* this, GlobalContext* globalCtx) { + f32 sp34; + s16 sp32; + s32 temp; + + this->stateFlags1 |= 0x1000; + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80832DBC(this); + func_808355DC(this); + this->stateFlags1 &= ~0x20000; + func_80832284(globalCtx, this, D_80854360[Player_HoldsTwoHandedWeapon(this)]); + this->unk_850 = -1; + } + + func_8083721C(this); + + if (!func_80842964(this, globalCtx) && (this->unk_850 != 0)) { + func_80844E3C(this); + + if (this->unk_850 < 0) { + if (this->unk_858 >= 0.1f) { + this->unk_845 = 0; + this->unk_850 = 1; + } else if (!CHECK_PAD(sControlInput->cur, B_BUTTON)) { + func_80844D68(this, globalCtx); + } + } else if (!func_80844BE4(this, globalCtx)) { + func_80837268(this, &sp34, &sp32, 0.0f, globalCtx); + + temp = func_80840058(this, &sp34, &sp32, globalCtx); + if (temp > 0) { + func_80844CF8(this, globalCtx); + } else if (temp < 0) { + func_80844D30(this, globalCtx); + } + } + } +} + +void func_80845000(Player* this, GlobalContext* globalCtx) { + s16 temp1; + s32 temp2; + f32 sp5C; + f32 sp58; + f32 sp54; + s16 sp52; + s32 temp4; + s16 temp5; + s32 sp44; + + temp1 = this->currentYaw - this->actor.shape.rot.y; + temp2 = ABS(temp1); + + sp5C = fabsf(this->linearVelocity); + sp58 = sp5C * 1.5f; + + this->stateFlags1 |= 0x1000; + + if (sp58 < 1.5f) { + sp58 = 1.5f; + } + + sp58 = ((temp2 < 0x4000) ? -1.0f : 1.0f) * sp58; + + func_8084029C(this, sp58); + + sp58 = CLAMP(sp5C * 0.5f, 0.5f, 1.0f); + + func_800A431C(globalCtx, &this->skelAnime, D_80854360[Player_HoldsTwoHandedWeapon(this)], 0.0f, + D_80854370[Player_HoldsTwoHandedWeapon(this)], this->unk_868 * 0.7241379022598267f, sp58, + this->unk_318); + + if (!func_80842964(this, globalCtx) && !func_80844BE4(this, globalCtx)) { + func_80844E3C(this); + func_80837268(this, &sp54, &sp52, 0.0f, globalCtx); + + temp4 = func_80840058(this, &sp54, &sp52, globalCtx); + + if (temp4 < 0) { + func_80844D30(this, globalCtx); + return; + } + + if (temp4 == 0) { + sp54 = 0.0f; + sp52 = this->currentYaw; + } + + temp5 = sp52 - this->currentYaw; + sp44 = ABS(temp5); + + if (sp44 > 0x4000) { + if (Math_ApproxF(&this->linearVelocity, 0.0f, 1.0f)) { + this->currentYaw = sp52; + } + return; + } + + func_80077C6C(&this->linearVelocity, sp54 * 0.2f, 1.0f, 0.5f); + Math_ApproxUpdateScaledS(&this->currentYaw, sp52, sp44 * 0.1f); + + if ((sp54 == 0.0f) && (this->linearVelocity == 0.0f)) { + func_80844DC8(this, globalCtx); + } + } +} + +void func_80845308(Player* this, GlobalContext* globalCtx) { + f32 sp5C; + f32 sp58; + f32 sp54; + s16 sp52; + s32 temp4; + s16 temp5; + s32 sp44; + + sp5C = fabsf(this->linearVelocity); + + this->stateFlags1 |= 0x1000; + + if (sp5C == 0.0f) { + sp5C = ABS(this->unk_87C) * 0.0015f; + if (sp5C < 400.0f) { + sp5C = 0.0f; + } + func_8084029C(this, ((this->unk_87C >= 0) ? 1 : -1) * sp5C); + } else { + sp58 = sp5C * 1.5f; + if (sp58 < 1.5f) { + sp58 = 1.5f; + } + func_8084029C(this, sp58); + } + + sp58 = CLAMP(sp5C * 0.5f, 0.5f, 1.0f); + + func_800A431C(globalCtx, &this->skelAnime, D_80854360[Player_HoldsTwoHandedWeapon(this)], 0.0f, + D_80854378[Player_HoldsTwoHandedWeapon(this)], this->unk_868 * 0.7241379022598267f, sp58, + this->unk_318); + + if (!func_80842964(this, globalCtx) && !func_80844BE4(this, globalCtx)) { + func_80844E3C(this); + func_80837268(this, &sp54, &sp52, 0.0f, globalCtx); + + temp4 = func_80840058(this, &sp54, &sp52, globalCtx); + + if (temp4 > 0) { + func_80844CF8(this, globalCtx); + return; + } + + if (temp4 == 0) { + sp54 = 0.0f; + sp52 = this->currentYaw; + } + + temp5 = sp52 - this->currentYaw; + sp44 = ABS(temp5); + + if (sp44 > 0x4000) { + if (Math_ApproxF(&this->linearVelocity, 0.0f, 1.0f)) { + this->currentYaw = sp52; + } + return; + } + + func_80077C6C(&this->linearVelocity, sp54 * 0.2f, 1.0f, 0.5f); + Math_ApproxUpdateScaledS(&this->currentYaw, sp52, sp44 * 0.1f); + + if ((sp54 == 0.0f) && (this->linearVelocity == 0.0f) && (sp5C == 0.0f)) { + func_80844DC8(this, globalCtx); + } + } +} + +void func_80845668(Player* this, GlobalContext* globalCtx) { + s32 sp3C; + f32 temp1; + s32 temp2; + f32 temp3; + + this->stateFlags2 |= 0x20; + sp3C = func_800A3BC0(globalCtx, &this->skelAnime); + + if (this->skelAnime.linkAnimetionSeg == &D_04002D48) { + this->linearVelocity = 1.0f; + + if (func_800A4530(&this->skelAnime, 8.0f)) { + temp1 = this->wallHeight; + + if (temp1 > this->ageProperties->unk_0C) { + temp1 = this->ageProperties->unk_0C; + } + + if (this->stateFlags1 & 0x8000000) { + temp1 *= 0.085f; + } else { + temp1 *= 0.072f; + } + + if (LINK_IS_CHILD) { + temp1 += 1.0f; + } + + func_80838940(this, NULL, temp1, globalCtx, NA_SE_VO_LI_AUTO_JUMP); + this->unk_850 = -1; + return; + } + } else { + temp2 = func_808374A0(globalCtx, this, &this->skelAnime, 4.0f); + + if (temp2 == 0) { + this->stateFlags1 &= ~0x44000; + return; + } + + if ((sp3C != 0) || (temp2 > 0)) { + func_8083C0E8(this, globalCtx); + this->stateFlags1 &= ~0x44000; + return; + } + + temp3 = 0.0f; + + if (this->skelAnime.linkAnimetionSeg == &D_040032E8) { + if (func_800A4530(&this->skelAnime, 30.0f)) { + func_8083D0A8(globalCtx, this, 10.0f); + } + temp3 = 50.0f; + } else if (this->skelAnime.linkAnimetionSeg == &D_04002D40) { + temp3 = 30.0f; + } else if (this->skelAnime.linkAnimetionSeg == &D_04002D38) { + temp3 = 16.0f; + } + + if (func_800A4530(&this->skelAnime, temp3)) { + func_808328A0(this); + func_80832698(this, NA_SE_VO_LI_CLIMB_END); + } + + if ((this->skelAnime.linkAnimetionSeg == &D_04002D38) || (this->skelAnime.animCurrentFrame > 5.0f)) { + if (this->unk_850 == 0) { + func_80832854(this); + this->unk_850 = 1; + } + Math_ApproxF(&this->actor.shape.unk_08, 0.0f, 150.0f); + } + } +} + +void func_808458D0(Player* this, GlobalContext* globalCtx) { + this->stateFlags2 |= 0x60; + func_800A3BC0(globalCtx, &this->skelAnime); + + if (((this->stateFlags1 & 0x800) && (this->heldActor != NULL) && (this->getItemId == GI_NONE)) || + !func_80836670(this, globalCtx)) { + this->func_A74(globalCtx, this); + } +} + +#ifdef NON_MATCHING +// single regalloc difference +s32 func_80845964(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2, f32 arg3, s16 arg4, s32 arg5) { + if ((arg5 != 0) && (this->linearVelocity == 0.0f)) { + return func_800A3BC0(globalCtx, &this->skelAnime); + } + + if (arg5 != 2) { + f32 sp34 = R_UPDATE_RATE * 0.5f; + f32 selfDistX = arg2->endPos.x - this->actor.posRot.pos.x; + f32 selfDistZ = arg2->endPos.z - this->actor.posRot.pos.z; + f32 sp28 = sqrtf(SQ(selfDistX) + SQ(selfDistZ)) / sp34; + s32 sp24 = (arg2->endFrame - globalCtx->csCtx.frames) + 1; + + arg4 = atan2s(selfDistX, selfDistZ); + + if (arg5 == 1) { + f32 distX = arg2->endPos.x - arg2->startPos.x; + f32 distZ = arg2->endPos.z - arg2->startPos.z; + s32 temp = (((sqrtf(SQ(distX) + SQ(distZ)) / sp34) / (arg2->endFrame - arg2->startFrame)) / 1.5f) * 4.0f; + + if (temp >= sp24) { + arg4 = this->actor.shape.rot.y; + arg3 = 0.0f; + } else { + arg3 = sp28 / ((sp24 - temp) + 1); + } + } else { + arg3 = sp28 / sp24; + } + } + + this->stateFlags2 |= 0x20; + func_80841EE4(this, globalCtx); + func_8083DF68(this, arg3, arg4); + + if ((arg3 == 0.0f) && (this->linearVelocity == 0.0f)) { + func_8083BF50(this, globalCtx); + } + + return 0; +} +#else +s32 func_80845964(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2, f32 arg3, s16 arg4, s32 arg5); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80845964.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80845BA0.s") +s32 func_80845BA0(GlobalContext* arg0, Player* arg1, f32* arg2, s32 arg3) { + f32 dx = arg1->unk_450.x - arg1->actor.posRot.pos.x; + f32 dz = arg1->unk_450.z - arg1->actor.posRot.pos.z; + s32 sp2C = sqrtf(SQ(dx) + SQ(dz)); + s16 yaw = Math_Vec3f_Yaw(&arg1->actor.posRot.pos, &arg1->unk_450); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80845C68.s") + if (sp2C < arg3) { + *arg2 = 0.0f; + yaw = arg1->actor.shape.rot.y; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80845CA4.s") + if (func_80845964(arg0, arg1, NULL, *arg2, yaw, 2)) { + return 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80845EF8.s") + return sp2C; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80846050.s") +s32 func_80845C68(GlobalContext* globalCtx, s32 arg1) { + if (arg1 == 0) { + Gameplay_SetupRespawnPoint(globalCtx, RESPAWN_MODE_DOWN, 0xDFF); + } + gSaveContext.respawn[RESPAWN_MODE_DOWN].data = 0; + return arg1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80846120.s") +void func_80845CA4(Player* this, GlobalContext* globalCtx) { + f32 sp3C; + s32 temp; + f32 sp34; + s32 sp30; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80846260.s") + if (!func_8083B040(this, globalCtx)) { + if (this->unk_850 == 0) { + func_800A3BC0(globalCtx, &this->skelAnime); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80846358.s") + if (DECR(this->doorTimer) == 0) { + this->linearVelocity = 0.1f; + this->unk_850 = 1; + } + } else if (this->unk_84F == 0) { + sp3C = 5.0f * D_808535E8; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80846408.s") + if (func_80845BA0(globalCtx, this, &sp3C, -1) < 30) { + this->unk_84F = 1; + this->stateFlags1 |= 0x20000000; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808464B0.s") + this->unk_450.x = this->unk_45C.x; + this->unk_450.z = this->unk_45C.z; + } + } else { + sp34 = 5.0f; + sp30 = 20; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80846578.s") + if (this->stateFlags1 & 1) { + sp34 = gSaveContext.unk_13BC; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084663C.s") + if (D_808535F4 != 0) { + this->unk_450.x = (Math_Sins(D_808535FC) * 400.0f) + this->actor.posRot.pos.x; + this->unk_450.z = (Math_Coss(D_808535FC) * 400.0f) + this->actor.posRot.pos.z; + } + } else if (this->unk_850 < 0) { + this->unk_850++; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80846648.s") + sp34 = gSaveContext.unk_13BC; + sp30 = -1; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s") + temp = func_80845BA0(globalCtx, this, &sp34, sp30); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80846720.s") + if ((this->unk_850 == 0) || + ((temp == 0) && (this->linearVelocity == 0.0f) && (Gameplay_GetCamera(globalCtx, 0)->unk_14C & 0x10))) { -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s") + func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); + func_80845C68(globalCtx, gSaveContext.respawn[RESPAWN_MODE_DOWN].data); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808468A8.s") + if (!func_8083B644(this, globalCtx)) { + func_8083CF5C(this, globalCtx); + } + } + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808468E8.s") + if (this->stateFlags1 & 0x800) { + func_80836670(this, globalCtx); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80846978.s") +void func_80845EF8(Player* this, GlobalContext* globalCtx) { + s32 sp2C; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808469BC.s") + this->stateFlags2 |= 0x20; + sp2C = func_800A3BC0(globalCtx, &this->skelAnime); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A00.s") + func_80836670(this, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80846A68.s") + if (sp2C) { + if (this->unk_850 == 0) { + if (DECR(this->doorTimer) == 0) { + this->unk_850 = 1; + this->skelAnime.animFrameCount = this->skelAnime.totalFrames - 1.0f; + } + } else { + func_8083C0E8(this, globalCtx); + if (globalCtx->roomCtx.prevRoom.num >= 0) { + func_80097534(globalCtx, &globalCtx->roomCtx); + } + func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); + Gameplay_SetupRespawnPoint(globalCtx, 0, 0xDFF); + } + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s") + if (!(this->stateFlags1 & 0x20000000) && func_800A4530(&this->skelAnime, 15.0f)) { + globalCtx->func_11D54(this, globalCtx); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80846CD8.s") +void func_80846050(Player* this, GlobalContext* globalCtx) { + func_8083721C(this); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808471F4.s") + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80839F90(this, globalCtx); + func_80835688(this, globalCtx); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80847298.s") + if (func_800A4530(&this->skelAnime, 4.0f)) { + Actor* interactRangeActor = this->interactRangeActor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808473D4.s") + if (!func_80835644(globalCtx, this, interactRangeActor)) { + this->heldActor = interactRangeActor; + this->actor.child = interactRangeActor; + interactRangeActor->parent = &this->actor; + interactRangeActor->bgCheckFlags &= 0xFF00; + this->unk_3BC.y = interactRangeActor->shape.rot.y - this->actor.shape.rot.y; + } + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80847A78.s") + Math_ApproxUpdateScaledS(&this->unk_3BC.y, 0, 4000); +} +struct_80832924 D_8085461C[] = { + { NA_SE_VO_LI_SWORD_L, 0x2031 }, + { NA_SE_VO_LI_SWORD_N, -0x20E6 }, +}; + +void func_80846120(Player* this, GlobalContext* globalCtx) { + if (func_800A3BC0(globalCtx, &this->skelAnime) && (this->unk_850++ > 20)) { + if (!func_8083B040(this, globalCtx)) { + func_8083A098(this, &D_04002FA0, globalCtx); + } + return; + } + + if (func_800A4530(&this->skelAnime, 41.0f)) { + BgHeavyBlock* heavyBlock = (BgHeavyBlock*)this->interactRangeActor; + + this->heldActor = &heavyBlock->dyna.actor; + this->actor.child = &heavyBlock->dyna.actor; + heavyBlock->dyna.actor.parent = &this->actor; + func_8002DBD0(&heavyBlock->dyna.actor, &heavyBlock->unk_164, &this->leftHandPos); + return; + } + + if (func_800A4530(&this->skelAnime, 229.0f)) { + Actor* heldActor = this->heldActor; + + heldActor->speedXZ = Math_Sins(heldActor->shape.rot.x) * 40.0f; + heldActor->velocity.y = Math_Coss(heldActor->shape.rot.x) * 40.0f; + heldActor->gravity = -2.0f; + heldActor->minVelocityY = -30.0f; + func_808323B4(globalCtx, this); + return; + } + + func_80832924(this, D_8085461C); +} + +void func_80846260(Player* this, GlobalContext* globalCtx) { + func_8083721C(this); + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80832284(globalCtx, this, &D_040032C0); + this->unk_850 = 1; + return; + } + + if (this->unk_850 == 0) { + if (func_800A4530(&this->skelAnime, 27.0f)) { + Actor* interactRangeActor = this->interactRangeActor; + + this->heldActor = interactRangeActor; + this->actor.child = interactRangeActor; + interactRangeActor->parent = &this->actor; + return; + } + + if (func_800A4530(&this->skelAnime, 25.0f)) { + func_80832698(this, NA_SE_VO_LI_SWORD_L); + return; + } + + } else if (sControlInput->press.in.button & (A_BUTTON | B_BUTTON | L_CBUTTONS | R_CBUTTONS | D_CBUTTONS)) { + func_80835C58(globalCtx, this, func_80846358, 1); + func_80832264(globalCtx, this, &D_040032B8); + } +} + +void func_80846358(Player* this, GlobalContext* globalCtx) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80839F90(this, globalCtx); + return; + } + + if (func_800A4530(&this->skelAnime, 6.0f)) { + Actor* heldActor = this->heldActor; + + heldActor->posRot.rot.y = this->actor.shape.rot.y; + heldActor->speedXZ = 10.0f; + heldActor->velocity.y = 20.0f; + func_80834644(globalCtx, this); + func_8002F7DC(&this->actor, NA_SE_PL_THROW); + func_80832698(this, NA_SE_VO_LI_SWORD_N); + } +} + +void func_80846408(Player* this, GlobalContext* globalCtx) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80832284(globalCtx, this, &D_04003070); + this->unk_850 = 15; + return; + } + + if (this->unk_850 != 0) { + this->unk_850--; + if (this->unk_850 == 0) { + func_8083A098(this, &D_04003068, globalCtx); + this->stateFlags1 &= ~0x800; + func_80832698(this, NA_SE_VO_LI_DAMAGE_S); + } + } +} + +void func_808464B0(Player* this, GlobalContext* globalCtx) { + func_8083721C(this); + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80839F90(this, globalCtx); + return; + } + + if (func_800A4530(&this->skelAnime, 4.0f)) { + Actor* heldActor = this->heldActor; + + if (!func_80835644(globalCtx, this, heldActor)) { + heldActor->velocity.y = 0.0f; + heldActor->speedXZ = 0.0f; + func_80834644(globalCtx, this); + if (heldActor->id == ACTOR_EN_BOM_CHU) { + func_8083B8F4(this, globalCtx); + } + } + } +} + +void func_80846578(Player* this, GlobalContext* globalCtx) { + f32 sp34; + s16 sp32; + + func_8083721C(this); + + if (func_800A3BC0(globalCtx, &this->skelAnime) || + ((this->skelAnime.animCurrentFrame >= 8.0f) && func_80837268(this, &sp34, &sp32, 0.018f, globalCtx))) { + func_80839F90(this, globalCtx); + return; + } + + if (func_800A4530(&this->skelAnime, 3.0f)) { + func_8084409C(globalCtx, this, this->linearVelocity + 8.0f, 12.0f); + } +} + +ColliderCylinderInit D_80854624 = { + { COLTYPE_UNK5, 0x00, 0x11, 0x39, 0x08, COLSHAPE_CYLINDER }, + { 0x01, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 12, 60, 0, { 0, 0, 0 } }, +}; + +ColliderQuadInit D_80854650 = { + { COLTYPE_UNK10, 0x09, 0x00, 0x00, 0x08, COLSHAPE_QUAD }, + { 0x02, { 0x00000100, 0x00, 0x01 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x01, 0x00, 0x00 }, + { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, +}; + +ColliderQuadInit D_808546A0 = { + { COLTYPE_METAL_SHIELD, 0x09, 0x15, 0x00, 0x08, COLSHAPE_QUAD }, + { 0x02, { 0x00100000, 0x00, 0x00 }, { 0xDFCFFFFF, 0x00, 0x00 }, 0x01, 0x01, 0x00 }, + { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, +}; + +void func_8084663C(Actor* thisx, GlobalContext* globalCtx) { +} + +void func_80846648(GlobalContext* globalCtx, Player* this) { + this->actor.update = func_8084663C; + this->actor.draw = NULL; +} + +void func_80846660(GlobalContext* globalCtx, Player* this) { + func_80835C58(globalCtx, this, func_8084F710, 0); + if ((globalCtx->sceneNum == SCENE_SPOT06) && (gSaveContext.sceneSetupIndex >= 4)) { + this->unk_84F = 1; + } + this->stateFlags1 |= 0x20000000; + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, &D_04003298, 2.0f / 3.0f, 0.0f, 24.0f, 2, 0.0f); + this->actor.posRot.pos.y += 800.0f; +} + +u8 D_808546F0[] = { ITEM_SWORD_MASTER, ITEM_SWORD_KOKIRI }; + +void func_80846720(GlobalContext* globalCtx, Player* this, s32 arg2) { + s32 item = D_808546F0[(void)0, gSaveContext.linkAge]; + s32 actionParam = sItemActionParams[item]; + + func_80835EFC(this); + func_808323B4(globalCtx, this); + + this->heldItemId = item; + this->nextModelGroup = Player_ActionToModelGroup(this, actionParam); + + func_8083399C(globalCtx, this, actionParam); + func_80834644(globalCtx, this); + + if (arg2 != 0) { + func_8002F7DC(&this->actor, NA_SE_IT_SWORD_PICKOUT); + } +} + +Vec3f D_808546F4 = { -1.0f, 69.0f, 20.0f }; + +void func_808467D4(GlobalContext* globalCtx, Player* this) { + func_80835C58(globalCtx, this, func_8084E9AC, 0); + this->stateFlags1 |= 0x20000000; + Math_Vec3f_Copy(&this->actor.posRot.pos, &D_808546F4); + this->currentYaw = this->actor.shape.rot.y = -0x8000; + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, this->ageProperties->unk_A0, 2.0f / 3.0f, 0.0f, 0.0f, 2, + 0.0f); + func_80832F54(globalCtx, this, 0x28F); + if (LINK_IS_ADULT) { + func_80846720(globalCtx, this, 0); + } + this->unk_850 = 20; +} + +void func_808468A8(GlobalContext* globalCtx, Player* this) { + func_80835C58(globalCtx, this, func_8084F9A0, 0); + func_80832F54(globalCtx, this, 0x9B); +} + +void func_808468E8(GlobalContext* globalCtx, Player* this) { + func_808389E8(this, &D_04002FE0, 12.0f, globalCtx); + func_80835C58(globalCtx, this, func_8084F9C0, 0); + this->stateFlags1 |= 0x20000000; + this->fallStartHeight = this->actor.posRot.pos.y; + func_800800F8(globalCtx, 0x13F6, 40, &this->actor, 0); +} + +void func_80846978(GlobalContext* globalCtx, Player* this) { + func_80837C0C(globalCtx, this, 1, 2.0f, 2.0f, this->actor.shape.rot.y + 0x8000, 0); +} + +void func_808469BC(GlobalContext* globalCtx, Player* this) { + func_80835C58(globalCtx, this, func_8084F698, 0); + this->actor.draw = NULL; + this->stateFlags1 |= 0x20000000; +} + +s16 D_80854700[] = { ACTOR_MAGIC_WIND, ACTOR_MAGIC_DARK, ACTOR_MAGIC_FIRE }; + +Actor* func_80846A00(GlobalContext* globalCtx, Player* this, s32 arg2) { + return Actor_Spawn(&globalCtx->actorCtx, globalCtx, D_80854700[arg2], this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 0); +} + +void func_80846A68(GlobalContext* globalCtx, Player* this) { + this->actor.draw = NULL; + func_80835C58(globalCtx, this, func_8085076C, 0); + this->stateFlags1 |= 0x20000000; +} + +InitChainEntry D_80854708[] = { + ICHAIN_F32(unk_4C, 500, ICHAIN_STOP), +}; + +EffectBlureInit2 D_8085470C = { + 0, 8, 0, { 255, 255, 255, 255 }, { 255, 255, 255, 64 }, { 255, 255, 255, 0 }, { 255, 255, 255, 0 }, 4, + 0, 2, 0, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, +}; + +Vec3s D_80854730 = { -57, 3377, 0 }; + +void Player_InitCommon(Player* this, GlobalContext* globalCtx, SkeletonHeader* skelHeader) { + this->ageProperties = &sAgeProperties[gSaveContext.linkAge]; + Actor_ProcessInitChain(&this->actor, D_80854708); + this->swordEffectIndex = TOTAL_EFFECT_COUNT; + this->currentYaw = this->actor.posRot.rot.y; + func_80834644(globalCtx, this); + + SkelAnime_InitLinkAnimetion(globalCtx, &this->skelAnime, skelHeader, D_80853914[this->modelAnimType], 9, + this->limbDrawTable, this->transitionDrawTable, PLAYER_LIMB_MAX); + this->skelAnime.unk_3E = D_80854730; + SkelAnime_InitLinkAnimetion(globalCtx, &this->skelAnime2, skelHeader, func_80833338(this), 9, this->limbDrawTable2, + this->transitionDrawTable2, PLAYER_LIMB_MAX); + this->skelAnime2.unk_3E = D_80854730; + + Effect_Add(globalCtx, &this->swordEffectIndex, EFFECT_BLURE2, 0, 0, &D_8085470C); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Teardrop, this->ageProperties->unk_04); + this->unk_46C = -1; + + Collider_InitCylinder(globalCtx, &this->cylinder); + Collider_SetCylinder(globalCtx, &this->cylinder, &this->actor, &D_80854624); + Collider_InitQuad(globalCtx, &this->swordQuads[0]); + Collider_SetQuad(globalCtx, &this->swordQuads[0], &this->actor, &D_80854650); + Collider_InitQuad(globalCtx, &this->swordQuads[1]); + Collider_SetQuad(globalCtx, &this->swordQuads[1], &this->actor, &D_80854650); + Collider_InitQuad(globalCtx, &this->shieldQuad); + Collider_SetQuad(globalCtx, &this->shieldQuad, &this->actor, &D_808546A0); +} + +void (*D_80854738[])(GlobalContext* globalCtx, Player* this) = { + func_80846648, func_808467D4, func_80846660, func_808468A8, func_808468E8, func_808469BC, + func_80846A68, func_80846978, func_8083CA54, func_8083CA54, func_8083CA54, func_8083CA54, + func_8083CA54, func_8083CA20, func_8083CA54, func_8083CA9C, +}; + +Vec3f D_80854778 = { 0.0f, 50.0f, 0.0f }; + +#ifdef NON_MATCHING +// mostly regalloc differences +void Player_Init(Actor* thisx, GlobalContext* globalCtx) { + Player* this = THIS; + Scene* scene = globalCtx->loadedScene; + s32 temp; + u8 temp2; + s32 sp50; + s32 sp4C; + s32 initMode; + s16 params; + u16 unk_13C0; + + globalCtx->unk_11E5C = globalCtx->bombchuBowlingAmmo = 0; + + globalCtx->playerInit = Player_InitCommon; + globalCtx->playerUpdate = Player_UpdateCommon; + globalCtx->isPlayerDroppingFish = Player_IsDroppingFish; + globalCtx->startPlayerFishing = Player_StartFishing; + globalCtx->grabPlayer = func_80852F38; + globalCtx->startPlayerCutscene = func_80852FFC; + globalCtx->func_11D54 = func_80853080; + globalCtx->damagePlayer = Player_InflictDamage; + globalCtx->talkWithPlayer = func_80853148; + + this->actor.room = -1; + this->ageProperties = &sAgeProperties[gSaveContext.linkAge]; + this->itemActionParam = this->heldItemActionParam = -1; + this->heldItemId = ITEM_NONE; + + func_80835F44(globalCtx, this, ITEM_NONE); + Player_SetEquipmentData(globalCtx, this); + this->prevBoots = this->currentBoots; + Player_InitCommon(this, globalCtx, gPlayerSkelHeaders[(void)0, gSaveContext.linkAge]); + this->giObjectSegment = (void*)(((u32)ZeldaArena_MallocDebug(0x3008, "../z_player.c", 17175) + 8) & ~0xF); + + sp50 = gSaveContext.respawnFlag; + + if (sp50 != 0) { + if (sp50 == -3) { + this->actor.params = gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams; + } else { + if ((sp50 == 1) || (sp50 == -1)) { + this->unk_A86 = -2; + } + + temp = sp50 - 1; + if (sp50 < 0) { + sp4C = 0; + } else { + sp4C = temp; + Math_Vec3f_Copy(&this->actor.posRot.pos, &gSaveContext.respawn[sp50 - 1].pos); + Math_Vec3f_Copy(&this->actor.initPosRot.pos, &this->actor.posRot.pos); + Math_Vec3f_Copy(&this->actor.pos4, &this->actor.posRot.pos); + this->fallStartHeight = this->actor.posRot.pos.y; + this->currentYaw = this->actor.shape.rot.y = gSaveContext.respawn[temp].yaw; + this->actor.params = gSaveContext.respawn[temp].playerParams; + } + + globalCtx->actorCtx.flags.tempSwch = gSaveContext.respawn[sp4C].tempSwchFlags & 0xFFFFFF; + globalCtx->actorCtx.flags.tempCollect = gSaveContext.respawn[sp4C].tempCollectFlags; + } + } + + if ((sp50 == 0) || (sp50 < -1)) { + if ((scene->titleFile.vromStart != scene->titleFile.vromEnd) && (gSaveContext.unk_13C7 != 0) && + (gSaveContext.sceneSetupIndex < 4) && + (gEntranceTable[gSaveContext.entranceIndex + gSaveContext.sceneSetupIndex].field & 0x4000) && + ((globalCtx->sceneNum != SCENE_DDAN) || (gSaveContext.eventChkInf[11] & 1)) && + ((globalCtx->sceneNum != SCENE_NIGHT_SHOP) || (gSaveContext.eventChkInf[2] & 0x20))) { + TitleCard_InitPlaceName(globalCtx, &globalCtx->actorCtx.titleCtx, this->giObjectSegment, 0xA0, 0x78, 0x90, + 0x18, 0x14); + } + gSaveContext.unk_13C7 = 1; + } + + if (sp50 == 2) { + temp2 = 1; + } else { + temp2 = 0; + } + + if (func_80845C68(globalCtx, temp2) == 0) { + params = this->actor.params; + gSaveContext.respawn[RESPAWN_MODE_DOWN].playerParams = (params & 0xFF) | 0xD00; + } + + gSaveContext.respawn[RESPAWN_MODE_DOWN].data = 1; + + if (globalCtx->sceneNum <= SCENE_GANONTIKA_SONOGO) { + gSaveContext.infTable[26] |= gBitFlags[globalCtx->sceneNum]; + } + + initMode = (this->actor.params & 0xF00) >> 8; + if ((initMode == 5) || (initMode == 6)) { + if (gSaveContext.cutsceneIndex >= 0xFFF0) { + initMode = 13; + } + } + + D_80854738[initMode](globalCtx, this); + + if (initMode != 0) { + if ((gSaveContext.gameMode == 0) || (gSaveContext.gameMode == 3)) { + this->naviActor = func_80839680(globalCtx, this, &this->actor.posRot.pos, &D_80854778, 0); + if (gSaveContext.dogParams != 0) { + gSaveContext.dogParams |= 0x8000; + } + } + } + + if (gSaveContext.nayrusLoveTimer != 0) { + gSaveContext.unk_13F0 = 3; + func_80846A00(globalCtx, this, 1); + this->stateFlags3 &= ~0x40; + } + + if (gSaveContext.unk_13C0 != 0) { + unk_13C0 = gSaveContext.unk_13C0; + Audio_PlayActorSound2(&this->actor, unk_13C0); + gSaveContext.unk_13C0 = 0; + } + + Map_SavePlayerInitialInfo(globalCtx); + MREG(64) = 0; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/Player_Init.s") +#endif + +void func_808471F4(s16* pValue) { + s16 step; + + step = (ABS(*pValue) * 100.0f) / 1000.0f; + step = CLAMP(step, 400, 4000); + + Math_ApproxUpdateScaledS(pValue, 0, step); +} + +void func_80847298(Player* this) { + s16 sp26; + + if (!(this->unk_6AE & 2)) { + sp26 = this->actor.posRot2.rot.y - this->actor.shape.rot.y; + func_808471F4(&sp26); + this->actor.posRot2.rot.y = this->actor.shape.rot.y + sp26; + } + + if (!(this->unk_6AE & 1)) { + func_808471F4(&this->actor.posRot2.rot.x); + } + + if (!(this->unk_6AE & 8)) { + func_808471F4(&this->unk_6B6); + } + + if (!(this->unk_6AE & 0x40)) { + func_808471F4(&this->unk_6BC); + } + + if (!(this->unk_6AE & 4)) { + func_808471F4(&this->actor.posRot2.rot.z); + } + + if (!(this->unk_6AE & 0x10)) { + func_808471F4(&this->unk_6B8); + } + + if (!(this->unk_6AE & 0x20)) { + func_808471F4(&this->unk_6BA); + } + + if (!(this->unk_6AE & 0x80)) { + if (this->unk_6B0 != 0) { + func_808471F4(&this->unk_6B0); + } else { + func_808471F4(&this->unk_6BE); + } + } + + if (!(this->unk_6AE & 0x100)) { + func_808471F4(&this->unk_6C0); + } + + this->unk_6AE = 0; +} + +f32 D_80854784[] = { 120.0f, 240.0f, 360.0f }; + +u8 D_80854790[] = { 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C }; + +void func_808473D4(GlobalContext* globalCtx, Player* this) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 0) && (this->actor.type == ACTORTYPE_PLAYER)) { + Actor* heldActor = this->heldActor; + Actor* interactRangeActor = this->interactRangeActor; + s32 sp24; + s32 sp20 = this->unk_84B[this->unk_846]; + s32 sp1C = func_808332B8(this); + s32 doAction = 0xA; + + if (!Player_InBlockingCsMode(globalCtx, this)) { + if (this->stateFlags1 & 0x100000) { + doAction = 3; + } else if ((this->heldItemActionParam == PLAYER_AP_FISHING_POLE) && (this->unk_860 != 0)) { + if (this->unk_860 == 2) { + doAction = 0x14; + } + } else if ((func_8084E3C4 != this->func_674) && !(this->stateFlags2 & 0x40000)) { + if ((this->doorType != 0) && + (!(this->stateFlags1 & 0x800) || ((heldActor != NULL) && (heldActor->id == ACTOR_EN_RU1)))) { + doAction = 4; + } else if ((!(this->stateFlags1 & 0x800) || (heldActor == NULL)) && (interactRangeActor != NULL) && + ((!sp1C && (this->getItemId == GI_NONE)) || + ((this->getItemId < 0) && !(this->stateFlags1 & 0x8000000)))) { + if (this->getItemId < 0) { + doAction = 4; + } else if ((interactRangeActor->id == ACTOR_BG_TOKI_SWD) && LINK_IS_ADULT) { + doAction = 0xC; + } else { + doAction = 0x11; + } + } else if (!sp1C && (this->stateFlags2 & 1)) { + doAction = 0x11; + } else if ((this->stateFlags2 & 4) || (!(this->stateFlags1 & 0x800000) && (this->rideActor != NULL))) { + doAction = 0xB; + } else if ((this->stateFlags1 & 0x800000) && !EN_HORSE_CHECK_4((EnHorse*)this->rideActor) && + (func_8084D3E4 != this->func_674)) { + if ((this->stateFlags2 & 2) && (this->targetActor != NULL)) { + if (this->targetActor->type == ACTORTYPE_NPC) { + doAction = 0xF; + } else { + doAction = 1; + } + } else if (!func_8002DD78(this) && !(this->stateFlags1 & 0x100000)) { + doAction = 8; + } + } else if ((this->stateFlags2 & 2) && (this->targetActor != NULL)) { + if (this->targetActor->type == ACTORTYPE_NPC) { + doAction = 0xF; + } else { + doAction = 1; + } + } else if ((this->stateFlags1 & 0x202000) || + ((this->stateFlags1 & 0x800000) && (this->stateFlags2 & 0x400000))) { + doAction = 0xD; + } else if (this->stateFlags2 & 0x10000) { + doAction = 2; + } else if ((this->stateFlags1 & 0x800) && (this->getItemId == GI_NONE) && (heldActor != NULL)) { + if ((this->actor.bgCheckFlags & 1) || (heldActor->id == ACTOR_EN_NIW)) { + if (func_8083EAF0(this, heldActor) == 0) { + doAction = 0xC; + } else { + doAction = 9; + } + } + } else if (!(this->stateFlags1 & 0x8000000) && func_8083A0D4(this) && (this->getItemId < GI_MAX)) { + doAction = 0x11; + } else if (this->stateFlags2 & 0x800) { + sp24 = (D_80854784[CUR_UPG_VALUE(UPG_SCALE)] - this->actor.waterY) / 40.0f; + sp24 = CLAMP(sp24, 0, 7); + doAction = D_80854790[sp24]; + } else if (sp1C && !(this->stateFlags2 & 0x400)) { + doAction = 7; + } else if (!sp1C && (!(this->stateFlags1 & 0x400000) || func_80833BCC(this) || + !Player_IsChildWithHylianShield(this))) { + if ((!(this->stateFlags1 & 0x4000) && (sp20 <= 0) && + (func_8008E9C4(this) || + ((D_808535E4 != 7) && + (func_80833B2C(this) || ((globalCtx->roomCtx.curRoom.unk_03 != 2) && + !(this->stateFlags1 & 0x400000) && (sp20 == 0))))))) { + doAction = 0; + } else if ((globalCtx->roomCtx.curRoom.unk_03 != 2) && func_80833BCC(this) && (sp20 > 0)) { + doAction = 5; + } else if ((this->heldItemActionParam >= PLAYER_AP_SWORD_MASTER) || + ((this->stateFlags2 & 0x100000) && + (globalCtx->actorCtx.targetCtx.arrowPointedActor == NULL))) { + doAction = 0x13; + } + } + } + } + + if (doAction != 0x13) { + this->unk_837 = 20; + } else if (this->unk_837 != 0) { + doAction = 0xA; + this->unk_837--; + } + + Interface_SetDoAction(globalCtx, doAction); + + if (this->stateFlags2 & 0x200000) { + if (this->unk_664 != NULL) { + Interface_SetNaviCall(globalCtx, 0x1E); + } else { + Interface_SetNaviCall(globalCtx, 0x1D); + } + Interface_SetNaviCall(globalCtx, 0x1E); + } else { + Interface_SetNaviCall(globalCtx, 0x1F); + } + } +} + +s32 func_80847A78(Player* this) { + s32 cond; + + if ((this->currentBoots == PLAYER_BOOTS_HOVER) && (this->unk_893 != 0)) { + this->unk_893--; + } else { + this->unk_893 = 0; + } + + cond = (this->currentBoots == PLAYER_BOOTS_HOVER) && + ((this->actor.waterY >= 0.0f) || (func_80838144(D_808535E4) >= 0) || func_8083816C(D_808535E4)); + + if (cond && (this->actor.bgCheckFlags & 1) && (this->unk_893 != 0)) { + this->actor.bgCheckFlags &= ~1; + } + + if (this->actor.bgCheckFlags & 1) { + if (!cond) { + this->unk_893 = 0x13; + } + return 0; + } + + D_808535E4 = 0; + this->unk_898 = this->unk_89A = D_80853610 = 0; + + return 1; +} + +Vec3f D_80854798 = { 0.0f, 18.0f, 0.0f }; + +#ifdef NON_MATCHING +// regalloc and stack alloc differences +void func_80847BA0(GlobalContext* globalCtx, Player* this) { + u8 spC7 = 0; + CollisionPoly* spC0; + Vec3f spB4; + f32 spB0; + f32 spAC; + f32 spA8; + u32 spA4; + + D_80853604 = this->unk_A7A; + + if (this->stateFlags2 & 0x40000) { + spB0 = 10.0f; + spAC = 15.0f; + spA8 = 30.0f; + } else { + spB0 = this->ageProperties->unk_38; + spAC = 26.0f; + spA8 = this->ageProperties->unk_00; + } + + if (this->stateFlags1 & 0xA0000000) { + if (this->stateFlags1 & 0x80000000) { + this->actor.bgCheckFlags &= ~1; + spA4 = 0x38; + } else if ((this->stateFlags1 & 1) && ((this->unk_A84 - (s32)this->actor.posRot.pos.y) >= 100)) { + spA4 = 0x39; + } else if (!(this->stateFlags1 & 1) && + ((func_80845EF8 == this->func_674) || (func_80845CA4 == this->func_674))) { + this->actor.bgCheckFlags &= ~0x208; + spA4 = 0x3C; + } else { + spA4 = 0x3F; + } + } else { + spA4 = 0x3F; + } + + if (this->stateFlags3 & 1) { + spA4 &= ~6; + } + + if (spA4 & 4) { + this->stateFlags3 |= 0x10; + } + + Math_Vec3f_Copy(&spB4, &this->actor.posRot.pos); + func_8002E4B4(globalCtx, &this->actor, spAC, spB0, spA8, spA4); + + if (this->actor.bgCheckFlags & 0x10) { + this->actor.velocity.y = 0.0f; + } + + D_80853600 = this->actor.posRot.pos.y - this->actor.groundY; + D_808535F4 = 0; + + spC0 = this->actor.floorPoly; + + if (spC0 != NULL) { + this->unk_A7A = func_80041EA4(&globalCtx->colCtx, spC0, this->actor.floorPolySource); + this->unk_A82 = this->unk_89E; + + if (this->actor.bgCheckFlags & 0x20) { + if (this->actor.waterY < 20.0f) { + this->unk_89E = 4; + } else { + this->unk_89E = 5; + } + } else { + if (this->stateFlags2 & 0x200) { + this->unk_89E = 1; + } else { + this->unk_89E = func_80041F34(&globalCtx->colCtx, spC0, this->actor.floorPolySource); + } + } + + if (this->actor.type == ACTORTYPE_PLAYER) { + func_800F66DC(func_80041FC4(&globalCtx->colCtx, spC0, this->actor.floorPolySource)); + + if (this->actor.floorPolySource == 50) { + func_80074CE8(globalCtx, func_80041FA0(&globalCtx->colCtx, spC0, this->actor.floorPolySource)); + } else { + func_80043508(&globalCtx->colCtx, this->actor.floorPolySource); + } + } + + D_808535F4 = func_800420C0(&globalCtx->colCtx, spC0, this->actor.floorPolySource); + if (D_808535F4 != 0) { + D_808535F8 = func_80042084(&globalCtx->colCtx, spC0, this->actor.floorPolySource); + if (((D_808535F8 == 0) && (this->actor.waterY > 20.0f) && (this->currentBoots != PLAYER_BOOTS_IRON)) || + ((D_808535F8 != 0) && (this->actor.bgCheckFlags & 1))) { + D_808535FC = func_800420E4(&globalCtx->colCtx, spC0, this->actor.floorPolySource) << 10; + } else { + D_808535F4 = 0; + } + } + } + + func_80839034(globalCtx, this, spC0, this->actor.floorPolySource); + + this->actor.bgCheckFlags &= ~0x200; + + if (this->actor.bgCheckFlags & 8) { + CollisionPoly* spA0; + u32 sp9C; + s16 sp9A; + f32 temp1; + + D_80854798.y = 18.0f; + D_80854798.z = this->ageProperties->unk_38 + 10.0f; + + if (!(this->stateFlags2 & 0x40000) && func_80839768(globalCtx, this, &D_80854798, &spA0, &sp9C, &D_80858AA8)) { + this->actor.bgCheckFlags |= 0x200; + if (this->actor.wallPoly != spA0) { + this->actor.wallPoly = spA0; + this->actor.wallPolySource = sp9C; + this->actor.wallPolyRot = atan2s(spA0->norm.z, spA0->norm.x); + } + } + + sp9A = this->actor.shape.rot.y - (s16)(this->actor.wallPolyRot + 0x8000); + + D_808535F0 = func_80041DB8(&globalCtx->colCtx, this->actor.wallPoly, this->actor.wallPolySource); + + D_80853608 = ABS(sp9A); + + sp9A = this->currentYaw - (s16)(this->actor.wallPolyRot + 0x8000); + + D_8085360C = ABS(sp9A); + + temp1 = D_8085360C * 0.00008f; + if (!(this->actor.bgCheckFlags & 1) || (temp1 >= 1.0f)) { + this->unk_880 = R_RUN_SPEED_LIMIT / 100.0f; + } else { + if ((this->unk_880 = (R_RUN_SPEED_LIMIT / 100.0f) * temp1) < 0.1f) { + this->unk_880 = 0.1f; + } + } + + if ((this->actor.bgCheckFlags & 0x200) && (D_80853608 < 0x3000)) { + CollisionPoly* wallPoly = this->actor.wallPoly; // sp+0x90 + + if (ABS(wallPoly->norm.y) < 600) { + f32 sp8C = wallPoly->norm.x * (1.0f / 32767.0f); + f32 sp88 = wallPoly->norm.y * (1.0f / 32767.0f); + f32 sp84 = wallPoly->norm.z * (1.0f / 32767.0f); + f32 temp2; + CollisionPoly* sp7C; + CollisionPoly* sp78; + u32 sp74; + Vec3f sp68; + f32 sp64; + f32 sp60; + s32 temp3; + + this->wallDistance = Math3D_UDistPlaneToPos(sp8C, sp88, sp84, wallPoly->dist, &this->actor.posRot.pos); + + temp2 = this->wallDistance + 10.0f; + sp68.x = this->actor.posRot.pos.x - (temp2 * sp8C); + sp68.z = this->actor.posRot.pos.z - (temp2 * sp84); + sp68.y = this->actor.posRot.pos.y + this->ageProperties->unk_0C; + + sp64 = func_8003C890(&globalCtx->colCtx, &sp7C, &sp68); + this->wallHeight = sp64 - this->actor.posRot.pos.y; + + if ((this->wallHeight < 18.0f) || + func_8003D7A0(&globalCtx->colCtx, &sp60, &this->actor.posRot.pos, + (sp64 - this->actor.posRot.pos.y) + 20.0f, &sp78, &sp74, &this->actor)) { + this->wallHeight = 399.96002f; + } else { + D_80854798.y = (sp64 + 5.0f) - this->actor.posRot.pos.y; + + if (func_80839768(globalCtx, this, &D_80854798, &sp78, &sp74, &D_80858AA8) && + (temp3 = this->actor.wallPolyRot - atan2s(sp78->norm.z, sp78->norm.x), ABS(temp3) < 0x4000) && + !func_80041E18(&globalCtx->colCtx, sp78, sp74)) { + this->wallHeight = 399.96002f; + } else if (func_80041DE4(&globalCtx->colCtx, wallPoly, this->actor.wallPolySource) == 0) { + if (this->ageProperties->unk_1C <= this->wallHeight) { + if (ABS(sp7C->norm.y) > 28000) { + if (this->ageProperties->unk_14 <= this->wallHeight) { + spC7 = 4; + } else if (this->ageProperties->unk_18 <= this->wallHeight) { + spC7 = 3; + } else { + spC7 = 2; + } + } + } else { + spC7 = 1; + } + } + } + } + } + } else { + this->unk_880 = R_RUN_SPEED_LIMIT / 100.0f; + this->unk_88D = 0; + this->wallHeight = 0.0f; + } + + if (spC7 == this->unk_88C) { + if ((this->linearVelocity != 0.0f) && (this->unk_88D < 100)) { + this->unk_88D++; + } + } else { + this->unk_88C = spC7; + this->unk_88D = 0; + } + + if (this->actor.bgCheckFlags & 1) { + D_808535E4 = func_80041D4C(&globalCtx->colCtx, spC0, this->actor.floorPolySource); + + if (!func_80847A78(this)) { + f32 sp58; + f32 sp54; + f32 sp50; + f32 sp4C; + s32 pad; + f32 sp44; + + if (this->actor.floorPolySource != 50) { + func_800434C8(&globalCtx->colCtx, this->actor.floorPolySource); + } + + sp58 = spC0->norm.x * (1.0f / 32767.0f); + sp54 = 1.0f / (spC0->norm.y * (1.0f / 32767.0f)); + sp50 = spC0->norm.z * (1.0f / 32767.0f); + + sp4C = Math_Sins(this->currentYaw); + sp44 = Math_Coss(this->currentYaw); + + this->unk_898 = atan2s(1.0f, (-(sp58 * sp4C) - (sp50 * sp44)) * sp54); + this->unk_89A = atan2s(1.0f, (-(sp58 * sp44) - (sp50 * sp4C)) * sp54); + + sp4C = Math_Sins(this->actor.shape.rot.y); + sp44 = Math_Coss(this->actor.shape.rot.y); + + D_80853610 = atan2s(1.0f, (-(sp58 * sp4C) - (sp50 * sp44)) * sp54); + + func_8083E318(globalCtx, this, spC0); + } + } else { + func_80847A78(this); + } + + if (this->unk_A7B == D_808535E4) { + this->unk_A79++; + } else { + this->unk_A7B = D_808535E4; + this->unk_A79 = 0; + } +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80847BA0.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808486A8.s") +void func_808486A8(GlobalContext* globalCtx, Player* this) { + u8 sp27; + s32 pad; + Actor* unk_664; + s32 sp18; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80848A04.s") + if (this->actor.type == ACTORTYPE_PLAYER) { + sp27 = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80848B44.s") + if (this->csMode != 0) { + func_8005A444(Gameplay_GetCamera(globalCtx, 0), 0); + } else if (!(this->stateFlags1 & 0x100000)) { + if ((this->actor.parent != NULL) && (this->stateFlags3 & 0x80)) { + sp18 = 9; + Camera_SetParam(Gameplay_GetCamera(globalCtx, 0), 8, this->actor.parent); + } else if (func_8084377C == this->func_674) { + sp18 = 0x12; + } else if (this->stateFlags2 & 0x100) { + sp18 = 0x13; + } else if ((unk_664 = this->unk_664) != NULL) { + if ((this->actor.flags & 0x100) == 0x100) { + sp18 = 3; + } else if (this->stateFlags1 & 0x10000) { + if (this->stateFlags1 & 0x2000000) { + sp18 = 0x14; + } else { + sp18 = 2; + } + } else { + sp18 = 4; + } + Camera_SetParam(Gameplay_GetCamera(globalCtx, 0), 8, unk_664); + } else if (this->stateFlags1 & 0x1000) { + sp18 = 0x11; + } else if (this->stateFlags1 & 0x2000000) { + sp18 = 0x14; + Camera_SetParam(Gameplay_GetCamera(globalCtx, 0), 8, this->boomerangActor); + } else if (this->stateFlags1 & 0x6000) { + if (func_80833B2C(this)) { + sp18 = 0xF; + } else { + sp18 = 0xE; + } + } else if (this->stateFlags1 & 0x40020000) { + if (func_8002DD78(this) || func_808334B4(this)) { + sp18 = 8; + } else if (this->stateFlags1 & 0x200000) { + sp18 = 0xC; + } else { + sp18 = 1; + } + } else if (this->stateFlags1 & 0x240000) { + if ((func_80845668 == this->func_674) || (this->stateFlags1 & 0x200000)) { + sp18 = 5; + } else { + sp18 = 0xD; + } + } else if (this->stateFlags1 & 0x80000) { + sp18 = 0x10; + } else if ((this->swordState != 0) && (this->swordAnimation >= 0) && (this->swordAnimation < 0x18)) { + sp18 = 0x12; + } else { + sp18 = 0; + if ((this->linearVelocity == 0.0f) && + (!(this->stateFlags1 & 0x800000) || (this->rideActor->speedXZ == 0.0f))) { + sp27 = 2; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80848C74.s") + func_8005A444(Gameplay_GetCamera(globalCtx, 0), sp18); + } else { + sp27 = 2; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80848EF8.s") + if (globalCtx->actorCtx.targetCtx.unk_90 != NULL) { + sp27 = 1; + func_800F6114(sqrtf(globalCtx->actorCtx.targetCtx.unk_90->xyzDistFromLinkSq)); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s") + if (globalCtx->sceneNum != SCENE_TURIBORI) { + func_800F5E90(sp27); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80849EA8.s") +Vec3f D_808547A4 = { 0.0f, 0.5f, 0.0f }; +Vec3f D_808547B0 = { 0.0f, 0.5f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s") +Color_RGBA8_n D_808547BC = { 255, 255, 100, 255 }; +Color_RGBA8_n D_808547C0 = { 255, 50, 0, 0 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s") +void func_80848A04(GlobalContext* globalCtx, Player* this) { + f32 temp; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s") + if (this->unk_85C == 0.0f) { + func_80835F44(globalCtx, this, 0xFF); + return; + } + temp = 1.0f; + if (DECR(this->unk_860) == 0) { + Inventory_ChangeAmmo(ITEM_STICK, -1); + this->unk_860 = 1; + temp = 0.0f; + this->unk_85C = temp; + } else if (this->unk_860 > 200) { + temp = (210 - this->unk_860) / 10.0f; + } else if (this->unk_860 < 20) { + temp = this->unk_860 / 20.0f; + this->unk_85C = temp; + } + + func_8002836C(globalCtx, &this->swordInfo[0].tip, &D_808547A4, &D_808547B0, &D_808547BC, &D_808547C0, temp * 200.0f, + 0, 8); +} + +void func_80848B44(GlobalContext* globalCtx, Player* this) { + Vec3f sp3C; + Vec3f* sp38; + s32 sp34; + + this->shockTimer--; + this->unk_892 += this->shockTimer; + + if (this->unk_892 > 20) { + sp34 = this->shockTimer * 2; + + this->unk_892 -= 20; + + if (sp34 > 40) { + sp34 = 40; + } + + sp38 = this->bodyPartsPos + (s32)Math_Rand_ZeroFloat(17.9f); + sp3C.x = (Math_Rand_CenteredFloat(5.0f) + sp38->x) - this->actor.posRot.pos.x; + sp3C.y = (Math_Rand_CenteredFloat(5.0f) + sp38->y) - this->actor.posRot.pos.y; + sp3C.z = (Math_Rand_CenteredFloat(5.0f) + sp38->z) - this->actor.posRot.pos.z; + + EffectSsFhgFlash_Spawn2(globalCtx, &this->actor, &sp3C, sp34, 1); + func_8002F8F0(&this->actor, NA_SE_PL_SPARK - SFX_FLAG); + } +} + +void func_80848C74(GlobalContext* globalCtx, Player* this) { + s32 spawnedFlame; + u8* timerPtr; + s32 timerStep; + f32 flameScale; + f32 flameIntensity; + s32 dmgCooldown; + s32 i; + s32 sp58; + s32 sp54; + + if (this->currentTunic == PLAYER_TUNIC_GORON) { + sp54 = 20; + } else { + sp54 = (s32)(this->linearVelocity * 0.4f) + 1; + } + + spawnedFlame = false; + timerPtr = this->flameTimers; + + if (this->stateFlags2 & 8) { + sp58 = 100; + } else { + sp58 = 0; + } + + func_8083819C(this, globalCtx); + + for (i = 0; i < 18; i++, timerPtr++) { + timerStep = sp58 + sp54; + + if (*timerPtr <= timerStep) { + *timerPtr = 0; + } else { + spawnedFlame = true; + *timerPtr -= timerStep; + + if (*timerPtr > 20.0f) { + flameIntensity = (*timerPtr - 20.0f) * 0.01f; + flameScale = CLAMP(flameIntensity, 0.19999999f, 0.2f); + } else { + flameScale = *timerPtr * 0.01f; + } + + flameIntensity = (*timerPtr - 25.0f) * 0.02f; + flameIntensity = CLAMP(flameIntensity, 0.0f, 1.0f); + func_8002A484(globalCtx, flameScale, i, flameIntensity); + } + + if (1) {} + } + + if (spawnedFlame) { + func_8002F7DC(&this->actor, NA_SE_EV_TORCH - SFX_FLAG); + + if (globalCtx->sceneNum == SCENE_JYASINBOSS) { + dmgCooldown = 0; + } else { + dmgCooldown = 7; + } + + if ((dmgCooldown & globalCtx->gameplayFrames) == 0) { + Player_InflictDamage(globalCtx, -1); + } + } else { + this->isBurning = false; + } +} + +void func_80848EF8(Player* this) { + if (CHECK_QUEST_ITEM(QUEST_STONE_OF_AGONY)) { + f32 temp = 200000.0f - (this->unk_6A4 * 5.0f); + + if (temp < 0.0f) { + temp = 0.0f; + } + + this->unk_6A0 += temp; + if (this->unk_6A0 > 4000000.0f) { + this->unk_6A0 = 0.0f; + func_8083264C(this, 120, 20, 10, 0); + } + } +} + +s8 D_808547C4[] = { + 0, 3, 3, 5, 4, 8, 9, 13, 14, 15, 16, 17, 18, -22, 23, 24, 25, 26, 27, 28, 29, 31, 32, 33, 34, -35, + 30, 36, 38, -39, -40, -41, 42, 43, 45, 46, 0, 0, 0, 67, 48, 47, -50, 51, -52, -53, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, -65, -66, 68, 11, 69, 70, 71, 8, 8, 72, 73, 78, 79, 80, 89, 90, 91, 92, 77, 19, 94, +}; + +Vec3f D_80854814 = { 0.0f, 0.0f, 200.0f }; + +f32 D_80854820[] = { 2.0f, 4.0f, 7.0f }; +f32 D_8085482C[] = { 0.5f, 1.0f, 3.0f }; + +#ifdef NON_MATCHING +// stack alloc differences +void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { + s32 pad; + + sControlInput = input; + + if (this->unk_A86 < 0) { + this->unk_A86++; + if (this->unk_A86 == 0) { + this->unk_A86 = 1; + func_80078884(NA_SE_OC_REVENGE); + } + } + + Math_Vec3f_Copy(&this->actor.pos4, &this->actor.initPosRot.pos); + + if (this->unk_A73 != 0) { + this->unk_A73--; + } + + if (this->unk_88E != 0) { + this->unk_88E--; + } + + if (this->unk_A87 != 0) { + this->unk_A87--; + } + + if (this->invincibilityTimer < 0) { + this->invincibilityTimer++; + } else if (this->invincibilityTimer > 0) { + this->invincibilityTimer--; + } + + if (this->unk_890 != 0) { + this->unk_890--; + } + + func_808473D4(globalCtx, this); + func_80836BEC(this, globalCtx); + + if ((this->heldItemActionParam == PLAYER_AP_STICK) && (this->unk_860 != 0)) { + func_80848A04(globalCtx, this); + } else if ((this->heldItemActionParam == PLAYER_AP_FISHING_POLE) && (this->unk_860 < 0)) { + this->unk_860++; + } + + if (this->shockTimer != 0) { + func_80848B44(globalCtx, this); + } + + if (this->isBurning) { + func_80848C74(globalCtx, this); + } + + if ((this->stateFlags3 & 0x40) && (gSaveContext.nayrusLoveTimer != 0) && (gSaveContext.unk_13F0 == 0)) { + gSaveContext.unk_13F0 = 3; + func_80846A00(globalCtx, this, 1); + this->stateFlags3 &= ~0x40; + } + + if (this->stateFlags2 & 0x8000) { + if (!(this->actor.bgCheckFlags & 1)) { + func_80832210(this); + Actor_MoveForward(&this->actor); + } + + func_80847BA0(globalCtx, this); + } else { + f32 temp_f0; + f32 phi_f12; + + if (this->currentBoots != this->prevBoots) { + if (this->currentBoots == PLAYER_BOOTS_IRON) { + if (this->stateFlags1 & 0x8000000) { + func_80832340(globalCtx, this); + if (this->ageProperties->unk_2C < this->actor.waterY) { + this->stateFlags2 |= 0x400; + } + } + } else { + if (this->stateFlags1 & 0x8000000) { + if ((this->prevBoots == PLAYER_BOOTS_IRON) || (this->actor.bgCheckFlags & 1)) { + func_8083D36C(globalCtx, this); + this->stateFlags2 &= ~0x400; + } + } + } + + this->prevBoots = this->currentBoots; + } + + if ((this->actor.parent == NULL) && (this->stateFlags1 & 0x800000)) { + this->actor.parent = this->rideActor; + func_8083A360(globalCtx, this); + this->stateFlags1 |= 0x800000; + func_80832264(globalCtx, this, &D_040033B8); + func_80832F54(globalCtx, this, 0x9B); + this->unk_850 = 99; + } + + if (this->unk_844 == 0) { + this->unk_845 = 0; + } else if (this->unk_844 < 0) { + this->unk_844++; + } else { + this->unk_844--; + } + + Math_ApproxUpdateScaledS(&this->unk_6C2, 0, 400); + func_80032CB4(this->unk_3A8, 20, 80, 6); + + this->actor.shape.unk_06 = this->unk_3A8[0] + ((globalCtx->gameplayFrames & 32) ? 0 : 3); + + if (this->currentMask == PLAYER_MASK_BUNNY) { + func_8085002C(this); + } + + if (func_8002DD6C(this) != 0) { + func_8084FF7C(this); + } + + if (!(this->skelAnime.flags & 0x80)) { + if (((this->actor.bgCheckFlags & 1) && (D_808535E4 == 5) && (this->currentBoots != PLAYER_BOOTS_IRON)) || + ((this->currentBoots == PLAYER_BOOTS_HOVER) && !(this->stateFlags1 & 0x28000000))) { + f32 sp70 = this->linearVelocity; + s16 sp6E = this->currentYaw; + s16 yawDiff = this->actor.posRot.rot.y - sp6E; + s32 pad; + + if ((ABS(yawDiff) > 0x6000) && (this->actor.speedXZ != 0.0f)) { + sp70 = 0.0f; + sp6E += 0x8000; + } + + if (Math_ApproxF(&this->actor.speedXZ, sp70, 0.35f) && (sp70 == 0.0f)) { + this->actor.posRot.rot.y = this->currentYaw; + } + + if (this->linearVelocity != 0.0f) { + s32 phi_v0; + + phi_v0 = (fabsf(this->linearVelocity) * 700.0f) - (fabsf(this->actor.speedXZ) * 100.0f); + phi_v0 = CLAMP(phi_v0, 0, 1350); + + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, sp6E, phi_v0); + } + + if ((this->linearVelocity == 0.0f) && (this->actor.speedXZ != 0.0f)) { + func_800F4138(&this->actor.projectedPos, 0xD0, this->actor.speedXZ); + } + } else { + this->actor.speedXZ = this->linearVelocity; + this->actor.posRot.rot.y = this->currentYaw; + } + + func_8002D868(&this->actor); + + if ((this->windSpeed != 0.0f) && !Player_InCsMode(globalCtx) && !(this->stateFlags1 & 0x206000) && + (func_80845668 != this->func_674) && (func_808507F4 != this->func_674)) { + this->actor.velocity.x += this->windSpeed * Math_Sins(this->windDirection); + this->actor.velocity.z += this->windSpeed * Math_Coss(this->windDirection); + } + + func_8002D7EC(&this->actor); + func_80847BA0(globalCtx, this); + } else { + D_808535E4 = 0; + this->unk_A7A = 0; + + if (!(this->stateFlags1 & 1) && (this->stateFlags1 & 0x800000)) { + EnHorse* rideActor = (EnHorse*)this->rideActor; + CollisionPoly* sp5C; + s32 sp58; + Vec3f sp4C; + + if (!(rideActor->actor.bgCheckFlags & 1)) { + func_808396F4(globalCtx, this, &D_80854814, &sp4C, &sp5C, &sp58); + } else { + sp5C = rideActor->actor.floorPoly; + sp58 = rideActor->actor.floorPolySource; + } + + if ((sp5C != NULL) && func_80839034(globalCtx, this, sp5C, sp58)) { + if (DREG(25) != 0) { + DREG(25) = 0; + } else { + AREG(6) = 1; + } + } + } + + D_808535F4 = 0; + this->windSpeed = 0.0f; + } + + if ((D_808535F4 != 0) && (this->currentBoots != PLAYER_BOOTS_IRON)) { + f32 sp48; + + D_808535F4--; + + if (D_808535F8 == 0) { + sp48 = D_80854820[D_808535F4]; + + if (!(this->stateFlags1 & 0x8000000)) { + sp48 *= 0.25f; + } + } else { + sp48 = D_8085482C[D_808535F4]; + } + + Math_ApproxF(&this->windSpeed, sp48, sp48 * 0.1f); + + Math_ApproxUpdateScaledS(&this->windDirection, D_808535FC, + ((this->stateFlags1 & 0x8000000) ? 400.0f : 800.0f) * sp48); + } else if (this->windSpeed != 0.0f) { + Math_ApproxF(&this->windSpeed, 0.0f, (this->stateFlags1 & 0x8000000) ? 0.5f : 1.0f); + } + + if (!Player_InBlockingCsMode(globalCtx, this) && !(this->stateFlags2 & 0x40000)) { + func_8083D53C(globalCtx, this); + + if ((this->actor.type == ACTORTYPE_PLAYER) && (gSaveContext.health == 0)) { + if (this->stateFlags1 & 0x206000) { + func_80832440(globalCtx, this); + func_80837B9C(this, globalCtx); + } else if ((this->actor.bgCheckFlags & 1) || (this->stateFlags1 & 0x8000000)) { + func_80836448(globalCtx, this, + func_808332B8(this) ? &D_04003310 : (this->shockTimer != 0) ? &D_04002F08 : &D_04002878); + } + } else { + if ((this->actor.parent == NULL) && + ((globalCtx->sceneLoadFlag == 0x14) || (this->unk_A87 != 0) || !func_808382DC(this, globalCtx))) { + func_8083AA10(this, globalCtx); + } else { + this->fallStartHeight = this->actor.posRot.pos.y; + } + func_80848EF8(this); + } + } + + if ((globalCtx->csCtx.state != 0) && (this->csMode != 6) && !(this->stateFlags1 & 0x800000) && + !(this->stateFlags2 & 0x80) && (this->actor.type == ACTORTYPE_PLAYER)) { + + if ((globalCtx->csCtx.linkAction != NULL) && (D_808547C4[globalCtx->csCtx.linkAction->action] != 0)) { + func_8002DF54(globalCtx, NULL, 6); + func_80832210(this); + } else if ((this->csMode == 0) && !(this->stateFlags2 & 0x400) && (globalCtx->csCtx.state != 3)) { + func_8002DF54(globalCtx, NULL, 0x31); + func_80832210(this); + } + } + + if (this->csMode != 0) { + if ((this->csMode != 7) || !(this->stateFlags1 & 0x4206000)) { + this->unk_6AD = 3; + } else if (func_80852E14 != this->func_674) { + func_80852944(globalCtx, this, NULL); + } + } else { + this->prevCsMode = 0; + } + + func_8083D6EC(globalCtx, this); + + if ((this->unk_664 == NULL) && (this->naviMessageId == 0)) { + this->stateFlags2 &= ~0x200002; + } + + this->stateFlags1 &= ~0x401202; + this->stateFlags2 &= ~0x441536D; + this->stateFlags3 &= ~0x10; + + func_80847298(this); + func_8083315C(globalCtx, this); + + if (this->stateFlags1 & 0x8000000) { + D_808535E8 = 0.5f; + } else { + D_808535E8 = 1.0f; + } + + D_808535EC = 1.0f / D_808535E8; + D_80853614 = D_80853618 = 0; + D_80858AA4 = this->currentMask; + + if (!(this->stateFlags3 & 4)) { + this->func_674(this, globalCtx); + } + + func_808486A8(globalCtx, this); + + if (this->skelAnime.flags & 8) { + SkelAnime_LoadAnimationType5(globalCtx, &this->actor, &this->skelAnime, + (this->skelAnime.flags & 4) ? 1.0f : this->ageProperties->unk_08); + } + + func_808368EC(this, globalCtx); + + if ((this->actor.flags & 0x100) == 0x100) { + this->targetActorDistance = 0.0f; + } else { + this->targetActor = NULL; + this->targetActorDistance = FLT_MAX; + this->exchangeItemId = EXCH_ITEM_NONE; + } + + if (!(this->stateFlags1 & 0x800)) { + this->interactRangeActor = NULL; + this->getItemDirection = 0x6000; + } + + if (this->actor.parent == NULL) { + this->rideActor = NULL; + } + + this->naviMessageId = 0; + + if (!(this->stateFlags2 & 0x2000000)) { + this->unk_6A8 = NULL; + } + + this->stateFlags2 &= ~0x800000; + this->unk_6A4 = FLT_MAX; + + temp_f0 = this->actor.posRot.pos.y - this->actor.pos4.y; + + this->doorType = 0; + this->unk_8A1 = 0; + this->unk_684 = NULL; + + phi_f12 = ((this->bodyPartsPos[6].y + this->bodyPartsPos[3].y) * 0.5f) + temp_f0; + temp_f0 += this->bodyPartsPos[7].y + 10.0f; + + this->cylinder.dim.height = temp_f0 - phi_f12; + + if (this->cylinder.dim.height < 0) { + phi_f12 = temp_f0; + this->cylinder.dim.height = -this->cylinder.dim.height; + } + + this->cylinder.dim.yShift = phi_f12 - this->actor.posRot.pos.y; + + if (this->stateFlags1 & 0x400000) { + this->cylinder.dim.height = this->cylinder.dim.height * 0.8f; + } + + Collider_CylinderUpdate(&this->actor, &this->cylinder); + + if (!(this->stateFlags2 & 0x4000)) { + if (!(this->stateFlags1 & 0x806080)) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->cylinder.base); + } + + if (!(this->stateFlags1 & 0x4000080) && (this->invincibilityTimer <= 0)) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->cylinder.base); + + if (this->invincibilityTimer < 0) { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->cylinder.base); + } + } + } + + func_800A32F4(globalCtx); + } + + Math_Vec3f_Copy(&this->actor.initPosRot.pos, &this->actor.posRot.pos); + Math_Vec3f_Copy(&this->unk_A88, &this->bodyPartsPos[0]); + + if (this->stateFlags1 & 0x30000080) { + this->actor.colChkInfo.mass = 0xFF; + } else { + this->actor.colChkInfo.mass = 50; + } + + this->stateFlags3 &= ~4; + + Collider_CylinderSetAC(globalCtx, &this->cylinder.base); + + Collider_QuadSetAT(globalCtx, &this->swordQuads[0].base); + Collider_QuadSetAT(globalCtx, &this->swordQuads[1].base); + + Collider_QuadSetAC(globalCtx, &this->shieldQuad.base); + Collider_QuadSetAT(globalCtx, &this->shieldQuad.base); +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/Player_UpdateCommon.s") +#endif + +Vec3f D_80854838 = { 0.0f, 0.0f, -30.0f }; + +void Player_Update(Actor* thisx, GlobalContext* globalCtx) { + static Vec3f sDogSpawnPos; + Player* this = THIS; + s32 dogParams; + s32 pad; + Input sp44; + Actor* dog; + + if (func_8084FCAC(this, globalCtx)) { + if (gSaveContext.dogParams < 0) { + if (Object_GetIndex(&globalCtx->objectCtx, OBJECT_DOG) < 0) { + gSaveContext.dogParams = 0; + } else { + gSaveContext.dogParams &= 0x7FFF; + func_808395DC(this, &this->actor.posRot.pos, &D_80854838, &sDogSpawnPos); + dogParams = gSaveContext.dogParams; + + dog = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_DOG, sDogSpawnPos.x, sDogSpawnPos.y, + sDogSpawnPos.z, 0, this->actor.shape.rot.y, 0, dogParams | 0x8000); + if (dog != NULL) { + dog->room = 0; + } + } + } + + if ((this->interactRangeActor != NULL) && (this->interactRangeActor->update == NULL)) { + this->interactRangeActor = NULL; + } + + if ((this->heldActor != NULL) && (this->heldActor->update == NULL)) { + func_808323B4(globalCtx, this); + } + + if (this->stateFlags1 & 0x20000020) { + bzero(&sp44, sizeof(sp44)); + } else { + sp44 = globalCtx->state.input[0]; + if (this->unk_88E != 0) { + sp44.cur.in.button &= ~(A_BUTTON | B_BUTTON | U_CBUTTONS); + sp44.press.in.button &= ~(A_BUTTON | B_BUTTON | U_CBUTTONS); + } + } + + Player_UpdateCommon(this, globalCtx, &sp44); + } + + MREG(52) = this->actor.posRot.pos.x; + MREG(53) = this->actor.posRot.pos.y; + MREG(54) = this->actor.posRot.pos.z; + MREG(55) = this->actor.posRot.rot.y; +} + +s16 D_80858AC8[5]; +Vec3s D_80858AD8[25]; + +Gfx* D_80854844[PLAYER_MASK_MAX - 1] = { + 0x0602B060, 0x0602AD40, 0x0602AF70, 0x0602CA38, 0x0602B350, 0x0602B580, 0x0602B788, 0x0602B1F0, +}; + +Vec3s D_80854864 = { 0, 0, 0 }; + +void func_8084A0E8(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* cullDList, OverrideLimbDraw overrideLimbDraw) { + static s32 D_8085486C = 255; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player.c", 19228); + + gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, cullDList); + gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, cullDList); + + func_8008F470(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, lod, + this->currentTunic, this->currentBoots, this->actor.shape.unk_06, overrideLimbDraw, func_80090D20, + &this->actor); + + if ((overrideLimbDraw == func_80090014) && (this->currentMask != PLAYER_MASK_NONE)) { + Mtx* sp70 = Graph_Alloc(globalCtx->state.gfxCtx, 2 * sizeof(Mtx)); + + if (this->currentMask == PLAYER_MASK_BUNNY) { + Vec3s sp68; + + gSPSegment(oGfxCtx->polyOpa.p++, 0x0B, sp70); + + sp68.x = D_80858AC8[1] + 0x3E2; + sp68.y = D_80858AC8[2] + 0xDBE; + sp68.z = D_80858AC8[0] - 0x348A; + func_800D1694(97.0f, -1203.0f, -240.0f, &sp68); + Matrix_ToMtx(sp70++, "../z_player.c", 19273); + + sp68.x = D_80858AC8[1] - 0x3E2; + sp68.y = -0xDBE - D_80858AC8[2]; + sp68.z = D_80858AC8[0] - 0x348A; + func_800D1694(97.0f, -1203.0f, 240.0f, &sp68); + Matrix_ToMtx(sp70, "../z_player.c", 19279); + } + + gSPDisplayList(oGfxCtx->polyOpa.p++, D_80854844[this->currentMask - 1]); + } + + if ((this->currentBoots == PLAYER_BOOTS_HOVER) && !(this->actor.bgCheckFlags & 1) && + !(this->stateFlags1 & 0x800000) && (this->unk_893 != 0)) { + s32 sp5C; + s32 unk_893 = this->unk_893; + + if (this->unk_893 < 19) { + if (unk_893 >= 0xF) { + D_8085486C = (19 - unk_893) * 51.0f; + } else if (unk_893 < 19) { + sp5C = unk_893; + + if (sp5C > 9) { + sp5C = 9; + } + + D_8085486C = (-sp5C * 4) + 36; + D_8085486C = D_8085486C * D_8085486C; + D_8085486C = (s32)((Math_Coss(D_8085486C) * 100.0f) + 100.0f) + 55.0f; + D_8085486C = D_8085486C * (sp5C * 0.11111111f); + } + + func_800D1694(this->actor.posRot.pos.x, this->actor.posRot.pos.y + 2.0f, this->actor.posRot.pos.z, + &D_80854864); + Matrix_Scale(4.0f, 4.0f, 4.0f, MTXMODE_APPLY); + + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player.c", 19317), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 16, 32, 1, 0, + (globalCtx->gameplayFrames * -15) % 128, 16, 32)); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 255, D_8085486C); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 120, 90, 30, 128); + gSPDisplayList(oGfxCtx->polyXlu.p++, D_04037E30); + } + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player.c", 19328); +} + +void Player_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + Player* this = THIS; + + if (1) {} + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player.c", 19346); + + if (!(this->stateFlags2 & 0x20000000)) { + OverrideLimbDraw overrideLimbDraw = func_80090014; + s32 lod; + s32 pad; + + if ((this->csMode != 0) || (func_8008E9C4(this) && 0) || (this->actor.projectedPos.z < 160.0f)) { + lod = 0; + } else { + lod = 1; + } + + func_80093C80(globalCtx); + func_80093D84(globalCtx->state.gfxCtx); + + if (this->invincibilityTimer > 0) { + this->unk_88F += CLAMP(50 - this->invincibilityTimer, 8, 40); + oGfxCtx->polyOpa.p = Gfx_SetFog2(oGfxCtx->polyOpa.p, 255, 0, 0, 0, 0, + 4000 - (s32)(Math_Coss(this->unk_88F * 256) * 2000.0f)); + } + + func_8002EBCC(&this->actor, globalCtx, 0); + func_8002ED80(&this->actor, globalCtx, 0); + + if (this->unk_6AD != 0) { + Vec3f sp7C; + + SkinMatrix_Vec3fMtxFMultXYZ(&globalCtx->mf_11D60, &this->actor.posRot2.pos, &sp7C); + if (sp7C.z < -4.0f) { + overrideLimbDraw = func_800902F0; + } + } else if (this->stateFlags2 & 0x40000) { + if (this->actor.projectedPos.z < 0.0f) { + overrideLimbDraw = func_80090440; + } + } + + if (this->stateFlags2 & 0x4000000) { + f32 sp78 = ((u16)(globalCtx->gameplayFrames * 600) * M_PI) / 0x8000; + f32 sp74 = ((u16)(globalCtx->gameplayFrames * 1000) * M_PI) / 0x8000; + + Matrix_Push(); + this->actor.scale.y = -this->actor.scale.y; + func_800D1694(this->actor.posRot.pos.x, + (this->actor.groundY + (this->actor.groundY - this->actor.posRot.pos.y)) + + (this->actor.shape.unk_08 * this->actor.scale.y), + this->actor.posRot.pos.z, &this->actor.shape.rot); + Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); + Matrix_RotateX(sp78, MTXMODE_APPLY); + Matrix_RotateY(sp74, MTXMODE_APPLY); + Matrix_Scale(1.1f, 0.95f, 1.05f, MTXMODE_APPLY); + Matrix_RotateY(-sp74, MTXMODE_APPLY); + Matrix_RotateX(-sp78, MTXMODE_APPLY); + func_8084A0E8(globalCtx, this, lod, gCullFrontDList, overrideLimbDraw); + this->actor.scale.y = -this->actor.scale.y; + Matrix_Pull(); + } + + gSPClearGeometryMode(oGfxCtx->polyOpa.p++, G_CULL_BOTH); + gSPClearGeometryMode(oGfxCtx->polyXlu.p++, G_CULL_BOTH); + + func_8084A0E8(globalCtx, this, lod, gCullBackDList, overrideLimbDraw); + + if (this->invincibilityTimer > 0) { + oGfxCtx->polyOpa.p = func_800BC8A0(globalCtx, oGfxCtx->polyOpa.p); + } + + if (this->stateFlags2 & 0x4000) { + f32 scale = (this->unk_84F >> 1) * 22.0f; + + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (0 - globalCtx->gameplayFrames) % 128, 32, 32, 1, + 0, (globalCtx->gameplayFrames * -2) % 128, 32, 32)); + + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player.c", 19459), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 50, 100, 255); + gSPDisplayList(oGfxCtx->polyXlu.p++, D_04033EE0); + } + + if (this->unk_862 > 0) { + Player_DrawGetItem(globalCtx, this); + } + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player.c", 19473); +} + +void Player_Destroy(Actor* thisx, GlobalContext* globalCtx) { + Player* this = THIS; + + Effect_Delete(globalCtx, this->swordEffectIndex); + + Collider_DestroyCylinder(globalCtx, &this->cylinder); + Collider_DestroyQuad(globalCtx, &this->swordQuads[0]); + Collider_DestroyQuad(globalCtx, &this->swordQuads[1]); + Collider_DestroyQuad(globalCtx, &this->shieldQuad); + + func_800876C8(globalCtx); + + gSaveContext.linkAge = globalCtx->linkAgeOnLoad; +} + +#ifdef NON_MATCHING +// regalloc differences +s16 func_8084ABD8(GlobalContext* globalCtx, Player* this, s32 arg2, s16 arg3) { + s32 temp1; + s16 temp2; + + if (!func_8002DD78(this) && !func_808334B4(this) && (arg2 == 0)) { + temp2 = sControlInput->rel.in.y * 240.0f; + Math_SmoothScaleMaxMinS(&this->actor.posRot2.rot.x, temp2, 14, 4000, 30); + + temp2 = sControlInput->rel.in.x * -16.0f; + temp2 = CLAMP(temp2, -3000, 3000); + this->actor.posRot2.rot.y += temp2; + } else { + temp1 = (this->stateFlags1 & 0x800000) ? 3500 : 14000; + this->actor.posRot2.rot.x += (s32)((1.0f - Math_Coss(sControlInput->rel.in.y * 200)) * 1500.0f) * + ((sControlInput->rel.in.y >= 0) ? 1 : -1); + this->actor.posRot2.rot.x = CLAMP(this->actor.posRot2.rot.x, -temp1, temp1); + + temp1 = 19114; + temp2 = this->actor.posRot2.rot.y - this->actor.shape.rot.y; + temp2 += (s32)((1.0f - Math_Coss(sControlInput->rel.in.x * 200)) * -1500.0f) * + ((sControlInput->rel.in.x >= 0) ? 1 : -1); + this->actor.posRot2.rot.y = CLAMP(temp2, -temp1, temp1) + this->actor.shape.rot.y; + } + + this->unk_6AE |= 2; + return func_80836AB8(this, (globalCtx->unk_11E5C != 0) || func_8002DD78(this) || func_808334B4(this)) - arg3; +} +#else +s16 func_8084ABD8(GlobalContext* globalCtx, Player* this, s32 arg2, s16 arg3); #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ABD8.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AEEC.s") +void func_8084AEEC(Player* this, f32* arg1, f32 arg2, s16 arg3) { + f32 temp1; + f32 temp2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B000.s") + temp1 = this->skelAnime.animCurrentFrame - 10.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B158.s") + temp2 = (R_RUN_SPEED_LIMIT / 100.0f) * 0.8f; + if (*arg1 > temp2) { + *arg1 = temp2; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B1D8.s") + if ((0.0f < temp1) && (temp1 < 10.0f)) { + temp1 *= 6.0f; + } else { + temp1 = 0.0f; + arg2 = 0.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B3CC.s") + func_80077C6C(arg1, arg2 * 0.8f, temp1, (fabsf(*arg1) * 0.02f) + 0.05f); + Math_ApproxUpdateScaledS(&this->currentYaw, arg3, 1600); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B498.s") +void func_8084B000(Player* this) { + f32 phi_f18; + f32 phi_f16; + f32 phi_f14; + f32 waterY; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B4D4.s") + phi_f14 = -5.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B530.s") + phi_f16 = this->ageProperties->unk_28; + if (this->actor.velocity.y < 0.0f) { + phi_f16 += 1.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B78C.s") + if (this->actor.waterY < phi_f16) { + if (this->actor.velocity.y <= 0.0f) { + phi_f16 = 0.0f; + } else { + phi_f16 = this->actor.velocity.y * 0.5f; + } + phi_f18 = -0.1f - phi_f16; + } else { + if (!(this->stateFlags1 & 0x80) && (this->currentBoots == PLAYER_BOOTS_IRON) && + (this->actor.velocity.y >= -3.0f)) { + phi_f18 = -0.2f; + } else { + phi_f14 = 2.0f; + if (this->actor.velocity.y >= 0.0f) { + phi_f16 = 0.0f; + } else { + phi_f16 = this->actor.velocity.y * -0.3f; + } + phi_f18 = phi_f16 + 0.1f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B840.s") + waterY = this->actor.waterY; + if (waterY > 100.0f) { + this->stateFlags2 |= 0x400; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B898.s") + this->actor.velocity.y += phi_f18; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084B9E4.s") + if (((this->actor.velocity.y - phi_f14) * phi_f18) > 0) { + this->actor.velocity.y = phi_f14; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BBE4.s") + this->actor.gravity = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BDFC.s") +void func_8084B158(GlobalContext* globalCtx, Player* this, Input* input, f32 arg3) { + f32 temp; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BEE4.s") + if ((input != NULL) && (input->press.in.button & (A_BUTTON | B_BUTTON))) { + temp = 1.0f; + } else { + temp = 0.5f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s") + temp *= arg3; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C5F8.s") + if (temp < 1.0f) { + temp = 1.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C760.s") + this->skelAnime.animPlaybackSpeed = temp; + func_800A3BC0(globalCtx, &this->skelAnime); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C81C.s") +void func_8084B1D8(Player* this, GlobalContext* globalCtx) { + if (this->stateFlags1 & 0x8000000) { + func_8084B000(this); + func_8084AEEC(this, &this->linearVelocity, 0, this->actor.shape.rot.y); + } else { + func_8083721C(this); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C89C.s") + if ((this->unk_6AD == 2) && (func_8002DD6C(this) || func_808332E4(this))) { + func_80836670(this, globalCtx); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084C9BC.s") + if ((this->csMode != 0) || (this->unk_6AD == 0) || (this->unk_6AD >= 4) || func_80833B54(this) || + (this->unk_664 != NULL) || !func_8083AD4C(globalCtx, this) || + (((this->unk_6AD == 2) && ((sControlInput->press.in.button & (A_BUTTON | B_BUTTON | R_TRIG)) || + func_80833B2C(this) || (!func_8002DD78(this) && !func_808334B4(this)))) || + ((this->unk_6AD == 1) && (sControlInput->press.in.button & (A_BUTTON | B_BUTTON | R_TRIG | U_CBUTTONS | + L_CBUTTONS | R_CBUTTONS | D_CBUTTONS))))) { + func_8083C148(this, globalCtx); + func_80078884(NA_SE_SY_CAMERA_ZOOM_UP); + } else if ((DECR(this->unk_850) == 0) || (this->unk_6AD != 2)) { + if (func_8008F128(this)) { + this->unk_6AE |= 0x43; + } else { + this->actor.shape.rot.y = func_8084ABD8(globalCtx, this, 0, 0); + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CBF4.s") + this->currentYaw = this->actor.shape.rot.y; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s") +s32 func_8084B3CC(GlobalContext* globalCtx, Player* this) { + if (globalCtx->unk_11E5C != 0) { + func_80832564(globalCtx, this); + func_80835C58(globalCtx, this, func_8084FA54, 0); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D3E4.s") + if (!func_8002DD6C(this) || Player_HoldsHookshot(this)) { + func_80835F44(globalCtx, this, 3); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D530.s") + this->stateFlags1 |= 0x100000; + func_80832264(globalCtx, this, func_80833338(this)); + func_80832210(this); + func_8083B010(this); + return 1; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D574.s") + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D5CC.s") +void func_8084B498(Player* this) { + this->itemActionParam = + (INV_CONTENT(ITEM_OCARINA_FAIRY) == ITEM_OCARINA_FAIRY) ? PLAYER_AP_OCARINA_FAIRY : PLAYER_AP_OCARINA_TIME; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D610.s") +s32 func_8084B4D4(GlobalContext* globalCtx, Player* this) { + if (this->stateFlags3 & 0x20) { + this->stateFlags3 &= ~0x20; + func_8084B498(this); + this->unk_6AD = 4; + func_8083B040(this, globalCtx); + return 1; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D7C4.s") + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D84C.s") +void func_8084B530(Player* this, GlobalContext* globalCtx) { + this->stateFlags2 |= 0x20; + func_80836670(this, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084D980.s") + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + this->actor.flags &= ~0x100; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DAB4.s") + if ((this->targetActor->flags & 5) != 5) { + this->stateFlags2 &= ~0x2000; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DBC4.s") + func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DC48.s") + if (!func_8084B4D4(globalCtx, this) && !func_8084B3CC(globalCtx, this) && !func_8083ADD4(globalCtx, this)) { + if ((this->targetActor != this->interactRangeActor) || !func_8083E5A8(this, globalCtx)) { + if (this->stateFlags1 & 0x800000) { + s32 sp24 = this->unk_850; + func_8083A360(globalCtx, this); + this->unk_850 = sp24; + } else if (func_808332B8(this)) { + func_80838F18(globalCtx, this); + } else { + func_80853080(this, globalCtx); + } + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DF6C.s") + this->unk_88E = 10; + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFAC.s") + if (this->stateFlags1 & 0x800000) { + func_8084CC98(this, globalCtx); + } else if (func_808332B8(this)) { + func_8084D610(this, globalCtx); + } else if (!func_8008E9C4(this) && func_800A3BC0(globalCtx, &this->skelAnime)) { + if (this->skelAnime.flags != 0) { + func_80832DBC(this); + if ((this->targetActor->type == ACTORTYPE_NPC) && (this->heldItemActionParam != PLAYER_AP_FISHING_POLE)) { + func_808322D0(globalCtx, this, &D_040031A0); + } else { + func_80832284(globalCtx, this, func_80833338(this)); + } + } else { + func_808322A4(globalCtx, this, &D_040031A8); + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084DFF4.s") + if (this->unk_664 != NULL) { + this->currentYaw = this->actor.shape.rot.y = func_8083DB98(this, 0); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E1EC.s") +void func_8084B78C(Player* this, GlobalContext* globalCtx) { + f32 sp34; + s16 sp32; + s32 temp; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E30C.s") + this->stateFlags2 |= 0x141; + func_8083F524(globalCtx, this); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E368.s") + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + if (!func_8083F9D0(globalCtx, this)) { + func_80837268(this, &sp34, &sp32, 0.0f, globalCtx); + temp = func_8083FFB8(this, &sp34, &sp32); + if (temp > 0) { + func_8083FAB8(this, globalCtx); + } else if (temp < 0) { + func_8083FB14(this, globalCtx); + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E3C4.s") +void func_8084B840(GlobalContext* globalCtx, Player* this, f32 arg2) { + if (this->actor.wallPolySource != 50) { + DynaPolyActor* dynaActor = DynaPolyInfo_GetActor(&globalCtx->colCtx, this->actor.wallPolySource); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E604.s") + if (dynaActor != NULL) { + func_8002DFA4(dynaActor, arg2, this->actor.posRot.rot.y); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E6D4.s") +struct_80832924 D_80854870[] = { + { NA_SE_PL_SLIP, 0x1003 }, + { NA_SE_PL_SLIP, -0x1015 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E988.s") +void func_8084B898(Player* this, GlobalContext* globalCtx) { + f32 sp34; + s16 sp32; + s32 temp; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084E9AC.s") + this->stateFlags2 |= 0x141; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EAC0.s") + if (func_80832CB0(globalCtx, this, &D_04003108)) { + this->unk_850 = 1; + } else if (this->unk_850 == 0) { + if (func_800A4530(&this->skelAnime, 11.0f)) { + func_80832698(this, NA_SE_VO_LI_PUSH); + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084ECA4.s") + func_80832924(this, D_80854870); + func_8083F524(globalCtx, this); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EED8.s") + if (!func_8083F9D0(globalCtx, this)) { + func_80837268(this, &sp34, &sp32, 0.0f, globalCtx); + temp = func_8083FFB8(this, &sp34, &sp32); + if (temp < 0) { + func_8083FB14(this, globalCtx); + } else if (temp == 0) { + func_8083F72C(this, &D_040030E0, globalCtx); + } else { + this->stateFlags2 |= 0x10; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084EFC0.s") + if (this->stateFlags2 & 0x10) { + func_8084B840(globalCtx, this, 2.0f); + this->linearVelocity = 2.0f; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F104.s") +struct_80832924 D_80854878[] = { + { NA_SE_PL_SLIP, 0x1004 }, + { NA_SE_PL_SLIP, -0x1018 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F308.s") +Vec3f D_80854880 = { 0.0f, 26.0f, -40.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F390.s") +void func_8084B9E4(Player* this, GlobalContext* globalCtx) { + LinkAnimetionEntry* anim; + f32 sp70; + s16 sp6E; + s32 temp1; + Vec3f sp5C; + f32 temp2; + CollisionPoly* sp54; + u32 sp50; + Vec3f sp44; + Vec3f sp38; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F608.s") + anim = D_80853C74[this->modelAnimType]; + this->stateFlags2 |= 0x141; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F698.s") + if (func_80832CB0(globalCtx, this, anim)) { + this->unk_850 = 1; + } else { + if (this->unk_850 == 0) { + if (func_800A4530(&this->skelAnime, 11.0f)) { + func_80832698(this, NA_SE_VO_LI_PUSH); + } + } else { + func_80832924(this, D_80854878); + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F710.s") + func_8083F524(globalCtx, this); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F88C.s") + if (!func_8083F9D0(globalCtx, this)) { + func_80837268(this, &sp70, &sp6E, 0.0f, globalCtx); + temp1 = func_8083FFB8(this, &sp70, &sp6E); + if (temp1 > 0) { + func_8083FAB8(this, globalCtx); + } else if (temp1 == 0) { + func_8083F72C(this, D_80853C8C[this->modelAnimType], globalCtx); + } else { + this->stateFlags2 |= 0x10; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9A0.s") + if (this->stateFlags2 & 0x10) { + temp2 = func_8083973C(globalCtx, this, &D_80854880, &sp5C) - this->actor.posRot.pos.y; + if (fabsf(temp2) < 20.0f) { + sp44.x = this->actor.posRot.pos.x; + sp44.z = this->actor.posRot.pos.z; + sp44.y = sp5C.y; + if (func_8003DE84(&globalCtx->colCtx, &sp44, &sp5C, &sp38, &sp54, 1, 0, 0, 1, &sp50) == 0) { + func_8084B840(globalCtx, this, -2.0f); + return; + } + } + this->stateFlags2 &= ~0x10; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084F9C0.s") +void func_8084BBE4(Player* this, GlobalContext* globalCtx) { + f32 sp3C; + s16 sp3A; + LinkAnimetionEntry* anim; + f32 temp; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FA54.s") + this->stateFlags2 |= 0x40; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FB10.s") + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + // clang-format off + anim = (this->unk_84F > 0) ? &D_04002F28 : D_80853CD4[this->modelAnimType]; func_80832284(globalCtx, this, anim); + // clang-format on + } else if (this->unk_84F == 0) { + if (this->skelAnime.linkAnimetionSeg == &D_04002F10) { + temp = 11.0f; + } else { + temp = 1.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FBF4.s") + if (func_800A4530(&this->skelAnime, temp)) { + func_80832770(this, NA_SE_PL_WALK_GROUND); + if (this->skelAnime.linkAnimetionSeg == &D_04002F10) { + this->unk_84F = 1; + } else { + this->unk_84F = -1; + } + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FCAC.s") + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->currentYaw, 0x800); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8084FF7C.s") + if (this->unk_84F != 0) { + func_80837268(this, &sp3C, &sp3A, 0.0f, globalCtx); + if (this->unk_847[this->unk_846] >= 0) { + if (this->unk_84F > 0) { + anim = D_80853CA4[this->modelAnimType]; + } else { + anim = D_80853CEC[this->modelAnimType]; + } + func_8083A9B8(this, anim, globalCtx); + return; + } + if (CHECK_PAD(sControlInput->cur, A_BUTTON) || (this->actor.shape.unk_15 != 0)) { + func_80837B60(this); + if (this->unk_84F < 0) { + this->linearVelocity = -0.8f; + } else { + this->linearVelocity = 0.8f; + } + func_80837B9C(this, globalCtx); + this->stateFlags1 &= ~0x6000; + } + } +} + +void func_8084BDFC(Player* this, GlobalContext* globalCtx) { + this->stateFlags2 |= 0x40; + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80832E48(this, 1); + func_8083C0E8(this, globalCtx); + return; + } + + if (func_800A4530(&this->skelAnime, this->skelAnime.animFrameCount - 6.0f)) { + func_808328A0(this); + } else if (func_800A4530(&this->skelAnime, this->skelAnime.animFrameCount - 34.0f)) { + this->stateFlags1 &= ~0x6000; + func_8002F7DC(&this->actor, NA_SE_PL_CLIMB_CLIFF); + func_80832698(this, NA_SE_VO_LI_CLIMB_END); + } +} + +void func_8084BEE4(Player* this) { + func_8002F7DC(&this->actor, (this->unk_84F != 0) ? NA_SE_PL_WALK_WALL : NA_SE_PL_WALK_LADDER); +} + +void func_8084BF1C(Player* this, GlobalContext* globalCtx) { + static Vec3f D_8085488C = { 0.0f, 0.0f, 26.0f }; + s32 sp84; + s32 sp80; + f32 phi_f0; + f32 phi_f2; + Vec3f sp6C; + s32 sp68; + Vec3f sp5C; + f32 temp_f0; + LinkAnimetionEntry* sp54; + LinkAnimetionEntry* sp50; + + sp84 = sControlInput->rel.in.y; + sp80 = sControlInput->rel.in.x; + + this->fallStartHeight = this->actor.posRot.pos.y; + this->stateFlags2 |= 0x40; + + if ((this->unk_84F != 0) && (ABS(sp84) < ABS(sp80))) { + phi_f0 = ABS(sp80) * 0.0325f; + sp84 = 0; + } else { + phi_f0 = ABS(sp84) * 0.05f; + sp80 = 0; + } + + if (phi_f0 < 1.0f) { + phi_f0 = 1.0f; + } else if (phi_f0 > 3.35f) { + phi_f0 = 3.35f; + } + + if (this->skelAnime.animPlaybackSpeed >= 0.0f) { + phi_f2 = 1.0f; + } else { + phi_f2 = -1.0f; + } + + this->skelAnime.animPlaybackSpeed = phi_f2 * phi_f0; + + if (this->unk_850 >= 0) { + if ((this->actor.wallPoly != NULL) && (this->actor.wallPolySource != 50)) { + DynaPolyActor* wallPolyActor = DynaPolyInfo_GetActor(&globalCtx->colCtx, this->actor.wallPolySource); + if (wallPolyActor != NULL) { + Math_Vec3f_Diff(&wallPolyActor->actor.posRot.pos, &wallPolyActor->actor.pos4, &sp6C); + Math_Vec3f_Sum(&this->actor.posRot.pos, &sp6C, &this->actor.posRot.pos); + } + } + + func_8002E4B4(globalCtx, &this->actor, 26.0f, 6.0f, this->ageProperties->unk_00, 7); + func_8083F360(globalCtx, this, 26.0f, this->ageProperties->unk_3C, 50.0f, -20.0f); + } + + if ((this->unk_850 < 0) || !func_8083FBC0(this, globalCtx)) { + if (func_800A3BC0(globalCtx, &this->skelAnime) != 0) { + if (this->unk_850 < 0) { + this->unk_850 = ABS(this->unk_850) & 1; + return; + } + + if (sp84 != 0) { + sp68 = this->unk_84F + this->unk_850; + + if (sp84 > 0) { + D_8085488C.y = this->ageProperties->unk_40; + temp_f0 = func_8083973C(globalCtx, this, &D_8085488C, &sp5C); + + if (this->actor.posRot.pos.y < temp_f0) { + if (this->unk_84F != 0) { + this->actor.posRot.pos.y = temp_f0; + this->stateFlags1 &= ~0x200000; + func_8083A5C4(globalCtx, this, this->actor.wallPoly, this->ageProperties->unk_3C, + &D_04003000); + this->currentYaw += 0x8000; + this->actor.shape.rot.y = this->currentYaw; + func_8083A9B8(this, &D_04003000, globalCtx); + this->stateFlags1 |= 0x4000; + } else { + func_8083F070(this, this->ageProperties->unk_CC[this->unk_850], globalCtx); + } + } else { + this->skelAnime.prevFramePos = this->ageProperties->unk_4A[sp68]; + func_80832264(globalCtx, this, this->ageProperties->unk_AC[sp68]); + } + } else { + sp68 ^= 1; + + if ((this->actor.posRot.pos.y - this->actor.groundY) < 15.0f) { + if (this->unk_84F != 0) { + func_8083FB7C(this, globalCtx); + } else { + if (this->unk_850 != 0) { + this->skelAnime.prevFramePos = this->ageProperties->unk_44; + } + func_8083F070(this, this->ageProperties->unk_C4[this->unk_850], globalCtx); + this->unk_850 = 1; + } + } else { + this->skelAnime.prevFramePos = this->ageProperties->unk_62[sp68]; + sp54 = this->ageProperties->unk_AC[sp68]; + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, sp54, -1.0f, + SkelAnime_GetFrameCount(&sp54->genericHeader), 0.0f, 2, 0.0f); + } + } + + this->unk_850 ^= 1; + } else { + if ((this->unk_84F != 0) && (sp80 != 0)) { + sp50 = this->ageProperties->unk_BC[this->unk_850]; + + if (sp80 > 0) { + this->skelAnime.prevFramePos = this->ageProperties->unk_7A[this->unk_850]; + func_80832264(globalCtx, this, sp50); + } else { + this->skelAnime.prevFramePos = this->ageProperties->unk_86[this->unk_850]; + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, sp50, -1.0f, + SkelAnime_GetFrameCount(&sp50->genericHeader), 0.0f, 2, 0.0f); + } + } else { + this->stateFlags2 |= 0x1000; + } + } + + return; + } + } + + if (this->unk_850 < 0) { + if (((this->unk_850 == -2) && + (func_800A4530(&this->skelAnime, 14.0f) || func_800A4530(&this->skelAnime, 29.0f))) || + ((this->unk_850 == -4) && + (func_800A4530(&this->skelAnime, 22.0f) || func_800A4530(&this->skelAnime, 35.0f) || + func_800A4530(&this->skelAnime, 49.0f) || func_800A4530(&this->skelAnime, 55.0f)))) { + func_8084BEE4(this); + } + return; + } + + if (func_800A4530(&this->skelAnime, (this->skelAnime.animPlaybackSpeed > 0.0f) ? 20.0f : 0.0f)) { + func_8084BEE4(this); + } +} + +f32 D_80854898[] = { 10.0f, 20.0f }; +f32 D_808548A0[] = { 40.0f, 50.0f }; + +struct_80832924 D_808548A8[] = { + { NA_SE_PL_WALK_LADDER, 0x80A }, + { NA_SE_PL_WALK_LADDER, 0x814 }, + { NA_SE_PL_WALK_LADDER, -0x81E }, +}; + +void func_8084C5F8(Player* this, GlobalContext* globalCtx) { + s32 temp; + f32* sp38; + CollisionPoly* sp34; + s32 sp30; + Vec3f sp24; + + this->stateFlags2 |= 0x40; + + temp = func_808374A0(globalCtx, this, &this->skelAnime, 4.0f); + + if (temp == 0) { + this->stateFlags1 &= ~0x200000; + return; + } + + if ((temp > 0) || func_800A3BC0(globalCtx, &this->skelAnime)) { + func_8083C0E8(this, globalCtx); + this->stateFlags1 &= ~0x200000; + return; + } + + sp38 = D_80854898; + + if (this->unk_850 != 0) { + func_80832924(this, D_808548A8); + sp38 = D_808548A0; + } + + if (func_800A4530(&this->skelAnime, sp38[0]) || func_800A4530(&this->skelAnime, sp38[1])) { + sp24.x = this->actor.posRot.pos.x; + sp24.y = this->actor.posRot.pos.y + 20.0f; + sp24.z = this->actor.posRot.pos.z; + if (func_8003C940(&globalCtx->colCtx, &sp34, &sp30, &sp24) != 0.0f) { + this->unk_89E = func_80041F10(&globalCtx->colCtx, sp34, sp30); + func_808328A0(this); + } + } +} + +struct_80832924 D_808548B4[] = { + { 0, 0x3028 }, { 0, 0x3030 }, { 0, 0x3038 }, { 0, 0x3040 }, { 0, 0x3048 }, + { 0, 0x3050 }, { 0, 0x3058 }, { 0, 0x3060 }, { 0, -0x3068 }, +}; + +void func_8084C760(Player* this, GlobalContext* globalCtx) { + this->stateFlags2 |= 0x40; + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + if (!(this->stateFlags1 & 1)) { + if (this->skelAnime.flags != 0) { + this->skelAnime.flags = 0; + return; + } + + if (!func_8083F570(this, globalCtx)) { + this->linearVelocity = sControlInput->rel.in.y * 0.03f; + } + } + return; + } + + func_80832924(this, D_808548B4); +} + +struct_80832924 D_808548D8[] = { + { 0, 0x300A }, { 0, 0x3012 }, { 0, 0x301A }, { 0, 0x3022 }, { 0, 0x3034 }, + { 0, 0x303C }, { 0, 0x3044 }, { 0, 0x304C }, { 0, -0x3054 }, +}; + +void func_8084C81C(Player* this, GlobalContext* globalCtx) { + this->stateFlags2 |= 0x40; + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_8083C0E8(this, globalCtx); + this->stateFlags2 &= ~0x40000; + return; + } + + func_80832924(this, D_808548D8); +} + +Vec3f D_808548FC[] = { + { 40.0f, 0.0f, 0.0f }, + { -40.0f, 0.0f, 0.0f }, +}; + +Vec3f D_80854914[] = { + { 60.0f, 20.0f, 0.0f }, + { -60.0f, 20.0f, 0.0f }, +}; + +Vec3f D_8085492C[] = { + { 60.0f, -20.0f, 0.0f }, + { -60.0f, -20.0f, 0.0f }, +}; + +s32 func_8084C89C(GlobalContext* globalCtx, Player* this, s32 arg2, f32* arg3) { + EnHorse* rideActor = (EnHorse*)this->rideActor; + f32 sp50; + f32 sp4C; + Vec3f sp40; + Vec3f sp34; + CollisionPoly* sp30; + u32 sp2C; + + sp50 = rideActor->actor.posRot.pos.y + 20.0f; + sp4C = rideActor->actor.posRot.pos.y - 20.0f; + + *arg3 = func_8083973C(globalCtx, this, &D_808548FC[arg2], &sp40); + + return (sp4C < *arg3) && (*arg3 < sp50) && + !func_80839768(globalCtx, this, &D_80854914[arg2], &sp30, &sp2C, &sp34) && + !func_80839768(globalCtx, this, &D_8085492C[arg2], &sp30, &sp2C, &sp34); +} + +s32 func_8084C9BC(Player* this, GlobalContext* globalCtx) { + EnHorse* rideActor = (EnHorse*)this->rideActor; + s32 sp38; + f32 sp34; + + if (this->unk_850 < 0) { + this->unk_850 = 99; + } else { + sp38 = (this->unk_43C < 0) ? 0 : 1; + if (!func_8084C89C(globalCtx, this, sp38, &sp34)) { + sp38 ^= 1; + if (!func_8084C89C(globalCtx, this, sp38, &sp34)) { + return 0; + } else { + this->unk_43C = -this->unk_43C; + } + } + + if ((globalCtx->csCtx.state == 0) && (globalCtx->transitionMode == 0) && + (EN_HORSE_CHECK_1(rideActor) || EN_HORSE_CHECK_4(rideActor))) { + this->stateFlags2 |= 0x400000; + + if (EN_HORSE_CHECK_1(rideActor) || + (EN_HORSE_CHECK_4(rideActor) && CHECK_PAD(sControlInput->press, A_BUTTON))) { + rideActor->actor.child = NULL; + func_80835DAC(globalCtx, this, func_8084D3E4, 0); + this->unk_878 = sp34 - rideActor->actor.posRot.pos.y; + func_80832264(globalCtx, this, (this->unk_43C < 0) ? &D_04003390 : &D_040033A0); + return 1; + } + } + } + + return 0; +} + +void func_8084CBF4(Player* this, f32 arg1, f32 arg2) { + f32 temp; + f32 dir; + + if ((this->unk_878 != 0.0f) && (arg2 <= this->skelAnime.animCurrentFrame)) { + if (arg1 < fabsf(this->unk_878)) { + if (this->unk_878 >= 0.0f) { + dir = 1; + } else { + dir = -1; + } + temp = dir * arg1; + } else { + temp = this->unk_878; + } + this->actor.posRot.pos.y += temp; + this->unk_878 -= temp; + } +} + +LinkAnimetionEntry* D_80854944[] = { + 0x04003370, 0x04003368, 0x04003380, 0x04003358, 0x04003338, 0x04003348, 0x04003350, NULL, NULL, +}; + +LinkAnimetionEntry* D_80854968[] = { + 0x04003388, 0x04003388, 0x04003388, 0x04003360, 0x04003340, 0x04003340, 0x04003340, NULL, NULL, +}; + +LinkAnimetionEntry* D_8085498C[] = { + 0x040033C8, + 0x040033B8, + 0x040033C0, +}; + +u8 D_80854998[2][2] = { + { 32, 58 }, + { 25, 42 }, +}; + +Vec3s D_8085499C = { -69, 7146, -266 }; + +struct_80832924 D_808549A4[] = { + { NA_SE_PL_CALM_HIT, 0x830 }, { NA_SE_PL_CALM_HIT, 0x83A }, { NA_SE_PL_CALM_HIT, 0x844 }, + { NA_SE_PL_CALM_PAT, 0x85C }, { NA_SE_PL_CALM_PAT, 0x86E }, { NA_SE_PL_CALM_PAT, 0x87E }, + { NA_SE_PL_CALM_PAT, 0x884 }, { NA_SE_PL_CALM_PAT, -0x888 }, +}; + +void func_8084CC98(Player* this, GlobalContext* globalCtx) { + EnHorse* rideActor = (EnHorse*)this->rideActor; + u8* arr; + + this->stateFlags2 |= 0x40; + + func_8084CBF4(this, 1.0f, 10.0f); + + if (this->unk_850 == 0) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + this->skelAnime.linkAnimetionSeg = &D_040033B8; + this->unk_850 = 99; + return; + } + + arr = D_80854998[(this->unk_43C < 0) ? 0 : 1]; + + if (func_800A4530(&this->skelAnime, arr[0])) { + func_8002F7DC(&this->actor, NA_SE_PL_CLIMB_CLIFF); + return; + } + + if (func_800A4530(&this->skelAnime, arr[1])) { + func_8002DE74(globalCtx, this); + func_8002F7DC(&this->actor, NA_SE_PL_SIT_ON_HORSE); + return; + } + + return; + } + + func_8002DE74(globalCtx, this); + this->skelAnime.prevFramePos = D_8085499C; + + if ((rideActor->unk_210 != this->unk_850) && ((rideActor->unk_210 >= 2) || (this->unk_850 >= 2))) { + if ((this->unk_850 = rideActor->unk_210) < 2) { + f32 rand = Math_Rand_ZeroOne(); + s32 temp = 0; + + this->unk_850 = 1; + + if (rand < 0.1f) { + temp = 2; + } else if (rand < 0.2f) { + temp = 1; + } + func_80832264(globalCtx, this, D_8085498C[temp]); + } else { + this->skelAnime.linkAnimetionSeg = D_80854944[this->unk_850 - 2]; + SkelAnime_SetTransition(globalCtx, &this->skelAnime, 8.0f); + if (this->unk_850 < 4) { + func_80834644(globalCtx, this); + this->unk_84F = 0; + } + } + } + + if (this->unk_850 == 1) { + if ((D_808535E0 != 0) || func_8083224C(globalCtx)) { + func_80832264(globalCtx, this, &D_040033C8); + } else if (func_800A3BC0(globalCtx, &this->skelAnime)) { + this->unk_850 = 99; + } else if (this->skelAnime.linkAnimetionSeg == &D_040033B8) { + func_80832924(this, D_808549A4); + } + } else { + this->skelAnime.animCurrentFrame = rideActor->unk_214; + func_800A3C9C(globalCtx, &this->skelAnime); + } + + SkelAnime_LoadAnimationType1(globalCtx, this->skelAnime.limbCount, this->skelAnime.transitionDrawTbl, + this->skelAnime.limbDrawTbl); + + if ((globalCtx->csCtx.state != 0) || (this->csMode != 0)) { + if (this->csMode == 7) { + this->csMode = 0; + } + this->unk_6AD = 0; + this->unk_84F = 0; + } else if ((this->unk_850 < 2) || (this->unk_850 >= 4)) { + D_808535E0 = func_80836670(this, globalCtx); + if (D_808535E0 != 0) { + this->unk_84F = 0; + } + } + + this->actor.posRot.pos.x = rideActor->actor.posRot.pos.x + rideActor->unk_258.x; + this->actor.posRot.pos.y = (rideActor->actor.posRot.pos.y + rideActor->unk_258.y) - 27.0f; + this->actor.posRot.pos.z = rideActor->actor.posRot.pos.z + rideActor->unk_258.z; + + this->currentYaw = this->actor.shape.rot.y = rideActor->actor.shape.rot.y; + + if ((this->csMode != 0) || + (!func_8083224C(globalCtx) && ((rideActor->actor.speedXZ != 0.0f) || !func_8083B644(this, globalCtx)) && + !func_8083C1DC(this, globalCtx))) { + if (D_808535E0 == 0) { + if (this->unk_84F != 0) { + if (func_800A3BC0(globalCtx, &this->skelAnime2)) { + rideActor->unk_1F0 &= ~0x100; + this->unk_84F = 0; + } + + if (this->skelAnime2.linkAnimetionSeg == &D_040033B0) { + if (func_800A4530(&this->skelAnime2, 23.0f)) { + func_8002F7DC(&this->actor, NA_SE_IT_LASH); + func_80832698(this, NA_SE_VO_LI_LASH); + } + + SkelAnime_LoadAnimationType1(globalCtx, this->skelAnime.limbCount, this->skelAnime.limbDrawTbl, + this->skelAnime2.limbDrawTbl); + } else { + if (func_800A4530(&this->skelAnime2, 10.0f)) { + func_8002F7DC(&this->actor, NA_SE_IT_LASH); + func_80832698(this, NA_SE_VO_LI_LASH); + } + + SkelAnime_LoadAnimationType3(globalCtx, this->skelAnime.limbCount, this->skelAnime.limbDrawTbl, + this->skelAnime2.limbDrawTbl, D_80853410); + } + } else { + LinkAnimetionEntry* anim = NULL; + + if (EN_HORSE_CHECK_3(rideActor)) { + anim = &D_040033B0; + } else if (EN_HORSE_CHECK_2(rideActor)) { + if ((this->unk_850 >= 2) && (this->unk_850 != 99)) { + anim = D_80854968[this->unk_850 - 2]; + } + } + + if (anim != NULL) { + SkelAnime_ChangeLinkAnimDefaultStop(globalCtx, &this->skelAnime2, anim); + this->unk_84F = 1; + } + } + } + + if (this->stateFlags1 & 0x100000) { + if (!func_8083AD4C(globalCtx, this) || (sControlInput->press.in.button & A_BUTTON) || func_80833BCC(this)) { + this->unk_6AD = 0; + this->stateFlags1 &= ~0x100000; + } else { + this->unk_6BE = func_8084ABD8(globalCtx, this, 1, -5000) - this->actor.shape.rot.y; + this->unk_6BE += 5000; + this->unk_6B0 = -5000; + } + return; + } + + if ((this->csMode != 0) || (!func_8084C9BC(this, globalCtx) && !func_8083B040(this, globalCtx))) { + if (this->unk_664 != NULL) { + if (func_8002DD78(this) != 0) { + this->unk_6BE = func_8083DB98(this, 1) - this->actor.shape.rot.y; + this->unk_6BE = CLAMP(this->unk_6BE, -0x4AAA, 0x4AAA); + this->actor.posRot2.rot.y = this->actor.shape.rot.y + this->unk_6BE; + this->unk_6BE += 5000; + this->unk_6AE |= 0x80; + } else { + func_8083DB98(this, 0); + } + } else { + if (func_8002DD78(this) != 0) { + this->unk_6BE = func_8084ABD8(globalCtx, this, 1, -5000) - this->actor.shape.rot.y; + this->unk_6BE += 5000; + this->unk_6B0 = -5000; + } + } + } + } +} + +struct_80832924 D_808549C4[] = { + { 0, 0x2800 }, + { NA_SE_PL_GET_OFF_HORSE, 0x80A }, + { NA_SE_PL_SLIPDOWN, -0x819 }, +}; + +void func_8084D3E4(Player* this, GlobalContext* globalCtx) { + this->stateFlags2 |= 0x40; + func_8084CBF4(this, 1.0f, 10.0f); + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + EnHorse* rideActor = (EnHorse*)this->rideActor; + + func_8083C0E8(this, globalCtx); + this->stateFlags1 &= ~0x800000; + this->actor.parent = NULL; + AREG(6) = 0; + + if (Flags_GetEventChkInf(0x18) || (DREG(1) != 0)) { + gSaveContext.horseData.pos.x = rideActor->actor.posRot.pos.x; + gSaveContext.horseData.pos.y = rideActor->actor.posRot.pos.y; + gSaveContext.horseData.pos.z = rideActor->actor.posRot.pos.z; + gSaveContext.horseData.angle = rideActor->actor.shape.rot.y; + } + } else { + func_8005A77C(Gameplay_GetCamera(globalCtx, 0), 1); + + if (this->unk_43C < 0) { + D_808549C4[0].field = 0x2828; + } else { + D_808549C4[0].field = 0x281D; + } + func_80832924(this, D_808549C4); + } +} + +struct_80832924 D_808549D0[] = { + { NA_SE_PL_SWIM, -0x800 }, +}; + +void func_8084D530(Player* this, f32* arg1, f32 arg2, s16 arg3) { + func_8084AEEC(this, arg1, arg2, arg3); + func_80832924(this, D_808549D0); +} + +void func_8084D574(GlobalContext* globalCtx, Player* this, s16 arg2) { + func_80835C58(globalCtx, this, func_8084D84C, 0); + this->actor.shape.rot.y = this->currentYaw = arg2; + func_80832C6C(globalCtx, this, &D_040032F0); +} + +void func_8084D5CC(GlobalContext* globalCtx, Player* this) { + func_80835C58(globalCtx, this, func_8084DAB4, 0); + func_80832C6C(globalCtx, this, &D_040032F0); +} + +void func_8084D610(Player* this, GlobalContext* globalCtx) { + f32 sp34; + s16 sp32; + + func_80832CB0(globalCtx, this, &D_04003328); + func_8084B000(this); + + if (!func_8083224C(globalCtx) && !func_80837348(globalCtx, this, D_80854444, 1) && + !func_8083D12C(globalCtx, this, sControlInput)) { + if (this->unk_6AD != 1) { + this->unk_6AD = 0; + } + + if (this->currentBoots == PLAYER_BOOTS_IRON) { + sp34 = 0.0f; + sp32 = this->actor.shape.rot.y; + + if (this->actor.bgCheckFlags & 1) { + func_8083A098(this, D_80853A7C[this->modelAnimType], globalCtx); + func_808328A0(this); + } + } else { + func_80837268(this, &sp34, &sp32, 0.0f, globalCtx); + + if (sp34 != 0.0f) { + s16 temp = this->actor.shape.rot.y - sp32; + if ((ABS(temp) > 0x6000) && !Math_ApproxF(&this->linearVelocity, 0.0f, 1.0f)) { + return; + } + + if (func_80833C04(this)) { + func_8084D5CC(globalCtx, this); + } else { + func_8084D574(globalCtx, this, sp32); + } + } + } + + func_8084AEEC(this, &this->linearVelocity, sp34, sp32); + } +} + +void func_8084D7C4(Player* this, GlobalContext* globalCtx) { + if (!func_8083B040(this, globalCtx)) { + this->stateFlags2 |= 0x20; + + func_8084B158(globalCtx, this, NULL, this->linearVelocity); + func_8084B000(this); + + if (DECR(this->unk_850) == 0) { + func_80838F18(globalCtx, this); + } + } +} + +void func_8084D84C(Player* this, GlobalContext* globalCtx) { + f32 sp34; + s16 sp32; + s16 temp; + + this->stateFlags2 |= 0x20; + + func_8084B158(globalCtx, this, sControlInput, this->linearVelocity); + func_8084B000(this); + + if (!func_80837348(globalCtx, this, D_80854444, 1) && !func_8083D12C(globalCtx, this, sControlInput)) { + func_80837268(this, &sp34, &sp32, 0.0f, globalCtx); + + temp = this->actor.shape.rot.y - sp32; + if ((sp34 == 0.0f) || (ABS(temp) > 0x6000) || (this->currentBoots == PLAYER_BOOTS_IRON)) { + func_80838F18(globalCtx, this); + } else if (func_80833C04(this)) { + func_8084D5CC(globalCtx, this); + } + + func_8084D530(this, &this->linearVelocity, sp34, sp32); + } +} + +s32 func_8084D980(GlobalContext* globalCtx, Player* this, f32* arg2, s16* arg3) { + LinkAnimetionEntry* anim; + s16 temp1; + s32 temp2; + + temp1 = this->currentYaw - *arg3; + + if (ABS(temp1) > 0x6000) { + anim = &D_04003328; + + if (Math_ApproxF(&this->linearVelocity, 0.0f, 1.0f)) { + this->currentYaw = *arg3; + } else { + *arg2 = 0.0f; + *arg3 = this->currentYaw; + } + } else { + temp2 = func_8083FD78(this, arg2, arg3, globalCtx); + + if (temp2 > 0) { + anim = &D_040032F0; + } else if (temp2 < 0) { + anim = &D_040032D8; + } else if ((temp1 = this->actor.shape.rot.y - *arg3) > 0) { + anim = &D_040032D0; + } else { + anim = &D_040032C8; + } + } + + if (anim != this->skelAnime.linkAnimetionSeg) { + func_80832C6C(globalCtx, this, anim); + return 1; + } + + return 0; +} + +void func_8084DAB4(Player* this, GlobalContext* globalCtx) { + f32 sp2C; + s16 sp2A; + + func_8084B158(globalCtx, this, sControlInput, this->linearVelocity); + func_8084B000(this); + + if (!func_80837348(globalCtx, this, D_80854444, 1) && !func_8083D12C(globalCtx, this, sControlInput)) { + func_80837268(this, &sp2C, &sp2A, 0.0f, globalCtx); + + if (sp2C == 0.0f) { + func_80838F18(globalCtx, this); + } else if (!func_80833C04(this)) { + func_8084D574(globalCtx, this, sp2A); + } else { + func_8084D980(globalCtx, this, &sp2C, &sp2A); + } + + func_8084D530(this, &this->linearVelocity, sp2C, sp2A); + } +} + +void func_8084DBC4(GlobalContext* globalCtx, Player* this, f32 arg2) { + f32 sp2C; + s16 sp2A; + + func_80837268(this, &sp2C, &sp2A, 0.0f, globalCtx); + func_8084AEEC(this, &this->linearVelocity, sp2C * 0.5f, sp2A); + func_8084AEEC(this, &this->actor.velocity.y, arg2, this->currentYaw); +} + +void func_8084DC48(Player* this, GlobalContext* globalCtx) { + f32 sp2C; + + this->stateFlags2 |= 0x20; + this->actor.gravity = 0.0f; + func_80836670(this, globalCtx); + + if (!func_8083B040(this, globalCtx)) { + if (this->currentBoots == PLAYER_BOOTS_IRON) { + func_80838F18(globalCtx, this); + return; + } + + if (this->unk_84F == 0) { + if (this->unk_850 == 0) { + if (func_800A3BC0(globalCtx, &this->skelAnime) || + ((this->skelAnime.animCurrentFrame >= 22.0f) && !CHECK_PAD(sControlInput->cur, A_BUTTON))) { + func_8083D330(globalCtx, this); + } else if (func_800A4530(&this->skelAnime, 20.0f) != 0) { + this->actor.velocity.y = -2.0f; + } + + func_8083721C(this); + return; + } + + func_8084B158(globalCtx, this, sControlInput, this->actor.velocity.y); + this->unk_6C2 = 16000; + + if (CHECK_PAD(sControlInput->cur, A_BUTTON) && !func_8083E5A8(this, globalCtx) && + !(this->actor.bgCheckFlags & 1) && (this->actor.waterY < D_80854784[CUR_UPG_VALUE(UPG_SCALE)])) { + func_8084DBC4(globalCtx, this, -2.0f); + } else { + this->unk_84F++; + func_80832C6C(globalCtx, this, &D_04003328); + } + } else if (this->unk_84F == 1) { + func_800A3BC0(globalCtx, &this->skelAnime); + func_8084B000(this); + + if (this->unk_6C2 < 10000) { + this->unk_84F++; + this->unk_850 = this->actor.waterY; + func_80832C6C(globalCtx, this, &D_040032F0); + } + } else if (!func_8083D12C(globalCtx, this, sControlInput)) { + sp2C = (this->unk_850 * 0.018f) + 4.0f; + + if (this->stateFlags1 & 0x800) { + sControlInput = NULL; + } + + func_8084B158(globalCtx, this, sControlInput, fabsf(this->actor.velocity.y)); + Math_ApproxUpdateScaledS(&this->unk_6C2, -10000, 800); + + if (sp2C > 8.0f) { + sp2C = 8.0f; + } + + func_8084DBC4(globalCtx, this, sp2C); + } + } +} + +void func_8084DF6C(GlobalContext* globalCtx, Player* this) { + this->unk_862 = 0; + this->stateFlags1 &= ~0xC00; + this->getItemId = GI_NONE; + func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); +} + +void func_8084DFAC(GlobalContext* globalCtx, Player* this) { + func_8084DF6C(globalCtx, this); + func_808322FC(this); + func_8083C0E8(this, globalCtx); + this->currentYaw = this->actor.shape.rot.y; +} + +s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) { + GetItemEntry* giEntry; + s32 temp1; + s32 temp2; + + if (this->getItemId == GI_NONE) { + return 1; + } + + if (this->unk_84F == 0) { + giEntry = &sGetItemTable[this->getItemId - 1]; + this->unk_84F = 1; + + func_8010B680(globalCtx, giEntry->textId, &this->actor); + Item_Give(globalCtx, giEntry->itemId); + + if (((this->getItemId >= GI_RUPEE_GREEN) && (this->getItemId <= GI_RUPEE_RED)) || + ((this->getItemId >= GI_RUPEE_PURPLE) && (this->getItemId <= GI_RUPEE_GOLD)) || + ((this->getItemId >= GI_RUPEE_GREEN_LOSE) && (this->getItemId <= GI_RUPEE_PURPLE_LOSE)) || + (this->getItemId == GI_HEART)) { + Audio_PlaySoundGeneral(NA_SE_SY_GET_BOXITEM, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } else { + if ((this->getItemId == GI_HEART_CONTAINER_2) || (this->getItemId == GI_HEART_CONTAINER) || + ((this->getItemId == GI_HEART_PIECE) && ((gSaveContext.questItems & 0xF0000000) == 0x40000000))) { + temp1 = 0x924; + } else { + temp1 = temp2 = (this->getItemId == GI_HEART_PIECE) ? 0x39 : 0x922; + } + func_800F5C64(temp1); + } + } else { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + if (this->getItemId == GI_GAUNTLETS_SILVER) { + globalCtx->nextEntranceIndex = 0x0123; + globalCtx->sceneLoadFlag = 0x14; + gSaveContext.nextCutsceneIndex = 0xFFF1; + globalCtx->fadeTransition = 0xF; + this->stateFlags1 &= ~0x20000000; + func_80852FFC(globalCtx, NULL, 8); + } + this->getItemId = GI_NONE; + } + } + + return 0; +} + +void func_8084E1EC(Player* this, GlobalContext* globalCtx) { + this->stateFlags2 |= 0x20; + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + if (!(this->stateFlags1 & 0x400) || func_8084DFF4(globalCtx, this)) { + func_8084DF6C(globalCtx, this); + func_80838F18(globalCtx, this); + func_80832340(globalCtx, this); + } + } else { + if ((this->stateFlags1 & 0x400) && func_800A4530(&this->skelAnime, 10.0f)) { + func_808332F4(this, globalCtx); + func_80832340(globalCtx, this); + func_80835EA4(globalCtx, 8); + } else if (func_800A4530(&this->skelAnime, 5.0f)) { + func_80832698(this, NA_SE_VO_LI_BREATH_DRINK); + } + } + + func_8084B000(this); + func_8084AEEC(this, &this->linearVelocity, 0.0f, this->actor.shape.rot.y); +} + +void func_8084E30C(Player* this, GlobalContext* globalCtx) { + func_8084B000(this); + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80838F18(globalCtx, this); + } + + func_8084AEEC(this, &this->linearVelocity, 0.0f, this->actor.shape.rot.y); +} + +void func_8084E368(Player* this, GlobalContext* globalCtx) { + func_8084B000(this); + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80843AE8(globalCtx, this); + } + + func_8084AEEC(this, &this->linearVelocity, 0.0f, this->actor.shape.rot.y); +} + +s16 D_808549D4[] = { 0x0600, 0x04F6, 0x0604, 0x01F1, 0x0568, 0x05F4 }; + +void func_8084E3C4(Player* this, GlobalContext* globalCtx) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_808322A4(globalCtx, this, &D_040030A8); + this->unk_850 = 1; + if (this->stateFlags2 & 0x2800000) { + this->stateFlags2 |= 0x1000000; + } else { + func_8010BD58(globalCtx, 1); + } + return; + } + + if (this->unk_850 == 0) { + return; + } + + if (globalCtx->msgCtx.unk_E3EE == 4) { + func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); + + if ((this->targetActor != NULL) && (this->targetActor == this->unk_6A8)) { + func_80853148(globalCtx, this->targetActor); + } else if (this->naviMessageId < 0) { + this->targetActor = this->naviActor; + this->naviActor->textId = -this->naviMessageId; + func_80853148(globalCtx, this->targetActor); + } else if (!func_8083B040(this, globalCtx)) { + func_8083A098(this, &D_04003098, globalCtx); + } + + this->stateFlags2 &= ~0x3800000; + this->unk_6A8 = NULL; + } else if (globalCtx->msgCtx.unk_E3EE == 2) { + gSaveContext.respawn[RESPAWN_MODE_RETURN].entranceIndex = D_808549D4[globalCtx->msgCtx.unk_E3EC]; + gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams = 0x5FF; + gSaveContext.respawn[RESPAWN_MODE_RETURN].data = globalCtx->msgCtx.unk_E3EC; + + this->csMode = 0; + this->stateFlags1 &= ~0x20000000; + + func_80852FFC(globalCtx, NULL, 8); + globalCtx->mainCamera.unk_14C &= ~8; + + this->stateFlags1 |= 0x30000000; + this->stateFlags2 |= 0x8000000; + + if (Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DEMO_KANKYO, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0xF) == NULL) { + func_800776E4(globalCtx); + } + + gSaveContext.seqIndex = 0xFF; + gSaveContext.nightSeqIndex = 0xFF; + } +} + +void func_8084E604(Player* this, GlobalContext* globalCtx) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_8083A098(this, &D_04003050, globalCtx); + } else if (func_800A4530(&this->skelAnime, 3.0f)) { + Inventory_ChangeAmmo(ITEM_NUT, -1); + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ARROW, this->bodyPartsPos[15].x, this->bodyPartsPos[15].y, + this->bodyPartsPos[15].z, 4000, this->actor.shape.rot.y, 0, 10); + func_80832698(this, NA_SE_VO_LI_SWORD_N); + } + + func_8083721C(this); +} + +struct_80832924 D_808549E0[] = { + { 0, 0x3857 }, + { NA_SE_VO_LI_CLIMB_END, 0x2057 }, + { NA_SE_VO_LI_AUTO_JUMP, 0x2045 }, + { 0, -0x287B }, +}; + +void func_8084E6D4(Player* this, GlobalContext* globalCtx) { + s32 cond; + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + if (this->unk_850 != 0) { + if (this->unk_850 >= 2) { + this->unk_850--; + } + + if (func_8084DFF4(globalCtx, this) && (this->unk_850 == 1)) { + cond = ((this->targetActor != NULL) && (this->exchangeItemId < 0)) || (this->stateFlags3 & 0x20); + + if (cond || (gSaveContext.healthAccumulator == 0)) { + if (cond) { + func_8084DF6C(globalCtx, this); + this->exchangeItemId = EXCH_ITEM_NONE; + + if (func_8084B4D4(globalCtx, this) == 0) { + func_80853148(globalCtx, this->targetActor); + } + } else { + func_8084DFAC(globalCtx, this); + } + } + } + } else { + func_80832DBC(this); + + if (this->getItemId == GI_ICE_TRAP) { + this->stateFlags1 &= ~0xC00; + + if (this->getItemId != GI_ICE_TRAP) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_CLEAR_TAG, this->actor.posRot.pos.x, + this->actor.posRot.pos.y + 100.0f, this->actor.posRot.pos.z, 0, 0, 0, 0); + func_8083C0E8(this, globalCtx); + } else { + this->actor.colChkInfo.damage = 0; + func_80837C0C(globalCtx, this, 3, 0.0f, 0.0f, 0, 20); + } + return; + } + + if (this->skelAnime.linkAnimetionSeg == &D_04002DF8) { + func_808322D0(globalCtx, this, &D_04002788); + } else { + func_808322D0(globalCtx, this, &D_04002780); + } + + this->unk_850 = 2; + func_80835EA4(globalCtx, 9); + } + } else { + if (this->unk_850 == 0) { + if (LINK_IS_CHILD) { + func_80832924(this, D_808549E0); + } + return; + } + + if (this->skelAnime.linkAnimetionSeg == &D_04002788) { + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, func_8005A9F4(ACTIVE_CAM) + 0x8000, 4000); + } + + if (func_800A4530(&this->skelAnime, 21.0f)) { + func_808332F4(this, globalCtx); + } + } +} + +struct_80832924 D_808549F0[] = { + { NA_SE_IT_MASTER_SWORD_SWING, -0x83C }, +}; + +void func_8084E988(Player* this) { + func_80832924(this, D_808549F0); +} + +struct_80832924 D_808549F4[] = { + { NA_SE_VO_LI_AUTO_JUMP, 0x2005 }, + { 0, -0x280F }, +}; + +void func_8084E9AC(Player* this, GlobalContext* globalCtx) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + if (this->unk_84F == 0) { + if (DECR(this->unk_850) == 0) { + this->unk_84F = 1; + this->skelAnime.animFrameCount = this->skelAnime.totalFrames - 1.0f; + } + } else { + func_8083C0E8(this, globalCtx); + } + } else { + if (LINK_IS_ADULT && func_800A4530(&this->skelAnime, 158.0f)) { + func_80832698(this, NA_SE_VO_LI_SWORD_N); + return; + } + + if (LINK_IS_CHILD) { + func_80832924(this, D_808549F4); + } else { + func_8084E988(this); + } + } +} + +u8 D_808549FC[] = { + 0x01, 0x03, 0x02, 0x04, 0x04, +}; + +void func_8084EAC0(Player* this, GlobalContext* globalCtx) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + if (this->unk_850 == 0) { + if (this->itemActionParam == PLAYER_AP_BOTTLE_POE) { + s32 rand = Math_Rand_S16Offset(-1, 3); + + if (rand == 0) { + rand = 3; + } + + if ((rand < 0) && (gSaveContext.health <= 0x10)) { + rand = 3; + } + + if (rand < 0) { + Health_ChangeBy(globalCtx, -0x10); + } else { + gSaveContext.healthAccumulator = rand * 0x10; + } + } else { + s32 sp28 = D_808549FC[this->itemActionParam - PLAYER_AP_BOTTLE_POTION_RED]; + + if (sp28 & 1) { + gSaveContext.healthAccumulator = 0x140; + } + + if (sp28 & 2) { + func_80087680(globalCtx); + } + + if (sp28 & 4) { + gSaveContext.healthAccumulator = 0x50; + } + } + + func_808322A4(globalCtx, this, &D_04002670); + this->unk_850 = 1; + return; + } + + func_8083C0E8(this, globalCtx); + func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); + } else if (this->unk_850 == 1) { + if ((gSaveContext.healthAccumulator == 0) && (gSaveContext.unk_13F0 != 9)) { + func_80832B78(globalCtx, this, &D_04002660); + this->unk_850 = 2; + Player_UpdateBottleHeld(globalCtx, this, ITEM_BOTTLE, PLAYER_AP_BOTTLE); + } + func_80832698(this, NA_SE_VO_LI_DRINK - SFX_FLAG); + } else if ((this->unk_850 == 2) && func_800A4530(&this->skelAnime, 29.0f)) { + func_80832698(this, NA_SE_VO_LI_BREATH_DRINK); + } +} + +BottleCatchInfo D_80854A04[] = { + { ACTOR_EN_ELF, ITEM_FAIRY, 0x2A, 0x46 }, + { ACTOR_EN_FISH, ITEM_FISH, 0x1F, 0x47 }, + { ACTOR_EN_ICE_HONO, ITEM_BLUE_FIRE, 0x20, 0x5D }, + { ACTOR_EN_INSECT, ITEM_BUG, 0x21, 0x7A }, +}; + +void func_8084ECA4(Player* this, GlobalContext* globalCtx) { + struct_80854554* sp24; + BottleCatchInfo* catchInfo; + s32 temp; + s32 i; + + sp24 = &D_80854554[this->unk_850]; + func_8083721C(this); + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + if (this->unk_84F != 0) { + if (this->unk_850 == 0) { + func_8010B680(globalCtx, D_80854A04[this->unk_84F - 1].textId, &this->actor); + func_800F5C64(0x922); + this->unk_850 = 1; + } else if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + this->unk_84F = 0; + func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); + } + } else { + func_8083C0E8(this, globalCtx); + } + } else { + if (this->unk_84F == 0) { + temp = this->skelAnime.animCurrentFrame - sp24->unk_08; + + if (temp >= 0) { + if (sp24->unk_09 >= temp) { + if (this->unk_850 != 0) { + if (temp == 0) { + func_8002F7DC(&this->actor, NA_SE_IT_SCOOP_UP_WATER); + } + } + + if (this->interactRangeActor != NULL) { + catchInfo = &D_80854A04[0]; + for (i = 0; i < 4; i++, catchInfo++) { + if (this->interactRangeActor->id == catchInfo->actorId) { + break; + } + } + + if (i < 4) { + this->unk_84F = i + 1; + this->unk_850 = 0; + this->stateFlags1 |= 0x30000000; + this->interactRangeActor->parent = &this->actor; + Player_UpdateBottleHeld(globalCtx, this, catchInfo->itemId, ABS(catchInfo->actionParam)); + func_808322D0(globalCtx, this, sp24->unk_04); + func_80835EA4(globalCtx, 4); + } + } + } + } + } + } + + if (this->skelAnime.animCurrentFrame <= 7.0f) { + this->stateFlags1 |= 2; + } +} + +Vec3f D_80854A1C = { 0.0f, 0.0f, 5.0f }; + +void func_8084EED8(Player* this, GlobalContext* globalCtx) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_8083C0E8(this, globalCtx); + func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); + return; + } + + if (func_800A4530(&this->skelAnime, 37.0f)) { + func_80839680(globalCtx, this, &this->leftHandPos, &D_80854A1C, 1); + 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); + } else if (func_800A4530(&this->skelAnime, 47.0f)) { + gSaveContext.healthAccumulator = 0x140; + } +} + +BottleDropInfo D_80854A28[] = { + { ACTOR_EN_FISH, 0 }, + { ACTOR_EN_ICE_HONO, 0 }, + { ACTOR_EN_INSECT, 2 }, +}; + +struct_80832924 D_80854A34[] = { + { NA_SE_VO_LI_AUTO_JUMP, 0x2026 }, + { NA_SE_EV_BOTTLE_CAP_OPEN, -0x828 }, +}; + +void func_8084EFC0(Player* this, GlobalContext* globalCtx) { + func_8083721C(this); + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_8083C0E8(this, globalCtx); + func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); + return; + } + + if (func_800A4530(&this->skelAnime, 76.0f)) { + BottleDropInfo* dropInfo = &D_80854A28[this->itemActionParam - PLAYER_AP_BOTTLE_FISH]; + + Actor_Spawn(&globalCtx->actorCtx, globalCtx, dropInfo->actorId, + (Math_Sins(this->actor.shape.rot.y) * 5.0f) + this->leftHandPos.x, this->leftHandPos.y, + (Math_Coss(this->actor.shape.rot.y) * 5.0f) + this->leftHandPos.z, 0x4000, this->actor.shape.rot.y, + 0, dropInfo->actorParams); + + Player_UpdateBottleHeld(globalCtx, this, ITEM_BOTTLE, PLAYER_AP_BOTTLE); + return; + } + + func_80832924(this, D_80854A34); +} + +struct_80832924 D_80854A3C[] = { + { NA_SE_PL_PUT_OUT_ITEM, -0x81E }, +}; + +void func_8084F104(Player* this, GlobalContext* globalCtx) { + this->stateFlags2 |= 0x20; + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + if (this->unk_850 < 0) { + func_8083C0E8(this, globalCtx); + } else if (this->exchangeItemId == EXCH_ITEM_NONE) { + Actor* targetActor = this->targetActor; + + this->unk_862 = 0; + if (targetActor->textId != 0xFFFF) { + this->actor.flags |= 0x100; + } + + func_80853148(globalCtx, targetActor); + } else { + GetItemEntry* giEntry = &sGetItemTable[D_80854528[this->exchangeItemId - 1] - 1]; + + if (this->itemActionParam >= PLAYER_AP_LETTER_ZELDA) { + if (giEntry->gi >= 0) { + this->unk_862 = giEntry->gi; + } else { + this->unk_862 = -giEntry->gi; + } + } + + if (this->unk_850 == 0) { + func_8010B680(globalCtx, this->actor.textId, &this->actor); + + if ((this->itemActionParam == PLAYER_AP_CHICKEN) || (this->itemActionParam == PLAYER_AP_POCKET_CUCCO)) { + func_8002F7DC(&this->actor, NA_SE_EV_CHICKEN_CRY_M); + } + + this->unk_850 = 1; + } else if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + this->actor.flags &= ~0x100; + this->unk_862 = 0; + + if (this->unk_84F == 1) { + func_80832264(globalCtx, this, &D_04002698); + this->unk_850 = -1; + } else { + func_8083C0E8(this, globalCtx); + } + + func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); + } + } + } else if (this->unk_850 >= 0) { + func_80832924(this, D_80854A3C); + } + + if ((this->unk_84F == 0) && (this->unk_664 != NULL)) { + this->currentYaw = this->actor.shape.rot.y = func_8083DB98(this, 0); + } +} + +void func_8084F308(Player* this, GlobalContext* globalCtx) { + this->stateFlags2 |= 0x60; + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80832284(globalCtx, this, &D_04003128); + } + + if (func_80832594(this, 0, 100)) { + func_80839F90(this, globalCtx); + this->stateFlags2 &= ~0x80; + } +} + +void func_8084F390(Player* this, GlobalContext* globalCtx) { + CollisionPoly* floorPoly; + f32 sp50; + f32 sp4C; + f32 sp48; + s16 sp46; + s16 sp44; + Vec3f sp38; + + this->stateFlags2 |= 0x60; + func_800A3BC0(globalCtx, &this->skelAnime); + func_8084269C(globalCtx, this); + func_800F4138(&this->actor.projectedPos, NA_SE_PL_SLIP_LEVEL - SFX_FLAG, this->actor.speedXZ); + + if (func_8083B040(this, globalCtx) == 0) { + floorPoly = this->actor.floorPoly; + + if (floorPoly == NULL) { + func_80837B9C(this, globalCtx); + return; + } + + func_8083E298(floorPoly, &sp38, &sp46); + + sp44 = sp46; + if (this->unk_84F != 0) { + sp44 = sp46 + 0x8000; + } + + if (this->linearVelocity < 0) { + sp46 += 0x8000; + } + + sp50 = (1.0f - sp38.y) * 40.0f; + sp50 = CLAMP(sp50, 0, 10.0f); + sp4C = (sp50 * sp50) * 0.015f; + sp48 = sp38.y * 0.01f; + + if (func_80041F7C(&globalCtx->colCtx, floorPoly, this->actor.floorPolySource) != 1) { + sp50 = 0; + sp48 = sp38.y * 10.0f; + } + + if (sp4C < 1.0f) { + sp4C = 1.0f; + } + + if (func_80077C6C(&this->linearVelocity, sp50, sp4C, sp48) && (sp50 == 0)) { + LinkAnimetionEntry* anim; + if (this->unk_84F == 0) { + anim = D_80853D04[this->modelAnimType]; + } else { + anim = D_80853D1C[this->modelAnimType]; + } + func_8083A098(this, anim, globalCtx); + } + + Math_SmoothScaleMaxMinS(&this->currentYaw, sp46, 10, 4000, 800); + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, sp44, 2000); + } +} + +void func_8084F608(Player* this, GlobalContext* globalCtx) { + if ((DECR(this->unk_850) == 0) && func_8083ADD4(globalCtx, this)) { + func_80852280(globalCtx, this, NULL); + func_80835C58(globalCtx, this, func_80852E14, 0); + func_80852E14(this, globalCtx); + } +} + +void func_8084F698(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_8084F608, 0); + this->unk_850 = 40; + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DEMO_KANKYO, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0x10); +} + +void func_8084F710(Player* this, GlobalContext* globalCtx) { + s32 pad; + + if ((this->unk_84F != 0) && (globalCtx->csCtx.frames < 0x131)) { + this->actor.gravity = 0.0f; + this->actor.velocity.y = 0.0f; + } else if (D_80853600 < 150.0f) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + if (this->unk_850 == 0) { + if (this->actor.bgCheckFlags & 1) { + this->skelAnime.animFrameCount = this->skelAnime.totalFrames - 1.0f; + func_808328A0(this); + this->unk_850 = 1; + } + } else { + if ((globalCtx->sceneNum == SCENE_SPOT04) && func_8083ADD4(globalCtx, this)) { + return; + } + func_80853080(this, globalCtx); + } + } + Math_SmoothScaleMaxMinF(&this->actor.velocity.y, 2.0f, 0.3f, 8.0f, 0.5f); + } + + if ((globalCtx->sceneNum == SCENE_KENJYANOMA) && func_8083ADD4(globalCtx, this)) { + return; + } + + if ((globalCtx->csCtx.state != 0) && (globalCtx->csCtx.linkAction != NULL)) { + f32 sp28 = this->actor.posRot.pos.y; + func_808529D0(globalCtx, this, globalCtx->csCtx.linkAction); + this->actor.posRot.pos.y = sp28; + } +} + +void func_8084F88C(Player* this, GlobalContext* globalCtx) { + func_800A3BC0(globalCtx, &this->skelAnime); + + if ((this->unk_850++ > 8) && (globalCtx->sceneLoadFlag == 0)) { + + if (this->unk_84F != 0) { + if (globalCtx->sceneNum == 9) { + Gameplay_TriggerRespawn(globalCtx); + globalCtx->nextEntranceIndex = 0x0088; + } else if (this->unk_84F < 0) { + Gameplay_TriggerRespawn(globalCtx); + } else { + Gameplay_TriggerVoidOut(globalCtx); + } + + globalCtx->fadeTransition = 4; + func_80078884(NA_SE_OC_ABYSS); + } else { + globalCtx->fadeTransition = 2; + gSaveContext.nextTransition = 2; + gSaveContext.seqIndex = 0xFF; + gSaveContext.nightSeqIndex = 0xFF; + } + + globalCtx->sceneLoadFlag = 0x14; + } +} + +void func_8084F9A0(Player* this, GlobalContext* globalCtx) { + func_80839800(this, globalCtx); +} + +void func_8084F9C0(Player* this, GlobalContext* globalCtx) { + this->actor.gravity = -1.0f; + + func_800A3BC0(globalCtx, &this->skelAnime); + + if (this->actor.velocity.y < 0.0f) { + func_80837B9C(this, globalCtx); + } else if (this->actor.velocity.y < 6.0f) { + Math_ApproxF(&this->linearVelocity, 3.0f, 0.5f); + } +} + +void func_8084FA54(Player* this, GlobalContext* globalCtx) { + this->unk_6AD = 2; + + func_8083AD4C(globalCtx, this); + func_800A3BC0(globalCtx, &this->skelAnime); + func_80836670(this, globalCtx); + + this->unk_6BE = func_8084ABD8(globalCtx, this, 1, 0) - this->actor.shape.rot.y; + this->unk_6AE |= 0x80; + + if (globalCtx->unk_11E5C < 0) { + globalCtx->unk_11E5C++; + if (globalCtx->unk_11E5C == 0) { + func_8083C148(this, globalCtx); + } + } +} + +void func_8084FB10(Player* this, GlobalContext* globalCtx) { + if (this->unk_84F >= 0) { + if (this->unk_84F < 6) { + this->unk_84F++; + } + + if (func_80832594(this, 1, 100)) { + this->unk_84F = -1; + func_80029FAC(globalCtx, &this->actor.posRot.pos, this->actor.scale.x); + func_8002F7DC(&this->actor, NA_SE_PL_ICE_BROKEN); + } else { + this->stateFlags2 |= 0x4000; + } + + if ((globalCtx->gameplayFrames % 4) == 0) { + Player_InflictDamage(globalCtx, -1); + } + } else { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80839F90(this, globalCtx); + func_80837AFC(this, -20); + } + } +} + +void func_8084FBF4(Player* this, GlobalContext* globalCtx) { + func_800A3BC0(globalCtx, &this->skelAnime); + func_808382BC(this); + + if (((this->unk_850 % 25) != 0) || func_80837B18(globalCtx, this, -1)) { + if (DECR(this->unk_850) == 0) { + func_80839F90(this, globalCtx); + } + } + + this->shockTimer = 40; + func_8002F8F0(&this->actor, NA_SE_VO_LI_TAKEN_AWAY - SFX_FLAG + this->ageProperties->unk_92); +} + +s32 func_8084FCAC(Player* this, GlobalContext* globalCtx) { + sControlInput = &globalCtx->state.input[0]; + + if ((CHECK_PAD(sControlInput->cur, A_BUTTON | L_TRIG | R_TRIG) && CHECK_PAD(sControlInput->press, B_BUTTON)) || + (CHECK_PAD(sControlInput->cur, L_TRIG) && CHECK_PAD(sControlInput->press, R_JPAD))) { + + D_808535D0 ^= 1; + + if (D_808535D0) { + func_8005A444(Gameplay_GetCamera(globalCtx, 0), 8); + } + } + + if (D_808535D0) { + f32 speed; + + if (CHECK_PAD(sControlInput->cur, R_TRIG)) { + speed = 100.0f; + } else { + speed = 20.0f; + } + + func_8006375C(3, 2, "DEBUG MODE"); + + if (!CHECK_PAD(sControlInput->cur, L_TRIG)) { + if (CHECK_PAD(sControlInput->cur, B_BUTTON)) { + this->actor.posRot.pos.y += speed; + } else if (CHECK_PAD(sControlInput->cur, A_BUTTON)) { + this->actor.posRot.pos.y -= speed; + } + + if (sControlInput->cur.in.button & (U_JPAD | L_JPAD | D_JPAD | R_JPAD)) { + s16 angle; + s16 temp; + + angle = temp = func_8005A948(ACTIVE_CAM); + + if (CHECK_PAD(sControlInput->cur, D_JPAD)) { + angle = temp + 0x8000; + } else if (CHECK_PAD(sControlInput->cur, L_JPAD)) { + angle = temp + 0x4000; + } else if (CHECK_PAD(sControlInput->cur, R_JPAD)) { + angle = temp - 0x4000; + } + + this->actor.posRot.pos.x += speed * Math_Sins(angle); + this->actor.posRot.pos.z += speed * Math_Coss(angle); + } + } + + func_80832210(this); + + this->actor.gravity = 0.0f; + this->actor.velocity.z = 0.0f; + this->actor.velocity.y = 0.0f; + this->actor.velocity.x = 0.0f; + + if (CHECK_PAD(sControlInput->cur, L_TRIG) && CHECK_PAD(sControlInput->press, L_JPAD)) { + Flags_SetTempClear(globalCtx, globalCtx->roomCtx.curRoom.num); + } + + Math_Vec3f_Copy(&this->actor.initPosRot.pos, &this->actor.posRot.pos); + + return 0; + } + + return 1; +} + +void func_8084FF7C(Player* this) { + this->unk_858 += this->unk_85C; + this->unk_85C -= this->unk_858 * 5.0f; + this->unk_85C *= 0.3f; + + if (ABS(this->unk_85C) < 0.00001f) { + this->unk_85C = 0.0f; + if (ABS(this->unk_858) < 0.00001f) { + this->unk_858 = 0.0f; + } + } +} + +#ifdef NON_MATCHING +// minor ordering and regalloc differences +void func_8085002C(Player* this) { + s32 pad; + s16 sp2A; + s16 sp28; + s16 sp26; + + D_80858AC8[3] -= D_80858AC8[3] >> 3; + D_80858AC8[4] -= D_80858AC8[4] >> 3; + D_80858AC8[3] += -D_80858AC8[0] >> 2; + D_80858AC8[4] += -D_80858AC8[1] >> 2; + + sp26 = this->actor.posRot.rot.y - this->actor.shape.rot.y; + + sp28 = this->actor.speedXZ * -200.0f * Math_Coss(sp26) * (Math_Rand_CenteredFloat(2.0f) + 10.0f); + sp2A = this->actor.speedXZ * 100.0f * Math_Sins(sp26) * (Math_Rand_CenteredFloat(2.0f) + 10.0f); + + D_80858AC8[3] += sp28 >> 2; + D_80858AC8[4] += sp2A >> 2; + + if (D_80858AC8[3] > 6000) { + D_80858AC8[3] = 6000; + } else if (D_80858AC8[3] < -6000) { + D_80858AC8[3] = -6000; + } + + if (D_80858AC8[4] > 6000) { + D_80858AC8[4] = 6000; + } else if (D_80858AC8[4] < -6000) { + D_80858AC8[4] = -6000; + } + + D_80858AC8[0] += D_80858AC8[3]; + D_80858AC8[1] += D_80858AC8[4]; + + if (D_80858AC8[0] < 0) { + D_80858AC8[2] = D_80858AC8[0] >> 1; + } else { + D_80858AC8[2] = 0; + } +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8085002C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80850224.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808502D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808505DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8085063C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8085076C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80850AEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80850C68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80850E84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80850ED8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851008.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851030.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851050.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851094.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808510B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808510D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808510F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851114.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851134.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851154.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851174.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851194.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808511B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808511D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808511FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851248.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851294.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808512E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851314.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851368.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808513BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808514C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8085157C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851688.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851750.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851788.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851828.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808518DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8085190C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851998.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808519C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808519EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851A50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851CA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851D80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851DEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851E90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851ECC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851F84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80851FB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852048.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852080.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808520BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852174.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808521B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808521F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852234.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8085225C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852280.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852298.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852328.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852358.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852388.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852414.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852450.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852480.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808524B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808524D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852514.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852544.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852554.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852564.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808525C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852608.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852648.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808526EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_8085283C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808528C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852944.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808529D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852A54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852B4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852C50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852E14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852EFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852F38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80852FFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80853080.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808530E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80853148.s") +#endif + +s32 func_80850224(Player* this, GlobalContext* globalCtx) { + if (func_8083C6B8(globalCtx, this) == 0) { + if (func_8083BB20(this) != 0) { + s32 sp24 = func_80837818(this); + + func_80837948(globalCtx, this, sp24); + + if (sp24 >= 0x18) { + this->stateFlags2 |= 0x20000; + func_80837530(globalCtx, this, 0); + return 1; + } + } else { + return 0; + } + } + + return 1; +} + +Vec3f D_80854A40 = { 0.0f, 40.0f, 45.0f }; +Vec3f D_80854A4C = { 0.0f, 0.0f, 0.0f }; + +void func_808502D0(Player* this, GlobalContext* globalCtx) { + struct_80854190* sp44 = &D_80854190[this->swordAnimation]; + + this->stateFlags2 |= 0x20; + + if (!func_80842DF4(globalCtx, this)) { + func_8084285C(this, 0.0f, sp44->unk_0C, sp44->unk_0D); + + if ((this->stateFlags2 & 0x40000000) && (this->heldItemActionParam != PLAYER_AP_HAMMER) && + func_800A4530(&this->skelAnime, 0.0f)) { + this->linearVelocity = 15.0f; + this->stateFlags2 &= ~0x40000000; + } + + if (this->linearVelocity > 12.0f) { + func_8084269C(globalCtx, this); + } + + Math_ApproxF(&this->linearVelocity, 0.0f, 5.0f); + func_8083C50C(this); + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + if (!func_80850224(this, globalCtx)) { + u8 sp43 = this->skelAnime.flags; + LinkAnimetionEntry* sp3C; + + if (func_8008E9C4(this)) { + sp3C = sp44->unk_08; + } else { + sp3C = sp44->unk_04; + } + + func_80832318(this); + this->skelAnime.flags = 0; + + if ((sp3C == &D_04002908) && (this->modelAnimType != 3)) { + sp3C = &D_04002AC8; + } + + func_8083A098(this, sp3C, globalCtx); + + this->skelAnime.flags = sp43; + this->stateFlags3 |= 8; + } + } else if (this->heldItemActionParam == PLAYER_AP_HAMMER) { + if ((this->swordAnimation == 0x16) || (this->swordAnimation == 0x13)) { + Vec3f sp30; + f32 sp2C; + + sp30.y = func_8083973C(globalCtx, this, &D_80854A40, &sp30); + sp2C = this->actor.posRot.pos.y - sp30.y; + + Math_ApproxUpdateScaledS(&this->actor.posRot2.rot.x, atan2s(45.0f, sp2C), 800); + func_80836AB8(this, 1); + + if ((((this->swordAnimation == 0x16) && func_800A4530(&this->skelAnime, 7.0f)) || + ((this->swordAnimation == 0x13) && func_800A4530(&this->skelAnime, 2.0f))) && + (sp2C > -40.0f) && (sp2C < 40.0f)) { + func_80842A28(globalCtx, this); + func_80029024(globalCtx, &sp30, &D_80854A4C, &D_80854A4C); + } + } + } + } +} + +void func_808505DC(Player* this, GlobalContext* globalCtx) { + func_800A3BC0(globalCtx, &this->skelAnime); + func_8083721C(this); + + if (this->skelAnime.animCurrentFrame >= 6.0f) { + func_80839FFC(this, globalCtx); + } +} + +void func_8085063C(Player* this, GlobalContext* globalCtx) { + this->stateFlags2 |= 0x20; + + func_800A3BC0(globalCtx, &this->skelAnime); + func_80836670(this, globalCtx); + + if (this->unk_850 == 0) { + func_8010B680(globalCtx, 0x3B, &this->actor); + this->unk_850 = 1; + return; + } + + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + s32 respawnData = gSaveContext.respawn[RESPAWN_MODE_TOP].data; + + if (globalCtx->msgCtx.choiceIndex == 0) { + gSaveContext.respawnFlag = 3; + globalCtx->sceneLoadFlag = 0x14; + globalCtx->nextEntranceIndex = gSaveContext.respawn[RESPAWN_MODE_TOP].entranceIndex; + globalCtx->fadeTransition = 5; + func_80088AF0(globalCtx); + return; + } + + if (globalCtx->msgCtx.choiceIndex == 1) { + gSaveContext.respawn[RESPAWN_MODE_TOP].data = -respawnData; + gSaveContext.fw.set = 0; + func_80078914(&gSaveContext.respawn[RESPAWN_MODE_TOP].pos, NA_SE_PL_MAGIC_WIND_VANISH); + } + + func_80853080(this, globalCtx); + func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); + } +} + +void func_8085076C(Player* this, GlobalContext* globalCtx) { + s32 respawnData = gSaveContext.respawn[RESPAWN_MODE_TOP].data; + + if (this->unk_850 > 20) { + this->actor.draw = Player_Draw; + this->actor.posRot.pos.y += 60.0f; + func_80837B9C(this, globalCtx); + return; + } + + if (this->unk_850++ == 20) { + gSaveContext.respawn[RESPAWN_MODE_TOP].data = respawnData + 1; + func_80078914(&gSaveContext.respawn[RESPAWN_MODE_TOP].pos, NA_SE_PL_MAGIC_WIND_WARP); + } +} + +LinkAnimetionEntry* D_80854A58[] = { + 0x04002CF8, + 0x04002CE0, + 0x04002D10, +}; + +LinkAnimetionEntry* D_80854A64[] = { + 0x04002D00, + 0x04002CE8, + 0x04002D18, +}; + +LinkAnimetionEntry* D_80854A70[] = { + 0x04002D08, + 0x04002CF0, + 0x04002D20, +}; + +u8 D_80854A7C[] = { 70, 10, 10 }; + +struct_80832924 D_80854A80[] = { + { NA_SE_PL_SKIP, 0x814 }, + { NA_SE_VO_LI_SWORD_N, 0x2014 }, + { 0, -0x301A }, +}; + +struct_80832924 D_80854A8C[][2] = { + { + { 0, 0x4014 }, + { NA_SE_VO_LI_MAGIC_FROL, -0x201E }, + }, + { + { 0, 0x4014 }, + { NA_SE_VO_LI_MAGIC_NALE, -0x202C }, + }, + { + { NA_SE_VO_LI_MAGIC_ATTACK, 0x2014 }, + { NA_SE_IT_SWORD_SWING_HARD, -0x814 }, + }, +}; + +void func_808507F4(Player* this, GlobalContext* globalCtx) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + if (this->unk_84F < 0) { + if ((this->itemActionParam == PLAYER_AP_NAYRUS_LOVE) || (gSaveContext.unk_13F0 == 0)) { + func_80839FFC(this, globalCtx); + func_8005B1A4(Gameplay_GetCamera(globalCtx, 0)); + } + } else { + if (this->unk_850 == 0) { + SkelAnime_ChangeLinkAnimPlaybackStop(globalCtx, &this->skelAnime, D_80854A58[this->unk_84F], 0.83f); + + if (func_80846A00(globalCtx, this, this->unk_84F) != NULL) { + this->stateFlags1 |= 0x30000000; + if ((this->unk_84F != 0) || (gSaveContext.respawn[RESPAWN_MODE_TOP].data <= 0)) { + gSaveContext.unk_13F0 = 1; + } + } else { + func_800876C8(globalCtx); + } + } else { + SkelAnime_ChangeLinkAnimPlaybackRepeat(globalCtx, &this->skelAnime, D_80854A64[this->unk_84F], 0.83f); + + if (this->unk_84F == 0) { + this->unk_850 = -10; + } + } + + this->unk_850++; + } + } else { + if (this->unk_850 < 0) { + this->unk_850++; + + if (this->unk_850 == 0) { + gSaveContext.respawn[RESPAWN_MODE_TOP].data = 1; + Gameplay_SetupRespawnPoint(globalCtx, RESPAWN_MODE_TOP, 0x6FF); + gSaveContext.fw.set = 1; + gSaveContext.fw.pos.x = gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.x; + gSaveContext.fw.pos.y = gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.y; + gSaveContext.fw.pos.z = gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.z; + gSaveContext.fw.yaw = gSaveContext.respawn[RESPAWN_MODE_DOWN].yaw; + gSaveContext.fw.playerParams = 0x6FF; + gSaveContext.fw.entranceIndex = gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex; + gSaveContext.fw.roomIndex = gSaveContext.respawn[RESPAWN_MODE_DOWN].roomIndex; + gSaveContext.fw.tempSwchFlags = gSaveContext.respawn[RESPAWN_MODE_DOWN].tempSwchFlags; + gSaveContext.fw.tempCollectFlags = gSaveContext.respawn[RESPAWN_MODE_DOWN].tempCollectFlags; + this->unk_850 = 2; + } + } else if (this->unk_84F >= 0) { + if (this->unk_850 == 0) { + func_80832924(this, D_80854A80); + } else if (this->unk_850 == 1) { + func_80832924(this, D_80854A8C[this->unk_84F]); + if ((this->unk_84F == 2) && func_800A4530(&this->skelAnime, 30.0f)) { + this->stateFlags1 &= ~0x30000000; + } + } else if (D_80854A7C[this->unk_84F] < this->unk_850++) { + SkelAnime_ChangeLinkAnimPlaybackStop(globalCtx, &this->skelAnime, D_80854A70[this->unk_84F], 0.83f); + this->currentYaw = this->actor.shape.rot.y; + this->unk_84F = -1; + } + } + } + + func_8083721C(this); +} + +void func_80850AEC(Player* this, GlobalContext* globalCtx) { + f32 temp; + + this->stateFlags2 |= 0x20; + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80832284(globalCtx, this, &D_04002C98); + } + + Math_Vec3f_Sum(&this->actor.posRot.pos, &this->actor.velocity, &this->actor.posRot.pos); + + if (func_80834FBC(this)) { + Math_Vec3f_Copy(&this->actor.pos4, &this->actor.posRot.pos); + func_80847BA0(globalCtx, this); + + temp = this->actor.posRot.pos.y - this->actor.groundY; + if (temp > 20.0f) { + temp = 20.0f; + } + + this->actor.posRot.rot.x = this->actor.shape.rot.x = 0; + this->actor.posRot.pos.y -= temp; + this->linearVelocity = 1.0f; + this->actor.velocity.y = 0.0f; + func_80837B9C(this, globalCtx); + this->stateFlags2 &= ~0x400; + this->actor.bgCheckFlags |= 1; + this->stateFlags1 |= 4; + return; + } + + if ((this->skelAnime.linkAnimetionSeg != &D_04002C90) || (4.0f <= this->skelAnime.animCurrentFrame)) { + this->actor.gravity = 0.0f; + Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, this->actor.posRot.rot.x, 0x800); + func_8083264C(this, 100, 2, 100, 0); + } +} + +void func_80850C68(Player* this, GlobalContext* globalCtx) { + if ((this->unk_850 != 0) && ((this->unk_858 != 0.0f) || (this->unk_85C != 0.0f))) { + f32 updateScale = R_UPDATE_RATE * 0.5f; + + this->skelAnime.animCurrentFrame += this->skelAnime.animPlaybackSpeed * updateScale; + if (this->skelAnime.animCurrentFrame >= this->skelAnime.totalFrames) { + this->skelAnime.animCurrentFrame -= this->skelAnime.totalFrames; + } + + func_800A431C(globalCtx, &this->skelAnime, &D_04002C38, this->skelAnime.animCurrentFrame, + (this->unk_858 < 0.0f) ? &D_04002C18 : &D_04002C20, 5.0f, fabsf(this->unk_858), this->unk_318); + func_800A43B8(globalCtx, &this->skelAnime, &D_04002C38, this->skelAnime.animCurrentFrame, + (this->unk_85C < 0.0f) ? &D_04002C28 : &D_04002C10, 5.0f, fabsf(this->unk_85C), D_80858AD8); + func_800A42E4(globalCtx, &this->skelAnime, 0.5f); + } else if (func_800A3BC0(globalCtx, &this->skelAnime)) { + this->unk_860 = 2; + func_80832284(globalCtx, this, &D_04002C38); + this->unk_850 = 1; + } + + func_8083721C(this); + + if (this->unk_860 == 0) { + func_80853080(this, globalCtx); + } else if (this->unk_860 == 3) { + func_80835C58(globalCtx, this, func_80850E84, 0); + func_80832B0C(globalCtx, this, &D_04002C00); + } +} + +void func_80850E84(Player* this, GlobalContext* globalCtx) { + if (func_800A3BC0(globalCtx, &this->skelAnime) && (this->unk_860 == 0)) { + func_8083A098(this, &D_04002C08, globalCtx); + } +} + +void (*D_80854AA4[])(GlobalContext*, Player*, void*) = { + NULL, func_80851008, func_80851030, func_80851094, func_808510B4, func_808510D4, func_808510F4, + func_80851114, func_80851134, func_80851154, func_80851174, func_808511D4, func_808511FC, func_80851294, + func_80851050, func_80851194, func_808511B4, func_80851248, func_808512E0, +}; + +struct_80832924 D_80854AF0[] = { + { 0, 0x2822 }, + { NA_SE_PL_CALM_HIT, 0x82D }, + { NA_SE_PL_CALM_HIT, 0x833 }, + { NA_SE_PL_CALM_HIT, -0x840 }, +}; + +struct_80832924 D_80854B00[] = { + { NA_SE_VO_LI_SURPRISE, 0x2003 }, { 0, 0x300F }, { 0, 0x3018 }, { 0, 0x301E }, { NA_SE_VO_LI_FALL_L, -0x201F }, +}; + +struct_80832924 D_80854B14[] = { + { 0, -0x300A }, +}; + +struct_80854B18 D_80854B18[] = { + { 0, NULL }, { -1, func_808515A4 }, { 2, 0x04002790 }, { 0, NULL }, { 0, NULL }, + { 3, 0x04002740 }, { 0, NULL }, { 0, NULL }, { -1, func_808515A4 }, { 2, 0x04002778 }, + { -1, func_80851788 }, { 3, 0x04002860 }, { -1, func_808518DC }, { 7, 0x04002348 }, { 5, 0x04002350 }, + { 5, 0x04002358 }, { 5, 0x040023B0 }, { 7, 0x040023B8 }, { -1, func_808519EC }, { 2, 0x04002728 }, + { 2, 0x04002738 }, { 0, NULL }, { -1, func_80851B90 }, { 3, 0x040027A8 }, { 9, 0x04002DB0 }, + { 2, 0x04002DC0 }, { -1, func_80851D2C }, { 2, 0x04003098 }, { 3, 0x04002780 }, { -1, func_808515A4 }, + { 2, 0x04003088 }, { 0, NULL }, { 0, NULL }, { 5, 0x04002320 }, { -1, func_80851368 }, + { -1, func_80851E64 }, { 5, 0x04002328 }, { 16, 0x04002F90 }, { -1, func_80851F84 }, { -1, func_80851E90 }, + { 6, 0x04002410 }, { 6, 0x04002418 }, { -1, func_80852080 }, { 5, 0x04002390 }, { -1, func_808521F4 }, + { -1, func_8085225C }, { -1, func_80852280 }, { 5, 0x040023A0 }, { 5, 0x04002368 }, { -1, func_808515A4 }, + { 5, 0x04002370 }, { 5, 0x040027B0 }, { 5, 0x040027B8 }, { 5, 0x040027C0 }, { 3, 0x04002768 }, + { 3, 0x040027D8 }, { 4, 0x040027E0 }, { 3, 0x04002380 }, { 3, 0x04002828 }, { 6, 0x04002470 }, + { 6, 0x040032A8 }, { 14, 0x040032A0 }, { 3, 0x040032A0 }, { 5, 0x04002AE8 }, { 16, 0x04002450 }, + { 15, 0x04002460 }, { 15, 0x04002458 }, { 3, 0x04002440 }, { 3, 0x04002438 }, { 3, 0x04002C88 }, + { 6, 0x04003450 }, { 6, 0x04003448 }, { 6, 0x04003460 }, { 6, 0x04003440 }, { 3, 0x04002798 }, + { 3, 0x04002818 }, { 4, 0x04002848 }, { 3, 0x04002850 }, { 3, 0x040034E0 }, { 3, 0x040034D8 }, + { 6, 0x040034C8 }, { 3, 0x04003470 }, { 3, 0x04003478 }, { 3, 0x040034C0 }, { 3, 0x04003480 }, + { 3, 0x04003490 }, { 3, 0x04003488 }, { 3, 0x04003498 }, { 3, 0x040034B0 }, { -1, func_808524B0 }, + { 3, 0x04003420 }, { -1, func_80852544 }, { -1, func_80852564 }, { 3, 0x04003250 }, { -1, func_80852608 }, + { 3, 0x04002810 }, { 3, 0x04002838 }, { 3, 0x04002CD0 }, { 3, 0x04002CD8 }, { 3, 0x04002868 }, + { 3, 0x040027E8 }, { 3, 0x040027F8 }, { 3, 0x04002800 }, +}; + +struct_80854B18 D_80854E50[] = { + { 0, NULL }, { -1, func_808514C0 }, { -1, func_8085157C }, { -1, func_80851998 }, { -1, func_808519C0 }, + { 11, NULL }, { -1, func_80852C50 }, { -1, func_80852944 }, { -1, func_80851688 }, { -1, func_80851750 }, + { -1, func_80851828 }, { -1, func_808521B8 }, { -1, func_8085190C }, { 11, NULL }, { 11, NULL }, + { 11, NULL }, { 18, D_80854AF0 }, { 11, NULL }, { -1, func_80851A50 }, { 12, 0x04002730 }, + { 11, NULL }, { 0, NULL }, { -1, func_80851BE8 }, { 11, NULL }, { -1, func_80851CA4 }, + { 11, NULL }, { 17, 0x040030A8 }, { 11, NULL }, { 11, NULL }, { 11, NULL }, + { -1, func_80851D80 }, { -1, func_80851DEC }, { -1, func_80851E28 }, { 18, D_80854B00 }, { -1, func_808513BC }, + { 11, NULL }, { 11, NULL }, { 11, NULL }, { 11, NULL }, { -1, func_80851ECC }, + { -1, func_80851FB0 }, { -1, func_80852048 }, { -1, func_80852174 }, { 13, 0x04002398 }, { -1, func_80852234 }, + { 0, NULL }, { 0, NULL }, { 11, NULL }, { -1, func_80852450 }, { -1, func_80851688 }, + { -1, func_80852298 }, { 13, 0x040027D0 }, { -1, func_80852480 }, { 13, 0x040027C8 }, { -1, func_80852328 }, + { 11, NULL }, { 11, NULL }, { 12, 0x04002388 }, { -1, func_80852358 }, { 11, NULL }, + { 18, D_80854B14 }, { 11, NULL }, { 11, NULL }, { 11, NULL }, { 11, NULL }, + { -1, func_80852388 }, { 17, 0x04002450 }, { 12, 0x04002448 }, { 12, 0x04002450 }, { 11, NULL }, + { -1, func_808526EC }, { 17, 0x04003468 }, { -1, func_808526EC }, { 17, 0x04003468 }, { 12, 0x040027A0 }, + { 12, 0x04002820 }, { 11, NULL }, { 12, 0x04002858 }, { 12, 0x040034D0 }, { 13, 0x040034F0 }, + { 12, 0x040034E8 }, { 12, 0x040034A8 }, { 11, NULL }, { 11, NULL }, { 11, NULL }, + { 11, NULL }, { -1, func_80852648 }, { 11, NULL }, { 12, 0x040034A0 }, { -1, func_808524D0 }, + { -1, func_80852514 }, { -1, func_80852554 }, { -1, func_808525C0 }, { 11, NULL }, { 11, NULL }, + { 11, NULL }, { -1, func_8085283C }, { -1, func_808528C8 }, { -1, func_808528C8 }, { 12, 0x04002870 }, + { 12, 0x040027F0 }, { 12, 0x04002808 }, { 12, 0x04002450 }, +}; + +void func_80850ED8(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + func_80832DB0(this); + func_80832B0C(globalCtx, this, anim); + func_80832210(this); +} + +void func_80850F1C(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + func_80832DB0(this); + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, anim, (2.0f / 3.0f), 0.0f, + SkelAnime_GetFrameCount(&anim->genericHeader), 2, -8.0f); + func_80832210(this); +} + +void func_80850F9C(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim) { + func_80832DB0(this); + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, anim, (2.0f / 3.0f), 0.0f, 0.0f, 0, -8.0f); + func_80832210(this); +} + +void func_80851008(GlobalContext* globalCtx, Player* this, void* anim) { + func_80832210(this); +} + +void func_80851030(GlobalContext* globalCtx, Player* this, void* anim) { + func_80850ED8(globalCtx, this, anim); +} + +void func_80851050(GlobalContext* globalCtx, Player* this, void* anim) { + func_80832DB0(this); + func_80832C2C(globalCtx, this, anim); + func_80832210(this); +} + +void func_80851094(GlobalContext* globalCtx, Player* this, void* anim) { + func_80850F1C(globalCtx, this, anim); +} + +void func_808510B4(GlobalContext* globalCtx, Player* this, void* anim) { + func_80850F9C(globalCtx, this, anim); +} + +void func_808510D4(GlobalContext* globalCtx, Player* this, void* anim) { + func_8083308C(globalCtx, this, anim); +} + +void func_808510F4(GlobalContext* globalCtx, Player* this, void* anim) { + func_8083303C(globalCtx, this, anim, 0x9C); +} + +void func_80851114(GlobalContext* globalCtx, Player* this, void* anim) { + func_8083313C(globalCtx, this, anim); +} + +void func_80851134(GlobalContext* globalCtx, Player* this, void* anim) { + func_808330EC(globalCtx, this, anim, 0x9C); +} + +void func_80851154(GlobalContext* globalCtx, Player* this, void* anim) { + func_80832264(globalCtx, this, anim); +} + +void func_80851174(GlobalContext* globalCtx, Player* this, void* anim) { + func_80832284(globalCtx, this, anim); +} + +void func_80851194(GlobalContext* globalCtx, Player* this, void* anim) { + func_808322D0(globalCtx, this, anim); +} + +void func_808511B4(GlobalContext* globalCtx, Player* this, void* anim) { + func_808322A4(globalCtx, this, anim); +} + +void func_808511D4(GlobalContext* globalCtx, Player* this, void* anim) { + func_800A3BC0(globalCtx, &this->skelAnime); +} + +void func_808511FC(GlobalContext* globalCtx, Player* this, void* anim) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80850F9C(globalCtx, this, anim); + this->unk_850 = 1; + } +} + +void func_80851248(GlobalContext* globalCtx, Player* this, void* anim) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80832DBC(this); + func_808322A4(globalCtx, this, anim); + } +} + +void func_80851294(GlobalContext* globalCtx, Player* this, void* anim) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_8083313C(globalCtx, this, anim); + this->unk_850 = 1; + } +} + +void func_808512E0(GlobalContext* globalCtx, Player* this, void* arg2) { + func_800A3BC0(globalCtx, &this->skelAnime); + func_80832924(this, arg2); +} + +void func_80851314(Player* this) { + if ((this->unk_448 == NULL) || (this->unk_448->update == NULL)) { + this->unk_448 = NULL; + } + + this->unk_664 = this->unk_448; + + if (this->unk_664 != NULL) { + this->actor.shape.rot.y = func_8083DB98(this, 0); + } +} + +void func_80851368(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + this->stateFlags1 |= 0x8000000; + this->stateFlags2 |= 0x400; + this->stateFlags1 &= ~0xC0000; + + func_80832284(globalCtx, this, &D_040032F0); +} + +void func_808513BC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + this->actor.gravity = 0.0f; + + if (this->unk_84F == 0) { + if (func_8083D12C(globalCtx, this, NULL)) { + this->unk_84F = 1; + } else { + func_8084B158(globalCtx, this, NULL, fabsf(this->actor.velocity.y)); + Math_ApproxUpdateScaledS(&this->unk_6C2, -10000, 800); + func_8084AEEC(this, &this->actor.velocity.y, 4.0f, this->currentYaw); + } + return; + } + + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + if (this->unk_84F == 1) { + func_80832C6C(globalCtx, this, &D_04003328); + } else { + func_80832284(globalCtx, this, &D_04003328); + } + } + + func_8084B000(this); + func_8084AEEC(this, &this->linearVelocity, 0.0f, this->actor.shape.rot.y); +} + +void func_808514C0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80851314(this); + + if (func_808332B8(this)) { + func_808513BC(globalCtx, this, 0); + return; + } + + func_800A3BC0(globalCtx, &this->skelAnime); + + if (func_8008F128(this) || (this->stateFlags1 & 0x800)) { + func_80836670(this, globalCtx); + return; + } + + if ((this->interactRangeActor != NULL) && (this->interactRangeActor->textId == 0xFFFF)) { + func_8083E5A8(this, globalCtx); + } +} + +void func_8085157C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_800A3BC0(globalCtx, &this->skelAnime); +} + +void func_808515A4(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + LinkAnimetionEntry* sp34; + + if (func_808332B8(this)) { + func_80851368(globalCtx, this, 0); + return; + } + + sp34 = D_80853D34[this->modelAnimType]; + + if ((this->unk_446 == 6) || (this->unk_446 == 0x2E)) { + func_80832264(globalCtx, this, sp34); + } else { + func_80832DB0(this); + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, sp34, (2.0f / 3.0f), 0.0f, + SkelAnime_GetFrameCount(&sp34->genericHeader), 0, -4.0f); + } + + func_80832210(this); +} + +void func_80851688(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + if (func_8084B3CC(globalCtx, this) == 0) { + if ((this->csMode == 0x31) && (globalCtx->csCtx.state == 0)) { + func_8002DF54(globalCtx, NULL, 7); + return; + } + + if (func_808332B8(this) != 0) { + func_808513BC(globalCtx, this, 0); + return; + } + + func_800A3BC0(globalCtx, &this->skelAnime); + + if (func_8008F128(this) || (this->stateFlags1 & 0x800)) { + func_80836670(this, globalCtx); + } + } +} + +struct_80832924 D_80855188[] = { + { 0, 0x302A }, + { 0, -0x3030 }, +}; + +void func_80851750(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_800A3BC0(globalCtx, &this->skelAnime); + func_80832924(this, D_80855188); +} + +void func_80851788(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + this->stateFlags1 &= ~0x2000000; + + this->currentYaw = this->actor.shape.rot.y = this->actor.posRot.rot.y = + Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->unk_450); + + if (this->linearVelocity <= 0.0f) { + this->linearVelocity = 0.1f; + } else if (this->linearVelocity > 2.5f) { + this->linearVelocity = 2.5f; + } +} + +void func_80851828(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + f32 sp1C = 2.5f; + + func_80845BA0(globalCtx, this, &sp1C, 10); + + if (globalCtx->sceneNum == SCENE_BDAN_BOSS) { + if (this->unk_850 == 0) { + if (func_8010BDBC(&globalCtx->msgCtx) == 0) { + return; + } + } else { + if (func_8010BDBC(&globalCtx->msgCtx) != 0) { + return; + } + } + } + + this->unk_850++; + if (this->unk_850 > 20) { + this->csMode = 0xB; + } +} + +void func_808518DC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_8083CEAC(this, globalCtx); +} + +void func_8085190C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80851314(this); + + if (this->unk_850 != 0) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80832284(globalCtx, this, func_808334E4(this)); + this->unk_850 = 0; + } + + func_80833C3C(this); + } else { + func_808401B0(globalCtx, this); + } +} + +void func_80851998(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80845964(globalCtx, this, arg2, 0.0f, 0, 0); +} + +void func_808519C0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80845964(globalCtx, this, arg2, 0.0f, 0, 1); +} + +// unused +LinkAnimetionEntry* D_80855190[] = { + 0x04002720, + 0x04002360, +}; + +Vec3f D_80855198 = { -1.0f, 70.0f, 20.0f }; + +void func_808519EC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + Math_Vec3f_Copy(&this->actor.posRot.pos, &D_80855198); + this->actor.shape.rot.y = -0x8000; + func_808322D0(globalCtx, this, this->ageProperties->unk_9C); + func_80832F54(globalCtx, this, 0x28F); +} + +struct_808551A4 D_808551A4[] = { + { NA_SE_IT_SWORD_PUTAWAY_STN, 0 }, + { NA_SE_IT_SWORD_STICK_STN, NA_SE_VO_LI_SWORD_N }, +}; + +struct_80832924 D_808551AC[] = { + { 0, 0x401D }, + { 0, -0x4027 }, +}; + +void func_80851A50(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + struct_808551A4* sp2C; + Gfx** dLists; + + func_800A3BC0(globalCtx, &this->skelAnime); + + if (((LINK_IS_ADULT) && func_800A4530(&this->skelAnime, 70.0f)) || + ((LINK_IS_CHILD) && func_800A4530(&this->skelAnime, 87.0f))) { + sp2C = &D_808551A4[gSaveContext.linkAge]; + this->interactRangeActor->parent = &this->actor; + + if (LINK_IS_CHILD) { + dLists = D_80125DE8; + } else { + dLists = D_80125E18; + } + this->leftHandDLists = &dLists[gSaveContext.linkAge]; + + func_8002F7DC(&this->actor, sp2C->unk_00); + if (LINK_IS_CHILD) { + func_80832698(this, sp2C->unk_02); + } + } else if (LINK_IS_ADULT) { + if (func_800A4530(&this->skelAnime, 66.0f)) { + func_80832698(this, NA_SE_VO_LI_SWORD_L); + } + } else { + func_80832924(this, D_808551AC); + } +} + +void func_80851B90(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, &D_04002860, -(2.0f / 3.0f), 12.0f, 12.0f, 2, 0.0f); +} + +struct_80832924 D_808551B4[] = { + { 0, -0x281E }, +}; + +void func_80851BE8(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_800A3BC0(globalCtx, &this->skelAnime); + + this->unk_850++; + + if (this->unk_850 >= 180) { + if (this->unk_850 == 180) { + SkelAnime_ChangeLinkAnim(globalCtx, &this->skelAnime, &D_04003298, (2.0f / 3.0f), 10.0f, + SkelAnime_GetFrameCount(&D_04003298.genericHeader), 2, -8.0f); + } + func_80832924(this, D_808551B4); + } +} + +void func_80851CA4(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + if (func_800A3BC0(globalCtx, &this->skelAnime) && (this->unk_850 == 0) && (this->actor.bgCheckFlags & 1)) { + func_80832264(globalCtx, this, &D_04002DB8); + this->unk_850 = 1; + } + + if (this->unk_850 != 0) { + func_8083721C(this); + } +} + +void func_80851D2C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80850F1C(globalCtx, this, &D_040030A0); + func_8084B498(this); + Player_SetModels(this, Player_ActionToModelGroup(this, this->itemActionParam)); +} + +struct_80832924 D_808551B8[] = { + { NA_SE_IT_SWORD_PICKOUT, -0x80C }, +}; + +void func_80851D80(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_800A3BC0(globalCtx, &this->skelAnime); + + if (func_800A4530(&this->skelAnime, 6.0f)) { + func_80846720(globalCtx, this, 0); + } else { + func_80832924(this, D_808551B8); + } +} + +void func_80851DEC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_800A3BC0(globalCtx, &this->skelAnime); + Math_ApproxS(&this->actor.shape.unk_06, 0, 1); +} + +void func_80851E28(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_800A3BC0(globalCtx, &this->skelAnime); + Math_ApproxS(&this->actor.shape.unk_06, 2, 1); +} + +void func_80851E64(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80833064(globalCtx, this, &D_04003318, 0x98); +} + +void func_80851E90(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_8083303C(globalCtx, this, &D_04002408, 0x9C); + func_80832698(this, NA_SE_VO_LI_GROAN); +} + +void func_80851ECC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_808330EC(globalCtx, this, &D_04002428, 0x9C); + } +} + +void func_80851F14(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim, struct_80832924* arg3) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_808322A4(globalCtx, this, anim); + this->unk_850 = 1; + } else if (this->unk_850 == 0) { + func_80832924(this, arg3); + } +} + +void func_80851F84(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + this->actor.shape.shadowDrawFunc = NULL; + func_80851134(globalCtx, this, &D_04002420); +} + +struct_80832924 D_808551BC[] = { + { NA_SE_VO_LI_RELAX, 0x2023 }, + { NA_SE_PL_SLIPDOWN, 0x8EC }, + { NA_SE_PL_SLIPDOWN, -0x900 }, +}; + +void func_80851FB0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_808330EC(globalCtx, this, &D_04002430, 0x9C); + this->unk_850 = 1; + } else if (this->unk_850 == 0) { + func_80832924(this, D_808551BC); + if (func_800A4530(&this->skelAnime, 240.0f)) { + this->actor.shape.shadowDrawFunc = ActorShadow_DrawFunc_Teardrop; + } + } +} + +struct_80832924 D_808551C8[] = { + { NA_SE_PL_LAND_LADDER, 0x843 }, + { 0, 0x4854 }, + { 0, 0x485A }, + { 0, -0x4860 }, +}; + +void func_80852048(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_800A3BC0(globalCtx, &this->skelAnime); + func_80832924(this, D_808551C8); +} + +void func_80852080(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80833064(globalCtx, this, &D_04002340, 0x9D); + func_80832698(this, NA_SE_VO_LI_FALL_L); +} + +void func_808520BC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + f32 startX = arg2->startPos.x; + f32 startY = arg2->startPos.y; + f32 startZ = arg2->startPos.z; + f32 distX = (arg2->endPos.x - startX); + f32 distY = (arg2->endPos.y - startY); + f32 distZ = (arg2->endPos.z - startZ); + f32 sp4 = (f32)(globalCtx->csCtx.frames - arg2->startFrame) / (f32)(arg2->endFrame - arg2->startFrame); + + this->actor.posRot.pos.x = distX * sp4 + startX; + this->actor.posRot.pos.y = distY * sp4 + startY; + this->actor.posRot.pos.z = distZ * sp4 + startZ; +} + +struct_80832924 D_808551D8[] = { + { NA_SE_PL_BOUND, 0x1014 }, + { NA_SE_PL_BOUND, -0x101E }, +}; + +void func_80852174(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_808520BC(globalCtx, this, arg2); + func_800A3BC0(globalCtx, &this->skelAnime); + func_80832924(this, D_808551D8); +} + +void func_808521B8(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + if (arg2 != NULL) { + func_808520BC(globalCtx, this, arg2); + } + func_800A3BC0(globalCtx, &this->skelAnime); +} + +void func_808521F4(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80832B0C(globalCtx, this, D_80853D34[this->modelAnimType]); + func_80832210(this); +} + +void func_80852234(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_800A3BC0(globalCtx, &this->skelAnime); +} + +void func_8085225C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80832F54(globalCtx, this, 0x98); +} + +void func_80852280(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + this->actor.draw = Player_Draw; +} + +void func_80852298(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_8083313C(globalCtx, this, &D_04002378); + this->unk_850 = 1; + } else if (this->unk_850 == 0) { + if (func_800A4530(&this->skelAnime, 10.0f)) { + func_80846720(globalCtx, this, 1); + } + } +} + +struct_80832924 D_808551E0[] = { + { 0, 0x300A }, + { 0, -0x3018 }, +}; + +void func_80852328(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80851F14(globalCtx, this, &D_04002770, D_808551E0); +} + +struct_80832924 D_808551E8[] = { + { 0, 0x400F }, + { 0, -0x4023 }, +}; + +void func_80852358(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80851F14(globalCtx, this, &D_04002830, D_808551E8); +} + +void func_80852388(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_808322A4(globalCtx, this, &D_04002468); + this->unk_850 = 1; + } + + if ((this->unk_850 != 0) && (globalCtx->csCtx.frames >= 900)) { + this->rightHandType = 0; + } else { + this->rightHandType = 0xFF; + } +} + +void func_80852414(GlobalContext* globalCtx, Player* this, LinkAnimetionEntry* anim, struct_80832924* arg3) { + func_80851294(globalCtx, this, anim); + if (this->unk_850 == 0) { + func_80832924(this, arg3); + } +} + +struct_80832924 D_808551F0[] = { + { 0, 0x300F }, + { 0, -0x3021 }, +}; + +void func_80852450(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80852414(globalCtx, this, &D_04002378, D_808551F0); +} + +struct_80832924 D_808551F8[] = { + { NA_SE_PL_KNOCK, -0x84E }, +}; + +void func_80852480(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80852414(globalCtx, this, &D_040027D0, D_808551F8); +} + +void func_808524B0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80837704(globalCtx, this); +} + +void func_808524D0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + sControlInput->press.in.button |= B_BUTTON; + + func_80844E68(this, globalCtx); +} + +void func_80852514(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80844E68(this, globalCtx); +} + +void func_80852544(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { +} + +void func_80852554(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { +} + +void func_80852564(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + this->stateFlags3 |= 2; + this->linearVelocity = 2.0f; + this->actor.velocity.y = -1.0f; + + func_80832264(globalCtx, this, &D_04002DB0); + func_80832698(this, NA_SE_VO_LI_FALL_L); +} + +void (*D_808551FC[])(Player* this, GlobalContext* globalCtx) = { + func_8084377C, + func_80843954, + func_80843A38, +}; + +void func_808525C0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + D_808551FC[this->unk_850](this, globalCtx); +} + +void func_80852608(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_80846720(globalCtx, this, 0); + func_808322D0(globalCtx, this, &D_04002838); +} + +void func_80852648(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + func_800A3BC0(globalCtx, &this->skelAnime); + + if (func_800A4530(&this->skelAnime, 10.0f)) { + this->heldItemActionParam = this->itemActionParam = PLAYER_AP_NONE; + this->heldItemId = ITEM_NONE; + this->modelGroup = this->nextModelGroup = Player_ActionToModelGroup(this, PLAYER_AP_NONE); + this->leftHandDLists = D_80125E08; + Inventory_ChangeEquipment(EQUIP_SWORD, 2); + gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER; + Inventory_DeleteEquipment(globalCtx, 0); + } +} + +LinkAnimetionEntry* D_80855208[] = { + 0x040034B8, + 0x04003458, +}; + +Vec3s D_80855210[2][2] = { + { { -200, 700, 100 }, { 800, 600, 800 } }, + { { -200, 500, 0 }, { 600, 400, 600 } }, +}; + +Vec3f D_80855228 = { 0.0f, 0.0f, 0.0f }; + +Color_RGB8 D_80855234 = { 255, 255, 255 }; +Color_RGB8 D_80855238 = { 0, 128, 128 }; + +void func_808526EC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + s32 age = gSaveContext.linkAge; + Vec3f sp40; + Vec3f sp34; + Vec3s* ptr; + + func_80851294(globalCtx, this, D_80855208[age]); + + if (this->rightHandType != 0xFF) { + this->rightHandType = 0xFF; + return; + } + + ptr = D_80855210[gSaveContext.linkAge]; + + sp34.x = ptr[0].x + Math_Rand_CenteredFloat(ptr[1].x); + sp34.y = ptr[0].y + Math_Rand_CenteredFloat(ptr[1].y); + sp34.z = ptr[0].z + Math_Rand_CenteredFloat(ptr[1].z); + + SkinMatrix_Vec3fMtxFMultXYZ(&this->shieldMf, &sp34, &sp40); + + func_80028BB0(globalCtx, &sp40, &D_80855228, &D_80855228, &D_80855234, &D_80855238, 600, -10); +} + +void func_8085283C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_80852944(globalCtx, this, arg2); + } else if (this->unk_850 == 0) { + Item_Give(globalCtx, ITEM_SWORD_MASTER); + func_80846720(globalCtx, this, 0); + } else { + func_8084E988(this); + } +} + +void func_808528C8(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + if (func_800A3BC0(globalCtx, &this->skelAnime)) { + func_8084285C(this, 0.0f, 99.0f, this->skelAnime.animFrameCount - 8.0f); + } + + if (this->heldItemActionParam != PLAYER_AP_SWORD_MASTER) { + func_80846720(globalCtx, this, 1); + } +} + +void func_80852944(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + if (func_808332B8(this)) { + func_80838F18(globalCtx, this); + func_80832340(globalCtx, this); + } else { + func_8083C148(this, globalCtx); + if (!func_8083B644(this, globalCtx)) { + func_8083E5A8(this, globalCtx); + } + } + + this->csMode = 0; + this->unk_6AD = 0; +} + +void func_808529D0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + this->actor.posRot.pos.x = arg2->startPos.x; + this->actor.posRot.pos.y = arg2->startPos.y; + if ((globalCtx->sceneNum == SCENE_SPOT04) && LINK_IS_CHILD) { + this->actor.posRot.pos.y -= 1.0f; + } + this->actor.posRot.pos.z = arg2->startPos.z; + this->currentYaw = this->actor.shape.rot.y = arg2->rot.y; +} + +void func_80852A54(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + f32 dx = arg2->startPos.x - (s32)this->actor.posRot.pos.x; + f32 dy = arg2->startPos.y - (s32)this->actor.posRot.pos.y; + f32 dz = arg2->startPos.z - (s32)this->actor.posRot.pos.z; + f32 dist = sqrtf(SQ(dx) + SQ(dy) + SQ(dz)); + s16 yawDiff = arg2->rot.y - this->actor.shape.rot.y; + + if ((this->linearVelocity == 0.0f) && ((dist > 50.0f) || (ABS(yawDiff) > 0x4000))) { + func_808529D0(globalCtx, this, arg2); + } + + this->skelAnime.flags = 0; + func_80832DB0(this); +} + +void func_80852B4C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2, struct_80854B18* arg3) { + if (arg3->type > 0) { + D_80854AA4[arg3->type](globalCtx, this, arg3->ptr); + } else if (arg3->type < 0) { + arg3->func(globalCtx, this, arg2); + } + + if ((D_80858AA0 & 4) && !(this->skelAnime.flags & 4)) { + this->skelAnime.transitionDrawTbl[0].y /= this->ageProperties->unk_08; + D_80858AA0 = 0; + } +} + +void func_80852C0C(GlobalContext* globalCtx, Player* this, s32 csMode) { + if ((csMode != 1) && (csMode != 8) && (csMode != 0x31) && (csMode != 7)) { + func_808323B4(globalCtx, this); + } +} + +void func_80852C50(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + CsCmdActorAction* linkCsAction = globalCtx->csCtx.linkAction; + s32 pad; + s32 sp24; + + if (globalCtx->csCtx.state == 3) { + func_8002DF54(globalCtx, NULL, 7); + this->unk_446 = 0; + func_80832210(this); + return; + } + + if (linkCsAction == NULL) { + this->actor.flags &= ~0x40; + return; + } + + if (this->unk_446 != linkCsAction->action) { + sp24 = D_808547C4[linkCsAction->action]; + if (sp24 >= 0) { + if ((sp24 == 3) || (sp24 == 4)) { + func_80852A54(globalCtx, this, linkCsAction); + } else { + func_808529D0(globalCtx, this, linkCsAction); + } + } + + D_80858AA0 = this->skelAnime.flags; + + func_80832DBC(this); + osSyncPrintf("TOOL MODE=%d\n", sp24); + func_80852C0C(globalCtx, this, ABS(sp24)); + func_80852B4C(globalCtx, this, linkCsAction, &D_80854B18[ABS(sp24)]); + + this->unk_850 = 0; + this->unk_84F = 0; + this->unk_446 = linkCsAction->action; + } + + sp24 = D_808547C4[this->unk_446]; + func_80852B4C(globalCtx, this, linkCsAction, &D_80854E50[ABS(sp24)]); +} + +void func_80852E14(Player* this, GlobalContext* globalCtx) { + if (this->csMode != this->prevCsMode) { + D_80858AA0 = this->skelAnime.flags; + + func_80832DBC(this); + this->prevCsMode = this->csMode; + osSyncPrintf("DEMO MODE=%d\n", this->csMode); + func_80852C0C(globalCtx, this, this->csMode); + func_80852B4C(globalCtx, this, NULL, &D_80854B18[this->csMode]); + } + + func_80852B4C(globalCtx, this, NULL, &D_80854E50[this->csMode]); +} + +s32 Player_IsDroppingFish(GlobalContext* globalCtx) { + Player* this = PLAYER; + + return (func_8084EFC0 == this->func_674) && (this->itemActionParam == PLAYER_AP_BOTTLE_FISH); +} + +s32 Player_StartFishing(GlobalContext* globalCtx) { + Player* this = PLAYER; + + func_80832564(globalCtx, this); + func_80835F44(globalCtx, this, ITEM_FISHING_POLE); + return 1; +} + +s32 func_80852F38(GlobalContext* globalCtx, Player* this) { + if (!Player_InBlockingCsMode(globalCtx, this) && (this->invincibilityTimer >= 0) && !func_8008F128(this) && + !(this->stateFlags3 & 0x80)) { + func_80832564(globalCtx, this); + func_80835C58(globalCtx, this, func_8084F308, 0); + func_80832264(globalCtx, this, &D_04003120); + this->stateFlags2 |= 0x80; + func_80832224(this); + func_80832698(this, NA_SE_VO_LI_HELD); + return 1; + } + + return 0; +} + +// Sets up player cutscene +s32 func_80852FFC(GlobalContext* globalCtx, Actor* actor, s32 csMode) { + Player* this = PLAYER; + + if (!Player_InBlockingCsMode(globalCtx, this)) { + func_80832564(globalCtx, this); + func_80835C58(globalCtx, this, func_80852E14, 0); + this->csMode = csMode; + this->unk_448 = actor; + func_80832224(this); + return 1; + } + + return 0; +} + +void func_80853080(Player* this, GlobalContext* globalCtx) { + func_80835C58(globalCtx, this, func_80840BC8, 1); + func_80832B0C(globalCtx, this, func_80833338(this)); + this->currentYaw = this->actor.shape.rot.y; +} + +s32 Player_InflictDamage(GlobalContext* globalCtx, s32 damage) { + Player* this = PLAYER; + + if (!Player_InBlockingCsMode(globalCtx, this) && !func_80837B18(globalCtx, this, damage)) { + this->stateFlags2 &= ~0x80; + return 1; + } + + return 0; +} + +// Start talking with the given actor +void func_80853148(GlobalContext* globalCtx, Actor* actor) { + Player* this = PLAYER; + s32 pad; + + if ((this->targetActor != NULL) || (actor == this->naviActor) || ((actor->flags & 0x40001) == 0x40001)) { + actor->flags |= 0x100; + } + + this->targetActor = actor; + this->exchangeItemId = EXCH_ITEM_NONE; + + if (actor->textId == 0xFFFF) { + func_8002DF54(globalCtx, actor, 1); + actor->flags |= 0x100; + func_80832528(globalCtx, this); + } else { + if (this->actor.flags & 0x100) { + this->actor.textId = 0; + } else { + this->actor.flags |= 0x100; + this->actor.textId = actor->textId; + } + + if (this->stateFlags1 & 0x800000) { + s32 sp24 = this->unk_850; + + func_80832528(globalCtx, this); + func_8083A2F8(globalCtx, this); + + this->unk_850 = sp24; + } else { + if (func_808332B8(this)) { + func_80836898(globalCtx, this, func_8083A2F8); + func_80832C6C(globalCtx, this, &D_04003328); + } else if ((actor->type != ACTORTYPE_NPC) || (this->heldItemActionParam == PLAYER_AP_FISHING_POLE)) { + func_8083A2F8(globalCtx, this); + + if (!func_8008E9C4(this)) { + if ((actor != this->naviActor) && (actor->xzDistFromLink < 40.0f)) { + func_808322D0(globalCtx, this, &D_04002DF0); + } else { + func_80832284(globalCtx, this, func_80833338(this)); + } + } + } else { + func_80836898(globalCtx, this, func_8083A2F8); + func_808322D0(globalCtx, this, (actor->xzDistFromLink < 40.0f) ? &D_04002DF0 : &D_040031A0); + } + + if (this->skelAnime.linkAnimetionSeg == &D_04002DF0) { + func_80832F54(globalCtx, this, 0x19); + } + + func_80832224(this); + } + + this->stateFlags1 |= 0x20000040; + } + + if ((this->naviActor == this->targetActor) && ((this->targetActor->textId & 0xFF00) != 0x200)) { + this->naviActor->flags |= 0x100; + func_80835EA4(globalCtx, 0xB); + } +} diff --git a/undefined_syms.txt b/undefined_syms.txt index 0b81b58baf..9fa47633f0 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -81,10 +81,143 @@ D_02003AC0 = 0x02003AC0; D_0201DA50 = 0x0201DA50; D_0300AA48 = 0x0300AA48; D_03012B20 = 0x03012B20; +D_04002040 = 0x04002040; D_040020D0 = 0x040020D0; D_04002160 = 0x04002160; +D_040021F0 = 0x040021F0; D_04002280 = 0x04002280; +D_04002340 = 0x04002340; +D_04002378 = 0x04002378; +D_04002400 = 0x04002400; +D_04002408 = 0x04002408; +D_04002420 = 0x04002420; +D_04002428 = 0x04002428; +D_04002430 = 0x04002430; +D_04002468 = 0x04002468; +D_040024E8 = 0x040024E8; +D_040024F8 = 0x040024F8; +D_04002538 = 0x04002538; +D_040025F8 = 0x040025F8; +D_04002600 = 0x04002600; +D_04002608 = 0x04002608; +D_04002618 = 0x04002618; +D_04002620 = 0x04002620; +D_04002628 = 0x04002628; +D_04002630 = 0x04002630; +D_04002638 = 0x04002638; +D_04002650 = 0x04002650; +D_04002660 = 0x04002660; +D_04002668 = 0x04002668; +D_04002670 = 0x04002670; +D_04002688 = 0x04002688; +D_04002698 = 0x04002698; +D_040026A0 = 0x040026A0; +D_040026B0 = 0x040026B0; +D_040026B8 = 0x040026B8; +D_040026E8 = 0x040026E8; +D_04002700 = 0x04002700; +D_04002708 = 0x04002708; +D_04002770 = 0x04002770; +D_04002780 = 0x04002780; +D_04002788 = 0x04002788; +D_040027D0 = 0x040027D0; +D_04002830 = 0x04002830; +D_04002838 = 0x04002838; +D_04002860 = 0x04002860; +D_04002878 = 0x04002878; +D_04002908 = 0x04002908; +D_04002AC8 = 0x04002AC8; +D_04002C00 = 0x04002C00; +D_04002C08 = 0x04002C08; +D_04002C10 = 0x04002C10; +D_04002C18 = 0x04002C18; +D_04002C20 = 0x04002C20; +D_04002C28 = 0x04002C28; +D_04002C30 = 0x04002C30; +D_04002C38 = 0x04002C38; +D_04002C90 = 0x04002C90; +D_04002C98 = 0x04002C98; +D_04002CA0 = 0x04002CA0; +D_04002D28 = 0x04002D28; +D_04002D38 = 0x04002D38; +D_04002D40 = 0x04002D40; +D_04002D48 = 0x04002D48; +D_04002D68 = 0x04002D68; +D_04002D80 = 0x04002D80; +D_04002D88 = 0x04002D88; +D_04002DA0 = 0x04002DA0; +D_04002DA8 = 0x04002DA8; +D_04002DB0 = 0x04002DB0; +D_04002DB8 = 0x04002DB8; +D_04002DC0 = 0x04002DC0; +D_04002DD0 = 0x04002DD0; +D_04002DF0 = 0x04002DF0; +D_04002DF8 = 0x04002DF8; +D_04002E10 = 0x04002E10; +D_04002E48 = 0x04002E48; +D_04002E90 = 0x04002E90; +D_04002EC8 = 0x04002EC8; +D_04002F00 = 0x04002F00; +D_04002F08 = 0x04002F08; +D_04002F10 = 0x04002F10; +D_04002F28 = 0x04002F28; +D_04002F30 = 0x04002F30; +D_04002F40 = 0x04002F40; +D_04002F58 = 0x04002F58; +D_04002F60 = 0x04002F60; +D_04002F68 = 0x04002F68; +D_04002F98 = 0x04002F98; +D_04002FA0 = 0x04002FA0; +D_04002FD0 = 0x04002FD0; +D_04002FE0 = 0x04002FE0; +D_04003000 = 0x04003000; +D_04003020 = 0x04003020; +D_04003040 = 0x04003040; +D_04003048 = 0x04003048; +D_04003050 = 0x04003050; +D_04003060 = 0x04003060; +D_04003068 = 0x04003068; +D_04003070 = 0x04003070; +D_04003098 = 0x04003098; +D_040030A0 = 0x040030A0; +D_040030A8 = 0x040030A8; +D_040030E0 = 0x040030E0; +D_040030F0 = 0x040030F0; +D_040030F8 = 0x040030F8; +D_04003100 = 0x04003100; +D_04003108 = 0x04003108; +D_04003120 = 0x04003120; +D_04003128 = 0x04003128; +D_04003148 = 0x04003148; +D_04003150 = 0x04003150; +D_04003158 = 0x04003158; +D_04003160 = 0x04003160; +D_040031A0 = 0x040031A0; +D_040031A8 = 0x040031A8; D_04003238 = 0x04003238; +D_04003298 = 0x04003298; +D_040032B0 = 0x040032B0; +D_040032B8 = 0x040032B8; +D_040032C0 = 0x040032C0; +D_040032C8 = 0x040032C8; +D_040032D0 = 0x040032D0; +D_040032D8 = 0x040032D8; +D_040032E0 = 0x040032E0; +D_040032E8 = 0x040032E8; +D_040032F0 = 0x040032F0; +D_04003300 = 0x04003300; +D_04003308 = 0x04003308; +D_04003310 = 0x04003310; +D_04003318 = 0x04003318; +D_04003320 = 0x04003320; +D_04003328 = 0x04003328; +D_04003330 = 0x04003330; +D_04003380 = 0x04003380; +D_04003390 = 0x04003390; +D_040033A0 = 0x040033A0; +D_040033B0 = 0x040033B0; +D_040033B8 = 0x040033B8; +D_040033C8 = 0x040033C8; D_04004298 = 0x04004298; D_04006020 = 0x04006020; D_0400C808 = 0x0400C808; @@ -96,7 +229,9 @@ D_04015760 = 0x04015760; D_0401A0B0 = 0x0401A0B0; D_0401E370 = 0x0401E370; D_0402CF30 = 0x0402CF30; +D_04033EE0 = 0x04033EE0; D_04037730 = 0x04037730; +D_04037E30 = 0x04037E30; D_04038F00 = 0x04038F00; D_04038FB0 = 0x04038FB0; D_0403B030 = 0x0403B030;