Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into expansion/ripenfix

include/battle_scripts.h

@@ -489,7 +489,6 @@ extern const u8 BattleScript_ShellTrapSetUp[];
 extern const u8 BattleScript_StealthRockActivates[];
 extern const u8 BattleScript_CouldntFullyProtect[];
 extern const u8 BattleScript_MoveEffectStockpileWoreOff[];
-extern const u8 BattleScript_StealthRockActivates[];
 extern const u8 BattleScript_SpikesActivates[];
 extern const u8 BattleScript_BerserkGeneRet[];
 extern const u8 BattleScript_BerserkGeneRetEnd2[];

test/battle/ability/bad_dreams.c

@@ -2,7 +2,7 @@
 #include "test/battle.h"
 
 // Also checks that non-sleeping enemy is not affected.
-SINGLE_BATTLE_TEST("Bad Dreams causes the sleeping enemy Pokemon to lose 1/8 of hp")
+SINGLE_BATTLE_TEST("Bad Dreams causes the sleeping enemy Pokemon to lose 1/8 of HP")
 {
     u32 status;
     PARAMETRIZE { status = STATUS1_NONE; }

test/battle/ability/ball_fetch.c

@@ -0,0 +1,7 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("Ball Fetch causes the Pokémon to pick up the last failed Ball at the end of the turn");
+TO_DO_BATTLE_TEST("Ball Fetch doesn't trigger if the Pokémon is already holding an item");
+TO_DO_BATTLE_TEST("Ball Fetch only picks up the first failed ball, once per battle"); // Bestow can help test this
+TO_DO_BATTLE_TEST("Ball Fetch doesn't trigger in Max Raid Battles");

test/battle/ability/battery.c

@@ -0,0 +1,5 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("Battery increases Sp. Attack damage of allies by ~30%"); // 5325/4096
+TO_DO_BATTLE_TEST("Battery does not increase its own Sp. Attack damage");

test/battle/ability/beads_of_ruin.c

@@ -73,3 +73,5 @@ SINGLE_BATTLE_TEST("Beads of Ruin's message displays correctly after all battler
         MESSAGE("The opposing Chi-Yu's Beads of Ruin weakened the Sp. Def of all surrounding Pokémon!");
     }
 }
+
+TO_DO_BATTLE_TEST("Beads of Ruin reduce Defense if Wonder Room is active");

test/battle/ability/beast_boost.c

@@ -56,3 +56,16 @@ SINGLE_BATTLE_TEST("Beast Boost doesn't trigger if user is fainted")
         MESSAGE("2 sent out Wobbuffet!");
     }
 }
+
+TO_DO_BATTLE_TEST("Beast Boost boosts Attack 1st in case of a stat tie");
+TO_DO_BATTLE_TEST("Beast Boost boosts Defense 2nd in case of a stat tie");
+TO_DO_BATTLE_TEST("Beast Boost boosts Special Attack 3rd in case of a stat tie");
+TO_DO_BATTLE_TEST("Beast Boost boosts Special Defense 4th in case of a stat tie");
+TO_DO_BATTLE_TEST("Beast Boost considers Power Split");
+TO_DO_BATTLE_TEST("Beast Boost considers Guard Split");
+TO_DO_BATTLE_TEST("Beast Boost considers Power Trick");
+TO_DO_BATTLE_TEST("Beast Boost considers Wonder Room");
+TO_DO_BATTLE_TEST("Beast Boost considers Speed Swap");
+TO_DO_BATTLE_TEST("Beast Boost doesn't consider stat stages");
+TO_DO_BATTLE_TEST("Beast Boost doesn't consider held items");
+TO_DO_BATTLE_TEST("Beast Boost doesn't consider status condition reductions");

test/battle/ability/berserk.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "test/battle.h"
 
-SINGLE_BATTLE_TEST("Berserk activates only if the target had more than 50% of its hp")
+SINGLE_BATTLE_TEST("Berserk activates only if the target had more than 50% of its HP")
 {
     bool32 activates = FALSE;
     u16 maxHp = 500, hp = 0;

test/battle/ability/bulletproof.c

@@ -0,0 +1,4 @@
+#include "global.h"
+#include "test/battle.h"
+
+TO_DO_BATTLE_TEST("Bulletproof makes ballistic moves fail against the ability user");