Rename a heap of symbols relating to chr attacks

src/include/commands.h

@@ -164,7 +164,7 @@
  * Attempt to jump sideways. If it worked then go to the given label.
  * The command may fail if the chr is blocked.
  */
-#define try_jump_sideways(label) \
+#define try_sidestep(label) \
 	mkshort(0x000f), \
 	label,
 
@@ -172,7 +172,7 @@
  * Attempt to hop sideways. If it worked then go to the given label.
  * The command may fail if the chr is blocked.
  */
-#define try_hop_sideways(label) \
+#define try_jumpout(label) \
 	mkshort(0x0010), \
 	label,
 
@@ -189,7 +189,7 @@
  * The command may fail if the chr is blocked, or maybe if the chr can't see
  * their target.
  */
-#define try_walk_and_shoot(label) \
+#define try_attack_walk(label) \
 	mkshort(0x0012), \
 	label,
 
@@ -198,7 +198,7 @@
  * The command may fail if the chr is blocked, or maybe if the chr can't see
  * their target.
  */
-#define try_run_and_shoot(label) \
+#define try_attack_run(label) \
 	mkshort(0x0013), \
 	label,
 
@@ -207,23 +207,23 @@
  * The command may fail if the chr is blocked, or maybe if the chr can't see
  * their target.
  */
-#define try_roll_and_shoot(label) \
+#define try_attack_roll(label) \
 	mkshort(0x0014), \
 	label,
 
-#define try_aim_and_shoot_thing1(u1, u2, label) \
+#define try_attack_stand1(u1, u2, label) \
 	mkshort(0x0015), \
 	mkshort(u1), \
 	mkshort(u2), \
 	label,
 
-#define try_chr_kneel_and_shoot_thing(u1, u2, label) \
+#define try_attack_kneel(u1, u2, label) \
 	mkshort(0x0016), \
 	mkshort(u1), \
 	mkshort(u2), \
 	label,
 
-#define try_aim_and_shoot_thing2(u1, u2, label) \
+#define try_attack_stand2(u1, u2, label) \
 	mkshort(0x0017), \
 	mkshort(u1), \
 	mkshort(u2), \
@@ -437,9 +437,10 @@
 	label,
 
 /**
- * Checks if the chr is doing their death animation.
+ * Checks if the chr is doing their death animation, has finished their death
+ * animation or is invalid.
  */
-#define if_chr_dying(chr, label) \
+#define if_chr_dead(chr, label) \
 	mkshort(0x0033), \
 	chr, \
 	label,
@@ -3195,7 +3196,10 @@
 	mkshort(0x017a), \
 	label,
 
-#define if_chr_unloaded(chr, label) \
+/**
+ * Checks if the chr is knocked out or invalid.
+ */
+#define if_chr_knockedout(chr, label) \
 	mkshort(0x017b), \
 	chr, \
 	label,
@@ -3632,7 +3636,7 @@
 	mkshort(0x01b9),
 
 // Likely some kind of shoot command, with u1 = entitytype and u2 = entityid
-#define cmd01ba(u1, u2, label) \
+#define try_attack_lie(u1, u2, label) \
 	mkshort(0x01ba), \
 	mkshort(u1), \
 	mkshort(u2), \

src/include/game/chr/chraction.h

@@ -27,9 +27,9 @@ void chrSurrenderStartAnim(struct chrdata *chr);
 void func0f02f8a4(struct chrdata *chr);
 void func0f02fc2c(struct chrdata *chr);
 void func0f02fe18(struct chrdata *chr);
-void func0f030120(struct chrdata *chr, s32 thingtype, s32 thingid);
-void func0f030308(struct chrdata *chr, s32 thingtype, s32 thingid);
-void func0f0303a0(struct chrdata *chr, s32 thingtype, s32 thingid);
+void func0f030120(struct chrdata *chr, s32 entitytype, s32 entityid);
+void chrAttackLie(struct chrdata *chr, s32 entitytype, s32 entityid);
+void chrAttackKneel(struct chrdata *chr, s32 entitytype, s32 entityid);
 u32 func0f030584(void);
 u32 chrAttackWalk(void);
 u32 func0f030a40(void);
@@ -90,11 +90,11 @@ u32 func0f0393b4(struct chrdata *chr, struct coord *pos, s16 *room);
 bool func0f039474(struct chrdata *chr, struct coord *pos, s16 *room);
 bool func0f039558(struct chrdata *chr, struct prop *prop);
 bool chrIsStopped(struct chrdata *chr);
-u32 func0f03978c(struct chrdata *chr);
-bool func0f039a18(struct chrdata *chr);
+u32 chrCheckTargetInSight(struct chrdata *chr);
+bool chrIsReadyForOrders(struct chrdata *chr);
 u32 chrTrySidestep(struct chrdata *chr);
 u32 chrTryJumpOut(struct chrdata *chr);
-u32 func0f039e28(struct chrdata *chr);
+u32 chrTryRunSideways(struct chrdata *chr);
 u32 chrTryAttackWalk(struct chrdata *chr);
 u32 chrTryAttackRun(struct chrdata *chr);
 u32 chrTryAttackRoll(struct chrdata *chr);
@@ -230,11 +230,11 @@ u32 func0f039368(struct chrdata *chr);
 void chrRecordLastSeeTargetTime(struct chrdata *chr);
 void chrRecordLastHearTargetTime(struct chrdata *chr);
 bool chrIsDead(struct chrdata *chr);
-bool func0f03a578(struct chrdata *chr, s32 thingtype, s32 thingid);
-bool func0f03a644(struct chrdata *chr, s32 thingtype, s32 thingid);
-bool func0f03a6d8(struct chrdata *chr, s32 thingtype, s32 thingid);
-bool func0f03a76c(struct chrdata *chr, u32 thingtype, s32 thingid);
-bool chrFaceEntity(struct chrdata *chr, u32 entity_type, u32 entity_id);
+bool func0f03a578(struct chrdata *chr, s32 entitytype, s32 entityid);
+bool chrTryAttackKneel(struct chrdata *chr, s32 entitytype, s32 entityid);
+bool chrTryAttackLie(struct chrdata *chr, s32 entitytype, s32 entityid);
+bool func0f03a76c(struct chrdata *chr, u32 entitytype, s32 entityid);
+bool chrFaceEntity(struct chrdata *chr, u32 entitytype, u32 entityid);
 bool chrSetPath(struct chrdata *chr, u32 path_id);
 u32 chrStartPath(struct chrdata *chr);
 u32 chrTrySurrender(struct chrdata *chr);

src/include/game/chr/chraicommands.h

@@ -18,15 +18,15 @@
 /*0x000c*/ bool aiIfIdle(void);
 /*0x000d*/ bool aiBeSurprisedOneHand(void);
 /*0x000e*/ bool aiBeSurprisedLookAround(void);
-/*0x000f*/ bool aiStepSideways(void);
-/*0x0010*/ bool aiHopSideways(void);
-/*0x0011*/ bool aiRunSideways(void);
-/*0x0012*/ bool aiWalkAndFire(void);
-/*0x0013*/ bool aiRunAndFire(void);
-/*0x0014*/ bool aiRollAndFire(void);
-/*0x0015*/ bool aiAimAndFire1(void);
-/*0x0016*/ bool aiKneelAndFire(void);
-/*0x0017*/ bool aiAimAndFire2(void);
+/*0x000f*/ bool aiTrySidestep(void);
+/*0x0010*/ bool aiTryJumpOut(void);
+/*0x0011*/ bool aiTryRunSideways(void);
+/*0x0012*/ bool aiTryAttackWalk(void);
+/*0x0013*/ bool aiTryAttackRun(void);
+/*0x0014*/ bool aiTryAttackRoll(void);
+/*0x0015*/ bool aiTryAttackStand1(void);
+/*0x0016*/ bool aiTryAttackKneel(void);
+/*0x0017*/ bool aiTryAttackStand2(void);
 /*0x0018*/ bool aiFaceEntity(void);
 /*0x0019*/ bool ai0019(void);
 /*0x001a*/ bool ai001a(void);
@@ -54,9 +54,9 @@
 /*0x0030*/ bool aiTryWalkToChr(void);
 /*0x0031*/ bool aiTryRunToChr(void);
 /*0x0032*/ bool aiIfStopped(void);
-/*0x0033*/ bool aiIfChrDying(void);
+/*0x0033*/ bool aiIfChrDead(void);
 /*0x0034*/ bool aiIfChrDeathAnimationFinished(void);
-/*0x0035*/ bool aiIfTargetPropInSight(void);
+/*0x0035*/ bool aiIfTargetInSight(void);
 /*0x0036*/ bool aiRandom(void);
 /*0x0037*/ bool aiIfRandomLessThan(void);
 /*0x0038*/ bool aiIfRandomGreaterThan(void);
@@ -356,7 +356,7 @@
 /*0x0178*/ bool aiIfPlayerAutoWalkFinished(void);
 /*0x0179*/ bool ai0179(void);
 /*0x017a*/ bool ai017a(void);
-/*0x017b*/ bool aiIfChrUnloaded(void);
+/*0x017b*/ bool aiIfChrKnockedOut(void);
 /*0x017c*/ bool aiAssignSound(void);
 /*0x017d*/ bool aiAudioSetMusicTrack(void);
 /*0x017e*/ bool aiAudioRestartDefaultMusic(void);
@@ -405,7 +405,7 @@
 /*0x01b7*/ bool aiChrSetCloaked(void);
 /*0x01b8*/ bool aiSetAutogunType(void);
 /*0x01b9*/ bool aiShufflePelagicSwitches(void);
-/*0x01ba*/ bool ai01ba(void);
+/*0x01ba*/ bool aiTryAttackLie(void);
 /*0x01bb*/ bool aiNoOp01bb(void);
 /*0x01bc*/ bool ai01bc(void);
 /*0x01bd*/ bool aiIfTrainingPcHolographed(void);

src/include/types.h

@@ -419,8 +419,8 @@ struct act_attack {
 	/*0x40*/ u32 unk040;
 	/*0x44*/ u32 unk044;
 	/*0x48*/ u32 unk048;
-	/*0x4c*/ u32 unk04c;
-	/*0x50*/ u32 unk050;
+	/*0x4c*/ u32 entitytype;
+	/*0x50*/ u32 entityid;
 	/*0x54*/ u32 unk054;
 	/*0x58*/ u32 unk058;
 };