Merge master into ObjEvent rename and prune accidental inclusions

2020-01-08 05:43:06 -05:00
parent 68cdd7b1cb
commit ef67f2d33b
85 changed files with 4548 additions and 4729 deletions
--- 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)