Fixed compatibility with Pokémon Expansion

LOuroboros · Nov 15, 2020 · 4da357a · 4da357a
1 parent 686ff59
commit 4da357a
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 24 deletions.
diff --git a/include/constants/battle_config.h b/include/constants/battle_config.h
@@ -3,26 +3,38 @@
 
 // Species with peculiar battle effects.
 #ifndef POKEMON_EXPANSION
-    #define SPECIES_DIALGA            0
-    #define SPECIES_PALKIA            0
-    #define SPECIES_GIRATINA          0
-    #define SPECIES_CHERRIM           0
-    #define SPECIES_ARCEUS            0
-    #define SPECIES_SILVALLY          0
-    #define SPECIES_GENESECT          0
-    #define SPECIES_AEGISLASH         0
-    #define SPECIES_AEGISLASH_BLADE   10000
-    #define SPECIES_MIMIKYU           0
-    #define SPECIES_MIMIKYU_BUSTED    10001
-    #define SPECIES_DARMANITAN        0
-    #define SPECIES_DARMANITAN_ZEN    10002
-    #define SPECIES_MINIOR_CORE       0
-    #define SPECIES_MINIOR            10003
-    #define SPECIES_WISHIWASHI        0
-    #define SPECIES_WISHIWASHI_SCHOOL 10004
-    #define SPECIES_ZYGARDE           0     // 50%
-    #define SPECIES_ZYGARDE_10        10005 // 10 %
-    #define SPECIES_ZYGARDE_COMPLETE  10006 // 100 %
+    #define SPECIES_DIALGA                  0
+    #define SPECIES_PALKIA                  0
+    #define SPECIES_GIRATINA                0
+    #define SPECIES_CHERRIM                 0
+    #define SPECIES_ARCEUS                  0
+    #define SPECIES_SILVALLY                0
+    #define SPECIES_GENESECT                0
+    #define SPECIES_AEGISLASH               0
+    #define SPECIES_AEGISLASH_BLADE         10000
+    #define SPECIES_MIMIKYU                 0
+    #define SPECIES_MIMIKYU_BUSTED          10001
+    #define SPECIES_DARMANITAN              0
+    #define SPECIES_DARMANITAN_ZEN_MODE     10002
+    #define SPECIES_MINIOR_CORE_RED         0
+    #define SPECIES_MINIOR                  10003
+    #define SPECIES_MINIOR_CORE_BLUE        0
+    #define SPECIES_MINIOR_METEOR_BLUE      10004
+    #define SPECIES_MINIOR_CORE_GREEN       0
+    #define SPECIES_MINIOR_METEOR_GREEN     10005
+    #define SPECIES_MINIOR_CORE_INDIGO      0
+    #define SPECIES_MINIOR_METEOR_INDIGO    10006
+    #define SPECIES_MINIOR_CORE_ORANGE      0
+    #define SPECIES_MINIOR_METEOR_ORANGE    10007
+    #define SPECIES_MINIOR_CORE_VIOLET      0
+    #define SPECIES_MINIOR_METEOR_VIOLET    10008
+    #define SPECIES_MINIOR_CORE_YELLOW      0
+    #define SPECIES_MINIOR_METEOR_YELLOW    10009
+    #define SPECIES_WISHIWASHI              0
+    #define SPECIES_WISHIWASHI_SCHOOL       10010
+    #define SPECIES_ZYGARDE                 0     // 50%
+    #define SPECIES_ZYGARDE_10              10011 // 10 %
+    #define SPECIES_ZYGARDE_COMPLETE        10012 // 100 %
 #endif
 
 // Items with peculiar battle effects.

diff --git a/src/battle_util.c b/src/battle_util.c
@@ -3473,8 +3473,14 @@ static bool32 ShouldChangeFormHpBased(u32 battler)
     // Ability,     form >, form <=, hp divided
     static const u16 forms[][4] =
     {
-        {ABILITY_ZEN_MODE, SPECIES_DARMANITAN, SPECIES_DARMANITAN_ZEN, 2},
-        {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR, SPECIES_MINIOR_CORE, 2},
+        {ABILITY_ZEN_MODE, SPECIES_DARMANITAN, SPECIES_DARMANITAN_ZEN_MODE, 2},
+        {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR, SPECIES_MINIOR_CORE_RED, 2},
+        {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_BLUE, SPECIES_MINIOR_CORE_BLUE, 2},
+        {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_GREEN, SPECIES_MINIOR_CORE_GREEN, 2},
+        {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_INDIGO, SPECIES_MINIOR_CORE_INDIGO, 2},
+        {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_ORANGE, SPECIES_MINIOR_CORE_ORANGE, 2},
+        {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_VIOLET, SPECIES_MINIOR_CORE_VIOLET, 2},
+        {ABILITY_SHIELDS_DOWN, SPECIES_MINIOR_METEOR_YELLOW, SPECIES_MINIOR_CORE_YELLOW, 2},
         {ABILITY_SCHOOLING, SPECIES_WISHIWASHI_SCHOOL, SPECIES_WISHIWASHI, 4},
     };
     u32 i;
@@ -7616,8 +7622,14 @@ void UndoFormChange(u32 monId, u32 side)
     {
         {SPECIES_AEGISLASH_BLADE, SPECIES_AEGISLASH},
         {SPECIES_MIMIKYU_BUSTED, SPECIES_MIMIKYU},
-        {SPECIES_DARMANITAN_ZEN, SPECIES_DARMANITAN},
-        {SPECIES_MINIOR, SPECIES_MINIOR_CORE},
+        {SPECIES_DARMANITAN_ZEN_MODE, SPECIES_DARMANITAN},
+        {SPECIES_MINIOR, SPECIES_MINIOR_CORE_RED},
+        {SPECIES_MINIOR_CORE_BLUE, SPECIES_MINIOR_METEOR_BLUE},
+        {SPECIES_MINIOR_CORE_GREEN, SPECIES_MINIOR_METEOR_GREEN},
+        {SPECIES_MINIOR_CORE_INDIGO, SPECIES_MINIOR_METEOR_INDIGO},
+        {SPECIES_MINIOR_CORE_ORANGE, SPECIES_MINIOR_METEOR_ORANGE},
+        {SPECIES_MINIOR_CORE_VIOLET, SPECIES_MINIOR_METEOR_VIOLET},
+        {SPECIES_MINIOR_CORE_YELLOW, SPECIES_MINIOR_METEOR_YELLOW},
         {SPECIES_WISHIWASHI_SCHOOL, SPECIES_WISHIWASHI},
     };