Merge branch 'master' into link

2017-11-27 20:05:51 -05:00
parent 73b0f9eb53 18c6b8efc2
commit cbd2718b5e
106 changed files with 13373 additions and 14129 deletions
--- a/include/flags.h
+++ b/include/flags.h
@@ -1,7 +1,9 @@
 #ifndef GUARD_FLAGS_H
 #define GUARD_FLAGS_H

-#define FLAG_PENDING_DAYCARE_EGG    0x86
+#define FLAG_340 0x340
+#define FLAG_LEGENDARIES_IN_SOOTOPOLIS  0x53
+#define FLAG_PENDING_DAYCARE_EGG        0x86

 #define FLAG_TRAINER_FLAG_START  0x500