Decompile chrTickDie

This commit is contained in:
Ryan Dwyer
2020-02-22 22:39:41 +10:00
parent 3ee00a7654
commit ec13c9dc46
11 changed files with 651 additions and 776 deletions
+6 -3
View File
@@ -3417,12 +3417,15 @@
/**
* Assigns a special death animation to the given chr.
*
* This is used for the Villa snipers and the Chicago guard on the fire escape.
* This is used for the Villa snipers, the Chicago guard on the fire escape,
* and all guards who sit in chairs.
*
* The value for specialdie should be one of the SPECIALDIE constants.
*/
#define set_chr_special_death_animation(chr, anim) \
#define set_chr_special_death_animation(chr, specialdie) \
mkshort(0x01a0), \
chr, \
anim,
specialdie,
/**
* Sets the current chr's roomtosearch field to the same room that the chr's
+9
View File
@@ -92,6 +92,7 @@
#define ANIM_SURRENDER_002E 0x002e
#define ANIM_SURRENDER_002F 0x002f
#define ANIM_DEATH_STOMACH_LONG 0x0039
#define ANIM_003C 0x003c
#define ANIM_TALKING_003D 0x003d
#define ANIM_KNEEL_SHOOT_RIGHT_HAND 0x004b
#define ANIM_TALKING_0098 0x0098
@@ -1660,6 +1661,14 @@
#define SOUNDMODE_HEADPHONE 2
#define SOUNDMODE_SURROUND 3
#define SPECIALDIE_NONE 0
#define SPECIALDIE_1 1
#define SPECIALDIE_2 2
#define SPECIALDIE_3 3
#define SPECIALDIE_4 4
#define SPECIALDIE_OVERRAILING 5
#define SPECIALDIE_ONCHAIR 6
#define SPEED_WALK 0
#define SPEED_JOG 1
#define SPEED_RUN 2
+2 -7
View File
@@ -184,8 +184,8 @@ extern u32 var8006805c;
extern u32 var80068064;
extern u32 var8006806c;
extern u32 var80068074;
extern u32 var8006807c;
extern u32 var80068080;
extern s32 var8006807c;
extern u8 var80068080;
extern u32 var80068084;
extern u32 var800680bc;
extern u32 var8006819c;
@@ -204,10 +204,5 @@ extern u32 var8006827c;
extern u32 var80068288;
extern u32 var8006829c;
extern u32 var8006835c;
extern struct coord var800683bc;
extern u32 var800683c8;
extern u32 var800683e0;
extern u32 var800683f8;
extern u32 var80068408;
#endif
+1 -1
View File
@@ -3,7 +3,7 @@
#include <ultra64.h>
#include "types.h"
u32 func0f129900(struct prop *prop, struct coord *pos, s16 *room, s32 arg3, s32 arg4);
u32 func0f129900(struct prop *prop, struct coord *pos, s16 *room, s32 arg3, s32 playernum);
u32 func0f129940(void);
u32 func0f129b08(void);
u32 func0f129ba4(void);
+2 -2
View File
@@ -51,7 +51,7 @@ u32 func0001cd18(void);
u32 func0001ce64(void);
u32 func0001cebc(void);
u32 animGetId(struct animdata *animdata);
u32 func0001d15c(void);
bool func0001d15c(struct animdata *animdata);
f32 animGetFrame(struct animdata *animdata);
f32 func0001d1a0(struct animdata *animdata);
u32 func0001d218(void);
@@ -67,7 +67,7 @@ u32 func0001dd90(void);
void func0001ddec(struct animdata *animdata, f32 arg1, f32 arg2);
void func0001de1c(struct animdata *animdata, f32 arg1);
u32 func0001de98(void);
u32 func0001deb0(void);
void func0001deb0(struct animdata *animdata, f32 arg1, f32 startframe);
u32 func0001df04(void);
u32 func0001dfac(void);
u32 func0001e000(void);
+7 -2
View File
@@ -362,9 +362,14 @@ struct act_anim {
struct act_die {
/*0x2c*/ u32 unk02c;
/*0x30*/ f32 unk030;
/*0x34*/ f32 unk034;
/*0x30*/ f32 unk030; // frame number
/*0x34*/ f32 unk034; // frame number
/*0x38*/ f32 unk038;
/*0x3c*/ u32 unk03c;
/*0x40*/ u32 unk040;
/*0x44*/ u32 unk044;
/*0x48*/ u32 unk048;
/*0x4c*/ s16 unk04c;
};
struct act_dead {