From 7b2fe32050c72bf00a9cce96a6ec2bcd15e1c4a2 Mon Sep 17 00:00:00 2001 From: surskitty Date: Mon, 28 Jul 2025 07:11:04 -0400 Subject: [PATCH] Make B_VAR_STARTING_STATUS tests run in CI (#7419) --- include/config/test.h | 4 ++++ include/constants/vars.h | 18 +++++++++--------- test/battle/starting_status/terrain.c | 27 ++++++++++++++------------- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/include/config/test.h b/include/config/test.h index 6122d14aa1..9e880d57c7 100644 --- a/include/config/test.h +++ b/include/config/test.h @@ -1132,6 +1132,10 @@ // Vars #undef B_VAR_DIFFICULTY #define B_VAR_DIFFICULTY TESTING_VAR_DIFFICULTY +#undef B_VAR_STARTING_STATUS +#define B_VAR_STARTING_STATUS TESTING_VAR_STARTING_STATUS +#undef B_VAR_STARTING_STATUS_TIMER +#define B_VAR_STARTING_STATUS_TIMER TESTING_VAR_STARTING_STATUS_TIMER // Flags #undef B_FLAG_SLEEP_CLAUSE diff --git a/include/constants/vars.h b/include/constants/vars.h index aac52dec0e..a12c2ff3a5 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -325,15 +325,15 @@ #define VAR_TEMP_TRANSFERRED_SPECIES VAR_TEMP_1 #if TESTING -#define TESTING_VARS_START 0x9000 -#define TESTING_VAR_DIFFICULTY (TESTING_VARS_START + 0x0) -#define TESTING_VAR_UNUSED_1 (TESTING_VARS_START + 0x1) -#define TESTING_VAR_UNUSED_2 (TESTING_VARS_START + 0x2) -#define TESTING_VAR_UNUSED_3 (TESTING_VARS_START + 0x3) -#define TESTING_VAR_UNUSED_4 (TESTING_VARS_START + 0x4) -#define TESTING_VAR_UNUSED_5 (TESTING_VARS_START + 0x5) -#define TESTING_VAR_UNUSED_6 (TESTING_VARS_START + 0x6) -#define TESTING_VAR_UNUSED_7 (TESTING_VARS_START + 0x7) +#define TESTING_VARS_START 0x9000 +#define TESTING_VAR_DIFFICULTY (TESTING_VARS_START + 0x0) +#define TESTING_VAR_STARTING_STATUS (TESTING_VARS_START + 0x1) +#define TESTING_VAR_STARTING_STATUS_TIMER (TESTING_VARS_START + 0x2) +#define TESTING_VAR_UNUSED_3 (TESTING_VARS_START + 0x3) +#define TESTING_VAR_UNUSED_4 (TESTING_VARS_START + 0x4) +#define TESTING_VAR_UNUSED_5 (TESTING_VARS_START + 0x5) +#define TESTING_VAR_UNUSED_6 (TESTING_VARS_START + 0x6) +#define TESTING_VAR_UNUSED_7 (TESTING_VARS_START + 0x7) #endif // TESTING #endif // GUARD_CONSTANTS_VARS_H diff --git a/test/battle/starting_status/terrain.c b/test/battle/starting_status/terrain.c index ab31bbbb96..3d84dba000 100644 --- a/test/battle/starting_status/terrain.c +++ b/test/battle/starting_status/terrain.c @@ -29,19 +29,20 @@ SINGLE_BATTLE_TEST("B_VAR_STARTING_STATUS starts a chosen terrain at the beginni TURN { ; } TURN { ; } } SCENE { - switch (terrain) { - case STARTING_STATUS_GRASSY_TERRAIN: - MESSAGE("Grass grew to cover the battlefield!"); - break; - case STARTING_STATUS_PSYCHIC_TERRAIN: - MESSAGE("The battlefield got weird!"); - break; - case STARTING_STATUS_MISTY_TERRAIN: - MESSAGE("Mist swirled around the battlefield!"); - break; - case STARTING_STATUS_ELECTRIC_TERRAIN: - MESSAGE("An electric current is running across the battlefield!"); - break; + switch (terrain) + { + case STARTING_STATUS_GRASSY_TERRAIN: + MESSAGE("The battlefield is covered with grass!"); + break; + case STARTING_STATUS_PSYCHIC_TERRAIN: + MESSAGE("The battlefield seems weird!"); + break; + case STARTING_STATUS_MISTY_TERRAIN: + MESSAGE("Mist swirls around the battlefield!"); + break; + case STARTING_STATUS_ELECTRIC_TERRAIN: + MESSAGE("An electric current is running across the battlefield!"); + break; } ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_RESTORE_BG); NONE_OF {