Rename command 0039 to if_can_hear_alarm

src/include/commands.h

@@ -521,10 +521,12 @@
 	label,
 
 /**
- * Checks if the alarm is currently sounding. Not sure how this differs from
- * if_alarm_active.
+ * Checks if the alarm is currently sounding.
+ *
+ * This is functionally the same as if_alarm_active, but during development may
+ * have contained extra per-chr checks such as chr flags and distance.
  */
-#define if_alarm_active2(label) \
+#define if_can_hear_alarm(label) \
 	mkshort(0x0039), \
 	label,
 

src/include/game/chr/chraction.h

@@ -304,7 +304,7 @@ s32 chrGetNumArghs(struct chrdata *chr);
 s32 chrGetNumCloseArghs(struct chrdata *chr);
 void decrementByte(u8 *dst, u8 amount);
 void incrementByte(u8 *dst, u8 amount);
-bool func0f04a2b4(struct chrdata *chr);
+bool chrCanHearAlarm(struct chrdata *chr);
 bool func0f04a76c(struct chrdata *chr, f32 distance);
 bool func0f04a79c(u8 chrnum, struct chrdata *chr, f32 distance);
 bool chrCompareTeams(struct chrdata *chr1, struct chrdata *chr2, u8 checktype);

src/include/game/chr/chraicommands.h

@@ -60,7 +60,7 @@
 /*0x0036*/ bool aiRandom(void);
 /*0x0037*/ bool aiIfRandomLessThan(void);
 /*0x0038*/ bool aiIfRandomGreaterThan(void);
-/*0x0039*/ bool aiIfChrAlarmActivate(void);
+/*0x0039*/ bool aiIfCanHearAlarm(void);
 /*0x003a*/ bool aiIfAlarmActive(void);
 /*0x003b*/ bool aiIfAlarmInactive(void);
 /*0x003c*/ bool ai003c(void);