`z_parameter`: Buttons (part 9) (#1192)

* import button docs

* cleanup

* sync timer val

* add flag comments

* Update src/code/z_parameter.c

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

* Update src/code/z_parameter.c

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

* Update src/code/z_parameter.c

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

* fix merge master

---------

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

4 files changed, 16 insertions, 5 deletions

diff --git a/include/functions.h b/include/functions.h
index 793ac829b..f87ec4ff6 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -1693,12 +1693,12 @@ void Interface_StartTimer(s16 timerId, s16 seconds);
 void Interface_StartPostmanTimer(s16 seconds, s16 bunnyHoodState);
 void Interface_NewDay(PlayState* play, s32 day);
 void Interface_SetHudVisibility(u16 hudVisibility);
-void func_80110038(PlayState* play);
+void Interface_UpdateButtonsPart2(PlayState* play);
 void Interface_SetSceneRestrictions(PlayState* play);
 void Interface_InitMinigame(PlayState* play);
 void Interface_LoadItemIconImpl(PlayState* play, u8 btn);
 void Interface_LoadItemIcon(PlayState* play, u8 btn);
-void func_80112C0C(PlayState* play, u16 flag);
+void Interface_UpdateButtonsAlt(PlayState* play, u16 flag);
 u8 Item_Give(PlayState* play, u8 item);
 u8 Item_CheckObtainability(u8 item);
 void Inventory_DeleteItem(s16 item, s16 slot);
diff --git a/include/z64interface.h b/include/z64interface.h
index 385f80835..e01baa425 100644
--- a/include/z64interface.h
+++ b/include/z64interface.h
@@ -134,7 +134,7 @@ typedef struct {
     /* 0x218 */ f32 aButtonRoll;
     /* 0x21C */ s16 unk_21C;
     /* 0x21E */ s16 bButtonDoAction;
-    /* 0x220 */ s16 unk_220;
+    /* 0x220 */ s16 tatlCalling;
     /* 0x222 */ s16 unk_222;
     /* 0x224 */ s16 unk_224;
     /* 0x226 */ s16 lifeColorChange;
diff --git a/include/z64player.h b/include/z64player.h
index 96abf00c8..456eba3eb 100644
--- a/include/z64player.h
+++ b/include/z64player.h
@@ -990,7 +990,7 @@ typedef struct Player {
     /* 0xB5D */ u8 unk_B5D;
     /* 0xB5E */ u8 unk_B5E;
     /* 0xB5F */ u8 unk_B5F;
-    /* 0xB60 */ u16 unk_B60; // blast mask timer?
+    /* 0xB60 */ u16 blastMaskTimer;
     /* 0xB62 */ s16 unk_B62;
     /* 0xB64 */ u8 unk_B64;
     /* 0xB65 */ u8 shockTimer;
diff --git a/include/z64save.h b/include/z64save.h
index 0037c5aa5..f6e9145df 100644
--- a/include/z64save.h
+++ b/include/z64save.h
@@ -313,7 +313,7 @@ typedef struct SaveContext {
     /* 0x0000 */ Save save;
     /* 0x100C */ u8 eventInf[8];                        // "event_inf"
     /* 0x1014 */ u8 unk_1014;                           // "stone_set_flag"
-    /* 0x1015 */ u8 unk_1015;
+    /* 0x1015 */ u8 bButtonStatus;
     /* 0x1016 */ u16 jinxTimer;
     /* 0x1018 */ s16 rupeeAccumulator;                  // "lupy_udct"
     /* 0x101A */ u8 bottleTimerStates[BOTTLE_MAX]; // See the `BottleTimerState` enum. "bottle_status"
@@ -572,8 +572,11 @@ typedef enum SunsSongState {
 #define WEEKEVENTREG_07_10 PACK_WEEKEVENTREG_FLAG(7, 0x10)
 #define WEEKEVENTREG_07_20 PACK_WEEKEVENTREG_FLAG(7, 0x20)
 #define WEEKEVENTREG_07_40 PACK_WEEKEVENTREG_FLAG(7, 0x40)
+
 // Entrance cutscene watched to the prison where the deku princess is kept. Also set in door_warp1.c
 #define WEEKEVENTREG_ENTERED_WOODFALL_TEMPLE_PRISON PACK_WEEKEVENTREG_FLAG(7, 0x80)
+
+// Related to Honey & Darling minigame
 #define WEEKEVENTREG_08_01 PACK_WEEKEVENTREG_FLAG(8, 0x01)
 #define WEEKEVENTREG_08_02 PACK_WEEKEVENTREG_FLAG(8, 0x02)
 #define WEEKEVENTREG_08_04 PACK_WEEKEVENTREG_FLAG(8, 0x04)
@@ -1267,6 +1270,7 @@ typedef enum SunsSongState {
 // check if already healed Kamaro the Dancing Ghost
 #define WEEKEVENTREG_82_04 PACK_WEEKEVENTREG_FLAG(82, 0x04)
 
+// Related to Swordsman's log minigame
 #define WEEKEVENTREG_82_08 PACK_WEEKEVENTREG_FLAG(82, 0x08)
 #define WEEKEVENTREG_82_10 PACK_WEEKEVENTREG_FLAG(82, 0x10)
 #define WEEKEVENTREG_82_20 PACK_WEEKEVENTREG_FLAG(82, 0x20)
@@ -1290,6 +1294,7 @@ typedef enum SunsSongState {
 #define WEEKEVENTREG_84_10 PACK_WEEKEVENTREG_FLAG(84, 0x10)
 
 // Unconfirmed: "Obtained Fierce Deity's Mask?"
+// Also related to moon child
 #define WEEKEVENTREG_84_20 PACK_WEEKEVENTREG_FLAG(84, 0x20)
 
 #define WEEKEVENTREG_84_40 PACK_WEEKEVENTREG_FLAG(84, 0x40)
@@ -1354,6 +1359,8 @@ typedef enum SunsSongState {
 #define WEEKEVENTREG_90_04 PACK_WEEKEVENTREG_FLAG(90, 0x04)
 #define WEEKEVENTREG_90_08 PACK_WEEKEVENTREG_FLAG(90, 0x08)
 #define WEEKEVENTREG_90_10 PACK_WEEKEVENTREG_FLAG(90, 0x10)
+
+// Related to Fishermans's jumping minigame
 #define WEEKEVENTREG_90_20 PACK_WEEKEVENTREG_FLAG(90, 0x20)
 #define WEEKEVENTREG_90_40 PACK_WEEKEVENTREG_FLAG(90, 0x40)
 #define WEEKEVENTREG_90_80 PACK_WEEKEVENTREG_FLAG(90, 0x80)
@@ -1493,11 +1500,15 @@ typedef enum SunsSongState {
 #define EVENTINF_32 0x32
 
 #define EVENTINF_33 0x33
+
+// Related to Deku playground minigame
 #define EVENTINF_34 0x34
 #define EVENTINF_35 0x35
 #define EVENTINF_36 0x36
 #define EVENTINF_37 0x37
 #define EVENTINF_40 0x40
+
+// Related to swamp boat (non-minigame)?
 #define EVENTINF_41 0x41
 #define EVENTINF_42 0x42
 #define EVENTINF_43 0x43