From f6f7689ae6840eca47af935e15982c8231f8e167 Mon Sep 17 00:00:00 2001
From: hiisuya <hiisuya@gmail.com>
Date: Thu, 5 Jun 2025 08:02:36 -0500
Subject: [PATCH] doc inftable entries in ma2

---
 include/z64save.h                         |  6 +++---
 src/overlays/actors/ovl_En_Ma2/z_en_ma2.c | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/z64save.h b/include/z64save.h
index 71b1414052..12da9bc2f8 100644
--- a/include/z64save.h
+++ b/include/z64save.h
@@ -782,9 +782,9 @@ typedef enum LinkAge {
 #define INFTABLE_TALKED_TO_MALON_FIRST_TIME 0x84
 #define INFTABLE_TOLD_EPONA_IS_SCARED 0x85
 #define INFTABLE_MALON_SPAWNED_AT_HYRULE_CASTLE 0x8B
-#define INFTABLE_8C 0x8C
-#define INFTABLE_8D 0x8D
-#define INFTABLE_8E 0x8E
+#define INFTABLE_TALKED_TO_ADULT_MALON_AFTER_SONG 0x8C
+#define INFTABLE_8D 0x8D // unreachable flag in EnMa2
+#define INFTABLE_PLAYED_SONG_FOR_ADULT_MALON 0x8E
 #define INFTABLE_94 0x94
 #define INFTABLE_97 0x97
 #define INFTABLE_9A 0x9A
diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
index 39d2743c75..5ff22f5ee0 100644
--- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
+++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
@@ -92,9 +92,9 @@ u16 EnMa2_GetTextId(PlayState* play, Actor* thisx) {
         return 0x2056;
     }
     if (IS_NIGHT) {
-        if (GET_INFTABLE(INFTABLE_8C)) {
+        if (GET_INFTABLE(INFTABLE_TALKED_TO_ADULT_MALON_AFTER_SONG)) {
             return 0x2052;
-        } else if (GET_INFTABLE(INFTABLE_8E)) {
+        } else if (GET_INFTABLE(INFTABLE_PLAYED_SONG_FOR_ADULT_MALON)) {
             return 0x2051;
         } else {
             return 0x2050;
@@ -110,10 +110,11 @@ s16 EnMa2_UpdateTalkState(PlayState* play, Actor* thisx) {
         case TEXT_STATE_CLOSING:
             switch (thisx->textId) {
                 case 0x2051:
-                    SET_INFTABLE(INFTABLE_8C);
+                    SET_INFTABLE(INFTABLE_TALKED_TO_ADULT_MALON_AFTER_SONG);
                     talkState = NPC_TALK_STATE_ACTION;
                     break;
-                case 0x2053:
+                // unreachable, 0x2053 is a text id for Gossip Stones, which EnMa2 never sets
+                case 0x2053: 
                     SET_INFTABLE(INFTABLE_8D);
                     talkState = NPC_TALK_STATE_IDLE;
                     break;
@@ -313,7 +314,7 @@ void EnMa2_WaitForEponasSong(EnMa2* this, PlayState* play) {
         Audio_PlaySfxGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
                              &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
         this->timer = 0x1E;
-        SET_INFTABLE(INFTABLE_8E);
+        SET_INFTABLE(INFTABLE_PLAYED_SONG_FOR_ADULT_MALON);
         this->actionFunc = EnMa2_ForceTalkAfterSong;
         play->msgCtx.ocarinaMode = OCARINA_MODE_04;
     } else {