diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-10-13 15:33:19 -0400 |
---|---|---|
committer | GriffinR <griffin.richards@comcast.net> | 2019-10-13 15:33:19 -0400 |
commit | bb23128b77a01d3c39b11aef978acf437ae71974 (patch) | |
tree | f6de6f5278cc10fba0c7ab159365d3ed16ab6bf9 /include/constants/vars.h | |
parent | 144c5888a11115c93ed065c738a8ab395d71a798 (diff) | |
parent | a081124a20896a0cc2ee4fac2df6d4b5440125ef (diff) |
Merge conflict resolves into review changes
Diffstat (limited to 'include/constants/vars.h')
-rw-r--r-- | include/constants/vars.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h index 72b15654e..3030581c6 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -77,7 +77,7 @@ #define VAR_REGICE_STEPS_2 0x403C #define VAR_REGICE_STEPS_3 0x403D #define VAR_ALTERING_CAVE_WILD_SET 0x403E -#define VAR_ALWAYS_ZERO_0x403F 0x403F // This var is read and written, but is always zero. +#define VAR_DISTRIBUTE_EON_TICKET 0x403F // This var is read and written, but is always zero. The only way to obtain the Eon Ticket in Emerald is via Record Mixing #define VAR_DAYS 0x4040 #define VAR_FANCLUB_UNKNOWN_1 0x4041 #define VAR_FANCLUB_UNKNOWN_2 0x4042 |