From 87aaeca623864793b606b9c33dfac479b83bc375 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sun, 12 Nov 2023 10:42:33 -0300 Subject: [PATCH 1/2] Fixed IS_DITTO macro (#3558) --- src/daycare.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/daycare.c b/src/daycare.c index 6078135fd..bf8a03e3f 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -28,7 +28,7 @@ extern const struct Evolution gEvolutionTable[][EVOS_PER_MON]; -#define IS_DITTO(species) (gBaseStats[species].eggGroup1 == EGG_GROUP_DITTO || gBaseStats[species].eggGroup2 == EGG_GROUP_DITTO) +#define IS_DITTO(species) (gSpeciesInfo[species].eggGroups[0] == EGG_GROUP_DITTO || gSpeciesInfo[species].eggGroups[1] == EGG_GROUP_DITTO) static void ClearDaycareMonMail(struct DaycareMail *mail); static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare); From 74de34c8b8a4eb0e5067ddc37fdca6fdb15b632a Mon Sep 17 00:00:00 2001 From: Zhengwen Jiang Date: Mon, 13 Nov 2023 01:48:47 -0600 Subject: [PATCH 2/2] improve the performance for specific tests Co-authored-by: Martin Griffin --- test/test_runner.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/test/test_runner.c b/test/test_runner.c index ddfe23b3e..6356010f6 100644 --- a/test/test_runner.c +++ b/test/test_runner.c @@ -162,17 +162,18 @@ void CB2_TestRunner(void) break; case STATE_ASSIGN_TEST: - if (gTestRunnerState.test == __stop_tests) + while (1) { - gTestRunnerState.state = STATE_EXIT; - return; - } - - if (gTestRunnerState.test->runner != &gAssumptionsRunner - && !PrefixMatch(gTestRunnerArgv, gTestRunnerState.test->name)) - { - gTestRunnerState.state = STATE_NEXT_TEST; - return; + if (gTestRunnerState.test == __stop_tests) + { + gTestRunnerState.state = STATE_EXIT; + return; + } + if (gTestRunnerState.test->runner != &gAssumptionsRunner + && !PrefixMatch(gTestRunnerArgv, gTestRunnerState.test->name)) + ++gTestRunnerState.test; + else + break; } MgbaPrintf_(":N%s", gTestRunnerState.test->name);