Decompile aiSetChrPresetToUnalertedTeammate

src/include/commands.h

@@ -1327,9 +1327,15 @@
 	u1, \
 	bool,
 
-#define try_set_target_chr_to_teammate(label) \
+/**
+ * Set the current chr's chrpreset to an unalerted teammate. The teammate must
+ * be in the same squadron or have no squadron assigned.
+ *
+ * If distance is specified, limit search to chrs within that distance.
+ */
+#define try_set_chrpreset_to_unalerted_teammate(distance, label) \
 	mkshort(0x013a), \
-	0x00, \
+	distance, \
 	0x00, \
 	label,
 

src/include/game/chr/chr.h

@@ -4,7 +4,7 @@
 #include "types.h"
 
 struct chrdata *chrFindById(struct chrdata *data, u32 chrnum);
-struct chrdata *chrFindByLiteralId(u8 chrnum);
+struct chrdata *chrFindByLiteralId(s32 chrnum);
 float chrGetDistanceFromTargetToPad(struct chrdata *chr, s32 pad_id);
 float chrGetDistanceToChr(struct chrdata *chr1, s32 chr2num);
 float chrGetDistanceToCoord(struct chrdata *chr, struct coord *coord);
@@ -402,7 +402,7 @@ u32 func0f04c784(void);
 void func0f04c874(struct chrdata *chr, u32 flags, struct coord *coord, s32 arg3, s32 arg4);
 u32 func0f04cc04(void);
 u32 func0f04cd04(void);
-u32 func0f04ce00(void);
+s16 *teamGetChrIds(s32 team_id);
 u32 func0f04ce9c(void);
 u32 func0f04ceec(void);
 u32 func0f04cf34(void);

src/include/game/chr/chraicommands.h

@@ -312,7 +312,7 @@
 /*0x0137*/ bool ai0137(void);
 /*0x0138*/ bool aiIfChannelIdle(void);
 /*0x0139*/ bool ai0139(void);
-/*0x013a*/ bool ai013a(void);
+/*0x013a*/ bool aiSetChrPresetToUnalertedTeammate(void);
 /*0x013b*/ bool aiSetSquadron(void);
 /*0x013c*/ bool ai013c(void);
 /*0x013d*/ bool ai013d(void);

src/include/types.h

@@ -228,7 +228,7 @@ struct chrdata {
 	/*0x2a2*/ u8 squadron;
 	/*0x2a3*/ u8 listening;
 	/*0x2a4*/ u32 convtalk;
-	/*0x2a8*/ u32 talktimer;
+	/*0x2a8*/ s32 talktimer;
 	/*0x2ac*/ u8 question;
 	/*0x2ad*/ u8 talkgap;
 	/*0x2ae*/ u16 unk2ae;