add some vars

4 files changed, 19 insertions, 8 deletions

diff --git a/include/vars.h b/include/vars.h
index 69939804a..265f903ba 100644
--- a/include/vars.h
+++ b/include/vars.h
@@ -1,10 +1,21 @@
 #ifndef GUARD_VARS_H
 #define GUARD_VARS_H
 
+#define VAR_RECYCLE_GOODS       0x4020
 #define VAR_REPEL_STEP_COUNT    0x4021
 
+#define VAR_FIRST_POKE          0x4023
+#define VAR_MIRAGE_RND_H        0x4024
+#define VAR_MIRAGE_RND_L        0x4025
+
 #define VAR_RESET_RTC_ENABLE    0x402C
 
+#define VAR_DAYS                0x4040
+
+#define VAR_POKELOT_PRIZE       0x4045
 #define VAR_NATIONAL_DEX        0x4046
 
+#define VAR_POKELOT_RND1        0x404B
+#define VAR_POKELOT_RND2        0x404C
+
 #endif // GUARD_VARS_H
diff --git a/src/clock.c b/src/clock.c
index feefae16c..cc02dc9a0 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -24,7 +24,7 @@ void sub_806A328(void)
     FlagSet(SYS_CLOCK_SET);
     RtcCalcLocalTime();
     gSaveBlock2.lastBerryTreeUpdate = gLocalTime;
-    VarSet(0x4040, gLocalTime.days);
+    VarSet(VAR_DAYS, gLocalTime.days);
 }
 
 void DoTimeBasedEvents(void)
@@ -39,7 +39,7 @@ void DoTimeBasedEvents(void)
 
 void sub_806A390(struct Time *time)
 {
-    u16 *varPtr = GetVarPointer(0x4040);
+    u16 *varPtr = GetVarPointer(VAR_DAYS);
     int days = *varPtr;
     u16 newDays;
 
diff --git a/src/lottery_corner.c b/src/lottery_corner.c
index 54ba3c46d..4d80f86c2 100644
--- a/src/lottery_corner.c
+++ b/src/lottery_corner.c
@@ -22,7 +22,7 @@ void ResetLotteryCorner(void)
     u16 rand = Random();
 
     SetLotteryNumber((Random() << 16) | rand);
-    VarSet(0x4045, 0);
+    VarSet(VAR_POKELOT_PRIZE, 0);
 }
 
 void SetRandomLotteryNumber(u16 i)
@@ -147,14 +147,14 @@ void SetLotteryNumber(u32 lotteryNum)
     u16 lowNum = lotteryNum >> 16;
     u16 highNum = lotteryNum;
 
-    VarSet(0x404B, highNum);
-    VarSet(0x404C, lowNum);
+    VarSet(VAR_POKELOT_RND1, highNum);
+    VarSet(VAR_POKELOT_RND2, lowNum);
 }
 
 u32 GetLotteryNumber(void)
 {
-    u16 highNum = VarGet(0x404B);
-    u16 lowNum = VarGet(0x404C);
+    u16 highNum = VarGet(VAR_POKELOT_RND1);
+    u16 lowNum = VarGet(VAR_POKELOT_RND2);
     
     return (lowNum << 16) | highNum;
 }
diff --git a/src/rom4.c b/src/rom4.c
index 971c46584..95d5ec2fd 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -731,7 +731,7 @@ bool16 sub_8053D30(struct WarpData *warp)
 
 bool16 sub_8053D6C(struct WarpData *warp)
 {
-    if (VarGet(16563))
+    if (VarGet(0x40B3))
         return FALSE;
     if (warp->mapGroup != 32)
         return FALSE;