Merge branch 'master' into vs_seeker

2018-10-17 11:05:44 -07:00
parent 46e957bacd d05339979e
commit aa6e1a91fc
134 changed files with 12517 additions and 22323 deletions
@@ -1288,6 +1288,13 @@
 #define TRAINERS_FLAG_NO    0x356
 #define CODE_FLAGS          (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x860

+// TODO: Find what these are
+#define FLAG_UNK820         0x820
+#define FLAG_UNK824         0x824
+#define FLAG_UNK826         0x826
+
+#define FLAG_UNK843         0x843
+
 // SYSTEM FLAGS

 // 0x860