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

Decompile aiSetRoomToSearch

This commit is contained in:
Ryan Dwyer 2019-10-10 19:04:04 +10:00
parent 5a5057d0e9
commit 57de503a23
5 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1813,7 +1813,7 @@ bool ai0045(void)
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
if (chr && chr->pos && func0f0393b4(g_Vars.chrdata, &chr->pos->coord, &chr->pos->unk28)) {
if (chr && chr->pos && func0f0393b4(g_Vars.chrdata, &chr->pos->coord, &chr->pos->room)) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
} else {
g_Vars.aioffset += 4;
@ -18369,34 +18369,18 @@ bool aiSetChrSpecialDeathAnimation(void)
/**
* @cmd 01a1
*/
GLOBAL_ASM(
glabel ai01a1
/* f05daac: 27bdffe8 */ addiu $sp,$sp,-24
/* f05dab0: 3c06800a */ lui $a2,0x800a
/* f05dab4: 24c69fc0 */ addiu $a2,$a2,-24640
/* f05dab8: afbf0014 */ sw $ra,0x14($sp)
/* f05dabc: 8cc40424 */ lw $a0,0x424($a2)
/* f05dac0: 0fc126d1 */ jal chrFindById
/* f05dac4: 240500f6 */ addiu $a1,$zero,0xf6
/* f05dac8: 3c06800a */ lui $a2,0x800a
/* f05dacc: 10400007 */ beqz $v0,.L0f05daec
/* f05dad0: 24c69fc0 */ addiu $a2,$a2,-24640
/* f05dad4: 8c43001c */ lw $v1,0x1c($v0)
/* f05dad8: 50600005 */ beqzl $v1,.L0f05daf0
/* f05dadc: 8cd80438 */ lw $t8,0x438($a2)
/* f05dae0: 846e0028 */ lh $t6,0x28($v1)
/* f05dae4: 8ccf0424 */ lw $t7,0x424($a2)
/* f05dae8: a5ee0330 */ sh $t6,0x330($t7)
.L0f05daec:
/* f05daec: 8cd80438 */ lw $t8,0x438($a2)
.L0f05daf0:
/* f05daf0: 8fbf0014 */ lw $ra,0x14($sp)
/* f05daf4: 27bd0018 */ addiu $sp,$sp,0x18
/* f05daf8: 27190002 */ addiu $t9,$t8,0x2
/* f05dafc: acd90438 */ sw $t9,0x438($a2)
/* f05db00: 03e00008 */ jr $ra
/* f05db04: 00001025 */ or $v0,$zero,$zero
);
bool aiSetRoomToSearch(void)
{
struct chrdata *target = chrFindById(g_Vars.chrdata, TARGET_CHR);
if (target && target->pos) {
g_Vars.chrdata->roomtosearch = target->pos->room;
}
g_Vars.aioffset += 2;
return false;
}
/**
* @cmd 01a2

3
src/include/commands.h
View File

@ -1574,7 +1574,8 @@
chr, \
anim,
// Copies the room from the chr's position struct into the chr struct itself
// Sets the chr's roomtosearch field
// to the same room that the chr's target is in.
#define set_chr_roomtosearch \
mkshort(0x01a1),

2
src/include/game/chr/chraicommands.h
View File

@ -384,7 +384,7 @@
/*0x019e*/ bool aiIfObjHealthLessThan(void);
/*0x019f*/ bool aiSetObjHealth(void);
/*0x01a0*/ bool aiSetChrSpecialDeathAnimation(void);
/*0x01a1*/ bool ai01a1(void);
/*0x01a1*/ bool aiSetRoomToSearch(void);
/*0x01a2*/ bool ai01a2(void);
/*0x01a3*/ bool ai01a3(void);
/*0x01a4*/ bool ai01a4(void);

4
src/include/types.h
View File

@ -14,7 +14,7 @@ struct coord {
struct position {
u8 unk00;
u8 flags;
u16 room;
u16 unk02;
u32 unk04;
struct coord coord;
u32 unk14;
@ -22,7 +22,7 @@ struct position {
u32 unk1c;
u32 unk20;
u32 unk24;
u32 unk28;
s16 room;
};
struct chrdata {

2
src/setup/setup_000000.c
View File

@ -14366,7 +14366,7 @@ bool (*command_pointers[])(void) = {
/*0x019e*/ aiIfObjHealthLessThan,
/*0x019f*/ aiSetObjHealth,
/*0x01a0*/ aiSetChrSpecialDeathAnimation,
/*0x01a1*/ ai01a1,
/*0x01a1*/ aiSetRoomToSearch,
/*0x01a2*/ ai01a2,
/*0x01a3*/ ai01a3,
/*0x01a4*/ ai01a4,