diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 05:43:06 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 05:43:06 -0500 |
| commit | ef67f2d33b45348d76d722f250cdbcc8485be264 (patch) | |
| tree | 2fb5d08a962dea3329bcd876ea2d237cf8c6d3c1 /include/constants/frontier_util.h | |
| parent | 68cdd7b1cb5a293b3de42185fe17d85b4067b3ad (diff) | |
Merge master into ObjEvent rename and prune accidental inclusions
Diffstat (limited to 'include/constants/frontier_util.h')
| -rw-r--r-- | include/constants/frontier_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/constants/frontier_util.h b/include/constants/frontier_util.h index d71809169..a310dbb2d 100644 --- a/include/constants/frontier_util.h +++ b/include/constants/frontier_util.h @@ -42,7 +42,7 @@ #define FRONTIER_DATA_PAUSED 3 #define FRONTIER_DATA_SELECTED_MON_ORDER 4 #define FRONTIER_DATA_BATTLE_OUTCOME 5 -#define FRONTIER_DATA_6 6 +#define FRONTIER_DATA_RECORD_DISABLED 6 #define FRONTIER_DATA_HEARD_BRAIN_SPEECH 7 #define STREAK_TOWER_SINGLES_50 (1 << 0) |