z_kaleido_collect.c (1 non-matching) and Mostly Documented (Pause Menu Quest Page) (#1108)

* import quest docs

* cleanup

* eol

* temp change to non-eq

* more missed stuff

* fix questVtx

* PR suggestions

* adjust comment

* missed two

* PR Suggestions

6 files changed, 15 insertions, 13 deletions

diff --git a/src/code/audio/code_8019AF00.c b/src/code/audio/code_8019AF00.c
index 6d1468d82..9df12e7fe 100644
--- a/src/code/audio/code_8019AF00.c
+++ b/src/code/audio/code_8019AF00.c
@@ -2733,7 +2733,7 @@ void AudioOcarina_SetOcarinaDisableTimer(u8 unused, u8 timer) {
     sOcarinaUnused = unused;
 }
 
-u32 AudioOcarina_SetInstrument(u8 ocarinaInstrumentId) {
+void AudioOcarina_SetInstrument(u8 ocarinaInstrumentId) {
     if ((sOcarinaInstrumentId != ocarinaInstrumentId) || (ocarinaInstrumentId == OCARINA_INSTRUMENT_DEFAULT)) {
         Audio_QueueSeqCmd(0x80000000 | ((u32)(SEQ_PLAYER_SFX) << 24) | ((u32)(1) << 16) |
                           ((u32)(SFX_CHANNEL_OCARINA) << 8) | (u32)(ocarinaInstrumentId));
diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c
index eb70cfbc8..fb6f0743d 100644
--- a/src/code/code_8012EC80.c
+++ b/src/code/code_8012EC80.c
@@ -661,17 +661,17 @@ void Inventory_SetWorldMapCloudVisibility(s16 tingleIndex) {
             i++;
         }
 
-        if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[0]) {
+        if (*tingleMapSceneIds == sSceneIdsPerTingleMap[TINGLE_MAP_CLOCK_TOWN]) {
             gSaveContext.save.worldMapCloudVisibility |= 3;
-        } else if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[1]) {
+        } else if (*tingleMapSceneIds == sSceneIdsPerTingleMap[TINGLE_MAP_WOODFALL]) {
             gSaveContext.save.worldMapCloudVisibility |= 0x1C;
-        } else if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[2]) {
+        } else if (*tingleMapSceneIds == sSceneIdsPerTingleMap[TINGLE_MAP_SNOWHEAD]) {
             gSaveContext.save.worldMapCloudVisibility |= 0xE0;
-        } else if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[3]) {
+        } else if (*tingleMapSceneIds == sSceneIdsPerTingleMap[TINGLE_MAP_ROMANI_RANCH]) {
             gSaveContext.save.worldMapCloudVisibility |= 0x100;
-        } else if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[4]) {
+        } else if (*tingleMapSceneIds == sSceneIdsPerTingleMap[TINGLE_MAP_GREAT_BAY]) {
             gSaveContext.save.worldMapCloudVisibility |= 0x1E00;
-        } else if ((*tingleMapSceneIds) == sSceneIdsPerTingleMap[5]) {
+        } else if (*tingleMapSceneIds == sSceneIdsPerTingleMap[TINGLE_MAP_STONE_TOWER]) {
             gSaveContext.save.worldMapCloudVisibility |= 0x6000;
         }
     }
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index 1fa041be1..25b2b471a 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -990,7 +990,7 @@ void Cutscene_Command_Textbox(PlayState* play, CutsceneContext* csCtx, CsCmdText
             D_801BB160 = CS_TEXTBOX_TYPE_1;
             D_801BB124 = cmd->base;
             if (cmd->type == CS_TEXTBOX_TYPE_BOSSES_REMAINS) {
-                if (CHECK_QUEST_ITEM(QUEST_REMAINS_ODOWLA) && CHECK_QUEST_ITEM(QUEST_REMAINS_GOHT) &&
+                if (CHECK_QUEST_ITEM(QUEST_REMAINS_ODOLWA) && CHECK_QUEST_ITEM(QUEST_REMAINS_GOHT) &&
                     CHECK_QUEST_ITEM(QUEST_REMAINS_GYORG) && CHECK_QUEST_ITEM(QUEST_REMAINS_TWINMOLD)) {
                     if (cmd->textId1 != 0xFFFF) {
                         Message_StartTextbox(play, cmd->textId1, NULL);
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c
index 2f2e3c388..a096aaabe 100644
--- a/src/code/z_kaleido_setup.c
+++ b/src/code/z_kaleido_setup.c
@@ -137,8 +137,8 @@ void KaleidoSetup_Init(PlayState* play) {
     pauseCtx->cursorSlot[PAUSE_ITEM] = 0;
     pauseCtx->cursorSlot[PAUSE_MAP] = R_REVERSE_FLOOR_INDEX + (DUNGEON_FLOOR_INDEX_4 - 1);
 
-    pauseCtx->cursorColorSet = 2;
-    pauseCtx->unk_2A0 = -1;
+    pauseCtx->cursorColorSet = PAUSE_CURSOR_COLOR_SET_YELLOW;
+    pauseCtx->ocarinaSongIndex = -1;
     pauseCtx->equipAnimScale = 320;
     pauseCtx->equipAnimShrinkRate = 40;
     pauseCtx->promptAlpha = 100;
diff --git a/src/code/z_message.c b/src/code/z_message.c
index de3a81c73..5b3598617 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -329,7 +329,7 @@ void func_80151938(PlayState* play, u16 textId) {
     }
     msgCtx->unk1203C = msgCtx->unk1203A;
 
-    if (play->pauseCtx.unk_1F0 != 0) {
+    if (play->pauseCtx.bombersNotebookOpen) {
         msgCtx->unk12004 = 0x22;
         msgCtx->unk12006 = 0x15E;
         func_80149C18(play);
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 4620dd816..d463edff3 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -1172,7 +1172,9 @@ u8 Item_Give(PlayState* play, u8 item) {
     }
 
     if (item == ITEM_SKULL_TOKEN) {
-        SET_QUEST_ITEM(item - ITEM_SKULL_TOKEN + QUEST_SKULL_TOKEN);
+        //! @bug: Sets QUEST_QUIVER instead of QUEST_SKULL_TOKEN
+        // Setting `QUEST_SKULL_TOKEN` will result in misplaced digits on the pause menu - Quest Status page.
+        SET_QUEST_ITEM(item - ITEM_SKULL_TOKEN + QUEST_QUIVER);
         Inventory_IncrementSkullTokenCount(play->sceneId);
         return ITEM_NONE;
 
@@ -1446,7 +1448,7 @@ u8 Item_Give(PlayState* play, u8 item) {
         return ITEM_NONE;
 
     } else if ((item >= ITEM_REMAINS_ODOLWA) && (item <= ITEM_REMAINS_TWINMOLD)) {
-        SET_QUEST_ITEM(item - ITEM_REMAINS_ODOLWA + QUEST_REMAINS_ODOWLA);
+        SET_QUEST_ITEM(item - ITEM_REMAINS_ODOLWA + QUEST_REMAINS_ODOLWA);
         return ITEM_NONE;
 
     } else if (item == ITEM_RECOVERY_HEART) {