diff --git a/include/z64save.h b/include/z64save.h
index 2c10d76bc61..2aa56e11a17 100644
--- a/include/z64save.h
+++ b/include/z64save.h
@@ -489,7 +489,7 @@ typedef enum LinkAge {
 #define EVENTCHKINF_20 0x20
 #define EVENTCHKINF_21 0x21
 #define EVENTCHKINF_22 0x22
-#define EVENTCHKINF_23 0x23
+#define EVENTCHKINF_DC_BOULDER_DESTROYED 0x23 // as child
 #define EVENTCHKINF_25 0x25
 #define EVENTCHKINF_2A 0x2A
 #define EVENTCHKINF_2B 0x2B
@@ -502,39 +502,39 @@ typedef enum LinkAge {
 #define EVENTCHKINF_33 0x33
 #define EVENTCHKINF_37 0x37
 #define EVENTCHKINF_38 0x38
-#define EVENTCHKINF_39 0x39
-#define EVENTCHKINF_3A 0x3A
+#define EVENTCHKINF_OPENED_ZORAS_DOMAIN 0x39
+#define EVENTCHKINF_JABUJABU_FISH_GIVEN 0x3A
 #define EVENTCHKINF_3B 0x3B
 #define EVENTCHKINF_3C 0x3C
 
 // 0x40
-#define EVENTCHKINF_40_INDEX 4
-#define EVENTCHKINF_40_SHIFT 0
-#define EVENTCHKINF_40_MASK (1 << EVENTCHKINF_40_SHIFT)
-#define EVENTCHKINF_40 ((EVENTCHKINF_40_INDEX << 4) | EVENTCHKINF_40_SHIFT)
+#define EVENTCHKINF_GOT_ZELDAS_LETTER_INDEX 4
+#define EVENTCHKINF_GOT_ZELDAS_LETTER_SHIFT 0
+#define EVENTCHKINF_GOT_ZELDAS_LETTER_MASK (1 << EVENTCHKINF_GOT_ZELDAS_LETTER_SHIFT)
+#define EVENTCHKINF_GOT_ZELDAS_LETTER ((EVENTCHKINF_GOT_ZELDAS_LETTER_INDEX << 4) | EVENTCHKINF_GOT_ZELDAS_LETTER_SHIFT)
 
 #define EVENTCHKINF_41 0x41
 #define EVENTCHKINF_42 0x42
-#define EVENTCHKINF_43 0x43
+#define EVENTCHKINF_GOT_OCARINA_OF_TIME 0x43
 #define EVENTCHKINF_45 0x45
-#define EVENTCHKINF_48 0x48
-#define EVENTCHKINF_49 0x49
-#define EVENTCHKINF_4A 0x4A
+#define EVENTCHKINF_CLEARED_FOREST_TEMPLE 0x48
+#define EVENTCHKINF_CLEARED_FIRE_TEMPLE 0x49
+#define EVENTCHKINF_CLEARED_WATER_TEMPLE 0x4A
 #define EVENTCHKINF_4B 0x4B
 #define EVENTCHKINF_4C 0x4C
 #define EVENTCHKINF_4D 0x4D
 #define EVENTCHKINF_4E 0x4E
 #define EVENTCHKINF_WATCHED_SHEIK_AFTER_MASTER_SWORD_CS 0x4F // Cutscene in Temple of Time as adult after pulling the Master Sword for the first time
-#define EVENTCHKINF_50 0x50
-#define EVENTCHKINF_51 0x51
-#define EVENTCHKINF_52 0x52
-#define EVENTCHKINF_54 0x54
-#define EVENTCHKINF_55 0x55
-#define EVENTCHKINF_59 0x59
-#define EVENTCHKINF_5A 0x5A
-#define EVENTCHKINF_5B 0x5B
+#define EVENTCHKINF_LEARNED_SONG_MINUET 0x50
+#define EVENTCHKINF_LEARNED_SONG_BOLERO 0x51
+#define EVENTCHKINF_LEARNED_SONG_SERENADE 0x52
+#define EVENTCHKINF_LEARNED_SONG_NOCTURNE 0x54
+#define EVENTCHKINF_LEARNED_SONG_PRELUDE 0x55
+#define EVENTCHKINF_LEARNED_SONG_LULLABY 0x59
+#define EVENTCHKINF_LEARNED_SONG_SUN 0x5A
+#define EVENTCHKINF_PLAYED_SONG_STORMS_AT_WINDMILL 0x5B
 #define EVENTCHKINF_5C 0x5C
-#define EVENTCHKINF_65 0x65
+#define EVENTCHKINF_LEARNED_SONG_STORMS 0x65
 #define EVENTCHKINF_67 0x67
 #define EVENTCHKINF_68 0x68
 #define EVENTCHKINF_69 0x69
@@ -559,10 +559,10 @@ typedef enum LinkAge {
 #define EVENTCHKINF_78 0x78
 #define EVENTCHKINF_80 0x80
 #define EVENTCHKINF_82 0x82
-#define EVENTCHKINF_8C 0x8C
-#define EVENTCHKINF_8D 0x8D
-#define EVENTCHKINF_8E 0x8E
-#define EVENTCHKINF_8F 0x8F
+#define EVENTCHKINF_PAID_BACK_KEATON_MASK 0x8C
+#define EVENTCHKINF_PAID_BACK_SKULL_MASK 0x8D
+#define EVENTCHKINF_PAID_BACK_SPOOKY_MASK 0x8E
+#define EVENTCHKINF_PAID_BACK_BUNNY_HOOD 0x8F
 
 // 0x90-0x93
 // carpenters freed from the gerudo
@@ -696,25 +696,25 @@ typedef enum LinkAge {
 #define ITEMGETINF_19 ((ITEMGETINF_18_19_1A_INDEX << 4) | ITEMGETINF_19_SHIFT)
 #define ITEMGETINF_1A ((ITEMGETINF_18_19_1A_INDEX << 4) | ITEMGETINF_1A_SHIFT)
 
-#define ITEMGETINF_1B 0x1B
-#define ITEMGETINF_1C 0x1C
+#define ITEMGETINF_FOUND_PURPLE_RUPEE 0x1B
+#define ITEMGETINF_UPGRADED_PURPLE_RUPEE 0x1C
 #define ITEMGETINF_1D 0x1D
 #define ITEMGETINF_1E 0x1E
 #define ITEMGETINF_1F 0x1F
-#define ITEMGETINF_23 0x23
-#define ITEMGETINF_24 0x24
-#define ITEMGETINF_25 0x25
-#define ITEMGETINF_26 0x26
-#define ITEMGETINF_2A 0x2A
+#define ITEMGETINF_BORROWED_KEATON_MASK 0x23
+#define ITEMGETINF_BORROWED_SKULL_MASK 0x24
+#define ITEMGETINF_BORROWED_SPOOKY_MASK 0x25
+#define ITEMGETINF_BORROWED_BUNNY_HOOD 0x26
+#define ITEMGETINF_BORROWED_TRUTH_MASK 0x2A
 #define ITEMGETINF_2C 0x2C
 #define ITEMGETINF_2E 0x2E
 #define ITEMGETINF_30 0x30
 #define ITEMGETINF_31 0x31
-#define ITEMGETINF_38 0x38
-#define ITEMGETINF_39 0x39
-#define ITEMGETINF_3A 0x3A
-#define ITEMGETINF_3B 0x3B
-#define ITEMGETINF_3F 0x3F
+#define ITEMGETINF_SOLD_KEATON_MASK 0x38
+#define ITEMGETINF_SOLD_SKULL_MASK 0x39
+#define ITEMGETINF_SOLD_SPOOKY_MASK 0x3A
+#define ITEMGETINF_SOLD_BUNNY_HOOD 0x3B
+#define ITEMGETINF_OBTAINED_MASK_OF_TRUTH 0x3F
 
 
 #define GET_ITEMGETINF(flag) (gSaveContext.save.info.itemGetInf[(flag) >> 4] & (1 << ((flag) & 0xF)))
@@ -770,7 +770,7 @@ typedef enum LinkAge {
 #define INFTABLE_AB 0xAB
 #define INFTABLE_B0 0xB0
 #define INFTABLE_B1 0xB1
-#define INFTABLE_B4 0xB4
+#define INFTABLE_TALKED_TO_GORON_MSG_3054 0xB4
 #define INFTABLE_B6 0xB6
 #define INFTABLE_B7 0xB7
 #define INFTABLE_B8 0xB8
@@ -797,24 +797,24 @@ typedef enum LinkAge {
 #define INFTABLE_D6 0xD6
 #define INFTABLE_D8 0xD8
 #define INFTABLE_D9 0xD9
-#define INFTABLE_E0 0xE0
-#define INFTABLE_E3 0xE3
-#define INFTABLE_E6 0xE6
-#define INFTABLE_EB 0xEB
-#define INFTABLE_F0 0xF0
-#define INFTABLE_F4 0xF4
-#define INFTABLE_F8 0xF8
+#define INFTABLE_TALKED_TO_GORON_MSG_3008 0xE0 // DMT Goron at DC entrance (Before DC is opened as child)
+#define INFTABLE_TALKED_TO_GORON_MSG_300E 0xE3 // GC Goron in bottom level stairwell
+#define INFTABLE_TALKED_TO_GORON_MSG_3024 0xE6 // GC Goron at LW entrance (Before LW shortcut is opened)
+#define INFTABLE_TALKED_TO_GORON_MSG_300B 0xEB // DMT Goron at Bomb Flower with goron bracelet
+#define INFTABLE_TALKED_TO_GORON_MSG_3014 0xF0 // GC Entrance (Before goron ruby is obtained)
+#define INFTABLE_TALKED_TO_GORON_MSG_3016 0xF4 // GC Island (Before goron ruby is obtained)
+#define INFTABLE_TALKED_TO_GORON_MSG_3018 0xF8 // outside Darunias door (after opening door, before getting goron bracelet)
 #define INFTABLE_FC 0xFC
-#define INFTABLE_109 0x109
-#define INFTABLE_10A 0x10A
-#define INFTABLE_10B 0x10B
-#define INFTABLE_10C 0x10C
-#define INFTABLE_10D 0x10D
-#define INFTABLE_10E 0x10E
-#define INFTABLE_10F 0x10F
+#define INFTABLE_GOT_GORON_TUNIC 0x109 // from Goron Link
+#define INFTABLE_TALKED_TO_GORON_MSG_3032 0x10A
+#define INFTABLE_TALKED_TO_GORON_MSG_3035 0x10B // About Volvagia
+#define INFTABLE_STOPPED_GORON_LINK 0x10C
+#define INFTABLE_TALKED_TO_GORON_MSG_3036 0x10D
+#define INFTABLE_TALKED_TO_GORON_MSG_3037 0x10E // Spoke to Goron Link
+#define INFTABLE_TALKED_TO_GORON_MSG_3041 0x10F
 #define INFTABLE_113 0x113
 #define INFTABLE_11A 0x11A
-#define INFTABLE_11E 0x11E
+#define INFTABLE_UPGRADED_BOMB_BAG 0x11E // from rolling Goron
 #define INFTABLE_124 0x124
 #define INFTABLE_129 0x129
 #define INFTABLE_12A 0x12A
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index e91ab50d844..618706d6781 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -5079,7 +5079,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
                 } else {
                     retTextId = 0x2010;
                 }
-            } else if (Flags_GetEventChkInf(EVENTCHKINF_40)) {
+            } else if (Flags_GetEventChkInf(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
                 retTextId = 0x200F;
             } else {
                 retTextId = 0x200E;
@@ -5199,9 +5199,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             if (!LINK_IS_ADULT) {
                 if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
                     retTextId = 0x3027;
-                } else if (Flags_GetEventChkInf(EVENTCHKINF_23)) {
+                } else if (Flags_GetEventChkInf(EVENTCHKINF_DC_BOULDER_DESTROYED)) {
                     retTextId = 0x3021;
-                } else if (Flags_GetInfTable(INFTABLE_E0)) {
+                } else if (Flags_GetInfTable(INFTABLE_TALKED_TO_GORON_MSG_3008)) {
                     retTextId = 0x302A;
                 } else {
                     retTextId = 0x3008;
@@ -5218,7 +5218,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             if (!LINK_IS_ADULT) {
                 if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
                     retTextId = 0x3027;
-                } else if (Flags_GetEventChkInf(EVENTCHKINF_23)) {
+                } else if (Flags_GetEventChkInf(EVENTCHKINF_DC_BOULDER_DESTROYED)) {
                     retTextId = 0x3026;
                 } else {
                     retTextId = 0x3009;
@@ -5235,9 +5235,9 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             if (!LINK_IS_ADULT) {
                 if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
                     retTextId = 0x3027;
-                } else if (Flags_GetEventChkInf(EVENTCHKINF_23)) {
+                } else if (Flags_GetEventChkInf(EVENTCHKINF_DC_BOULDER_DESTROYED)) {
                     retTextId = 0x3026;
-                } else if (Flags_GetInfTable(INFTABLE_EB)) {
+                } else if (Flags_GetInfTable(INFTABLE_TALKED_TO_GORON_MSG_300B)) {
                     retTextId = 0x302B;
                 } else {
                     retTextId = 0x300A;
@@ -5254,7 +5254,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             if (!LINK_IS_ADULT) {
                 if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
                     retTextId = 0x3027;
-                } else if (Flags_GetInfTable(INFTABLE_F0)) {
+                } else if (Flags_GetInfTable(INFTABLE_TALKED_TO_GORON_MSG_3014)) {
                     retTextId = 0x3015;
                 } else {
                     retTextId = 0x3014;
@@ -5271,7 +5271,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             if (!LINK_IS_ADULT) {
                 if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
                     retTextId = 0x3027;
-                } else if (Flags_GetInfTable(INFTABLE_F4)) {
+                } else if (Flags_GetInfTable(INFTABLE_TALKED_TO_GORON_MSG_3016)) {
                     retTextId = 0x3017;
                 } else {
                     retTextId = 0x3016;
@@ -5288,7 +5288,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
             if (!LINK_IS_ADULT) {
                 if (Flags_GetEventChkInf(EVENTCHKINF_25)) {
                     retTextId = 0x3027;
-                } else if (Flags_GetInfTable(INFTABLE_F8)) {
+                } else if (Flags_GetInfTable(INFTABLE_TALKED_TO_GORON_MSG_3018)) {
                     retTextId = 0x3019;
                 } else {
                     retTextId = 0x3018;
@@ -5646,28 +5646,28 @@ void func_80036E50(u16 textId, s16 arg1) {
             return;
         case 38:
             if (textId == 0x3008) {
-                Flags_SetInfTable(INFTABLE_E0);
+                Flags_SetInfTable(INFTABLE_TALKED_TO_GORON_MSG_3008);
             }
             return;
         case 40:
             if (textId == 0x300B) {
-                Flags_SetInfTable(INFTABLE_EB);
+                Flags_SetInfTable(INFTABLE_TALKED_TO_GORON_MSG_300B);
             }
             return;
         case 41:
             if (textId == 0x3014) {
-                Flags_SetInfTable(INFTABLE_F0);
+                Flags_SetInfTable(INFTABLE_TALKED_TO_GORON_MSG_3014);
             }
             return;
         case 42:
             if (textId == 0x3016) {
-                Flags_SetInfTable(INFTABLE_F4);
+                Flags_SetInfTable(INFTABLE_TALKED_TO_GORON_MSG_3016);
             }
             return;
         case 43:
             if (textId == 0x3018) {
                 Flags_SetEventChkInf(EVENTCHKINF_20);
-                Flags_SetInfTable(INFTABLE_F8);
+                Flags_SetInfTable(INFTABLE_TALKED_TO_GORON_MSG_3018);
             }
             return;
         case 48:
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index 4b48261cd75..c6515ffe983 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -101,7 +101,7 @@ EntranceCutscene sEntranceCutsceneTable[] = {
     { ENTR_DESERT_COLOSSUS_0, 2, EVENTCHKINF_B8, gDesertColossusIntroCs },
     { ENTR_DEATH_MOUNTAIN_CRATER_0, 2, EVENTCHKINF_B9, gDeathMountainCraterIntroCs },
     { ENTR_HYRULE_CASTLE_0, 0, EVENTCHKINF_BA, gGanonsCastleIntroCs },
-    { ENTR_ROYAL_FAMILYS_TOMB_1, 2, EVENTCHKINF_5A, gSunSongGraveSunSongTeachPart2Cs },
+    { ENTR_ROYAL_FAMILYS_TOMB_1, 2, EVENTCHKINF_LEARNED_SONG_SUN, gSunSongGraveSunSongTeachPart2Cs },
     { ENTR_INSIDE_GANONS_CASTLE_2, 2, EVENTCHKINF_BB, gForestBarrierCs },
     { ENTR_INSIDE_GANONS_CASTLE_3, 2, EVENTCHKINF_BC, gWaterBarrierCs },
     { ENTR_INSIDE_GANONS_CASTLE_4, 2, EVENTCHKINF_BD, gShadowBarrierCs },
@@ -397,7 +397,7 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) {
             break;
 
         case CS_MISC_SET_FLAG_FAST_WINDMILL:
-            SET_EVENTCHKINF(EVENTCHKINF_65);
+            SET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_STORMS);
             break;
 
         case CS_MISC_SET_FLAG_WELL_DRAINED:
@@ -912,7 +912,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
 
             case CS_DEST_KAKARIKO_VILLAGE_NOCTURNE_PART_2:
                 Item_Give(play, ITEM_SONG_NOCTURNE);
-                SET_EVENTCHKINF(EVENTCHKINF_54);
+                SET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_NOCTURNE);
                 play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 gSaveContext.save.cutsceneIndex = 0xFFF1;
@@ -1181,8 +1181,9 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                 // all 3 are restored. This cutscene destination sends the player to the correct blue warp destination,
                 // unless all 3 dungeons have been cleared. In that case, the destination is the Temple of Time which
                 // plays a cutscene where the door opens.
-                if (GET_EVENTCHKINF(EVENTCHKINF_48) && GET_EVENTCHKINF(EVENTCHKINF_49) &&
-                    GET_EVENTCHKINF(EVENTCHKINF_4A)) {
+                if (GET_EVENTCHKINF(EVENTCHKINF_CLEARED_FOREST_TEMPLE) &&
+                    GET_EVENTCHKINF(EVENTCHKINF_CLEARED_FIRE_TEMPLE) &&
+                    GET_EVENTCHKINF(EVENTCHKINF_CLEARED_WATER_TEMPLE)) {
                     play->nextEntranceIndex = ENTR_TEMPLE_OF_TIME_0;
                     play->transitionTrigger = TRANS_TRIGGER_START;
                     gSaveContext.save.cutsceneIndex = 0xFFF3;
@@ -2399,8 +2400,9 @@ void Cutscene_HandleConditionalTriggers(PlayState* play) {
             gSaveContext.save.entranceIndex = ENTR_DESERT_COLOSSUS_0;
             gSaveContext.save.cutsceneIndex = 0xFFF0;
         } else if ((gSaveContext.save.entranceIndex == ENTR_KAKARIKO_VILLAGE_0) && LINK_IS_ADULT &&
-                   GET_EVENTCHKINF(EVENTCHKINF_48) && GET_EVENTCHKINF(EVENTCHKINF_49) &&
-                   GET_EVENTCHKINF(EVENTCHKINF_4A) && !Flags_GetEventChkInf(EVENTCHKINF_AA)) {
+                   GET_EVENTCHKINF(EVENTCHKINF_CLEARED_FOREST_TEMPLE) &&
+                   GET_EVENTCHKINF(EVENTCHKINF_CLEARED_FIRE_TEMPLE) &&
+                   GET_EVENTCHKINF(EVENTCHKINF_CLEARED_WATER_TEMPLE) && !Flags_GetEventChkInf(EVENTCHKINF_AA)) {
             Flags_SetEventChkInf(EVENTCHKINF_AA);
             gSaveContext.save.cutsceneIndex = 0xFFF0;
         } else if ((gSaveContext.save.entranceIndex == ENTR_LOST_WOODS_9) && !Flags_GetEventChkInf(EVENTCHKINF_C1)) {
diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c
index c90b4ee6f4a..b3fe5d172d3 100644
--- a/src/code/z_elf_message.c
+++ b/src/code/z_elf_message.c
@@ -8,7 +8,7 @@ QuestHintCmd sChildSariaQuestHints[] = {
 
     QUEST_HINT_FLAG(CHECK, EVENTCHKINF_25, false, 0x62),
     QUEST_HINT_FLAG(CHECK, EVENTCHKINF_37, false, 0x63),
-    QUEST_HINT_FLAG(CHECK, EVENTCHKINF_43, false, 0x65),
+    QUEST_HINT_FLAG(CHECK, EVENTCHKINF_GOT_OCARINA_OF_TIME, false, 0x65),
     QUEST_HINT_MEDALLION(CHECK, ITEM_MEDALLION_FOREST, false, 0x66),
     QUEST_HINT_MEDALLION(CHECK, ITEM_MEDALLION_FIRE, false, 0x66),
     QUEST_HINT_MEDALLION(CHECK, ITEM_MEDALLION_WATER, false, 0x66),
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 3cfedca3de8..bd91c76db66 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -373,7 +373,7 @@ void Play_Init(GameState* thisx) {
         }
     } else if ((gEntranceTable[((void)0, gSaveContext.save.entranceIndex)].sceneId == SCENE_KOKIRI_FOREST) &&
                LINK_IS_ADULT && !IS_CUTSCENE_LAYER) {
-        gSaveContext.sceneLayer = GET_EVENTCHKINF(EVENTCHKINF_48) ? 3 : 2;
+        gSaveContext.sceneLayer = GET_EVENTCHKINF(EVENTCHKINF_CLEARED_FOREST_TEMPLE) ? 3 : 2;
     }
 
     Play_SpawnScene(
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index 3a5060abffc..34068c6ab4f 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -497,9 +497,10 @@ void Sram_OpenSave(SramContext* sramCtx) {
     }
 
     // if zelda cutscene has been watched but lullaby was not obtained, restore cutscene and take away letter
-    if (GET_EVENTCHKINF(EVENTCHKINF_40) && !CHECK_QUEST_ITEM(QUEST_SONG_LULLABY)) {
-        i = gSaveContext.save.info.eventChkInf[EVENTCHKINF_40_INDEX] & ~EVENTCHKINF_40_MASK;
-        gSaveContext.save.info.eventChkInf[EVENTCHKINF_40_INDEX] = i;
+    if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER) && !CHECK_QUEST_ITEM(QUEST_SONG_LULLABY)) {
+        i = gSaveContext.save.info.eventChkInf[EVENTCHKINF_GOT_ZELDAS_LETTER_INDEX] &
+            ~EVENTCHKINF_GOT_ZELDAS_LETTER_MASK;
+        gSaveContext.save.info.eventChkInf[EVENTCHKINF_GOT_ZELDAS_LETTER_INDEX] = i;
 
         INV_CONTENT(ITEM_ZELDAS_LETTER) = ITEM_CHICKEN;
 
diff --git a/src/elf_message/elf_message_field.c b/src/elf_message/elf_message_field.c
index bcdb71caf8e..04154a6a057 100644
--- a/src/elf_message/elf_message_field.c
+++ b/src/elf_message/elf_message_field.c
@@ -6,7 +6,7 @@ QuestHintCmd gOverworldNaviQuestHints[] = {
     QUEST_HINT_FLAG(CHECK, EVENTCHKINF_09, false, 0x41),
     QUEST_HINT_FLAG(CHECK, EVENTCHKINF_RECEIVED_WEIRD_EGG, false, 0x42),
     QUEST_HINT_FLAG(CHECK, EVENTCHKINF_TALON_RETURNED_FROM_CASTLE, false, 0x43),
-    QUEST_HINT_FLAG(CHECK, EVENTCHKINF_40, false, 0x44),
+    QUEST_HINT_FLAG(CHECK, EVENTCHKINF_GOT_ZELDAS_LETTER, false, 0x44),
     QUEST_HINT_SONG(CHECK, ITEM_SONG_SARIA, false, 0x45),
     QUEST_HINT_STRENGTH_UPG(CHECK, 0, true, 0x46),
     QUEST_HINT_FLAG(CHECK, EVENTCHKINF_25, false, 0x47),
@@ -14,7 +14,7 @@ QuestHintCmd gOverworldNaviQuestHints[] = {
     QUEST_HINT_FLAG(CHECK, EVENTCHKINF_33, false, 0x49),
     QUEST_HINT_FLAG(CHECK, EVENTCHKINF_37, false, 0x4A),
     QUEST_HINT_FLAG(CHECK, EVENTCHKINF_80, false, 0x4B),
-    QUEST_HINT_FLAG(CHECK, EVENTCHKINF_43, false, 0x4C),
+    QUEST_HINT_FLAG(CHECK, EVENTCHKINF_GOT_OCARINA_OF_TIME, false, 0x4C),
     QUEST_HINT_FLAG(CHECK, EVENTCHKINF_45, false, 0x4D),
     QUEST_HINT_ITEM(CHECK, ITEM_HOOKSHOT, ITEM_NONE, true, 0x4E),
     QUEST_HINT_MEDALLION(CHECK, ITEM_MEDALLION_FOREST, false, 0x50),
diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
index 3b1f5594791..95d41a1473c 100644
--- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
+++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
@@ -55,7 +55,7 @@ void BgRelayObjects_Init(Actor* thisx, PlayState* play) {
     DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS | DYNA_TRANSFORM_ROT_Y);
     if (thisx->params == WINDMILL_ROTATING_GEAR) {
         CollisionHeader_GetVirtual(&gWindmillRotatingPlatformCol, &colHeader);
-        if (GET_EVENTCHKINF(EVENTCHKINF_65)) {
+        if (GET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_STORMS)) {
             thisx->world.rot.y = 0x400;
         } else {
             thisx->world.rot.y = 0x80;
@@ -109,7 +109,7 @@ void BgRelayObjects_Destroy(Actor* thisx, PlayState* play) {
 
     DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId);
     if ((this->dyna.actor.params == WINDMILL_ROTATING_GEAR) && (gSaveContext.save.cutsceneIndex < 0xFFF0)) {
-        CLEAR_EVENTCHKINF(EVENTCHKINF_65);
+        CLEAR_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_STORMS);
     }
 }
 
@@ -180,9 +180,9 @@ void func_808A932C(BgRelayObjects* this, PlayState* play) {
 
 void func_808A939C(BgRelayObjects* this, PlayState* play) {
     if (CutsceneFlags_Get(play, 5)) {
-        SET_EVENTCHKINF(EVENTCHKINF_65);
+        SET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_STORMS);
     }
-    if (GET_EVENTCHKINF(EVENTCHKINF_65)) {
+    if (GET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_STORMS)) {
         Math_ScaledStepToS(&this->dyna.actor.world.rot.y, 0x400, 8);
     } else {
         Math_ScaledStepToS(&this->dyna.actor.world.rot.y, 0x80, 8);
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
index 9dde534fa8c..9206d478680 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
+++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
@@ -47,7 +47,7 @@ void BgSpot01Fusya_Init(Actor* thisx, PlayState* play) {
     this->unk_158 = 100.0f;
     this->unk_15C = 0.5f;
     if (!IS_CUTSCENE_LAYER) {
-        CLEAR_EVENTCHKINF(EVENTCHKINF_65);
+        CLEAR_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_STORMS);
     }
     BgSpot01Fusya_SetupAction(this, func_808AAA50);
 }
@@ -59,7 +59,7 @@ void func_808AAA50(BgSpot01Fusya* this, PlayState* play) {
     f32 temp;
     Actor* thisx = &this->actor;
 
-    if (GET_EVENTCHKINF(EVENTCHKINF_65)) {
+    if (GET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_STORMS)) {
         this->unk_158 = 1800.0f;
     }
     thisx->shape.rot.z += this->unk_154;
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c
index 475940dd532..66b05b2a048 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c
+++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c
@@ -302,7 +302,7 @@ void BgSpot01Idohashira_Init(Actor* thisx, PlayState* play) {
     this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader);
 
     if (!IS_CUTSCENE_LAYER) {
-        if (GET_EVENTCHKINF(EVENTCHKINF_54) && LINK_IS_ADULT) {
+        if (GET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_NOCTURNE) && LINK_IS_ADULT) {
             Actor_Kill(&this->dyna.actor);
         } else {
             this->action = 0;
diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
index 5aa678ef2ee..d67773f903f 100644
--- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
+++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
@@ -446,7 +446,7 @@ void func_808B5950(BgSpot16Bombstone* this, PlayState* play) {
         OnePointCutscene_Init(play, 4180, 50, NULL, CAM_ID_MAIN);
 
         Flags_SetSwitch(play, this->switchFlag);
-        SET_EVENTCHKINF(EVENTCHKINF_23);
+        SET_EVENTCHKINF(EVENTCHKINF_DC_BOULDER_DESTROYED);
 
         func_808B5A78(this);
     } else {
diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c
index 789921509e4..8d92e502c56 100644
--- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c
+++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c
@@ -47,7 +47,7 @@ void BgSpot18Shutter_Init(Actor* thisx, PlayState* play) {
 
     if (param == 0) {
         if (LINK_AGE_IN_YEARS == YEARS_ADULT) {
-            if (GET_INFTABLE(INFTABLE_109)) {
+            if (GET_INFTABLE(INFTABLE_GOT_GORON_TUNIC)) {
                 this->actionFunc = func_808B95AC;
                 this->dyna.actor.world.pos.y += 180.0f;
             } else {
@@ -62,7 +62,7 @@ void BgSpot18Shutter_Init(Actor* thisx, PlayState* play) {
             }
         }
     } else {
-        if (GET_INFTABLE(INFTABLE_109)) {
+        if (GET_INFTABLE(INFTABLE_GOT_GORON_TUNIC)) {
             this->dyna.actor.world.pos.x += 125.0f * Math_CosS(this->dyna.actor.world.rot.y);
             this->dyna.actor.world.pos.z -= 125.0f * Math_SinS(this->dyna.actor.world.rot.y);
             this->actionFunc = func_808B95AC;
@@ -93,7 +93,7 @@ void func_808B95B8(BgSpot18Shutter* this, PlayState* play) {
 }
 
 void func_808B9618(BgSpot18Shutter* this, PlayState* play) {
-    if (GET_INFTABLE(INFTABLE_109)) {
+    if (GET_INFTABLE(INFTABLE_GOT_GORON_TUNIC)) {
         Actor_SetFocus(&this->dyna.actor, 70.0f);
         if (PARAMS_GET_U(this->dyna.actor.params, 8, 1) == 0) {
             this->actionFunc = func_808B9698;
diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
index e25280ed0bd..717460efe71 100644
--- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
+++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
@@ -99,7 +99,7 @@ void func_808BAF40(BgTokiSwd* this, PlayState* play) {
         play->csCtx.script = D_808BBD90;
         gSaveContext.cutsceneTrigger = 1;
     }
-    if (!LINK_IS_ADULT || GET_EVENTCHKINF(EVENTCHKINF_55)) {
+    if (!LINK_IS_ADULT || GET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_PRELUDE)) {
         if (Actor_HasParent(&this->actor, play)) {
             if (!LINK_IS_ADULT) {
                 Item_Give(play, ITEM_SWORD_MASTER);
diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
index 302bd6411e8..dae5370dc20 100644
--- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
+++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
@@ -898,7 +898,7 @@ void func_80986BE4(DemoIm* this, s32 arg1) {
 }
 
 void func_80986BF8(DemoIm* this, PlayState* play) {
-    if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+    if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
         this->action = 24;
         this->drawConfig = 1;
         this->unk_280 = 1;
@@ -912,14 +912,14 @@ void func_80986C30(DemoIm* this, PlayState* play) {
 
         play->csCtx.script = SEGMENTED_TO_VIRTUAL(gZeldasCourtyardLullabyCs);
         gSaveContext.cutsceneTrigger = 1;
-        SET_EVENTCHKINF(EVENTCHKINF_59);
+        SET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_LULLABY);
         Item_Give(play, ITEM_SONG_LULLABY);
         func_80985F54(this);
     }
 }
 
 void func_80986CC8(DemoIm* this) {
-    if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+    if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
         this->action = 26;
         this->drawConfig = 1;
         this->unk_280 = 1;
@@ -945,7 +945,7 @@ void func_80986D40(DemoIm* this, PlayState* play) {
 
     if (GET_EVENTCHKINF(EVENTCHKINF_80)) {
         Actor_Kill(&this->actor);
-    } else if (!GET_EVENTCHKINF(EVENTCHKINF_59)) {
+    } else if (!GET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_LULLABY)) {
         this->action = 23;
     } else {
         this->action = 20;
diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
index b5ff0dbaaf5..ca4889fdfb0 100644
--- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
@@ -702,8 +702,8 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
 
     if (this->warpTimer > sWarpTimerTarget && gSaveContext.nextCutsceneIndex == 0xFFEF) {
         if (play->sceneId == SCENE_FOREST_TEMPLE_BOSS) {
-            if (!GET_EVENTCHKINF(EVENTCHKINF_48)) {
-                SET_EVENTCHKINF(EVENTCHKINF_48);
+            if (!GET_EVENTCHKINF(EVENTCHKINF_CLEARED_FOREST_TEMPLE)) {
+                SET_EVENTCHKINF(EVENTCHKINF_CLEARED_FOREST_TEMPLE);
                 Item_Give(play, ITEM_MEDALLION_FOREST);
                 play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
                 gSaveContext.nextCutsceneIndex = 0;
@@ -717,8 +717,8 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneId == SCENE_FIRE_TEMPLE_BOSS) {
-            if (!GET_EVENTCHKINF(EVENTCHKINF_49)) {
-                SET_EVENTCHKINF(EVENTCHKINF_49);
+            if (!GET_EVENTCHKINF(EVENTCHKINF_CLEARED_FIRE_TEMPLE)) {
+                SET_EVENTCHKINF(EVENTCHKINF_CLEARED_FIRE_TEMPLE);
                 Item_Give(play, ITEM_MEDALLION_FIRE);
                 play->nextEntranceIndex = ENTR_KAKARIKO_VILLAGE_0;
                 gSaveContext.nextCutsceneIndex = 0xFFF3;
@@ -731,8 +731,8 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) {
                 gSaveContext.nextCutsceneIndex = 0;
             }
         } else if (play->sceneId == SCENE_WATER_TEMPLE_BOSS) {
-            if (!GET_EVENTCHKINF(EVENTCHKINF_4A)) {
-                SET_EVENTCHKINF(EVENTCHKINF_4A);
+            if (!GET_EVENTCHKINF(EVENTCHKINF_CLEARED_WATER_TEMPLE)) {
+                SET_EVENTCHKINF(EVENTCHKINF_CLEARED_WATER_TEMPLE);
                 Item_Give(play, ITEM_MEDALLION_WATER);
                 play->nextEntranceIndex = ENTR_CHAMBER_OF_THE_SAGES_0;
                 gSaveContext.nextCutsceneIndex = 0;
diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/src/overlays/actors/ovl_En_Changer/z_en_changer.c
index 9850651834f..ea3c6a216b7 100644
--- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c
+++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c
@@ -97,7 +97,7 @@ void EnChanger_Init(Actor* thisx, PlayState* play2) {
     minigameRoomNum *= 2;
     // Spawn Heart Piece in chest (or Purple Rupee if won Heart Piece)
     if (play->roomCtx.curRoom.num >= 6) {
-        rewardChestParams = GET_ITEMGETINF(ITEMGETINF_1B) ? 0x4EA0 : 0x4EC0;
+        rewardChestParams = GET_ITEMGETINF(ITEMGETINF_FOUND_PURPLE_RUPEE) ? 0x4EA0 : 0x4EC0;
         rewardChestParams = sTreasureFlags[5] | rewardChestParams;
         this->finalChest = (EnBox*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_BOX, 20.0f, 20.0f,
                                                       -2500.0f, 0, 0x7FFF, 0, rewardChestParams);
@@ -107,8 +107,8 @@ void EnChanger_Init(Actor* thisx, PlayState* play2) {
                 Actor_Kill(&this->actor);
                 return;
             } else {
-                rewardParams = (GET_ITEMGETINF(ITEMGETINF_1B) ? ITEM_ETC_RUPEE_PURPLE_CHEST_GAME
-                                                              : ITEM_ETC_HEART_PIECE_CHEST_GAME) &
+                rewardParams = (GET_ITEMGETINF(ITEMGETINF_FOUND_PURPLE_RUPEE) ? ITEM_ETC_RUPEE_PURPLE_CHEST_GAME
+                                                                              : ITEM_ETC_HEART_PIECE_CHEST_GAME) &
                                0xFF;
                 Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_ETCETERA, 20.0f, 20.0f, -2500.0f, 0, 0, 0,
                             ((sTreasureFlags[5] & 0x1F) << 8) + rewardParams);
@@ -273,8 +273,8 @@ void EnChanger_OpenChests(EnChanger* this, PlayState* play) {
 
 void EnChanger_SetHeartPieceFlag(EnChanger* this, PlayState* play) {
     if (this->finalChest->unk_1F4 != 0) {
-        if (!GET_ITEMGETINF(ITEMGETINF_1B)) {
-            SET_ITEMGETINF(ITEMGETINF_1B);
+        if (!GET_ITEMGETINF(ITEMGETINF_FOUND_PURPLE_RUPEE)) {
+            SET_ITEMGETINF(ITEMGETINF_FOUND_PURPLE_RUPEE);
         }
         Actor_Kill(&this->actor);
     }
diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c
index 807abac5ec6..53ddb045658 100644
--- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c
+++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c
@@ -186,7 +186,7 @@ s32 EnCs_GetTalkState(EnCs* this, PlayState* play) {
                 if (this->actor.textId == 0x2026) {
                     Player_UnsetMask(play);
                     Item_Give(play, ITEM_SOLD_OUT);
-                    SET_ITEMGETINF(ITEMGETINF_3A);
+                    SET_ITEMGETINF(ITEMGETINF_SOLD_SPOOKY_MASK);
                     Rupees_ChangeBy(30);
                     this->actor.textId = 0x2027;
                     talkState = 2;
@@ -210,7 +210,7 @@ s32 EnCs_GetTextId(EnCs* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
     s32 textId = MaskReaction_GetTextId(play, MASK_REACTION_SET_GRAVEYARD_KID);
 
-    if (GET_ITEMGETINF(ITEMGETINF_3A)) {
+    if (GET_ITEMGETINF(ITEMGETINF_SOLD_SPOOKY_MASK)) {
         if (textId == 0) {
             textId = 0x2028;
         }
@@ -333,14 +333,14 @@ void EnCs_Walk(EnCs* this, PlayState* play) {
         animIndex = this->currentAnimIndex;
 
         if (this->talkState == 0) {
-            if (GET_ITEMGETINF(ITEMGETINF_3A)) {
+            if (GET_ITEMGETINF(ITEMGETINF_SOLD_SPOOKY_MASK)) {
                 rnd = Rand_ZeroOne() * 10.0f;
             } else {
                 rnd = Rand_ZeroOne() * 5.0f;
             }
 
             if (rnd == 0) {
-                if (GET_ITEMGETINF(ITEMGETINF_3A)) {
+                if (GET_ITEMGETINF(ITEMGETINF_SOLD_SPOOKY_MASK)) {
                     animIndex = 2.0f * Rand_ZeroOne();
                     animIndex = (animIndex == 0) ? ENCS_ANIM_2 : ENCS_ANIM_1;
                 } else {
@@ -469,7 +469,7 @@ void EnCs_Draw(Actor* thisx, PlayState* play) {
     SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
                           EnCs_OverrideLimbDraw, EnCs_PostLimbDraw, &this->actor);
 
-    if (GET_ITEMGETINF(ITEMGETINF_3A)) {
+    if (GET_ITEMGETINF(ITEMGETINF_SOLD_SPOOKY_MASK)) {
         s32 linkChildObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_LINK_CHILD);
 
         // Handle attaching the Spooky Mask to the boy's face
diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
index 972f06b6f70..129659d82eb 100644
--- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
+++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
@@ -47,7 +47,7 @@ void EnEncount2_Init(Actor* thisx, PlayState* play) {
         // "☆☆☆☆☆ Death Mountain Encount2 set ☆☆☆☆☆"
         PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ デスマウンテンエンカウント２セットされました ☆☆☆☆☆ %d\n" VT_RST,
                this->actor.params);
-        if (LINK_IS_ADULT && GET_EVENTCHKINF(EVENTCHKINF_49)) { // flag for having used fire temple blue warp
+        if (LINK_IS_ADULT && GET_EVENTCHKINF(EVENTCHKINF_CLEARED_FIRE_TEMPLE)) {
             Actor_Kill(thisx);
         }
     } else {
diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c
index 0e911a1e246..041f2348e8f 100644
--- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c
+++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c
@@ -150,7 +150,7 @@ void EnFu_WaitChild(EnFu* this, PlayState* play) {
 void func_80A1DB60(EnFu* this, PlayState* play) {
     if (play->csCtx.state == CS_STATE_IDLE) {
         this->actionFunc = EnFu_WaitAdult;
-        SET_EVENTCHKINF(EVENTCHKINF_5B);
+        SET_EVENTCHKINF(EVENTCHKINF_PLAYED_SONG_STORMS_AT_WINDMILL);
         play->msgCtx.ocarinaMode = OCARINA_MODE_04;
     }
 }
@@ -176,7 +176,7 @@ void func_80A1DBD4(EnFu* this, PlayState* play) {
         gSaveContext.cutsceneTrigger = 1;
         Item_Give(play, ITEM_SONG_STORMS);
         play->msgCtx.ocarinaMode = OCARINA_MODE_00;
-        SET_EVENTCHKINF(EVENTCHKINF_65);
+        SET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_STORMS);
     } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_02) {
         player->stateFlags2 &= ~PLAYER_STATE2_24;
         this->actionFunc = EnFu_WaitAdult;
@@ -215,7 +215,7 @@ void EnFu_WaitAdult(EnFu* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
-    if (GET_EVENTCHKINF(EVENTCHKINF_5B)) {
+    if (GET_EVENTCHKINF(EVENTCHKINF_PLAYED_SONG_STORMS_AT_WINDMILL)) {
         func_80A1D94C(this, play, 0x508E, func_80A1DBA0);
     } else if (player->stateFlags2 & PLAYER_STATE2_24) {
         this->actor.textId = 0x5035;
diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
index c02438a6e9f..bce1d960461 100644
--- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
+++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
@@ -904,27 +904,27 @@ void EnGirlA_SetItemDescription(PlayState* play, EnGirlA* this) {
 
         switch (this->actor.params) {
             case SI_KEATON_MASK:
-                if (GET_ITEMGETINF(ITEMGETINF_38)) {
+                if (GET_ITEMGETINF(ITEMGETINF_SOLD_KEATON_MASK)) {
                     isMaskFreeToBorrow = true;
                 }
                 break;
             case SI_SPOOKY_MASK:
-                if (GET_ITEMGETINF(ITEMGETINF_3A)) {
+                if (GET_ITEMGETINF(ITEMGETINF_SOLD_SPOOKY_MASK)) {
                     isMaskFreeToBorrow = true;
                 }
                 break;
             case SI_SKULL_MASK:
-                if (GET_ITEMGETINF(ITEMGETINF_39)) {
+                if (GET_ITEMGETINF(ITEMGETINF_SOLD_SKULL_MASK)) {
                     isMaskFreeToBorrow = true;
                 }
                 break;
             case SI_BUNNY_HOOD:
-                if (GET_ITEMGETINF(ITEMGETINF_3B)) {
+                if (GET_ITEMGETINF(ITEMGETINF_SOLD_BUNNY_HOOD)) {
                     isMaskFreeToBorrow = true;
                 }
                 break;
             case SI_MASK_OF_TRUTH:
-                if (GET_ITEMGETINF(ITEMGETINF_3B)) {
+                if (GET_ITEMGETINF(ITEMGETINF_SOLD_BUNNY_HOOD)) {
                     isMaskFreeToBorrow = true;
                 }
                 break;
@@ -986,7 +986,7 @@ void EnGirlA_WaitForObject(EnGirlA* this, PlayState* play) {
         this->actor.objectSlot = this->requiredObjectSlot;
         switch (this->actor.params) {
             case SI_KEATON_MASK:
-                if (GET_ITEMGETINF(ITEMGETINF_38)) {
+                if (GET_ITEMGETINF(ITEMGETINF_SOLD_KEATON_MASK)) {
                     this->actor.textId = 0x70B6;
                 } else {
                     this->actor.textId = itemEntry->itemDescTextId;
@@ -994,7 +994,7 @@ void EnGirlA_WaitForObject(EnGirlA* this, PlayState* play) {
                 this->itemBuyPromptTextId = itemEntry->itemBuyPromptTextId;
                 break;
             case SI_SPOOKY_MASK:
-                if (GET_ITEMGETINF(ITEMGETINF_3A)) {
+                if (GET_ITEMGETINF(ITEMGETINF_SOLD_SPOOKY_MASK)) {
                     this->actor.textId = 0x70B5;
                 } else {
                     this->actor.textId = itemEntry->itemDescTextId;
@@ -1002,7 +1002,7 @@ void EnGirlA_WaitForObject(EnGirlA* this, PlayState* play) {
                 this->itemBuyPromptTextId = itemEntry->itemBuyPromptTextId;
                 break;
             case SI_SKULL_MASK:
-                if (GET_ITEMGETINF(ITEMGETINF_39)) {
+                if (GET_ITEMGETINF(ITEMGETINF_SOLD_SKULL_MASK)) {
                     this->actor.textId = 0x70B4;
                 } else {
                     this->actor.textId = itemEntry->itemDescTextId;
@@ -1010,7 +1010,7 @@ void EnGirlA_WaitForObject(EnGirlA* this, PlayState* play) {
                 this->itemBuyPromptTextId = itemEntry->itemBuyPromptTextId;
                 break;
             case SI_BUNNY_HOOD:
-                if (GET_ITEMGETINF(ITEMGETINF_3B)) {
+                if (GET_ITEMGETINF(ITEMGETINF_SOLD_BUNNY_HOOD)) {
                     this->actor.textId = 0x70B7;
                 } else {
                     this->actor.textId = itemEntry->itemDescTextId;
@@ -1018,7 +1018,7 @@ void EnGirlA_WaitForObject(EnGirlA* this, PlayState* play) {
                 this->itemBuyPromptTextId = itemEntry->itemBuyPromptTextId;
                 break;
             case SI_MASK_OF_TRUTH:
-                if (GET_ITEMGETINF(ITEMGETINF_3B)) {
+                if (GET_ITEMGETINF(ITEMGETINF_SOLD_BUNNY_HOOD)) {
                     this->actor.textId = 0x70BB;
                     this->itemBuyPromptTextId = itemEntry->itemBuyPromptTextId;
                 } else {
diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c
index 78376c98134..d2f7d34bb2a 100644
--- a/src/overlays/actors/ovl_En_Go/z_en_go.c
+++ b/src/overlays/actors/ovl_En_Go/z_en_go.c
@@ -110,20 +110,21 @@ u16 EnGo_GetTextID(PlayState* play, Actor* thisx) {
             }
         case 0x00:
             if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) {
-                if (GET_INFTABLE(INFTABLE_10F)) {
+                if (GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3041)) {
                     return 0x3042;
                 } else {
                     return 0x3041;
                 }
-            } else if (CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON) || GET_INFTABLE(INFTABLE_10D)) {
-                if (GET_INFTABLE(INFTABLE_10E)) {
+            } else if (CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON) ||
+                       GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3036)) {
+                if (GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3037)) {
                     return 0x3038;
                 } else {
                     return 0x3037;
                 }
             } else {
-                if (GET_INFTABLE(INFTABLE_109)) {
-                    if (GET_INFTABLE(INFTABLE_10A)) {
+                if (GET_INFTABLE(INFTABLE_GOT_GORON_TUNIC)) {
+                    if (GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3032)) {
                         return 0x3033;
                     } else {
                         return 0x3032;
@@ -141,9 +142,9 @@ u16 EnGo_GetTextID(PlayState* play, Actor* thisx) {
         case 0x20:
             if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
                 return 0x3027;
-            } else if (GET_EVENTCHKINF(EVENTCHKINF_23)) {
+            } else if (GET_EVENTCHKINF(EVENTCHKINF_DC_BOULDER_DESTROYED)) {
                 return 0x3021;
-            } else if (GET_INFTABLE(INFTABLE_E0)) {
+            } else if (GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3008)) {
                 return 0x302A;
             } else {
                 return 0x3008;
@@ -151,7 +152,7 @@ u16 EnGo_GetTextID(PlayState* play, Actor* thisx) {
         case 0x30:
             if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
                 return 0x3027;
-            } else if (GET_EVENTCHKINF(EVENTCHKINF_23)) {
+            } else if (GET_EVENTCHKINF(EVENTCHKINF_DC_BOULDER_DESTROYED)) {
                 return 0x3026;
             } else {
                 return 0x3009;
@@ -159,7 +160,7 @@ u16 EnGo_GetTextID(PlayState* play, Actor* thisx) {
         case 0x40:
             if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
                 return 0x3027;
-            } else if (GET_EVENTCHKINF(EVENTCHKINF_23)) {
+            } else if (GET_EVENTCHKINF(EVENTCHKINF_DC_BOULDER_DESTROYED)) {
                 return 0x3026;
             } else {
                 return 0x300A;
@@ -167,7 +168,7 @@ u16 EnGo_GetTextID(PlayState* play, Actor* thisx) {
         case 0x50:
             if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
                 return 0x3027;
-            } else if (GET_INFTABLE(INFTABLE_F0)) {
+            } else if (GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3014)) {
                 return 0x3015;
             } else {
                 return 0x3014;
@@ -175,7 +176,7 @@ u16 EnGo_GetTextID(PlayState* play, Actor* thisx) {
         case 0x60:
             if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
                 return 0x3027;
-            } else if (GET_INFTABLE(INFTABLE_F4)) {
+            } else if (GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3016)) {
                 return 0x3017;
             } else {
                 return 0x3016;
@@ -183,7 +184,7 @@ u16 EnGo_GetTextID(PlayState* play, Actor* thisx) {
         case 0x70:
             if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
                 return 0x3027;
-            } else if (GET_INFTABLE(INFTABLE_F8)) {
+            } else if (GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3018)) {
                 return 0x3019;
             } else {
                 return 0x3018;
@@ -204,36 +205,36 @@ s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) {
         case TEXT_STATE_CLOSING:
             switch (thisx->textId) {
                 case 0x3008:
-                    SET_INFTABLE(INFTABLE_E0);
+                    SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3008);
                     talkState = NPC_TALK_STATE_IDLE;
                     break;
                 case 0x300B:
-                    SET_INFTABLE(INFTABLE_EB);
+                    SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_300B);
                     talkState = NPC_TALK_STATE_IDLE;
                     break;
                 case 0x3014:
-                    SET_INFTABLE(INFTABLE_F0);
+                    SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3014);
                     talkState = NPC_TALK_STATE_IDLE;
                     break;
                 case 0x3016:
-                    SET_INFTABLE(INFTABLE_F4);
+                    SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3016);
                     talkState = NPC_TALK_STATE_IDLE;
                     break;
                 case 0x3018:
-                    SET_INFTABLE(INFTABLE_F8);
+                    SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3018);
                     talkState = NPC_TALK_STATE_IDLE;
                     break;
                 case 0x3036:
                     Actor_OfferGetItem(thisx, play, GI_TUNIC_GORON, xzRange, yRange);
-                    SET_INFTABLE(INFTABLE_10D); // EnGo exclusive flag
+                    SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3036);
                     talkState = NPC_TALK_STATE_ACTION;
                     break;
                 case 0x3037:
-                    SET_INFTABLE(INFTABLE_10E);
+                    SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3037);
                     talkState = NPC_TALK_STATE_IDLE;
                     break;
                 case 0x3041:
-                    SET_INFTABLE(INFTABLE_10F);
+                    SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3041);
                     talkState = NPC_TALK_STATE_IDLE;
                     break;
                 case 0x3059:
@@ -258,7 +259,7 @@ s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) {
                 switch (thisx->textId) {
                     case 0x300A:
                         if (play->msgCtx.choiceIndex == 0) {
-                            if (CUR_UPG_VALUE(UPG_STRENGTH) != 0 || GET_INFTABLE(INFTABLE_EB)) {
+                            if (CUR_UPG_VALUE(UPG_STRENGTH) != 0 || GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_300B)) {
                                 thisx->textId = 0x300B;
                             } else {
                                 thisx->textId = 0x300C;
@@ -271,12 +272,12 @@ s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) {
                         break;
                     case 0x3034:
                         if (play->msgCtx.choiceIndex == 0) {
-                            if (GET_INFTABLE(INFTABLE_10B)) {
+                            if (GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3035)) {
                                 thisx->textId = 0x3033;
                             } else {
                                 thisx->textId = 0x3035;
                             }
-                        } else if (GET_INFTABLE(INFTABLE_10B)) {
+                        } else if (GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3035)) {
                             thisx->textId = 0x3036;
                         } else {
                             thisx->textId = 0x3033;
@@ -293,7 +294,7 @@ s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) {
                             Message_ContinueTextbox(play, thisx->textId);
                             talkState = NPC_TALK_STATE_TALKING;
                         }
-                        SET_INFTABLE(INFTABLE_B4);
+                        SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3054);
                         break;
                 }
             }
@@ -302,7 +303,7 @@ s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) {
             if (Message_ShouldAdvance(play)) {
                 switch (thisx->textId) {
                     case 0x3035:
-                        SET_INFTABLE(INFTABLE_10B);
+                        SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3035);
                         FALLTHROUGH;
                     case 0x3032:
                     case 0x3033:
@@ -598,7 +599,7 @@ void func_80A3F908(EnGo* this, PlayState* play) {
         if ((PARAMS_GET_NOSHIFT(this->actor.params, 4, 4) == 0x90) && (dialogStarted == true)) {
             if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_BROKEN_GORONS_SWORD) {
                 if (func_8002F368(play) == EXCH_ITEM_BROKEN_GORONS_SWORD) {
-                    if (GET_INFTABLE(INFTABLE_B4)) {
+                    if (GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3054)) {
                         this->actor.textId = 0x3055;
                     } else {
                         this->actor.textId = 0x3054;
@@ -666,7 +667,7 @@ void EnGo_Init(Actor* thisx, PlayState* play) {
             EnGo_SetupAction(this, EnGo_FireGenericActionFunc);
             break;
         case 0x40:
-            if (GET_INFTABLE(INFTABLE_EB)) {
+            if (GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_300B)) {
                 EnGo_SetMovedPos(this, play);
             }
             Actor_SetScale(&this->actor, 0.015f);
@@ -754,7 +755,7 @@ void EnGo_GoronLinkRolling(EnGo* this, PlayState* play) {
         (this->unk_218 == 0)) {
         this->actor.speed = 0.0f;
         EnGo_SetupAction(this, func_80A4008C);
-        SET_INFTABLE(INFTABLE_109);
+        SET_INFTABLE(INFTABLE_GOT_GORON_TUNIC);
     }
 
     this->actor.shape.rot = this->actor.world.rot;
@@ -851,7 +852,8 @@ void func_80A405CC(EnGo* this, PlayState* play) {
         this->skelAnime.curFrame = lastFrame;
         this->skelAnime.playSpeed = 0.0f;
         this->unk_212 = Rand_S16Offset(30, 30);
-        if ((PARAMS_GET_NOSHIFT(this->actor.params, 4, 4) == 0x40) && !GET_INFTABLE(INFTABLE_EB)) {
+        if ((PARAMS_GET_NOSHIFT(this->actor.params, 4, 4) == 0x40) &&
+            !GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_300B)) {
             EnGo_SetupAction(this, func_80A40B1C);
         } else {
             EnGo_SetupAction(this, EnGo_BiggoronActionFunc);
@@ -941,7 +943,7 @@ void func_80A40A54(EnGo* this, PlayState* play) {
 }
 
 void func_80A40B1C(EnGo* this, PlayState* play) {
-    if (GET_INFTABLE(INFTABLE_EB)) {
+    if (GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_300B)) {
         EnGo_ChangeAnim(this, ENGO_ANIM_3);
         EnGo_SetupAction(this, func_80A40A54);
     } else {
diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c
index 397c9e7cc9b..a4126e37660 100644
--- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c
+++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c
@@ -8,31 +8,6 @@
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_4 | ACTOR_FLAG_5)
 
 /*
-FLAGS
-
-EVENTCHKINF_23 - DC entrance boulder blown up as child
-
-InfTable
-
-INFTABLE_B4
-INFTABLE_E0 - Talked to DMT Goron at DC entrance (Before DC is opened as child)
-INFTABLE_E3 - Talked to GC Goron in bottom level stairwell
-INFTABLE_E6 - Talked to GC Goron at LW entrance (Before LW shortcut is opened)
-INFTABLE_EB - Talked to DMT Goron at Bomb Flower with goron bracelet
-INFTABLE_F0 - Talked to Goron at GC Entrance (Before goron ruby is obtained)
-INFTABLE_F4 - Talked to Goron at GC Island (Before goron ruby is obtained)
-INFTABLE_F8 - (not on cloud modding) Talked to GC Goron outside Darunias door (after opening door,
-before getting goron bracelet)
-INFTABLE_109 - Obtained Fire Tunic from Goron Link
-INFTABLE_10A - (not on cloud modding)
-INFTABLE_10B - Spoke to Goron Link About Volvagia
-INFTABLE_10C - Stopped Goron Link's Rolling
-INFTABLE_10D - EnGo Exclusive
-INFTABLE_10E - Spoke to Goron Link
-INFTABLE_10F - (not on cloud modding)
-
-INFTABLE_11E - Bomb bag upgrade obtained from rolling Goron
-
 Gorons only move when this->interactInfo.talkState == NPC_TALK_STATE_IDLE
 */
 
@@ -310,7 +285,7 @@ u16 EnGo2_GoronFireGenericGetTextId(EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronCityRollingBig(PlayState* play, EnGo2* this) {
-    if (GET_INFTABLE(INFTABLE_11E)) {
+    if (GET_INFTABLE(INFTABLE_UPGRADED_BOMB_BAG)) {
         return 0x3013;
     } else if (CUR_CAPACITY(UPG_BOMB_BAG) >= 20 && this->waypoint > 7 && this->waypoint < 12) {
         return 0x3012;
@@ -332,7 +307,7 @@ s16 EnGo2_UpdateTalkStateGoronCityRollingBig(PlayState* play, EnGo2* this) {
                     bombBagUpgrade = CUR_CAPACITY(UPG_BOMB_BAG) == 30 ? GI_BOMB_BAG_40 : GI_BOMB_BAG_30;
                     EnGo2_GetItem(this, play, bombBagUpgrade);
                     Message_CloseTextbox(play);
-                    SET_INFTABLE(INFTABLE_11E);
+                    SET_INFTABLE(INFTABLE_UPGRADED_BOMB_BAG);
                     return NPC_TALK_STATE_ACTION;
                 } else {
                     return NPC_TALK_STATE_ACTION;
@@ -352,8 +327,8 @@ u16 EnGo2_GetTextIdGoronDmtBombFlower(PlayState* play, EnGo2* this) {
 s16 EnGo2_UpdateTalkStateGoronDmtBombFlower(PlayState* play, EnGo2* this) {
     switch (Message_GetState(&play->msgCtx)) {
         case TEXT_STATE_CLOSING:
-            if ((this->actor.textId == 0x300B) && !GET_INFTABLE(INFTABLE_EB)) {
-                SET_INFTABLE(INFTABLE_EB);
+            if ((this->actor.textId == 0x300B) && !GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_300B)) {
+                SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_300B);
                 return NPC_TALK_STATE_ACTION;
             } else {
                 return NPC_TALK_STATE_IDLE;
@@ -381,7 +356,7 @@ u16 EnGo2_GetTextIdGoronDmtRollingSmall(PlayState* play, EnGo2* this) {
     if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
         return 0x3027;
     } else {
-        return GET_EVENTCHKINF(EVENTCHKINF_23) ? 0x3026 : 0x3009;
+        return GET_EVENTCHKINF(EVENTCHKINF_DC_BOULDER_DESTROYED) ? 0x3026 : 0x3009;
     }
 }
 
@@ -399,14 +374,16 @@ u16 EnGo2_GetTextIdGoronDmtDcEntrance(PlayState* play, EnGo2* this) {
     } else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
         return 0x3027;
     } else {
-        return GET_EVENTCHKINF(EVENTCHKINF_23) ? 0x3021 : GET_INFTABLE(INFTABLE_E0) ? 0x302A : 0x3008;
+        return GET_EVENTCHKINF(EVENTCHKINF_DC_BOULDER_DESTROYED) ? 0x3021
+               : GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3008) ? 0x302A
+                                                                 : 0x3008;
     }
 }
 
 s16 EnGo2_UpdateTalkStateGoronDmtDcEntrance(PlayState* play, EnGo2* this) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
         if (this->actor.textId == 0x3008) {
-            SET_INFTABLE(INFTABLE_E0);
+            SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3008);
         }
         return NPC_TALK_STATE_IDLE;
     } else {
@@ -420,14 +397,14 @@ u16 EnGo2_GetTextIdGoronCityEntrance(PlayState* play, EnGo2* this) {
     } else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
         return 0x3027;
     } else {
-        return GET_INFTABLE(INFTABLE_F0) ? 0x3015 : 0x3014;
+        return GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3014) ? 0x3015 : 0x3014;
     }
 }
 
 s16 EnGo2_UpdateTalkStateGoronCityEntrance(PlayState* play, EnGo2* this) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
         if (this->actor.textId == 0x3014) {
-            SET_INFTABLE(INFTABLE_F0);
+            SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3014);
         }
         return NPC_TALK_STATE_IDLE;
     } else {
@@ -441,14 +418,14 @@ u16 EnGo2_GetTextIdGoronCityIsland(PlayState* play, EnGo2* this) {
     } else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
         return 0x3067;
     } else {
-        return GET_INFTABLE(INFTABLE_F4) ? 0x3017 : 0x3016;
+        return GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3016) ? 0x3017 : 0x3016;
     }
 }
 
 s16 EnGo2_UpdateTalkStateGoronCityIsland(PlayState* play, EnGo2* this) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
         if (this->actor.textId == 0x3016) {
-            SET_INFTABLE(INFTABLE_F4);
+            SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3016);
         }
         return NPC_TALK_STATE_IDLE;
     } else {
@@ -462,17 +439,17 @@ u16 EnGo2_GetTextIdGoronCityLowestFloor(PlayState* play, EnGo2* this) {
     } else if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
         return 0x3027;
     } else {
-        return CUR_UPG_VALUE(UPG_STRENGTH) != 0 ? 0x302C
-               : !Flags_GetSwitch(play, 0x1B)   ? 0x3017
-               : GET_INFTABLE(INFTABLE_F8)      ? 0x3019
-                                                : 0x3018;
+        return CUR_UPG_VALUE(UPG_STRENGTH) != 0                  ? 0x302C
+               : !Flags_GetSwitch(play, 0x1B)                    ? 0x3017
+               : GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3018) ? 0x3019
+                                                                 : 0x3018;
     }
 }
 
 s16 EnGo2_UpdateTalkStateGoronCityLowestFloor(PlayState* play, EnGo2* this) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
         if (this->actor.textId == 0x3018) {
-            SET_INFTABLE(INFTABLE_F8);
+            SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3018);
         }
         return NPC_TALK_STATE_IDLE;
     } else {
@@ -482,13 +459,13 @@ s16 EnGo2_UpdateTalkStateGoronCityLowestFloor(PlayState* play, EnGo2* this) {
 
 u16 EnGo2_GetTextIdGoronCityLink(PlayState* play, EnGo2* this) {
     if (CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE)) {
-        return GET_INFTABLE(INFTABLE_10F) ? 0x3042 : 0x3041;
+        return GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3041) ? 0x3042 : 0x3041;
     } else if (CHECK_OWNED_EQUIP(EQUIP_TYPE_TUNIC, EQUIP_INV_TUNIC_GORON)) {
-        return GET_INFTABLE(INFTABLE_10E) ? 0x3038 : 0x3037;
-    } else if (GET_INFTABLE(INFTABLE_10C)) {
+        return GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3037) ? 0x3038 : 0x3037;
+    } else if (GET_INFTABLE(INFTABLE_STOPPED_GORON_LINK)) {
         this->unk_20C = 0;
         this->dialogState = TEXT_STATE_NONE;
-        return GET_INFTABLE(INFTABLE_10A) ? 0x3033 : 0x3032;
+        return GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3032) ? 0x3033 : 0x3032;
     } else {
         return 0x3030;
     }
@@ -503,7 +480,7 @@ s16 EnGo2_UpdateTalkStateGoronCityLink(PlayState* play, EnGo2* this) {
                     this->actionFunc = EnGo2_SetupGetItem;
                     return NPC_TALK_STATE_ACTION;
                 case 0x3037:
-                    SET_INFTABLE(INFTABLE_10E);
+                    SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3037);
                     FALLTHROUGH;
                 default:
                     return NPC_TALK_STATE_IDLE;
@@ -512,12 +489,12 @@ s16 EnGo2_UpdateTalkStateGoronCityLink(PlayState* play, EnGo2* this) {
             if (Message_ShouldAdvance(play)) {
                 if (this->actor.textId == 0x3034) {
                     if (play->msgCtx.choiceIndex == 0) {
-                        this->actor.textId = GET_INFTABLE(INFTABLE_10B) ? 0x3033 : 0x3035;
+                        this->actor.textId = GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3035) ? 0x3033 : 0x3035;
                         if (this->actor.textId == 0x3035) {
                             Audio_StopSfxById(NA_SE_EN_GOLON_CRY);
                         }
                     } else {
-                        this->actor.textId = GET_INFTABLE(INFTABLE_10B) ? 0x3036 : 0x3033;
+                        this->actor.textId = GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3035) ? 0x3036 : 0x3033;
                         if (this->actor.textId == 0x3036) {
                             Audio_StopSfxById(NA_SE_EN_GOLON_CRY);
                         }
@@ -533,7 +510,7 @@ s16 EnGo2_UpdateTalkStateGoronCityLink(PlayState* play, EnGo2* this) {
             if (Message_ShouldAdvance(play)) {
                 switch (this->actor.textId) {
                     case 0x3035:
-                        SET_INFTABLE(INFTABLE_10B);
+                        SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3035);
                         FALLTHROUGH;
                     case 0x3032:
                     case 0x3033:
@@ -662,13 +639,13 @@ s16 EnGo2_UpdateTalkStateGoronFireGeneric(PlayState* play, EnGo2* this) {
 }
 
 u16 EnGo2_GetTextIdGoronCityStairwell(PlayState* play, EnGo2* this) {
-    return !LINK_IS_ADULT ? GET_INFTABLE(INFTABLE_E3) ? 0x3022 : 0x300E : 0x3043;
+    return !LINK_IS_ADULT ? GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_300E) ? 0x3022 : 0x300E : 0x3043;
 }
 
 s16 EnGo2_UpdateTalkStateGoronCityStairwell(PlayState* play, EnGo2* this) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
         if (this->actor.textId == 0x300E) {
-            SET_INFTABLE(INFTABLE_E3);
+            SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_300E);
         }
         return NPC_TALK_STATE_IDLE;
     } else {
@@ -694,7 +671,7 @@ u16 EnGo2_GetTextIdGoronCityLostWoods(PlayState* play, EnGo2* this) {
         if (Flags_GetSwitch(play, 0x1C)) {
             return 0x302F;
         } else {
-            return GET_INFTABLE(INFTABLE_E6) ? 0x3025 : 0x3024;
+            return GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3024) ? 0x3025 : 0x3024;
         }
     } else {
         return 0x3043;
@@ -704,7 +681,7 @@ u16 EnGo2_GetTextIdGoronCityLostWoods(PlayState* play, EnGo2* this) {
 s16 EnGo2_UpdateTalkStateGoronCityLostWoods(PlayState* play, EnGo2* this) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
         if (this->actor.textId == 0x3024) {
-            SET_INFTABLE(INFTABLE_E6);
+            SET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3024);
         }
         return NPC_TALK_STATE_IDLE;
     } else {
@@ -1064,7 +1041,7 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) {
 
         } else if (INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_BROKEN_GORONS_SWORD) {
             if (func_8002F368(play) == EXCH_ITEM_BROKEN_GORONS_SWORD) {
-                if (GET_INFTABLE(INFTABLE_B4)) {
+                if (GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_3054)) {
                     textId = 0x3055;
                 } else {
                     textId = 0x3054;
@@ -1345,7 +1322,7 @@ void EnGo2_SetupRolling(EnGo2* this, PlayState* play) {
     if (PARAMS_GET_S(this->actor.params, 0, 5) == GORON_CITY_ROLLING_BIG ||
         PARAMS_GET_S(this->actor.params, 0, 5) == GORON_CITY_LINK) {
         this->collider.elem.acElemFlags = ACELEM_ON;
-        this->actor.speed = GET_INFTABLE(INFTABLE_11E) ? 6.0f : 3.6000001f;
+        this->actor.speed = GET_INFTABLE(INFTABLE_UPGRADED_BOMB_BAG) ? 6.0f : 3.6000001f;
     } else {
         this->actor.speed = 6.0f;
     }
@@ -1571,7 +1548,7 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
             EnGo2_GetItemAnimation(this, play);
             break;
         case GORON_CITY_LINK:
-            if (GET_INFTABLE(INFTABLE_109)) {
+            if (GET_INFTABLE(INFTABLE_GOT_GORON_TUNIC)) {
                 Path_CopyLastPoint(this->path, &this->actor.world.pos);
                 this->actor.home.pos = this->actor.world.pos;
                 if (!CHECK_QUEST_ITEM(QUEST_MEDALLION_FIRE) &&
@@ -1582,7 +1559,7 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
                 }
             } else {
 #if OOT_VERSION >= PAL_1_1
-                CLEAR_INFTABLE(INFTABLE_10C);
+                CLEAR_INFTABLE(INFTABLE_STOPPED_GORON_LINK);
 #endif
                 this->collider.dim.height = (D_80A4816C[PARAMS_GET_S(this->actor.params, 0, 5)].height * 0.6f);
                 EnGo2_SetupRolling(this, play);
@@ -1614,7 +1591,7 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
             this->actionFunc = EnGo2_CurledUp;
             break;
         case GORON_DMT_BOMB_FLOWER:
-            if (GET_INFTABLE(INFTABLE_EB)) {
+            if (GET_INFTABLE(INFTABLE_TALKED_TO_GORON_MSG_300B)) {
                 Path_CopyLastPoint(this->path, &this->actor.world.pos);
                 this->actor.home.pos = this->actor.world.pos;
             }
@@ -1813,7 +1790,7 @@ void EnGo2_SetGetItem(EnGo2* this, PlayState* play) {
                 EnGo2_GetItemAnimation(this, play);
                 return;
             case GI_TUNIC_GORON:
-                SET_INFTABLE(INFTABLE_109);
+                SET_INFTABLE(INFTABLE_GOT_GORON_TUNIC);
                 EnGo2_GetItemAnimation(this, play);
                 return;
             case GI_SWORD_BIGGORON:
@@ -1897,7 +1874,7 @@ void EnGo2_GoronLinkStopRolling(EnGo2* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) != TEXT_STATE_CLOSING) {
         player->actor.freezeTimer = 10;
     } else {
-        SET_INFTABLE(INFTABLE_10C);
+        SET_INFTABLE(INFTABLE_STOPPED_GORON_LINK);
         this->trackingMode = NPC_TRACKING_NONE;
         this->unk_211 = false;
         this->isAwake = false;
diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
index b1ee0997219..c10040eb970 100644
--- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
+++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
@@ -542,7 +542,7 @@ void func_80A540C0(EnHeishi2* this, PlayState* play) {
                 Message_ContinueTextbox(play, this->actor.textId);
                 Player_UnsetMask(play);
                 SET_INFTABLE(INFTABLE_77);
-                SET_ITEMGETINF(ITEMGETINF_38);
+                SET_ITEMGETINF(ITEMGETINF_SOLD_KEATON_MASK);
                 Item_Give(play, ITEM_SOLD_OUT);
                 if (this->unk_30A != 0) {
                     this->unk_30A = 2;
diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c
index 999e97cd246..d4b7d63d36d 100644
--- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c
+++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c
@@ -96,7 +96,7 @@ void EnJj_Init(Actor* thisx, PlayState* play2) {
             this->extraBlinkCounter = 0;
             this->extraBlinkTotal = 0;
 
-            if (GET_EVENTCHKINF(EVENTCHKINF_3A)) { // Fish given
+            if (GET_EVENTCHKINF(EVENTCHKINF_JABUJABU_FISH_GIVEN)) {
                 EnJj_SetupAction(this, EnJj_WaitToOpenMouth);
             } else {
                 EnJj_SetupAction(this, EnJj_WaitForFish);
@@ -218,7 +218,7 @@ void EnJj_BeginCutscene(EnJj* this, PlayState* play) {
         gSaveContext.cutsceneTrigger = 1;
         DynaPoly_DisableCollision(play, &play->colCtx.dyna, bodyCollisionActor->bgId);
         Camera_SetFinishedFlag(GET_ACTIVE_CAM(play));
-        SET_EVENTCHKINF(EVENTCHKINF_3A);
+        SET_EVENTCHKINF(EVENTCHKINF_JABUJABU_FISH_GIVEN);
         Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
     }
 }
diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c
index 2fb0b859772..41ff4950f7b 100644
--- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c
+++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c
@@ -309,7 +309,7 @@ u16 EnKo_GetTextIdChild(PlayState* play, Actor* thisx) {
     EnKo* this = (EnKo*)thisx;
     switch (ENKO_TYPE) {
         case ENKO_TYPE_CHILD_FADO:
-            if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
                 return 0x10DA;
             }
             if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) {
@@ -317,7 +317,7 @@ u16 EnKo_GetTextIdChild(PlayState* play, Actor* thisx) {
             }
             return GET_INFTABLE(INFTABLE_B7) ? 0x10D8 : 0x10D7;
         case ENKO_TYPE_CHILD_0:
-            if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
                 return 0x1025;
             }
             if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) {
@@ -325,7 +325,7 @@ u16 EnKo_GetTextIdChild(PlayState* play, Actor* thisx) {
             }
             return 0x1004;
         case ENKO_TYPE_CHILD_1:
-            if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
                 return 0x1023;
             }
             if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) {
@@ -336,12 +336,12 @@ u16 EnKo_GetTextIdChild(PlayState* play, Actor* thisx) {
             }
             return 0x1005;
         case ENKO_TYPE_CHILD_2:
-            if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
                 return 0x1022;
             }
             return 0x1007;
         case ENKO_TYPE_CHILD_3:
-            if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
                 return 0x1021;
             }
             if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) {
@@ -352,7 +352,7 @@ u16 EnKo_GetTextIdChild(PlayState* play, Actor* thisx) {
             }
             return 0x1008;
         case ENKO_TYPE_CHILD_4:
-            if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
                 return 0x1097;
             }
             if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) {
@@ -363,7 +363,7 @@ u16 EnKo_GetTextIdChild(PlayState* play, Actor* thisx) {
             }
             return 0x100A;
         case ENKO_TYPE_CHILD_5:
-            if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
                 return 0x10B0;
             }
             if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) {
@@ -374,7 +374,7 @@ u16 EnKo_GetTextIdChild(PlayState* play, Actor* thisx) {
             }
             return 0x100C;
         case ENKO_TYPE_CHILD_6:
-            if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
                 return 0x10B5;
             }
             if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) {
@@ -612,7 +612,7 @@ s32 EnKo_GetForestQuestState(EnKo* this) {
 
     if (!LINK_IS_ADULT) {
         // Obtained Zelda's Letter
-        if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+        if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
             return ENKO_FQS_CHILD_SARIA;
         }
         if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) {
@@ -1094,7 +1094,7 @@ s32 EnKo_GetForestQuestState2(EnKo* this) {
         return CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST) ? ENKO_FQS_ADULT_SAVED : ENKO_FQS_ADULT_ENEMY;
     }
     if (CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) {
-        return GET_EVENTCHKINF(EVENTCHKINF_40) ? ENKO_FQS_CHILD_SARIA : ENKO_FQS_CHILD_STONE;
+        return GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER) ? ENKO_FQS_CHILD_SARIA : ENKO_FQS_CHILD_STONE;
     }
     return ENKO_FQS_CHILD_START;
 }
diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c
index ab0d130a707..0e1c49023bb 100644
--- a/src/overlays/actors/ovl_En_Md/z_en_md.c
+++ b/src/overlays/actors/ovl_En_Md/z_en_md.c
@@ -418,7 +418,7 @@ u16 EnMd_GetTextIdMidosHouse(PlayState* play, EnMd* this) {
     this->unk_208 = 0;
     this->unk_209 = TEXT_STATE_NONE;
 
-    if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+    if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
         return 0x1028;
     }
 
@@ -429,7 +429,7 @@ u16 EnMd_GetTextIdLostWoods(PlayState* play, EnMd* this) {
     this->unk_208 = 0;
     this->unk_209 = TEXT_STATE_NONE;
 
-    if (GET_EVENTCHKINF(EVENTCHKINF_48)) {
+    if (GET_EVENTCHKINF(EVENTCHKINF_CLEARED_FOREST_TEMPLE)) {
         if (GET_INFTABLE(INFTABLE_19)) {
             return 0x1071;
         }
@@ -506,13 +506,13 @@ s16 EnMd_UpdateTalkState(PlayState* play, Actor* thisx) {
 
 u8 EnMd_ShouldSpawn(EnMd* this, PlayState* play) {
     if (play->sceneId == SCENE_KOKIRI_FOREST) {
-        if (!GET_EVENTCHKINF(EVENTCHKINF_1C) && !GET_EVENTCHKINF(EVENTCHKINF_40)) {
+        if (!GET_EVENTCHKINF(EVENTCHKINF_1C) && !GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
             return 1;
         }
     }
 
     if (play->sceneId == SCENE_MIDOS_HOUSE) {
-        if (GET_EVENTCHKINF(EVENTCHKINF_1C) || GET_EVENTCHKINF(EVENTCHKINF_40)) {
+        if (GET_EVENTCHKINF(EVENTCHKINF_1C) || GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
             if (!LINK_IS_ADULT) {
                 return 1;
             }
diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c
index 1053bfb0af4..12b545dcdc2 100644
--- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c
+++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c
@@ -237,7 +237,7 @@ s32 func_80AADAA0(EnMm* this, PlayState* play) {
             if (Message_ShouldAdvance(play)) {
                 Player_UnsetMask(play);
                 Item_Give(play, ITEM_SOLD_OUT);
-                SET_ITEMGETINF(ITEMGETINF_3B);
+                SET_ITEMGETINF(ITEMGETINF_SOLD_BUNNY_HOOD);
                 Rupees_ChangeBy(500);
                 player->actor.textId = 0x202E;
                 sp1C = 2;
@@ -261,7 +261,7 @@ s32 EnMm_GetTextId(EnMm* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
     s32 textId = MaskReaction_GetTextId(play, MASK_REACTION_SET_RUNNING_MAN);
 
-    if (GET_ITEMGETINF(ITEMGETINF_3B)) {
+    if (GET_ITEMGETINF(ITEMGETINF_SOLD_BUNNY_HOOD)) {
         if (textId == 0) {
             textId = 0x204D;
         }
@@ -425,7 +425,7 @@ void func_80AAE294(EnMm* this, PlayState* play) {
             }
         }
 
-        if (GET_ITEMGETINF(ITEMGETINF_3B)) {
+        if (GET_ITEMGETINF(ITEMGETINF_SOLD_BUNNY_HOOD)) {
             this->speedXZ = 10.0f;
             this->skelAnime.playSpeed = 2.0f;
         } else {
@@ -452,7 +452,7 @@ void func_80AAE294(EnMm* this, PlayState* play) {
             }
         }
 
-        if (GET_ITEMGETINF(ITEMGETINF_3B)) {
+        if (GET_ITEMGETINF(ITEMGETINF_SOLD_BUNNY_HOOD)) {
             dustPos.x = this->actor.world.pos.x;
             dustPos.y = this->actor.world.pos.y;
             dustPos.z = this->actor.world.pos.z;
@@ -473,7 +473,7 @@ void func_80AAE50C(EnMm* this, PlayState* play) {
         this->sitTimer = 0;
         this->actionFunc = func_80AAE294;
 
-        if (GET_ITEMGETINF(ITEMGETINF_3B)) {
+        if (GET_ITEMGETINF(ITEMGETINF_SOLD_BUNNY_HOOD)) {
             EnMm_ChangeAnim(this, RM_ANIM_SPRINT, &this->curAnimIndex);
             this->mouthTexIndex = RM_MOUTH_CLOSED;
         } else {
@@ -519,7 +519,7 @@ void EnMm_Draw(Actor* thisx, PlayState* play) {
     SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
                           EnMm_OverrideLimbDraw, EnMm_PostLimbDraw, this);
 
-    if (GET_ITEMGETINF(ITEMGETINF_3B)) {
+    if (GET_ITEMGETINF(ITEMGETINF_SOLD_BUNNY_HOOD)) {
         s32 linkChildObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_LINK_CHILD);
 
         // Draw Bunny Hood
diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
index a959b46b4c1..77771621cee 100644
--- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
+++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c
@@ -244,7 +244,7 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) {
         switch (this->type) {
             case 1:
                 Flags_SetSwitch(play, this->switchFlag);
-                SET_EVENTCHKINF(EVENTCHKINF_39);
+                SET_EVENTCHKINF(EVENTCHKINF_OPENED_ZORAS_DOMAIN);
                 break;
             case 2:
                 play->csCtx.script = D_80ABF9D0;
diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
index e72837d85d9..ba83c11917a 100644
--- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
@@ -383,48 +383,42 @@ s16 ShopItemDisp_Default(s16 v) {
 }
 
 s16 ShopItemDisp_SpookyMask(s16 v) {
-    // Sold Skull Mask
-    if (GET_ITEMGETINF(ITEMGETINF_39)) {
+    if (GET_ITEMGETINF(ITEMGETINF_SOLD_SKULL_MASK)) {
         return v;
     }
     return -1;
 }
 
 s16 ShopItemDisp_SkullMask(s16 v) {
-    // Sold Keaton Mask
-    if (GET_ITEMGETINF(ITEMGETINF_38)) {
+    if (GET_ITEMGETINF(ITEMGETINF_SOLD_KEATON_MASK)) {
         return v;
     }
     return -1;
 }
 
 s16 ShopItemDisp_BunnyHood(s16 v) {
-    // Sold Spooky Mask
-    if (GET_ITEMGETINF(ITEMGETINF_3A)) {
+    if (GET_ITEMGETINF(ITEMGETINF_SOLD_SPOOKY_MASK)) {
         return v;
     }
     return -1;
 }
 
 s16 ShopItemDisp_ZoraMask(s16 v) {
-    // Obtained Mask of Truth
-    if (GET_ITEMGETINF(ITEMGETINF_3F)) {
+    if (GET_ITEMGETINF(ITEMGETINF_OBTAINED_MASK_OF_TRUTH)) {
         return v;
     }
     return -1;
 }
 
 s16 ShopItemDisp_GoronMask(s16 v) {
-    // Obtained Mask of Truth
-    if (GET_ITEMGETINF(ITEMGETINF_3F)) {
+    if (GET_ITEMGETINF(ITEMGETINF_OBTAINED_MASK_OF_TRUTH)) {
         return v;
     }
     return -1;
 }
 
 s16 ShopItemDisp_GerudoMask(s16 v) {
-    // Obtained Mask of Truth
-    if (GET_ITEMGETINF(ITEMGETINF_3F)) {
+    if (GET_ITEMGETINF(ITEMGETINF_OBTAINED_MASK_OF_TRUTH)) {
         return v;
     }
     return -1;
@@ -539,10 +533,8 @@ void EnOssan_TalkGoronShopkeeper(PlayState* play) {
 
 // Happy Mask Shop
 void EnOssan_TalkHappyMaskShopkeeper(PlayState* play) {
-    if (GET_ITEMGETINF(ITEMGETINF_38)       // Sold Keaton Mask
-        && GET_ITEMGETINF(ITEMGETINF_39)    // Sold Skull Mask
-        && GET_ITEMGETINF(ITEMGETINF_3A)    // Sold Spooky Mask
-        && GET_ITEMGETINF(ITEMGETINF_3B)) { // Sold Bunny Hood
+    if (GET_ITEMGETINF(ITEMGETINF_SOLD_KEATON_MASK) && GET_ITEMGETINF(ITEMGETINF_SOLD_SKULL_MASK) &&
+        GET_ITEMGETINF(ITEMGETINF_SOLD_SPOOKY_MASK) && GET_ITEMGETINF(ITEMGETINF_SOLD_BUNNY_HOOD)) {
         Message_ContinueTextbox(play, 0x70AE);
     } else {
         switch (play->msgCtx.choiceIndex) {
@@ -714,8 +706,8 @@ void EnOssan_StartShopping(PlayState* play, EnOssan* this) {
 
     if (this->actor.params == OSSAN_TYPE_MASK) {
         // if all masks have been sold, give the option to ask about the mask of truth
-        if (GET_ITEMGETINF(ITEMGETINF_38) && GET_ITEMGETINF(ITEMGETINF_39) && GET_ITEMGETINF(ITEMGETINF_3A) &&
-            GET_ITEMGETINF(ITEMGETINF_3B)) {
+        if (GET_ITEMGETINF(ITEMGETINF_SOLD_KEATON_MASK) && GET_ITEMGETINF(ITEMGETINF_SOLD_SKULL_MASK) &&
+            GET_ITEMGETINF(ITEMGETINF_SOLD_SPOOKY_MASK) && GET_ITEMGETINF(ITEMGETINF_SOLD_BUNNY_HOOD)) {
             Message_ContinueTextbox(play, 0x70AD);
         } else {
             Message_ContinueTextbox(play, 0x70A2);
@@ -877,18 +869,18 @@ void EnOssan_TryPaybackMask(EnOssan* this, PlayState* play) {
         Rupees_ChangeBy(-price);
 
         if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_BUNNY_HOOD) {
-            SET_EVENTCHKINF(EVENTCHKINF_8F);
+            SET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_BUNNY_HOOD);
             Message_ContinueTextbox(play, 0x70A9);
             this->happyMaskShopState = OSSAN_HAPPY_STATE_ALL_MASKS_SOLD;
             return;
         }
 
         if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_KEATON_MASK) {
-            SET_EVENTCHKINF(EVENTCHKINF_8C);
+            SET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_KEATON_MASK);
         } else if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SPOOKY_MASK) {
-            SET_EVENTCHKINF(EVENTCHKINF_8E);
+            SET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_SPOOKY_MASK);
         } else if (this->happyMaskShopState == OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SKULL_MASK) {
-            SET_EVENTCHKINF(EVENTCHKINF_8D);
+            SET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_SKULL_MASK);
         }
 
         Message_ContinueTextbox(play, 0x70A7);
@@ -1608,16 +1600,16 @@ void EnOssan_State_SelectMaskItem(EnOssan* this, PlayState* play, Player* player
             case 0:
                 switch (item->actor.params) {
                     case SI_KEATON_MASK:
-                        SET_ITEMGETINF(ITEMGETINF_23);
+                        SET_ITEMGETINF(ITEMGETINF_BORROWED_KEATON_MASK);
                         break;
                     case SI_SPOOKY_MASK:
-                        SET_ITEMGETINF(ITEMGETINF_25);
+                        SET_ITEMGETINF(ITEMGETINF_BORROWED_SPOOKY_MASK);
                         break;
                     case SI_SKULL_MASK:
-                        SET_ITEMGETINF(ITEMGETINF_24);
+                        SET_ITEMGETINF(ITEMGETINF_BORROWED_SKULL_MASK);
                         break;
                     case SI_BUNNY_HOOD:
-                        SET_ITEMGETINF(ITEMGETINF_26);
+                        SET_ITEMGETINF(ITEMGETINF_BORROWED_BUNNY_HOOD);
                         break;
                     case SI_MASK_OF_TRUTH:
                     case SI_ZORA_MASK:
@@ -1678,8 +1670,8 @@ void EnOssan_State_ItemPurchased(EnOssan* this, PlayState* play, Player* player)
             EnOssan_ResetItemPosition(this);
             item = this->shelfSlots[this->cursorIndex];
             item->updateStockedItemFunc(play, item);
-            if (itemTemp->actor.params == SI_MASK_OF_TRUTH && !GET_ITEMGETINF(ITEMGETINF_3F)) {
-                SET_ITEMGETINF(ITEMGETINF_3F);
+            if (itemTemp->actor.params == SI_MASK_OF_TRUTH && !GET_ITEMGETINF(ITEMGETINF_OBTAINED_MASK_OF_TRUTH)) {
+                SET_ITEMGETINF(ITEMGETINF_OBTAINED_MASK_OF_TRUTH);
                 Message_ContinueTextbox(play, 0x70AB);
                 this->happyMaskShopState = OSSAN_HAPPY_STATE_BORROWED_FIRST_MASK;
                 EnOssan_UpdateShopOfferings(this, play);
@@ -1772,7 +1764,7 @@ void EnOssan_State_GiveLonLonMilk(EnOssan* this, PlayState* play, Player* player
 // For giving Mask of Truth when you first sell all masks
 void EnOssan_State_LendMaskOfTruth(EnOssan* this, PlayState* play, Player* player) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT && Message_ShouldAdvance(play)) {
-        SET_ITEMGETINF(ITEMGETINF_2A);
+        SET_ITEMGETINF(ITEMGETINF_BORROWED_TRUTH_MASK);
         this->cursorIndex = 2;
         EnOssan_GiveItemWithFanfare(play, this);
     }
@@ -2058,36 +2050,32 @@ u16 EnOssan_SetupHelloDialog(EnOssan* this) {
     // mask shop messages
     if (this->actor.params == OSSAN_TYPE_MASK) {
         if (INV_CONTENT(ITEM_TRADE_CHILD) == ITEM_SOLD_OUT) {
-            if (GET_ITEMGETINF(ITEMGETINF_3B)) {
-                if (!GET_EVENTCHKINF(EVENTCHKINF_8F)) {
-                    // Pay back Bunny Hood
+            if (GET_ITEMGETINF(ITEMGETINF_SOLD_BUNNY_HOOD)) {
+                if (!GET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_BUNNY_HOOD)) {
                     this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_BUNNY_HOOD;
                     return 0x70C6;
                 } else {
                     return 0x70AC;
                 }
             }
-            if (GET_ITEMGETINF(ITEMGETINF_3A)) {
-                if (!GET_EVENTCHKINF(EVENTCHKINF_8E)) {
-                    // Pay back Spooky Mask
+            if (GET_ITEMGETINF(ITEMGETINF_SOLD_SPOOKY_MASK)) {
+                if (!GET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_SPOOKY_MASK)) {
                     this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SPOOKY_MASK;
                     return 0x70C5;
                 } else {
                     return 0x70AC;
                 }
             }
-            if (GET_ITEMGETINF(ITEMGETINF_39)) {
-                if (!GET_EVENTCHKINF(EVENTCHKINF_8D)) {
-                    // Pay back Skull Mask
+            if (GET_ITEMGETINF(ITEMGETINF_SOLD_SKULL_MASK)) {
+                if (!GET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_SKULL_MASK)) {
                     this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_SKULL_MASK;
                     return 0x70C4;
                 } else {
                     return 0x70AC;
                 }
             }
-            if (GET_ITEMGETINF(ITEMGETINF_38)) {
-                if (!GET_EVENTCHKINF(EVENTCHKINF_8C)) {
-                    // Pay back Keaton Mask
+            if (GET_ITEMGETINF(ITEMGETINF_SOLD_KEATON_MASK)) {
+                if (!GET_EVENTCHKINF(EVENTCHKINF_PAID_BACK_KEATON_MASK)) {
                     this->happyMaskShopState = OSSAN_HAPPY_STATE_REQUEST_PAYMENT_KEATON_MASK;
                     return 0x70A5;
                 } else {
@@ -2095,12 +2083,12 @@ u16 EnOssan_SetupHelloDialog(EnOssan* this) {
                 }
             }
         } else {
-            if (GET_ITEMGETINF(ITEMGETINF_3B)) {
+            if (GET_ITEMGETINF(ITEMGETINF_SOLD_BUNNY_HOOD)) {
                 return 0x70AC;
-            } else if (!GET_ITEMGETINF(ITEMGETINF_3A) && !GET_ITEMGETINF(ITEMGETINF_24) &&
-                       !GET_ITEMGETINF(ITEMGETINF_38)) {
-                // Haven't borrowed the Keaton Mask
-                if (!GET_ITEMGETINF(ITEMGETINF_23)) {
+            } else if (!GET_ITEMGETINF(ITEMGETINF_SOLD_SPOOKY_MASK) &&
+                       !GET_ITEMGETINF(ITEMGETINF_BORROWED_SKULL_MASK) &&
+                       !GET_ITEMGETINF(ITEMGETINF_SOLD_KEATON_MASK)) {
+                if (!GET_ITEMGETINF(ITEMGETINF_BORROWED_KEATON_MASK)) {
                     return 0x70A1;
                 } else {
                     // Haven't sold the Keaton Mask
diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c
index 78b170c63db..cc52ee69cf4 100644
--- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c
+++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c
@@ -158,8 +158,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
             this->actionFunc = EnOwl_WaitHyruleCastle;
             break;
         case OWL_KAKARIKO:
-            if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
-                // has zelda's letter
+            if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
                 PRINTF(T("フクロウ退避\n", "Owl evacuation\n"));
                 Actor_Kill(&this->actor);
                 return;
@@ -168,8 +167,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
             this->actionFunc = EnOwl_WaitKakariko;
             break;
         case OWL_HYLIA_GERUDO:
-            if (GET_EVENTCHKINF(EVENTCHKINF_43)) {
-                // has ocarina of time
+            if (GET_EVENTCHKINF(EVENTCHKINF_GOT_OCARINA_OF_TIME)) {
                 PRINTF(T("フクロウ退避\n", "Owl evacuation\n"));
                 Actor_Kill(&this->actor);
                 return;
@@ -180,8 +178,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
             this->actionFunc = EnOwl_WaitLakeHylia;
             break;
         case OWL_ZORA_RIVER:
-            if (GET_EVENTCHKINF(EVENTCHKINF_39) || !GET_EVENTCHKINF(EVENTCHKINF_40)) {
-                // opened zora's domain or has zelda's letter
+            if (GET_EVENTCHKINF(EVENTCHKINF_OPENED_ZORAS_DOMAIN) || !GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
                 PRINTF(T("フクロウ退避\n", "Owl evacuation\n"));
                 Actor_Kill(&this->actor);
                 return;
@@ -437,8 +434,7 @@ void func_80ACAB88(EnOwl* this, PlayState* play) {
     if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && Message_ShouldAdvance(play)) {
         switch (play->msgCtx.choiceIndex) {
             case OWL_REPEAT:
-                // obtained zelda's letter
-                if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+                if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
                     Message_ContinueTextbox(play, 0x206D);
                 } else {
                     Message_ContinueTextbox(play, 0x206C);
diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c
index 72eba29b611..a231760c040 100644
--- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c
+++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c
@@ -388,10 +388,10 @@ s32 func_80AF5DFC(EnSa* this, PlayState* play) {
         }
     }
     if (play->sceneId == SCENE_SARIAS_HOUSE && !LINK_IS_ADULT &&
-        INV_CONTENT(ITEM_OCARINA_FAIRY) == ITEM_OCARINA_FAIRY && !GET_EVENTCHKINF(EVENTCHKINF_40)) {
+        INV_CONTENT(ITEM_OCARINA_FAIRY) == ITEM_OCARINA_FAIRY && !GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
         return 1;
     }
-    if (play->sceneId == SCENE_SACRED_FOREST_MEADOW && GET_EVENTCHKINF(EVENTCHKINF_40)) {
+    if (play->sceneId == SCENE_SACRED_FOREST_MEADOW && GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
         return CHECK_QUEST_ITEM(QUEST_SONG_SARIA) ? 2 : 5;
     }
     if (play->sceneId == SCENE_KOKIRI_FOREST && !CHECK_QUEST_ITEM(QUEST_KOKIRI_EMERALD)) {
diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c
index 040490ed51c..dff00032f96 100644
--- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c
+++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c
@@ -339,7 +339,7 @@ void EnSkj_CalculateCenter(EnSkj* this) {
 void EnSkj_SetNaviId(EnSkj* this) {
     switch (this->actor.params) {
         case 0:
-            if (GET_ITEMGETINF(ITEMGETINF_39)) {
+            if (GET_ITEMGETINF(ITEMGETINF_SOLD_SKULL_MASK)) {
                 this->actor.naviEnemyId = NAVI_ENEMY_SKULL_KID_MASK;
             } else if (GET_ITEMGETINF(ITEMGETINF_16)) {
                 this->actor.naviEnemyId = NAVI_ENEMY_SKULL_KID_FRIENDLY;
@@ -919,7 +919,7 @@ void EnSkj_WaitInRange(EnSkj* this, PlayState* play) {
         player->actor.world.pos.x = sSmallStumpSkullKid.skullkid->actor.world.pos.x;
         player->actor.world.pos.y = sSmallStumpSkullKid.skullkid->actor.world.pos.y;
         player->actor.world.pos.z = sSmallStumpSkullKid.skullkid->actor.world.pos.z;
-        if ((Player_GetMask(play) == PLAYER_MASK_SKULL) && !GET_ITEMGETINF(ITEMGETINF_39)) {
+        if ((Player_GetMask(play) == PLAYER_MASK_SKULL) && !GET_ITEMGETINF(ITEMGETINF_SOLD_SKULL_MASK)) {
             Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
             EnSkj_SetupMaskTrade(this);
         } else {
@@ -930,7 +930,7 @@ void EnSkj_WaitInRange(EnSkj* this, PlayState* play) {
     } else {
         player->stateFlags2 |= PLAYER_STATE2_23;
         if (GET_ITEMGETINF(ITEMGETINF_16)) {
-            if (GET_ITEMGETINF(ITEMGETINF_39)) {
+            if (GET_ITEMGETINF(ITEMGETINF_SOLD_SKULL_MASK)) {
                 this->textId = MaskReaction_GetTextId(play, MASK_REACTION_SET_SKULL_KID);
                 if (this->textId == 0) {
                     this->textId = 0x1020;
@@ -1160,7 +1160,7 @@ void EnSkj_SetupTakeMask(EnSkj* this, PlayState* play) {
 void EnSkj_TakeMask(EnSkj* this, PlayState* play) {
     if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
         Rupees_ChangeBy(10);
-        SET_ITEMGETINF(ITEMGETINF_39);
+        SET_ITEMGETINF(ITEMGETINF_SOLD_SKULL_MASK);
         EnSkj_SetNaviId(this);
         Player_UnsetMask(play);
         Item_Give(play, ITEM_SOLD_OUT);
@@ -1612,7 +1612,7 @@ s32 EnSkj_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p
 void EnSkj_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
     OPEN_DISPS(play->state.gfxCtx, "../z_en_skj.c", 2417);
 
-    if ((limbIndex == 11) && GET_ITEMGETINF(ITEMGETINF_39)) {
+    if ((limbIndex == 11) && GET_ITEMGETINF(ITEMGETINF_SOLD_SKULL_MASK)) {
         Gfx_SetupDL_25Opa(play->state.gfxCtx);
         Matrix_Push();
         Matrix_RotateZYX(-0x4000, 0, 0, MTXMODE_APPLY);
diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
index 747b0085c6c..14602d2dec5 100644
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
@@ -607,8 +607,8 @@ void EnTk_Dig(EnTk* this, PlayState* play) {
                  * Upgrade the purple rupee reward to the heart piece if this
                  * is the first grand prize dig.
                  */
-                if (!GET_ITEMGETINF(ITEMGETINF_1C)) {
-                    SET_ITEMGETINF(ITEMGETINF_1C);
+                if (!GET_ITEMGETINF(ITEMGETINF_UPGRADED_PURPLE_RUPEE)) {
+                    SET_ITEMGETINF(ITEMGETINF_UPGRADED_PURPLE_RUPEE);
                     this->currentReward = 4;
                 }
             }
diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
index 5e9e95ad3d7..d81336dd64f 100644
--- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
+++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
@@ -77,7 +77,7 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) {
             // "☆☆☆☆☆ Yukigafuru You won't come (._.) ☆☆☆☆☆"
             PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ ゆきがふるー あなたはこないー (._.) ☆☆☆☆☆ \n" VT_RST);
 
-            if (GET_EVENTCHKINF(EVENTCHKINF_4A)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_CLEARED_WATER_TEMPLE)) {
                 Actor_Kill(&this->actor);
             }
             EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledCloudySnow);
@@ -87,7 +87,7 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) {
             // "☆☆☆☆☆ Wow wa wa na wa saa ki ha (^o^) ☆☆☆☆☆"
             PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" VT_RST);
 
-            if (GET_EVENTCHKINF(EVENTCHKINF_4A)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_CLEARED_WATER_TEMPLE)) {
                 Actor_Kill(&this->actor);
             }
             EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledRainLakeHylia);
@@ -96,7 +96,7 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) {
             PRINTF("\n\n");
             // "☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆"
             PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" VT_RST);
-            if (GET_EVENTCHKINF(EVENTCHKINF_49)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_CLEARED_FIRE_TEMPLE)) {
                 Actor_Kill(&this->actor);
             }
             EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledCloudyDeathMountain);
@@ -106,8 +106,9 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) {
             // "☆☆☆☆☆ Cloudy Rain Thunder (;O;) Uo Melancholy ☆☆☆☆☆"
             PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり雨雷 (;O;) うおお 憂鬱 ☆☆☆☆☆ \n" VT_RST);
 
-            if (!GET_EVENTCHKINF(EVENTCHKINF_48) || !GET_EVENTCHKINF(EVENTCHKINF_49) ||
-                !GET_EVENTCHKINF(EVENTCHKINF_4A) || CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) {
+            if (!GET_EVENTCHKINF(EVENTCHKINF_CLEARED_FOREST_TEMPLE) ||
+                !GET_EVENTCHKINF(EVENTCHKINF_CLEARED_FIRE_TEMPLE) ||
+                !GET_EVENTCHKINF(EVENTCHKINF_CLEARED_WATER_TEMPLE) || CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) {
                 Actor_Kill(&this->actor);
             }
             EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledCloudyRainThunderKakariko);
diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c
index 0f373e95af1..c4eeea90d0e 100644
--- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c
+++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c
@@ -283,8 +283,7 @@ void func_80B3C9EC(EnXc* this) {
 }
 
 void func_80B3CA38(EnXc* this, PlayState* play) {
-    // If Player is adult but hasn't learned Minuet of Forest
-    if (!GET_EVENTCHKINF(EVENTCHKINF_50) && LINK_IS_ADULT) {
+    if (!GET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_MINUET) && LINK_IS_ADULT) {
         s32 pad;
 
         this->action = SHEIK_ACTION_INIT;
@@ -307,7 +306,7 @@ s32 EnXc_MinuetCS(EnXc* this, PlayState* play) {
 
                 play->csCtx.script = SEGMENTED_TO_VIRTUAL(gMinuetCs);
                 gSaveContext.cutsceneTrigger = 1;
-                SET_EVENTCHKINF(EVENTCHKINF_50);
+                SET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_MINUET);
                 Item_Give(play, ITEM_SONG_MINUET);
                 return true;
             }
@@ -318,8 +317,7 @@ s32 EnXc_MinuetCS(EnXc* this, PlayState* play) {
 }
 
 void func_80B3CB58(EnXc* this, PlayState* play) {
-    // If hasn't learned Bolero and Player is Adult
-    if (!GET_EVENTCHKINF(EVENTCHKINF_51) && LINK_IS_ADULT) {
+    if (!GET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_BOLERO) && LINK_IS_ADULT) {
         s32 pad;
 
         this->action = SHEIK_ACTION_INIT;
@@ -342,7 +340,7 @@ s32 EnXc_BoleroCS(EnXc* this, PlayState* play) {
 
             play->csCtx.script = SEGMENTED_TO_VIRTUAL(gDeathMountainCraterBoleroCs);
             gSaveContext.cutsceneTrigger = 1;
-            SET_EVENTCHKINF(EVENTCHKINF_51);
+            SET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_BOLERO);
             Item_Give(play, ITEM_SONG_BOLERO);
             return true;
         }
@@ -352,8 +350,8 @@ s32 EnXc_BoleroCS(EnXc* this, PlayState* play) {
 }
 
 void EnXc_SetupSerenadeAction(EnXc* this, PlayState* play) {
-    if (!(CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && OOT_DEBUG) && !GET_EVENTCHKINF(EVENTCHKINF_52) &&
-        LINK_IS_ADULT) {
+    if (!(CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && OOT_DEBUG) &&
+        !GET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_SERENADE) && LINK_IS_ADULT) {
         s32 pad;
 
         this->action = SHEIK_ACTION_SERENADE;
@@ -369,13 +367,14 @@ s32 EnXc_SerenadeCS(EnXc* this, PlayState* play) {
         Player* player = GET_PLAYER(play);
         s32 stateFlags = player->stateFlags1;
 
-        if (CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !GET_EVENTCHKINF(EVENTCHKINF_52) &&
-            !(stateFlags & PLAYER_STATE1_29) && !Play_InCsMode(play)) {
+        if (CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) &&
+            !GET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_SERENADE) && !(stateFlags & PLAYER_STATE1_29) &&
+            !Play_InCsMode(play)) {
             s32 pad;
 
             Cutscene_SetScript(play, gIceCavernSerenadeCs);
             gSaveContext.cutsceneTrigger = 1;
-            SET_EVENTCHKINF(EVENTCHKINF_52); // Learned Serenade of Water Flag
+            SET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_SERENADE);
             Item_Give(play, ITEM_SONG_SERENADE);
             PRINTF("ブーツを取った!!!!!!!!!!!!!!!!!!\n");
             return true;
@@ -2187,13 +2186,14 @@ void EnXc_InitTempleOfTime(EnXc* this, PlayState* play) {
             play->csCtx.script = SEGMENTED_TO_VIRTUAL(gTempleOfTimeFirstAdultCs);
             gSaveContext.cutsceneTrigger = 1;
             func_80B3EBF0(this, play);
-        } else if (!GET_EVENTCHKINF(EVENTCHKINF_55) && GET_EVENTCHKINF(EVENTCHKINF_48)) {
-            SET_EVENTCHKINF(EVENTCHKINF_55);
+        } else if (!GET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_PRELUDE) &&
+                   GET_EVENTCHKINF(EVENTCHKINF_CLEARED_FOREST_TEMPLE)) {
+            SET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_PRELUDE);
             Item_Give(play, ITEM_SONG_PRELUDE);
             play->csCtx.script = SEGMENTED_TO_VIRTUAL(gTempleOfTimePreludeCs);
             gSaveContext.cutsceneTrigger = 1;
             this->action = SHEIK_ACTION_30;
-        } else if (!GET_EVENTCHKINF(EVENTCHKINF_55)) {
+        } else if (!GET_EVENTCHKINF(EVENTCHKINF_LEARNED_SONG_PRELUDE)) {
             func_80B3C9EC(this);
         } else {
             Actor_Kill(&this->actor);
diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
index 7a9edb9c677..1cdaff6e52c 100644
--- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
+++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
@@ -101,7 +101,7 @@ void EnZl1_Init(Actor* thisx, PlayState* play) {
         Animation_Change(&this->skelAnime, &gChildZelda1Anim_00438, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f);
         this->actor.textId = 0x703D;
         this->actionFunc = func_80B4AF18;
-    } else if (Flags_GetEventChkInf(EVENTCHKINF_40)) {
+    } else if (Flags_GetEventChkInf(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
         frameCount = Animation_GetLastFrame(&gChildZelda1Anim_00438);
         Animation_Change(&this->skelAnime, &gChildZelda1Anim_00438, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f);
         this->actor.textId = 0x703C;
@@ -548,7 +548,7 @@ void func_80B4BF2C(EnZl1* this, PlayState* play) {
             if ((Message_GetState(msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
                 this->actor.textId = 0x703C;
                 Message_ContinueTextbox(play, this->actor.textId);
-                Flags_SetEventChkInf(EVENTCHKINF_40);
+                Flags_SetEventChkInf(EVENTCHKINF_GOT_ZELDAS_LETTER);
                 this->unk_1E2 = 6;
             }
             break;
diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
index 22f558ea5f0..ee378801910 100644
--- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
+++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
@@ -374,7 +374,7 @@ void EnZl4_Init(Actor* thisx, PlayState* play) {
     if (IS_CUTSCENE_LAYER) {
         Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_0);
         this->actionFunc = EnZl4_TheEnd;
-    } else if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+    } else if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
         Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_0);
         this->actionFunc = EnZl4_Idle;
     } else {
@@ -1195,7 +1195,7 @@ void EnZl4_Cutscene(EnZl4* this, PlayState* play) {
             if (EnZl4_CsMakePlan(this, play)) {
                 Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_7);
                 gSaveContext.prevHudVisibilityMode = HUD_VISIBILITY_ALL;
-                SET_EVENTCHKINF(EVENTCHKINF_40);
+                SET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER);
                 this->actionFunc = EnZl4_Idle;
             }
             break;
diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
index 00d7eab43e7..0c1910f7e13 100644
--- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
+++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
@@ -57,7 +57,7 @@ void ItemOcarina_Init(Actor* thisx, PlayState* play) {
             break;
         case 3:
             ItemOcarina_SetupAction(this, ItemOcarina_WaitInWater);
-            if (!GET_EVENTCHKINF(EVENTCHKINF_80) || GET_EVENTCHKINF(EVENTCHKINF_43)) {
+            if (!GET_EVENTCHKINF(EVENTCHKINF_80) || GET_EVENTCHKINF(EVENTCHKINF_GOT_OCARINA_OF_TIME)) {
                 Actor_Kill(thisx);
                 return;
             }
@@ -175,7 +175,7 @@ void ItemOcarina_StartSoTCutscene(ItemOcarina* this, PlayState* play) {
 
 void ItemOcarina_WaitInWater(ItemOcarina* this, PlayState* play) {
     if (Actor_HasParent(&this->actor, play)) {
-        SET_EVENTCHKINF(EVENTCHKINF_43);
+        SET_EVENTCHKINF(EVENTCHKINF_GOT_OCARINA_OF_TIME);
         Flags_SetSwitch(play, 3);
         this->actionFunc = ItemOcarina_StartSoTCutscene;
         this->actor.draw = NULL;
diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c
index 11b671c4b4e..6a40c893f01 100644
--- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c
+++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c
@@ -86,7 +86,7 @@ void ObjHana_Init(Actor* thisx, PlayState* play) {
         CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
     }
 
-    if (type == 2 && GET_EVENTCHKINF(EVENTCHKINF_40)) {
+    if (type == 2 && GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
         Actor_Kill(&this->actor);
     }
 }
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
index 71104dd5454..8a40285c322 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
@@ -3836,7 +3836,7 @@ void KaleidoScope_Update(PlayState* play) {
             if (GET_EVENTCHKINF(EVENTCHKINF_09)) {
                 pauseCtx->worldMapPoints[WORLD_MAP_POINT_MARKET] = WORLD_MAP_POINT_STATE_HIGHLIGHT;
             }
-            if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
                 pauseCtx->worldMapPoints[WORLD_MAP_POINT_MARKET] = WORLD_MAP_POINT_STATE_SHOW;
             }
             if (INV_CONTENT(ITEM_OCARINA_OF_TIME) == ITEM_OCARINA_OF_TIME) {
@@ -3853,7 +3853,7 @@ void KaleidoScope_Update(PlayState* play) {
                 pauseCtx->worldMapPoints[WORLD_MAP_POINT_HYRULE_FIELD] = WORLD_MAP_POINT_STATE_SHOW;
             }
 
-            if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_GOT_ZELDAS_LETTER)) {
                 pauseCtx->worldMapPoints[WORLD_MAP_POINT_DEATH_MOUNTAIN] = WORLD_MAP_POINT_STATE_HIGHLIGHT;
             }
             if (GET_EVENTCHKINF(EVENTCHKINF_25)) {
@@ -3862,7 +3862,7 @@ void KaleidoScope_Update(PlayState* play) {
             if (INV_CONTENT(ITEM_HOOKSHOT) == ITEM_HOOKSHOT) {
                 pauseCtx->worldMapPoints[WORLD_MAP_POINT_DEATH_MOUNTAIN] = WORLD_MAP_POINT_STATE_HIGHLIGHT;
             }
-            if (GET_EVENTCHKINF(EVENTCHKINF_49)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_CLEARED_FIRE_TEMPLE)) {
                 pauseCtx->worldMapPoints[WORLD_MAP_POINT_DEATH_MOUNTAIN] = WORLD_MAP_POINT_STATE_SHOW;
             }
 
@@ -3906,7 +3906,7 @@ void KaleidoScope_Update(PlayState* play) {
             if (INV_CONTENT(ITEM_HOOKSHOT) == ITEM_HOOKSHOT) {
                 pauseCtx->worldMapPoints[WORLD_MAP_POINT_LOST_WOODS] = WORLD_MAP_POINT_STATE_HIGHLIGHT;
             }
-            if (GET_EVENTCHKINF(EVENTCHKINF_48)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_CLEARED_FOREST_TEMPLE)) {
                 pauseCtx->worldMapPoints[WORLD_MAP_POINT_LOST_WOODS] = WORLD_MAP_POINT_STATE_SHOW;
             }