Merge branch 'master' into decomp_egg_hatch

2017-09-18 23:50:08 +02:00
parent 2e7127284f e23fb64dad
commit f255cbd7dc
21 changed files with 6969 additions and 11534 deletions
@@ -439,6 +439,12 @@ struct BattleMove
    u8 flags;
 };

+#define FLAG_MAKES_CONTACT          0x1
+#define FLAG_PROTECT_AFFECTED       0x2
+#define FLAG_MAGICCOAT_AFFECTED     0x4
+#define FLAG_SNATCH_AFFECTED        0x8
+#define FLAG_KINGSROCK_AFFECTED     0x20
+
 struct SpindaSpot
 {
    u8 x, y;