Decompile chrCreateFireslot

This commit is contained in:
Ryan Dwyer
2021-06-23 23:10:39 +10:00
parent e816d1492c
commit 26adadd06f
14 changed files with 133 additions and 310 deletions
+1
View File
@@ -459,6 +459,7 @@
#define CHRH2FLAG_0004 0x0004
#define CHRH2FLAG_BLUESIGHT 0x0008
#define CHRH2FLAG_TICKDURINGAUTOCUT 0x0010
#define CHRH2FLAG_0020 0x0020
#define CHRH2FLAG_0040 0x0040
#define CHRH2FLAG_0080 0x0080
#define CHRH2FLAG_HEADSHOTTED 0x1000
+2 -2
View File
@@ -134,9 +134,9 @@ u32 bgun0f0a5300(void);
void bgun0f0a5550(s32 handnum);
void bgunTickMaulerCharge(void);
void bgun0f0a6c30(void);
s32 bgun0f0a70f8(void);
s32 bgunAllocateFireslot(void);
void bgun0f0a7138(Gfx **gdl);
struct audiohandle **bgunNewAudioHandle(void);
struct audiohandle **bgunAllocateAudioHandle(void);
void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum);
void bgun0f0a8404(struct coord *pos, s16 *rooms, s32 arg2);
void bgunPlayBgHitSound(struct gset *gset, struct coord *arg1, s32 texturenum, s16 *arg3);
+1 -1
View File
@@ -134,7 +134,7 @@ void chrTickSidestep(struct chrdata *chr);
void chrTickJumpOut(struct chrdata *chr);
void chrTickStartAlarm(struct chrdata *chr);
void chrTickSurprised(struct chrdata *chr);
void func0f03e29c(struct chrdata *chr, s32 arg1, s32 arg2, s32 arg3, struct coord *arg4, struct coord *arg5);
void chrCreateFireslot(struct chrdata *chr, s32 handnum, bool withsound, bool withbeam, struct coord *from, struct coord *to);
f32 chrGetInverseTheta(struct chrdata *chr);
f32 chrGetAimAngle(struct chrdata *chr);
f32 func0f03e754(struct chrdata *chr);
+1 -1
View File
@@ -4,7 +4,7 @@
#include "data.h"
#include "types.h"
u32 func0f0abe70(void);
void beamCreate(struct beam *beam, s32 weaponnum, struct coord *arg4, struct coord *arg5);
u32 func0f0ac138(void);
Gfx *func0f0ac4b8(Gfx *gdl, struct textureconfig *arg1, f32 arg2, struct coord *arg3, u32 colour1, f32 arg5, struct coord *arg6, u32 colour2);
Gfx *func0f0acb90(Gfx *gdl, struct beam *beam, bool arg2, u32 arg3);
+1 -1
View File
@@ -29,7 +29,7 @@ struct inventory_ammo *gsetGetAmmoDefinition(struct gset *gset);
u8 gsetGetSingleUnk3c(struct gset *gset);
f32 gsetGetStrength(struct gset *gset);
f32 gsetGetDamage(struct gset *gset);
u8 gsetGetSingleUnk38(struct gset *gset);
u8 gsetGetFireslotDuration(struct gset *gset);
u16 gsetGetSingleShootSound(struct gset *gset);
bool gsetHasFunctionFlags(struct gset *gset, u32 flags);
s8 weaponGetNumTicksPerShot(u32 weaponnum, u32 funcindex);
+2 -2
View File
@@ -1330,7 +1330,7 @@ struct chrdata {
/*0x168*/ f32 aimendback;
/*0x16c*/ f32 aimendsideback;
/*0x170*/ struct prop *weapons_held[3]; // gun 1, gun 2, hat
/*0x17c*/ s8 fireslot[2];
/*0x17c*/ s8 fireslots[2];
/*0x17e*/ s16 target; // index into g_Vars.props
/*0x180*/ f32 cshield;
@@ -3722,7 +3722,7 @@ struct fireslotthing {
};
struct fireslot {
/*0x00*/ s32 unk00;
/*0x00*/ s32 endlvframe;
#if VERSION < VERSION_NTSC_1_0
struct audiohandle *unk04nb;
struct audiohandle *unk08nb;