summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJordan Longstaff <JordanLongstaff@users.noreply.github.com>2024-12-12 10:43:58 -0500
committerGitHub <noreply@github.com>2024-12-12 10:43:58 -0500
commitc57dff4f78dbeba3defde8b9727628e3abb03c52 (patch)
treeeddc35fc5cff5a13853e3cd0af18c1c0ecedf15a /include
parentc780c4e147ddeb56c59fa44e2d9ccc7d9fbc00b8 (diff)
Rename item get flags for Forest Stage upgrades (#2333)
* Rename item get flags for Forest Stage upgrades * Fix Jenkins build error * Document shared flag bug * Rename shared flag * Massive documenting comments * GDI - remove one trailing whitespace
Diffstat (limited to 'include')
-rw-r--r--include/z64save.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/z64save.h b/include/z64save.h
index f3f8eb9c8..a4448fe58 100644
--- a/include/z64save.h
+++ b/include/z64save.h
@@ -699,8 +699,11 @@ typedef enum LinkAge {
#define ITEMGETINF_1B 0x1B
#define ITEMGETINF_1C 0x1C
#define ITEMGETINF_1D 0x1D
-#define ITEMGETINF_1E 0x1E
-#define ITEMGETINF_1F 0x1F
+#define ITEMGETINF_FOREST_STAGE_STICK_UPGRADE 0x1E
+// This flag is shared by two events; It is set when obtaining the Deku Nut upgrade at the Forest Stage and when obtaining Poachers Saw.
+// This will make obtaining the Deku Nut upgrade impossible if Poachers Saw is obtained first.
+// This flag is never read for the Poachers Saw event, so the overlap only causes an issue for the Deku Nut Upgrade. It will not prevent obtaining Poachers Saw.
+#define ITEMGETINF_FOREST_STAGE_NUT_UPGRADE 0x1F
#define ITEMGETINF_23 0x23
#define ITEMGETINF_24 0x24
#define ITEMGETINF_25 0x25