mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-09-12 20:16:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to decompile chrIsStopped

Browse Source
This commit is contained in:
Ryan Dwyer
2019-12-26 11:50:00 +10:00
parent 0f61afa53c
commit 8e5bb6ad65
7 changed files with 76 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/chr/chr.c
+48 -2
View File
@@ -20191,7 +20191,7 @@ glabel func0f02f530
/* f02f5d8: 10000007 */ beqz $zero,.L0f02f5f8
/* f02f5dc: ae090014 */ sw $t1,0x14($s0)
.L0f02f5e0:
/* f02f5e0: 0fc0e576 */ jal func0f0395d8
/* f02f5e0: 0fc0e576 */ jal chrIsStopped
/* f02f5e4: 02002025 */ or $a0,$s0,$zero
/* f02f5e8: 54400004 */ bnezl $v0,.L0f02f5fc
/* f02f5ec: 8fbf001c */ lw $ra,0x1c($sp)
@@ -31296,7 +31296,7 @@ void chrRecordLastHearTargetTime(struct chrdata *chr)
}
GLOBAL_ASM(
glabel func0f0395d8
glabel chrIsStopped
/* f0395d8: 27bdffd8 */ addiu $sp,$sp,-40
/* f0395dc: afb00018 */ sw $s0,0x18($sp)
/* f0395e0: 00808025 */ or $s0,$a0,$zero
@@ -31418,6 +31418,52 @@ glabel func0f0395d8
/* f039788: 00000000 */ sll $zero,$zero,0x0
);
//bool chrIsStopped(struct chrdata *chr)
//{
// u32 anim = func0001d13c(chr->unk020);
//
// if (anim == 0x269 || anim == 0x26b) {
// return false;
// }
//
// if (anim == 0x26a && chr->act_attack.unk034 <= chr->act_attack.unk033) {
// chrStopFiring(chr);
// return true;
// }
//
// if (chr->actiontype == ACT_ROBOTATTACK && chr->unk06e) {
// return true;
// }
//
// if (chr->actiontype == ACT_ATTACKAMOUNT && chr->act_attackamount.unk034 <= chr->act_attackamount.unk033) {
// return true;
// }
//
// if (chr->actiontype == ACT_STAND && chr->act_stand.unk02c == 0 && chr->act_stand.unk038 == 0 && chr->act_stand.unk03c != 1) {
// return true;
// }
//
// if (chr->actiontype == ACT_ANIM) {
// if (chr->act_anim.unk034) {
// return true;
// }
//
// if (func0001d260(chr->unk020) >= 0 && func0001d17c(chr->unk020) >= func0001d1a0(chr->unk020)) {
// return true;
// }
//
// if (func0001d260(chr->unk020) >= 0 || func0001d17c(chr->unk020) > 0) {
// return false;
// }
// }
//
// if (chr->actiontype == ACT_PATROL) {
// return true;
// }
//
// return false;
//}
GLOBAL_ASM(
glabel func0f03978c
/* f03978c: 27bdffb0 */ addiu $sp,$sp,-80
src/game/chr/chraicommands.c
+2 -2
View File
@@ -384,7 +384,7 @@ bool aiStop(void)
if (g_Vars.chrdata) {
chrTryStop(g_Vars.chrdata);
} else if (g_Vars.hovdata) {
func0f07b078(g_Vars.hovdata);
heliTryStop(g_Vars.hovdata);
}
g_Vars.aioffset += 2;
@@ -672,7 +672,7 @@ bool aiBeSurprised000e(void)
*/
bool aiIfStopped(void)
{
if (func0f0395d8(g_Vars.chrdata)) {
if (chrIsStopped(g_Vars.chrdata)) {
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]);
} else {
src/game/game_066310.c
+1 -1
View File
@@ -24779,7 +24779,7 @@ glabel func0f07b038
);
GLOBAL_ASM(
glabel func0f07b078
glabel heliTryStop
/* f07b078: 27bdffe8 */ addiu $sp,$sp,-24
/* f07b07c: afbf0014 */ sw $ra,0x14($sp)
/* f07b080: 0fc1eb7d */ jal objGetHeli