Identify chrGetTargetSomething and objGetTargetSomething

This commit is contained in:
Ryan Dwyer
2019-11-02 19:49:39 +10:00
parent e5192213f3
commit 360509056f
7 changed files with 176 additions and 185 deletions
+1
View File
@@ -5,6 +5,7 @@
struct chrdata *chrFindByLiteralId(u8 chrnum);
struct chrdata *chrFindById(struct chrdata *data, u32 chrnum);
struct targetsomething *chrGetTargetSomething(struct chrdata *chr);
float chrGetTimer(struct chrdata *chr);
+1
View File
@@ -301,6 +301,7 @@ u32 func0f065880(void);
u32 func0f065d1c(void);
u32 func0f065f80(void);
u32 func0f066290(void);
struct targetsomething *objGetTargetSomething(struct defaultobj *obj);
u32 func0f095bf4(void);
u32 func0f095d64(void);
u32 func0f096700(void);
+20 -36
View File
@@ -220,42 +220,26 @@ struct g_vars {
/*00032c*/ u32 unk00032c;
/*000330*/ u32 unk000330;
/*000334*/ u32 unk000334;
/*000338*/ u32 unk000338; // array of something related to chr targets, each 0x48 long
/*00033c*/ u32 unk00033c;
/*000340*/ u32 unk000340;
/*000344*/ u32 unk000344;
/*000348*/ u32 unk000348;
/*00034c*/ u32 unk00034c;
/*000350*/ u32 unk000350;
/*000354*/ u32 unk000354;
/*000358*/ u32 unk000358;
/*00035c*/ u32 unk00035c;
/*000360*/ u32 unk000360;
/*000364*/ u32 unk000364;
/*000368*/ u32 unk000368;
/*00036c*/ u32 unk00036c;
/*000370*/ u32 unk000370;
/*000374*/ u32 unk000374;
/*000378*/ u32 unk000378;
/*00037c*/ u32 unk00037c;
/*000380*/ u32 unk000380;
/*000384*/ u32 unk000384;
/*000388*/ u32 unk000388;
/*00038c*/ u32 unk00038c;
/*000390*/ u32 unk000390;
/*000394*/ u32 unk000394;
/*000398*/ u32 unk000398;
/*00039c*/ u32 unk00039c;
/*0003a0*/ u32 unk0003a0;
/*0003a4*/ u32 unk0003a4;
/*0003a8*/ u32 unk0003a8;
/*0003ac*/ u32 unk0003ac;
/*0003b0*/ u32 unk0003b0;
/*0003b4*/ u32 unk0003b4;
/*0003b8*/ u32 unk0003b8;
/*0003bc*/ u32 unk0003bc;
/*0003c0*/ u32 unk0003c0;
/*0003c4*/ u32 unk0003c4;
/*000338*/ struct targetsomething targets[2]; // array length unknown
///*000338*/ struct targetsomething *targets[24]; // array length unknown
///*000380*/ u32 unk000380;
///*000384*/ u32 unk000384;
///*000388*/ u32 unk000388;
///*00038c*/ u32 unk00038c;
///*000390*/ u32 unk000390;
///*000394*/ u32 unk000394;
///*000398*/ u32 unk000398;
///*00039c*/ u32 unk00039c;
///*0003a0*/ u32 unk0003a0;
///*0003a4*/ u32 unk0003a4;
///*0003a8*/ u32 unk0003a8;
///*0003ac*/ u32 unk0003ac;
///*0003b0*/ u32 unk0003b0;
///*0003b4*/ u32 unk0003b4;
///*0003b8*/ u32 unk0003b8;
///*0003bc*/ u32 unk0003bc;
///*0003c0*/ u32 unk0003c0;
///*0003c4*/ u32 unk0003c4;
/*0003c8*/ u32 unk0003c8;
/*0003cc*/ u32 unk0003cc;
/*0003d0*/ u32 unk0003d0;
+20 -25
View File
@@ -472,9 +472,25 @@ struct otheraidata {
/*0x90*/ s16 unk90;
};
struct playerbc {
u32 unk00;
struct chrdata *chr;
struct targetsomething {
/*0x00*/ u8 unk00;
/*0x04*/ struct chrdata *chr;
/*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;
/*0x30*/ u32 unk30;
/*0x34*/ u32 unk34;
/*0x38*/ u32 unk38;
/*0x3c*/ u32 unk3c;
/*0x40*/ u32 unk40;
/*0x44*/ u32 unk44;
};
struct player {
@@ -525,7 +541,7 @@ struct player {
/*0xb0*/ u32 unkb0;
/*0xb4*/ u32 unkb4;
/*0xb8*/ u32 unkb8;
/*0xbc*/ struct playerbc *unkbc;
/*0xbc*/ struct targetsomething *targetsomething;
/*0xc0*/ u32 unkc0;
/*0xc4*/ u32 unkc4;
/*0xc8*/ u32 unkc8;
@@ -535,27 +551,6 @@ struct player {
/*0xd8*/ u32 unkd8;
};
struct targetsomething {
/*0x00*/ u8 unk00;
/*0x04*/ struct chrdata *chr;
/*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;
/*0x30*/ u32 unk30;
/*0x34*/ u32 unk34;
/*0x38*/ u32 unk38;
/*0x3c*/ u32 unk3c;
/*0x40*/ u32 unk40;
/*0x44*/ u32 unk44;
};
struct ailists {
u8 *list;
u32 id;