Kaleido OK & icon_item_vtx_static (Documented) (#1243)

* Begin Kaleido

* WIP

* DW macros for gbi

* More Progress

* Match KaleidoScope_GrayOutTextureRGBA32

* DrawGameOver wip

* Add some function names

* A few more matching, some docs

* More docs, data wip

* Import Kaleido Data

* Data cleanup

* Some progress

* Match TitleCard_Draw Again (Thanks Roman)

* Match KaleidoScope_DrawDebugEditor

* KaleidoScope_UpdateDebugEditor WIP

* Some cleanup

* z_kaleido_debug.c OK

* Cleanup

* match func_8081B6EC

* more wip, data cleanup

* match func_80825A50

* match KaleidoScope_InitVertices

* cursor progress

* name func

* item headers

* match KaleidoScope_DrawItemSelect

* KaleidoScope_UpdateItemEquip WIP

* match kaleido item

* doc kaleido item

* z_kaleido_prompt ok

* kaleido mask setup

* small cleanup

* kaleido mask OK

* mask cleanup

* small fix

* quest page setup

* doc save prompt

* sync with prompt docs

* KaleidoScope_Update WIP

* More progress on KaleidoScope_Update

* kaleido update cleanup

* KaleidoScope_Update OK

* Slightly cleaner match in KaleidoScope_Update

* match KaleidoScope_DrawPages and KaleidoScope_DrawGameOver, organize data

* more cleanup

* match KaleidoScope_Draw and KaleidoScope_SetView

* match KaleidoScope_UpdateNamePanel

* match another 2 funcs, segment docs

* another KaleidoScope_UpdateNamePanel ?

* swap update name panel names

* another match, only 2 large/similar vtx function in kaleido nes

* more setup for drawInfoPanel

* match KaleidoScope_DrawDungeonStrayFairyCount, 8 funcs left

* document KaleidoScope_DrawDungeonStrayFairyCount

* KaleidoScope_DrawInfoPanel1 WIP

* match KaleidoScope_DrawInfoPanel2

* gameover pause states

* name two pause states

* match KaleidoScope_UpdateDungeonCursor and KaleidoScope_UpdateWorldMapCursor

* match KaleidoScope_DrawDungeonMap

* KaleidoScope_DrawWorldMap WIP

* cleanup map

* some cursor/texture docs

* more cursor docs

* KaleidoScope_UpdateQuestCursor wip

* match KaleidoScope_UpdateQuestCursor

* quest cleanup

* KaleidoScope_DrawQuestStatus WIP, broke gakufu

* match KaleidoScope_DrawInfoPanel1, Kaleido NES OK

* pause substates

* more cleanup

* map progress

* very small improvements to KaleidoScope_DrawWorldMap

* match KaleidoScope_DrawWorldMap

* cleanup KaleidoScope_DrawWorldMap

* rematch EnGakufu_ProcessNotes, thanks anon58

* gameover and misc docs

* more docs

* small cleanup of maps

* owl warp and other docs

* symmetry in pause state

* some docs and cleanup

* docs

* more docs from OoT WIP

* fix

* quest page docs

* more enums

* more cleanup and enums

* another round of docs

* doc cursor indices

* map docs

* some docs

* cleanup for-loops

* cleanup

* else if

* small docs

* icon_item_field_static

* dungeon static

* eol

* icon item jpn static

* vtx static

* jpn static comments

* import parameter texture functions

* mask cleanup

* sync with PRs

* some docs

* more docs

* fix bss

* some docs

* sync with PR

* quest docs

* fix quest vtx

* sync with PR

* sync with PR

* fix typo

* small cleanup

* vtx madness

* more vtx

* add quad docs

* cleanup vtx

* cleanup

* cleanup

* revert gbi changes

* cleanup

* more cleanup

* another cleanup

* remove empty comment

* some PR review

* more naming suggestions

* namefixer

* L button to Z button

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

2 files changed, 10 insertions, 10 deletions

diff --git a/include/variables.h b/include/variables.h
index 4e3559077..e7dc43da0 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -600,7 +600,7 @@ extern UNK_PTR D_801C5CB0;
 // extern UNK_TYPE2 D_801C6A8C;
 // extern UNK_TYPE2 D_801C6A90;
 // extern UNK_TYPE2 D_801C6A94;
-extern u8 D_801C6A98[5][5];
+extern u8 gPageSwitchNextButtonStatus[6][5];
 // extern UNK_TYPE1 D_801C6AB8;
 // extern UNK_TYPE1 D_801C6B28;
 // extern UNK_TYPE1 D_801CED40;
diff --git a/include/z64.h b/include/z64.h
index 05aad655e..12738f9a7 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -200,7 +200,7 @@ typedef struct {
     /* 0x204 */ u16 pageIndex;
     /* 0x206 */ u16 switchPageTimer;
     /* 0x208 */ u16 savePromptState;
-    /* 0x20C */ f32 unk_20C;
+    /* 0x20C */ f32 unk_20C; // set to 936.0f, unused remnant from OoT
     /* 0x210 */ f32 itemPageRoll; // rotation (-z) of the item page into the screen
     /* 0x214 */ f32 mapPageRoll; // rotation (+x) of the map page into the screen
     /* 0x218 */ f32 questPageRoll; // rotation (+z) of the quest page into the screen
@@ -216,7 +216,7 @@ typedef struct {
     /* 0x24C */ s16 cursorYIndex[5];
     /* 0x256 */ s16 unk_256; // Uses DungeonItem enum
     /* 0x258 */ s16 cursorSpecialPos;
-    /* 0x25A */ s16 pageSwitchTimer;
+    /* 0x25A */ s16 pageSwitchInputTimer; // Used to introduce a delay before switching page when arriving on the "scroll left/right" positions while holding stick left/right.
     /* 0x25C */ u16 namedItem;
     /* 0x25E */ u16 cursorItem[5];
     /* 0x268 */ u16 cursorSlot[5];
@@ -227,15 +227,15 @@ typedef struct {
     /* 0x27A */ s16 equipAnimY;
     /* 0x27C */ s16 equipAnimAlpha;
     /* 0x27E */ s16 infoPanelOffsetY;
-    /* 0x280 */ u16 unk_280;
+    /* 0x280 */ u16 nameDisplayTimer;
     /* 0x282 */ u16 nameColorSet;
     /* 0x284 */ s16 cursorColorSet;
-    /* 0x286 */ s16 unk_286;
-    /* 0x288 */ f32 unk_288;
-    /* 0x28C */ f32 unk_28C;
-    /* 0x290 */ f32 unk_290;
-    /* 0x294 */ f32 unk_294;
-    /* 0x298 */ f32 unk_298;
+    /* 0x286 */ s16 cursorSpinPhase;
+    /* 0x288 */ f32 cursorX;
+    /* 0x28C */ f32 cursorY;
+    /* 0x290 */ f32 cursorWidth;
+    /* 0x294 */ f32 cursorHeight;
+    /* 0x298 */ f32 cursorShrinkRate;
     /* 0x29C */ s16 promptChoice; // save/continue choice: 0 = yes; 4 = no
     /* 0x29E */ s16 promptAlpha;
     /* 0x2A0 */ s16 ocarinaSongIndex;