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

include/functions.h

@@ -2929,7 +2929,7 @@ void AudioOcarina_StartDefault(u32 ocarinaFlags);
 u8 func_8019B5AC(void);
 void AudioOcarina_ResetAndReadInput(void);
 void AudioOcarina_SetOcarinaDisableTimer(u8 unused, u8 timer);
-u32 AudioOcarina_SetInstrument(u8 ocarinaInstrumentId);
+void AudioOcarina_SetInstrument(u8 ocarinaInstrumentId);
 void AudioOcarina_SetPlaybackSong(s8 songIndexPlusOne, u8 playbackState);
 void AudioOcarina_SetRecordingState(u8 recordingState);
 OcarinaStaff* AudioOcarina_GetRecordingStaff(void);

include/regs.h

@@ -50,6 +50,9 @@
 #define R_PAUSE_WORLD_MAP_YAW             YREG(24)
 #define R_PAUSE_WORLD_MAP_Y_OFFSET        YREG(25)
 #define R_PAUSE_WORLD_MAP_DEPTH           YREG(26)
+#define R_PAUSE_DBG_QUEST_CURSOR_ON       YREG(69)
+#define R_PAUSE_DBG_QUEST_CURSOR_X        YREG(70)
+#define R_PAUSE_DBG_QUEST_CURSOR_Y        YREG(71)
 #define R_MAGIC_FILL_COLOR(i)             ZREG(0 + i)
 #define R_C_BTN_COLOR(i)                  ZREG(39 + i)
 #define R_B_BTN_COLOR(i)                  ZREG(43 + i)

include/variables.h

@@ -924,7 +924,7 @@ extern u8 gUpgradeShifts[8];
 extern u16 gUpgradeCapacities[][4];
 extern u32 gGsFlagsMask[];
 extern u32 gGsFlagsShift[];
-extern void* gItemIcons[];
+extern TexturePtr gItemIcons[];
 extern u8 gItemSlots[];
 extern s16 gItemPrices[];
 extern u16 gSceneIdsPerRegion[11][27];
@@ -973,7 +973,7 @@ extern struct_801C5F44 D_801C5F44[]; // D_801C5F44
 extern u8 D_801CFC98;
 extern s16 D_801CFCA4[9];
 // extern UNK_TYPE2 D_801CFCAC;
-// extern UNK_TYPE1 D_801CFCB8;
+extern s16 gOcarinaSongItemMap[];
 // extern UNK_TYPE2 D_801CFCD8;
 // extern UNK_TYPE2 D_801CFCE4;
 // extern UNK_TYPE2 D_801CFCF0;

include/z64.h

@@ -407,7 +407,7 @@ typedef struct {
     /* 0x1E8 */ OSMesg loadMsg;
     /* 0x1EC */ u16 state;
     /* 0x1EE */ u16 debugEditor;
-    /* 0x1F0 */ u8 unk_1F0;
+    /* 0x1F0 */ u8 bombersNotebookOpen;
     /* 0x1F4 */ Vec3f eye;
     /* 0x200 */ u16 unk_200;
     /* 0x202 */ u16 mode;
@@ -452,7 +452,7 @@ typedef struct {
     /* 0x298 */ f32 unk_298;
     /* 0x29C */ s16 promptChoice; // save/continue choice: 0 = yes; 4 = no
     /* 0x29E */ s16 promptAlpha;
-    /* 0x2A0 */ s16 unk_2A0;
+    /* 0x2A0 */ s16 ocarinaSongIndex;
     /* 0x2A2 */ u8 worldMapPoints[20];
     /* 0x2B6 */ u8 unk_2B6;
     /* 0x2B7 */ u8 unk_2B7;
@@ -460,9 +460,9 @@ typedef struct {
     /* 0x2B9 */ u8 itemDescriptionOn; // helpful description of item given through a message box
     /* 0x2BA */ s16 equipAnimScale; // scale of item icon while moving being equipped to c-button
     /* 0x2BC */ s16 equipAnimShrinkRate; // rate the scale is shrinking for the item icon while moving being equipped to c-button
-    /* 0x2BE */ s16 unk_2BE[5];
+    /* 0x2BE */ s16 ocarinaButtonsY[5];
     /* 0x2C8 */ u16 unk_2C8; // Uses PauseMenuPage enum for Owl Warp. Never set.
-    /* 0x2CA */ s16 unk_2CA; // Uses OwlStatueId enum for Owl Warp. Never set.
+    /* 0x2CA */ s16 unk_2CA; // Uses OwlWarpId enum for Owl Warp. Never set.
 } PauseContext; // size = 0x2D0
 
 typedef struct {

include/z64item.h

@@ -40,7 +40,7 @@ typedef enum {
 } UpgradeType;
 
 typedef enum {
-    /* 0x00 */ QUEST_REMAINS_ODOWLA,
+    /* 0x00 */ QUEST_REMAINS_ODOLWA,
     /* 0x01 */ QUEST_REMAINS_GOHT,
     /* 0x02 */ QUEST_REMAINS_GYORG,
     /* 0x03 */ QUEST_REMAINS_TWINMOLD,
@@ -59,8 +59,12 @@ typedef enum {
     /* 0x10 */ QUEST_SONG_STORMS,
     /* 0x11 */ QUEST_SONG_SUN,
     /* 0x12 */ QUEST_BOMBERS_NOTEBOOK, // Obtained Bombers Notebook
-    /* 0x13 */ QUEST_SKULL_TOKEN,
-    /* 0x18 */ QUEST_SONG_LULLABY_INTRO = 0x18,
+    /* 0x13 */ QUEST_QUIVER,
+    /* 0x14 */ QUEST_BOMB_BAG,
+    /* 0x15 */ QUEST_SKULL_TOKEN,
+    /* 0x16 */ QUEST_HEART_PIECE,  // for `pauseCtx->cursorPoint[PAUSE_QUEST]`
+    /* 0x17 */ QUEST_17, // Used in a conditional for quest cursors
+    /* 0x18 */ QUEST_SONG_LULLABY_INTRO,
     /* 0x19 */ QUEST_PICTOGRAPH, // A photo from the pictograph box is saved
     /* 0x1C */ QUEST_HEART_PIECE_COUNT = 0x1C
 } QuestItem;