Rename hudmsg functions

src/include/commands.h

@@ -1804,7 +1804,7 @@
  *
  * The chr argument should be a player.
  */
-#define message(chr, text) \
+#define show_hudmsg(chr, text) \
 	mkshort(0x00cb), \
 	chr, \
 	mkshort(text),
@@ -1815,7 +1815,7 @@
  * The chr argument should be a player.
  * The color argument should be a COLOR constant.
  */
-#define display_text_top_middle(chr, text, color) \
+#define show_hudmsg_top_middle(chr, text, color) \
 	mkshort(0x00cc), \
 	chr, \
 	mkshort(text), \
@@ -3451,9 +3451,18 @@
 	mkshort(0x01a3), \
 	value,
 
-#define display_text(prop, color, text) \
+/**
+ * Show or remove a HUD message.
+ *
+ * If operation is 0, show it in the top middle with infinite duration.
+ * If operation is 1, show it in the bottom middle with a long duration.
+ * If operation is 2, remove all HUD messages.
+ *
+ * For removing HUD messages, consider using remove_hudmsgs instead.
+ */
+#define show_hudmsg_middle(operation, color, text) \
 	mkshort(0x01a4), \
-	prop, \
+	operation, \
 	color, \
 	mkshort(text),
 
@@ -3981,7 +3990,7 @@
 
 #define reloop(id) goto_first(id)
 
-#define remove_displayed_text display_text(0x02, 0, 0x0002)
+#define remove_hudmsgs show_hudmsg_middle(0x02, 0, 0x0002)
 
 #define if_stage_is_not(stage, label) if_stage_lt(stage, label) if_stage_gt(stage, label)
 

src/include/game/chr/chraicommands.h

@@ -205,8 +205,8 @@
 /*0x00c8*/ bool aiTryEquipWeapon(void);
 /*0x00c9*/ bool aiTryEquipHat(void);
 /*0x00ca*/ bool aiDuplicateChr(void);
-/*0x00cb*/ bool aiMessage(void);
-/*0x00cc*/ bool aiShowText2(void);
+/*0x00cb*/ bool aiShowHudmsg(void);
+/*0x00cc*/ bool aiShowHudmsgTopMiddle(void);
 /*0x00cd*/ bool aiSpeak(void);
 /*0x00ce*/ bool aiPlaySound(void);
 /*0x00cf*/ bool ai00cf(void);
@@ -387,7 +387,7 @@
 /*0x01a1*/ bool aiSetRoomToSearch(void);
 /*0x01a2*/ bool aiSayCiStaffQuip(void);
 /*0x01a3*/ bool aiDoPresetAnimation(void);
-/*0x01a4*/ bool aiShowText(void);
+/*0x01a4*/ bool aiShowHudmsgMiddle(void);
 /*0x01a5*/ bool ai01a5(void);
 /*0x01a6*/ bool aiIfTargetYDifferenceLessThan(void);
 /*0x01a7*/ bool aiIfChrPropsoundcountZero(void);

src/include/game/game_0dcdb0.h

@@ -13,13 +13,13 @@ u32 func0f0ddd44(void);
 void func0f0ddda0(void);
 void hudmsgRemoveAll(void);
 u32 func0f0ddeac(void);
-void currentPlayerQueueMessage(char *text, s32 confignum);
+void hudmsgCreateViaPreset(char *text, s32 confignum);
 void func0f0ddfa4(char *text, s32 confignum, s32 arg2);
-void func0f0de034(char *text, s32 confignum, u8 colour);
-void func0f0de0d4(char *text, s32 confignum, struct hudmessageconfig *config, s32 arg3);
+void hudmsgCreateViaPresetWithColour(char *text, s32 confignum, u8 colour);
+void hudmsgCreateViaStruct(char *text, s32 confignum, struct hudmessageconfig *config, s32 arg3);
 u32 func0f0de160(void);
 u32 func0f0de7fc(void);
-u32 func0f0deebc(char *text, s32 confignum, u8 conf00, u8 conf01, u8 conf02,
+u32 hudmsgCreate(char *text, s32 confignum, u8 conf00, u8 conf01, u8 conf02,
 		void *conf04, void *conf08, u32 colour, u32 conf10, u8 alignh, s16 conf16,
 		u8 alignv, s16 conf18, s32 arg14, s32 arg15);
 void func0f0df364(void);