From f74a1b07660ad5fd8c2e205074f1e265df98657d Mon Sep 17 00:00:00 2001
From: CallmeEchoo <samedding@protonmail.com>
Date: Mon, 24 Apr 2023 22:26:56 +0200
Subject: [PATCH] fix strings after update

---
 test/item_effect_cure_status.c          | 61 +++++++------------------
 test/item_effect_heal_and_cure_status.c |  5 +-
 test/item_effect_revive.c               | 10 ++--
 3 files changed, 23 insertions(+), 53 deletions(-)

diff --git a/test/item_effect_cure_status.c b/test/item_effect_cure_status.c
index f014a29b78..c593aa016c 100644
--- a/test/item_effect_cure_status.c
+++ b/test/item_effect_cure_status.c
@@ -10,7 +10,7 @@ SINGLE_BATTLE_TEST("Cure Status: Paralyze Heal heals a battler from being paraly
     } WHEN {
         TURN { USE_ITEM(player, ITEM_PARALYZE_HEAL, partyIndex: 0); }
     } SCENE {
-        MESSAGE("Paralyze Heal cured Wobbuffet's status!");
+        MESSAGE("Wobbuffet had its status healed!");
     }
 }
 
@@ -23,7 +23,7 @@ SINGLE_BATTLE_TEST("Cure Status: Antidote heals a battler from being poisoned")
     } WHEN {
         TURN { USE_ITEM(player, ITEM_ANTIDOTE, partyIndex: 0); }
     } SCENE {
-        MESSAGE("Antidote cured Wobbuffet's status!");
+        MESSAGE("Wobbuffet had its status healed!");
     }
 }
 
@@ -36,7 +36,7 @@ SINGLE_BATTLE_TEST("Cure Status: Antidote heals a battler from being badly poiso
     } WHEN {
         TURN { USE_ITEM(player, ITEM_ANTIDOTE, partyIndex: 0); }
     } SCENE {
-        MESSAGE("Antidote cured Wobbuffet's status!");
+        MESSAGE("Wobbuffet had its status healed!");
     }
 }
 
@@ -49,7 +49,7 @@ SINGLE_BATTLE_TEST("Cure Status: Awakening heals a battler from being asleep")
     } WHEN {
         TURN { USE_ITEM(player, ITEM_AWAKENING, partyIndex: 0); }
     } SCENE {
-        MESSAGE("Awakening cured Wobbuffet's status!");
+        MESSAGE("Wobbuffet had its status healed!");
     }
 }
 
@@ -62,7 +62,7 @@ SINGLE_BATTLE_TEST("Cure Status: Burn Heal heals a battler from being burned")
     } WHEN {
         TURN { USE_ITEM(player, ITEM_BURN_HEAL, partyIndex: 0); }
     } SCENE {
-        MESSAGE("Burn Heal cured Wobbuffet's status!");
+        MESSAGE("Wobbuffet had its status healed!");
     }
 }
 
@@ -75,7 +75,7 @@ SINGLE_BATTLE_TEST("Cure Status: Ice Heal heals a battler from being paralyzed")
     } WHEN {
         TURN { USE_ITEM(player, ITEM_ICE_HEAL, partyIndex: 0); }
     } SCENE {
-        MESSAGE("Ice Heal cured Wobbuffet's status!");
+        MESSAGE("Wobbuffet had its status healed!");
     }
 }
 
@@ -95,7 +95,7 @@ SINGLE_BATTLE_TEST("Cure Status: Full Heal heals a battler from any primary stat
     } WHEN {
         TURN { USE_ITEM(player, ITEM_FULL_HEAL, partyIndex: 0); }
     } SCENE {
-        MESSAGE("Full Heal cured Wobbuffet's status!");
+        MESSAGE("Wobbuffet had its status healed!");
     }
 }
 
@@ -115,7 +115,7 @@ SINGLE_BATTLE_TEST("Cure Status: Pewter Crunchies heals a battler from any prima
     } WHEN {
         TURN { USE_ITEM(player, ITEM_PEWTER_CRUNCHIES, partyIndex: 0); }
     } SCENE {
-        MESSAGE("PewtrCrnches cured Wobbuffet's status!");
+        MESSAGE("Wobbuffet had its status healed!");
     }
 }
 
@@ -135,7 +135,7 @@ SINGLE_BATTLE_TEST("Cure Status: Lava Cookies heals a battler from any primary s
     } WHEN {
         TURN { USE_ITEM(player, ITEM_LAVA_COOKIE, partyIndex: 0); }
     } SCENE {
-        MESSAGE("Lava Cookie cured Wobbuffet's status!");
+        MESSAGE("Wobbuffet had its status healed!");
     }
 }
 
@@ -155,7 +155,7 @@ SINGLE_BATTLE_TEST("Cure Status: Rage Candy Bar heals a battler from any primary
     } WHEN {
         TURN { USE_ITEM(player, ITEM_RAGE_CANDY_BAR, partyIndex: 0); }
     } SCENE {
-        MESSAGE("RageCandyBar cured Wobbuffet's status!");
+        MESSAGE("Wobbuffet had its status healed!");
     }
 }
 
@@ -175,7 +175,7 @@ SINGLE_BATTLE_TEST("Cure Status: Old Gateu heals a battler from any primary stat
     } WHEN {
         TURN { USE_ITEM(player, ITEM_OLD_GATEAU, partyIndex: 0); }
     } SCENE {
-        MESSAGE("Old Gateau cured Wobbuffet's status!");
+        MESSAGE("Wobbuffet had its status healed!");
     }
 }
 
@@ -195,7 +195,7 @@ SINGLE_BATTLE_TEST("Cure Status: Casteliacone heals a battler from any primary s
     } WHEN {
         TURN { USE_ITEM(player, ITEM_CASTELIACONE, partyIndex: 0); }
     } SCENE {
-        MESSAGE("Casteliacone cured Wobbuffet's status!");
+        MESSAGE("Wobbuffet had its status healed!");
     }
 }
 
@@ -215,7 +215,7 @@ SINGLE_BATTLE_TEST("Cure Status: Lumiose Galette heals a battler from any primar
     } WHEN {
         TURN { USE_ITEM(player, ITEM_LUMIOSE_GALETTE, partyIndex: 0); }
     } SCENE {
-        MESSAGE("LumioseGlete cured Wobbuffet's status!");
+        MESSAGE("Wobbuffet had its status healed!");;
     }
 }
 
@@ -235,7 +235,7 @@ SINGLE_BATTLE_TEST("Cure Status: Shalour Sable heals a battler from any primary
     } WHEN {
         TURN { USE_ITEM(player, ITEM_SHALOUR_SABLE, partyIndex: 0); }
     } SCENE {
-        MESSAGE("ShalourSable cured Wobbuffet's status!");
+        MESSAGE("Wobbuffet had its status healed!");
     }
 }
 
@@ -255,7 +255,7 @@ SINGLE_BATTLE_TEST("Cure Status: Big Malasada heals a battler from any primary s
     } WHEN {
         TURN { USE_ITEM(player, ITEM_BIG_MALASADA, partyIndex: 0); }
     } SCENE {
-        MESSAGE("Big Malasada cured Wobbuffet's status!");
+        MESSAGE("Wobbuffet had its status healed!");
     }
 }
 
@@ -279,35 +279,6 @@ SINGLE_BATTLE_TEST("Cure Status: Full Heal and local specialties heal a battler
         TURN { MOVE(opponent, MOVE_CONFUSE_RAY); }
         TURN { USE_ITEM(player, item, partyIndex: 0); }
     } SCENE {
-        switch (item)
-        {
-            case ITEM_FULL_HEAL:
-                MESSAGE("Full Heal cured Wobbuffet's status!");
-                break;
-            case ITEM_PEWTER_CRUNCHIES:
-                MESSAGE("PewtrCrnches cured Wobbuffet's status!");
-                break;
-            case ITEM_LAVA_COOKIE:
-                MESSAGE("Lava Cookie cured Wobbuffet's status!");
-                break;
-            case ITEM_RAGE_CANDY_BAR:
-                MESSAGE("RageCandyBar cured Wobbuffet's status!");
-                break;
-            case ITEM_OLD_GATEAU:
-                MESSAGE("Old Gateau cured Wobbuffet's status!");
-                break;
-            case ITEM_CASTELIACONE:
-                MESSAGE("Casteliacone cured Wobbuffet's status!");
-                break;
-            case ITEM_LUMIOSE_GALETTE:
-                MESSAGE("LumioseGlete cured Wobbuffet's status!");
-                break;
-            case ITEM_SHALOUR_SABLE:
-                MESSAGE("ShalourSable cured Wobbuffet's status!");
-                break;
-            case ITEM_BIG_MALASADA:
-                MESSAGE("Big Malasada cured Wobbuffet's status!");
-                break;
-        }
+        MESSAGE("Wobbuffet had its status healed!");
     }
 }
diff --git a/test/item_effect_heal_and_cure_status.c b/test/item_effect_heal_and_cure_status.c
index d9bf0cf7c8..95f97fbaa3 100644
--- a/test/item_effect_heal_and_cure_status.c
+++ b/test/item_effect_heal_and_cure_status.c
@@ -17,7 +17,7 @@ SINGLE_BATTLE_TEST("Full Restore restores a battler's HP and cures any primary s
     } WHEN {
         TURN{ USE_ITEM(player, ITEM_FULL_RESTORE, partyIndex: 0); }
     } SCENE {
-        MESSAGE("Full Restore restored Wobbuffet's health!");
+        MESSAGE("Wobbuffet had its HP restored!");
     } FINALLY {
         EXPECT_EQ(player->hp, player->maxHP);
         EXPECT_EQ(player->status1, STATUS1_NONE);
@@ -28,7 +28,6 @@ SINGLE_BATTLE_TEST("Full Restore restores a battler's HP and cures confusion")
 {
     // known failing bc even though it passes there is an underlying bug still that is only obvious in the replay. see #2938
     // this also means that this test is likely not very good so I advice this to be redone
-    KNOWN_FAILING; 
     GIVEN {
         ASSUME(gItems[ITEM_FULL_RESTORE].battleUsage == EFFECT_ITEM_HEAL_AND_CURE_STATUS);
         PLAYER(SPECIES_WOBBUFFET) { HP(1); MaxHP(300);};
@@ -38,7 +37,7 @@ SINGLE_BATTLE_TEST("Full Restore restores a battler's HP and cures confusion")
         TURN{ USE_ITEM(player, ITEM_FULL_RESTORE, partyIndex: 0); }
         TURN{ MOVE(player, MOVE_TACKLE); }
     } SCENE {
-        MESSAGE("Full Restore restored Wobbuffet's health!");
+        MESSAGE("Wobbuffet had its HP restored!");
         NONE_OF { MESSAGE("Wobbuffet is confused!"); }
     } FINALLY {
         EXPECT_EQ(player->hp, player->maxHP);
diff --git a/test/item_effect_revive.c b/test/item_effect_revive.c
index 9ced527f4e..695361892e 100644
--- a/test/item_effect_revive.c
+++ b/test/item_effect_revive.c
@@ -15,7 +15,7 @@ SINGLE_BATTLE_TEST("Revive: Super Potion restores a fainted battler's HP to half
         TURN { USE_ITEM(player, ITEM_SUPER_POTION, partyIndex: 0); }
         TURN { SWITCH(player, 0); }
     } SCENE {
-        MESSAGE("Super Potion restored Wynaut's health!");
+        MESSAGE("Wynaut had its HP restored!");
     } FINALLY {
         EXPECT_EQ(player->hp, 60);
     }
@@ -33,7 +33,7 @@ SINGLE_BATTLE_TEST("Revive: Revive restores a fainted battler's HP to half")
         TURN { USE_ITEM(player, ITEM_REVIVE, partyIndex: 0); }
         TURN { SWITCH(player, 0); }
     } SCENE {
-        MESSAGE("Revive restored Wynaut's health!");
+        MESSAGE("Wynaut had its HP restored!");
     } FINALLY {
         EXPECT_EQ(player->hp, MAX_HP/2);
     }
@@ -51,7 +51,7 @@ SINGLE_BATTLE_TEST("Revive: Max Revive restores a fainted battler's HP fully")
         TURN { USE_ITEM(player, ITEM_MAX_REVIVE, partyIndex: 0); }
         TURN { SWITCH(player, 0); }
     } SCENE {
-        MESSAGE("Max Revive restored Wynaut's health!");
+        MESSAGE("Wynaut had its HP restored!");
     } FINALLY {
         EXPECT_EQ(player->hp, MAX_HP);
     }
@@ -69,7 +69,7 @@ SINGLE_BATTLE_TEST("Revive: Revival Herb restores a fainted battler's HP fully")
         TURN { USE_ITEM(player, ITEM_REVIVAL_HERB, partyIndex: 0); }
         TURN { SWITCH(player, 0); }
     } SCENE {
-        MESSAGE("Revival Herb restored Wynaut's health!");
+        MESSAGE("Wynaut had its HP restored!");
     } FINALLY {
         EXPECT_EQ(player->hp, MAX_HP);
     }
@@ -87,7 +87,7 @@ SINGLE_BATTLE_TEST("Revive: Max Honey restores a fainted battler's HP fully")
         TURN { USE_ITEM(player, ITEM_MAX_HONEY, partyIndex: 0); }
         TURN { SWITCH(player, 0); }
     } SCENE {
-        MESSAGE("Max Honey restored Wynaut's health!");
+        MESSAGE("Wynaut had its HP restored!");
     } FINALLY {
         EXPECT_EQ(player->hp, MAX_HP);
     }