Merge branch 'master' into link

2017-11-19 00:07:56 -05:00
parent a5498843fa 5dc8beb034
commit d6d315d817
59 changed files with 4682 additions and 7627 deletions
@@ -1,7 +1,10 @@
 #ifndef GUARD_FLAGS_H
 #define GUARD_FLAGS_H

+#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