falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile chrGetSameFloorDistanceToPad

This commit is contained in:
Ryan Dwyer 2020-02-16 22:30:57 +10:00
parent dc1d03773a
commit 7dc628e428
1 changed files with 26 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/game/chr/chraction.c
View File

@ -504,10 +504,6 @@ const u32 var7f1a9378[] = {0x40490fdb};
const u32 var7f1a937c[] = {0x40c907a9};
const u32 var7f1a9380[] = {0x40490fdb};
// <chrGetSameFloorDistanceToPad>
const u32 var7f1a9384[] = {0x4cbebc20};
// </chrGetSameFloorDistanceToPad>
GLOBAL_ASM(
glabel func0f02dff0
/* f02dff0: 00043400 */ sll $a2,$a0,0x10
@ -30276,89 +30272,33 @@ f32 chrGetDistanceToPad(struct chrdata *chr, s32 pad_id)
return distance;
}
GLOBAL_ASM(
glabel chrGetSameFloorDistanceToPad
/* f049380: 27bdff78 */ addiu $sp,$sp,-136
/* f049384: afbf0014 */ sw $ra,0x14($sp)
/* f049388: 8c83001c */ lw $v1,0x1c($a0)
/* f04938c: 0fc1258b */ jal chrResolvePadId
/* f049390: afa30084 */ sw $v1,0x84($sp)
/* f049394: 00402025 */ or $a0,$v0,$zero
/* f049398: 24050002 */ addiu $a1,$zero,0x2
/* f04939c: 0fc456ac */ jal padUnpack
/* f0493a0: 27a60020 */ addiu $a2,$sp,0x20
/* f0493a4: 8fa30084 */ lw $v1,0x84($sp)
/* f0493a8: c7a40020 */ lwc1 $f4,0x20($sp)
/* f0493ac: c7a80024 */ lwc1 $f8,0x24($sp)
/* f0493b0: c4660008 */ lwc1 $f6,0x8($v1)
/* f0493b4: c46a000c */ lwc1 $f10,0xc($v1)
/* f0493b8: c7b00028 */ lwc1 $f16,0x28($sp)
/* f0493bc: 46062081 */ sub.s $f2,$f4,$f6
/* f0493c0: 44802000 */ mtc1 $zero,$f4
/* f0493c4: c4720010 */ lwc1 $f18,0x10($v1)
/* f0493c8: 460a4001 */ sub.s $f0,$f8,$f10
/* f0493cc: 3c014316 */ lui $at,0x4316
/* f0493d0: 44813000 */ mtc1 $at,$f6
/* f0493d4: 3c017f1b */ lui $at,0x7f1b
/* f0493d8: 4600203c */ c.lt.s $f4,$f0
/* f0493dc: 46128381 */ sub.s $f14,$f16,$f18
/* f0493e0: 45020004 */ bc1fl .L0f0493f4
/* f0493e4: 46000307 */ neg.s $f12,$f0
/* f0493e8: 10000002 */ beqz $zero,.L0f0493f4
/* f0493ec: 46000306 */ mov.s $f12,$f0
/* f0493f0: 46000307 */ neg.s $f12,$f0
.L0f0493f4:
/* f0493f4: 4606603c */ c.lt.s $f12,$f6
/* f0493f8: 00000000 */ sll $zero,$zero,0x0
/* f0493fc: 45000008 */ bc1f .L0f049420
/* f049400: 00000000 */ sll $zero,$zero,0x0
/* f049404: 46021202 */ mul.s $f8,$f2,$f2
/* f049408: 00000000 */ sll $zero,$zero,0x0
/* f04940c: 460e7282 */ mul.s $f10,$f14,$f14
/* f049410: 0c012974 */ jal sqrtf
/* f049414: 460a4300 */ add.s $f12,$f8,$f10
/* f049418: 10000002 */ beqz $zero,.L0f049424
/* f04941c: 46000086 */ mov.s $f2,$f0
.L0f049420:
/* f049420: c4229384 */ lwc1 $f2,-0x6c7c($at)
.L0f049424:
/* f049424: 8fbf0014 */ lw $ra,0x14($sp)
/* f049428: 27bd0088 */ addiu $sp,$sp,0x88
/* f04942c: 46001006 */ mov.s $f0,$f2
/* f049430: 03e00008 */ jr $ra
/* f049434: 00000000 */ sll $zero,$zero,0x0
);
f32 chrGetSameFloorDistanceToPad(struct chrdata *chr, s32 pad_id)
{
struct prop *prop = chr->prop;
f32 xdiff, ydiff, zdiff, ydiff_absolute;
struct pad pad;
f32 ret;
// Matches, but commented because it puts rodata out of order. Will be safe to
// uncomment once all functions either above or below it which contain rodata
// have been decompiled.
//f32 chrGetSameFloorDistanceToPad(struct chrdata *chr, s32 pad_id)
//{
// struct prop *prop = chr->prop;
// f32 xdiff, ydiff, zdiff, ydiff_absolute;
// struct pad pad;
// f32 ret;
//
// pad_id = chrResolvePadId(chr, pad_id);
// padUnpack(pad_id, PADFIELD_POS, &pad);
// xdiff = pad.pos.x - prop->pos.x;
// ydiff = pad.pos.y - prop->pos.y;
// zdiff = pad.pos.z - prop->pos.z;
//
// if (ydiff > 0) {
// ydiff_absolute = ydiff;
// } else {
// ydiff_absolute = -ydiff;
// }
//
// if (ydiff_absolute < 150) {
// ret = sqrtf(xdiff * xdiff + zdiff * zdiff);
// } else {
// ret = 100000000;
// }
//
// return ret;
//}
pad_id = chrResolvePadId(chr, pad_id);
padUnpack(pad_id, PADFIELD_POS, &pad);
xdiff = pad.pos.x - prop->pos.x;
ydiff = pad.pos.y - prop->pos.y;
zdiff = pad.pos.z - prop->pos.z;
if (ydiff > 0) {
ydiff_absolute = ydiff;
} else {
ydiff_absolute = -ydiff;
}
if (ydiff_absolute < 150) {
ret = sqrtf(xdiff * xdiff + zdiff * zdiff);
} else {
ret = 100000000;
}
return ret;
}
f32 chrGetDistanceToCoord(struct chrdata *chr, struct coord *pos)
{