From c21c3fe3da9cf1aa088f5dbf292671951b6f2a3b Mon Sep 17 00:00:00 2001
From: Jordan Longstaff <JordanLongstaff@users.noreply.github.com>
Date: Mon, 9 Dec 2024 23:53:41 -0500
Subject: [PATCH] Renamed EVENTCHKINF_33 (#2326)

* Renamed EVENTCHKINF_33

* Rename: Gave letter to King Zora
---
 include/z64save.h                       | 2 +-
 src/code/z_actor.c                      | 4 ++--
 src/elf_message/elf_message_field.c     | 2 +-
 src/overlays/actors/ovl_En_Kz/z_en_kz.c | 8 ++++----
 src/overlays/actors/ovl_En_Zo/z_en_zo.c | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/z64save.h b/include/z64save.h
index 381af91c89..3dea790385 100644
--- a/include/z64save.h
+++ b/include/z64save.h
@@ -499,7 +499,7 @@ typedef enum LinkAge {
 #define EVENTCHKINF_30 0x30
 #define EVENTCHKINF_31 0x31
 #define EVENTCHKINF_32 0x32
-#define EVENTCHKINF_33 0x33
+#define EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA 0x33
 #define EVENTCHKINF_37 0x37
 #define EVENTCHKINF_38 0x38
 #define EVENTCHKINF_39 0x39
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 9e258450d7..c9f89ffc7f 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -5381,7 +5381,7 @@ u32 func_80035BFC(PlayState* play, s16 arg1) {
         case 53:
             if (Flags_GetEventChkInf(EVENTCHKINF_37)) {
                 retTextId = 0x402D;
-            } else if (Flags_GetEventChkInf(EVENTCHKINF_33)) {
+            } else if (Flags_GetEventChkInf(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA)) {
                 retTextId = 0x4010;
             } else if (Flags_GetEventChkInf(EVENTCHKINF_30)) {
                 retTextId = 0x400F;
@@ -5727,7 +5727,7 @@ void func_80036E50(u16 textId, s16 arg1) {
             return;
         case 55:
             if (textId == 0x401B) {
-                Flags_SetEventChkInf(EVENTCHKINF_33);
+                Flags_SetEventChkInf(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA);
                 Flags_SetInfTable(INFTABLE_138);
             }
             return;
diff --git a/src/elf_message/elf_message_field.c b/src/elf_message/elf_message_field.c
index bcdb71caf8..505649afda 100644
--- a/src/elf_message/elf_message_field.c
+++ b/src/elf_message/elf_message_field.c
@@ -11,7 +11,7 @@ QuestHintCmd gOverworldNaviQuestHints[] = {
     QUEST_HINT_STRENGTH_UPG(CHECK, 0, true, 0x46),
     QUEST_HINT_FLAG(CHECK, EVENTCHKINF_25, false, 0x47),
     QUEST_HINT_MAGIC(CHECK, false, 0x48),
-    QUEST_HINT_FLAG(CHECK, EVENTCHKINF_33, false, 0x49),
+    QUEST_HINT_FLAG(CHECK, EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA, 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),
diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c
index 18ea64aa3e..ba8c0c4c9f 100644
--- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c
+++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c
@@ -74,7 +74,7 @@ u16 EnKz_GetTextIdChild(PlayState* play, EnKz* this) {
 
     if (CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) {
         return 0x402B;
-    } else if (GET_EVENTCHKINF(EVENTCHKINF_33)) {
+    } else if (GET_EVENTCHKINF(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA)) {
         return 0x401C;
     } else {
         player->exchangeItemId = EXCH_ITEM_BOTTLE_RUTOS_LETTER;
@@ -291,7 +291,7 @@ void func_80A9CB18(EnKz* this, PlayState* play) {
 
     if (EnKz_UpdateTalking(play, &this->actor, &this->interactInfo.talkState, 340.0f, EnKz_GetTextId,
                            EnKz_UpdateTalkState)) {
-        if ((this->actor.textId == 0x401A) && !GET_EVENTCHKINF(EVENTCHKINF_33)) {
+        if ((this->actor.textId == 0x401A) && !GET_EVENTCHKINF(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA)) {
             if (func_8002F368(play) == EXCH_ITEM_BOTTLE_RUTOS_LETTER) {
                 this->actor.textId = 0x401B;
                 this->sfxPlayed = false;
@@ -389,7 +389,7 @@ void EnKz_Init(Actor* thisx, PlayState* play) {
     this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
     Animation_ChangeByInfo(&this->skelanime, sAnimationInfo, ENKZ_ANIM_0);
 
-    if (GET_EVENTCHKINF(EVENTCHKINF_33)) {
+    if (GET_EVENTCHKINF(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA)) {
         EnKz_SetMovedPos(this, play);
     }
 
@@ -455,7 +455,7 @@ void EnKz_Mweep(EnKz* this, PlayState* play) {
         Animation_ChangeByInfo(&this->skelanime, sAnimationInfo, ENKZ_ANIM_1);
         Inventory_ReplaceItem(play, ITEM_BOTTLE_RUTOS_LETTER, ITEM_BOTTLE_EMPTY);
         EnKz_SetMovedPos(this, play);
-        SET_EVENTCHKINF(EVENTCHKINF_33);
+        SET_EVENTCHKINF(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA);
         this->actor.speed = 0.0;
         this->actionFunc = EnKz_StopMweep;
     }
diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c
index c3080986e1..6eb051e47a 100644
--- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c
+++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c
@@ -418,7 +418,7 @@ u16 EnZo_GetTextId(PlayState* play, Actor* thisx) {
                 return 0x402D;
             }
 
-            if (GET_EVENTCHKINF(EVENTCHKINF_33)) {
+            if (GET_EVENTCHKINF(EVENTCHKINF_GAVE_LETTER_TO_KING_ZORA)) {
                 return 0x4010;
             }
             if (GET_EVENTCHKINF(EVENTCHKINF_30)) {