wild encounter, fix merge conflicts

2017-11-18 21:45:52 +01:00
parent f8b40754c7 5dc8beb034
commit 3de416662b
59 changed files with 4681 additions and 7626 deletions
--- a/include/flags.h
+++ b/include/flags.h
@@ -1,9 +1,11 @@
 #ifndef GUARD_FLAGS_H
 #define GUARD_FLAGS_H

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

 #define FLAG_TRAINER_FLAG_START  0x500
+
 #define TRAINERS_FLAG_NO    0x356
 #define CODE_FLAGS          (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x860