berry blender fix merge conflicts

2017-11-26 19:21:51 +01:00
parent ad3a97e178 1e4f12e6fa
commit b0657350a4
27 changed files with 1034 additions and 2406 deletions
--- a/include/flags.h
+++ b/include/flags.h
@@ -1,8 +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