From 1f3983cb05fc91945004c5dd75507def95e01c05 Mon Sep 17 00:00:00 2001 From: BuffelSaft Date: Sat, 7 Aug 2021 20:38:35 +1200 Subject: [PATCH 1/2] Shields Down protects all meteor form Minior This was only working with red core minior. --- src/battle_script_commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index de7105a270..104c528b82 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7138,7 +7138,7 @@ u32 IsLeafGuardProtected(u32 battler) bool32 IsShieldsDownProtected(u32 battler) { return (gBattleMons[battler].ability == ABILITY_SHIELDS_DOWN - && gBattleMons[battler].species == SPECIES_MINIOR); + && GetFormIdFromFormSpeciesId(gBattleMons[battler].species) < 6); // Minior is not in core form } u32 IsAbilityStatusProtected(u32 battler) From 611da31ae3d269a4f716f0fca7e4986aa53f1c95 Mon Sep 17 00:00:00 2001 From: BuffelSaft Date: Sat, 2 Oct 2021 15:51:16 +1300 Subject: [PATCH 2/2] Fix form ID check The six here should be a seven, and replacing it with this function call is better than hard-coding it. --- src/battle_script_commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a74cb3aaa7..fc9e9a66e2 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7137,7 +7137,7 @@ u32 IsLeafGuardProtected(u32 battler) bool32 IsShieldsDownProtected(u32 battler) { return (gBattleMons[battler].ability == ABILITY_SHIELDS_DOWN - && GetFormIdFromFormSpeciesId(gBattleMons[battler].species) < 6); // Minior is not in core form + && GetFormIdFromFormSpeciesId(gBattleMons[battler].species) < GetFormIdFromFormSpeciesId(SPECIES_MINIOR_CORE_RED)); // Minior is not in core form } u32 IsAbilityStatusProtected(u32 battler)