Rename alliance to team and add constants for all values

src/include/commands.h

@@ -1003,10 +1003,10 @@
 	bool, \
 	label,
 
-#define set_chr_alliance(chr, alliance) \
+#define set_chr_team(chr, team) \
 	mkshort(0x010b), \
 	chr, \
-	alliance,
+	team,
 
 #define set_shield(value) \
 	mkshort(0x010e), \

src/include/constants.h

@@ -27,9 +27,6 @@
 #define ACTION_FACING_TARGET      0x35
 #define ACTION_HAND_COMBAT_SKEDAR 0x36
 
-#define ALLIANCE_ENEMY 0x02
-#define ALLIANCE_ALLY  0x10
-
 #define AMMOTYPE_PISTOL      0x01
 #define AMMOTYPE_SMG         0x02
 #define AMMOTYPE_CROSSBOW    0x03
@@ -1322,6 +1319,15 @@
 #define MUSIC_BETA_MELODY             0x75
 #define MUSIC_ESCAPE_OUTRO_SHORT      0x76
 
+#define TEAM_00        0x00
+#define TEAM_01        0x01
+#define TEAM_ENEMY     0x02
+#define TEAM_04        0x04
+#define TEAM_ALLY      0x10
+#define TEAM_20        0x20
+#define TEAM_22        0x22
+#define TEAM_32        0x32
+#define TEAM_NONCOMBAT 0x80
 
 // Animations
 //.set ANIM_, 0x0000: idle

src/include/props.h

@@ -66,7 +66,7 @@
 	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
 	mkword(ammotype),
 
-#define chr(unk1, id, pad, body, head, function, target_pad, target_chr, hear_dist, view_dist, props1, bank1flags, alliance, group, chair, group2, associated) \
+#define chr(unk1, id, pad, body, head, function, target_pad, target_chr, hear_dist, view_dist, props1, bank1flags, team, group, chair, group2, associated) \
 	mkshort(0), \
 	mkshort(0x09), \
 	mkword(unk1), \
@@ -81,7 +81,7 @@
 	mkshort(view_dist), \
 	mkword(props1), \
 	mkword(bank1flags), \
-	alliance, \
+	team, \
 	group, \
 	mkshort(chair), \
 	mkword(group2), \