From e37f91d3532433bc1484129ef185cc58fb4c1e88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Fa=C3=9Fbender?= <31699028+Brotenko@users.noreply.github.com> Date: Fri, 24 Sep 2021 13:20:10 +0200 Subject: [PATCH] decompile several duplicated dead funcs (#428) --- src/ED0310.c | 24 +- src/EDEA00.c | 24 +- src/EE70C0.c | 22 +- src/EEDF50.c | 24 +- src/EF2680.c | 24 +- .../ED0310/func_80240320_ED0310.s | 123 --------- .../ED0310/func_80240BB8_ED0BA8.s | 225 ---------------- .../ED0310/func_80240EFC_ED0EEC.s | 34 --- .../ED0310/func_80240F74_ED0F64.s | 32 --- .../ED0310/func_80241114_ED1104.s | 31 --- .../ED0310/func_80241178_ED1168.s | 243 ------------------ .../ED0310/func_80241508_ED14F8.s | 79 ------ .../ED0310/func_8024162C_ED161C.s | 12 +- .../EDEA00/func_802401C4_EDEB84.s | 123 --------- .../EDEA00/func_80240A5C_EDF41C.s | 225 ---------------- .../EDEA00/func_80240DA0_EDF760.s | 34 --- .../EDEA00/func_80240E18_EDF7D8.s | 32 --- .../EDEA00/func_80240FB8_EDF978.s | 31 --- .../EDEA00/func_8024101C_EDF9DC.s | 243 ------------------ .../EDEA00/func_802413AC_EDFD6C.s | 79 ------ .../EDEA00/func_802414D0_EDFE90.s | 12 +- .../EDEA00/func_80241DE4_EE07A4.s | 8 +- .../EE70C0/func_802413A8_EE7958.s | 225 ---------------- .../EE70C0/func_802416EC_EE7C9C.s | 34 --- .../EE70C0/func_80241764_EE7D14.s | 32 --- .../EE70C0/func_80241904_EE7EB4.s | 31 --- .../EE70C0/func_80241968_EE7F18.s | 243 ------------------ .../EE70C0/func_80241CF8_EE82A8.s | 79 ------ .../EE70C0/func_80241E1C_EE83CC.s | 10 +- .../EEDF50/func_80240E50_EEDF50.s | 123 --------- .../EEDF50/func_802416E8_EEE7E8.s | 225 ---------------- .../EEDF50/func_80241A2C_EEEB2C.s | 34 --- .../EEDF50/func_80241AA4_EEEBA4.s | 32 --- .../EEDF50/func_80241C44_EEED44.s | 31 --- .../EEDF50/func_80241CA8_EEEDA8.s | 243 ------------------ .../EEDF50/func_80242038_EEF138.s | 79 ------ .../EEDF50/func_8024215C_EEF25C.s | 12 +- .../EEDF50/func_80242780_EEF880.s | 8 +- .../EF2680/func_8024137C_EF398C.s | 2 +- .../EF2680/func_80241C90_EF42A0.s | 2 +- ver/us/symbol_addrs.txt | 48 ++-- 41 files changed, 125 insertions(+), 3052 deletions(-) delete mode 100644 ver/us/asm/nonmatchings/ED0310/func_80240320_ED0310.s delete mode 100644 ver/us/asm/nonmatchings/ED0310/func_80240BB8_ED0BA8.s delete mode 100644 ver/us/asm/nonmatchings/ED0310/func_80240EFC_ED0EEC.s delete mode 100644 ver/us/asm/nonmatchings/ED0310/func_80240F74_ED0F64.s delete mode 100644 ver/us/asm/nonmatchings/ED0310/func_80241114_ED1104.s delete mode 100644 ver/us/asm/nonmatchings/ED0310/func_80241178_ED1168.s delete mode 100644 ver/us/asm/nonmatchings/ED0310/func_80241508_ED14F8.s delete mode 100644 ver/us/asm/nonmatchings/EDEA00/func_802401C4_EDEB84.s delete mode 100644 ver/us/asm/nonmatchings/EDEA00/func_80240A5C_EDF41C.s delete mode 100644 ver/us/asm/nonmatchings/EDEA00/func_80240DA0_EDF760.s delete mode 100644 ver/us/asm/nonmatchings/EDEA00/func_80240E18_EDF7D8.s delete mode 100644 ver/us/asm/nonmatchings/EDEA00/func_80240FB8_EDF978.s delete mode 100644 ver/us/asm/nonmatchings/EDEA00/func_8024101C_EDF9DC.s delete mode 100644 ver/us/asm/nonmatchings/EDEA00/func_802413AC_EDFD6C.s delete mode 100644 ver/us/asm/nonmatchings/EE70C0/func_802413A8_EE7958.s delete mode 100644 ver/us/asm/nonmatchings/EE70C0/func_802416EC_EE7C9C.s delete mode 100644 ver/us/asm/nonmatchings/EE70C0/func_80241764_EE7D14.s delete mode 100644 ver/us/asm/nonmatchings/EE70C0/func_80241904_EE7EB4.s delete mode 100644 ver/us/asm/nonmatchings/EE70C0/func_80241968_EE7F18.s delete mode 100644 ver/us/asm/nonmatchings/EE70C0/func_80241CF8_EE82A8.s delete mode 100644 ver/us/asm/nonmatchings/EEDF50/func_80240E50_EEDF50.s delete mode 100644 ver/us/asm/nonmatchings/EEDF50/func_802416E8_EEE7E8.s delete mode 100644 ver/us/asm/nonmatchings/EEDF50/func_80241A2C_EEEB2C.s delete mode 100644 ver/us/asm/nonmatchings/EEDF50/func_80241AA4_EEEBA4.s delete mode 100644 ver/us/asm/nonmatchings/EEDF50/func_80241C44_EEED44.s delete mode 100644 ver/us/asm/nonmatchings/EEDF50/func_80241CA8_EEEDA8.s delete mode 100644 ver/us/asm/nonmatchings/EEDF50/func_80242038_EEF138.s diff --git a/src/ED0310.c b/src/ED0310.c index f64e2a7f1a..b3fafb33e4 100644 --- a/src/ED0310.c +++ b/src/ED0310.c @@ -3,24 +3,34 @@ #define NAMESPACE ED0310 -INCLUDE_ASM(s32, "ED0310", func_80240320_ED0310); +extern f32 D_8024365C_ED364C[]; + +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "ED0310", func_802404D0_ED04C0); #include "world/common/DeadUnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "ED0310", func_80240BB8_ED0BA8); +#include "world/common/UnkFunc4.inc.c" -INCLUDE_ASM(s32, "ED0310", func_80240EFC_ED0EEC); +#include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "ED0310", func_80240F74_ED0F64); +void func_80240F74_ED0F64(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->pos.y += D_8024365C_ED364C[npc->duration++]; + if (npc->duration >= 5) { + script->functionTemp[0] = 12; + } +} #include "world/common/DeadUnkNpcAIFunc14.inc.c" -INCLUDE_ASM(s32, "ED0310", func_80241114_ED1104); +#include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "ED0310", func_80241178_ED1168); +#include "world/common/UnkFunc6.inc.c" -INCLUDE_ASM(s32, "ED0310", func_80241508_ED14F8); +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "ED0310", func_8024162C_ED161C); diff --git a/src/EDEA00.c b/src/EDEA00.c index 468ef14c50..9cbdd3c05d 100644 --- a/src/EDEA00.c +++ b/src/EDEA00.c @@ -3,27 +3,37 @@ #define NAMESPACE EDEA00 +extern f32 D_802441DC_EE2B9C[]; + INCLUDE_ASM(s32, "EDEA00", func_80240040_EDEA00); -INCLUDE_ASM(s32, "EDEA00", func_802401C4_EDEB84); +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "EDEA00", func_80240374_EDED34); #include "world/common/DeadUnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "EDEA00", func_80240A5C_EDF41C); +#include "world/common/UnkFunc4.inc.c" -INCLUDE_ASM(s32, "EDEA00", func_80240DA0_EDF760); +#include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "EDEA00", func_80240E18_EDF7D8); +void func_80240E18_EDF7D8(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->pos.y += D_802441DC_EE2B9C[npc->duration++]; + if (npc->duration >= 5) { + script->functionTemp[0] = 12; + } +} #include "world/common/DeadUnkNpcAIFunc14.inc.c" -INCLUDE_ASM(s32, "EDEA00", func_80240FB8_EDF978); +#include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "EDEA00", func_8024101C_EDF9DC); +#include "world/common/UnkFunc6.inc.c" -INCLUDE_ASM(s32, "EDEA00", func_802413AC_EDFD6C); +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "EDEA00", func_802414D0_EDFE90); diff --git a/src/EE70C0.c b/src/EE70C0.c index 4191a371fe..1527bf3333 100644 --- a/src/EE70C0.c +++ b/src/EE70C0.c @@ -3,25 +3,35 @@ #define NAMESPACE EE70C0 +extern f32 D_802444F0_EEAAA0[]; + INCLUDE_ASM(s32, "EE70C0", func_80240B10_EE70C0); INCLUDE_ASM(s32, "EE70C0", func_80240CC0_EE7270); #include "world/common/DeadUnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "EE70C0", func_802413A8_EE7958); +#include "world/common/UnkFunc4.inc.c" -INCLUDE_ASM(s32, "EE70C0", func_802416EC_EE7C9C); +#include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "EE70C0", func_80241764_EE7D14); +void func_80241764_EE7D14(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->pos.y += D_802444F0_EEAAA0[npc->duration++]; + if (npc->duration >= 5) { + script->functionTemp[0] = 12; + } +} #include "world/common/DeadUnkNpcAIFunc14.inc.c" -INCLUDE_ASM(s32, "EE70C0", func_80241904_EE7EB4); +#include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "EE70C0", func_80241968_EE7F18); +#include "world/common/UnkFunc6.inc.c" -INCLUDE_ASM(s32, "EE70C0", func_80241CF8_EE82A8); +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "EE70C0", func_80241E1C_EE83CC); diff --git a/src/EEDF50.c b/src/EEDF50.c index 25ba92e1f5..3c044234be 100644 --- a/src/EEDF50.c +++ b/src/EEDF50.c @@ -3,25 +3,35 @@ #define NAMESPACE EEDF50 -INCLUDE_ASM(s32, "EEDF50", func_80240E50_EEDF50); +extern f32 D_80244070_EF1170[]; + +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "EEDF50", func_80241000_EEE100); #include "world/common/DeadUnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "EEDF50", func_802416E8_EEE7E8); +#include "world/common/UnkFunc4.inc.c" -INCLUDE_ASM(s32, "EEDF50", func_80241A2C_EEEB2C); +#include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "EEDF50", func_80241AA4_EEEBA4); +void func_80241AA4_EEEBA4(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->pos.y += D_80244070_EF1170[npc->duration++]; + if (npc->duration >= 5) { + script->functionTemp[0] = 12; + } +} #include "world/common/DeadUnkNpcAIFunc14.inc.c" -INCLUDE_ASM(s32, "EEDF50", func_80241C44_EEED44); +#include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "EEDF50", func_80241CA8_EEEDA8); +#include "world/common/UnkFunc6.inc.c" -INCLUDE_ASM(s32, "EEDF50", func_80242038_EEF138); +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "EEDF50", func_8024215C_EEF25C); diff --git a/src/EF2680.c b/src/EF2680.c index cd0b7c613f..d34dd0b763 100644 --- a/src/EF2680.c +++ b/src/EF2680.c @@ -3,29 +3,7 @@ #define NAMESPACE EF2680 -void func_80240070_EF2680(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim.w = enemy->animList[1]; - script->functionTemp[1] = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0] = 1; -} +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "EF2680", func_80240220_EF2830); diff --git a/ver/us/asm/nonmatchings/ED0310/func_80240320_ED0310.s b/ver/us/asm/nonmatchings/ED0310/func_80240320_ED0310.s deleted file mode 100644 index 0a8f2e9b9d..0000000000 --- a/ver/us/asm/nonmatchings/ED0310/func_80240320_ED0310.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802441D0_ED41C0 -.double 32767.0 - -.section .text - -glabel func_80240320_ED0310 -/* ED0310 80240320 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* ED0314 80240324 AFB3002C */ sw $s3, 0x2c($sp) -/* ED0318 80240328 0080982D */ daddu $s3, $a0, $zero -/* ED031C 8024032C AFBF0030 */ sw $ra, 0x30($sp) -/* ED0320 80240330 AFB20028 */ sw $s2, 0x28($sp) -/* ED0324 80240334 AFB10024 */ sw $s1, 0x24($sp) -/* ED0328 80240338 AFB00020 */ sw $s0, 0x20($sp) -/* ED032C 8024033C 8E710148 */ lw $s1, 0x148($s3) -/* ED0330 80240340 86240008 */ lh $a0, 8($s1) -/* ED0334 80240344 0C00F92F */ jal dead_get_npc_unsafe -/* ED0338 80240348 00A0902D */ daddu $s2, $a1, $zero -/* ED033C 8024034C 8E440004 */ lw $a0, 4($s2) -/* ED0340 80240350 0040802D */ daddu $s0, $v0, $zero -/* ED0344 80240354 00041FC2 */ srl $v1, $a0, 0x1f -/* ED0348 80240358 00832021 */ addu $a0, $a0, $v1 -/* ED034C 8024035C 00042043 */ sra $a0, $a0, 1 -/* ED0350 80240360 0C00AB3B */ jal dead_rand_int -/* ED0354 80240364 24840001 */ addiu $a0, $a0, 1 -/* ED0358 80240368 8E430004 */ lw $v1, 4($s2) -/* ED035C 8024036C 000327C2 */ srl $a0, $v1, 0x1f -/* ED0360 80240370 00641821 */ addu $v1, $v1, $a0 -/* ED0364 80240374 00031843 */ sra $v1, $v1, 1 -/* ED0368 80240378 00621821 */ addu $v1, $v1, $v0 -/* ED036C 8024037C A603008E */ sh $v1, 0x8e($s0) -/* ED0370 80240380 8E2300D0 */ lw $v1, 0xd0($s1) -/* ED0374 80240384 C6000040 */ lwc1 $f0, 0x40($s0) -/* ED0378 80240388 C4640000 */ lwc1 $f4, ($v1) -/* ED037C 8024038C 46802120 */ cvt.s.w $f4, $f4 -/* ED0380 80240390 C4620008 */ lwc1 $f2, 8($v1) -/* ED0384 80240394 468010A0 */ cvt.s.w $f2, $f2 -/* ED0388 80240398 E7A00010 */ swc1 $f0, 0x10($sp) -/* ED038C 8024039C 8E2200D0 */ lw $v0, 0xd0($s1) -/* ED0390 802403A0 44061000 */ mfc1 $a2, $f2 -/* ED0394 802403A4 C440000C */ lwc1 $f0, 0xc($v0) -/* ED0398 802403A8 46800020 */ cvt.s.w $f0, $f0 -/* ED039C 802403AC E7A00014 */ swc1 $f0, 0x14($sp) -/* ED03A0 802403B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* ED03A4 802403B4 44052000 */ mfc1 $a1, $f4 -/* ED03A8 802403B8 C4400010 */ lwc1 $f0, 0x10($v0) -/* ED03AC 802403BC 46800020 */ cvt.s.w $f0, $f0 -/* ED03B0 802403C0 E7A00018 */ swc1 $f0, 0x18($sp) -/* ED03B4 802403C4 8C640018 */ lw $a0, 0x18($v1) -/* ED03B8 802403C8 0C013431 */ jal dead_is_point_within_region -/* ED03BC 802403CC 8E070038 */ lw $a3, 0x38($s0) -/* ED03C0 802403D0 1040000E */ beqz $v0, .L8024040C -/* ED03C4 802403D4 00000000 */ nop -/* ED03C8 802403D8 8E2200D0 */ lw $v0, 0xd0($s1) -/* ED03CC 802403DC C60C0038 */ lwc1 $f12, 0x38($s0) -/* ED03D0 802403E0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* ED03D4 802403E4 C4460000 */ lwc1 $f6, ($v0) -/* ED03D8 802403E8 468031A0 */ cvt.s.w $f6, $f6 -/* ED03DC 802403EC 44063000 */ mfc1 $a2, $f6 -/* ED03E0 802403F0 C4460008 */ lwc1 $f6, 8($v0) -/* ED03E4 802403F4 468031A0 */ cvt.s.w $f6, $f6 -/* ED03E8 802403F8 44073000 */ mfc1 $a3, $f6 -/* ED03EC 802403FC 0C00ABDC */ jal fio_validate_header_checksums -/* ED03F0 80240400 00000000 */ nop -/* ED03F4 80240404 0809010F */ j .L8024043C -/* ED03F8 80240408 E600000C */ swc1 $f0, 0xc($s0) -.L8024040C: -/* ED03FC 8024040C 0C00AB3B */ jal dead_rand_int -/* ED0400 80240410 2404003C */ addiu $a0, $zero, 0x3c -/* ED0404 80240414 C60C000C */ lwc1 $f12, 0xc($s0) -/* ED0408 80240418 44820000 */ mtc1 $v0, $f0 -/* ED040C 8024041C 00000000 */ nop -/* ED0410 80240420 46800020 */ cvt.s.w $f0, $f0 -/* ED0414 80240424 46006300 */ add.s $f12, $f12, $f0 -/* ED0418 80240428 3C0141F0 */ lui $at, 0x41f0 -/* ED041C 8024042C 44810000 */ mtc1 $at, $f0 -/* ED0420 80240430 0C00AB85 */ jal dead_clamp_angle -/* ED0424 80240434 46006301 */ sub.s $f12, $f12, $f0 -/* ED0428 80240438 E600000C */ swc1 $f0, 0xc($s0) -.L8024043C: -/* ED042C 8024043C 8E2200CC */ lw $v0, 0xcc($s1) -/* ED0430 80240440 8C420004 */ lw $v0, 4($v0) -/* ED0434 80240444 AE020028 */ sw $v0, 0x28($s0) -/* ED0438 80240448 AE600074 */ sw $zero, 0x74($s3) -/* ED043C 8024044C 8E2200D0 */ lw $v0, 0xd0($s1) -/* ED0440 80240450 8C420014 */ lw $v0, 0x14($v0) -/* ED0444 80240454 04410004 */ bgez $v0, .L80240468 -/* ED0448 80240458 00000000 */ nop -/* ED044C 8024045C C6400000 */ lwc1 $f0, ($s2) -/* ED0450 80240460 08090122 */ j .L80240488 -/* ED0454 80240464 E6000018 */ swc1 $f0, 0x18($s0) -.L80240468: -/* ED0458 80240468 3C018024 */ lui $at, %hi(D_802441D0_ED41C0) -/* ED045C 8024046C D42241D0 */ ldc1 $f2, %lo(D_802441D0_ED41C0)($at) -/* ED0460 80240470 44820000 */ mtc1 $v0, $f0 -/* ED0464 80240474 00000000 */ nop -/* ED0468 80240478 46800021 */ cvt.d.w $f0, $f0 -/* ED046C 8024047C 46220003 */ div.d $f0, $f0, $f2 -/* ED0470 80240480 46200020 */ cvt.s.d $f0, $f0 -/* ED0474 80240484 E6000018 */ swc1 $f0, 0x18($s0) -.L80240488: -/* ED0478 80240488 C600003C */ lwc1 $f0, 0x3c($s0) -/* ED047C 8024048C 3C014059 */ lui $at, 0x4059 -/* ED0480 80240490 44811800 */ mtc1 $at, $f3 -/* ED0484 80240494 44801000 */ mtc1 $zero, $f2 -/* ED0488 80240498 46000021 */ cvt.d.s $f0, $f0 -/* ED048C 8024049C 46220002 */ mul.d $f0, $f0, $f2 -/* ED0490 802404A0 00000000 */ nop -/* ED0494 802404A4 24020001 */ addiu $v0, $zero, 1 -/* ED0498 802404A8 4620018D */ trunc.w.d $f6, $f0 -/* ED049C 802404AC E626007C */ swc1 $f6, 0x7c($s1) -/* ED04A0 802404B0 AE620070 */ sw $v0, 0x70($s3) -/* ED04A4 802404B4 8FBF0030 */ lw $ra, 0x30($sp) -/* ED04A8 802404B8 8FB3002C */ lw $s3, 0x2c($sp) -/* ED04AC 802404BC 8FB20028 */ lw $s2, 0x28($sp) -/* ED04B0 802404C0 8FB10024 */ lw $s1, 0x24($sp) -/* ED04B4 802404C4 8FB00020 */ lw $s0, 0x20($sp) -/* ED04B8 802404C8 03E00008 */ jr $ra -/* ED04BC 802404CC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/ED0310/func_80240BB8_ED0BA8.s b/ver/us/asm/nonmatchings/ED0310/func_80240BB8_ED0BA8.s deleted file mode 100644 index cae1a443a0..0000000000 --- a/ver/us/asm/nonmatchings/ED0310/func_80240BB8_ED0BA8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BB8_ED0BA8 -/* ED0BA8 80240BB8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* ED0BAC 80240BBC AFB3004C */ sw $s3, 0x4c($sp) -/* ED0BB0 80240BC0 0080982D */ daddu $s3, $a0, $zero -/* ED0BB4 80240BC4 AFBF0054 */ sw $ra, 0x54($sp) -/* ED0BB8 80240BC8 AFB40050 */ sw $s4, 0x50($sp) -/* ED0BBC 80240BCC AFB20048 */ sw $s2, 0x48($sp) -/* ED0BC0 80240BD0 AFB10044 */ sw $s1, 0x44($sp) -/* ED0BC4 80240BD4 AFB00040 */ sw $s0, 0x40($sp) -/* ED0BC8 80240BD8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* ED0BCC 80240BDC F7B80068 */ sdc1 $f24, 0x68($sp) -/* ED0BD0 80240BE0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* ED0BD4 80240BE4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* ED0BD8 80240BE8 8E710148 */ lw $s1, 0x148($s3) -/* ED0BDC 80240BEC 00A0902D */ daddu $s2, $a1, $zero -/* ED0BE0 80240BF0 86240008 */ lh $a0, 8($s1) -/* ED0BE4 80240BF4 0C00F92F */ jal dead_get_npc_unsafe -/* ED0BE8 80240BF8 00C0A02D */ daddu $s4, $a2, $zero -/* ED0BEC 80240BFC 0040802D */ daddu $s0, $v0, $zero -/* ED0BF0 80240C00 C6200078 */ lwc1 $f0, 0x78($s1) -/* ED0BF4 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* ED0BF8 80240C08 46000021 */ cvt.d.s $f0, $f0 -/* ED0BFC 80240C0C 3C014059 */ lui $at, 0x4059 -/* ED0C00 80240C10 44811800 */ mtc1 $at, $f3 -/* ED0C04 80240C14 44801000 */ mtc1 $zero, $f2 -/* ED0C08 80240C18 8602008E */ lh $v0, 0x8e($s0) -/* ED0C0C 80240C1C 9603008E */ lhu $v1, 0x8e($s0) -/* ED0C10 80240C20 46220003 */ div.d $f0, $f0, $f2 -/* ED0C14 80240C24 46200620 */ cvt.s.d $f24, $f0 -/* ED0C18 80240C28 C6200088 */ lwc1 $f0, 0x88($s1) -/* ED0C1C 80240C2C 46800020 */ cvt.s.w $f0, $f0 -/* ED0C20 80240C30 46000021 */ cvt.d.s $f0, $f0 -/* ED0C24 80240C34 46220003 */ div.d $f0, $f0, $f2 -/* ED0C28 80240C38 46200020 */ cvt.s.d $f0, $f0 -/* ED0C2C 80240C3C 18400003 */ blez $v0, .L80240C4C -/* ED0C30 80240C40 4600C680 */ add.s $f26, $f24, $f0 -/* ED0C34 80240C44 2462FFFF */ addiu $v0, $v1, -1 -/* ED0C38 80240C48 A602008E */ sh $v0, 0x8e($s0) -.L80240C4C: -/* ED0C3C 80240C4C 8E220070 */ lw $v0, 0x70($s1) -/* ED0C40 80240C50 18400034 */ blez $v0, .L80240D24 -/* ED0C44 80240C54 00000000 */ nop -/* ED0C48 80240C58 C62C0074 */ lwc1 $f12, 0x74($s1) -/* ED0C4C 80240C5C 46806320 */ cvt.s.w $f12, $f12 -/* ED0C50 80240C60 44820000 */ mtc1 $v0, $f0 -/* ED0C54 80240C64 00000000 */ nop -/* ED0C58 80240C68 46800020 */ cvt.s.w $f0, $f0 -/* ED0C5C 80240C6C 46000021 */ cvt.d.s $f0, $f0 -/* ED0C60 80240C70 46220003 */ div.d $f0, $f0, $f2 -/* ED0C64 80240C74 0C00AD77 */ jal dead_sin_deg -/* ED0C68 80240C78 462005A0 */ cvt.s.d $f22, $f0 -/* ED0C6C 80240C7C 8E020000 */ lw $v0, ($s0) -/* ED0C70 80240C80 30420008 */ andi $v0, $v0, 8 -/* ED0C74 80240C84 10400003 */ beqz $v0, .L80240C94 -/* ED0C78 80240C88 46000506 */ mov.s $f20, $f0 -/* ED0C7C 80240C8C 08090335 */ j .L80240CD4 -/* ED0C80 80240C90 0000102D */ daddu $v0, $zero, $zero -.L80240C94: -/* ED0C84 80240C94 27A50028 */ addiu $a1, $sp, 0x28 -/* ED0C88 80240C98 27A6002C */ addiu $a2, $sp, 0x2c -/* ED0C8C 80240C9C C6000038 */ lwc1 $f0, 0x38($s0) -/* ED0C90 80240CA0 C602003C */ lwc1 $f2, 0x3c($s0) -/* ED0C94 80240CA4 C6040040 */ lwc1 $f4, 0x40($s0) -/* ED0C98 80240CA8 3C01447A */ lui $at, 0x447a -/* ED0C9C 80240CAC 44813000 */ mtc1 $at, $f6 -/* ED0CA0 80240CB0 27A20034 */ addiu $v0, $sp, 0x34 -/* ED0CA4 80240CB4 E7A00028 */ swc1 $f0, 0x28($sp) -/* ED0CA8 80240CB8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* ED0CAC 80240CBC E7A40030 */ swc1 $f4, 0x30($sp) -/* ED0CB0 80240CC0 E7A60034 */ swc1 $f6, 0x34($sp) -/* ED0CB4 80240CC4 AFA20010 */ sw $v0, 0x10($sp) -/* ED0CB8 80240CC8 8E040080 */ lw $a0, 0x80($s0) -/* ED0CBC 80240CCC 0C03908F */ jal dead_npc_raycast_down_sides -/* ED0CC0 80240CD0 27A70030 */ addiu $a3, $sp, 0x30 -.L80240CD4: -/* ED0CC4 80240CD4 10400007 */ beqz $v0, .L80240CF4 -/* ED0CC8 80240CD8 00000000 */ nop -/* ED0CCC 80240CDC 4616A082 */ mul.s $f2, $f20, $f22 -/* ED0CD0 80240CE0 00000000 */ nop -/* ED0CD4 80240CE4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* ED0CD8 80240CE8 46180000 */ add.s $f0, $f0, $f24 -/* ED0CDC 80240CEC 08090340 */ j .L80240D00 -/* ED0CE0 80240CF0 46020000 */ add.s $f0, $f0, $f2 -.L80240CF4: -/* ED0CE4 80240CF4 4616A002 */ mul.s $f0, $f20, $f22 -/* ED0CE8 80240CF8 00000000 */ nop -/* ED0CEC 80240CFC 4600D000 */ add.s $f0, $f26, $f0 -.L80240D00: -/* ED0CF0 80240D00 E600003C */ swc1 $f0, 0x3c($s0) -/* ED0CF4 80240D04 8E220074 */ lw $v0, 0x74($s1) -/* ED0CF8 80240D08 2442000A */ addiu $v0, $v0, 0xa -/* ED0CFC 80240D0C 44826000 */ mtc1 $v0, $f12 -/* ED0D00 80240D10 00000000 */ nop -/* ED0D04 80240D14 0C00AB85 */ jal dead_clamp_angle -/* ED0D08 80240D18 46806320 */ cvt.s.w $f12, $f12 -/* ED0D0C 80240D1C 4600020D */ trunc.w.s $f8, $f0 -/* ED0D10 80240D20 E6280074 */ swc1 $f8, 0x74($s1) -.L80240D24: -/* ED0D14 80240D24 8E220090 */ lw $v0, 0x90($s1) -/* ED0D18 80240D28 1C400040 */ bgtz $v0, .L80240E2C -/* ED0D1C 80240D2C 2442FFFF */ addiu $v0, $v0, -1 -/* ED0D20 80240D30 860200A8 */ lh $v0, 0xa8($s0) -/* ED0D24 80240D34 C600003C */ lwc1 $f0, 0x3c($s0) -/* ED0D28 80240D38 44821000 */ mtc1 $v0, $f2 -/* ED0D2C 80240D3C 00000000 */ nop -/* ED0D30 80240D40 468010A0 */ cvt.s.w $f2, $f2 -/* ED0D34 80240D44 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* ED0D38 80240D48 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* ED0D3C 80240D4C 46020000 */ add.s $f0, $f0, $f2 -/* ED0D40 80240D50 3C014024 */ lui $at, 0x4024 -/* ED0D44 80240D54 44812800 */ mtc1 $at, $f5 -/* ED0D48 80240D58 44802000 */ mtc1 $zero, $f4 -/* ED0D4C 80240D5C C442002C */ lwc1 $f2, 0x2c($v0) -/* ED0D50 80240D60 46000021 */ cvt.d.s $f0, $f0 -/* ED0D54 80240D64 46240000 */ add.d $f0, $f0, $f4 -/* ED0D58 80240D68 460010A1 */ cvt.d.s $f2, $f2 -/* ED0D5C 80240D6C 4620103C */ c.lt.d $f2, $f0 -/* ED0D60 80240D70 00000000 */ nop -/* ED0D64 80240D74 4500002E */ bc1f .L80240E30 -/* ED0D68 80240D78 0280202D */ daddu $a0, $s4, $zero -/* ED0D6C 80240D7C 24020001 */ addiu $v0, $zero, 1 -/* ED0D70 80240D80 AFA20010 */ sw $v0, 0x10($sp) -/* ED0D74 80240D84 8E460024 */ lw $a2, 0x24($s2) -/* ED0D78 80240D88 8E470028 */ lw $a3, 0x28($s2) -/* ED0D7C 80240D8C 0C013469 */ jal func_8004D1A4 -/* ED0D80 80240D90 0220282D */ daddu $a1, $s1, $zero -/* ED0D84 80240D94 10400026 */ beqz $v0, .L80240E30 -/* ED0D88 80240D98 0000202D */ daddu $a0, $zero, $zero -/* ED0D8C 80240D9C 0200282D */ daddu $a1, $s0, $zero -/* ED0D90 80240DA0 0000302D */ daddu $a2, $zero, $zero -/* ED0D94 80240DA4 2412000C */ addiu $s2, $zero, 0xc -/* ED0D98 80240DA8 860300A8 */ lh $v1, 0xa8($s0) -/* ED0D9C 80240DAC 3C013F80 */ lui $at, 0x3f80 -/* ED0DA0 80240DB0 44810000 */ mtc1 $at, $f0 -/* ED0DA4 80240DB4 3C014000 */ lui $at, 0x4000 -/* ED0DA8 80240DB8 44811000 */ mtc1 $at, $f2 -/* ED0DAC 80240DBC 3C01C1A0 */ lui $at, 0xc1a0 -/* ED0DB0 80240DC0 44812000 */ mtc1 $at, $f4 -/* ED0DB4 80240DC4 44834000 */ mtc1 $v1, $f8 -/* ED0DB8 80240DC8 00000000 */ nop -/* ED0DBC 80240DCC 46804220 */ cvt.s.w $f8, $f8 -/* ED0DC0 80240DD0 44074000 */ mfc1 $a3, $f8 -/* ED0DC4 80240DD4 27A20038 */ addiu $v0, $sp, 0x38 -/* ED0DC8 80240DD8 AFB2001C */ sw $s2, 0x1c($sp) -/* ED0DCC 80240DDC AFA20020 */ sw $v0, 0x20($sp) -/* ED0DD0 80240DE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* ED0DD4 80240DE4 E7A20014 */ swc1 $f2, 0x14($sp) -/* ED0DD8 80240DE8 0C01D444 */ jal dead_fx_emote -/* ED0DDC 80240DEC E7A40018 */ swc1 $f4, 0x18($sp) -/* ED0DE0 80240DF0 0200202D */ daddu $a0, $s0, $zero -/* ED0DE4 80240DF4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* ED0DE8 80240DF8 C480003C */ lwc1 $f0, 0x3c($a0) -/* ED0DEC 80240DFC 3C060020 */ lui $a2, 0x20 -/* ED0DF0 80240E00 0C013600 */ jal dead_ai_enemy_play_sound -/* ED0DF4 80240E04 E4800064 */ swc1 $f0, 0x64($a0) -/* ED0DF8 80240E08 8E220018 */ lw $v0, 0x18($s1) -/* ED0DFC 80240E0C 9442002A */ lhu $v0, 0x2a($v0) -/* ED0E00 80240E10 30420001 */ andi $v0, $v0, 1 -/* ED0E04 80240E14 10400003 */ beqz $v0, .L80240E24 -/* ED0E08 80240E18 2402000A */ addiu $v0, $zero, 0xa -/* ED0E0C 80240E1C 080903B3 */ j .L80240ECC -/* ED0E10 80240E20 AE620070 */ sw $v0, 0x70($s3) -.L80240E24: -/* ED0E14 80240E24 080903B3 */ j .L80240ECC -/* ED0E18 80240E28 AE720070 */ sw $s2, 0x70($s3) -.L80240E2C: -/* ED0E1C 80240E2C AE220090 */ sw $v0, 0x90($s1) -.L80240E30: -/* ED0E20 80240E30 8602008C */ lh $v0, 0x8c($s0) -/* ED0E24 80240E34 14400025 */ bnez $v0, .L80240ECC -/* ED0E28 80240E38 00000000 */ nop -/* ED0E2C 80240E3C 8602008E */ lh $v0, 0x8e($s0) -/* ED0E30 80240E40 1C400022 */ bgtz $v0, .L80240ECC -/* ED0E34 80240E44 00000000 */ nop -/* ED0E38 80240E48 8E620074 */ lw $v0, 0x74($s3) -/* ED0E3C 80240E4C 2442FFFF */ addiu $v0, $v0, -1 -/* ED0E40 80240E50 1840001D */ blez $v0, .L80240EC8 -/* ED0E44 80240E54 AE620074 */ sw $v0, 0x74($s3) -/* ED0E48 80240E58 8E220018 */ lw $v0, 0x18($s1) -/* ED0E4C 80240E5C 9442002A */ lhu $v0, 0x2a($v0) -/* ED0E50 80240E60 30420010 */ andi $v0, $v0, 0x10 -/* ED0E54 80240E64 14400007 */ bnez $v0, .L80240E84 -/* ED0E58 80240E68 00000000 */ nop -/* ED0E5C 80240E6C C600000C */ lwc1 $f0, 0xc($s0) -/* ED0E60 80240E70 3C014334 */ lui $at, 0x4334 -/* ED0E64 80240E74 44816000 */ mtc1 $at, $f12 -/* ED0E68 80240E78 0C00AB85 */ jal dead_clamp_angle -/* ED0E6C 80240E7C 460C0300 */ add.s $f12, $f0, $f12 -/* ED0E70 80240E80 E600000C */ swc1 $f0, 0xc($s0) -.L80240E84: -/* ED0E74 80240E84 0C00AB3B */ jal dead_rand_int -/* ED0E78 80240E88 240403E8 */ addiu $a0, $zero, 0x3e8 -/* ED0E7C 80240E8C 3C032E8B */ lui $v1, 0x2e8b -/* ED0E80 80240E90 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* ED0E84 80240E94 00430018 */ mult $v0, $v1 -/* ED0E88 80240E98 00021FC3 */ sra $v1, $v0, 0x1f -/* ED0E8C 80240E9C 00004010 */ mfhi $t0 -/* ED0E90 80240EA0 00082043 */ sra $a0, $t0, 1 -/* ED0E94 80240EA4 00832023 */ subu $a0, $a0, $v1 -/* ED0E98 80240EA8 00041840 */ sll $v1, $a0, 1 -/* ED0E9C 80240EAC 00641821 */ addu $v1, $v1, $a0 -/* ED0EA0 80240EB0 00031880 */ sll $v1, $v1, 2 -/* ED0EA4 80240EB4 00641823 */ subu $v1, $v1, $a0 -/* ED0EA8 80240EB8 00431023 */ subu $v0, $v0, $v1 -/* ED0EAC 80240EBC 24420005 */ addiu $v0, $v0, 5 -/* ED0EB0 80240EC0 080903B3 */ j .L80240ECC -/* ED0EB4 80240EC4 A602008E */ sh $v0, 0x8e($s0) -.L80240EC8: -/* ED0EB8 80240EC8 AE600070 */ sw $zero, 0x70($s3) -.L80240ECC: -/* ED0EBC 80240ECC 8FBF0054 */ lw $ra, 0x54($sp) -/* ED0EC0 80240ED0 8FB40050 */ lw $s4, 0x50($sp) -/* ED0EC4 80240ED4 8FB3004C */ lw $s3, 0x4c($sp) -/* ED0EC8 80240ED8 8FB20048 */ lw $s2, 0x48($sp) -/* ED0ECC 80240EDC 8FB10044 */ lw $s1, 0x44($sp) -/* ED0ED0 80240EE0 8FB00040 */ lw $s0, 0x40($sp) -/* ED0ED4 80240EE4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* ED0ED8 80240EE8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* ED0EDC 80240EEC D7B60060 */ ldc1 $f22, 0x60($sp) -/* ED0EE0 80240EF0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* ED0EE4 80240EF4 03E00008 */ jr $ra -/* ED0EE8 80240EF8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/ED0310/func_80240EFC_ED0EEC.s b/ver/us/asm/nonmatchings/ED0310/func_80240EFC_ED0EEC.s deleted file mode 100644 index 6c29e02263..0000000000 --- a/ver/us/asm/nonmatchings/ED0310/func_80240EFC_ED0EEC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EFC_ED0EEC -/* ED0EEC 80240EFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ED0EF0 80240F00 AFB20018 */ sw $s2, 0x18($sp) -/* ED0EF4 80240F04 0080902D */ daddu $s2, $a0, $zero -/* ED0EF8 80240F08 AFBF001C */ sw $ra, 0x1c($sp) -/* ED0EFC 80240F0C AFB10014 */ sw $s1, 0x14($sp) -/* ED0F00 80240F10 AFB00010 */ sw $s0, 0x10($sp) -/* ED0F04 80240F14 8E510148 */ lw $s1, 0x148($s2) -/* ED0F08 80240F18 0C00F92F */ jal dead_get_npc_unsafe -/* ED0F0C 80240F1C 86240008 */ lh $a0, 8($s1) -/* ED0F10 80240F20 0040802D */ daddu $s0, $v0, $zero -/* ED0F14 80240F24 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* ED0F18 80240F28 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* ED0F1C 80240F2C C60C0038 */ lwc1 $f12, 0x38($s0) -/* ED0F20 80240F30 C60E0040 */ lwc1 $f14, 0x40($s0) -/* ED0F24 80240F34 A600008E */ sh $zero, 0x8e($s0) -/* ED0F28 80240F38 8C460028 */ lw $a2, 0x28($v0) -/* ED0F2C 80240F3C 0C00ABDC */ jal fio_validate_header_checksums -/* ED0F30 80240F40 8C470030 */ lw $a3, 0x30($v0) -/* ED0F34 80240F44 E600000C */ swc1 $f0, 0xc($s0) -/* ED0F38 80240F48 8E2200CC */ lw $v0, 0xcc($s1) -/* ED0F3C 80240F4C 8C420020 */ lw $v0, 0x20($v0) -/* ED0F40 80240F50 AE020028 */ sw $v0, 0x28($s0) -/* ED0F44 80240F54 2402000B */ addiu $v0, $zero, 0xb -/* ED0F48 80240F58 AE420070 */ sw $v0, 0x70($s2) -/* ED0F4C 80240F5C 8FBF001C */ lw $ra, 0x1c($sp) -/* ED0F50 80240F60 8FB20018 */ lw $s2, 0x18($sp) -/* ED0F54 80240F64 8FB10014 */ lw $s1, 0x14($sp) -/* ED0F58 80240F68 8FB00010 */ lw $s0, 0x10($sp) -/* ED0F5C 80240F6C 03E00008 */ jr $ra -/* ED0F60 80240F70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/ED0310/func_80240F74_ED0F64.s b/ver/us/asm/nonmatchings/ED0310/func_80240F74_ED0F64.s deleted file mode 100644 index a255917120..0000000000 --- a/ver/us/asm/nonmatchings/ED0310/func_80240F74_ED0F64.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F74_ED0F64 -/* ED0F64 80240F74 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ED0F68 80240F78 AFB00010 */ sw $s0, 0x10($sp) -/* ED0F6C 80240F7C 0080802D */ daddu $s0, $a0, $zero -/* ED0F70 80240F80 AFBF0014 */ sw $ra, 0x14($sp) -/* ED0F74 80240F84 8E020148 */ lw $v0, 0x148($s0) -/* ED0F78 80240F88 0C00F92F */ jal dead_get_npc_unsafe -/* ED0F7C 80240F8C 84440008 */ lh $a0, 8($v0) -/* ED0F80 80240F90 9443008E */ lhu $v1, 0x8e($v0) -/* ED0F84 80240F94 C440003C */ lwc1 $f0, 0x3c($v0) -/* ED0F88 80240F98 24640001 */ addiu $a0, $v1, 1 -/* ED0F8C 80240F9C 00031C00 */ sll $v1, $v1, 0x10 -/* ED0F90 80240FA0 00031B83 */ sra $v1, $v1, 0xe -/* ED0F94 80240FA4 A444008E */ sh $a0, 0x8e($v0) -/* ED0F98 80240FA8 3C018024 */ lui $at, %hi(D_8024365C_ED364C) -/* ED0F9C 80240FAC 00230821 */ addu $at, $at, $v1 -/* ED0FA0 80240FB0 C422365C */ lwc1 $f2, %lo(D_8024365C_ED364C)($at) -/* ED0FA4 80240FB4 8443008E */ lh $v1, 0x8e($v0) -/* ED0FA8 80240FB8 46020000 */ add.s $f0, $f0, $f2 -/* ED0FAC 80240FBC 28630005 */ slti $v1, $v1, 5 -/* ED0FB0 80240FC0 14600003 */ bnez $v1, .L80240FD0 -/* ED0FB4 80240FC4 E440003C */ swc1 $f0, 0x3c($v0) -/* ED0FB8 80240FC8 2402000C */ addiu $v0, $zero, 0xc -/* ED0FBC 80240FCC AE020070 */ sw $v0, 0x70($s0) -.L80240FD0: -/* ED0FC0 80240FD0 8FBF0014 */ lw $ra, 0x14($sp) -/* ED0FC4 80240FD4 8FB00010 */ lw $s0, 0x10($sp) -/* ED0FC8 80240FD8 03E00008 */ jr $ra -/* ED0FCC 80240FDC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/ED0310/func_80241114_ED1104.s b/ver/us/asm/nonmatchings/ED0310/func_80241114_ED1104.s deleted file mode 100644 index 2ea610516a..0000000000 --- a/ver/us/asm/nonmatchings/ED0310/func_80241114_ED1104.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241114_ED1104 -/* ED1104 80241114 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ED1108 80241118 AFB00010 */ sw $s0, 0x10($sp) -/* ED110C 8024111C 0080802D */ daddu $s0, $a0, $zero -/* ED1110 80241120 AFBF0014 */ sw $ra, 0x14($sp) -/* ED1114 80241124 8E020148 */ lw $v0, 0x148($s0) -/* ED1118 80241128 0C00F92F */ jal dead_get_npc_unsafe -/* ED111C 8024112C 84440008 */ lh $a0, 8($v0) -/* ED1120 80241130 0040202D */ daddu $a0, $v0, $zero -/* ED1124 80241134 8482008E */ lh $v0, 0x8e($a0) -/* ED1128 80241138 9483008E */ lhu $v1, 0x8e($a0) -/* ED112C 8024113C 18400005 */ blez $v0, .L80241154 -/* ED1130 80241140 2462FFFF */ addiu $v0, $v1, -1 -/* ED1134 80241144 A482008E */ sh $v0, 0x8e($a0) -/* ED1138 80241148 00021400 */ sll $v0, $v0, 0x10 -/* ED113C 8024114C 1C400006 */ bgtz $v0, .L80241168 -/* ED1140 80241150 00000000 */ nop -.L80241154: -/* ED1144 80241154 8482008C */ lh $v0, 0x8c($a0) -/* ED1148 80241158 14400003 */ bnez $v0, .L80241168 -/* ED114C 8024115C 2402000E */ addiu $v0, $zero, 0xe -/* ED1150 80241160 A480008E */ sh $zero, 0x8e($a0) -/* ED1154 80241164 AE020070 */ sw $v0, 0x70($s0) -.L80241168: -/* ED1158 80241168 8FBF0014 */ lw $ra, 0x14($sp) -/* ED115C 8024116C 8FB00010 */ lw $s0, 0x10($sp) -/* ED1160 80241170 03E00008 */ jr $ra -/* ED1164 80241174 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/ED0310/func_80241178_ED1168.s b/ver/us/asm/nonmatchings/ED0310/func_80241178_ED1168.s deleted file mode 100644 index fb8eba9ba0..0000000000 --- a/ver/us/asm/nonmatchings/ED0310/func_80241178_ED1168.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241178_ED1168 -/* ED1168 80241178 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* ED116C 8024117C AFB20030 */ sw $s2, 0x30($sp) -/* ED1170 80241180 0080902D */ daddu $s2, $a0, $zero -/* ED1174 80241184 AFBF0038 */ sw $ra, 0x38($sp) -/* ED1178 80241188 AFB30034 */ sw $s3, 0x34($sp) -/* ED117C 8024118C AFB1002C */ sw $s1, 0x2c($sp) -/* ED1180 80241190 AFB00028 */ sw $s0, 0x28($sp) -/* ED1184 80241194 F7B60048 */ sdc1 $f22, 0x48($sp) -/* ED1188 80241198 F7B40040 */ sdc1 $f20, 0x40($sp) -/* ED118C 8024119C 8E510148 */ lw $s1, 0x148($s2) -/* ED1190 802411A0 86240008 */ lh $a0, 8($s1) -/* ED1194 802411A4 0C00F92F */ jal dead_get_npc_unsafe -/* ED1198 802411A8 00A0982D */ daddu $s3, $a1, $zero -/* ED119C 802411AC 0040802D */ daddu $s0, $v0, $zero -/* ED11A0 802411B0 0200202D */ daddu $a0, $s0, $zero -/* ED11A4 802411B4 C6220088 */ lwc1 $f2, 0x88($s1) -/* ED11A8 802411B8 468010A0 */ cvt.s.w $f2, $f2 -/* ED11AC 802411BC 460010A1 */ cvt.d.s $f2, $f2 -/* ED11B0 802411C0 C604001C */ lwc1 $f4, 0x1c($s0) -/* ED11B4 802411C4 C6000014 */ lwc1 $f0, 0x14($s0) -/* ED11B8 802411C8 8E050018 */ lw $a1, 0x18($s0) -/* ED11BC 802411CC 46002100 */ add.s $f4, $f4, $f0 -/* ED11C0 802411D0 8E06000C */ lw $a2, 0xc($s0) -/* ED11C4 802411D4 C6200078 */ lwc1 $f0, 0x78($s1) -/* ED11C8 802411D8 46800020 */ cvt.s.w $f0, $f0 -/* ED11CC 802411DC E604001C */ swc1 $f4, 0x1c($s0) -/* ED11D0 802411E0 3C014059 */ lui $at, 0x4059 -/* ED11D4 802411E4 44812800 */ mtc1 $at, $f5 -/* ED11D8 802411E8 44802000 */ mtc1 $zero, $f4 -/* ED11DC 802411EC 46000021 */ cvt.d.s $f0, $f0 -/* ED11E0 802411F0 46240003 */ div.d $f0, $f0, $f4 -/* ED11E4 802411F4 46200520 */ cvt.s.d $f20, $f0 -/* ED11E8 802411F8 46241083 */ div.d $f2, $f2, $f4 -/* ED11EC 802411FC 0C00F909 */ jal dead_npc_move_heading -/* ED11F0 80241200 462015A0 */ cvt.s.d $f22, $f2 -/* ED11F4 80241204 C604001C */ lwc1 $f4, 0x1c($s0) -/* ED11F8 80241208 44801000 */ mtc1 $zero, $f2 -/* ED11FC 8024120C 44801800 */ mtc1 $zero, $f3 -/* ED1200 80241210 46002021 */ cvt.d.s $f0, $f4 -/* ED1204 80241214 4620103E */ c.le.d $f2, $f0 -/* ED1208 80241218 00000000 */ nop -/* ED120C 8024121C 45000030 */ bc1f .L802412E0 -/* ED1210 80241220 00000000 */ nop -/* ED1214 80241224 C600003C */ lwc1 $f0, 0x3c($s0) -/* ED1218 80241228 46040000 */ add.s $f0, $f0, $f4 -/* ED121C 8024122C E600003C */ swc1 $f0, 0x3c($s0) -/* ED1220 80241230 8E2200CC */ lw $v0, 0xcc($s1) -/* ED1224 80241234 8C420024 */ lw $v0, 0x24($v0) -/* ED1228 80241238 AE020028 */ sw $v0, 0x28($s0) -/* ED122C 8024123C A2200007 */ sb $zero, 7($s1) -/* ED1230 80241240 8E020000 */ lw $v0, ($s0) -/* ED1234 80241244 30420008 */ andi $v0, $v0, 8 -/* ED1238 80241248 14400011 */ bnez $v0, .L80241290 -/* ED123C 8024124C 0000102D */ daddu $v0, $zero, $zero -/* ED1240 80241250 27A50018 */ addiu $a1, $sp, 0x18 -/* ED1244 80241254 27A6001C */ addiu $a2, $sp, 0x1c -/* ED1248 80241258 C6000038 */ lwc1 $f0, 0x38($s0) -/* ED124C 8024125C C602003C */ lwc1 $f2, 0x3c($s0) -/* ED1250 80241260 C6040040 */ lwc1 $f4, 0x40($s0) -/* ED1254 80241264 3C01447A */ lui $at, 0x447a -/* ED1258 80241268 44813000 */ mtc1 $at, $f6 -/* ED125C 8024126C 27A20024 */ addiu $v0, $sp, 0x24 -/* ED1260 80241270 E7A00018 */ swc1 $f0, 0x18($sp) -/* ED1264 80241274 E7A2001C */ swc1 $f2, 0x1c($sp) -/* ED1268 80241278 E7A40020 */ swc1 $f4, 0x20($sp) -/* ED126C 8024127C E7A60024 */ swc1 $f6, 0x24($sp) -/* ED1270 80241280 AFA20010 */ sw $v0, 0x10($sp) -/* ED1274 80241284 8E040080 */ lw $a0, 0x80($s0) -/* ED1278 80241288 0C03908F */ jal dead_npc_raycast_down_sides -/* ED127C 8024128C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241290: -/* ED1280 80241290 1040000B */ beqz $v0, .L802412C0 -/* ED1284 80241294 00000000 */ nop -/* ED1288 80241298 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* ED128C 8024129C 46140080 */ add.s $f2, $f0, $f20 -/* ED1290 802412A0 C600003C */ lwc1 $f0, 0x3c($s0) -/* ED1294 802412A4 4600103E */ c.le.s $f2, $f0 -/* ED1298 802412A8 00000000 */ nop -/* ED129C 802412AC 4500008D */ bc1f .L802414E4 -/* ED12A0 802412B0 00000000 */ nop -/* ED12A4 802412B4 E602003C */ swc1 $f2, 0x3c($s0) -/* ED12A8 802412B8 08090539 */ j .L802414E4 -/* ED12AC 802412BC AE400070 */ sw $zero, 0x70($s2) -.L802412C0: -/* ED12B0 802412C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* ED12B4 802412C4 C6000064 */ lwc1 $f0, 0x64($s0) -/* ED12B8 802412C8 4602003E */ c.le.s $f0, $f2 -/* ED12BC 802412CC 00000000 */ nop -/* ED12C0 802412D0 45030084 */ bc1tl .L802414E4 -/* ED12C4 802412D4 AE400070 */ sw $zero, 0x70($s2) -/* ED12C8 802412D8 08090539 */ j .L802414E4 -/* ED12CC 802412DC 00000000 */ nop -.L802412E0: -/* ED12D0 802412E0 4622003C */ c.lt.d $f0, $f2 -/* ED12D4 802412E4 00000000 */ nop -/* ED12D8 802412E8 4500007E */ bc1f .L802414E4 -/* ED12DC 802412EC 00000000 */ nop -/* ED12E0 802412F0 9602008E */ lhu $v0, 0x8e($s0) -/* ED12E4 802412F4 24420001 */ addiu $v0, $v0, 1 -/* ED12E8 802412F8 A602008E */ sh $v0, 0x8e($s0) -/* ED12EC 802412FC 00021400 */ sll $v0, $v0, 0x10 -/* ED12F0 80241300 8E630020 */ lw $v1, 0x20($s3) -/* ED12F4 80241304 00021403 */ sra $v0, $v0, 0x10 -/* ED12F8 80241308 0043102A */ slt $v0, $v0, $v1 -/* ED12FC 8024130C 14400026 */ bnez $v0, .L802413A8 -/* ED1300 80241310 00000000 */ nop -/* ED1304 80241314 C60C0038 */ lwc1 $f12, 0x38($s0) -/* ED1308 80241318 C60E0040 */ lwc1 $f14, 0x40($s0) -/* ED130C 8024131C 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* ED1310 80241320 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* ED1314 80241324 A600008E */ sh $zero, 0x8e($s0) -/* ED1318 80241328 8C460028 */ lw $a2, 0x28($v0) -/* ED131C 8024132C 0C00ABDC */ jal fio_validate_header_checksums -/* ED1320 80241330 8C470030 */ lw $a3, 0x30($v0) -/* ED1324 80241334 46000506 */ mov.s $f20, $f0 -/* ED1328 80241338 C60C000C */ lwc1 $f12, 0xc($s0) -/* ED132C 8024133C 0C00ABC6 */ jal dead_get_clamped_angle_diff -/* ED1330 80241340 4600A386 */ mov.s $f14, $f20 -/* ED1334 80241344 46000086 */ mov.s $f2, $f0 -/* ED1338 80241348 8E62001C */ lw $v0, 0x1c($s3) -/* ED133C 8024134C 46001005 */ abs.s $f0, $f2 -/* ED1340 80241350 44822000 */ mtc1 $v0, $f4 -/* ED1344 80241354 00000000 */ nop -/* ED1348 80241358 46802120 */ cvt.s.w $f4, $f4 -/* ED134C 8024135C 4600203C */ c.lt.s $f4, $f0 -/* ED1350 80241360 00000000 */ nop -/* ED1354 80241364 4500000D */ bc1f .L8024139C -/* ED1358 80241368 00000000 */ nop -/* ED135C 8024136C 44800000 */ mtc1 $zero, $f0 -/* ED1360 80241370 C614000C */ lwc1 $f20, 0xc($s0) -/* ED1364 80241374 4600103C */ c.lt.s $f2, $f0 -/* ED1368 80241378 00000000 */ nop -/* ED136C 8024137C 45000006 */ bc1f .L80241398 -/* ED1370 80241380 00021023 */ negu $v0, $v0 -/* ED1374 80241384 44820000 */ mtc1 $v0, $f0 -/* ED1378 80241388 00000000 */ nop -/* ED137C 8024138C 46800020 */ cvt.s.w $f0, $f0 -/* ED1380 80241390 080904E7 */ j .L8024139C -/* ED1384 80241394 4600A500 */ add.s $f20, $f20, $f0 -.L80241398: -/* ED1388 80241398 4604A500 */ add.s $f20, $f20, $f4 -.L8024139C: -/* ED138C 8024139C 0C00AB85 */ jal dead_clamp_angle -/* ED1390 802413A0 4600A306 */ mov.s $f12, $f20 -/* ED1394 802413A4 E600000C */ swc1 $f0, 0xc($s0) -.L802413A8: -/* ED1398 802413A8 8E020000 */ lw $v0, ($s0) -/* ED139C 802413AC 30420008 */ andi $v0, $v0, 8 -/* ED13A0 802413B0 1040000A */ beqz $v0, .L802413DC -/* ED13A4 802413B4 27A50018 */ addiu $a1, $sp, 0x18 -/* ED13A8 802413B8 C602003C */ lwc1 $f2, 0x3c($s0) -/* ED13AC 802413BC C600001C */ lwc1 $f0, 0x1c($s0) -/* ED13B0 802413C0 46001080 */ add.s $f2, $f2, $f0 -/* ED13B4 802413C4 4616103C */ c.lt.s $f2, $f22 -/* ED13B8 802413C8 00000000 */ nop -/* ED13BC 802413CC 45020045 */ bc1fl .L802414E4 -/* ED13C0 802413D0 E602003C */ swc1 $f2, 0x3c($s0) -/* ED13C4 802413D4 08090538 */ j .L802414E0 -/* ED13C8 802413D8 E616003C */ swc1 $f22, 0x3c($s0) -.L802413DC: -/* ED13CC 802413DC C6000038 */ lwc1 $f0, 0x38($s0) -/* ED13D0 802413E0 27A6001C */ addiu $a2, $sp, 0x1c -/* ED13D4 802413E4 E7A00018 */ swc1 $f0, 0x18($sp) -/* ED13D8 802413E8 860200A8 */ lh $v0, 0xa8($s0) -/* ED13DC 802413EC C600001C */ lwc1 $f0, 0x1c($s0) -/* ED13E0 802413F0 C604003C */ lwc1 $f4, 0x3c($s0) -/* ED13E4 802413F4 44821000 */ mtc1 $v0, $f2 -/* ED13E8 802413F8 00000000 */ nop -/* ED13EC 802413FC 468010A0 */ cvt.s.w $f2, $f2 -/* ED13F0 80241400 46000005 */ abs.s $f0, $f0 -/* ED13F4 80241404 46020000 */ add.s $f0, $f0, $f2 -/* ED13F8 80241408 C6060040 */ lwc1 $f6, 0x40($s0) -/* ED13FC 8024140C 27A20024 */ addiu $v0, $sp, 0x24 -/* ED1400 80241410 46022100 */ add.s $f4, $f4, $f2 -/* ED1404 80241414 3C014024 */ lui $at, 0x4024 -/* ED1408 80241418 44811800 */ mtc1 $at, $f3 -/* ED140C 8024141C 44801000 */ mtc1 $zero, $f2 -/* ED1410 80241420 46000021 */ cvt.d.s $f0, $f0 -/* ED1414 80241424 46220000 */ add.d $f0, $f0, $f2 -/* ED1418 80241428 E7A60020 */ swc1 $f6, 0x20($sp) -/* ED141C 8024142C E7A4001C */ swc1 $f4, 0x1c($sp) -/* ED1420 80241430 46200020 */ cvt.s.d $f0, $f0 -/* ED1424 80241434 E7A00024 */ swc1 $f0, 0x24($sp) -/* ED1428 80241438 AFA20010 */ sw $v0, 0x10($sp) -/* ED142C 8024143C 8E040080 */ lw $a0, 0x80($s0) -/* ED1430 80241440 0C03908F */ jal dead_npc_raycast_down_sides -/* ED1434 80241444 27A70020 */ addiu $a3, $sp, 0x20 -/* ED1438 80241448 10400015 */ beqz $v0, .L802414A0 -/* ED143C 8024144C 00000000 */ nop -/* ED1440 80241450 860200A8 */ lh $v0, 0xa8($s0) -/* ED1444 80241454 C604001C */ lwc1 $f4, 0x1c($s0) -/* ED1448 80241458 44820000 */ mtc1 $v0, $f0 -/* ED144C 8024145C 00000000 */ nop -/* ED1450 80241460 46800020 */ cvt.s.w $f0, $f0 -/* ED1454 80241464 46002085 */ abs.s $f2, $f4 -/* ED1458 80241468 46020000 */ add.s $f0, $f0, $f2 -/* ED145C 8024146C C7A20024 */ lwc1 $f2, 0x24($sp) -/* ED1460 80241470 4600103E */ c.le.s $f2, $f0 -/* ED1464 80241474 00000000 */ nop -/* ED1468 80241478 45000005 */ bc1f .L80241490 -/* ED146C 8024147C 00000000 */ nop -/* ED1470 80241480 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* ED1474 80241484 AE00001C */ sw $zero, 0x1c($s0) -/* ED1478 80241488 08090539 */ j .L802414E4 -/* ED147C 8024148C E600003C */ swc1 $f0, 0x3c($s0) -.L80241490: -/* ED1480 80241490 C600003C */ lwc1 $f0, 0x3c($s0) -/* ED1484 80241494 46040000 */ add.s $f0, $f0, $f4 -/* ED1488 80241498 08090539 */ j .L802414E4 -/* ED148C 8024149C E600003C */ swc1 $f0, 0x3c($s0) -.L802414A0: -/* ED1490 802414A0 C606003C */ lwc1 $f6, 0x3c($s0) -/* ED1494 802414A4 860200A8 */ lh $v0, 0xa8($s0) -/* ED1498 802414A8 46163081 */ sub.s $f2, $f6, $f22 -/* ED149C 802414AC 44820000 */ mtc1 $v0, $f0 -/* ED14A0 802414B0 00000000 */ nop -/* ED14A4 802414B4 46800020 */ cvt.s.w $f0, $f0 -/* ED14A8 802414B8 46001080 */ add.s $f2, $f2, $f0 -/* ED14AC 802414BC C604001C */ lwc1 $f4, 0x1c($s0) -/* ED14B0 802414C0 46002005 */ abs.s $f0, $f4 -/* ED14B4 802414C4 4602003C */ c.lt.s $f0, $f2 -/* ED14B8 802414C8 00000000 */ nop -/* ED14BC 802414CC 45020005 */ bc1fl .L802414E4 -/* ED14C0 802414D0 AE00001C */ sw $zero, 0x1c($s0) -/* ED14C4 802414D4 46043000 */ add.s $f0, $f6, $f4 -/* ED14C8 802414D8 08090539 */ j .L802414E4 -/* ED14CC 802414DC E600003C */ swc1 $f0, 0x3c($s0) -.L802414E0: -/* ED14D0 802414E0 AE00001C */ sw $zero, 0x1c($s0) -.L802414E4: -/* ED14D4 802414E4 8FBF0038 */ lw $ra, 0x38($sp) -/* ED14D8 802414E8 8FB30034 */ lw $s3, 0x34($sp) -/* ED14DC 802414EC 8FB20030 */ lw $s2, 0x30($sp) -/* ED14E0 802414F0 8FB1002C */ lw $s1, 0x2c($sp) -/* ED14E4 802414F4 8FB00028 */ lw $s0, 0x28($sp) -/* ED14E8 802414F8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* ED14EC 802414FC D7B40040 */ ldc1 $f20, 0x40($sp) -/* ED14F0 80241500 03E00008 */ jr $ra -/* ED14F4 80241504 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/ED0310/func_80241508_ED14F8.s b/ver/us/asm/nonmatchings/ED0310/func_80241508_ED14F8.s deleted file mode 100644 index ad564cd4b0..0000000000 --- a/ver/us/asm/nonmatchings/ED0310/func_80241508_ED14F8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241508_ED14F8 -/* ED14F8 80241508 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* ED14FC 8024150C AFB00028 */ sw $s0, 0x28($sp) -/* ED1500 80241510 00A0802D */ daddu $s0, $a1, $zero -/* ED1504 80241514 AFB1002C */ sw $s1, 0x2c($sp) -/* ED1508 80241518 00C0882D */ daddu $s1, $a2, $zero -/* ED150C 8024151C AFBF0034 */ sw $ra, 0x34($sp) -/* ED1510 80241520 AFB20030 */ sw $s2, 0x30($sp) -/* ED1514 80241524 AE200070 */ sw $zero, 0x70($s1) -/* ED1518 80241528 8C830000 */ lw $v1, ($a0) -/* ED151C 8024152C 2402FDFF */ addiu $v0, $zero, -0x201 -/* ED1520 80241530 A480008E */ sh $zero, 0x8e($a0) -/* ED1524 80241534 00621824 */ and $v1, $v1, $v0 -/* ED1528 80241538 34650800 */ ori $a1, $v1, 0x800 -/* ED152C 8024153C AC850000 */ sw $a1, ($a0) -/* ED1530 80241540 8E0200D0 */ lw $v0, 0xd0($s0) -/* ED1534 80241544 8C420034 */ lw $v0, 0x34($v0) -/* ED1538 80241548 10400003 */ beqz $v0, .L80241558 -/* ED153C 8024154C 00E0902D */ daddu $s2, $a3, $zero -/* ED1540 80241550 08090558 */ j .L80241560 -/* ED1544 80241554 34620808 */ ori $v0, $v1, 0x808 -.L80241558: -/* ED1548 80241558 2402FFF7 */ addiu $v0, $zero, -9 -/* ED154C 8024155C 00A21024 */ and $v0, $a1, $v0 -.L80241560: -/* ED1550 80241560 AC820000 */ sw $v0, ($a0) -/* ED1554 80241564 27A20024 */ addiu $v0, $sp, 0x24 -/* ED1558 80241568 27A50018 */ addiu $a1, $sp, 0x18 -/* ED155C 8024156C C4800038 */ lwc1 $f0, 0x38($a0) -/* ED1560 80241570 C482003C */ lwc1 $f2, 0x3c($a0) -/* ED1564 80241574 C4840040 */ lwc1 $f4, 0x40($a0) -/* ED1568 80241578 3C01447A */ lui $at, 0x447a -/* ED156C 8024157C 44813000 */ mtc1 $at, $f6 -/* ED1570 80241580 27A6001C */ addiu $a2, $sp, 0x1c -/* ED1574 80241584 E7A00018 */ swc1 $f0, 0x18($sp) -/* ED1578 80241588 E7A2001C */ swc1 $f2, 0x1c($sp) -/* ED157C 8024158C E7A40020 */ swc1 $f4, 0x20($sp) -/* ED1580 80241590 E7A60024 */ swc1 $f6, 0x24($sp) -/* ED1584 80241594 AFA20010 */ sw $v0, 0x10($sp) -/* ED1588 80241598 8C840080 */ lw $a0, 0x80($a0) -/* ED158C 8024159C 0C03908F */ jal dead_npc_raycast_down_sides -/* ED1590 802415A0 27A70020 */ addiu $a3, $sp, 0x20 -/* ED1594 802415A4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* ED1598 802415A8 3C014059 */ lui $at, 0x4059 -/* ED159C 802415AC 44812800 */ mtc1 $at, $f5 -/* ED15A0 802415B0 44802000 */ mtc1 $zero, $f4 -/* ED15A4 802415B4 460010A1 */ cvt.d.s $f2, $f2 -/* ED15A8 802415B8 46241082 */ mul.d $f2, $f2, $f4 -/* ED15AC 802415BC 00000000 */ nop -/* ED15B0 802415C0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* ED15B4 802415C4 46000021 */ cvt.d.s $f0, $f0 -/* ED15B8 802415C8 46240002 */ mul.d $f0, $f0, $f4 -/* ED15BC 802415CC 00000000 */ nop -/* ED15C0 802415D0 3C013FE0 */ lui $at, 0x3fe0 -/* ED15C4 802415D4 44812800 */ mtc1 $at, $f5 -/* ED15C8 802415D8 44802000 */ mtc1 $zero, $f4 -/* ED15CC 802415DC 00000000 */ nop -/* ED15D0 802415E0 46241080 */ add.d $f2, $f2, $f4 -/* ED15D4 802415E4 AE000074 */ sw $zero, 0x74($s0) -/* ED15D8 802415E8 46240000 */ add.d $f0, $f0, $f4 -/* ED15DC 802415EC AE000090 */ sw $zero, 0x90($s0) -/* ED15E0 802415F0 4620120D */ trunc.w.d $f8, $f2 -/* ED15E4 802415F4 E6080078 */ swc1 $f8, 0x78($s0) -/* ED15E8 802415F8 4620020D */ trunc.w.d $f8, $f0 -/* ED15EC 802415FC E6080088 */ swc1 $f8, 0x88($s0) -/* ED15F0 80241600 8E420014 */ lw $v0, 0x14($s2) -/* ED15F4 80241604 AE220074 */ sw $v0, 0x74($s1) -/* ED15F8 80241608 8E0200B0 */ lw $v0, 0xb0($s0) -/* ED15FC 8024160C 34420010 */ ori $v0, $v0, 0x10 -/* ED1600 80241610 AE0200B0 */ sw $v0, 0xb0($s0) -/* ED1604 80241614 8FBF0034 */ lw $ra, 0x34($sp) -/* ED1608 80241618 8FB20030 */ lw $s2, 0x30($sp) -/* ED160C 8024161C 8FB1002C */ lw $s1, 0x2c($sp) -/* ED1610 80241620 8FB00028 */ lw $s0, 0x28($sp) -/* ED1614 80241624 03E00008 */ jr $ra -/* ED1618 80241628 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s b/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s index f5fbdded65..401e089a1e 100644 --- a/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s +++ b/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s @@ -64,7 +64,7 @@ glabel func_8024162C_ED161C /* ED16EC 802416FC 0280202D */ daddu $a0, $s4, $zero /* ED16F0 80241700 0240282D */ daddu $a1, $s2, $zero /* ED16F4 80241704 02A0302D */ daddu $a2, $s5, $zero -/* ED16F8 80241708 0C090542 */ jal func_80241508_ED14F8 +/* ED16F8 80241708 0C090542 */ jal ED0310_UnkFunc5 /* ED16FC 8024170C 0200382D */ daddu $a3, $s0, $zero .L80241710: /* ED1700 80241710 2402FFFE */ addiu $v0, $zero, -2 @@ -92,7 +92,7 @@ glabel func_8024162C_ED161C glabel L80241764_ED1754 /* ED1754 80241764 02A0202D */ daddu $a0, $s5, $zero /* ED1758 80241768 0200282D */ daddu $a1, $s0, $zero -/* ED175C 8024176C 0C0900C8 */ jal func_80240320_ED0310 +/* ED175C 8024176C 0C0900C8 */ jal ED0310_UnkNpcAIFunc23 /* ED1760 80241770 0260302D */ daddu $a2, $s3, $zero glabel L80241774_ED1764 /* ED1764 80241774 02A0202D */ daddu $a0, $s5, $zero @@ -109,14 +109,14 @@ glabel L8024178C_ED177C glabel L8024179C_ED178C /* ED178C 8024179C 02A0202D */ daddu $a0, $s5, $zero /* ED1790 802417A0 0200282D */ daddu $a1, $s0, $zero -/* ED1794 802417A4 0C0902EE */ jal func_80240BB8_ED0BA8 +/* ED1794 802417A4 0C0902EE */ jal ED0310_UnkFunc4 /* ED1798 802417A8 0260302D */ daddu $a2, $s3, $zero /* ED179C 802417AC 08090608 */ j .L80241820 /* ED17A0 802417B0 0000102D */ daddu $v0, $zero, $zero glabel L802417B4_ED17A4 /* ED17A4 802417B4 02A0202D */ daddu $a0, $s5, $zero /* ED17A8 802417B8 0200282D */ daddu $a1, $s0, $zero -/* ED17AC 802417BC 0C0903BF */ jal func_80240EFC_ED0EEC +/* ED17AC 802417BC 0C0903BF */ jal ED0310_UnkNpcAIFunc2 /* ED17B0 802417C0 0260302D */ daddu $a2, $s3, $zero glabel L802417C4_ED17B4 /* ED17B4 802417C4 02A0202D */ daddu $a0, $s5, $zero @@ -135,14 +135,14 @@ glabel L802417DC_ED17CC glabel L802417F4_ED17E4 /* ED17E4 802417F4 02A0202D */ daddu $a0, $s5, $zero /* ED17E8 802417F8 0200282D */ daddu $a1, $s0, $zero -/* ED17EC 802417FC 0C090445 */ jal func_80241114_ED1104 +/* ED17EC 802417FC 0C090445 */ jal ED0310_UnkNpcAIFunc3 /* ED17F0 80241800 0260302D */ daddu $a2, $s3, $zero /* ED17F4 80241804 08090608 */ j .L80241820 /* ED17F8 80241808 0000102D */ daddu $v0, $zero, $zero glabel L8024180C_ED17FC /* ED17FC 8024180C 02A0202D */ daddu $a0, $s5, $zero /* ED1800 80241810 0200282D */ daddu $a1, $s0, $zero -/* ED1804 80241814 0C09045E */ jal func_80241178_ED1168 +/* ED1804 80241814 0C09045E */ jal ED0310_UnkFunc6 /* ED1808 80241818 0260302D */ daddu $a2, $s3, $zero glabel L8024181C_ED180C /* ED180C 8024181C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EDEA00/func_802401C4_EDEB84.s b/ver/us/asm/nonmatchings/EDEA00/func_802401C4_EDEB84.s deleted file mode 100644 index 26ada8799f..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_802401C4_EDEB84.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80247AF0_EE64B0 -.double 32767.0 - -.section .text - -glabel func_802401C4_EDEB84 -/* EDEB84 802401C4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* EDEB88 802401C8 AFB3002C */ sw $s3, 0x2c($sp) -/* EDEB8C 802401CC 0080982D */ daddu $s3, $a0, $zero -/* EDEB90 802401D0 AFBF0030 */ sw $ra, 0x30($sp) -/* EDEB94 802401D4 AFB20028 */ sw $s2, 0x28($sp) -/* EDEB98 802401D8 AFB10024 */ sw $s1, 0x24($sp) -/* EDEB9C 802401DC AFB00020 */ sw $s0, 0x20($sp) -/* EDEBA0 802401E0 8E710148 */ lw $s1, 0x148($s3) -/* EDEBA4 802401E4 86240008 */ lh $a0, 8($s1) -/* EDEBA8 802401E8 0C00F92F */ jal dead_get_npc_unsafe -/* EDEBAC 802401EC 00A0902D */ daddu $s2, $a1, $zero -/* EDEBB0 802401F0 8E440004 */ lw $a0, 4($s2) -/* EDEBB4 802401F4 0040802D */ daddu $s0, $v0, $zero -/* EDEBB8 802401F8 00041FC2 */ srl $v1, $a0, 0x1f -/* EDEBBC 802401FC 00832021 */ addu $a0, $a0, $v1 -/* EDEBC0 80240200 00042043 */ sra $a0, $a0, 1 -/* EDEBC4 80240204 0C00AB3B */ jal dead_rand_int -/* EDEBC8 80240208 24840001 */ addiu $a0, $a0, 1 -/* EDEBCC 8024020C 8E430004 */ lw $v1, 4($s2) -/* EDEBD0 80240210 000327C2 */ srl $a0, $v1, 0x1f -/* EDEBD4 80240214 00641821 */ addu $v1, $v1, $a0 -/* EDEBD8 80240218 00031843 */ sra $v1, $v1, 1 -/* EDEBDC 8024021C 00621821 */ addu $v1, $v1, $v0 -/* EDEBE0 80240220 A603008E */ sh $v1, 0x8e($s0) -/* EDEBE4 80240224 8E2300D0 */ lw $v1, 0xd0($s1) -/* EDEBE8 80240228 C6000040 */ lwc1 $f0, 0x40($s0) -/* EDEBEC 8024022C C4640000 */ lwc1 $f4, ($v1) -/* EDEBF0 80240230 46802120 */ cvt.s.w $f4, $f4 -/* EDEBF4 80240234 C4620008 */ lwc1 $f2, 8($v1) -/* EDEBF8 80240238 468010A0 */ cvt.s.w $f2, $f2 -/* EDEBFC 8024023C E7A00010 */ swc1 $f0, 0x10($sp) -/* EDEC00 80240240 8E2200D0 */ lw $v0, 0xd0($s1) -/* EDEC04 80240244 44061000 */ mfc1 $a2, $f2 -/* EDEC08 80240248 C440000C */ lwc1 $f0, 0xc($v0) -/* EDEC0C 8024024C 46800020 */ cvt.s.w $f0, $f0 -/* EDEC10 80240250 E7A00014 */ swc1 $f0, 0x14($sp) -/* EDEC14 80240254 8E2200D0 */ lw $v0, 0xd0($s1) -/* EDEC18 80240258 44052000 */ mfc1 $a1, $f4 -/* EDEC1C 8024025C C4400010 */ lwc1 $f0, 0x10($v0) -/* EDEC20 80240260 46800020 */ cvt.s.w $f0, $f0 -/* EDEC24 80240264 E7A00018 */ swc1 $f0, 0x18($sp) -/* EDEC28 80240268 8C640018 */ lw $a0, 0x18($v1) -/* EDEC2C 8024026C 0C013431 */ jal dead_is_point_within_region -/* EDEC30 80240270 8E070038 */ lw $a3, 0x38($s0) -/* EDEC34 80240274 1040000E */ beqz $v0, .L802402B0 -/* EDEC38 80240278 00000000 */ nop -/* EDEC3C 8024027C 8E2200D0 */ lw $v0, 0xd0($s1) -/* EDEC40 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) -/* EDEC44 80240284 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EDEC48 80240288 C4460000 */ lwc1 $f6, ($v0) -/* EDEC4C 8024028C 468031A0 */ cvt.s.w $f6, $f6 -/* EDEC50 80240290 44063000 */ mfc1 $a2, $f6 -/* EDEC54 80240294 C4460008 */ lwc1 $f6, 8($v0) -/* EDEC58 80240298 468031A0 */ cvt.s.w $f6, $f6 -/* EDEC5C 8024029C 44073000 */ mfc1 $a3, $f6 -/* EDEC60 802402A0 0C00ABDC */ jal fio_validate_header_checksums -/* EDEC64 802402A4 00000000 */ nop -/* EDEC68 802402A8 080900B8 */ j .L802402E0 -/* EDEC6C 802402AC E600000C */ swc1 $f0, 0xc($s0) -.L802402B0: -/* EDEC70 802402B0 0C00AB3B */ jal dead_rand_int -/* EDEC74 802402B4 2404003C */ addiu $a0, $zero, 0x3c -/* EDEC78 802402B8 C60C000C */ lwc1 $f12, 0xc($s0) -/* EDEC7C 802402BC 44820000 */ mtc1 $v0, $f0 -/* EDEC80 802402C0 00000000 */ nop -/* EDEC84 802402C4 46800020 */ cvt.s.w $f0, $f0 -/* EDEC88 802402C8 46006300 */ add.s $f12, $f12, $f0 -/* EDEC8C 802402CC 3C0141F0 */ lui $at, 0x41f0 -/* EDEC90 802402D0 44810000 */ mtc1 $at, $f0 -/* EDEC94 802402D4 0C00AB85 */ jal dead_clamp_angle -/* EDEC98 802402D8 46006301 */ sub.s $f12, $f12, $f0 -/* EDEC9C 802402DC E600000C */ swc1 $f0, 0xc($s0) -.L802402E0: -/* EDECA0 802402E0 8E2200CC */ lw $v0, 0xcc($s1) -/* EDECA4 802402E4 8C420004 */ lw $v0, 4($v0) -/* EDECA8 802402E8 AE020028 */ sw $v0, 0x28($s0) -/* EDECAC 802402EC AE600074 */ sw $zero, 0x74($s3) -/* EDECB0 802402F0 8E2200D0 */ lw $v0, 0xd0($s1) -/* EDECB4 802402F4 8C420014 */ lw $v0, 0x14($v0) -/* EDECB8 802402F8 04410004 */ bgez $v0, .L8024030C -/* EDECBC 802402FC 00000000 */ nop -/* EDECC0 80240300 C6400000 */ lwc1 $f0, ($s2) -/* EDECC4 80240304 080900CB */ j .L8024032C -/* EDECC8 80240308 E6000018 */ swc1 $f0, 0x18($s0) -.L8024030C: -/* EDECCC 8024030C 3C018024 */ lui $at, %hi(D_80247AF0_EE64B0) -/* EDECD0 80240310 D4227AF0 */ ldc1 $f2, %lo(D_80247AF0_EE64B0)($at) -/* EDECD4 80240314 44820000 */ mtc1 $v0, $f0 -/* EDECD8 80240318 00000000 */ nop -/* EDECDC 8024031C 46800021 */ cvt.d.w $f0, $f0 -/* EDECE0 80240320 46220003 */ div.d $f0, $f0, $f2 -/* EDECE4 80240324 46200020 */ cvt.s.d $f0, $f0 -/* EDECE8 80240328 E6000018 */ swc1 $f0, 0x18($s0) -.L8024032C: -/* EDECEC 8024032C C600003C */ lwc1 $f0, 0x3c($s0) -/* EDECF0 80240330 3C014059 */ lui $at, 0x4059 -/* EDECF4 80240334 44811800 */ mtc1 $at, $f3 -/* EDECF8 80240338 44801000 */ mtc1 $zero, $f2 -/* EDECFC 8024033C 46000021 */ cvt.d.s $f0, $f0 -/* EDED00 80240340 46220002 */ mul.d $f0, $f0, $f2 -/* EDED04 80240344 00000000 */ nop -/* EDED08 80240348 24020001 */ addiu $v0, $zero, 1 -/* EDED0C 8024034C 4620018D */ trunc.w.d $f6, $f0 -/* EDED10 80240350 E626007C */ swc1 $f6, 0x7c($s1) -/* EDED14 80240354 AE620070 */ sw $v0, 0x70($s3) -/* EDED18 80240358 8FBF0030 */ lw $ra, 0x30($sp) -/* EDED1C 8024035C 8FB3002C */ lw $s3, 0x2c($sp) -/* EDED20 80240360 8FB20028 */ lw $s2, 0x28($sp) -/* EDED24 80240364 8FB10024 */ lw $s1, 0x24($sp) -/* EDED28 80240368 8FB00020 */ lw $s0, 0x20($sp) -/* EDED2C 8024036C 03E00008 */ jr $ra -/* EDED30 80240370 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80240A5C_EDF41C.s b/ver/us/asm/nonmatchings/EDEA00/func_80240A5C_EDF41C.s deleted file mode 100644 index 3a474638ee..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_80240A5C_EDF41C.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A5C_EDF41C -/* EDF41C 80240A5C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* EDF420 80240A60 AFB3004C */ sw $s3, 0x4c($sp) -/* EDF424 80240A64 0080982D */ daddu $s3, $a0, $zero -/* EDF428 80240A68 AFBF0054 */ sw $ra, 0x54($sp) -/* EDF42C 80240A6C AFB40050 */ sw $s4, 0x50($sp) -/* EDF430 80240A70 AFB20048 */ sw $s2, 0x48($sp) -/* EDF434 80240A74 AFB10044 */ sw $s1, 0x44($sp) -/* EDF438 80240A78 AFB00040 */ sw $s0, 0x40($sp) -/* EDF43C 80240A7C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* EDF440 80240A80 F7B80068 */ sdc1 $f24, 0x68($sp) -/* EDF444 80240A84 F7B60060 */ sdc1 $f22, 0x60($sp) -/* EDF448 80240A88 F7B40058 */ sdc1 $f20, 0x58($sp) -/* EDF44C 80240A8C 8E710148 */ lw $s1, 0x148($s3) -/* EDF450 80240A90 00A0902D */ daddu $s2, $a1, $zero -/* EDF454 80240A94 86240008 */ lh $a0, 8($s1) -/* EDF458 80240A98 0C00F92F */ jal dead_get_npc_unsafe -/* EDF45C 80240A9C 00C0A02D */ daddu $s4, $a2, $zero -/* EDF460 80240AA0 0040802D */ daddu $s0, $v0, $zero -/* EDF464 80240AA4 C6200078 */ lwc1 $f0, 0x78($s1) -/* EDF468 80240AA8 46800020 */ cvt.s.w $f0, $f0 -/* EDF46C 80240AAC 46000021 */ cvt.d.s $f0, $f0 -/* EDF470 80240AB0 3C014059 */ lui $at, 0x4059 -/* EDF474 80240AB4 44811800 */ mtc1 $at, $f3 -/* EDF478 80240AB8 44801000 */ mtc1 $zero, $f2 -/* EDF47C 80240ABC 8602008E */ lh $v0, 0x8e($s0) -/* EDF480 80240AC0 9603008E */ lhu $v1, 0x8e($s0) -/* EDF484 80240AC4 46220003 */ div.d $f0, $f0, $f2 -/* EDF488 80240AC8 46200620 */ cvt.s.d $f24, $f0 -/* EDF48C 80240ACC C6200088 */ lwc1 $f0, 0x88($s1) -/* EDF490 80240AD0 46800020 */ cvt.s.w $f0, $f0 -/* EDF494 80240AD4 46000021 */ cvt.d.s $f0, $f0 -/* EDF498 80240AD8 46220003 */ div.d $f0, $f0, $f2 -/* EDF49C 80240ADC 46200020 */ cvt.s.d $f0, $f0 -/* EDF4A0 80240AE0 18400003 */ blez $v0, .L80240AF0 -/* EDF4A4 80240AE4 4600C680 */ add.s $f26, $f24, $f0 -/* EDF4A8 80240AE8 2462FFFF */ addiu $v0, $v1, -1 -/* EDF4AC 80240AEC A602008E */ sh $v0, 0x8e($s0) -.L80240AF0: -/* EDF4B0 80240AF0 8E220070 */ lw $v0, 0x70($s1) -/* EDF4B4 80240AF4 18400034 */ blez $v0, .L80240BC8 -/* EDF4B8 80240AF8 00000000 */ nop -/* EDF4BC 80240AFC C62C0074 */ lwc1 $f12, 0x74($s1) -/* EDF4C0 80240B00 46806320 */ cvt.s.w $f12, $f12 -/* EDF4C4 80240B04 44820000 */ mtc1 $v0, $f0 -/* EDF4C8 80240B08 00000000 */ nop -/* EDF4CC 80240B0C 46800020 */ cvt.s.w $f0, $f0 -/* EDF4D0 80240B10 46000021 */ cvt.d.s $f0, $f0 -/* EDF4D4 80240B14 46220003 */ div.d $f0, $f0, $f2 -/* EDF4D8 80240B18 0C00AD77 */ jal dead_sin_deg -/* EDF4DC 80240B1C 462005A0 */ cvt.s.d $f22, $f0 -/* EDF4E0 80240B20 8E020000 */ lw $v0, ($s0) -/* EDF4E4 80240B24 30420008 */ andi $v0, $v0, 8 -/* EDF4E8 80240B28 10400003 */ beqz $v0, .L80240B38 -/* EDF4EC 80240B2C 46000506 */ mov.s $f20, $f0 -/* EDF4F0 80240B30 080902DE */ j .L80240B78 -/* EDF4F4 80240B34 0000102D */ daddu $v0, $zero, $zero -.L80240B38: -/* EDF4F8 80240B38 27A50028 */ addiu $a1, $sp, 0x28 -/* EDF4FC 80240B3C 27A6002C */ addiu $a2, $sp, 0x2c -/* EDF500 80240B40 C6000038 */ lwc1 $f0, 0x38($s0) -/* EDF504 80240B44 C602003C */ lwc1 $f2, 0x3c($s0) -/* EDF508 80240B48 C6040040 */ lwc1 $f4, 0x40($s0) -/* EDF50C 80240B4C 3C01447A */ lui $at, 0x447a -/* EDF510 80240B50 44813000 */ mtc1 $at, $f6 -/* EDF514 80240B54 27A20034 */ addiu $v0, $sp, 0x34 -/* EDF518 80240B58 E7A00028 */ swc1 $f0, 0x28($sp) -/* EDF51C 80240B5C E7A2002C */ swc1 $f2, 0x2c($sp) -/* EDF520 80240B60 E7A40030 */ swc1 $f4, 0x30($sp) -/* EDF524 80240B64 E7A60034 */ swc1 $f6, 0x34($sp) -/* EDF528 80240B68 AFA20010 */ sw $v0, 0x10($sp) -/* EDF52C 80240B6C 8E040080 */ lw $a0, 0x80($s0) -/* EDF530 80240B70 0C03908F */ jal dead_npc_raycast_down_sides -/* EDF534 80240B74 27A70030 */ addiu $a3, $sp, 0x30 -.L80240B78: -/* EDF538 80240B78 10400007 */ beqz $v0, .L80240B98 -/* EDF53C 80240B7C 00000000 */ nop -/* EDF540 80240B80 4616A082 */ mul.s $f2, $f20, $f22 -/* EDF544 80240B84 00000000 */ nop -/* EDF548 80240B88 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* EDF54C 80240B8C 46180000 */ add.s $f0, $f0, $f24 -/* EDF550 80240B90 080902E9 */ j .L80240BA4 -/* EDF554 80240B94 46020000 */ add.s $f0, $f0, $f2 -.L80240B98: -/* EDF558 80240B98 4616A002 */ mul.s $f0, $f20, $f22 -/* EDF55C 80240B9C 00000000 */ nop -/* EDF560 80240BA0 4600D000 */ add.s $f0, $f26, $f0 -.L80240BA4: -/* EDF564 80240BA4 E600003C */ swc1 $f0, 0x3c($s0) -/* EDF568 80240BA8 8E220074 */ lw $v0, 0x74($s1) -/* EDF56C 80240BAC 2442000A */ addiu $v0, $v0, 0xa -/* EDF570 80240BB0 44826000 */ mtc1 $v0, $f12 -/* EDF574 80240BB4 00000000 */ nop -/* EDF578 80240BB8 0C00AB85 */ jal dead_clamp_angle -/* EDF57C 80240BBC 46806320 */ cvt.s.w $f12, $f12 -/* EDF580 80240BC0 4600020D */ trunc.w.s $f8, $f0 -/* EDF584 80240BC4 E6280074 */ swc1 $f8, 0x74($s1) -.L80240BC8: -/* EDF588 80240BC8 8E220090 */ lw $v0, 0x90($s1) -/* EDF58C 80240BCC 1C400040 */ bgtz $v0, .L80240CD0 -/* EDF590 80240BD0 2442FFFF */ addiu $v0, $v0, -1 -/* EDF594 80240BD4 860200A8 */ lh $v0, 0xa8($s0) -/* EDF598 80240BD8 C600003C */ lwc1 $f0, 0x3c($s0) -/* EDF59C 80240BDC 44821000 */ mtc1 $v0, $f2 -/* EDF5A0 80240BE0 00000000 */ nop -/* EDF5A4 80240BE4 468010A0 */ cvt.s.w $f2, $f2 -/* EDF5A8 80240BE8 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EDF5AC 80240BEC 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EDF5B0 80240BF0 46020000 */ add.s $f0, $f0, $f2 -/* EDF5B4 80240BF4 3C014024 */ lui $at, 0x4024 -/* EDF5B8 80240BF8 44812800 */ mtc1 $at, $f5 -/* EDF5BC 80240BFC 44802000 */ mtc1 $zero, $f4 -/* EDF5C0 80240C00 C442002C */ lwc1 $f2, 0x2c($v0) -/* EDF5C4 80240C04 46000021 */ cvt.d.s $f0, $f0 -/* EDF5C8 80240C08 46240000 */ add.d $f0, $f0, $f4 -/* EDF5CC 80240C0C 460010A1 */ cvt.d.s $f2, $f2 -/* EDF5D0 80240C10 4620103C */ c.lt.d $f2, $f0 -/* EDF5D4 80240C14 00000000 */ nop -/* EDF5D8 80240C18 4500002E */ bc1f .L80240CD4 -/* EDF5DC 80240C1C 0280202D */ daddu $a0, $s4, $zero -/* EDF5E0 80240C20 24020001 */ addiu $v0, $zero, 1 -/* EDF5E4 80240C24 AFA20010 */ sw $v0, 0x10($sp) -/* EDF5E8 80240C28 8E460024 */ lw $a2, 0x24($s2) -/* EDF5EC 80240C2C 8E470028 */ lw $a3, 0x28($s2) -/* EDF5F0 80240C30 0C013469 */ jal func_8004D1A4 -/* EDF5F4 80240C34 0220282D */ daddu $a1, $s1, $zero -/* EDF5F8 80240C38 10400026 */ beqz $v0, .L80240CD4 -/* EDF5FC 80240C3C 0000202D */ daddu $a0, $zero, $zero -/* EDF600 80240C40 0200282D */ daddu $a1, $s0, $zero -/* EDF604 80240C44 0000302D */ daddu $a2, $zero, $zero -/* EDF608 80240C48 2412000C */ addiu $s2, $zero, 0xc -/* EDF60C 80240C4C 860300A8 */ lh $v1, 0xa8($s0) -/* EDF610 80240C50 3C013F80 */ lui $at, 0x3f80 -/* EDF614 80240C54 44810000 */ mtc1 $at, $f0 -/* EDF618 80240C58 3C014000 */ lui $at, 0x4000 -/* EDF61C 80240C5C 44811000 */ mtc1 $at, $f2 -/* EDF620 80240C60 3C01C1A0 */ lui $at, 0xc1a0 -/* EDF624 80240C64 44812000 */ mtc1 $at, $f4 -/* EDF628 80240C68 44834000 */ mtc1 $v1, $f8 -/* EDF62C 80240C6C 00000000 */ nop -/* EDF630 80240C70 46804220 */ cvt.s.w $f8, $f8 -/* EDF634 80240C74 44074000 */ mfc1 $a3, $f8 -/* EDF638 80240C78 27A20038 */ addiu $v0, $sp, 0x38 -/* EDF63C 80240C7C AFB2001C */ sw $s2, 0x1c($sp) -/* EDF640 80240C80 AFA20020 */ sw $v0, 0x20($sp) -/* EDF644 80240C84 E7A00010 */ swc1 $f0, 0x10($sp) -/* EDF648 80240C88 E7A20014 */ swc1 $f2, 0x14($sp) -/* EDF64C 80240C8C 0C01D444 */ jal dead_fx_emote -/* EDF650 80240C90 E7A40018 */ swc1 $f4, 0x18($sp) -/* EDF654 80240C94 0200202D */ daddu $a0, $s0, $zero -/* EDF658 80240C98 240502F4 */ addiu $a1, $zero, 0x2f4 -/* EDF65C 80240C9C C480003C */ lwc1 $f0, 0x3c($a0) -/* EDF660 80240CA0 3C060020 */ lui $a2, 0x20 -/* EDF664 80240CA4 0C013600 */ jal dead_ai_enemy_play_sound -/* EDF668 80240CA8 E4800064 */ swc1 $f0, 0x64($a0) -/* EDF66C 80240CAC 8E220018 */ lw $v0, 0x18($s1) -/* EDF670 80240CB0 9442002A */ lhu $v0, 0x2a($v0) -/* EDF674 80240CB4 30420001 */ andi $v0, $v0, 1 -/* EDF678 80240CB8 10400003 */ beqz $v0, .L80240CC8 -/* EDF67C 80240CBC 2402000A */ addiu $v0, $zero, 0xa -/* EDF680 80240CC0 0809035C */ j .L80240D70 -/* EDF684 80240CC4 AE620070 */ sw $v0, 0x70($s3) -.L80240CC8: -/* EDF688 80240CC8 0809035C */ j .L80240D70 -/* EDF68C 80240CCC AE720070 */ sw $s2, 0x70($s3) -.L80240CD0: -/* EDF690 80240CD0 AE220090 */ sw $v0, 0x90($s1) -.L80240CD4: -/* EDF694 80240CD4 8602008C */ lh $v0, 0x8c($s0) -/* EDF698 80240CD8 14400025 */ bnez $v0, .L80240D70 -/* EDF69C 80240CDC 00000000 */ nop -/* EDF6A0 80240CE0 8602008E */ lh $v0, 0x8e($s0) -/* EDF6A4 80240CE4 1C400022 */ bgtz $v0, .L80240D70 -/* EDF6A8 80240CE8 00000000 */ nop -/* EDF6AC 80240CEC 8E620074 */ lw $v0, 0x74($s3) -/* EDF6B0 80240CF0 2442FFFF */ addiu $v0, $v0, -1 -/* EDF6B4 80240CF4 1840001D */ blez $v0, .L80240D6C -/* EDF6B8 80240CF8 AE620074 */ sw $v0, 0x74($s3) -/* EDF6BC 80240CFC 8E220018 */ lw $v0, 0x18($s1) -/* EDF6C0 80240D00 9442002A */ lhu $v0, 0x2a($v0) -/* EDF6C4 80240D04 30420010 */ andi $v0, $v0, 0x10 -/* EDF6C8 80240D08 14400007 */ bnez $v0, .L80240D28 -/* EDF6CC 80240D0C 00000000 */ nop -/* EDF6D0 80240D10 C600000C */ lwc1 $f0, 0xc($s0) -/* EDF6D4 80240D14 3C014334 */ lui $at, 0x4334 -/* EDF6D8 80240D18 44816000 */ mtc1 $at, $f12 -/* EDF6DC 80240D1C 0C00AB85 */ jal dead_clamp_angle -/* EDF6E0 80240D20 460C0300 */ add.s $f12, $f0, $f12 -/* EDF6E4 80240D24 E600000C */ swc1 $f0, 0xc($s0) -.L80240D28: -/* EDF6E8 80240D28 0C00AB3B */ jal dead_rand_int -/* EDF6EC 80240D2C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* EDF6F0 80240D30 3C032E8B */ lui $v1, 0x2e8b -/* EDF6F4 80240D34 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* EDF6F8 80240D38 00430018 */ mult $v0, $v1 -/* EDF6FC 80240D3C 00021FC3 */ sra $v1, $v0, 0x1f -/* EDF700 80240D40 00004010 */ mfhi $t0 -/* EDF704 80240D44 00082043 */ sra $a0, $t0, 1 -/* EDF708 80240D48 00832023 */ subu $a0, $a0, $v1 -/* EDF70C 80240D4C 00041840 */ sll $v1, $a0, 1 -/* EDF710 80240D50 00641821 */ addu $v1, $v1, $a0 -/* EDF714 80240D54 00031880 */ sll $v1, $v1, 2 -/* EDF718 80240D58 00641823 */ subu $v1, $v1, $a0 -/* EDF71C 80240D5C 00431023 */ subu $v0, $v0, $v1 -/* EDF720 80240D60 24420005 */ addiu $v0, $v0, 5 -/* EDF724 80240D64 0809035C */ j .L80240D70 -/* EDF728 80240D68 A602008E */ sh $v0, 0x8e($s0) -.L80240D6C: -/* EDF72C 80240D6C AE600070 */ sw $zero, 0x70($s3) -.L80240D70: -/* EDF730 80240D70 8FBF0054 */ lw $ra, 0x54($sp) -/* EDF734 80240D74 8FB40050 */ lw $s4, 0x50($sp) -/* EDF738 80240D78 8FB3004C */ lw $s3, 0x4c($sp) -/* EDF73C 80240D7C 8FB20048 */ lw $s2, 0x48($sp) -/* EDF740 80240D80 8FB10044 */ lw $s1, 0x44($sp) -/* EDF744 80240D84 8FB00040 */ lw $s0, 0x40($sp) -/* EDF748 80240D88 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* EDF74C 80240D8C D7B80068 */ ldc1 $f24, 0x68($sp) -/* EDF750 80240D90 D7B60060 */ ldc1 $f22, 0x60($sp) -/* EDF754 80240D94 D7B40058 */ ldc1 $f20, 0x58($sp) -/* EDF758 80240D98 03E00008 */ jr $ra -/* EDF75C 80240D9C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80240DA0_EDF760.s b/ver/us/asm/nonmatchings/EDEA00/func_80240DA0_EDF760.s deleted file mode 100644 index 3505059176..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_80240DA0_EDF760.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA0_EDF760 -/* EDF760 80240DA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EDF764 80240DA4 AFB20018 */ sw $s2, 0x18($sp) -/* EDF768 80240DA8 0080902D */ daddu $s2, $a0, $zero -/* EDF76C 80240DAC AFBF001C */ sw $ra, 0x1c($sp) -/* EDF770 80240DB0 AFB10014 */ sw $s1, 0x14($sp) -/* EDF774 80240DB4 AFB00010 */ sw $s0, 0x10($sp) -/* EDF778 80240DB8 8E510148 */ lw $s1, 0x148($s2) -/* EDF77C 80240DBC 0C00F92F */ jal dead_get_npc_unsafe -/* EDF780 80240DC0 86240008 */ lh $a0, 8($s1) -/* EDF784 80240DC4 0040802D */ daddu $s0, $v0, $zero -/* EDF788 80240DC8 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EDF78C 80240DCC 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EDF790 80240DD0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* EDF794 80240DD4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EDF798 80240DD8 A600008E */ sh $zero, 0x8e($s0) -/* EDF79C 80240DDC 8C460028 */ lw $a2, 0x28($v0) -/* EDF7A0 80240DE0 0C00ABDC */ jal fio_validate_header_checksums -/* EDF7A4 80240DE4 8C470030 */ lw $a3, 0x30($v0) -/* EDF7A8 80240DE8 E600000C */ swc1 $f0, 0xc($s0) -/* EDF7AC 80240DEC 8E2200CC */ lw $v0, 0xcc($s1) -/* EDF7B0 80240DF0 8C420020 */ lw $v0, 0x20($v0) -/* EDF7B4 80240DF4 AE020028 */ sw $v0, 0x28($s0) -/* EDF7B8 80240DF8 2402000B */ addiu $v0, $zero, 0xb -/* EDF7BC 80240DFC AE420070 */ sw $v0, 0x70($s2) -/* EDF7C0 80240E00 8FBF001C */ lw $ra, 0x1c($sp) -/* EDF7C4 80240E04 8FB20018 */ lw $s2, 0x18($sp) -/* EDF7C8 80240E08 8FB10014 */ lw $s1, 0x14($sp) -/* EDF7CC 80240E0C 8FB00010 */ lw $s0, 0x10($sp) -/* EDF7D0 80240E10 03E00008 */ jr $ra -/* EDF7D4 80240E14 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80240E18_EDF7D8.s b/ver/us/asm/nonmatchings/EDEA00/func_80240E18_EDF7D8.s deleted file mode 100644 index 42acd28215..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_80240E18_EDF7D8.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E18_EDF7D8 -/* EDF7D8 80240E18 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EDF7DC 80240E1C AFB00010 */ sw $s0, 0x10($sp) -/* EDF7E0 80240E20 0080802D */ daddu $s0, $a0, $zero -/* EDF7E4 80240E24 AFBF0014 */ sw $ra, 0x14($sp) -/* EDF7E8 80240E28 8E020148 */ lw $v0, 0x148($s0) -/* EDF7EC 80240E2C 0C00F92F */ jal dead_get_npc_unsafe -/* EDF7F0 80240E30 84440008 */ lh $a0, 8($v0) -/* EDF7F4 80240E34 9443008E */ lhu $v1, 0x8e($v0) -/* EDF7F8 80240E38 C440003C */ lwc1 $f0, 0x3c($v0) -/* EDF7FC 80240E3C 24640001 */ addiu $a0, $v1, 1 -/* EDF800 80240E40 00031C00 */ sll $v1, $v1, 0x10 -/* EDF804 80240E44 00031B83 */ sra $v1, $v1, 0xe -/* EDF808 80240E48 A444008E */ sh $a0, 0x8e($v0) -/* EDF80C 80240E4C 3C018024 */ lui $at, %hi(D_802441DC_EE2B9C) -/* EDF810 80240E50 00230821 */ addu $at, $at, $v1 -/* EDF814 80240E54 C42241DC */ lwc1 $f2, %lo(D_802441DC_EE2B9C)($at) -/* EDF818 80240E58 8443008E */ lh $v1, 0x8e($v0) -/* EDF81C 80240E5C 46020000 */ add.s $f0, $f0, $f2 -/* EDF820 80240E60 28630005 */ slti $v1, $v1, 5 -/* EDF824 80240E64 14600003 */ bnez $v1, .L80240E74 -/* EDF828 80240E68 E440003C */ swc1 $f0, 0x3c($v0) -/* EDF82C 80240E6C 2402000C */ addiu $v0, $zero, 0xc -/* EDF830 80240E70 AE020070 */ sw $v0, 0x70($s0) -.L80240E74: -/* EDF834 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* EDF838 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* EDF83C 80240E7C 03E00008 */ jr $ra -/* EDF840 80240E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80240FB8_EDF978.s b/ver/us/asm/nonmatchings/EDEA00/func_80240FB8_EDF978.s deleted file mode 100644 index 9f5d251b6b..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_80240FB8_EDF978.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FB8_EDF978 -/* EDF978 80240FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EDF97C 80240FBC AFB00010 */ sw $s0, 0x10($sp) -/* EDF980 80240FC0 0080802D */ daddu $s0, $a0, $zero -/* EDF984 80240FC4 AFBF0014 */ sw $ra, 0x14($sp) -/* EDF988 80240FC8 8E020148 */ lw $v0, 0x148($s0) -/* EDF98C 80240FCC 0C00F92F */ jal dead_get_npc_unsafe -/* EDF990 80240FD0 84440008 */ lh $a0, 8($v0) -/* EDF994 80240FD4 0040202D */ daddu $a0, $v0, $zero -/* EDF998 80240FD8 8482008E */ lh $v0, 0x8e($a0) -/* EDF99C 80240FDC 9483008E */ lhu $v1, 0x8e($a0) -/* EDF9A0 80240FE0 18400005 */ blez $v0, .L80240FF8 -/* EDF9A4 80240FE4 2462FFFF */ addiu $v0, $v1, -1 -/* EDF9A8 80240FE8 A482008E */ sh $v0, 0x8e($a0) -/* EDF9AC 80240FEC 00021400 */ sll $v0, $v0, 0x10 -/* EDF9B0 80240FF0 1C400006 */ bgtz $v0, .L8024100C -/* EDF9B4 80240FF4 00000000 */ nop -.L80240FF8: -/* EDF9B8 80240FF8 8482008C */ lh $v0, 0x8c($a0) -/* EDF9BC 80240FFC 14400003 */ bnez $v0, .L8024100C -/* EDF9C0 80241000 2402000E */ addiu $v0, $zero, 0xe -/* EDF9C4 80241004 A480008E */ sh $zero, 0x8e($a0) -/* EDF9C8 80241008 AE020070 */ sw $v0, 0x70($s0) -.L8024100C: -/* EDF9CC 8024100C 8FBF0014 */ lw $ra, 0x14($sp) -/* EDF9D0 80241010 8FB00010 */ lw $s0, 0x10($sp) -/* EDF9D4 80241014 03E00008 */ jr $ra -/* EDF9D8 80241018 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_8024101C_EDF9DC.s b/ver/us/asm/nonmatchings/EDEA00/func_8024101C_EDF9DC.s deleted file mode 100644 index ab050c9fbd..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_8024101C_EDF9DC.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024101C_EDF9DC -/* EDF9DC 8024101C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* EDF9E0 80241020 AFB20030 */ sw $s2, 0x30($sp) -/* EDF9E4 80241024 0080902D */ daddu $s2, $a0, $zero -/* EDF9E8 80241028 AFBF0038 */ sw $ra, 0x38($sp) -/* EDF9EC 8024102C AFB30034 */ sw $s3, 0x34($sp) -/* EDF9F0 80241030 AFB1002C */ sw $s1, 0x2c($sp) -/* EDF9F4 80241034 AFB00028 */ sw $s0, 0x28($sp) -/* EDF9F8 80241038 F7B60048 */ sdc1 $f22, 0x48($sp) -/* EDF9FC 8024103C F7B40040 */ sdc1 $f20, 0x40($sp) -/* EDFA00 80241040 8E510148 */ lw $s1, 0x148($s2) -/* EDFA04 80241044 86240008 */ lh $a0, 8($s1) -/* EDFA08 80241048 0C00F92F */ jal dead_get_npc_unsafe -/* EDFA0C 8024104C 00A0982D */ daddu $s3, $a1, $zero -/* EDFA10 80241050 0040802D */ daddu $s0, $v0, $zero -/* EDFA14 80241054 0200202D */ daddu $a0, $s0, $zero -/* EDFA18 80241058 C6220088 */ lwc1 $f2, 0x88($s1) -/* EDFA1C 8024105C 468010A0 */ cvt.s.w $f2, $f2 -/* EDFA20 80241060 460010A1 */ cvt.d.s $f2, $f2 -/* EDFA24 80241064 C604001C */ lwc1 $f4, 0x1c($s0) -/* EDFA28 80241068 C6000014 */ lwc1 $f0, 0x14($s0) -/* EDFA2C 8024106C 8E050018 */ lw $a1, 0x18($s0) -/* EDFA30 80241070 46002100 */ add.s $f4, $f4, $f0 -/* EDFA34 80241074 8E06000C */ lw $a2, 0xc($s0) -/* EDFA38 80241078 C6200078 */ lwc1 $f0, 0x78($s1) -/* EDFA3C 8024107C 46800020 */ cvt.s.w $f0, $f0 -/* EDFA40 80241080 E604001C */ swc1 $f4, 0x1c($s0) -/* EDFA44 80241084 3C014059 */ lui $at, 0x4059 -/* EDFA48 80241088 44812800 */ mtc1 $at, $f5 -/* EDFA4C 8024108C 44802000 */ mtc1 $zero, $f4 -/* EDFA50 80241090 46000021 */ cvt.d.s $f0, $f0 -/* EDFA54 80241094 46240003 */ div.d $f0, $f0, $f4 -/* EDFA58 80241098 46200520 */ cvt.s.d $f20, $f0 -/* EDFA5C 8024109C 46241083 */ div.d $f2, $f2, $f4 -/* EDFA60 802410A0 0C00F909 */ jal dead_npc_move_heading -/* EDFA64 802410A4 462015A0 */ cvt.s.d $f22, $f2 -/* EDFA68 802410A8 C604001C */ lwc1 $f4, 0x1c($s0) -/* EDFA6C 802410AC 44801000 */ mtc1 $zero, $f2 -/* EDFA70 802410B0 44801800 */ mtc1 $zero, $f3 -/* EDFA74 802410B4 46002021 */ cvt.d.s $f0, $f4 -/* EDFA78 802410B8 4620103E */ c.le.d $f2, $f0 -/* EDFA7C 802410BC 00000000 */ nop -/* EDFA80 802410C0 45000030 */ bc1f .L80241184 -/* EDFA84 802410C4 00000000 */ nop -/* EDFA88 802410C8 C600003C */ lwc1 $f0, 0x3c($s0) -/* EDFA8C 802410CC 46040000 */ add.s $f0, $f0, $f4 -/* EDFA90 802410D0 E600003C */ swc1 $f0, 0x3c($s0) -/* EDFA94 802410D4 8E2200CC */ lw $v0, 0xcc($s1) -/* EDFA98 802410D8 8C420024 */ lw $v0, 0x24($v0) -/* EDFA9C 802410DC AE020028 */ sw $v0, 0x28($s0) -/* EDFAA0 802410E0 A2200007 */ sb $zero, 7($s1) -/* EDFAA4 802410E4 8E020000 */ lw $v0, ($s0) -/* EDFAA8 802410E8 30420008 */ andi $v0, $v0, 8 -/* EDFAAC 802410EC 14400011 */ bnez $v0, .L80241134 -/* EDFAB0 802410F0 0000102D */ daddu $v0, $zero, $zero -/* EDFAB4 802410F4 27A50018 */ addiu $a1, $sp, 0x18 -/* EDFAB8 802410F8 27A6001C */ addiu $a2, $sp, 0x1c -/* EDFABC 802410FC C6000038 */ lwc1 $f0, 0x38($s0) -/* EDFAC0 80241100 C602003C */ lwc1 $f2, 0x3c($s0) -/* EDFAC4 80241104 C6040040 */ lwc1 $f4, 0x40($s0) -/* EDFAC8 80241108 3C01447A */ lui $at, 0x447a -/* EDFACC 8024110C 44813000 */ mtc1 $at, $f6 -/* EDFAD0 80241110 27A20024 */ addiu $v0, $sp, 0x24 -/* EDFAD4 80241114 E7A00018 */ swc1 $f0, 0x18($sp) -/* EDFAD8 80241118 E7A2001C */ swc1 $f2, 0x1c($sp) -/* EDFADC 8024111C E7A40020 */ swc1 $f4, 0x20($sp) -/* EDFAE0 80241120 E7A60024 */ swc1 $f6, 0x24($sp) -/* EDFAE4 80241124 AFA20010 */ sw $v0, 0x10($sp) -/* EDFAE8 80241128 8E040080 */ lw $a0, 0x80($s0) -/* EDFAEC 8024112C 0C03908F */ jal dead_npc_raycast_down_sides -/* EDFAF0 80241130 27A70020 */ addiu $a3, $sp, 0x20 -.L80241134: -/* EDFAF4 80241134 1040000B */ beqz $v0, .L80241164 -/* EDFAF8 80241138 00000000 */ nop -/* EDFAFC 8024113C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* EDFB00 80241140 46140080 */ add.s $f2, $f0, $f20 -/* EDFB04 80241144 C600003C */ lwc1 $f0, 0x3c($s0) -/* EDFB08 80241148 4600103E */ c.le.s $f2, $f0 -/* EDFB0C 8024114C 00000000 */ nop -/* EDFB10 80241150 4500008D */ bc1f .L80241388 -/* EDFB14 80241154 00000000 */ nop -/* EDFB18 80241158 E602003C */ swc1 $f2, 0x3c($s0) -/* EDFB1C 8024115C 080904E2 */ j .L80241388 -/* EDFB20 80241160 AE400070 */ sw $zero, 0x70($s2) -.L80241164: -/* EDFB24 80241164 C602003C */ lwc1 $f2, 0x3c($s0) -/* EDFB28 80241168 C6000064 */ lwc1 $f0, 0x64($s0) -/* EDFB2C 8024116C 4602003E */ c.le.s $f0, $f2 -/* EDFB30 80241170 00000000 */ nop -/* EDFB34 80241174 45030084 */ bc1tl .L80241388 -/* EDFB38 80241178 AE400070 */ sw $zero, 0x70($s2) -/* EDFB3C 8024117C 080904E2 */ j .L80241388 -/* EDFB40 80241180 00000000 */ nop -.L80241184: -/* EDFB44 80241184 4622003C */ c.lt.d $f0, $f2 -/* EDFB48 80241188 00000000 */ nop -/* EDFB4C 8024118C 4500007E */ bc1f .L80241388 -/* EDFB50 80241190 00000000 */ nop -/* EDFB54 80241194 9602008E */ lhu $v0, 0x8e($s0) -/* EDFB58 80241198 24420001 */ addiu $v0, $v0, 1 -/* EDFB5C 8024119C A602008E */ sh $v0, 0x8e($s0) -/* EDFB60 802411A0 00021400 */ sll $v0, $v0, 0x10 -/* EDFB64 802411A4 8E630020 */ lw $v1, 0x20($s3) -/* EDFB68 802411A8 00021403 */ sra $v0, $v0, 0x10 -/* EDFB6C 802411AC 0043102A */ slt $v0, $v0, $v1 -/* EDFB70 802411B0 14400026 */ bnez $v0, .L8024124C -/* EDFB74 802411B4 00000000 */ nop -/* EDFB78 802411B8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* EDFB7C 802411BC C60E0040 */ lwc1 $f14, 0x40($s0) -/* EDFB80 802411C0 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EDFB84 802411C4 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EDFB88 802411C8 A600008E */ sh $zero, 0x8e($s0) -/* EDFB8C 802411CC 8C460028 */ lw $a2, 0x28($v0) -/* EDFB90 802411D0 0C00ABDC */ jal fio_validate_header_checksums -/* EDFB94 802411D4 8C470030 */ lw $a3, 0x30($v0) -/* EDFB98 802411D8 46000506 */ mov.s $f20, $f0 -/* EDFB9C 802411DC C60C000C */ lwc1 $f12, 0xc($s0) -/* EDFBA0 802411E0 0C00ABC6 */ jal dead_get_clamped_angle_diff -/* EDFBA4 802411E4 4600A386 */ mov.s $f14, $f20 -/* EDFBA8 802411E8 46000086 */ mov.s $f2, $f0 -/* EDFBAC 802411EC 8E62001C */ lw $v0, 0x1c($s3) -/* EDFBB0 802411F0 46001005 */ abs.s $f0, $f2 -/* EDFBB4 802411F4 44822000 */ mtc1 $v0, $f4 -/* EDFBB8 802411F8 00000000 */ nop -/* EDFBBC 802411FC 46802120 */ cvt.s.w $f4, $f4 -/* EDFBC0 80241200 4600203C */ c.lt.s $f4, $f0 -/* EDFBC4 80241204 00000000 */ nop -/* EDFBC8 80241208 4500000D */ bc1f .L80241240 -/* EDFBCC 8024120C 00000000 */ nop -/* EDFBD0 80241210 44800000 */ mtc1 $zero, $f0 -/* EDFBD4 80241214 C614000C */ lwc1 $f20, 0xc($s0) -/* EDFBD8 80241218 4600103C */ c.lt.s $f2, $f0 -/* EDFBDC 8024121C 00000000 */ nop -/* EDFBE0 80241220 45000006 */ bc1f .L8024123C -/* EDFBE4 80241224 00021023 */ negu $v0, $v0 -/* EDFBE8 80241228 44820000 */ mtc1 $v0, $f0 -/* EDFBEC 8024122C 00000000 */ nop -/* EDFBF0 80241230 46800020 */ cvt.s.w $f0, $f0 -/* EDFBF4 80241234 08090490 */ j .L80241240 -/* EDFBF8 80241238 4600A500 */ add.s $f20, $f20, $f0 -.L8024123C: -/* EDFBFC 8024123C 4604A500 */ add.s $f20, $f20, $f4 -.L80241240: -/* EDFC00 80241240 0C00AB85 */ jal dead_clamp_angle -/* EDFC04 80241244 4600A306 */ mov.s $f12, $f20 -/* EDFC08 80241248 E600000C */ swc1 $f0, 0xc($s0) -.L8024124C: -/* EDFC0C 8024124C 8E020000 */ lw $v0, ($s0) -/* EDFC10 80241250 30420008 */ andi $v0, $v0, 8 -/* EDFC14 80241254 1040000A */ beqz $v0, .L80241280 -/* EDFC18 80241258 27A50018 */ addiu $a1, $sp, 0x18 -/* EDFC1C 8024125C C602003C */ lwc1 $f2, 0x3c($s0) -/* EDFC20 80241260 C600001C */ lwc1 $f0, 0x1c($s0) -/* EDFC24 80241264 46001080 */ add.s $f2, $f2, $f0 -/* EDFC28 80241268 4616103C */ c.lt.s $f2, $f22 -/* EDFC2C 8024126C 00000000 */ nop -/* EDFC30 80241270 45020045 */ bc1fl .L80241388 -/* EDFC34 80241274 E602003C */ swc1 $f2, 0x3c($s0) -/* EDFC38 80241278 080904E1 */ j .L80241384 -/* EDFC3C 8024127C E616003C */ swc1 $f22, 0x3c($s0) -.L80241280: -/* EDFC40 80241280 C6000038 */ lwc1 $f0, 0x38($s0) -/* EDFC44 80241284 27A6001C */ addiu $a2, $sp, 0x1c -/* EDFC48 80241288 E7A00018 */ swc1 $f0, 0x18($sp) -/* EDFC4C 8024128C 860200A8 */ lh $v0, 0xa8($s0) -/* EDFC50 80241290 C600001C */ lwc1 $f0, 0x1c($s0) -/* EDFC54 80241294 C604003C */ lwc1 $f4, 0x3c($s0) -/* EDFC58 80241298 44821000 */ mtc1 $v0, $f2 -/* EDFC5C 8024129C 00000000 */ nop -/* EDFC60 802412A0 468010A0 */ cvt.s.w $f2, $f2 -/* EDFC64 802412A4 46000005 */ abs.s $f0, $f0 -/* EDFC68 802412A8 46020000 */ add.s $f0, $f0, $f2 -/* EDFC6C 802412AC C6060040 */ lwc1 $f6, 0x40($s0) -/* EDFC70 802412B0 27A20024 */ addiu $v0, $sp, 0x24 -/* EDFC74 802412B4 46022100 */ add.s $f4, $f4, $f2 -/* EDFC78 802412B8 3C014024 */ lui $at, 0x4024 -/* EDFC7C 802412BC 44811800 */ mtc1 $at, $f3 -/* EDFC80 802412C0 44801000 */ mtc1 $zero, $f2 -/* EDFC84 802412C4 46000021 */ cvt.d.s $f0, $f0 -/* EDFC88 802412C8 46220000 */ add.d $f0, $f0, $f2 -/* EDFC8C 802412CC E7A60020 */ swc1 $f6, 0x20($sp) -/* EDFC90 802412D0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* EDFC94 802412D4 46200020 */ cvt.s.d $f0, $f0 -/* EDFC98 802412D8 E7A00024 */ swc1 $f0, 0x24($sp) -/* EDFC9C 802412DC AFA20010 */ sw $v0, 0x10($sp) -/* EDFCA0 802412E0 8E040080 */ lw $a0, 0x80($s0) -/* EDFCA4 802412E4 0C03908F */ jal dead_npc_raycast_down_sides -/* EDFCA8 802412E8 27A70020 */ addiu $a3, $sp, 0x20 -/* EDFCAC 802412EC 10400015 */ beqz $v0, .L80241344 -/* EDFCB0 802412F0 00000000 */ nop -/* EDFCB4 802412F4 860200A8 */ lh $v0, 0xa8($s0) -/* EDFCB8 802412F8 C604001C */ lwc1 $f4, 0x1c($s0) -/* EDFCBC 802412FC 44820000 */ mtc1 $v0, $f0 -/* EDFCC0 80241300 00000000 */ nop -/* EDFCC4 80241304 46800020 */ cvt.s.w $f0, $f0 -/* EDFCC8 80241308 46002085 */ abs.s $f2, $f4 -/* EDFCCC 8024130C 46020000 */ add.s $f0, $f0, $f2 -/* EDFCD0 80241310 C7A20024 */ lwc1 $f2, 0x24($sp) -/* EDFCD4 80241314 4600103E */ c.le.s $f2, $f0 -/* EDFCD8 80241318 00000000 */ nop -/* EDFCDC 8024131C 45000005 */ bc1f .L80241334 -/* EDFCE0 80241320 00000000 */ nop -/* EDFCE4 80241324 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* EDFCE8 80241328 AE00001C */ sw $zero, 0x1c($s0) -/* EDFCEC 8024132C 080904E2 */ j .L80241388 -/* EDFCF0 80241330 E600003C */ swc1 $f0, 0x3c($s0) -.L80241334: -/* EDFCF4 80241334 C600003C */ lwc1 $f0, 0x3c($s0) -/* EDFCF8 80241338 46040000 */ add.s $f0, $f0, $f4 -/* EDFCFC 8024133C 080904E2 */ j .L80241388 -/* EDFD00 80241340 E600003C */ swc1 $f0, 0x3c($s0) -.L80241344: -/* EDFD04 80241344 C606003C */ lwc1 $f6, 0x3c($s0) -/* EDFD08 80241348 860200A8 */ lh $v0, 0xa8($s0) -/* EDFD0C 8024134C 46163081 */ sub.s $f2, $f6, $f22 -/* EDFD10 80241350 44820000 */ mtc1 $v0, $f0 -/* EDFD14 80241354 00000000 */ nop -/* EDFD18 80241358 46800020 */ cvt.s.w $f0, $f0 -/* EDFD1C 8024135C 46001080 */ add.s $f2, $f2, $f0 -/* EDFD20 80241360 C604001C */ lwc1 $f4, 0x1c($s0) -/* EDFD24 80241364 46002005 */ abs.s $f0, $f4 -/* EDFD28 80241368 4602003C */ c.lt.s $f0, $f2 -/* EDFD2C 8024136C 00000000 */ nop -/* EDFD30 80241370 45020005 */ bc1fl .L80241388 -/* EDFD34 80241374 AE00001C */ sw $zero, 0x1c($s0) -/* EDFD38 80241378 46043000 */ add.s $f0, $f6, $f4 -/* EDFD3C 8024137C 080904E2 */ j .L80241388 -/* EDFD40 80241380 E600003C */ swc1 $f0, 0x3c($s0) -.L80241384: -/* EDFD44 80241384 AE00001C */ sw $zero, 0x1c($s0) -.L80241388: -/* EDFD48 80241388 8FBF0038 */ lw $ra, 0x38($sp) -/* EDFD4C 8024138C 8FB30034 */ lw $s3, 0x34($sp) -/* EDFD50 80241390 8FB20030 */ lw $s2, 0x30($sp) -/* EDFD54 80241394 8FB1002C */ lw $s1, 0x2c($sp) -/* EDFD58 80241398 8FB00028 */ lw $s0, 0x28($sp) -/* EDFD5C 8024139C D7B60048 */ ldc1 $f22, 0x48($sp) -/* EDFD60 802413A0 D7B40040 */ ldc1 $f20, 0x40($sp) -/* EDFD64 802413A4 03E00008 */ jr $ra -/* EDFD68 802413A8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_802413AC_EDFD6C.s b/ver/us/asm/nonmatchings/EDEA00/func_802413AC_EDFD6C.s deleted file mode 100644 index 5cd8bc967f..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_802413AC_EDFD6C.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413AC_EDFD6C -/* EDFD6C 802413AC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* EDFD70 802413B0 AFB00028 */ sw $s0, 0x28($sp) -/* EDFD74 802413B4 00A0802D */ daddu $s0, $a1, $zero -/* EDFD78 802413B8 AFB1002C */ sw $s1, 0x2c($sp) -/* EDFD7C 802413BC 00C0882D */ daddu $s1, $a2, $zero -/* EDFD80 802413C0 AFBF0034 */ sw $ra, 0x34($sp) -/* EDFD84 802413C4 AFB20030 */ sw $s2, 0x30($sp) -/* EDFD88 802413C8 AE200070 */ sw $zero, 0x70($s1) -/* EDFD8C 802413CC 8C830000 */ lw $v1, ($a0) -/* EDFD90 802413D0 2402FDFF */ addiu $v0, $zero, -0x201 -/* EDFD94 802413D4 A480008E */ sh $zero, 0x8e($a0) -/* EDFD98 802413D8 00621824 */ and $v1, $v1, $v0 -/* EDFD9C 802413DC 34650800 */ ori $a1, $v1, 0x800 -/* EDFDA0 802413E0 AC850000 */ sw $a1, ($a0) -/* EDFDA4 802413E4 8E0200D0 */ lw $v0, 0xd0($s0) -/* EDFDA8 802413E8 8C420034 */ lw $v0, 0x34($v0) -/* EDFDAC 802413EC 10400003 */ beqz $v0, .L802413FC -/* EDFDB0 802413F0 00E0902D */ daddu $s2, $a3, $zero -/* EDFDB4 802413F4 08090501 */ j .L80241404 -/* EDFDB8 802413F8 34620808 */ ori $v0, $v1, 0x808 -.L802413FC: -/* EDFDBC 802413FC 2402FFF7 */ addiu $v0, $zero, -9 -/* EDFDC0 80241400 00A21024 */ and $v0, $a1, $v0 -.L80241404: -/* EDFDC4 80241404 AC820000 */ sw $v0, ($a0) -/* EDFDC8 80241408 27A20024 */ addiu $v0, $sp, 0x24 -/* EDFDCC 8024140C 27A50018 */ addiu $a1, $sp, 0x18 -/* EDFDD0 80241410 C4800038 */ lwc1 $f0, 0x38($a0) -/* EDFDD4 80241414 C482003C */ lwc1 $f2, 0x3c($a0) -/* EDFDD8 80241418 C4840040 */ lwc1 $f4, 0x40($a0) -/* EDFDDC 8024141C 3C01447A */ lui $at, 0x447a -/* EDFDE0 80241420 44813000 */ mtc1 $at, $f6 -/* EDFDE4 80241424 27A6001C */ addiu $a2, $sp, 0x1c -/* EDFDE8 80241428 E7A00018 */ swc1 $f0, 0x18($sp) -/* EDFDEC 8024142C E7A2001C */ swc1 $f2, 0x1c($sp) -/* EDFDF0 80241430 E7A40020 */ swc1 $f4, 0x20($sp) -/* EDFDF4 80241434 E7A60024 */ swc1 $f6, 0x24($sp) -/* EDFDF8 80241438 AFA20010 */ sw $v0, 0x10($sp) -/* EDFDFC 8024143C 8C840080 */ lw $a0, 0x80($a0) -/* EDFE00 80241440 0C03908F */ jal dead_npc_raycast_down_sides -/* EDFE04 80241444 27A70020 */ addiu $a3, $sp, 0x20 -/* EDFE08 80241448 C7A20024 */ lwc1 $f2, 0x24($sp) -/* EDFE0C 8024144C 3C014059 */ lui $at, 0x4059 -/* EDFE10 80241450 44812800 */ mtc1 $at, $f5 -/* EDFE14 80241454 44802000 */ mtc1 $zero, $f4 -/* EDFE18 80241458 460010A1 */ cvt.d.s $f2, $f2 -/* EDFE1C 8024145C 46241082 */ mul.d $f2, $f2, $f4 -/* EDFE20 80241460 00000000 */ nop -/* EDFE24 80241464 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* EDFE28 80241468 46000021 */ cvt.d.s $f0, $f0 -/* EDFE2C 8024146C 46240002 */ mul.d $f0, $f0, $f4 -/* EDFE30 80241470 00000000 */ nop -/* EDFE34 80241474 3C013FE0 */ lui $at, 0x3fe0 -/* EDFE38 80241478 44812800 */ mtc1 $at, $f5 -/* EDFE3C 8024147C 44802000 */ mtc1 $zero, $f4 -/* EDFE40 80241480 00000000 */ nop -/* EDFE44 80241484 46241080 */ add.d $f2, $f2, $f4 -/* EDFE48 80241488 AE000074 */ sw $zero, 0x74($s0) -/* EDFE4C 8024148C 46240000 */ add.d $f0, $f0, $f4 -/* EDFE50 80241490 AE000090 */ sw $zero, 0x90($s0) -/* EDFE54 80241494 4620120D */ trunc.w.d $f8, $f2 -/* EDFE58 80241498 E6080078 */ swc1 $f8, 0x78($s0) -/* EDFE5C 8024149C 4620020D */ trunc.w.d $f8, $f0 -/* EDFE60 802414A0 E6080088 */ swc1 $f8, 0x88($s0) -/* EDFE64 802414A4 8E420014 */ lw $v0, 0x14($s2) -/* EDFE68 802414A8 AE220074 */ sw $v0, 0x74($s1) -/* EDFE6C 802414AC 8E0200B0 */ lw $v0, 0xb0($s0) -/* EDFE70 802414B0 34420010 */ ori $v0, $v0, 0x10 -/* EDFE74 802414B4 AE0200B0 */ sw $v0, 0xb0($s0) -/* EDFE78 802414B8 8FBF0034 */ lw $ra, 0x34($sp) -/* EDFE7C 802414BC 8FB20030 */ lw $s2, 0x30($sp) -/* EDFE80 802414C0 8FB1002C */ lw $s1, 0x2c($sp) -/* EDFE84 802414C4 8FB00028 */ lw $s0, 0x28($sp) -/* EDFE88 802414C8 03E00008 */ jr $ra -/* EDFE8C 802414CC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s b/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s index f0f9825e06..4c7d684725 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s @@ -67,7 +67,7 @@ glabel func_802414D0_EDFE90 /* EDFF60 802415A0 0280202D */ daddu $a0, $s4, $zero /* EDFF64 802415A4 0240282D */ daddu $a1, $s2, $zero /* EDFF68 802415A8 02A0302D */ daddu $a2, $s5, $zero -/* EDFF6C 802415AC 0C0904EB */ jal func_802413AC_EDFD6C +/* EDFF6C 802415AC 0C0904EB */ jal EDEA00_UnkFunc5 /* EDFF70 802415B0 0200382D */ daddu $a3, $s0, $zero .L802415B4: /* EDFF74 802415B4 2402FFFE */ addiu $v0, $zero, -2 @@ -95,7 +95,7 @@ glabel func_802414D0_EDFE90 glabel L80241608_EDFFC8 /* EDFFC8 80241608 02A0202D */ daddu $a0, $s5, $zero /* EDFFCC 8024160C 0200282D */ daddu $a1, $s0, $zero -/* EDFFD0 80241610 0C090071 */ jal func_802401C4_EDEB84 +/* EDFFD0 80241610 0C090071 */ jal EDEA00_UnkNpcAIFunc23 /* EDFFD4 80241614 0260302D */ daddu $a2, $s3, $zero glabel L80241618_EDFFD8 /* EDFFD8 80241618 02A0202D */ daddu $a0, $s5, $zero @@ -112,14 +112,14 @@ glabel L80241630_EDFFF0 glabel L80241640_EE0000 /* EE0000 80241640 02A0202D */ daddu $a0, $s5, $zero /* EE0004 80241644 0200282D */ daddu $a1, $s0, $zero -/* EE0008 80241648 0C090297 */ jal func_80240A5C_EDF41C +/* EE0008 80241648 0C090297 */ jal EDEA00_UnkFunc4 /* EE000C 8024164C 0260302D */ daddu $a2, $s3, $zero /* EE0010 80241650 080905B1 */ j .L802416C4 /* EE0014 80241654 0000102D */ daddu $v0, $zero, $zero glabel L80241658_EE0018 /* EE0018 80241658 02A0202D */ daddu $a0, $s5, $zero /* EE001C 8024165C 0200282D */ daddu $a1, $s0, $zero -/* EE0020 80241660 0C090368 */ jal func_80240DA0_EDF760 +/* EE0020 80241660 0C090368 */ jal EDEA00_UnkNpcAIFunc2 /* EE0024 80241664 0260302D */ daddu $a2, $s3, $zero glabel L80241668_EE0028 /* EE0028 80241668 02A0202D */ daddu $a0, $s5, $zero @@ -138,14 +138,14 @@ glabel L80241680_EE0040 glabel L80241698_EE0058 /* EE0058 80241698 02A0202D */ daddu $a0, $s5, $zero /* EE005C 8024169C 0200282D */ daddu $a1, $s0, $zero -/* EE0060 802416A0 0C0903EE */ jal func_80240FB8_EDF978 +/* EE0060 802416A0 0C0903EE */ jal EDEA00_UnkNpcAIFunc3 /* EE0064 802416A4 0260302D */ daddu $a2, $s3, $zero /* EE0068 802416A8 080905B1 */ j .L802416C4 /* EE006C 802416AC 0000102D */ daddu $v0, $zero, $zero glabel L802416B0_EE0070 /* EE0070 802416B0 02A0202D */ daddu $a0, $s5, $zero /* EE0074 802416B4 0200282D */ daddu $a1, $s0, $zero -/* EE0078 802416B8 0C090407 */ jal func_8024101C_EDF9DC +/* EE0078 802416B8 0C090407 */ jal EDEA00_UnkFunc6 /* EE007C 802416BC 0260302D */ daddu $a2, $s3, $zero glabel L802416C0_EE0080 /* EE0080 802416C0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s b/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s index 740259a093..6b82b0186a 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s @@ -59,7 +59,7 @@ glabel func_80241DE4_EE07A4 /* EE087C 80241EBC 0240202D */ daddu $a0, $s2, $zero /* EE0880 80241EC0 0260282D */ daddu $a1, $s3, $zero /* EE0884 80241EC4 0280302D */ daddu $a2, $s4, $zero -/* EE0888 80241EC8 0C0904EB */ jal func_802413AC_EDFD6C +/* EE0888 80241EC8 0C0904EB */ jal EDEA00_UnkFunc5 /* EE088C 80241ECC 02C0382D */ daddu $a3, $s6, $zero /* EE0890 80241ED0 AE800070 */ sw $zero, 0x70($s4) .L80241ED4: @@ -96,7 +96,7 @@ glabel func_80241DE4_EE07A4 .L80241F44: /* EE0904 80241F44 0280202D */ daddu $a0, $s4, $zero /* EE0908 80241F48 02C0282D */ daddu $a1, $s6, $zero -/* EE090C 80241F4C 0C090071 */ jal func_802401C4_EDEB84 +/* EE090C 80241F4C 0C090071 */ jal EDEA00_UnkNpcAIFunc23 /* EE0910 80241F50 02A0302D */ daddu $a2, $s5, $zero .L80241F54: /* EE0914 80241F54 0280202D */ daddu $a0, $s4, $zero @@ -171,13 +171,13 @@ glabel func_80241DE4_EE07A4 .L8024204C: /* EE0A0C 8024204C 0280202D */ daddu $a0, $s4, $zero /* EE0A10 80242050 02C0282D */ daddu $a1, $s6, $zero -/* EE0A14 80242054 0C0903EE */ jal func_80240FB8_EDF978 +/* EE0A14 80242054 0C0903EE */ jal EDEA00_UnkNpcAIFunc3 /* EE0A18 80242058 02A0302D */ daddu $a2, $s5, $zero /* EE0A1C 8024205C 0809081C */ j .L80242070 /* EE0A20 80242060 00000000 */ nop .L80242064: /* EE0A24 80242064 02C0282D */ daddu $a1, $s6, $zero -/* EE0A28 80242068 0C090407 */ jal func_8024101C_EDF9DC +/* EE0A28 80242068 0C090407 */ jal EDEA00_UnkFunc6 /* EE0A2C 8024206C 02A0302D */ daddu $a2, $s5, $zero .L80242070: /* EE0A30 80242070 8E830070 */ lw $v1, 0x70($s4) diff --git a/ver/us/asm/nonmatchings/EE70C0/func_802413A8_EE7958.s b/ver/us/asm/nonmatchings/EE70C0/func_802413A8_EE7958.s deleted file mode 100644 index 3eb214a182..0000000000 --- a/ver/us/asm/nonmatchings/EE70C0/func_802413A8_EE7958.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413A8_EE7958 -/* EE7958 802413A8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* EE795C 802413AC AFB3004C */ sw $s3, 0x4c($sp) -/* EE7960 802413B0 0080982D */ daddu $s3, $a0, $zero -/* EE7964 802413B4 AFBF0054 */ sw $ra, 0x54($sp) -/* EE7968 802413B8 AFB40050 */ sw $s4, 0x50($sp) -/* EE796C 802413BC AFB20048 */ sw $s2, 0x48($sp) -/* EE7970 802413C0 AFB10044 */ sw $s1, 0x44($sp) -/* EE7974 802413C4 AFB00040 */ sw $s0, 0x40($sp) -/* EE7978 802413C8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* EE797C 802413CC F7B80068 */ sdc1 $f24, 0x68($sp) -/* EE7980 802413D0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* EE7984 802413D4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* EE7988 802413D8 8E710148 */ lw $s1, 0x148($s3) -/* EE798C 802413DC 00A0902D */ daddu $s2, $a1, $zero -/* EE7990 802413E0 86240008 */ lh $a0, 8($s1) -/* EE7994 802413E4 0C00F92F */ jal dead_get_npc_unsafe -/* EE7998 802413E8 00C0A02D */ daddu $s4, $a2, $zero -/* EE799C 802413EC 0040802D */ daddu $s0, $v0, $zero -/* EE79A0 802413F0 C6200078 */ lwc1 $f0, 0x78($s1) -/* EE79A4 802413F4 46800020 */ cvt.s.w $f0, $f0 -/* EE79A8 802413F8 46000021 */ cvt.d.s $f0, $f0 -/* EE79AC 802413FC 3C014059 */ lui $at, 0x4059 -/* EE79B0 80241400 44811800 */ mtc1 $at, $f3 -/* EE79B4 80241404 44801000 */ mtc1 $zero, $f2 -/* EE79B8 80241408 8602008E */ lh $v0, 0x8e($s0) -/* EE79BC 8024140C 9603008E */ lhu $v1, 0x8e($s0) -/* EE79C0 80241410 46220003 */ div.d $f0, $f0, $f2 -/* EE79C4 80241414 46200620 */ cvt.s.d $f24, $f0 -/* EE79C8 80241418 C6200088 */ lwc1 $f0, 0x88($s1) -/* EE79CC 8024141C 46800020 */ cvt.s.w $f0, $f0 -/* EE79D0 80241420 46000021 */ cvt.d.s $f0, $f0 -/* EE79D4 80241424 46220003 */ div.d $f0, $f0, $f2 -/* EE79D8 80241428 46200020 */ cvt.s.d $f0, $f0 -/* EE79DC 8024142C 18400003 */ blez $v0, .L8024143C -/* EE79E0 80241430 4600C680 */ add.s $f26, $f24, $f0 -/* EE79E4 80241434 2462FFFF */ addiu $v0, $v1, -1 -/* EE79E8 80241438 A602008E */ sh $v0, 0x8e($s0) -.L8024143C: -/* EE79EC 8024143C 8E220070 */ lw $v0, 0x70($s1) -/* EE79F0 80241440 18400034 */ blez $v0, .L80241514 -/* EE79F4 80241444 00000000 */ nop -/* EE79F8 80241448 C62C0074 */ lwc1 $f12, 0x74($s1) -/* EE79FC 8024144C 46806320 */ cvt.s.w $f12, $f12 -/* EE7A00 80241450 44820000 */ mtc1 $v0, $f0 -/* EE7A04 80241454 00000000 */ nop -/* EE7A08 80241458 46800020 */ cvt.s.w $f0, $f0 -/* EE7A0C 8024145C 46000021 */ cvt.d.s $f0, $f0 -/* EE7A10 80241460 46220003 */ div.d $f0, $f0, $f2 -/* EE7A14 80241464 0C00AD77 */ jal dead_sin_deg -/* EE7A18 80241468 462005A0 */ cvt.s.d $f22, $f0 -/* EE7A1C 8024146C 8E020000 */ lw $v0, ($s0) -/* EE7A20 80241470 30420008 */ andi $v0, $v0, 8 -/* EE7A24 80241474 10400003 */ beqz $v0, .L80241484 -/* EE7A28 80241478 46000506 */ mov.s $f20, $f0 -/* EE7A2C 8024147C 08090531 */ j .L802414C4 -/* EE7A30 80241480 0000102D */ daddu $v0, $zero, $zero -.L80241484: -/* EE7A34 80241484 27A50028 */ addiu $a1, $sp, 0x28 -/* EE7A38 80241488 27A6002C */ addiu $a2, $sp, 0x2c -/* EE7A3C 8024148C C6000038 */ lwc1 $f0, 0x38($s0) -/* EE7A40 80241490 C602003C */ lwc1 $f2, 0x3c($s0) -/* EE7A44 80241494 C6040040 */ lwc1 $f4, 0x40($s0) -/* EE7A48 80241498 3C01447A */ lui $at, 0x447a -/* EE7A4C 8024149C 44813000 */ mtc1 $at, $f6 -/* EE7A50 802414A0 27A20034 */ addiu $v0, $sp, 0x34 -/* EE7A54 802414A4 E7A00028 */ swc1 $f0, 0x28($sp) -/* EE7A58 802414A8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* EE7A5C 802414AC E7A40030 */ swc1 $f4, 0x30($sp) -/* EE7A60 802414B0 E7A60034 */ swc1 $f6, 0x34($sp) -/* EE7A64 802414B4 AFA20010 */ sw $v0, 0x10($sp) -/* EE7A68 802414B8 8E040080 */ lw $a0, 0x80($s0) -/* EE7A6C 802414BC 0C03908F */ jal dead_npc_raycast_down_sides -/* EE7A70 802414C0 27A70030 */ addiu $a3, $sp, 0x30 -.L802414C4: -/* EE7A74 802414C4 10400007 */ beqz $v0, .L802414E4 -/* EE7A78 802414C8 00000000 */ nop -/* EE7A7C 802414CC 4616A082 */ mul.s $f2, $f20, $f22 -/* EE7A80 802414D0 00000000 */ nop -/* EE7A84 802414D4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* EE7A88 802414D8 46180000 */ add.s $f0, $f0, $f24 -/* EE7A8C 802414DC 0809053C */ j .L802414F0 -/* EE7A90 802414E0 46020000 */ add.s $f0, $f0, $f2 -.L802414E4: -/* EE7A94 802414E4 4616A002 */ mul.s $f0, $f20, $f22 -/* EE7A98 802414E8 00000000 */ nop -/* EE7A9C 802414EC 4600D000 */ add.s $f0, $f26, $f0 -.L802414F0: -/* EE7AA0 802414F0 E600003C */ swc1 $f0, 0x3c($s0) -/* EE7AA4 802414F4 8E220074 */ lw $v0, 0x74($s1) -/* EE7AA8 802414F8 2442000A */ addiu $v0, $v0, 0xa -/* EE7AAC 802414FC 44826000 */ mtc1 $v0, $f12 -/* EE7AB0 80241500 00000000 */ nop -/* EE7AB4 80241504 0C00AB85 */ jal dead_clamp_angle -/* EE7AB8 80241508 46806320 */ cvt.s.w $f12, $f12 -/* EE7ABC 8024150C 4600020D */ trunc.w.s $f8, $f0 -/* EE7AC0 80241510 E6280074 */ swc1 $f8, 0x74($s1) -.L80241514: -/* EE7AC4 80241514 8E220090 */ lw $v0, 0x90($s1) -/* EE7AC8 80241518 1C400040 */ bgtz $v0, .L8024161C -/* EE7ACC 8024151C 2442FFFF */ addiu $v0, $v0, -1 -/* EE7AD0 80241520 860200A8 */ lh $v0, 0xa8($s0) -/* EE7AD4 80241524 C600003C */ lwc1 $f0, 0x3c($s0) -/* EE7AD8 80241528 44821000 */ mtc1 $v0, $f2 -/* EE7ADC 8024152C 00000000 */ nop -/* EE7AE0 80241530 468010A0 */ cvt.s.w $f2, $f2 -/* EE7AE4 80241534 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EE7AE8 80241538 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EE7AEC 8024153C 46020000 */ add.s $f0, $f0, $f2 -/* EE7AF0 80241540 3C014024 */ lui $at, 0x4024 -/* EE7AF4 80241544 44812800 */ mtc1 $at, $f5 -/* EE7AF8 80241548 44802000 */ mtc1 $zero, $f4 -/* EE7AFC 8024154C C442002C */ lwc1 $f2, 0x2c($v0) -/* EE7B00 80241550 46000021 */ cvt.d.s $f0, $f0 -/* EE7B04 80241554 46240000 */ add.d $f0, $f0, $f4 -/* EE7B08 80241558 460010A1 */ cvt.d.s $f2, $f2 -/* EE7B0C 8024155C 4620103C */ c.lt.d $f2, $f0 -/* EE7B10 80241560 00000000 */ nop -/* EE7B14 80241564 4500002E */ bc1f .L80241620 -/* EE7B18 80241568 0280202D */ daddu $a0, $s4, $zero -/* EE7B1C 8024156C 24020001 */ addiu $v0, $zero, 1 -/* EE7B20 80241570 AFA20010 */ sw $v0, 0x10($sp) -/* EE7B24 80241574 8E460024 */ lw $a2, 0x24($s2) -/* EE7B28 80241578 8E470028 */ lw $a3, 0x28($s2) -/* EE7B2C 8024157C 0C013469 */ jal func_8004D1A4 -/* EE7B30 80241580 0220282D */ daddu $a1, $s1, $zero -/* EE7B34 80241584 10400026 */ beqz $v0, .L80241620 -/* EE7B38 80241588 0000202D */ daddu $a0, $zero, $zero -/* EE7B3C 8024158C 0200282D */ daddu $a1, $s0, $zero -/* EE7B40 80241590 0000302D */ daddu $a2, $zero, $zero -/* EE7B44 80241594 2412000C */ addiu $s2, $zero, 0xc -/* EE7B48 80241598 860300A8 */ lh $v1, 0xa8($s0) -/* EE7B4C 8024159C 3C013F80 */ lui $at, 0x3f80 -/* EE7B50 802415A0 44810000 */ mtc1 $at, $f0 -/* EE7B54 802415A4 3C014000 */ lui $at, 0x4000 -/* EE7B58 802415A8 44811000 */ mtc1 $at, $f2 -/* EE7B5C 802415AC 3C01C1A0 */ lui $at, 0xc1a0 -/* EE7B60 802415B0 44812000 */ mtc1 $at, $f4 -/* EE7B64 802415B4 44834000 */ mtc1 $v1, $f8 -/* EE7B68 802415B8 00000000 */ nop -/* EE7B6C 802415BC 46804220 */ cvt.s.w $f8, $f8 -/* EE7B70 802415C0 44074000 */ mfc1 $a3, $f8 -/* EE7B74 802415C4 27A20038 */ addiu $v0, $sp, 0x38 -/* EE7B78 802415C8 AFB2001C */ sw $s2, 0x1c($sp) -/* EE7B7C 802415CC AFA20020 */ sw $v0, 0x20($sp) -/* EE7B80 802415D0 E7A00010 */ swc1 $f0, 0x10($sp) -/* EE7B84 802415D4 E7A20014 */ swc1 $f2, 0x14($sp) -/* EE7B88 802415D8 0C01D444 */ jal dead_fx_emote -/* EE7B8C 802415DC E7A40018 */ swc1 $f4, 0x18($sp) -/* EE7B90 802415E0 0200202D */ daddu $a0, $s0, $zero -/* EE7B94 802415E4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* EE7B98 802415E8 C480003C */ lwc1 $f0, 0x3c($a0) -/* EE7B9C 802415EC 3C060020 */ lui $a2, 0x20 -/* EE7BA0 802415F0 0C013600 */ jal dead_ai_enemy_play_sound -/* EE7BA4 802415F4 E4800064 */ swc1 $f0, 0x64($a0) -/* EE7BA8 802415F8 8E220018 */ lw $v0, 0x18($s1) -/* EE7BAC 802415FC 9442002A */ lhu $v0, 0x2a($v0) -/* EE7BB0 80241600 30420001 */ andi $v0, $v0, 1 -/* EE7BB4 80241604 10400003 */ beqz $v0, .L80241614 -/* EE7BB8 80241608 2402000A */ addiu $v0, $zero, 0xa -/* EE7BBC 8024160C 080905AF */ j .L802416BC -/* EE7BC0 80241610 AE620070 */ sw $v0, 0x70($s3) -.L80241614: -/* EE7BC4 80241614 080905AF */ j .L802416BC -/* EE7BC8 80241618 AE720070 */ sw $s2, 0x70($s3) -.L8024161C: -/* EE7BCC 8024161C AE220090 */ sw $v0, 0x90($s1) -.L80241620: -/* EE7BD0 80241620 8602008C */ lh $v0, 0x8c($s0) -/* EE7BD4 80241624 14400025 */ bnez $v0, .L802416BC -/* EE7BD8 80241628 00000000 */ nop -/* EE7BDC 8024162C 8602008E */ lh $v0, 0x8e($s0) -/* EE7BE0 80241630 1C400022 */ bgtz $v0, .L802416BC -/* EE7BE4 80241634 00000000 */ nop -/* EE7BE8 80241638 8E620074 */ lw $v0, 0x74($s3) -/* EE7BEC 8024163C 2442FFFF */ addiu $v0, $v0, -1 -/* EE7BF0 80241640 1840001D */ blez $v0, .L802416B8 -/* EE7BF4 80241644 AE620074 */ sw $v0, 0x74($s3) -/* EE7BF8 80241648 8E220018 */ lw $v0, 0x18($s1) -/* EE7BFC 8024164C 9442002A */ lhu $v0, 0x2a($v0) -/* EE7C00 80241650 30420010 */ andi $v0, $v0, 0x10 -/* EE7C04 80241654 14400007 */ bnez $v0, .L80241674 -/* EE7C08 80241658 00000000 */ nop -/* EE7C0C 8024165C C600000C */ lwc1 $f0, 0xc($s0) -/* EE7C10 80241660 3C014334 */ lui $at, 0x4334 -/* EE7C14 80241664 44816000 */ mtc1 $at, $f12 -/* EE7C18 80241668 0C00AB85 */ jal dead_clamp_angle -/* EE7C1C 8024166C 460C0300 */ add.s $f12, $f0, $f12 -/* EE7C20 80241670 E600000C */ swc1 $f0, 0xc($s0) -.L80241674: -/* EE7C24 80241674 0C00AB3B */ jal dead_rand_int -/* EE7C28 80241678 240403E8 */ addiu $a0, $zero, 0x3e8 -/* EE7C2C 8024167C 3C032E8B */ lui $v1, 0x2e8b -/* EE7C30 80241680 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* EE7C34 80241684 00430018 */ mult $v0, $v1 -/* EE7C38 80241688 00021FC3 */ sra $v1, $v0, 0x1f -/* EE7C3C 8024168C 00004010 */ mfhi $t0 -/* EE7C40 80241690 00082043 */ sra $a0, $t0, 1 -/* EE7C44 80241694 00832023 */ subu $a0, $a0, $v1 -/* EE7C48 80241698 00041840 */ sll $v1, $a0, 1 -/* EE7C4C 8024169C 00641821 */ addu $v1, $v1, $a0 -/* EE7C50 802416A0 00031880 */ sll $v1, $v1, 2 -/* EE7C54 802416A4 00641823 */ subu $v1, $v1, $a0 -/* EE7C58 802416A8 00431023 */ subu $v0, $v0, $v1 -/* EE7C5C 802416AC 24420005 */ addiu $v0, $v0, 5 -/* EE7C60 802416B0 080905AF */ j .L802416BC -/* EE7C64 802416B4 A602008E */ sh $v0, 0x8e($s0) -.L802416B8: -/* EE7C68 802416B8 AE600070 */ sw $zero, 0x70($s3) -.L802416BC: -/* EE7C6C 802416BC 8FBF0054 */ lw $ra, 0x54($sp) -/* EE7C70 802416C0 8FB40050 */ lw $s4, 0x50($sp) -/* EE7C74 802416C4 8FB3004C */ lw $s3, 0x4c($sp) -/* EE7C78 802416C8 8FB20048 */ lw $s2, 0x48($sp) -/* EE7C7C 802416CC 8FB10044 */ lw $s1, 0x44($sp) -/* EE7C80 802416D0 8FB00040 */ lw $s0, 0x40($sp) -/* EE7C84 802416D4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* EE7C88 802416D8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* EE7C8C 802416DC D7B60060 */ ldc1 $f22, 0x60($sp) -/* EE7C90 802416E0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* EE7C94 802416E4 03E00008 */ jr $ra -/* EE7C98 802416E8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/EE70C0/func_802416EC_EE7C9C.s b/ver/us/asm/nonmatchings/EE70C0/func_802416EC_EE7C9C.s deleted file mode 100644 index ea9f389336..0000000000 --- a/ver/us/asm/nonmatchings/EE70C0/func_802416EC_EE7C9C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416EC_EE7C9C -/* EE7C9C 802416EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EE7CA0 802416F0 AFB20018 */ sw $s2, 0x18($sp) -/* EE7CA4 802416F4 0080902D */ daddu $s2, $a0, $zero -/* EE7CA8 802416F8 AFBF001C */ sw $ra, 0x1c($sp) -/* EE7CAC 802416FC AFB10014 */ sw $s1, 0x14($sp) -/* EE7CB0 80241700 AFB00010 */ sw $s0, 0x10($sp) -/* EE7CB4 80241704 8E510148 */ lw $s1, 0x148($s2) -/* EE7CB8 80241708 0C00F92F */ jal dead_get_npc_unsafe -/* EE7CBC 8024170C 86240008 */ lh $a0, 8($s1) -/* EE7CC0 80241710 0040802D */ daddu $s0, $v0, $zero -/* EE7CC4 80241714 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EE7CC8 80241718 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EE7CCC 8024171C C60C0038 */ lwc1 $f12, 0x38($s0) -/* EE7CD0 80241720 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EE7CD4 80241724 A600008E */ sh $zero, 0x8e($s0) -/* EE7CD8 80241728 8C460028 */ lw $a2, 0x28($v0) -/* EE7CDC 8024172C 0C00ABDC */ jal fio_validate_header_checksums -/* EE7CE0 80241730 8C470030 */ lw $a3, 0x30($v0) -/* EE7CE4 80241734 E600000C */ swc1 $f0, 0xc($s0) -/* EE7CE8 80241738 8E2200CC */ lw $v0, 0xcc($s1) -/* EE7CEC 8024173C 8C420020 */ lw $v0, 0x20($v0) -/* EE7CF0 80241740 AE020028 */ sw $v0, 0x28($s0) -/* EE7CF4 80241744 2402000B */ addiu $v0, $zero, 0xb -/* EE7CF8 80241748 AE420070 */ sw $v0, 0x70($s2) -/* EE7CFC 8024174C 8FBF001C */ lw $ra, 0x1c($sp) -/* EE7D00 80241750 8FB20018 */ lw $s2, 0x18($sp) -/* EE7D04 80241754 8FB10014 */ lw $s1, 0x14($sp) -/* EE7D08 80241758 8FB00010 */ lw $s0, 0x10($sp) -/* EE7D0C 8024175C 03E00008 */ jr $ra -/* EE7D10 80241760 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80241764_EE7D14.s b/ver/us/asm/nonmatchings/EE70C0/func_80241764_EE7D14.s deleted file mode 100644 index aa3c4de86f..0000000000 --- a/ver/us/asm/nonmatchings/EE70C0/func_80241764_EE7D14.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241764_EE7D14 -/* EE7D14 80241764 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EE7D18 80241768 AFB00010 */ sw $s0, 0x10($sp) -/* EE7D1C 8024176C 0080802D */ daddu $s0, $a0, $zero -/* EE7D20 80241770 AFBF0014 */ sw $ra, 0x14($sp) -/* EE7D24 80241774 8E020148 */ lw $v0, 0x148($s0) -/* EE7D28 80241778 0C00F92F */ jal dead_get_npc_unsafe -/* EE7D2C 8024177C 84440008 */ lh $a0, 8($v0) -/* EE7D30 80241780 9443008E */ lhu $v1, 0x8e($v0) -/* EE7D34 80241784 C440003C */ lwc1 $f0, 0x3c($v0) -/* EE7D38 80241788 24640001 */ addiu $a0, $v1, 1 -/* EE7D3C 8024178C 00031C00 */ sll $v1, $v1, 0x10 -/* EE7D40 80241790 00031B83 */ sra $v1, $v1, 0xe -/* EE7D44 80241794 A444008E */ sh $a0, 0x8e($v0) -/* EE7D48 80241798 3C018024 */ lui $at, %hi(D_802444F0_EEAAA0) -/* EE7D4C 8024179C 00230821 */ addu $at, $at, $v1 -/* EE7D50 802417A0 C42244F0 */ lwc1 $f2, %lo(D_802444F0_EEAAA0)($at) -/* EE7D54 802417A4 8443008E */ lh $v1, 0x8e($v0) -/* EE7D58 802417A8 46020000 */ add.s $f0, $f0, $f2 -/* EE7D5C 802417AC 28630005 */ slti $v1, $v1, 5 -/* EE7D60 802417B0 14600003 */ bnez $v1, .L802417C0 -/* EE7D64 802417B4 E440003C */ swc1 $f0, 0x3c($v0) -/* EE7D68 802417B8 2402000C */ addiu $v0, $zero, 0xc -/* EE7D6C 802417BC AE020070 */ sw $v0, 0x70($s0) -.L802417C0: -/* EE7D70 802417C0 8FBF0014 */ lw $ra, 0x14($sp) -/* EE7D74 802417C4 8FB00010 */ lw $s0, 0x10($sp) -/* EE7D78 802417C8 03E00008 */ jr $ra -/* EE7D7C 802417CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80241904_EE7EB4.s b/ver/us/asm/nonmatchings/EE70C0/func_80241904_EE7EB4.s deleted file mode 100644 index 4cfea2d18a..0000000000 --- a/ver/us/asm/nonmatchings/EE70C0/func_80241904_EE7EB4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241904_EE7EB4 -/* EE7EB4 80241904 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EE7EB8 80241908 AFB00010 */ sw $s0, 0x10($sp) -/* EE7EBC 8024190C 0080802D */ daddu $s0, $a0, $zero -/* EE7EC0 80241910 AFBF0014 */ sw $ra, 0x14($sp) -/* EE7EC4 80241914 8E020148 */ lw $v0, 0x148($s0) -/* EE7EC8 80241918 0C00F92F */ jal dead_get_npc_unsafe -/* EE7ECC 8024191C 84440008 */ lh $a0, 8($v0) -/* EE7ED0 80241920 0040202D */ daddu $a0, $v0, $zero -/* EE7ED4 80241924 8482008E */ lh $v0, 0x8e($a0) -/* EE7ED8 80241928 9483008E */ lhu $v1, 0x8e($a0) -/* EE7EDC 8024192C 18400005 */ blez $v0, .L80241944 -/* EE7EE0 80241930 2462FFFF */ addiu $v0, $v1, -1 -/* EE7EE4 80241934 A482008E */ sh $v0, 0x8e($a0) -/* EE7EE8 80241938 00021400 */ sll $v0, $v0, 0x10 -/* EE7EEC 8024193C 1C400006 */ bgtz $v0, .L80241958 -/* EE7EF0 80241940 00000000 */ nop -.L80241944: -/* EE7EF4 80241944 8482008C */ lh $v0, 0x8c($a0) -/* EE7EF8 80241948 14400003 */ bnez $v0, .L80241958 -/* EE7EFC 8024194C 2402000E */ addiu $v0, $zero, 0xe -/* EE7F00 80241950 A480008E */ sh $zero, 0x8e($a0) -/* EE7F04 80241954 AE020070 */ sw $v0, 0x70($s0) -.L80241958: -/* EE7F08 80241958 8FBF0014 */ lw $ra, 0x14($sp) -/* EE7F0C 8024195C 8FB00010 */ lw $s0, 0x10($sp) -/* EE7F10 80241960 03E00008 */ jr $ra -/* EE7F14 80241964 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80241968_EE7F18.s b/ver/us/asm/nonmatchings/EE70C0/func_80241968_EE7F18.s deleted file mode 100644 index 43fa4538d9..0000000000 --- a/ver/us/asm/nonmatchings/EE70C0/func_80241968_EE7F18.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241968_EE7F18 -/* EE7F18 80241968 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* EE7F1C 8024196C AFB20030 */ sw $s2, 0x30($sp) -/* EE7F20 80241970 0080902D */ daddu $s2, $a0, $zero -/* EE7F24 80241974 AFBF0038 */ sw $ra, 0x38($sp) -/* EE7F28 80241978 AFB30034 */ sw $s3, 0x34($sp) -/* EE7F2C 8024197C AFB1002C */ sw $s1, 0x2c($sp) -/* EE7F30 80241980 AFB00028 */ sw $s0, 0x28($sp) -/* EE7F34 80241984 F7B60048 */ sdc1 $f22, 0x48($sp) -/* EE7F38 80241988 F7B40040 */ sdc1 $f20, 0x40($sp) -/* EE7F3C 8024198C 8E510148 */ lw $s1, 0x148($s2) -/* EE7F40 80241990 86240008 */ lh $a0, 8($s1) -/* EE7F44 80241994 0C00F92F */ jal dead_get_npc_unsafe -/* EE7F48 80241998 00A0982D */ daddu $s3, $a1, $zero -/* EE7F4C 8024199C 0040802D */ daddu $s0, $v0, $zero -/* EE7F50 802419A0 0200202D */ daddu $a0, $s0, $zero -/* EE7F54 802419A4 C6220088 */ lwc1 $f2, 0x88($s1) -/* EE7F58 802419A8 468010A0 */ cvt.s.w $f2, $f2 -/* EE7F5C 802419AC 460010A1 */ cvt.d.s $f2, $f2 -/* EE7F60 802419B0 C604001C */ lwc1 $f4, 0x1c($s0) -/* EE7F64 802419B4 C6000014 */ lwc1 $f0, 0x14($s0) -/* EE7F68 802419B8 8E050018 */ lw $a1, 0x18($s0) -/* EE7F6C 802419BC 46002100 */ add.s $f4, $f4, $f0 -/* EE7F70 802419C0 8E06000C */ lw $a2, 0xc($s0) -/* EE7F74 802419C4 C6200078 */ lwc1 $f0, 0x78($s1) -/* EE7F78 802419C8 46800020 */ cvt.s.w $f0, $f0 -/* EE7F7C 802419CC E604001C */ swc1 $f4, 0x1c($s0) -/* EE7F80 802419D0 3C014059 */ lui $at, 0x4059 -/* EE7F84 802419D4 44812800 */ mtc1 $at, $f5 -/* EE7F88 802419D8 44802000 */ mtc1 $zero, $f4 -/* EE7F8C 802419DC 46000021 */ cvt.d.s $f0, $f0 -/* EE7F90 802419E0 46240003 */ div.d $f0, $f0, $f4 -/* EE7F94 802419E4 46200520 */ cvt.s.d $f20, $f0 -/* EE7F98 802419E8 46241083 */ div.d $f2, $f2, $f4 -/* EE7F9C 802419EC 0C00F909 */ jal dead_npc_move_heading -/* EE7FA0 802419F0 462015A0 */ cvt.s.d $f22, $f2 -/* EE7FA4 802419F4 C604001C */ lwc1 $f4, 0x1c($s0) -/* EE7FA8 802419F8 44801000 */ mtc1 $zero, $f2 -/* EE7FAC 802419FC 44801800 */ mtc1 $zero, $f3 -/* EE7FB0 80241A00 46002021 */ cvt.d.s $f0, $f4 -/* EE7FB4 80241A04 4620103E */ c.le.d $f2, $f0 -/* EE7FB8 80241A08 00000000 */ nop -/* EE7FBC 80241A0C 45000030 */ bc1f .L80241AD0 -/* EE7FC0 80241A10 00000000 */ nop -/* EE7FC4 80241A14 C600003C */ lwc1 $f0, 0x3c($s0) -/* EE7FC8 80241A18 46040000 */ add.s $f0, $f0, $f4 -/* EE7FCC 80241A1C E600003C */ swc1 $f0, 0x3c($s0) -/* EE7FD0 80241A20 8E2200CC */ lw $v0, 0xcc($s1) -/* EE7FD4 80241A24 8C420024 */ lw $v0, 0x24($v0) -/* EE7FD8 80241A28 AE020028 */ sw $v0, 0x28($s0) -/* EE7FDC 80241A2C A2200007 */ sb $zero, 7($s1) -/* EE7FE0 80241A30 8E020000 */ lw $v0, ($s0) -/* EE7FE4 80241A34 30420008 */ andi $v0, $v0, 8 -/* EE7FE8 80241A38 14400011 */ bnez $v0, .L80241A80 -/* EE7FEC 80241A3C 0000102D */ daddu $v0, $zero, $zero -/* EE7FF0 80241A40 27A50018 */ addiu $a1, $sp, 0x18 -/* EE7FF4 80241A44 27A6001C */ addiu $a2, $sp, 0x1c -/* EE7FF8 80241A48 C6000038 */ lwc1 $f0, 0x38($s0) -/* EE7FFC 80241A4C C602003C */ lwc1 $f2, 0x3c($s0) -/* EE8000 80241A50 C6040040 */ lwc1 $f4, 0x40($s0) -/* EE8004 80241A54 3C01447A */ lui $at, 0x447a -/* EE8008 80241A58 44813000 */ mtc1 $at, $f6 -/* EE800C 80241A5C 27A20024 */ addiu $v0, $sp, 0x24 -/* EE8010 80241A60 E7A00018 */ swc1 $f0, 0x18($sp) -/* EE8014 80241A64 E7A2001C */ swc1 $f2, 0x1c($sp) -/* EE8018 80241A68 E7A40020 */ swc1 $f4, 0x20($sp) -/* EE801C 80241A6C E7A60024 */ swc1 $f6, 0x24($sp) -/* EE8020 80241A70 AFA20010 */ sw $v0, 0x10($sp) -/* EE8024 80241A74 8E040080 */ lw $a0, 0x80($s0) -/* EE8028 80241A78 0C03908F */ jal dead_npc_raycast_down_sides -/* EE802C 80241A7C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241A80: -/* EE8030 80241A80 1040000B */ beqz $v0, .L80241AB0 -/* EE8034 80241A84 00000000 */ nop -/* EE8038 80241A88 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* EE803C 80241A8C 46140080 */ add.s $f2, $f0, $f20 -/* EE8040 80241A90 C600003C */ lwc1 $f0, 0x3c($s0) -/* EE8044 80241A94 4600103E */ c.le.s $f2, $f0 -/* EE8048 80241A98 00000000 */ nop -/* EE804C 80241A9C 4500008D */ bc1f .L80241CD4 -/* EE8050 80241AA0 00000000 */ nop -/* EE8054 80241AA4 E602003C */ swc1 $f2, 0x3c($s0) -/* EE8058 80241AA8 08090735 */ j .L80241CD4 -/* EE805C 80241AAC AE400070 */ sw $zero, 0x70($s2) -.L80241AB0: -/* EE8060 80241AB0 C602003C */ lwc1 $f2, 0x3c($s0) -/* EE8064 80241AB4 C6000064 */ lwc1 $f0, 0x64($s0) -/* EE8068 80241AB8 4602003E */ c.le.s $f0, $f2 -/* EE806C 80241ABC 00000000 */ nop -/* EE8070 80241AC0 45030084 */ bc1tl .L80241CD4 -/* EE8074 80241AC4 AE400070 */ sw $zero, 0x70($s2) -/* EE8078 80241AC8 08090735 */ j .L80241CD4 -/* EE807C 80241ACC 00000000 */ nop -.L80241AD0: -/* EE8080 80241AD0 4622003C */ c.lt.d $f0, $f2 -/* EE8084 80241AD4 00000000 */ nop -/* EE8088 80241AD8 4500007E */ bc1f .L80241CD4 -/* EE808C 80241ADC 00000000 */ nop -/* EE8090 80241AE0 9602008E */ lhu $v0, 0x8e($s0) -/* EE8094 80241AE4 24420001 */ addiu $v0, $v0, 1 -/* EE8098 80241AE8 A602008E */ sh $v0, 0x8e($s0) -/* EE809C 80241AEC 00021400 */ sll $v0, $v0, 0x10 -/* EE80A0 80241AF0 8E630020 */ lw $v1, 0x20($s3) -/* EE80A4 80241AF4 00021403 */ sra $v0, $v0, 0x10 -/* EE80A8 80241AF8 0043102A */ slt $v0, $v0, $v1 -/* EE80AC 80241AFC 14400026 */ bnez $v0, .L80241B98 -/* EE80B0 80241B00 00000000 */ nop -/* EE80B4 80241B04 C60C0038 */ lwc1 $f12, 0x38($s0) -/* EE80B8 80241B08 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EE80BC 80241B0C 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EE80C0 80241B10 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EE80C4 80241B14 A600008E */ sh $zero, 0x8e($s0) -/* EE80C8 80241B18 8C460028 */ lw $a2, 0x28($v0) -/* EE80CC 80241B1C 0C00ABDC */ jal fio_validate_header_checksums -/* EE80D0 80241B20 8C470030 */ lw $a3, 0x30($v0) -/* EE80D4 80241B24 46000506 */ mov.s $f20, $f0 -/* EE80D8 80241B28 C60C000C */ lwc1 $f12, 0xc($s0) -/* EE80DC 80241B2C 0C00ABC6 */ jal dead_get_clamped_angle_diff -/* EE80E0 80241B30 4600A386 */ mov.s $f14, $f20 -/* EE80E4 80241B34 46000086 */ mov.s $f2, $f0 -/* EE80E8 80241B38 8E62001C */ lw $v0, 0x1c($s3) -/* EE80EC 80241B3C 46001005 */ abs.s $f0, $f2 -/* EE80F0 80241B40 44822000 */ mtc1 $v0, $f4 -/* EE80F4 80241B44 00000000 */ nop -/* EE80F8 80241B48 46802120 */ cvt.s.w $f4, $f4 -/* EE80FC 80241B4C 4600203C */ c.lt.s $f4, $f0 -/* EE8100 80241B50 00000000 */ nop -/* EE8104 80241B54 4500000D */ bc1f .L80241B8C -/* EE8108 80241B58 00000000 */ nop -/* EE810C 80241B5C 44800000 */ mtc1 $zero, $f0 -/* EE8110 80241B60 C614000C */ lwc1 $f20, 0xc($s0) -/* EE8114 80241B64 4600103C */ c.lt.s $f2, $f0 -/* EE8118 80241B68 00000000 */ nop -/* EE811C 80241B6C 45000006 */ bc1f .L80241B88 -/* EE8120 80241B70 00021023 */ negu $v0, $v0 -/* EE8124 80241B74 44820000 */ mtc1 $v0, $f0 -/* EE8128 80241B78 00000000 */ nop -/* EE812C 80241B7C 46800020 */ cvt.s.w $f0, $f0 -/* EE8130 80241B80 080906E3 */ j .L80241B8C -/* EE8134 80241B84 4600A500 */ add.s $f20, $f20, $f0 -.L80241B88: -/* EE8138 80241B88 4604A500 */ add.s $f20, $f20, $f4 -.L80241B8C: -/* EE813C 80241B8C 0C00AB85 */ jal dead_clamp_angle -/* EE8140 80241B90 4600A306 */ mov.s $f12, $f20 -/* EE8144 80241B94 E600000C */ swc1 $f0, 0xc($s0) -.L80241B98: -/* EE8148 80241B98 8E020000 */ lw $v0, ($s0) -/* EE814C 80241B9C 30420008 */ andi $v0, $v0, 8 -/* EE8150 80241BA0 1040000A */ beqz $v0, .L80241BCC -/* EE8154 80241BA4 27A50018 */ addiu $a1, $sp, 0x18 -/* EE8158 80241BA8 C602003C */ lwc1 $f2, 0x3c($s0) -/* EE815C 80241BAC C600001C */ lwc1 $f0, 0x1c($s0) -/* EE8160 80241BB0 46001080 */ add.s $f2, $f2, $f0 -/* EE8164 80241BB4 4616103C */ c.lt.s $f2, $f22 -/* EE8168 80241BB8 00000000 */ nop -/* EE816C 80241BBC 45020045 */ bc1fl .L80241CD4 -/* EE8170 80241BC0 E602003C */ swc1 $f2, 0x3c($s0) -/* EE8174 80241BC4 08090734 */ j .L80241CD0 -/* EE8178 80241BC8 E616003C */ swc1 $f22, 0x3c($s0) -.L80241BCC: -/* EE817C 80241BCC C6000038 */ lwc1 $f0, 0x38($s0) -/* EE8180 80241BD0 27A6001C */ addiu $a2, $sp, 0x1c -/* EE8184 80241BD4 E7A00018 */ swc1 $f0, 0x18($sp) -/* EE8188 80241BD8 860200A8 */ lh $v0, 0xa8($s0) -/* EE818C 80241BDC C600001C */ lwc1 $f0, 0x1c($s0) -/* EE8190 80241BE0 C604003C */ lwc1 $f4, 0x3c($s0) -/* EE8194 80241BE4 44821000 */ mtc1 $v0, $f2 -/* EE8198 80241BE8 00000000 */ nop -/* EE819C 80241BEC 468010A0 */ cvt.s.w $f2, $f2 -/* EE81A0 80241BF0 46000005 */ abs.s $f0, $f0 -/* EE81A4 80241BF4 46020000 */ add.s $f0, $f0, $f2 -/* EE81A8 80241BF8 C6060040 */ lwc1 $f6, 0x40($s0) -/* EE81AC 80241BFC 27A20024 */ addiu $v0, $sp, 0x24 -/* EE81B0 80241C00 46022100 */ add.s $f4, $f4, $f2 -/* EE81B4 80241C04 3C014024 */ lui $at, 0x4024 -/* EE81B8 80241C08 44811800 */ mtc1 $at, $f3 -/* EE81BC 80241C0C 44801000 */ mtc1 $zero, $f2 -/* EE81C0 80241C10 46000021 */ cvt.d.s $f0, $f0 -/* EE81C4 80241C14 46220000 */ add.d $f0, $f0, $f2 -/* EE81C8 80241C18 E7A60020 */ swc1 $f6, 0x20($sp) -/* EE81CC 80241C1C E7A4001C */ swc1 $f4, 0x1c($sp) -/* EE81D0 80241C20 46200020 */ cvt.s.d $f0, $f0 -/* EE81D4 80241C24 E7A00024 */ swc1 $f0, 0x24($sp) -/* EE81D8 80241C28 AFA20010 */ sw $v0, 0x10($sp) -/* EE81DC 80241C2C 8E040080 */ lw $a0, 0x80($s0) -/* EE81E0 80241C30 0C03908F */ jal dead_npc_raycast_down_sides -/* EE81E4 80241C34 27A70020 */ addiu $a3, $sp, 0x20 -/* EE81E8 80241C38 10400015 */ beqz $v0, .L80241C90 -/* EE81EC 80241C3C 00000000 */ nop -/* EE81F0 80241C40 860200A8 */ lh $v0, 0xa8($s0) -/* EE81F4 80241C44 C604001C */ lwc1 $f4, 0x1c($s0) -/* EE81F8 80241C48 44820000 */ mtc1 $v0, $f0 -/* EE81FC 80241C4C 00000000 */ nop -/* EE8200 80241C50 46800020 */ cvt.s.w $f0, $f0 -/* EE8204 80241C54 46002085 */ abs.s $f2, $f4 -/* EE8208 80241C58 46020000 */ add.s $f0, $f0, $f2 -/* EE820C 80241C5C C7A20024 */ lwc1 $f2, 0x24($sp) -/* EE8210 80241C60 4600103E */ c.le.s $f2, $f0 -/* EE8214 80241C64 00000000 */ nop -/* EE8218 80241C68 45000005 */ bc1f .L80241C80 -/* EE821C 80241C6C 00000000 */ nop -/* EE8220 80241C70 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* EE8224 80241C74 AE00001C */ sw $zero, 0x1c($s0) -/* EE8228 80241C78 08090735 */ j .L80241CD4 -/* EE822C 80241C7C E600003C */ swc1 $f0, 0x3c($s0) -.L80241C80: -/* EE8230 80241C80 C600003C */ lwc1 $f0, 0x3c($s0) -/* EE8234 80241C84 46040000 */ add.s $f0, $f0, $f4 -/* EE8238 80241C88 08090735 */ j .L80241CD4 -/* EE823C 80241C8C E600003C */ swc1 $f0, 0x3c($s0) -.L80241C90: -/* EE8240 80241C90 C606003C */ lwc1 $f6, 0x3c($s0) -/* EE8244 80241C94 860200A8 */ lh $v0, 0xa8($s0) -/* EE8248 80241C98 46163081 */ sub.s $f2, $f6, $f22 -/* EE824C 80241C9C 44820000 */ mtc1 $v0, $f0 -/* EE8250 80241CA0 00000000 */ nop -/* EE8254 80241CA4 46800020 */ cvt.s.w $f0, $f0 -/* EE8258 80241CA8 46001080 */ add.s $f2, $f2, $f0 -/* EE825C 80241CAC C604001C */ lwc1 $f4, 0x1c($s0) -/* EE8260 80241CB0 46002005 */ abs.s $f0, $f4 -/* EE8264 80241CB4 4602003C */ c.lt.s $f0, $f2 -/* EE8268 80241CB8 00000000 */ nop -/* EE826C 80241CBC 45020005 */ bc1fl .L80241CD4 -/* EE8270 80241CC0 AE00001C */ sw $zero, 0x1c($s0) -/* EE8274 80241CC4 46043000 */ add.s $f0, $f6, $f4 -/* EE8278 80241CC8 08090735 */ j .L80241CD4 -/* EE827C 80241CCC E600003C */ swc1 $f0, 0x3c($s0) -.L80241CD0: -/* EE8280 80241CD0 AE00001C */ sw $zero, 0x1c($s0) -.L80241CD4: -/* EE8284 80241CD4 8FBF0038 */ lw $ra, 0x38($sp) -/* EE8288 80241CD8 8FB30034 */ lw $s3, 0x34($sp) -/* EE828C 80241CDC 8FB20030 */ lw $s2, 0x30($sp) -/* EE8290 80241CE0 8FB1002C */ lw $s1, 0x2c($sp) -/* EE8294 80241CE4 8FB00028 */ lw $s0, 0x28($sp) -/* EE8298 80241CE8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* EE829C 80241CEC D7B40040 */ ldc1 $f20, 0x40($sp) -/* EE82A0 80241CF0 03E00008 */ jr $ra -/* EE82A4 80241CF4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80241CF8_EE82A8.s b/ver/us/asm/nonmatchings/EE70C0/func_80241CF8_EE82A8.s deleted file mode 100644 index 5bd49446ed..0000000000 --- a/ver/us/asm/nonmatchings/EE70C0/func_80241CF8_EE82A8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CF8_EE82A8 -/* EE82A8 80241CF8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* EE82AC 80241CFC AFB00028 */ sw $s0, 0x28($sp) -/* EE82B0 80241D00 00A0802D */ daddu $s0, $a1, $zero -/* EE82B4 80241D04 AFB1002C */ sw $s1, 0x2c($sp) -/* EE82B8 80241D08 00C0882D */ daddu $s1, $a2, $zero -/* EE82BC 80241D0C AFBF0034 */ sw $ra, 0x34($sp) -/* EE82C0 80241D10 AFB20030 */ sw $s2, 0x30($sp) -/* EE82C4 80241D14 AE200070 */ sw $zero, 0x70($s1) -/* EE82C8 80241D18 8C830000 */ lw $v1, ($a0) -/* EE82CC 80241D1C 2402FDFF */ addiu $v0, $zero, -0x201 -/* EE82D0 80241D20 A480008E */ sh $zero, 0x8e($a0) -/* EE82D4 80241D24 00621824 */ and $v1, $v1, $v0 -/* EE82D8 80241D28 34650800 */ ori $a1, $v1, 0x800 -/* EE82DC 80241D2C AC850000 */ sw $a1, ($a0) -/* EE82E0 80241D30 8E0200D0 */ lw $v0, 0xd0($s0) -/* EE82E4 80241D34 8C420034 */ lw $v0, 0x34($v0) -/* EE82E8 80241D38 10400003 */ beqz $v0, .L80241D48 -/* EE82EC 80241D3C 00E0902D */ daddu $s2, $a3, $zero -/* EE82F0 80241D40 08090754 */ j .L80241D50 -/* EE82F4 80241D44 34620808 */ ori $v0, $v1, 0x808 -.L80241D48: -/* EE82F8 80241D48 2402FFF7 */ addiu $v0, $zero, -9 -/* EE82FC 80241D4C 00A21024 */ and $v0, $a1, $v0 -.L80241D50: -/* EE8300 80241D50 AC820000 */ sw $v0, ($a0) -/* EE8304 80241D54 27A20024 */ addiu $v0, $sp, 0x24 -/* EE8308 80241D58 27A50018 */ addiu $a1, $sp, 0x18 -/* EE830C 80241D5C C4800038 */ lwc1 $f0, 0x38($a0) -/* EE8310 80241D60 C482003C */ lwc1 $f2, 0x3c($a0) -/* EE8314 80241D64 C4840040 */ lwc1 $f4, 0x40($a0) -/* EE8318 80241D68 3C01447A */ lui $at, 0x447a -/* EE831C 80241D6C 44813000 */ mtc1 $at, $f6 -/* EE8320 80241D70 27A6001C */ addiu $a2, $sp, 0x1c -/* EE8324 80241D74 E7A00018 */ swc1 $f0, 0x18($sp) -/* EE8328 80241D78 E7A2001C */ swc1 $f2, 0x1c($sp) -/* EE832C 80241D7C E7A40020 */ swc1 $f4, 0x20($sp) -/* EE8330 80241D80 E7A60024 */ swc1 $f6, 0x24($sp) -/* EE8334 80241D84 AFA20010 */ sw $v0, 0x10($sp) -/* EE8338 80241D88 8C840080 */ lw $a0, 0x80($a0) -/* EE833C 80241D8C 0C03908F */ jal dead_npc_raycast_down_sides -/* EE8340 80241D90 27A70020 */ addiu $a3, $sp, 0x20 -/* EE8344 80241D94 C7A20024 */ lwc1 $f2, 0x24($sp) -/* EE8348 80241D98 3C014059 */ lui $at, 0x4059 -/* EE834C 80241D9C 44812800 */ mtc1 $at, $f5 -/* EE8350 80241DA0 44802000 */ mtc1 $zero, $f4 -/* EE8354 80241DA4 460010A1 */ cvt.d.s $f2, $f2 -/* EE8358 80241DA8 46241082 */ mul.d $f2, $f2, $f4 -/* EE835C 80241DAC 00000000 */ nop -/* EE8360 80241DB0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* EE8364 80241DB4 46000021 */ cvt.d.s $f0, $f0 -/* EE8368 80241DB8 46240002 */ mul.d $f0, $f0, $f4 -/* EE836C 80241DBC 00000000 */ nop -/* EE8370 80241DC0 3C013FE0 */ lui $at, 0x3fe0 -/* EE8374 80241DC4 44812800 */ mtc1 $at, $f5 -/* EE8378 80241DC8 44802000 */ mtc1 $zero, $f4 -/* EE837C 80241DCC 00000000 */ nop -/* EE8380 80241DD0 46241080 */ add.d $f2, $f2, $f4 -/* EE8384 80241DD4 AE000074 */ sw $zero, 0x74($s0) -/* EE8388 80241DD8 46240000 */ add.d $f0, $f0, $f4 -/* EE838C 80241DDC AE000090 */ sw $zero, 0x90($s0) -/* EE8390 80241DE0 4620120D */ trunc.w.d $f8, $f2 -/* EE8394 80241DE4 E6080078 */ swc1 $f8, 0x78($s0) -/* EE8398 80241DE8 4620020D */ trunc.w.d $f8, $f0 -/* EE839C 80241DEC E6080088 */ swc1 $f8, 0x88($s0) -/* EE83A0 80241DF0 8E420014 */ lw $v0, 0x14($s2) -/* EE83A4 80241DF4 AE220074 */ sw $v0, 0x74($s1) -/* EE83A8 80241DF8 8E0200B0 */ lw $v0, 0xb0($s0) -/* EE83AC 80241DFC 34420010 */ ori $v0, $v0, 0x10 -/* EE83B0 80241E00 AE0200B0 */ sw $v0, 0xb0($s0) -/* EE83B4 80241E04 8FBF0034 */ lw $ra, 0x34($sp) -/* EE83B8 80241E08 8FB20030 */ lw $s2, 0x30($sp) -/* EE83BC 80241E0C 8FB1002C */ lw $s1, 0x2c($sp) -/* EE83C0 80241E10 8FB00028 */ lw $s0, 0x28($sp) -/* EE83C4 80241E14 03E00008 */ jr $ra -/* EE83C8 80241E18 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s b/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s index 0833ea2b32..513634de35 100644 --- a/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s +++ b/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s @@ -57,7 +57,7 @@ glabel func_80241E1C_EE83CC /* EE849C 80241EEC 0280202D */ daddu $a0, $s4, $zero /* EE84A0 80241EF0 0240282D */ daddu $a1, $s2, $zero /* EE84A4 80241EF4 02A0302D */ daddu $a2, $s5, $zero -/* EE84A8 80241EF8 0C09073E */ jal func_80241CF8_EE82A8 +/* EE84A8 80241EF8 0C09073E */ jal EE70C0_UnkFunc5 /* EE84AC 80241EFC 0200382D */ daddu $a3, $s0, $zero .L80241F00: /* EE84B0 80241F00 2402FFFE */ addiu $v0, $zero, -2 @@ -102,14 +102,14 @@ glabel L80241F7C_EE852C glabel L80241F8C_EE853C /* EE853C 80241F8C 02A0202D */ daddu $a0, $s5, $zero /* EE8540 80241F90 0200282D */ daddu $a1, $s0, $zero -/* EE8544 80241F94 0C0904EA */ jal func_802413A8_EE7958 +/* EE8544 80241F94 0C0904EA */ jal EE70C0_UnkFunc4 /* EE8548 80241F98 0260302D */ daddu $a2, $s3, $zero /* EE854C 80241F9C 08090804 */ j .L80242010 /* EE8550 80241FA0 0000102D */ daddu $v0, $zero, $zero glabel L80241FA4_EE8554 /* EE8554 80241FA4 02A0202D */ daddu $a0, $s5, $zero /* EE8558 80241FA8 0200282D */ daddu $a1, $s0, $zero -/* EE855C 80241FAC 0C0905BB */ jal func_802416EC_EE7C9C +/* EE855C 80241FAC 0C0905BB */ jal EE70C0_UnkNpcAIFunc2 /* EE8560 80241FB0 0260302D */ daddu $a2, $s3, $zero glabel L80241FB4_EE8564 /* EE8564 80241FB4 02A0202D */ daddu $a0, $s5, $zero @@ -128,14 +128,14 @@ glabel L80241FCC_EE857C glabel L80241FE4_EE8594 /* EE8594 80241FE4 02A0202D */ daddu $a0, $s5, $zero /* EE8598 80241FE8 0200282D */ daddu $a1, $s0, $zero -/* EE859C 80241FEC 0C090641 */ jal func_80241904_EE7EB4 +/* EE859C 80241FEC 0C090641 */ jal EE70C0_UnkNpcAIFunc3 /* EE85A0 80241FF0 0260302D */ daddu $a2, $s3, $zero /* EE85A4 80241FF4 08090804 */ j .L80242010 /* EE85A8 80241FF8 0000102D */ daddu $v0, $zero, $zero glabel L80241FFC_EE85AC /* EE85AC 80241FFC 02A0202D */ daddu $a0, $s5, $zero /* EE85B0 80242000 0200282D */ daddu $a1, $s0, $zero -/* EE85B4 80242004 0C09065A */ jal func_80241968_EE7F18 +/* EE85B4 80242004 0C09065A */ jal EE70C0_UnkFunc6 /* EE85B8 80242008 0260302D */ daddu $a2, $s3, $zero glabel L8024200C_EE85BC /* EE85BC 8024200C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80240E50_EEDF50.s b/ver/us/asm/nonmatchings/EEDF50/func_80240E50_EEDF50.s deleted file mode 100644 index 059baab793..0000000000 --- a/ver/us/asm/nonmatchings/EEDF50/func_80240E50_EEDF50.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245450_EF2550 -.double 32767.0 - -.section .text - -glabel func_80240E50_EEDF50 -/* EEDF50 80240E50 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* EEDF54 80240E54 AFB3002C */ sw $s3, 0x2c($sp) -/* EEDF58 80240E58 0080982D */ daddu $s3, $a0, $zero -/* EEDF5C 80240E5C AFBF0030 */ sw $ra, 0x30($sp) -/* EEDF60 80240E60 AFB20028 */ sw $s2, 0x28($sp) -/* EEDF64 80240E64 AFB10024 */ sw $s1, 0x24($sp) -/* EEDF68 80240E68 AFB00020 */ sw $s0, 0x20($sp) -/* EEDF6C 80240E6C 8E710148 */ lw $s1, 0x148($s3) -/* EEDF70 80240E70 86240008 */ lh $a0, 8($s1) -/* EEDF74 80240E74 0C00F92F */ jal dead_get_npc_unsafe -/* EEDF78 80240E78 00A0902D */ daddu $s2, $a1, $zero -/* EEDF7C 80240E7C 8E440004 */ lw $a0, 4($s2) -/* EEDF80 80240E80 0040802D */ daddu $s0, $v0, $zero -/* EEDF84 80240E84 00041FC2 */ srl $v1, $a0, 0x1f -/* EEDF88 80240E88 00832021 */ addu $a0, $a0, $v1 -/* EEDF8C 80240E8C 00042043 */ sra $a0, $a0, 1 -/* EEDF90 80240E90 0C00AB3B */ jal dead_rand_int -/* EEDF94 80240E94 24840001 */ addiu $a0, $a0, 1 -/* EEDF98 80240E98 8E430004 */ lw $v1, 4($s2) -/* EEDF9C 80240E9C 000327C2 */ srl $a0, $v1, 0x1f -/* EEDFA0 80240EA0 00641821 */ addu $v1, $v1, $a0 -/* EEDFA4 80240EA4 00031843 */ sra $v1, $v1, 1 -/* EEDFA8 80240EA8 00621821 */ addu $v1, $v1, $v0 -/* EEDFAC 80240EAC A603008E */ sh $v1, 0x8e($s0) -/* EEDFB0 80240EB0 8E2300D0 */ lw $v1, 0xd0($s1) -/* EEDFB4 80240EB4 C6000040 */ lwc1 $f0, 0x40($s0) -/* EEDFB8 80240EB8 C4640000 */ lwc1 $f4, ($v1) -/* EEDFBC 80240EBC 46802120 */ cvt.s.w $f4, $f4 -/* EEDFC0 80240EC0 C4620008 */ lwc1 $f2, 8($v1) -/* EEDFC4 80240EC4 468010A0 */ cvt.s.w $f2, $f2 -/* EEDFC8 80240EC8 E7A00010 */ swc1 $f0, 0x10($sp) -/* EEDFCC 80240ECC 8E2200D0 */ lw $v0, 0xd0($s1) -/* EEDFD0 80240ED0 44061000 */ mfc1 $a2, $f2 -/* EEDFD4 80240ED4 C440000C */ lwc1 $f0, 0xc($v0) -/* EEDFD8 80240ED8 46800020 */ cvt.s.w $f0, $f0 -/* EEDFDC 80240EDC E7A00014 */ swc1 $f0, 0x14($sp) -/* EEDFE0 80240EE0 8E2200D0 */ lw $v0, 0xd0($s1) -/* EEDFE4 80240EE4 44052000 */ mfc1 $a1, $f4 -/* EEDFE8 80240EE8 C4400010 */ lwc1 $f0, 0x10($v0) -/* EEDFEC 80240EEC 46800020 */ cvt.s.w $f0, $f0 -/* EEDFF0 80240EF0 E7A00018 */ swc1 $f0, 0x18($sp) -/* EEDFF4 80240EF4 8C640018 */ lw $a0, 0x18($v1) -/* EEDFF8 80240EF8 0C013431 */ jal dead_is_point_within_region -/* EEDFFC 80240EFC 8E070038 */ lw $a3, 0x38($s0) -/* EEE000 80240F00 1040000E */ beqz $v0, .L80240F3C -/* EEE004 80240F04 00000000 */ nop -/* EEE008 80240F08 8E2200D0 */ lw $v0, 0xd0($s1) -/* EEE00C 80240F0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* EEE010 80240F10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EEE014 80240F14 C4460000 */ lwc1 $f6, ($v0) -/* EEE018 80240F18 468031A0 */ cvt.s.w $f6, $f6 -/* EEE01C 80240F1C 44063000 */ mfc1 $a2, $f6 -/* EEE020 80240F20 C4460008 */ lwc1 $f6, 8($v0) -/* EEE024 80240F24 468031A0 */ cvt.s.w $f6, $f6 -/* EEE028 80240F28 44073000 */ mfc1 $a3, $f6 -/* EEE02C 80240F2C 0C00ABDC */ jal fio_validate_header_checksums -/* EEE030 80240F30 00000000 */ nop -/* EEE034 80240F34 080903DB */ j .L80240F6C -/* EEE038 80240F38 E600000C */ swc1 $f0, 0xc($s0) -.L80240F3C: -/* EEE03C 80240F3C 0C00AB3B */ jal dead_rand_int -/* EEE040 80240F40 2404003C */ addiu $a0, $zero, 0x3c -/* EEE044 80240F44 C60C000C */ lwc1 $f12, 0xc($s0) -/* EEE048 80240F48 44820000 */ mtc1 $v0, $f0 -/* EEE04C 80240F4C 00000000 */ nop -/* EEE050 80240F50 46800020 */ cvt.s.w $f0, $f0 -/* EEE054 80240F54 46006300 */ add.s $f12, $f12, $f0 -/* EEE058 80240F58 3C0141F0 */ lui $at, 0x41f0 -/* EEE05C 80240F5C 44810000 */ mtc1 $at, $f0 -/* EEE060 80240F60 0C00AB85 */ jal dead_clamp_angle -/* EEE064 80240F64 46006301 */ sub.s $f12, $f12, $f0 -/* EEE068 80240F68 E600000C */ swc1 $f0, 0xc($s0) -.L80240F6C: -/* EEE06C 80240F6C 8E2200CC */ lw $v0, 0xcc($s1) -/* EEE070 80240F70 8C420004 */ lw $v0, 4($v0) -/* EEE074 80240F74 AE020028 */ sw $v0, 0x28($s0) -/* EEE078 80240F78 AE600074 */ sw $zero, 0x74($s3) -/* EEE07C 80240F7C 8E2200D0 */ lw $v0, 0xd0($s1) -/* EEE080 80240F80 8C420014 */ lw $v0, 0x14($v0) -/* EEE084 80240F84 04410004 */ bgez $v0, .L80240F98 -/* EEE088 80240F88 00000000 */ nop -/* EEE08C 80240F8C C6400000 */ lwc1 $f0, ($s2) -/* EEE090 80240F90 080903EE */ j .L80240FB8 -/* EEE094 80240F94 E6000018 */ swc1 $f0, 0x18($s0) -.L80240F98: -/* EEE098 80240F98 3C018024 */ lui $at, %hi(D_80245450_EF2550) -/* EEE09C 80240F9C D4225450 */ ldc1 $f2, %lo(D_80245450_EF2550)($at) -/* EEE0A0 80240FA0 44820000 */ mtc1 $v0, $f0 -/* EEE0A4 80240FA4 00000000 */ nop -/* EEE0A8 80240FA8 46800021 */ cvt.d.w $f0, $f0 -/* EEE0AC 80240FAC 46220003 */ div.d $f0, $f0, $f2 -/* EEE0B0 80240FB0 46200020 */ cvt.s.d $f0, $f0 -/* EEE0B4 80240FB4 E6000018 */ swc1 $f0, 0x18($s0) -.L80240FB8: -/* EEE0B8 80240FB8 C600003C */ lwc1 $f0, 0x3c($s0) -/* EEE0BC 80240FBC 3C014059 */ lui $at, 0x4059 -/* EEE0C0 80240FC0 44811800 */ mtc1 $at, $f3 -/* EEE0C4 80240FC4 44801000 */ mtc1 $zero, $f2 -/* EEE0C8 80240FC8 46000021 */ cvt.d.s $f0, $f0 -/* EEE0CC 80240FCC 46220002 */ mul.d $f0, $f0, $f2 -/* EEE0D0 80240FD0 00000000 */ nop -/* EEE0D4 80240FD4 24020001 */ addiu $v0, $zero, 1 -/* EEE0D8 80240FD8 4620018D */ trunc.w.d $f6, $f0 -/* EEE0DC 80240FDC E626007C */ swc1 $f6, 0x7c($s1) -/* EEE0E0 80240FE0 AE620070 */ sw $v0, 0x70($s3) -/* EEE0E4 80240FE4 8FBF0030 */ lw $ra, 0x30($sp) -/* EEE0E8 80240FE8 8FB3002C */ lw $s3, 0x2c($sp) -/* EEE0EC 80240FEC 8FB20028 */ lw $s2, 0x28($sp) -/* EEE0F0 80240FF0 8FB10024 */ lw $s1, 0x24($sp) -/* EEE0F4 80240FF4 8FB00020 */ lw $s0, 0x20($sp) -/* EEE0F8 80240FF8 03E00008 */ jr $ra -/* EEE0FC 80240FFC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/EEDF50/func_802416E8_EEE7E8.s b/ver/us/asm/nonmatchings/EEDF50/func_802416E8_EEE7E8.s deleted file mode 100644 index 81f18b2042..0000000000 --- a/ver/us/asm/nonmatchings/EEDF50/func_802416E8_EEE7E8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416E8_EEE7E8 -/* EEE7E8 802416E8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* EEE7EC 802416EC AFB3004C */ sw $s3, 0x4c($sp) -/* EEE7F0 802416F0 0080982D */ daddu $s3, $a0, $zero -/* EEE7F4 802416F4 AFBF0054 */ sw $ra, 0x54($sp) -/* EEE7F8 802416F8 AFB40050 */ sw $s4, 0x50($sp) -/* EEE7FC 802416FC AFB20048 */ sw $s2, 0x48($sp) -/* EEE800 80241700 AFB10044 */ sw $s1, 0x44($sp) -/* EEE804 80241704 AFB00040 */ sw $s0, 0x40($sp) -/* EEE808 80241708 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* EEE80C 8024170C F7B80068 */ sdc1 $f24, 0x68($sp) -/* EEE810 80241710 F7B60060 */ sdc1 $f22, 0x60($sp) -/* EEE814 80241714 F7B40058 */ sdc1 $f20, 0x58($sp) -/* EEE818 80241718 8E710148 */ lw $s1, 0x148($s3) -/* EEE81C 8024171C 00A0902D */ daddu $s2, $a1, $zero -/* EEE820 80241720 86240008 */ lh $a0, 8($s1) -/* EEE824 80241724 0C00F92F */ jal dead_get_npc_unsafe -/* EEE828 80241728 00C0A02D */ daddu $s4, $a2, $zero -/* EEE82C 8024172C 0040802D */ daddu $s0, $v0, $zero -/* EEE830 80241730 C6200078 */ lwc1 $f0, 0x78($s1) -/* EEE834 80241734 46800020 */ cvt.s.w $f0, $f0 -/* EEE838 80241738 46000021 */ cvt.d.s $f0, $f0 -/* EEE83C 8024173C 3C014059 */ lui $at, 0x4059 -/* EEE840 80241740 44811800 */ mtc1 $at, $f3 -/* EEE844 80241744 44801000 */ mtc1 $zero, $f2 -/* EEE848 80241748 8602008E */ lh $v0, 0x8e($s0) -/* EEE84C 8024174C 9603008E */ lhu $v1, 0x8e($s0) -/* EEE850 80241750 46220003 */ div.d $f0, $f0, $f2 -/* EEE854 80241754 46200620 */ cvt.s.d $f24, $f0 -/* EEE858 80241758 C6200088 */ lwc1 $f0, 0x88($s1) -/* EEE85C 8024175C 46800020 */ cvt.s.w $f0, $f0 -/* EEE860 80241760 46000021 */ cvt.d.s $f0, $f0 -/* EEE864 80241764 46220003 */ div.d $f0, $f0, $f2 -/* EEE868 80241768 46200020 */ cvt.s.d $f0, $f0 -/* EEE86C 8024176C 18400003 */ blez $v0, .L8024177C -/* EEE870 80241770 4600C680 */ add.s $f26, $f24, $f0 -/* EEE874 80241774 2462FFFF */ addiu $v0, $v1, -1 -/* EEE878 80241778 A602008E */ sh $v0, 0x8e($s0) -.L8024177C: -/* EEE87C 8024177C 8E220070 */ lw $v0, 0x70($s1) -/* EEE880 80241780 18400034 */ blez $v0, .L80241854 -/* EEE884 80241784 00000000 */ nop -/* EEE888 80241788 C62C0074 */ lwc1 $f12, 0x74($s1) -/* EEE88C 8024178C 46806320 */ cvt.s.w $f12, $f12 -/* EEE890 80241790 44820000 */ mtc1 $v0, $f0 -/* EEE894 80241794 00000000 */ nop -/* EEE898 80241798 46800020 */ cvt.s.w $f0, $f0 -/* EEE89C 8024179C 46000021 */ cvt.d.s $f0, $f0 -/* EEE8A0 802417A0 46220003 */ div.d $f0, $f0, $f2 -/* EEE8A4 802417A4 0C00AD77 */ jal dead_sin_deg -/* EEE8A8 802417A8 462005A0 */ cvt.s.d $f22, $f0 -/* EEE8AC 802417AC 8E020000 */ lw $v0, ($s0) -/* EEE8B0 802417B0 30420008 */ andi $v0, $v0, 8 -/* EEE8B4 802417B4 10400003 */ beqz $v0, .L802417C4 -/* EEE8B8 802417B8 46000506 */ mov.s $f20, $f0 -/* EEE8BC 802417BC 08090601 */ j .L80241804 -/* EEE8C0 802417C0 0000102D */ daddu $v0, $zero, $zero -.L802417C4: -/* EEE8C4 802417C4 27A50028 */ addiu $a1, $sp, 0x28 -/* EEE8C8 802417C8 27A6002C */ addiu $a2, $sp, 0x2c -/* EEE8CC 802417CC C6000038 */ lwc1 $f0, 0x38($s0) -/* EEE8D0 802417D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* EEE8D4 802417D4 C6040040 */ lwc1 $f4, 0x40($s0) -/* EEE8D8 802417D8 3C01447A */ lui $at, 0x447a -/* EEE8DC 802417DC 44813000 */ mtc1 $at, $f6 -/* EEE8E0 802417E0 27A20034 */ addiu $v0, $sp, 0x34 -/* EEE8E4 802417E4 E7A00028 */ swc1 $f0, 0x28($sp) -/* EEE8E8 802417E8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* EEE8EC 802417EC E7A40030 */ swc1 $f4, 0x30($sp) -/* EEE8F0 802417F0 E7A60034 */ swc1 $f6, 0x34($sp) -/* EEE8F4 802417F4 AFA20010 */ sw $v0, 0x10($sp) -/* EEE8F8 802417F8 8E040080 */ lw $a0, 0x80($s0) -/* EEE8FC 802417FC 0C03908F */ jal dead_npc_raycast_down_sides -/* EEE900 80241800 27A70030 */ addiu $a3, $sp, 0x30 -.L80241804: -/* EEE904 80241804 10400007 */ beqz $v0, .L80241824 -/* EEE908 80241808 00000000 */ nop -/* EEE90C 8024180C 4616A082 */ mul.s $f2, $f20, $f22 -/* EEE910 80241810 00000000 */ nop -/* EEE914 80241814 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* EEE918 80241818 46180000 */ add.s $f0, $f0, $f24 -/* EEE91C 8024181C 0809060C */ j .L80241830 -/* EEE920 80241820 46020000 */ add.s $f0, $f0, $f2 -.L80241824: -/* EEE924 80241824 4616A002 */ mul.s $f0, $f20, $f22 -/* EEE928 80241828 00000000 */ nop -/* EEE92C 8024182C 4600D000 */ add.s $f0, $f26, $f0 -.L80241830: -/* EEE930 80241830 E600003C */ swc1 $f0, 0x3c($s0) -/* EEE934 80241834 8E220074 */ lw $v0, 0x74($s1) -/* EEE938 80241838 2442000A */ addiu $v0, $v0, 0xa -/* EEE93C 8024183C 44826000 */ mtc1 $v0, $f12 -/* EEE940 80241840 00000000 */ nop -/* EEE944 80241844 0C00AB85 */ jal dead_clamp_angle -/* EEE948 80241848 46806320 */ cvt.s.w $f12, $f12 -/* EEE94C 8024184C 4600020D */ trunc.w.s $f8, $f0 -/* EEE950 80241850 E6280074 */ swc1 $f8, 0x74($s1) -.L80241854: -/* EEE954 80241854 8E220090 */ lw $v0, 0x90($s1) -/* EEE958 80241858 1C400040 */ bgtz $v0, .L8024195C -/* EEE95C 8024185C 2442FFFF */ addiu $v0, $v0, -1 -/* EEE960 80241860 860200A8 */ lh $v0, 0xa8($s0) -/* EEE964 80241864 C600003C */ lwc1 $f0, 0x3c($s0) -/* EEE968 80241868 44821000 */ mtc1 $v0, $f2 -/* EEE96C 8024186C 00000000 */ nop -/* EEE970 80241870 468010A0 */ cvt.s.w $f2, $f2 -/* EEE974 80241874 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EEE978 80241878 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EEE97C 8024187C 46020000 */ add.s $f0, $f0, $f2 -/* EEE980 80241880 3C014024 */ lui $at, 0x4024 -/* EEE984 80241884 44812800 */ mtc1 $at, $f5 -/* EEE988 80241888 44802000 */ mtc1 $zero, $f4 -/* EEE98C 8024188C C442002C */ lwc1 $f2, 0x2c($v0) -/* EEE990 80241890 46000021 */ cvt.d.s $f0, $f0 -/* EEE994 80241894 46240000 */ add.d $f0, $f0, $f4 -/* EEE998 80241898 460010A1 */ cvt.d.s $f2, $f2 -/* EEE99C 8024189C 4620103C */ c.lt.d $f2, $f0 -/* EEE9A0 802418A0 00000000 */ nop -/* EEE9A4 802418A4 4500002E */ bc1f .L80241960 -/* EEE9A8 802418A8 0280202D */ daddu $a0, $s4, $zero -/* EEE9AC 802418AC 24020001 */ addiu $v0, $zero, 1 -/* EEE9B0 802418B0 AFA20010 */ sw $v0, 0x10($sp) -/* EEE9B4 802418B4 8E460024 */ lw $a2, 0x24($s2) -/* EEE9B8 802418B8 8E470028 */ lw $a3, 0x28($s2) -/* EEE9BC 802418BC 0C013469 */ jal func_8004D1A4 -/* EEE9C0 802418C0 0220282D */ daddu $a1, $s1, $zero -/* EEE9C4 802418C4 10400026 */ beqz $v0, .L80241960 -/* EEE9C8 802418C8 0000202D */ daddu $a0, $zero, $zero -/* EEE9CC 802418CC 0200282D */ daddu $a1, $s0, $zero -/* EEE9D0 802418D0 0000302D */ daddu $a2, $zero, $zero -/* EEE9D4 802418D4 2412000C */ addiu $s2, $zero, 0xc -/* EEE9D8 802418D8 860300A8 */ lh $v1, 0xa8($s0) -/* EEE9DC 802418DC 3C013F80 */ lui $at, 0x3f80 -/* EEE9E0 802418E0 44810000 */ mtc1 $at, $f0 -/* EEE9E4 802418E4 3C014000 */ lui $at, 0x4000 -/* EEE9E8 802418E8 44811000 */ mtc1 $at, $f2 -/* EEE9EC 802418EC 3C01C1A0 */ lui $at, 0xc1a0 -/* EEE9F0 802418F0 44812000 */ mtc1 $at, $f4 -/* EEE9F4 802418F4 44834000 */ mtc1 $v1, $f8 -/* EEE9F8 802418F8 00000000 */ nop -/* EEE9FC 802418FC 46804220 */ cvt.s.w $f8, $f8 -/* EEEA00 80241900 44074000 */ mfc1 $a3, $f8 -/* EEEA04 80241904 27A20038 */ addiu $v0, $sp, 0x38 -/* EEEA08 80241908 AFB2001C */ sw $s2, 0x1c($sp) -/* EEEA0C 8024190C AFA20020 */ sw $v0, 0x20($sp) -/* EEEA10 80241910 E7A00010 */ swc1 $f0, 0x10($sp) -/* EEEA14 80241914 E7A20014 */ swc1 $f2, 0x14($sp) -/* EEEA18 80241918 0C01D444 */ jal dead_fx_emote -/* EEEA1C 8024191C E7A40018 */ swc1 $f4, 0x18($sp) -/* EEEA20 80241920 0200202D */ daddu $a0, $s0, $zero -/* EEEA24 80241924 240502F4 */ addiu $a1, $zero, 0x2f4 -/* EEEA28 80241928 C480003C */ lwc1 $f0, 0x3c($a0) -/* EEEA2C 8024192C 3C060020 */ lui $a2, 0x20 -/* EEEA30 80241930 0C013600 */ jal dead_ai_enemy_play_sound -/* EEEA34 80241934 E4800064 */ swc1 $f0, 0x64($a0) -/* EEEA38 80241938 8E220018 */ lw $v0, 0x18($s1) -/* EEEA3C 8024193C 9442002A */ lhu $v0, 0x2a($v0) -/* EEEA40 80241940 30420001 */ andi $v0, $v0, 1 -/* EEEA44 80241944 10400003 */ beqz $v0, .L80241954 -/* EEEA48 80241948 2402000A */ addiu $v0, $zero, 0xa -/* EEEA4C 8024194C 0809067F */ j .L802419FC -/* EEEA50 80241950 AE620070 */ sw $v0, 0x70($s3) -.L80241954: -/* EEEA54 80241954 0809067F */ j .L802419FC -/* EEEA58 80241958 AE720070 */ sw $s2, 0x70($s3) -.L8024195C: -/* EEEA5C 8024195C AE220090 */ sw $v0, 0x90($s1) -.L80241960: -/* EEEA60 80241960 8602008C */ lh $v0, 0x8c($s0) -/* EEEA64 80241964 14400025 */ bnez $v0, .L802419FC -/* EEEA68 80241968 00000000 */ nop -/* EEEA6C 8024196C 8602008E */ lh $v0, 0x8e($s0) -/* EEEA70 80241970 1C400022 */ bgtz $v0, .L802419FC -/* EEEA74 80241974 00000000 */ nop -/* EEEA78 80241978 8E620074 */ lw $v0, 0x74($s3) -/* EEEA7C 8024197C 2442FFFF */ addiu $v0, $v0, -1 -/* EEEA80 80241980 1840001D */ blez $v0, .L802419F8 -/* EEEA84 80241984 AE620074 */ sw $v0, 0x74($s3) -/* EEEA88 80241988 8E220018 */ lw $v0, 0x18($s1) -/* EEEA8C 8024198C 9442002A */ lhu $v0, 0x2a($v0) -/* EEEA90 80241990 30420010 */ andi $v0, $v0, 0x10 -/* EEEA94 80241994 14400007 */ bnez $v0, .L802419B4 -/* EEEA98 80241998 00000000 */ nop -/* EEEA9C 8024199C C600000C */ lwc1 $f0, 0xc($s0) -/* EEEAA0 802419A0 3C014334 */ lui $at, 0x4334 -/* EEEAA4 802419A4 44816000 */ mtc1 $at, $f12 -/* EEEAA8 802419A8 0C00AB85 */ jal dead_clamp_angle -/* EEEAAC 802419AC 460C0300 */ add.s $f12, $f0, $f12 -/* EEEAB0 802419B0 E600000C */ swc1 $f0, 0xc($s0) -.L802419B4: -/* EEEAB4 802419B4 0C00AB3B */ jal dead_rand_int -/* EEEAB8 802419B8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* EEEABC 802419BC 3C032E8B */ lui $v1, 0x2e8b -/* EEEAC0 802419C0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* EEEAC4 802419C4 00430018 */ mult $v0, $v1 -/* EEEAC8 802419C8 00021FC3 */ sra $v1, $v0, 0x1f -/* EEEACC 802419CC 00004010 */ mfhi $t0 -/* EEEAD0 802419D0 00082043 */ sra $a0, $t0, 1 -/* EEEAD4 802419D4 00832023 */ subu $a0, $a0, $v1 -/* EEEAD8 802419D8 00041840 */ sll $v1, $a0, 1 -/* EEEADC 802419DC 00641821 */ addu $v1, $v1, $a0 -/* EEEAE0 802419E0 00031880 */ sll $v1, $v1, 2 -/* EEEAE4 802419E4 00641823 */ subu $v1, $v1, $a0 -/* EEEAE8 802419E8 00431023 */ subu $v0, $v0, $v1 -/* EEEAEC 802419EC 24420005 */ addiu $v0, $v0, 5 -/* EEEAF0 802419F0 0809067F */ j .L802419FC -/* EEEAF4 802419F4 A602008E */ sh $v0, 0x8e($s0) -.L802419F8: -/* EEEAF8 802419F8 AE600070 */ sw $zero, 0x70($s3) -.L802419FC: -/* EEEAFC 802419FC 8FBF0054 */ lw $ra, 0x54($sp) -/* EEEB00 80241A00 8FB40050 */ lw $s4, 0x50($sp) -/* EEEB04 80241A04 8FB3004C */ lw $s3, 0x4c($sp) -/* EEEB08 80241A08 8FB20048 */ lw $s2, 0x48($sp) -/* EEEB0C 80241A0C 8FB10044 */ lw $s1, 0x44($sp) -/* EEEB10 80241A10 8FB00040 */ lw $s0, 0x40($sp) -/* EEEB14 80241A14 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* EEEB18 80241A18 D7B80068 */ ldc1 $f24, 0x68($sp) -/* EEEB1C 80241A1C D7B60060 */ ldc1 $f22, 0x60($sp) -/* EEEB20 80241A20 D7B40058 */ ldc1 $f20, 0x58($sp) -/* EEEB24 80241A24 03E00008 */ jr $ra -/* EEEB28 80241A28 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80241A2C_EEEB2C.s b/ver/us/asm/nonmatchings/EEDF50/func_80241A2C_EEEB2C.s deleted file mode 100644 index 5e79459eb7..0000000000 --- a/ver/us/asm/nonmatchings/EEDF50/func_80241A2C_EEEB2C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A2C_EEEB2C -/* EEEB2C 80241A2C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EEEB30 80241A30 AFB20018 */ sw $s2, 0x18($sp) -/* EEEB34 80241A34 0080902D */ daddu $s2, $a0, $zero -/* EEEB38 80241A38 AFBF001C */ sw $ra, 0x1c($sp) -/* EEEB3C 80241A3C AFB10014 */ sw $s1, 0x14($sp) -/* EEEB40 80241A40 AFB00010 */ sw $s0, 0x10($sp) -/* EEEB44 80241A44 8E510148 */ lw $s1, 0x148($s2) -/* EEEB48 80241A48 0C00F92F */ jal dead_get_npc_unsafe -/* EEEB4C 80241A4C 86240008 */ lh $a0, 8($s1) -/* EEEB50 80241A50 0040802D */ daddu $s0, $v0, $zero -/* EEEB54 80241A54 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EEEB58 80241A58 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EEEB5C 80241A5C C60C0038 */ lwc1 $f12, 0x38($s0) -/* EEEB60 80241A60 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EEEB64 80241A64 A600008E */ sh $zero, 0x8e($s0) -/* EEEB68 80241A68 8C460028 */ lw $a2, 0x28($v0) -/* EEEB6C 80241A6C 0C00ABDC */ jal fio_validate_header_checksums -/* EEEB70 80241A70 8C470030 */ lw $a3, 0x30($v0) -/* EEEB74 80241A74 E600000C */ swc1 $f0, 0xc($s0) -/* EEEB78 80241A78 8E2200CC */ lw $v0, 0xcc($s1) -/* EEEB7C 80241A7C 8C420020 */ lw $v0, 0x20($v0) -/* EEEB80 80241A80 AE020028 */ sw $v0, 0x28($s0) -/* EEEB84 80241A84 2402000B */ addiu $v0, $zero, 0xb -/* EEEB88 80241A88 AE420070 */ sw $v0, 0x70($s2) -/* EEEB8C 80241A8C 8FBF001C */ lw $ra, 0x1c($sp) -/* EEEB90 80241A90 8FB20018 */ lw $s2, 0x18($sp) -/* EEEB94 80241A94 8FB10014 */ lw $s1, 0x14($sp) -/* EEEB98 80241A98 8FB00010 */ lw $s0, 0x10($sp) -/* EEEB9C 80241A9C 03E00008 */ jr $ra -/* EEEBA0 80241AA0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80241AA4_EEEBA4.s b/ver/us/asm/nonmatchings/EEDF50/func_80241AA4_EEEBA4.s deleted file mode 100644 index ddfc7dc3ed..0000000000 --- a/ver/us/asm/nonmatchings/EEDF50/func_80241AA4_EEEBA4.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AA4_EEEBA4 -/* EEEBA4 80241AA4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EEEBA8 80241AA8 AFB00010 */ sw $s0, 0x10($sp) -/* EEEBAC 80241AAC 0080802D */ daddu $s0, $a0, $zero -/* EEEBB0 80241AB0 AFBF0014 */ sw $ra, 0x14($sp) -/* EEEBB4 80241AB4 8E020148 */ lw $v0, 0x148($s0) -/* EEEBB8 80241AB8 0C00F92F */ jal dead_get_npc_unsafe -/* EEEBBC 80241ABC 84440008 */ lh $a0, 8($v0) -/* EEEBC0 80241AC0 9443008E */ lhu $v1, 0x8e($v0) -/* EEEBC4 80241AC4 C440003C */ lwc1 $f0, 0x3c($v0) -/* EEEBC8 80241AC8 24640001 */ addiu $a0, $v1, 1 -/* EEEBCC 80241ACC 00031C00 */ sll $v1, $v1, 0x10 -/* EEEBD0 80241AD0 00031B83 */ sra $v1, $v1, 0xe -/* EEEBD4 80241AD4 A444008E */ sh $a0, 0x8e($v0) -/* EEEBD8 80241AD8 3C018024 */ lui $at, %hi(D_80244070_EF1170) -/* EEEBDC 80241ADC 00230821 */ addu $at, $at, $v1 -/* EEEBE0 80241AE0 C4224070 */ lwc1 $f2, %lo(D_80244070_EF1170)($at) -/* EEEBE4 80241AE4 8443008E */ lh $v1, 0x8e($v0) -/* EEEBE8 80241AE8 46020000 */ add.s $f0, $f0, $f2 -/* EEEBEC 80241AEC 28630005 */ slti $v1, $v1, 5 -/* EEEBF0 80241AF0 14600003 */ bnez $v1, .L80241B00 -/* EEEBF4 80241AF4 E440003C */ swc1 $f0, 0x3c($v0) -/* EEEBF8 80241AF8 2402000C */ addiu $v0, $zero, 0xc -/* EEEBFC 80241AFC AE020070 */ sw $v0, 0x70($s0) -.L80241B00: -/* EEEC00 80241B00 8FBF0014 */ lw $ra, 0x14($sp) -/* EEEC04 80241B04 8FB00010 */ lw $s0, 0x10($sp) -/* EEEC08 80241B08 03E00008 */ jr $ra -/* EEEC0C 80241B0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80241C44_EEED44.s b/ver/us/asm/nonmatchings/EEDF50/func_80241C44_EEED44.s deleted file mode 100644 index 47d6bf855d..0000000000 --- a/ver/us/asm/nonmatchings/EEDF50/func_80241C44_EEED44.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C44_EEED44 -/* EEED44 80241C44 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EEED48 80241C48 AFB00010 */ sw $s0, 0x10($sp) -/* EEED4C 80241C4C 0080802D */ daddu $s0, $a0, $zero -/* EEED50 80241C50 AFBF0014 */ sw $ra, 0x14($sp) -/* EEED54 80241C54 8E020148 */ lw $v0, 0x148($s0) -/* EEED58 80241C58 0C00F92F */ jal dead_get_npc_unsafe -/* EEED5C 80241C5C 84440008 */ lh $a0, 8($v0) -/* EEED60 80241C60 0040202D */ daddu $a0, $v0, $zero -/* EEED64 80241C64 8482008E */ lh $v0, 0x8e($a0) -/* EEED68 80241C68 9483008E */ lhu $v1, 0x8e($a0) -/* EEED6C 80241C6C 18400005 */ blez $v0, .L80241C84 -/* EEED70 80241C70 2462FFFF */ addiu $v0, $v1, -1 -/* EEED74 80241C74 A482008E */ sh $v0, 0x8e($a0) -/* EEED78 80241C78 00021400 */ sll $v0, $v0, 0x10 -/* EEED7C 80241C7C 1C400006 */ bgtz $v0, .L80241C98 -/* EEED80 80241C80 00000000 */ nop -.L80241C84: -/* EEED84 80241C84 8482008C */ lh $v0, 0x8c($a0) -/* EEED88 80241C88 14400003 */ bnez $v0, .L80241C98 -/* EEED8C 80241C8C 2402000E */ addiu $v0, $zero, 0xe -/* EEED90 80241C90 A480008E */ sh $zero, 0x8e($a0) -/* EEED94 80241C94 AE020070 */ sw $v0, 0x70($s0) -.L80241C98: -/* EEED98 80241C98 8FBF0014 */ lw $ra, 0x14($sp) -/* EEED9C 80241C9C 8FB00010 */ lw $s0, 0x10($sp) -/* EEEDA0 80241CA0 03E00008 */ jr $ra -/* EEEDA4 80241CA4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80241CA8_EEEDA8.s b/ver/us/asm/nonmatchings/EEDF50/func_80241CA8_EEEDA8.s deleted file mode 100644 index 901e5bb841..0000000000 --- a/ver/us/asm/nonmatchings/EEDF50/func_80241CA8_EEEDA8.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CA8_EEEDA8 -/* EEEDA8 80241CA8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* EEEDAC 80241CAC AFB20030 */ sw $s2, 0x30($sp) -/* EEEDB0 80241CB0 0080902D */ daddu $s2, $a0, $zero -/* EEEDB4 80241CB4 AFBF0038 */ sw $ra, 0x38($sp) -/* EEEDB8 80241CB8 AFB30034 */ sw $s3, 0x34($sp) -/* EEEDBC 80241CBC AFB1002C */ sw $s1, 0x2c($sp) -/* EEEDC0 80241CC0 AFB00028 */ sw $s0, 0x28($sp) -/* EEEDC4 80241CC4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* EEEDC8 80241CC8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* EEEDCC 80241CCC 8E510148 */ lw $s1, 0x148($s2) -/* EEEDD0 80241CD0 86240008 */ lh $a0, 8($s1) -/* EEEDD4 80241CD4 0C00F92F */ jal dead_get_npc_unsafe -/* EEEDD8 80241CD8 00A0982D */ daddu $s3, $a1, $zero -/* EEEDDC 80241CDC 0040802D */ daddu $s0, $v0, $zero -/* EEEDE0 80241CE0 0200202D */ daddu $a0, $s0, $zero -/* EEEDE4 80241CE4 C6220088 */ lwc1 $f2, 0x88($s1) -/* EEEDE8 80241CE8 468010A0 */ cvt.s.w $f2, $f2 -/* EEEDEC 80241CEC 460010A1 */ cvt.d.s $f2, $f2 -/* EEEDF0 80241CF0 C604001C */ lwc1 $f4, 0x1c($s0) -/* EEEDF4 80241CF4 C6000014 */ lwc1 $f0, 0x14($s0) -/* EEEDF8 80241CF8 8E050018 */ lw $a1, 0x18($s0) -/* EEEDFC 80241CFC 46002100 */ add.s $f4, $f4, $f0 -/* EEEE00 80241D00 8E06000C */ lw $a2, 0xc($s0) -/* EEEE04 80241D04 C6200078 */ lwc1 $f0, 0x78($s1) -/* EEEE08 80241D08 46800020 */ cvt.s.w $f0, $f0 -/* EEEE0C 80241D0C E604001C */ swc1 $f4, 0x1c($s0) -/* EEEE10 80241D10 3C014059 */ lui $at, 0x4059 -/* EEEE14 80241D14 44812800 */ mtc1 $at, $f5 -/* EEEE18 80241D18 44802000 */ mtc1 $zero, $f4 -/* EEEE1C 80241D1C 46000021 */ cvt.d.s $f0, $f0 -/* EEEE20 80241D20 46240003 */ div.d $f0, $f0, $f4 -/* EEEE24 80241D24 46200520 */ cvt.s.d $f20, $f0 -/* EEEE28 80241D28 46241083 */ div.d $f2, $f2, $f4 -/* EEEE2C 80241D2C 0C00F909 */ jal dead_npc_move_heading -/* EEEE30 80241D30 462015A0 */ cvt.s.d $f22, $f2 -/* EEEE34 80241D34 C604001C */ lwc1 $f4, 0x1c($s0) -/* EEEE38 80241D38 44801000 */ mtc1 $zero, $f2 -/* EEEE3C 80241D3C 44801800 */ mtc1 $zero, $f3 -/* EEEE40 80241D40 46002021 */ cvt.d.s $f0, $f4 -/* EEEE44 80241D44 4620103E */ c.le.d $f2, $f0 -/* EEEE48 80241D48 00000000 */ nop -/* EEEE4C 80241D4C 45000030 */ bc1f .L80241E10 -/* EEEE50 80241D50 00000000 */ nop -/* EEEE54 80241D54 C600003C */ lwc1 $f0, 0x3c($s0) -/* EEEE58 80241D58 46040000 */ add.s $f0, $f0, $f4 -/* EEEE5C 80241D5C E600003C */ swc1 $f0, 0x3c($s0) -/* EEEE60 80241D60 8E2200CC */ lw $v0, 0xcc($s1) -/* EEEE64 80241D64 8C420024 */ lw $v0, 0x24($v0) -/* EEEE68 80241D68 AE020028 */ sw $v0, 0x28($s0) -/* EEEE6C 80241D6C A2200007 */ sb $zero, 7($s1) -/* EEEE70 80241D70 8E020000 */ lw $v0, ($s0) -/* EEEE74 80241D74 30420008 */ andi $v0, $v0, 8 -/* EEEE78 80241D78 14400011 */ bnez $v0, .L80241DC0 -/* EEEE7C 80241D7C 0000102D */ daddu $v0, $zero, $zero -/* EEEE80 80241D80 27A50018 */ addiu $a1, $sp, 0x18 -/* EEEE84 80241D84 27A6001C */ addiu $a2, $sp, 0x1c -/* EEEE88 80241D88 C6000038 */ lwc1 $f0, 0x38($s0) -/* EEEE8C 80241D8C C602003C */ lwc1 $f2, 0x3c($s0) -/* EEEE90 80241D90 C6040040 */ lwc1 $f4, 0x40($s0) -/* EEEE94 80241D94 3C01447A */ lui $at, 0x447a -/* EEEE98 80241D98 44813000 */ mtc1 $at, $f6 -/* EEEE9C 80241D9C 27A20024 */ addiu $v0, $sp, 0x24 -/* EEEEA0 80241DA0 E7A00018 */ swc1 $f0, 0x18($sp) -/* EEEEA4 80241DA4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* EEEEA8 80241DA8 E7A40020 */ swc1 $f4, 0x20($sp) -/* EEEEAC 80241DAC E7A60024 */ swc1 $f6, 0x24($sp) -/* EEEEB0 80241DB0 AFA20010 */ sw $v0, 0x10($sp) -/* EEEEB4 80241DB4 8E040080 */ lw $a0, 0x80($s0) -/* EEEEB8 80241DB8 0C03908F */ jal dead_npc_raycast_down_sides -/* EEEEBC 80241DBC 27A70020 */ addiu $a3, $sp, 0x20 -.L80241DC0: -/* EEEEC0 80241DC0 1040000B */ beqz $v0, .L80241DF0 -/* EEEEC4 80241DC4 00000000 */ nop -/* EEEEC8 80241DC8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* EEEECC 80241DCC 46140080 */ add.s $f2, $f0, $f20 -/* EEEED0 80241DD0 C600003C */ lwc1 $f0, 0x3c($s0) -/* EEEED4 80241DD4 4600103E */ c.le.s $f2, $f0 -/* EEEED8 80241DD8 00000000 */ nop -/* EEEEDC 80241DDC 4500008D */ bc1f .L80242014 -/* EEEEE0 80241DE0 00000000 */ nop -/* EEEEE4 80241DE4 E602003C */ swc1 $f2, 0x3c($s0) -/* EEEEE8 80241DE8 08090805 */ j .L80242014 -/* EEEEEC 80241DEC AE400070 */ sw $zero, 0x70($s2) -.L80241DF0: -/* EEEEF0 80241DF0 C602003C */ lwc1 $f2, 0x3c($s0) -/* EEEEF4 80241DF4 C6000064 */ lwc1 $f0, 0x64($s0) -/* EEEEF8 80241DF8 4602003E */ c.le.s $f0, $f2 -/* EEEEFC 80241DFC 00000000 */ nop -/* EEEF00 80241E00 45030084 */ bc1tl .L80242014 -/* EEEF04 80241E04 AE400070 */ sw $zero, 0x70($s2) -/* EEEF08 80241E08 08090805 */ j .L80242014 -/* EEEF0C 80241E0C 00000000 */ nop -.L80241E10: -/* EEEF10 80241E10 4622003C */ c.lt.d $f0, $f2 -/* EEEF14 80241E14 00000000 */ nop -/* EEEF18 80241E18 4500007E */ bc1f .L80242014 -/* EEEF1C 80241E1C 00000000 */ nop -/* EEEF20 80241E20 9602008E */ lhu $v0, 0x8e($s0) -/* EEEF24 80241E24 24420001 */ addiu $v0, $v0, 1 -/* EEEF28 80241E28 A602008E */ sh $v0, 0x8e($s0) -/* EEEF2C 80241E2C 00021400 */ sll $v0, $v0, 0x10 -/* EEEF30 80241E30 8E630020 */ lw $v1, 0x20($s3) -/* EEEF34 80241E34 00021403 */ sra $v0, $v0, 0x10 -/* EEEF38 80241E38 0043102A */ slt $v0, $v0, $v1 -/* EEEF3C 80241E3C 14400026 */ bnez $v0, .L80241ED8 -/* EEEF40 80241E40 00000000 */ nop -/* EEEF44 80241E44 C60C0038 */ lwc1 $f12, 0x38($s0) -/* EEEF48 80241E48 C60E0040 */ lwc1 $f14, 0x40($s0) -/* EEEF4C 80241E4C 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EEEF50 80241E50 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EEEF54 80241E54 A600008E */ sh $zero, 0x8e($s0) -/* EEEF58 80241E58 8C460028 */ lw $a2, 0x28($v0) -/* EEEF5C 80241E5C 0C00ABDC */ jal fio_validate_header_checksums -/* EEEF60 80241E60 8C470030 */ lw $a3, 0x30($v0) -/* EEEF64 80241E64 46000506 */ mov.s $f20, $f0 -/* EEEF68 80241E68 C60C000C */ lwc1 $f12, 0xc($s0) -/* EEEF6C 80241E6C 0C00ABC6 */ jal dead_get_clamped_angle_diff -/* EEEF70 80241E70 4600A386 */ mov.s $f14, $f20 -/* EEEF74 80241E74 46000086 */ mov.s $f2, $f0 -/* EEEF78 80241E78 8E62001C */ lw $v0, 0x1c($s3) -/* EEEF7C 80241E7C 46001005 */ abs.s $f0, $f2 -/* EEEF80 80241E80 44822000 */ mtc1 $v0, $f4 -/* EEEF84 80241E84 00000000 */ nop -/* EEEF88 80241E88 46802120 */ cvt.s.w $f4, $f4 -/* EEEF8C 80241E8C 4600203C */ c.lt.s $f4, $f0 -/* EEEF90 80241E90 00000000 */ nop -/* EEEF94 80241E94 4500000D */ bc1f .L80241ECC -/* EEEF98 80241E98 00000000 */ nop -/* EEEF9C 80241E9C 44800000 */ mtc1 $zero, $f0 -/* EEEFA0 80241EA0 C614000C */ lwc1 $f20, 0xc($s0) -/* EEEFA4 80241EA4 4600103C */ c.lt.s $f2, $f0 -/* EEEFA8 80241EA8 00000000 */ nop -/* EEEFAC 80241EAC 45000006 */ bc1f .L80241EC8 -/* EEEFB0 80241EB0 00021023 */ negu $v0, $v0 -/* EEEFB4 80241EB4 44820000 */ mtc1 $v0, $f0 -/* EEEFB8 80241EB8 00000000 */ nop -/* EEEFBC 80241EBC 46800020 */ cvt.s.w $f0, $f0 -/* EEEFC0 80241EC0 080907B3 */ j .L80241ECC -/* EEEFC4 80241EC4 4600A500 */ add.s $f20, $f20, $f0 -.L80241EC8: -/* EEEFC8 80241EC8 4604A500 */ add.s $f20, $f20, $f4 -.L80241ECC: -/* EEEFCC 80241ECC 0C00AB85 */ jal dead_clamp_angle -/* EEEFD0 80241ED0 4600A306 */ mov.s $f12, $f20 -/* EEEFD4 80241ED4 E600000C */ swc1 $f0, 0xc($s0) -.L80241ED8: -/* EEEFD8 80241ED8 8E020000 */ lw $v0, ($s0) -/* EEEFDC 80241EDC 30420008 */ andi $v0, $v0, 8 -/* EEEFE0 80241EE0 1040000A */ beqz $v0, .L80241F0C -/* EEEFE4 80241EE4 27A50018 */ addiu $a1, $sp, 0x18 -/* EEEFE8 80241EE8 C602003C */ lwc1 $f2, 0x3c($s0) -/* EEEFEC 80241EEC C600001C */ lwc1 $f0, 0x1c($s0) -/* EEEFF0 80241EF0 46001080 */ add.s $f2, $f2, $f0 -/* EEEFF4 80241EF4 4616103C */ c.lt.s $f2, $f22 -/* EEEFF8 80241EF8 00000000 */ nop -/* EEEFFC 80241EFC 45020045 */ bc1fl .L80242014 -/* EEF000 80241F00 E602003C */ swc1 $f2, 0x3c($s0) -/* EEF004 80241F04 08090804 */ j .L80242010 -/* EEF008 80241F08 E616003C */ swc1 $f22, 0x3c($s0) -.L80241F0C: -/* EEF00C 80241F0C C6000038 */ lwc1 $f0, 0x38($s0) -/* EEF010 80241F10 27A6001C */ addiu $a2, $sp, 0x1c -/* EEF014 80241F14 E7A00018 */ swc1 $f0, 0x18($sp) -/* EEF018 80241F18 860200A8 */ lh $v0, 0xa8($s0) -/* EEF01C 80241F1C C600001C */ lwc1 $f0, 0x1c($s0) -/* EEF020 80241F20 C604003C */ lwc1 $f4, 0x3c($s0) -/* EEF024 80241F24 44821000 */ mtc1 $v0, $f2 -/* EEF028 80241F28 00000000 */ nop -/* EEF02C 80241F2C 468010A0 */ cvt.s.w $f2, $f2 -/* EEF030 80241F30 46000005 */ abs.s $f0, $f0 -/* EEF034 80241F34 46020000 */ add.s $f0, $f0, $f2 -/* EEF038 80241F38 C6060040 */ lwc1 $f6, 0x40($s0) -/* EEF03C 80241F3C 27A20024 */ addiu $v0, $sp, 0x24 -/* EEF040 80241F40 46022100 */ add.s $f4, $f4, $f2 -/* EEF044 80241F44 3C014024 */ lui $at, 0x4024 -/* EEF048 80241F48 44811800 */ mtc1 $at, $f3 -/* EEF04C 80241F4C 44801000 */ mtc1 $zero, $f2 -/* EEF050 80241F50 46000021 */ cvt.d.s $f0, $f0 -/* EEF054 80241F54 46220000 */ add.d $f0, $f0, $f2 -/* EEF058 80241F58 E7A60020 */ swc1 $f6, 0x20($sp) -/* EEF05C 80241F5C E7A4001C */ swc1 $f4, 0x1c($sp) -/* EEF060 80241F60 46200020 */ cvt.s.d $f0, $f0 -/* EEF064 80241F64 E7A00024 */ swc1 $f0, 0x24($sp) -/* EEF068 80241F68 AFA20010 */ sw $v0, 0x10($sp) -/* EEF06C 80241F6C 8E040080 */ lw $a0, 0x80($s0) -/* EEF070 80241F70 0C03908F */ jal dead_npc_raycast_down_sides -/* EEF074 80241F74 27A70020 */ addiu $a3, $sp, 0x20 -/* EEF078 80241F78 10400015 */ beqz $v0, .L80241FD0 -/* EEF07C 80241F7C 00000000 */ nop -/* EEF080 80241F80 860200A8 */ lh $v0, 0xa8($s0) -/* EEF084 80241F84 C604001C */ lwc1 $f4, 0x1c($s0) -/* EEF088 80241F88 44820000 */ mtc1 $v0, $f0 -/* EEF08C 80241F8C 00000000 */ nop -/* EEF090 80241F90 46800020 */ cvt.s.w $f0, $f0 -/* EEF094 80241F94 46002085 */ abs.s $f2, $f4 -/* EEF098 80241F98 46020000 */ add.s $f0, $f0, $f2 -/* EEF09C 80241F9C C7A20024 */ lwc1 $f2, 0x24($sp) -/* EEF0A0 80241FA0 4600103E */ c.le.s $f2, $f0 -/* EEF0A4 80241FA4 00000000 */ nop -/* EEF0A8 80241FA8 45000005 */ bc1f .L80241FC0 -/* EEF0AC 80241FAC 00000000 */ nop -/* EEF0B0 80241FB0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* EEF0B4 80241FB4 AE00001C */ sw $zero, 0x1c($s0) -/* EEF0B8 80241FB8 08090805 */ j .L80242014 -/* EEF0BC 80241FBC E600003C */ swc1 $f0, 0x3c($s0) -.L80241FC0: -/* EEF0C0 80241FC0 C600003C */ lwc1 $f0, 0x3c($s0) -/* EEF0C4 80241FC4 46040000 */ add.s $f0, $f0, $f4 -/* EEF0C8 80241FC8 08090805 */ j .L80242014 -/* EEF0CC 80241FCC E600003C */ swc1 $f0, 0x3c($s0) -.L80241FD0: -/* EEF0D0 80241FD0 C606003C */ lwc1 $f6, 0x3c($s0) -/* EEF0D4 80241FD4 860200A8 */ lh $v0, 0xa8($s0) -/* EEF0D8 80241FD8 46163081 */ sub.s $f2, $f6, $f22 -/* EEF0DC 80241FDC 44820000 */ mtc1 $v0, $f0 -/* EEF0E0 80241FE0 00000000 */ nop -/* EEF0E4 80241FE4 46800020 */ cvt.s.w $f0, $f0 -/* EEF0E8 80241FE8 46001080 */ add.s $f2, $f2, $f0 -/* EEF0EC 80241FEC C604001C */ lwc1 $f4, 0x1c($s0) -/* EEF0F0 80241FF0 46002005 */ abs.s $f0, $f4 -/* EEF0F4 80241FF4 4602003C */ c.lt.s $f0, $f2 -/* EEF0F8 80241FF8 00000000 */ nop -/* EEF0FC 80241FFC 45020005 */ bc1fl .L80242014 -/* EEF100 80242000 AE00001C */ sw $zero, 0x1c($s0) -/* EEF104 80242004 46043000 */ add.s $f0, $f6, $f4 -/* EEF108 80242008 08090805 */ j .L80242014 -/* EEF10C 8024200C E600003C */ swc1 $f0, 0x3c($s0) -.L80242010: -/* EEF110 80242010 AE00001C */ sw $zero, 0x1c($s0) -.L80242014: -/* EEF114 80242014 8FBF0038 */ lw $ra, 0x38($sp) -/* EEF118 80242018 8FB30034 */ lw $s3, 0x34($sp) -/* EEF11C 8024201C 8FB20030 */ lw $s2, 0x30($sp) -/* EEF120 80242020 8FB1002C */ lw $s1, 0x2c($sp) -/* EEF124 80242024 8FB00028 */ lw $s0, 0x28($sp) -/* EEF128 80242028 D7B60048 */ ldc1 $f22, 0x48($sp) -/* EEF12C 8024202C D7B40040 */ ldc1 $f20, 0x40($sp) -/* EEF130 80242030 03E00008 */ jr $ra -/* EEF134 80242034 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80242038_EEF138.s b/ver/us/asm/nonmatchings/EEDF50/func_80242038_EEF138.s deleted file mode 100644 index 95773b9f3a..0000000000 --- a/ver/us/asm/nonmatchings/EEDF50/func_80242038_EEF138.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242038_EEF138 -/* EEF138 80242038 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* EEF13C 8024203C AFB00028 */ sw $s0, 0x28($sp) -/* EEF140 80242040 00A0802D */ daddu $s0, $a1, $zero -/* EEF144 80242044 AFB1002C */ sw $s1, 0x2c($sp) -/* EEF148 80242048 00C0882D */ daddu $s1, $a2, $zero -/* EEF14C 8024204C AFBF0034 */ sw $ra, 0x34($sp) -/* EEF150 80242050 AFB20030 */ sw $s2, 0x30($sp) -/* EEF154 80242054 AE200070 */ sw $zero, 0x70($s1) -/* EEF158 80242058 8C830000 */ lw $v1, ($a0) -/* EEF15C 8024205C 2402FDFF */ addiu $v0, $zero, -0x201 -/* EEF160 80242060 A480008E */ sh $zero, 0x8e($a0) -/* EEF164 80242064 00621824 */ and $v1, $v1, $v0 -/* EEF168 80242068 34650800 */ ori $a1, $v1, 0x800 -/* EEF16C 8024206C AC850000 */ sw $a1, ($a0) -/* EEF170 80242070 8E0200D0 */ lw $v0, 0xd0($s0) -/* EEF174 80242074 8C420034 */ lw $v0, 0x34($v0) -/* EEF178 80242078 10400003 */ beqz $v0, .L80242088 -/* EEF17C 8024207C 00E0902D */ daddu $s2, $a3, $zero -/* EEF180 80242080 08090824 */ j .L80242090 -/* EEF184 80242084 34620808 */ ori $v0, $v1, 0x808 -.L80242088: -/* EEF188 80242088 2402FFF7 */ addiu $v0, $zero, -9 -/* EEF18C 8024208C 00A21024 */ and $v0, $a1, $v0 -.L80242090: -/* EEF190 80242090 AC820000 */ sw $v0, ($a0) -/* EEF194 80242094 27A20024 */ addiu $v0, $sp, 0x24 -/* EEF198 80242098 27A50018 */ addiu $a1, $sp, 0x18 -/* EEF19C 8024209C C4800038 */ lwc1 $f0, 0x38($a0) -/* EEF1A0 802420A0 C482003C */ lwc1 $f2, 0x3c($a0) -/* EEF1A4 802420A4 C4840040 */ lwc1 $f4, 0x40($a0) -/* EEF1A8 802420A8 3C01447A */ lui $at, 0x447a -/* EEF1AC 802420AC 44813000 */ mtc1 $at, $f6 -/* EEF1B0 802420B0 27A6001C */ addiu $a2, $sp, 0x1c -/* EEF1B4 802420B4 E7A00018 */ swc1 $f0, 0x18($sp) -/* EEF1B8 802420B8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* EEF1BC 802420BC E7A40020 */ swc1 $f4, 0x20($sp) -/* EEF1C0 802420C0 E7A60024 */ swc1 $f6, 0x24($sp) -/* EEF1C4 802420C4 AFA20010 */ sw $v0, 0x10($sp) -/* EEF1C8 802420C8 8C840080 */ lw $a0, 0x80($a0) -/* EEF1CC 802420CC 0C03908F */ jal dead_npc_raycast_down_sides -/* EEF1D0 802420D0 27A70020 */ addiu $a3, $sp, 0x20 -/* EEF1D4 802420D4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* EEF1D8 802420D8 3C014059 */ lui $at, 0x4059 -/* EEF1DC 802420DC 44812800 */ mtc1 $at, $f5 -/* EEF1E0 802420E0 44802000 */ mtc1 $zero, $f4 -/* EEF1E4 802420E4 460010A1 */ cvt.d.s $f2, $f2 -/* EEF1E8 802420E8 46241082 */ mul.d $f2, $f2, $f4 -/* EEF1EC 802420EC 00000000 */ nop -/* EEF1F0 802420F0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* EEF1F4 802420F4 46000021 */ cvt.d.s $f0, $f0 -/* EEF1F8 802420F8 46240002 */ mul.d $f0, $f0, $f4 -/* EEF1FC 802420FC 00000000 */ nop -/* EEF200 80242100 3C013FE0 */ lui $at, 0x3fe0 -/* EEF204 80242104 44812800 */ mtc1 $at, $f5 -/* EEF208 80242108 44802000 */ mtc1 $zero, $f4 -/* EEF20C 8024210C 00000000 */ nop -/* EEF210 80242110 46241080 */ add.d $f2, $f2, $f4 -/* EEF214 80242114 AE000074 */ sw $zero, 0x74($s0) -/* EEF218 80242118 46240000 */ add.d $f0, $f0, $f4 -/* EEF21C 8024211C AE000090 */ sw $zero, 0x90($s0) -/* EEF220 80242120 4620120D */ trunc.w.d $f8, $f2 -/* EEF224 80242124 E6080078 */ swc1 $f8, 0x78($s0) -/* EEF228 80242128 4620020D */ trunc.w.d $f8, $f0 -/* EEF22C 8024212C E6080088 */ swc1 $f8, 0x88($s0) -/* EEF230 80242130 8E420014 */ lw $v0, 0x14($s2) -/* EEF234 80242134 AE220074 */ sw $v0, 0x74($s1) -/* EEF238 80242138 8E0200B0 */ lw $v0, 0xb0($s0) -/* EEF23C 8024213C 34420010 */ ori $v0, $v0, 0x10 -/* EEF240 80242140 AE0200B0 */ sw $v0, 0xb0($s0) -/* EEF244 80242144 8FBF0034 */ lw $ra, 0x34($sp) -/* EEF248 80242148 8FB20030 */ lw $s2, 0x30($sp) -/* EEF24C 8024214C 8FB1002C */ lw $s1, 0x2c($sp) -/* EEF250 80242150 8FB00028 */ lw $s0, 0x28($sp) -/* EEF254 80242154 03E00008 */ jr $ra -/* EEF258 80242158 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s b/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s index cea9812e80..50a9854246 100644 --- a/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s +++ b/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s @@ -64,7 +64,7 @@ glabel func_8024215C_EEF25C /* EEF32C 8024222C 0280202D */ daddu $a0, $s4, $zero /* EEF330 80242230 0240282D */ daddu $a1, $s2, $zero /* EEF334 80242234 02A0302D */ daddu $a2, $s5, $zero -/* EEF338 80242238 0C09080E */ jal func_80242038_EEF138 +/* EEF338 80242238 0C09080E */ jal EEDF50_UnkFunc5 /* EEF33C 8024223C 0200382D */ daddu $a3, $s0, $zero .L80242240: /* EEF340 80242240 2402FFFE */ addiu $v0, $zero, -2 @@ -92,7 +92,7 @@ glabel func_8024215C_EEF25C glabel L80242294_EEF394 /* EEF394 80242294 02A0202D */ daddu $a0, $s5, $zero /* EEF398 80242298 0200282D */ daddu $a1, $s0, $zero -/* EEF39C 8024229C 0C090394 */ jal func_80240E50_EEDF50 +/* EEF39C 8024229C 0C090394 */ jal EEDF50_UnkNpcAIFunc23 /* EEF3A0 802422A0 0260302D */ daddu $a2, $s3, $zero glabel L802422A4_EEF3A4 /* EEF3A4 802422A4 02A0202D */ daddu $a0, $s5, $zero @@ -109,14 +109,14 @@ glabel L802422BC_EEF3BC glabel L802422CC_EEF3CC /* EEF3CC 802422CC 02A0202D */ daddu $a0, $s5, $zero /* EEF3D0 802422D0 0200282D */ daddu $a1, $s0, $zero -/* EEF3D4 802422D4 0C0905BA */ jal func_802416E8_EEE7E8 +/* EEF3D4 802422D4 0C0905BA */ jal EEDF50_UnkFunc4 /* EEF3D8 802422D8 0260302D */ daddu $a2, $s3, $zero /* EEF3DC 802422DC 080908D4 */ j .L80242350 /* EEF3E0 802422E0 0000102D */ daddu $v0, $zero, $zero glabel L802422E4_EEF3E4 /* EEF3E4 802422E4 02A0202D */ daddu $a0, $s5, $zero /* EEF3E8 802422E8 0200282D */ daddu $a1, $s0, $zero -/* EEF3EC 802422EC 0C09068B */ jal func_80241A2C_EEEB2C +/* EEF3EC 802422EC 0C09068B */ jal EEDF50_UnkNpcAIFunc2 /* EEF3F0 802422F0 0260302D */ daddu $a2, $s3, $zero glabel L802422F4_EEF3F4 /* EEF3F4 802422F4 02A0202D */ daddu $a0, $s5, $zero @@ -135,14 +135,14 @@ glabel L8024230C_EEF40C glabel L80242324_EEF424 /* EEF424 80242324 02A0202D */ daddu $a0, $s5, $zero /* EEF428 80242328 0200282D */ daddu $a1, $s0, $zero -/* EEF42C 8024232C 0C090711 */ jal func_80241C44_EEED44 +/* EEF42C 8024232C 0C090711 */ jal EEDF50_UnkNpcAIFunc3 /* EEF430 80242330 0260302D */ daddu $a2, $s3, $zero /* EEF434 80242334 080908D4 */ j .L80242350 /* EEF438 80242338 0000102D */ daddu $v0, $zero, $zero glabel L8024233C_EEF43C /* EEF43C 8024233C 02A0202D */ daddu $a0, $s5, $zero /* EEF440 80242340 0200282D */ daddu $a1, $s0, $zero -/* EEF444 80242344 0C09072A */ jal func_80241CA8_EEEDA8 +/* EEF444 80242344 0C09072A */ jal EEDF50_UnkFunc6 /* EEF448 80242348 0260302D */ daddu $a2, $s3, $zero glabel L8024234C_EEF44C /* EEF44C 8024234C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s b/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s index 48a03c2386..3e95c2b1fe 100644 --- a/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s +++ b/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s @@ -64,7 +64,7 @@ glabel func_80242780_EEF880 /* EEF950 80242850 02A0202D */ daddu $a0, $s5, $zero /* EEF954 80242854 0240282D */ daddu $a1, $s2, $zero /* EEF958 80242858 0280302D */ daddu $a2, $s4, $zero -/* EEF95C 8024285C 0C09080E */ jal func_80242038_EEF138 +/* EEF95C 8024285C 0C09080E */ jal EEDF50_UnkFunc5 /* EEF960 80242860 0200382D */ daddu $a3, $s0, $zero /* EEF964 80242864 AE800070 */ sw $zero, 0x70($s4) .L80242868: @@ -93,7 +93,7 @@ glabel func_80242780_EEF880 glabel L802428BC_EEF9BC /* EEF9BC 802428BC 0280202D */ daddu $a0, $s4, $zero /* EEF9C0 802428C0 0200282D */ daddu $a1, $s0, $zero -/* EEF9C4 802428C4 0C090394 */ jal func_80240E50_EEDF50 +/* EEF9C4 802428C4 0C090394 */ jal EEDF50_UnkNpcAIFunc23 /* EEF9C8 802428C8 0260302D */ daddu $a2, $s3, $zero glabel L802428CC_EEF9CC /* EEF9CC 802428CC 0280202D */ daddu $a0, $s4, $zero @@ -110,14 +110,14 @@ glabel L802428E4_EEF9E4 glabel L802428F4_EEF9F4 /* EEF9F4 802428F4 0280202D */ daddu $a0, $s4, $zero /* EEF9F8 802428F8 0200282D */ daddu $a1, $s0, $zero -/* EEF9FC 802428FC 0C0905BA */ jal func_802416E8_EEE7E8 +/* EEF9FC 802428FC 0C0905BA */ jal EEDF50_UnkFunc4 /* EEFA00 80242900 0260302D */ daddu $a2, $s3, $zero /* EEFA04 80242904 08090A5C */ j .L80242970 /* EEFA08 80242908 0000102D */ daddu $v0, $zero, $zero glabel L8024290C_EEFA0C /* EEFA0C 8024290C 0280202D */ daddu $a0, $s4, $zero /* EEFA10 80242910 0200282D */ daddu $a1, $s0, $zero -/* EEFA14 80242914 0C09068B */ jal func_80241A2C_EEEB2C +/* EEFA14 80242914 0C09068B */ jal EEDF50_UnkNpcAIFunc2 /* EEFA18 80242918 0260302D */ daddu $a2, $s3, $zero glabel L8024291C_EEFA1C /* EEFA1C 8024291C 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s b/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s index c1b67124c5..09283dd30e 100644 --- a/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s +++ b/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s @@ -92,7 +92,7 @@ glabel func_8024137C_EF398C glabel L802414B4_EF3AC4 /* EF3AC4 802414B4 02A0202D */ daddu $a0, $s5, $zero /* EF3AC8 802414B8 0200282D */ daddu $a1, $s0, $zero -/* EF3ACC 802414BC 0C09001C */ jal func_80240070_EF2680 +/* EF3ACC 802414BC 0C09001C */ jal EF2680_UnkNpcAIFunc23 /* EF3AD0 802414C0 0260302D */ daddu $a2, $s3, $zero glabel L802414C4_EF3AD4 /* EF3AD4 802414C4 02A0202D */ daddu $a0, $s5, $zero diff --git a/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s b/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s index a6fdba34d0..68690b568f 100644 --- a/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s +++ b/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s @@ -96,7 +96,7 @@ glabel func_80241C90_EF42A0 .L80241DF0: /* EF4400 80241DF0 0280202D */ daddu $a0, $s4, $zero /* EF4404 80241DF4 02C0282D */ daddu $a1, $s6, $zero -/* EF4408 80241DF8 0C09001C */ jal func_80240070_EF2680 +/* EF4408 80241DF8 0C09001C */ jal EF2680_UnkNpcAIFunc23 /* EF440C 80241DFC 02A0302D */ daddu $a2, $s5, $zero .L80241E00: /* EF4410 80241E00 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 760ee5847f..0542bc0a3d 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -17893,16 +17893,16 @@ ECFFF0_DeadUnk1 = 0x80240000; // type:func rom:0xECFFF0 func_80240040_ED0030 = 0x80240040; // type:func rom:0xED0030 ED00D0_dead_foliage_setup_shear_mtx = 0x802400E0; // type:func rom:0xED00D0 ED00D0_DeadTransformFoliage = 0x80240150; // type:func rom:0xED0140 -func_80240320_ED0310 = 0x80240320; // type:func rom:0xED0310 +ED0310_UnkNpcAIFunc23 = 0x80240320; // type:func rom:0xED0310 func_802404D0_ED04C0 = 0x802404D0; // type:func rom:0xED04C0 ED0310_DeadUnkNpcAIFunc1 = 0x80240AF8; // type:func rom:0xED0AE8 -func_80240BB8_ED0BA8 = 0x80240BB8; // type:func rom:0xED0BA8 -func_80240EFC_ED0EEC = 0x80240EFC; // type:func rom:0xED0EEC +ED0310_UnkFunc4 = 0x80240BB8; // type:func rom:0xED0BA8 +ED0310_UnkNpcAIFunc2 = 0x80240EFC; // type:func rom:0xED0EEC func_80240F74_ED0F64 = 0x80240F74; // type:func rom:0xED0F64 ED0310_DeadUnkNpcAIFunc14 = 0x80240FE0; // type:func rom:0xED0FD0 -func_80241114_ED1104 = 0x80241114; // type:func rom:0xED1104 -func_80241178_ED1168 = 0x80241178; // type:func rom:0xED1168 -func_80241508_ED14F8 = 0x80241508; // type:func rom:0xED14F8 +ED0310_UnkNpcAIFunc3 = 0x80241114; // type:func rom:0xED1104 +ED0310_UnkFunc6 = 0x80241178; // type:func rom:0xED1168 +ED0310_UnkFunc5 = 0x80241508; // type:func rom:0xED14F8 func_8024162C_ED161C = 0x8024162C; // type:func rom:0xED161C D_8024365C_ED364C = 0x8024365C; // type:data rom:0xED364C D_802441D0_ED41C0 = 0x802441D0; // type:data rom:0xED41C0 @@ -17945,16 +17945,16 @@ D_80241850_EDD830 = 0x80241850; // type:data rom:0xEDD830 D_80241854_EDD834 = 0x80241854; // type:data rom:0xEDD834 func_80240000_EDE9C0 = 0x80240000; // type:func rom:0xEDE9C0 func_80240040_EDEA00 = 0x80240040; // type:func rom:0xEDEA00 -func_802401C4_EDEB84 = 0x802401C4; // type:func rom:0xEDEB84 +EDEA00_UnkNpcAIFunc23 = 0x802401C4; // type:func rom:0xEDEB84 func_80240374_EDED34 = 0x80240374; // type:func rom:0xEDED34 EDEA00_DeadUnkNpcAIFunc1 = 0x8024099C; // type:func rom:0xEDF35C -func_80240A5C_EDF41C = 0x80240A5C; // type:func rom:0xEDF41C -func_80240DA0_EDF760 = 0x80240DA0; // type:func rom:0xEDF760 +EDEA00_UnkFunc4 = 0x80240A5C; // type:func rom:0xEDF41C +EDEA00_UnkNpcAIFunc2 = 0x80240DA0; // type:func rom:0xEDF760 func_80240E18_EDF7D8 = 0x80240E18; // type:func rom:0xEDF7D8 EDEA00_DeadUnkNpcAIFunc14 = 0x80240E84; // type:func rom:0xEDF844 -func_80240FB8_EDF978 = 0x80240FB8; // type:func rom:0xEDF978 -func_8024101C_EDF9DC = 0x8024101C; // type:func rom:0xEDF9DC -func_802413AC_EDFD6C = 0x802413AC; // type:func rom:0xEDFD6C +EDEA00_UnkNpcAIFunc3 = 0x80240FB8; // type:func rom:0xEDF978 +EDEA00_UnkFunc6 = 0x8024101C; // type:func rom:0xEDF9DC +EDEA00_UnkFunc5 = 0x802413AC; // type:func rom:0xEDFD6C func_802414D0_EDFE90 = 0x802414D0; // type:func rom:0xEDFE90 func_802416E8_EE00A8 = 0x802416E8; // type:func rom:0xEE00A8 func_80241730_EE00F0 = 0x80241730; // type:func rom:0xEE00F0 @@ -17990,13 +17990,13 @@ func_802407D4_EE6D84 = 0x802407D4; // type:func rom:0xEE6D84 func_80240B10_EE70C0 = 0x80240B10; // type:func rom:0xEE70C0 func_80240CC0_EE7270 = 0x80240CC0; // type:func rom:0xEE7270 EE70C0_DeadUnkNpcAIFunc1 = 0x802412E8; // type:func rom:0xEE7898 -func_802413A8_EE7958 = 0x802413A8; // type:func rom:0xEE7958 -func_802416EC_EE7C9C = 0x802416EC; // type:func rom:0xEE7C9C +EE70C0_UnkFunc4 = 0x802413A8; // type:func rom:0xEE7958 +EE70C0_UnkNpcAIFunc2 = 0x802416EC; // type:func rom:0xEE7C9C func_80241764_EE7D14 = 0x80241764; // type:func rom:0xEE7D14 EE70C0_DeadUnkNpcAIFunc14 = 0x802417D0; // type:func rom:0xEE7D80 -func_80241904_EE7EB4 = 0x80241904; // type:func rom:0xEE7EB4 -func_80241968_EE7F18 = 0x80241968; // type:func rom:0xEE7F18 -func_80241CF8_EE82A8 = 0x80241CF8; // type:func rom:0xEE82A8 +EE70C0_UnkNpcAIFunc3 = 0x80241904; // type:func rom:0xEE7EB4 +EE70C0_UnkFunc6 = 0x80241968; // type:func rom:0xEE7F18 +EE70C0_UnkFunc5 = 0x80241CF8; // type:func rom:0xEE82A8 func_80241E1C_EE83CC = 0x80241E1C; // type:func rom:0xEE83CC func_80242034_EE85E4 = 0x80242034; // type:func rom:0xEE85E4 func_80242090_EE8640 = 0x80242090; // type:func rom:0xEE8640 @@ -18041,16 +18041,16 @@ EED1E0_DeadUnkPartnerPosFunc = 0x80240D58; // type:func rom:0xEEDE58 EED1E0_DeadUnkPartnerPosFunc2 = 0x80240DA0; // type:func rom:0xEEDEA0 func_80240DE8_EEDEE8 = 0x80240DE8; // type:func rom:0xEEDEE8 func_80240E18_EEDF18 = 0x80240E18; // type:func rom:0xEEDF18 -func_80240E50_EEDF50 = 0x80240E50; // type:func rom:0xEEDF50 +EEDF50_UnkNpcAIFunc23 = 0x80240E50; // type:func rom:0xEEDF50 func_80241000_EEE100 = 0x80241000; // type:func rom:0xEEE100 EEDF50_DeadUnkNpcAIFunc1 = 0x80241628; // type:func rom:0xEEE728 -func_802416E8_EEE7E8 = 0x802416E8; // type:func rom:0xEEE7E8 -func_80241A2C_EEEB2C = 0x80241A2C; // type:func rom:0xEEEB2C +EEDF50_UnkFunc4 = 0x802416E8; // type:func rom:0xEEE7E8 +EEDF50_UnkNpcAIFunc2 = 0x80241A2C; // type:func rom:0xEEEB2C func_80241AA4_EEEBA4 = 0x80241AA4; // type:func rom:0xEEEBA4 EEDF50_DeadUnkNpcAIFunc14 = 0x80241B10; // type:func rom:0xEEEC10 -func_80241C44_EEED44 = 0x80241C44; // type:func rom:0xEEED44 -func_80241CA8_EEEDA8 = 0x80241CA8; // type:func rom:0xEEEDA8 -func_80242038_EEF138 = 0x80242038; // type:func rom:0xEEF138 +EEDF50_UnkNpcAIFunc3 = 0x80241C44; // type:func rom:0xEEED44 +EEDF50_UnkFunc6 = 0x80241CA8; // type:func rom:0xEEEDA8 +EEDF50_UnkFunc5 = 0x80242038; // type:func rom:0xEEF138 func_8024215C_EEF25C = 0x8024215C; // type:func rom:0xEEF25C func_80242374_EEF474 = 0x80242374; // type:func rom:0xEEF474 func_802424A4_EEF5A4 = 0x802424A4; // type:func rom:0xEEF5A4 @@ -18068,7 +18068,7 @@ D_80245460_EF2560 = 0x80245460; // type:data rom:0xEF2560 D_802454A8_EF25A8 = 0x802454A8; // type:data rom:0xEF25A8 EF2610_DeadUnk1 = 0x80240000; // type:func rom:0xEF2610 func_80240040_EF2650 = 0x80240040; // type:func rom:0xEF2650 -func_80240070_EF2680 = 0x80240070; // type:func rom:0xEF2680 +EF2680_UnkNpcAIFunc23 = 0x80240070; // type:func rom:0xEF2680 func_80240220_EF2830 = 0x80240220; // type:func rom:0xEF2830 EF2680_DeadUnkNpcAIFunc1 = 0x80240848; // type:func rom:0xEF2E58 EF2680_UnkFunc4 = 0x80240908; // type:func rom:0xEF2F18