From ee0222c0ecf40106b491a3b816f5c752edf8cffe Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Mon, 6 Nov 2023 06:18:45 -0300
Subject: [PATCH 1/3] Updated the holdEffectParam of the items that double the
 amount of money gained in battle (#3528)

---
 src/data/items.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/data/items.h b/src/data/items.h
index 1cb54c88a179..cb32c14cd02a 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -4993,7 +4993,6 @@ const struct Item gItems[] =
         .name = _("Luck Incense"),
         .price = 11000,
         .holdEffect = HOLD_EFFECT_DOUBLE_PRIZE,
-        .holdEffectParam = 10,
         .description = sLuckIncenseDesc,
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_BAG_MENU,
@@ -5707,7 +5706,6 @@ const struct Item gItems[] =
         .name = _("Amulet Coin"),
         .price = 10000,
         .holdEffect = HOLD_EFFECT_DOUBLE_PRIZE,
-        .holdEffectParam = 10,
         .description = sAmuletCoinDesc,
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_BAG_MENU,

From 87aaeca623864793b606b9c33dfac479b83bc375 Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Sun, 12 Nov 2023 10:42:33 -0300
Subject: [PATCH 2/3] 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 6078135fd73a..bf8a03e3f24b 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 <jian0463@umn.edu>
Date: Mon, 13 Nov 2023 01:48:47 -0600
Subject: [PATCH 3/3] improve the performance for specific tests

Co-authored-by: Martin Griffin <martin.griffin@algosport.co.uk>
---
 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 ddfe23b3ecf0..6356010f62ee 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);