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

Decompile aiSpawnChrAtChr

This commit is contained in:
Ryan Dwyer 2020-02-18 23:12:57 +10:00
parent 1e4803d8c4
commit 13532df085
3 changed files with 19 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32030,7 +32030,7 @@ glabel chrSpawnAtCoord
/* f04b574: 00000000 */ sll $zero,$zero,0x0
);
bool chrSpawnAtPad(struct chrdata *basechr, s32 body, s32 head, s32 pad_id, u8 *ailist, u32 flags)
struct prop *chrSpawnAtPad(struct chrdata *basechr, s32 body, s32 head, s32 pad_id, u8 *ailist, u32 flags)
{
s32 resolved_pad_id = chrResolvePadId(basechr, pad_id);
struct pad pad;
@ -32044,7 +32044,7 @@ bool chrSpawnAtPad(struct chrdata *basechr, s32 body, s32 head, s32 pad_id, u8 *
return chrSpawnAtCoord(body, head, &pad.pos, &room[0], fvalue, ailist, flags);
}
bool chrSpawnAtChr(struct chrdata *basechr, s32 body, s32 head, u32 chrnum, u8 *ailist, u32 flags)
struct prop *chrSpawnAtChr(struct chrdata *basechr, s32 body, s32 head, u32 chrnum, u8 *ailist, u32 flags)
{
struct chrdata *chr = chrFindById(basechr, chrnum);
f32 fvalue;

86
src/game/chr/chraicommands.c
View File

@ -4694,79 +4694,21 @@ glabel aiSpawnChrAtPad
/**
* @cmd 00c7
*/
GLOBAL_ASM(
glabel aiSpawnChrAtChr
/* f055740: 27bdffd0 */ addiu $sp,$sp,-48
/* f055744: afb00020 */ sw $s0,0x20($sp)
/* f055748: 3c10800a */ lui $s0,%hi(g_Vars)
/* f05574c: 26109fc0 */ addiu $s0,$s0,%lo(g_Vars)
/* f055750: 8e0e0434 */ lw $t6,0x434($s0)
/* f055754: 8e0f0438 */ lw $t7,0x438($s0)
/* f055758: afbf0024 */ sw $ra,0x24($sp)
/* f05575c: 01cf1821 */ addu $v1,$t6,$t7
/* f055760: 90780007 */ lbu $t8,0x7($v1)
/* f055764: 90680008 */ lbu $t0,0x8($v1)
/* f055768: 906b0009 */ lbu $t3,0x9($v1)
/* f05576c: 906e000a */ lbu $t6,0xa($v1)
/* f055770: 0018ce00 */ sll $t9,$t8,0x18
/* f055774: 00084c00 */ sll $t1,$t0,0x10
/* f055778: 03295025 */ or $t2,$t9,$t1
/* f05577c: 000b6200 */ sll $t4,$t3,0x8
/* f055780: 014c6825 */ or $t5,$t2,$t4
/* f055784: 01ae7825 */ or $t7,$t5,$t6
/* f055788: afaf0028 */ sw $t7,0x28($sp)
/* f05578c: 90780005 */ lbu $t8,0x5($v1)
/* f055790: 90790006 */ lbu $t9,0x6($v1)
/* f055794: afa3002c */ sw $v1,0x2c($sp)
/* f055798: 00184200 */ sll $t0,$t8,0x8
/* f05579c: 01191025 */ or $v0,$t0,$t9
/* f0557a0: 0c006134 */ jal ailistFindById
/* f0557a4: 3044ffff */ andi $a0,$v0,0xffff
/* f0557a8: 8fa3002c */ lw $v1,0x2c($sp)
/* f0557ac: 8fab0028 */ lw $t3,0x28($sp)
/* f0557b0: 8e040424 */ lw $a0,0x424($s0)
/* f0557b4: 90650002 */ lbu $a1,0x2($v1)
/* f0557b8: 80660003 */ lb $a2,0x3($v1)
/* f0557bc: 90670004 */ lbu $a3,0x4($v1)
/* f0557c0: afa20010 */ sw $v0,0x10($sp)
/* f0557c4: 0fc12d7d */ jal chrSpawnAtChr
/* f0557c8: afab0014 */ sw $t3,0x14($sp)
/* f0557cc: 10400007 */ beqz $v0,.L0f0557ec
/* f0557d0: 8fa3002c */ lw $v1,0x2c($sp)
/* f0557d4: 8e040434 */ lw $a0,0x434($s0)
/* f0557d8: 8e050438 */ lw $a1,0x438($s0)
/* f0557dc: 0fc13583 */ jal chraiGoToLabel
/* f0557e0: 9066000b */ lbu $a2,0xb($v1)
/* f0557e4: 10000004 */ beqz $zero,.L0f0557f8
/* f0557e8: ae020438 */ sw $v0,0x438($s0)
.L0f0557ec:
/* f0557ec: 8e0a0438 */ lw $t2,0x438($s0)
/* f0557f0: 254c000c */ addiu $t4,$t2,0xc
/* f0557f4: ae0c0438 */ sw $t4,0x438($s0)
.L0f0557f8:
/* f0557f8: 8fbf0024 */ lw $ra,0x24($sp)
/* f0557fc: 8fb00020 */ lw $s0,0x20($sp)
/* f055800: 27bd0030 */ addiu $sp,$sp,0x30
/* f055804: 03e00008 */ jr $ra
/* f055808: 00001025 */ or $v0,$zero,$zero
);
bool aiSpawnChrAtChr(void)
{
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
u32 flags = (cmd[8] << 16) | (cmd[9] << 8) | cmd[10] | (cmd[7] << 24);
u16 ailistid = cmd[6] | (cmd[5] << 8);
u8 *ailist = ailistFindById(ailistid);
// Mismatch due to different temporary registers
//bool aiSpawnChrAtChr(void)
//{
// u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
// u32 flags = (cmd[8] << 16) | (cmd[9] << 8) | cmd[10] | (cmd[7] << 24);
// u32 ailistid = cmd[6] | (cmd[5] << 8);
// u8 *ailist = ailistFindById(ailistid);
//
// if (chrSpawnAtChr(g_Vars.chrdata, cmd[2], (s8)cmd[3], cmd[4], ailist, flags)) {
// g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[11]);
// } else {
// g_Vars.aioffset += 12;
// }
//
// return false;
//}
if (chrSpawnAtChr(g_Vars.chrdata, cmd[2], (s8)cmd[3], cmd[4], ailist, flags)) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[11]);
} else {
g_Vars.aioffset += 12;
}
return false;
}
/**
* @cmd 00c8

6
src/include/game/chr/chraction.h
View File

@ -194,7 +194,7 @@ bool func0f04a848(u8 chrnum, struct chrdata *chr, f32 distance, struct coord *po
u32 chrIsInLoadedRoom(struct chrdata *chr);
u32 func0f04aeb0(void);
u32 func0f04af84(void);
bool chrSpawnAtCoord(s32 body, s32 head, struct coord *pos, s16 *room, f32 arg4, u8 *ailist, u32 flags);
struct prop *chrSpawnAtCoord(s32 body, s32 head, struct coord *pos, s16 *room, f32 arg4, u8 *ailist, u32 flags);
u32 func0f04b658(struct chrdata *chr);
bool chrMoveToPos(struct chrdata *chr, struct coord *pos, s16 *room, f32 arg3, u32 allowonscreen);
u32 func0f04b950(struct chrdata *chr, u32 cover, u32 arg2);
@ -312,8 +312,8 @@ void chrSetChrPreset(struct chrdata *chr, s32 chrpreset);
void chrSetChrPresetByChrnum(struct chrdata *chr, s32 chrnum, s32 chrpreset);
void chrSetPadPreset(struct chrdata *chr, s32 pad_id);
void chrSetPadPresetByChrnum(struct chrdata *chr, s32 chrnum, s32 pad_id);
bool chrSpawnAtPad(struct chrdata *chr, s32 body, s32 head, s32 pad, u8 *ailist, u32 flags);
bool chrSpawnAtChr(struct chrdata *basechr, s32 body, s32 head, u32 chrnum, u8 *ailist, u32 flags);
struct prop *chrSpawnAtPad(struct chrdata *chr, s32 body, s32 head, s32 pad, u8 *ailist, u32 flags);
struct prop *chrSpawnAtChr(struct chrdata *basechr, s32 body, s32 head, u32 chrnum, u8 *ailist, u32 flags);
s16 chrGoToCover(struct chrdata *chr, u8 speed);
void chrAddTargetToBdlist(struct chrdata *chr);
s32 chrGetDistanceLostToTargetInLastSecond(struct chrdata *chr);