Attempt to decompile wallhitRenderBgHitsLayer1

This commit is contained in:
Ryan Dwyer
2022-02-08 20:14:34 +10:00
parent a3ed4ff448
commit 2d2037667f
12 changed files with 179 additions and 121 deletions
+2 -2
View File
@@ -211,8 +211,8 @@ extern u32 g_NextSparkIndex;
extern struct sparkgroup g_SparkGroups[10];
extern u32 var800a4130;
extern u8 *var800a41a0;
extern struct var800a41b0 *var800a41b0;
extern struct var800a41b0 *var800a41b4;
extern struct wallhit *var800a41b0;
extern struct wallhit *var800a41b4;
extern u32 var800a41b8;
extern s32 g_MaxShards;
extern struct shard *g_Shards;
+1 -1
View File
@@ -11,6 +11,6 @@ u32 func0f0b34d8(void);
u32 func0f0b3548(void);
u32 func0f0b35b8(void);
void func0f0b3988(struct textureconfig *config);
void func0f0b39c0(Gfx **gdl, struct textureconfig *arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5, u32 *arg6);
void func0f0b39c0(Gfx **gdl, struct textureconfig *arg1, u32 arg2, u32 arg3, u32 arg4, s32 arg5, u32 *arg6);
#endif
+9 -9
View File
@@ -5,21 +5,21 @@
#include "types.h"
s16 func0f13e0e0(f32 arg0);
void func0f13e1b0(struct var800a41b0 *arg0);
void func0f13e40c(struct prop *prop, s8 arg1);
void wallhitRemove(struct wallhit *wallhit);
void wallhitsRemoveByProp(struct prop *prop, s8 layer);
bool chrIsUsingPaintball(struct chrdata *chr);
void func0f13e5c8(struct prop *prop);
void func0f13e640(struct var800a41b0 *thing, u32 arg1);
void func0f13e640(struct wallhit *wallhit, u32 arg1);
u32 func0f13e744(void);
u32 func0f13e994(void);
void func0f13eb44(void);
void func0f13f3f4(struct coord *arg0, struct coord *arg1, struct coord *arg2, u32 arg3, u32 arg4, u32 arg5, s32 room, struct prop *arg7, s32 arg8, u32 arg9, struct chrdata *chr, bool arg11);
void wallhitsTick(void);
void wallhitCreate(struct coord *arg0, struct coord *arg1, struct coord *arg2, u32 arg3, u32 arg4, u32 arg5, s32 room, struct prop *arg7, s32 arg8, u32 arg9, struct chrdata *chr, bool arg11);
u32 func0f13f504(void);
s32 func0f140750(struct coord *coord);
Gfx *func0f1408a8(s32 roomnum, Gfx *gdl);
Gfx *func0f140b7c(s32 roomnum, Gfx *gdl);
Gfx *func0f140e20(Gfx *gdl, struct prop *prop, bool withalpha);
Gfx *wallhitsRender(s32 roomnum, Gfx *gdl);
Gfx *wallhitRenderBgHitsLayer1(s32 roomnum, Gfx *gdl);
Gfx *wallhitRenderBgHitsLayer2(s32 roomnum, Gfx *gdl);
Gfx *wallhitRenderPropHits(Gfx *gdl, struct prop *prop, bool withalpha);
Gfx *wallhitRenderBgHits(s32 roomnum, Gfx *gdl);
void func0f141234(void);
void func0f14159c(struct prop *prop);
void func0f141704(struct prop *prop);
+21 -28
View File
@@ -433,8 +433,8 @@ struct prop {
/*0x3f*/ u8 backgrounded : 1;
/*0x3f*/ u8 forcetick : 1;
/*0x3f*/ u8 active : 1;
/*0x40*/ struct var800a41b0 *unk40;
/*0x44*/ struct var800a41b0 *unk44;
/*0x40*/ struct wallhit *wallhits1;
/*0x44*/ struct wallhit *wallhits2;
};
struct packedpad {
@@ -3752,8 +3752,8 @@ struct room {
/*0x78*/ u32 unk78;
/*0x7c*/ u32 unk7c;
/*0x80*/ s32 gfxdatalen; // when inflated
/*0x84*/ u32 unk84;
/*0x88*/ u32 unk88;
/*0x84*/ struct wallhit *wallhits1;
/*0x88*/ struct wallhit *wallhits2;
};
struct fireslotthing {
@@ -6113,35 +6113,26 @@ struct stageheadlimit {
u8 maxheads;
};
struct var800a41b0 {
/*0x00*/ u32 unk00;
/*0x04*/ u32 unk04;
/*0x08*/ u32 unk08;
/*0x0c*/ u32 unk0c;
/*0x10*/ u32 unk10;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u32 unk20;
/*0x24*/ u32 unk24;
/*0x28*/ u32 unk28;
/*0x2c*/ u32 unk2c;
struct fourcolours {
u32 colour1;
u32 colour2;
u32 colour3;
u32 colour4;
};
struct wallhit {
/*0x00*/ struct gfxvtx vertices[4];
/*0x30*/ u32 unk30;
/*0x34*/ u32 unk34;
/*0x38*/ u32 unk38;
/*0x3c*/ u32 unk3c;
/*0x40*/ u32 unk40;
/*0x44*/ u32 unk44;
/*0x48*/ u32 unk48;
/*0x4c*/ u32 unk4c;
/*0x50*/ u32 unk50;
/*0x54*/ u32 unk54;
/*0x58*/ u32 unk58;
/*0x40*/ u32 colours[4];
/*0x50*/ struct coord unk50;
/*0x5c*/ struct prop *prop;
/*0x60*/ u32 unk60;
/*0x64*/ u32 unk64;
/*0x64*/ struct gfxvtx *verticesptr;
/*0x68*/ s16 unk68;
/*0x6a*/ u8 unk6a;
/*0x6a*/ u8 texturenum;
/*0x6b*/ u8 unk6b;
/*0x6c*/ u8 unk6c;
/*0x6d*/ u8 unk6d;
@@ -6150,10 +6141,12 @@ struct var800a41b0 {
/*0x6f*/ u8 unk6f_01 : 1;
/*0x6f*/ u8 unk6f_02 : 1;
/*0x6f*/ u8 unk6f_03 : 1;
/*0x6f*/ u8 unk6f_04 : 1;
/*0x6f*/ u8 unk6f_05 : 1;
/*0x70*/ u32 unk70_00 : 28;
/*0x70*/ u32 unk70_28 : 4;
/*0x74*/ struct var800a41b0 *prev;
/*0x78*/ u32 unk78;
/*0x74*/ struct wallhit *prev;
/*0x78*/ struct wallhit *next;
};
/**