Merge struct targetsomething into struct position, decompile chrGetDistanceToTarget and rename ai0052 and ai0053 to aiIfDistanceToTargetLessThan/GreaterThan

src/include/game/chr/chraicommands.h

@@ -85,8 +85,8 @@
 /*0x004f*/ bool ai004f(void);
 /*0x0050*/ bool ai0050(void);
 /*0x0051*/ bool ai0051(void);
-/*0x0052*/ bool ai0052(void);
-/*0x0053*/ bool ai0053(void);
+/*0x0052*/ bool aiIfDistanceToTargetLessThan(void);
+/*0x0053*/ bool aiIfDistanceToTargetGreaterThan(void);
 /*0x0054*/ bool ai0054(void);
 /*0x0055*/ bool ai0055(void);
 /*0x0056*/ bool ai0056(void);

src/include/game/game_000000.h

@@ -5,7 +5,7 @@
 
 struct chrdata *chrFindByLiteralId(u8 chrnum);
 struct chrdata *chrFindById(struct chrdata *data, u32 chrnum);
-struct targetsomething *chrGetTargetSomething(struct chrdata *chr);
+struct position *chrGetTargetPosition(struct chrdata *chr);
 
 float chrGetTimer(struct chrdata *chr);
 
@@ -35,6 +35,7 @@ u32 func0f01b148(void);
 u32 func0f01b154(void);
 void func0f03af44(struct chrdata *chr, u32 anim_id, float fstartframe, float fendframe, u8 flags, u8 transition, float result);
 u32 func0f048f20(struct chrdata *chr, u8 b);
-float func0f0491c8(struct chrdata *chr);
+float chrGetDistanceToTarget(struct chrdata *chr);
+float func0f049254(struct position *a, struct position *b);
 
 #endif

src/include/game/game_0601b0.h

@@ -301,7 +301,7 @@ u32 func0f065880(void);
 u32 func0f065d1c(void);
 u32 func0f065f80(void);
 u32 func0f066290(void);
-struct targetsomething *heliGetTargetSomething(struct heliobj *obj);
+struct position *heliGetTargetPosition(struct heliobj *obj);
 struct heliobj *func0f07adf4(struct defaultobj *obj);
 u32 func0f095bf4(void);
 u32 func0f095d64(void);

src/include/gvars/gvars.h

@@ -88,7 +88,7 @@ struct g_vars {
 	/*00032c*/ u32 unk00032c;
 	/*000330*/ u32 unk000330;
 	/*000334*/ u32 unk000334;
-	/*000338*/ struct targetsomething *targets;
+	/*000338*/ struct position *positions;
 	/*00033c*/ u32 unk00033c;
 	/*000340*/ u32 unk000340;
 	/*000344*/ u32 unk000344;

src/include/types.h

@@ -11,31 +11,14 @@ struct coord {
 	float z;
 };
 
-struct position04 {
-	/*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;
-	/*0x30*/ u32 unk30;
-	/*0x34*/ u32 unk34;
-	/*0x38*/ u32 unk38;
-	/*0x3c*/ u32 unk3c;
-	/*0x40*/ u32 flags;
-};
-
+// This might be a pad, but given that chrs have a gunground pointer to this
+// struct, I think it's more likely an ad hoc coordinate that can be created as
+// needed during gameplay.
 struct position {
 	u8 unk00;
 	u8 flags;
 	u16 unk02;
-	struct position04 *unk04;
+	struct chrdata *chr;
 	struct coord coord;
 	u32 unk14;
 	u32 unk18; // related to gun recovery
@@ -50,6 +33,7 @@ struct position {
 	s16 unk3a;
 	u32 unk3c;
 	u32 unk40;
+	u32 unk44;
 };
 
 struct bitfield {
@@ -451,27 +435,6 @@ struct tag {
 	struct defaultobj *obj;
 };
 
-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 {
 	/*0x000*/ u32 unk000;
 	/*0x004*/ u32 unk004;
@@ -520,7 +483,7 @@ struct player {
 	/*0x0b0*/ u32 unk0b0;
 	/*0x0b4*/ float unk0b4;
 	/*0x0b8*/ u32 unk0b8;
-	/*0x0bc*/ struct targetsomething *targetsomething;
+	/*0x0bc*/ struct position *targetpos;
 	/*0x0c0*/ u32 unk0c0;
 	/*0x0c4*/ u32 unk0c4;
 	/*0x0c8*/ u32 unk0c8;