Decompile wallhitFree

This commit is contained in:
Ryan Dwyer
2022-06-29 21:27:46 +10:00
parent 00f84bc48d
commit ef9dbbd24b
9 changed files with 210 additions and 290 deletions
+5 -5
View File
@@ -69,10 +69,10 @@ extern u8 var8009caef;
extern u8 var8009caf0;
extern struct prop *g_DangerousProps[MAX_DANGEROUSPROPS];
extern u16 *var8009cc40;
extern s32 var8009cc44;
extern s32 g_WallhitsMax;
extern u32 var8009cc48;
extern u32 var8009cc4c;
extern u32 var8009cc50;
extern u32 g_WallhitsNumFree;
extern u32 g_WallhitsNumUsed;
extern u32 var8009cc54;
extern u32 var8009cc58;
extern u32 var8009cc5c;
@@ -206,9 +206,9 @@ extern s32 g_NextSparkIndex;
extern struct sparkgroup g_SparkGroups[10];
extern s32 g_NextSparkGroupIndex;
extern u8 *var800a41a0;
extern struct wallhit *var800a41b0;
extern struct wallhit *g_Wallhits;
extern struct wallhit *var800a41b4;
extern u32 var800a41b8;
extern struct wallhit *var800a41b8;
extern s32 g_MaxShards;
extern struct shard *g_Shards;
extern Gfx *var800a4634;
+1 -1
View File
@@ -139,7 +139,7 @@ void pak0f11e3bc(s8 device);
void pakProbeEeprom(void);
PakErr1 pakReadEeprom(u8 address, u8 *buffer, u32 len);
PakErr1 pakWriteEeprom(u8 address, u8 *buffer, u32 len);
void pakSetBitflag(u32 flagnum, u8 *bitstream, bool set);
void pakSetBitflag(s32 flagnum, u8 *bitstream, bool set);
bool pakHasBitflag(u32 flagnum, u8 *stream);
void pakClearAllBitflags(u8 *flags);
void pakN64FontCodeToAscii(char *src, char *dst, s32 len);
+2 -2
View File
@@ -7,8 +7,8 @@
void wallhitReset(void);
s16 func0f13e0e0(f32 arg0);
void wallhitRemove(struct wallhit *wallhit);
void wallhitsRemoveByProp(struct prop *prop, s8 layer);
void wallhitFree(struct wallhit *wallhit);
void wallhitsFreeByProp(struct prop *prop, s8 layer);
bool chrIsUsingPaintball(struct chrdata *chr);
void func0f13e5c8(struct prop *prop);
void func0f13e640(struct wallhit *wallhit, u32 arg1);
+6 -9
View File
@@ -6016,22 +6016,19 @@ struct stageheadlimit {
struct wallhit {
/*0x00*/ struct gfxvtx vertices[4];
/*0x30*/ u32 unk30;
/*0x34*/ u32 unk34;
/*0x38*/ u32 unk38;
/*0x3c*/ u32 unk3c;
/*0x30*/ struct colour unk30[4];
/*0x40*/ struct colour colours[4];
/*0x50*/ struct coord unk50;
/*0x5c*/ struct prop *prop;
/*0x60*/ u32 unk60;
/*0x60*/ struct prop *prop60;
/*0x64*/ struct gfxvtx *verticesptr;
/*0x68*/ s16 unk68;
/*0x68*/ s16 roomnum;
/*0x6a*/ u8 texturenum;
/*0x6b*/ u8 unk6b;
/*0x6c*/ u8 mtxindex;
/*0x6d*/ u8 unk6d;
/*0x6e*/ u8 unk6e;
/*0x6f*/ u8 unk6f_00 : 1;
/*0x6f*/ u8 inuse : 1;
/*0x6f*/ u8 unk6f_01 : 1;
/*0x6f*/ u8 unk6f_02 : 1;
/*0x6f*/ u8 unk6f_03 : 1;
@@ -6039,8 +6036,8 @@ struct wallhit {
/*0x6f*/ u8 unk6f_05 : 1;
/*0x70*/ u32 unk70_00 : 28;
/*0x70*/ u32 unk70_28 : 4;
/*0x74*/ struct wallhit *prev;
/*0x78*/ struct wallhit *next;
/*0x74*/ struct wallhit *globalnext; // for the used/free linked lists
/*0x78*/ struct wallhit *localnext; // for the room/prop specific linked list
};
/**