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

Decompile heliAttack

This commit is contained in:
Ryan Dwyer 2020-01-14 22:01:59 +10:00
parent 5e27cf969d
commit 70a3864737
3 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,7 +384,7 @@ bool aiStop(void)
if (g_Vars.chrdata) {
chrTryStop(g_Vars.chrdata);
} else if (g_Vars.hovdata) {
heliTryStop(g_Vars.hovdata);
heliStop(g_Vars.hovdata);
}
g_Vars.aioffset += 2;
@ -947,7 +947,7 @@ bool aiAimAndFire2(void)
u32 thingtype = cmd[3] | (cmd[2] << 8);
if ((g_Vars.chrdata && func0f03a76c(g_Vars.chrdata, thingtype, thingid)) ||
(g_Vars.hovdata && func0f07b038(g_Vars.hovdata))) {
(g_Vars.hovdata && heliAttack(g_Vars.hovdata))) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]);
} else {
g_Vars.aioffset += 7;

36
src/game/game_066310.c
View File

@ -24751,29 +24751,21 @@ glabel heliSetTarget
/* f07b034: 00000000 */ sll $zero,$zero,0x0
);
GLOBAL_ASM(
glabel func0f07b038
/* f07b038: 27bdffe8 */ addiu $sp,$sp,-24
/* f07b03c: afbf0014 */ sw $ra,0x14($sp)
/* f07b040: 0fc1eb7d */ jal heliFromObj
/* f07b044: 00000000 */ sll $zero,$zero,0x0
/* f07b048: 10400006 */ beqz $v0,.L0f07b064
/* f07b04c: 240e0001 */ addiu $t6,$zero,0x1
/* f07b050: 240f00f0 */ addiu $t7,$zero,0xf0
/* f07b054: a04e0096 */ sb $t6,0x96($v0)
/* f07b058: ac4f00c4 */ sw $t7,0xc4($v0)
/* f07b05c: 10000002 */ beqz $zero,.L0f07b068
/* f07b060: 24020001 */ addiu $v0,$zero,0x1
.L0f07b064:
/* f07b064: 00001025 */ or $v0,$zero,$zero
.L0f07b068:
/* f07b068: 8fbf0014 */ lw $ra,0x14($sp)
/* f07b06c: 27bd0018 */ addiu $sp,$sp,0x18
/* f07b070: 03e00008 */ jr $ra
/* f07b074: 00000000 */ sll $zero,$zero,0x0
);
bool heliAttack(struct defaultobj *obj)
{
struct heliobj *heli = heliFromObj(obj);
bool heliTryStop(struct defaultobj *obj)
if (heli) {
heli->attackmode = 1;
heli->patroltimer60 = 240;
return true;
}
return false;
}
bool heliStop(struct defaultobj *obj)
{
struct heliobj *heli = heliFromObj(obj);

4
src/include/game/game_066310.h
View File

@ -165,8 +165,8 @@ struct heliobj *heliFromObj(struct defaultobj *obj);
u32 func0f07ae18(struct heliobj *heli, u32 arg1);
u32 func0f07af34(struct heliobj *heli);
void heliSetTarget(struct heliobj *heli, s32 arg1);
u32 func0f07b038(struct heliobj *heli);
bool heliTryStop(struct defaultobj *obj);
bool heliAttack(struct defaultobj *obj);
bool heliStop(struct defaultobj *obj);
bool heliSetArmed(struct defaultobj *obj, bool armed);
void heliRestartTimer(struct defaultobj *obj);
f32 heliGetTimer(struct heliobj *heli);