Decompile obj48Reset

This commit is contained in:
Ryan Dwyer
2020-12-26 13:05:44 +10:00
parent fa63389186
commit f362cab373
7 changed files with 78 additions and 90 deletions
+7
View File
@@ -603,6 +603,13 @@
#define DRCAROLLIMAGE_RANDOM25 7
#define DRCAROLLIMAGE_RANDOM 8
#define DROPREASON_1 1
#define DROPREASON_2 2
#define DROPREASON_3 3
#define DROPREASON_4 4
#define DROPREASON_5 5
#define DROPREASON_6 6
#define ENTITYTYPE_BOND 0x0001 // aim/shoot at Jo
#define ENTITYTYPE_FORWARD 0x0002 // aim/shoot in front of self
#define ENTITYTYPE_CHR 0x0004 // aim/shoot at chr (ID should be given in entity_id)
+1 -1
View File
@@ -61,7 +61,7 @@ struct defaultobj *objFindByPadNum(s32 padnum);
u32 func0f068218(void);
void func0f0682dc(struct obj48 *obj48);
void func0f0682fc(struct prop *prop);
void func0f068368(struct obj48 *obj48);
void obj48Reset(struct obj48 *obj48);
struct obj48 *func0f06843c(void);
void func0f0685e4(struct prop *prop);
u32 func0f068694(void);
+17 -16
View File
@@ -1052,7 +1052,7 @@ struct obj48 {
/*0x010*/ f32 unk010;
/*0x014*/ f32 unk014;
/*0x018*/ f32 unk018;
/*0x01c*/ u32 unk01c;
/*0x01c*/ f32 unk01c;
/*0x020*/ f32 unk020;
/*0x024*/ u32 unk024;
/*0x028*/ u32 unk028;
@@ -1069,7 +1069,7 @@ struct obj48 {
/*0x054*/ u32 unk054;
/*0x058*/ u32 unk058;
/*0x05c*/ u32 unk05c;
/*0x060*/ u32 unk060;
/*0x060*/ f32 unk060;
/*0x064*/ u32 unk064;
/*0x068*/ u32 unk068;
/*0x06c*/ u32 unk06c;
@@ -1080,35 +1080,36 @@ struct obj48 {
/*0x080*/ u32 unk080;
/*0x084*/ u32 unk084;
/*0x088*/ struct prop *unk088;
/*0x08c*/ u32 unk08c;
/*0x08c*/ f32 unk08c;
/*0x090*/ u32 unk090;
/*0x094*/ u32 unk094;
/*0x098*/ u32 unk098;
/*0x09c*/ u32 unk09c;
/*0x094*/ s32 unk094;
/*0x098*/ f32 unk098;
/*0x09c*/ s32 unk09c;
/*0x0a0*/ u32 unk0a0;
/*0x0a4*/ u32 unk0a4;
/*0x0a4*/ s32 unk0a4;
/*0x0a8*/ u32 unk0a8;
/*0x0ac*/ u32 unk0ac;
/*0x0b0*/ u16 dropreason;
/*0x0b2*/ u16 unk0b2;
/*0x0b0*/ s16 dropreason;
/*0x0b2*/ s16 unk0b2;
/*0x0b4*/ u32 unk0b4;
/*0x0b8*/ u32 unk0b8;
/*0x0bc*/ u32 unk0bc;
/*0x0c0*/ u32 unk0c0;
/*0x0b8*/ f32 unk0b8;
/*0x0bc*/ f32 unk0bc;
/*0x0c0*/ f32 unk0c0;
/*0x0c4*/ struct coord pos;
/*0x0d0*/ u32 unk0d0;
/*0x0d4*/ u32 unk0d4;
/*0x0d8*/ u32 unk0d8;
/*0x0dc*/ f32 unk0dc;
/*0x0e0*/ u32 unk0e0;
/*0x0e4*/ u32 unk0e4;
/*0x0e0*/ f32 unk0e0;
/*0x0e4*/ f32 unk0e4;
/*0x0e8*/ u32 unk0e8;
/*0x0ec*/ u32 unk0ec;
/*0x0f0*/ u32 unk0f0;
/*0x0ec*/ f32 unk0ec;
/*0x0f0*/ f32 unk0f0;
/*0x0f4*/ u32 unk0f4;
/*0x0f8*/ s16 waypads[6];
/*0x104*/ u8 numwaypads;
/*0x105*/ u8 unk105;
/*0x108*/ u32 unk108;
};
struct monitorscreen {