summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDragorn421 <Dragorn421@users.noreply.github.com>2022-10-04 19:13:40 +0200
committerGitHub <noreply@github.com>2022-10-04 13:13:40 -0400
commit9771afdc6945f174a8d2d2b5b3564010686aeafa (patch)
tree56fd789c36594f133c62c7d3fde46f98992b1f07 /include
parent1cb00350d94b98a70574545ebb5d858fd8532fe6 (diff)
Some pause menu inputs doc (#1370)
* `PauseContext.pageSwitchTimer` -> `delaySwitchPageInputTimer` * Document stick input repeat in the pause menu * format * `delaySwitchPageInputTimer` -> `pageSwitchInputTimer` * Fix swapped delay and delay_first, oops * Move timer incrs on their own lines Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Diffstat (limited to 'include')
-rw-r--r--include/regs.h2
-rw-r--r--include/z64.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/regs.h b/include/regs.h
index a873e34c9..7c58c035c 100644
--- a/include/regs.h
+++ b/include/regs.h
@@ -106,6 +106,8 @@
#define R_TRANS_DBG_TYPE CREG(12)
#define R_ENV_WIND_DIR(i) CREG(16 + (i))
#define R_ENV_WIND_SPEED CREG(19)
+#define R_PAUSE_STICK_REPEAT_DELAY XREG(6)
+#define R_PAUSE_STICK_REPEAT_DELAY_FIRST XREG(8)
#define R_A_BTN_Y XREG(16)
#define R_A_BTN_X XREG(17)
#define R_A_ICON_Y XREG(19)
diff --git a/include/z64.h b/include/z64.h
index d6d5e7ba1..2d8e08757 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -786,7 +786,7 @@ typedef struct {
/* 0x022C */ s16 cursorY[5]; // "cur_ypt"
/* 0x0236 */ s16 dungeonMapSlot;
/* 0x0238 */ s16 cursorSpecialPos; // "key_angle"
- /* 0x023A */ s16 pageSwitchTimer;
+ /* 0x023A */ s16 pageSwitchInputTimer; // Used to introduce a delay before switching page when arriving on the "scroll left/right" positions while holding stick left/right.
/* 0x023C */ u16 namedItem; // "zoom_name"
/* 0x023E */ u16 cursorItem[4]; // "select_name"
/* 0x0246 */ u16 cursorSlot[4];