Decompile chrDisfigure

This commit is contained in:
Ryan Dwyer
2021-12-19 11:16:40 +10:00
parent 57dae70981
commit c24c3ade55
10 changed files with 243 additions and 592 deletions
+1 -1
View File
@@ -39,7 +39,7 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool withalpha);
void chrEmitSparks(struct chrdata *chr, struct prop *prop, s32 hitpart, struct coord *coord, struct coord *coord2, struct chrdata *chr2);
u32 chr0f0260c4(void);
void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct coord *arg3);
u32 chr0f0270f4(void);
void chrDisfigure(struct chrdata *chr, u32 arg1, u32 arg2);
f32 chr0f0278a4(struct chrdata *chr);
void chr0f027994(struct prop *prop, struct shotdata *shotdata, bool arg2, bool arg3);
void chrHit(struct shotdata *shotdata, struct hit *hit);
+1 -1
View File
@@ -5,6 +5,6 @@
#include "types.h"
u32 random2(void);
u32 rng2SetSeed(void);
void rng2SetSeed(u32 seed);
#endif
+4 -4
View File
@@ -4,9 +4,9 @@
#include "data.h"
#include "types.h"
void func0f129210(union modelrwdata *find, union modelrwdata *replacement);
void func0f12939c(void);
void *func0f12955c(s32 count, s32 index, s32 arg2, s32 arg3);
void func0f129818(s32 arg0, void *arg1);
void vtxstoreFixRefs(union modelrwdata *find, union modelrwdata *replacement);
void vtxstoreTick(void);
void *vtxstoreAllocate(s32 count, s32 index, s32 arg2, s32 arg3);
void vtxstoreFree(s32 arg0, void *arg1);
#endif
+15 -14
View File
@@ -668,7 +668,7 @@ struct modelrodata_dl { // type 0x18
/*0x00*/ Gfx *primary;
/*0x04*/ Gfx *secondary;
/*0x08*/ u32 *colourtable;
/*0x0c*/ struct gfxvtx *vertices;
/*0x0c*/ struct gfxvtx *vertices; // colours follow this array
/*0x10*/ s16 numvertices;
/*0x12*/ s16 mcount;
/*0x14*/ u16 rwdataindex;
@@ -785,10 +785,23 @@ struct modelrwdata_headspot { // type 0x17
void *rwdatas;
};
struct colour {
union {
u32 word;
u8 bytes[4];
struct {
u8 r;
u8 g;
u8 b;
u8 a;
};
};
};
struct modelrwdata_dl { // type 0x18
struct gfxvtx *vertices;
Gfx *gdl;
u32 *unk08;
struct colour *colours;
};
union modelrwdata {
@@ -6836,18 +6849,6 @@ struct var8009dd78 {
f32 unk04;
};
struct colour {
union {
struct {
u8 r;
u8 g;
u8 b;
u8 a;
} u8;
u32 u32;
};
};
struct var800ab570 {
u32 unk00;
u32 unk04;