Fixed Gimmick tests failing when running first (rh-hideout#6001)

Liamjd14 · Jan 11, 2025 · 8427d47 · 8427d47
1 parent 71cf1bf
commit 8427d47
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/test/battle/gimmick/dynamax.c b/test/battle/gimmick/dynamax.c
@@ -458,7 +458,6 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Max Moves deal 1/4 damage through protect", s16 da
     }
 }
 
-//  This test will fail if it's the first test a thread runs
 SINGLE_BATTLE_TEST("(DYNAMAX) Max Moves don't bypass Max Guard")
 {
     GIVEN {
@@ -1536,7 +1535,6 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Moxie clones can be triggered by Max Moves faintin
     }
 }
 
-//  This test will fail if it's the first test a thread runs
 SINGLE_BATTLE_TEST("(DYNAMAX) Max Attacks prints a message when hitting into Max Guard")
 {
     GIVEN {

diff --git a/test/test_runner_battle.c b/test/test_runner_battle.c
@@ -2117,7 +2117,7 @@ void MoveGetIdAndSlot(s32 battlerId, struct MoveContext *ctx, u32 *moveId, u32 *
         u32 item = GetMonData(mon, MON_DATA_HELD_ITEM);
         u32 holdEffect = ItemId_GetHoldEffect(item);
         u32 species = GetMonData(mon, MON_DATA_SPECIES);
-        u32 side = GetBattlerSide(battlerId);
+        u32 side = battlerId & BIT_SIDE;
 
         // Check invalid item usage.
         INVALID_IF(ctx->gimmick == GIMMICK_MEGA && holdEffect != HOLD_EFFECT_MEGA_STONE && species != SPECIES_RAYQUAZA, "Cannot Mega Evolve without a Mega Stone");
-Original file line number
+Diff line change
@@ Expand Up @@
         }
     }
-    //  This test will fail if it's the first test a thread runs
     SINGLE_BATTLE_TEST("(DYNAMAX) Max Moves don't bypass Max Guard")
     {
         GIVEN {
@@ Expand Down Expand Up @@
         }
     }
-    //  This test will fail if it's the first test a thread runs
     SINGLE_BATTLE_TEST("(DYNAMAX) Max Attacks prints a message when hitting into Max Guard")
     {
         GIVEN {
@@ Expand Down @@