diff options
author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
---|---|---|
committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
commit | d4532c70cb03962d38517fef2d723f81a9b27c1b (patch) | |
tree | 70220c06025360d7089011f5d80239b61ac183af /include/vars.h | |
parent | 11f9a27640a9f921c6dc1858261d9a609a6599ca (diff) | |
parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) |
fix merge conflicts
Diffstat (limited to 'include/vars.h')
-rw-r--r-- | include/vars.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/vars.h b/include/vars.h index 7c0edeb77..67c0b67fc 100644 --- a/include/vars.h +++ b/include/vars.h @@ -53,4 +53,14 @@ #define VAR_0x40BC 0x40BC #define VAR_0x40C2 0x40C2 +#define VAR_FRONTIER_FACILITY 0x40CF + +#define VAR_DAILY_SLOTS 0x40E6 +#define VAR_DAILY_WILDS 0x40E7 +#define VAR_DAILY_BLENDER 0x40E8 +#define VAR_DAILY_PLANTED_BERRIES 0x40E9 +#define VAR_DAILY_PICKED_BERRIES 0x40EA +#define VAR_DAILY_ROULETTE 0x40EB +#define VAR_DAILY_BP 0x40F1 + #endif // GUARD_VARS_H |