From ee82e65c1a8273615095fd153fc677065b14ff45 Mon Sep 17 00:00:00 2001
From: engineer124 <47598039+engineer124@users.noreply.github.com>
Date: Mon, 26 Sep 2022 23:37:00 -0400
Subject: z_kaleido_item.c Ok and Documented (Pause Menu Item Page) (#1027)

* import wip from kaleido

* small cleanup

* add for-loop comments

* pr review 1

* spacing

* Update src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
---
 src/code/z_kaleido_setup.c | 28 ++++++++++++++--------------
 src/code/z_message.c       |  2 +-
 src/code/z_message_nes.c   |  2 +-
 src/code/z_player_lib.c    |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/code')

diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c
index b054dac74..50022849e 100644
--- a/src/code/z_kaleido_setup.c
+++ b/src/code/z_kaleido_setup.c
@@ -33,12 +33,12 @@ void func_800F4A10(PlayState* play) {
         for (i = 9; i >= 0; i--) {
             if ((gSaveContext.save.playerData.owlActivationFlags >> i) & 1) {
                 pauseCtx->worldMapPoints[i] = 1;
-                pauseCtx->unk_238[4] = i;
+                pauseCtx->cursorPoint[PAUSE_WORLD_MAP] = i;
             }
         }
 
         if ((gSaveContext.save.playerData.owlActivationFlags >> 4) & 1) {
-            pauseCtx->unk_238[4] = 4;
+            pauseCtx->cursorPoint[PAUSE_WORLD_MAP] = 4;
         }
     }
 
@@ -82,7 +82,7 @@ void KaleidoSetup_Update(PlayState* play) {
                                 !(play->actorCtx.flags & ACTORCTX_FLAG_2)) {
                                 if ((play->actorCtx.unk268 == 0) && CHECK_BTN_ALL(input->press.button, BTN_START)) {
                                     gSaveContext.unk_3F26 = gSaveContext.unk_3F22;
-                                    pauseCtx->unk_2B9 = 0;
+                                    pauseCtx->itemDescriptionOn = false;
                                     pauseCtx->state = 1;
                                     func_800F4A10(play);
                                     pauseCtx->mode = pauseCtx->pageIndex * 2 + 1;
@@ -122,23 +122,23 @@ void KaleidoSetup_Init(PlayState* play) {
     pauseCtx->unk_20C = 936.0f;
     pauseCtx->unk_220 = -314.0f;
 
-    pauseCtx->unk_238[PAUSE_MAP] = XREG(94) + 3;
+    pauseCtx->cursorPoint[PAUSE_MAP] = XREG(94) + 3;
 
-    pauseCtx->unk_258 = 11;
-    pauseCtx->unk_25A = 0;
+    pauseCtx->cursorSpecialPos = PAUSE_CURSOR_PAGE_RIGHT;
+    pauseCtx->pageSwitchTimer = 0;
 
-    pauseCtx->cursorItem[PAUSE_ITEM] = 999;
+    pauseCtx->cursorItem[PAUSE_ITEM] = PAUSE_ITEM_NONE;
     pauseCtx->cursorItem[PAUSE_MAP] = XREG(94) + 3;
-    pauseCtx->cursorItem[PAUSE_QUEST] = 999;
-    pauseCtx->cursorItem[PAUSE_MASK] = 999;
+    pauseCtx->cursorItem[PAUSE_QUEST] = PAUSE_ITEM_NONE;
+    pauseCtx->cursorItem[PAUSE_MASK] = PAUSE_ITEM_NONE;
 
-    pauseCtx->unk_268[PAUSE_ITEM] = 0;
-    pauseCtx->unk_268[PAUSE_MAP] = XREG(94) + 3;
+    pauseCtx->cursorSlot[PAUSE_ITEM] = 0;
+    pauseCtx->cursorSlot[PAUSE_MAP] = XREG(94) + 3;
 
-    pauseCtx->unk_284 = 2;
+    pauseCtx->cursorColorSet = 2;
     pauseCtx->unk_2A0 = -1;
-    pauseCtx->unk_2BA = 320;
-    pauseCtx->unk_2BC = 40;
+    pauseCtx->equipAnimScale = 320;
+    pauseCtx->equipAnimShrinkRate = 40;
     pauseCtx->promptAlpha = 100;
 
     View_Init(&pauseCtx->view, play->state.gfxCtx);
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 16e1203d7..f98d3cf3a 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -270,7 +270,7 @@ void func_8014D62C(PlayState* play, s32* arg1, f32* arg2, s16* arg3) {
     if ((func_8010A0A4(play) != 0) || (play->sceneNum == 0x4F)) {
         phi_v0 = 0xA;
     } else {
-        phi_v0 = pauseCtx->unk_238[PAUSE_WORLD_MAP];
+        phi_v0 = pauseCtx->cursorPoint[PAUSE_WORLD_MAP];
     }
 
     temp_s6 = D_801D0250[phi_v0];
diff --git a/src/code/z_message_nes.c b/src/code/z_message_nes.c
index 9231ca9b9..1ac301f20 100644
--- a/src/code/z_message_nes.c
+++ b/src/code/z_message_nes.c
@@ -257,7 +257,7 @@ void Message_LoadAreaTextNES(PlayState* play, s32* offset, f32* arg2, s16* decod
     if ((func_8010A0A4(play) != 0) || (play->sceneNum == SCENE_SECOM)) {
         currentArea = 10;
     } else {
-        currentArea = play->pauseCtx.unk_238[PAUSE_WORLD_MAP];
+        currentArea = play->pauseCtx.cursorPoint[PAUSE_WORLD_MAP];
     }
     stringLimit = D_801D07C4[currentArea];
 
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 1566077f1..8ced31cb7 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -274,7 +274,7 @@ u8 Player_MaskIdToItemId(s32 maskIdMinusOne) {
     return sMaskItemIds[maskIdMinusOne];
 }
 
-u8 Player_GetCurMaskItemId(PlayState* play) {
+s32 Player_GetCurMaskItemId(PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     if (player->currentMask != PLAYER_MASK_NONE) {
-- 
cgit v1.2.3