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

Decompile heliRestartTimer

This commit is contained in:
Ryan Dwyer 2020-01-14 21:39:53 +10:00
parent 944b1cc3b0
commit 560548ced5
3 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/game/game_066310.c
View File

@ -24808,21 +24808,14 @@ bool heliSetArmed(struct defaultobj *obj, bool armed)
return false;
}
GLOBAL_ASM(
glabel heliRestartTimer
/* f07b0f4: 27bdffe8 */ addiu $sp,$sp,-24
/* f07b0f8: afbf0014 */ sw $ra,0x14($sp)
/* f07b0fc: 0fc1eb7d */ jal heliFromObj
/* f07b100: 00000000 */ sll $zero,$zero,0x0
/* f07b104: 50400003 */ beqzl $v0,.L0f07b114
/* f07b108: 8fbf0014 */ lw $ra,0x14($sp)
/* f07b10c: ac4000c0 */ sw $zero,0xc0($v0)
/* f07b110: 8fbf0014 */ lw $ra,0x14($sp)
.L0f07b114:
/* f07b114: 27bd0018 */ addiu $sp,$sp,0x18
/* f07b118: 03e00008 */ jr $ra
/* f07b11c: 00000000 */ sll $zero,$zero,0x0
);
void heliRestartTimer(struct defaultobj *obj)
{
struct heliobj *heli = heliFromObj(obj);
if (heli) {
heli->timer60 = 0;
}
}
GLOBAL_ASM(
glabel heliGetTimer

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

@ -168,7 +168,7 @@ void heliSetTarget(struct heliobj *heli, s32 arg1);
u32 func0f07b038(struct heliobj *heli);
void heliTryStop(struct heliobj *heli);
bool heliSetArmed(struct defaultobj *obj, bool armed);
u32 heliRestartTimer(struct heliobj *heli);
void heliRestartTimer(struct defaultobj *obj);
f32 heliGetTimer(struct heliobj *heli);
void heliSetMaxDamage(struct heliobj *heli, s16 health);
u32 func0f07b164(void);

20
src/include/types.h
View File

@ -818,6 +818,26 @@ struct heliobj {
/*0x90*/ s16 weaponsarmed;
/*0x92*/ u16 ontarget;
/*0x94*/ s16 target;
/*0x96*/ u8 attackmode;
/*0x97*/ u8 cw;
/*0x98*/ u32 vx;
/*0x9c*/ u32 vy;
/*0xa0*/ u32 vz;
/*0xa4*/ u32 power;
/*0xa8*/ u32 otx;
/*0xac*/ u32 oty;
/*0xb0*/ u32 otz;
/*0xb4*/ u32 bob;
/*0xb8*/ u32 bobstrength;
/*0xbc*/ u32 targetvisible;
/*0xc0*/ u32 timer60;
/*0xc4*/ u32 patroltimer60;
/*0xc8*/ u32 gunturnyspeed60;
/*0xcc*/ u32 gunturnxspeed60;
/*0xd0*/ u32 gunroty;
/*0xd4*/ u32 gunrotx;
/*0xd8*/ u32 barrelrotspeed;
/*0xdc*/ u32 barrelrot;
};
struct tag {