From 8fb7eebfb9310ab22edf222293d81203c638259d Mon Sep 17 00:00:00 2001
From: lioniac <80606013+lioniac@users.noreply.github.com>
Date: Mon, 26 Sep 2022 10:29:31 -0300
Subject: [PATCH 1/2] Naming Mystery Gift Vars

---
 src/event_data.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/event_data.c b/src/event_data.c
index f5ec179e0..ac227177d 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -141,13 +141,13 @@ void ResetMysteryEventFlags(void)
 void ResetMysteryEventVars(void)
 {
     VarSet(VAR_EVENT_PICHU_SLOT, 0);
-    VarSet(VAR_0x40B6, 0);
-    VarSet(VAR_0x40B7, 0);
-    VarSet(VAR_0x40B8, 0);
-    VarSet(VAR_0x40B9, 0);
-    VarSet(VAR_0x40BA, 0);
-    VarSet(VAR_0x40BB, 0);
-    VarSet(VAR_0x40BC, 0);
+    VarSet(VAR_MYSTERY_GIFT_1,  0);
+    VarSet(VAR_MYSTERY_GIFT_2,  0);
+    VarSet(VAR_MYSTERY_GIFT_3,  0);
+    VarSet(VAR_MYSTERY_GIFT_4,  0);
+    VarSet(VAR_MYSTERY_GIFT_5,  0);
+    VarSet(VAR_MYSTERY_GIFT_6,  0);
+    VarSet(VAR_MYSTERY_GIFT_7,  0);
     VarSet(VAR_ALTERING_CAVE_WILD_SET, 0);
 }
 

From fe757ff8aeac4b8b43a3fc353d0f7cef09c57d11 Mon Sep 17 00:00:00 2001
From: lioniac <80606013+lioniac@users.noreply.github.com>
Date: Mon, 26 Sep 2022 10:31:44 -0300
Subject: [PATCH 2/2] Updated vars.h

---
 include/constants/vars.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/constants/vars.h b/include/constants/vars.h
index 0db01238c..0a88f6508 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -230,13 +230,13 @@
 #define VAR_0x40B3                 0x40B3
 #define VAR_PORTHOLE               0x40B4
 #define VAR_EVENT_PICHU_SLOT       0x40B5
-#define VAR_0x40B6                 0x40B6
-#define VAR_0x40B7                 0x40B7
-#define VAR_0x40B8                 0x40B8
-#define VAR_0x40B9                 0x40B9
-#define VAR_0x40BA                 0x40BA
-#define VAR_0x40BB                 0x40BB
-#define VAR_0x40BC                 0x40BC
+#define VAR_MYSTERY_GIFT_1         0x40B6
+#define VAR_MYSTERY_GIFT_2         0x40B7
+#define VAR_MYSTERY_GIFT_3         0x40B8
+#define VAR_MYSTERY_GIFT_4         0x40B9
+#define VAR_MYSTERY_GIFT_5         0x40BA
+#define VAR_MYSTERY_GIFT_6         0x40BB
+#define VAR_MYSTERY_GIFT_7         0x40BC
 #define VAR_0x40BD                 0x40BD
 #define VAR_0x40BE                 0x40BE
 #define VAR_0x40BF                 0x40BF