diff --git a/include/z64save.h b/include/z64save.h
index ab753a515d..fb8767b0a1 100644
--- a/include/z64save.h
+++ b/include/z64save.h
@@ -968,12 +968,26 @@ typedef enum IngoRaceState {
 #define EVENTINF_MARATHON_ACTIVE 0x10
 
 // EVENTINF 0x20-0x24
-#define EVENTINF_INDEX_20_21_22_23_24 2
-#define EVENTINF_20_MASK (1 << 0)
-#define EVENTINF_21_MASK (1 << 1)
-#define EVENTINF_22_MASK (1 << 2)
-#define EVENTINF_23_MASK (1 << 3)
-#define EVENTINF_24_MASK (1 << 4)
+#define EVENTINF_INDEX_HAGGLING_TOWNSFOLK 0x2
+#define EVENTINF_HAGGLING_TOWNSFOLK_MESG_0 0x20
+#define EVENTINF_HAGGLING_TOWNSFOLK_MESG_1 0x21
+#define EVENTINF_HAGGLING_TOWNSFOLK_MESG_2 0x22
+#define EVENTINF_HAGGLING_TOWNSFOLK_MESG_3 0x23
+#define EVENTINF_HAGGLING_TOWNSFOLK_MESG_4 0x24
+
+#define EVENTINF_HAGGLING_TOWNSFOLK_MASK                                                                     \
+    (EVENTINF_MASK(EVENTINF_HAGGLING_TOWNSFOLK_MESG_0) | EVENTINF_MASK(EVENTINF_HAGGLING_TOWNSFOLK_MESG_1) | \
+     EVENTINF_MASK(EVENTINF_HAGGLING_TOWNSFOLK_MESG_2) | EVENTINF_MASK(EVENTINF_HAGGLING_TOWNSFOLK_MESG_3) | \
+     EVENTINF_MASK(EVENTINF_HAGGLING_TOWNSFOLK_MESG_4))
+
+#define GET_EVENTINF_ENMU_TALK_FLAGS() \
+    gSaveContext.eventInf[EVENTINF_INDEX_HAGGLING_TOWNSFOLK] & EVENTINF_HAGGLING_TOWNSFOLK_MASK
+
+#define SET_EVENTINF_ENMU_TALK_FLAGS(talkFlags) \
+    gSaveContext.eventInf[EVENTINF_INDEX_HAGGLING_TOWNSFOLK] |= (talkFlags);
+
+#define RESET_EVENTINF_ENMU_TALK_FLAGS() \
+    gSaveContext.eventInf[EVENTINF_INDEX_HAGGLING_TOWNSFOLK] &= ~(EVENTINF_HAGGLING_TOWNSFOLK_MASK);
 
 #define EVENTINF_30 0x30
 
diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c
index dbe5e1b15c..4f4221820f 100644
--- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c
+++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c
@@ -58,21 +58,21 @@ void EnMu_SetupAction(EnMu* this, EnMuActionFunc actionFunc) {
 void EnMu_Interact(EnMu* this, PlayState* play) {
     u8 textIdOffset[] = { 0x42, 0x43, 0x3F, 0x41, 0x3E };
     u8 bitmask[] = {
-        EVENTINF_20_MASK, EVENTINF_21_MASK, EVENTINF_22_MASK, EVENTINF_23_MASK, EVENTINF_24_MASK,
+        EVENTINF_MASK(EVENTINF_HAGGLING_TOWNSFOLK_MESG_0), EVENTINF_MASK(EVENTINF_HAGGLING_TOWNSFOLK_MESG_1),
+        EVENTINF_MASK(EVENTINF_HAGGLING_TOWNSFOLK_MESG_2), EVENTINF_MASK(EVENTINF_HAGGLING_TOWNSFOLK_MESG_3),
+        EVENTINF_MASK(EVENTINF_HAGGLING_TOWNSFOLK_MESG_4),
     };
-    u8 textFlags;
+    u8 talkFlags;
     s32 randomIndex;
     s32 i;
 
-    textFlags = gSaveContext.eventInf[EVENTINF_INDEX_20_21_22_23_24] &
-                (EVENTINF_20_MASK | EVENTINF_21_MASK | EVENTINF_22_MASK | EVENTINF_23_MASK | EVENTINF_24_MASK);
-    gSaveContext.eventInf[EVENTINF_INDEX_20_21_22_23_24] &=
-        ~(EVENTINF_20_MASK | EVENTINF_21_MASK | EVENTINF_22_MASK | EVENTINF_23_MASK | EVENTINF_24_MASK);
+    talkFlags = GET_EVENTINF_ENMU_TALK_FLAGS();
+    RESET_EVENTINF_ENMU_TALK_FLAGS();
     randomIndex = (play->state.frames + (s32)(Rand_ZeroOne() * 5.0f)) % 5;
 
+    // Starting at randomIndex, scan sequentially for the next unspoken message
     for (i = 0; i < 5; i++) {
-
-        if (!(textFlags & bitmask[randomIndex])) {
+        if (!(talkFlags & bitmask[randomIndex])) {
             break;
         }
 
@@ -82,6 +82,7 @@ void EnMu_Interact(EnMu* this, PlayState* play) {
         }
     }
 
+    // If all 5 messages have been spoken, reset but prevent the last message from being repeated
     if (i == 5) {
         if (this->defaultTextId == (textIdOffset[randomIndex] | 0x7000)) {
             randomIndex++;
@@ -89,13 +90,12 @@ void EnMu_Interact(EnMu* this, PlayState* play) {
                 randomIndex = 0;
             }
         }
-        textFlags = 0;
+        talkFlags = 0;
     }
 
-    textFlags |= bitmask[randomIndex];
+    talkFlags |= (u8)bitmask[randomIndex];
     this->defaultTextId = textIdOffset[randomIndex] | 0x7000;
-    textFlags &= EVENTINF_20_MASK | EVENTINF_21_MASK | EVENTINF_22_MASK | EVENTINF_23_MASK | EVENTINF_24_MASK | 0xE0;
-    gSaveContext.eventInf[EVENTINF_INDEX_20_21_22_23_24] |= textFlags;
+    SET_EVENTINF_ENMU_TALK_FLAGS(talkFlags);
 }
 
 u16 EnMu_GetTextId(PlayState* play, Actor* thisx) {