From f682e409f05ff7a46b3fec39daf3b849f26039e8 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sat, 4 Sep 2021 08:19:57 -0400 Subject: [PATCH 1/3] update mental herb desc --- src/data/text/item_descriptions.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index c102b4116a..83edfdbdbc 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -1041,10 +1041,17 @@ static const u8 sSootheBellDesc[] = _( "calms spirits and\n" "fosters friendship."); +#ifdef BATTLE_ENGINE static const u8 sMentalHerbDesc[] = _( "A hold item that\n" - "snaps Pokémon out\n" + "snaps POKéMON out\n" "of infatuation."); +#else +static const u8 sMentalHerbDesc[] = _( + "Snaps Pokémon out\n" + "of move-binding\n" + "effects."); +#endif static const u8 sChoiceBandDesc[] = _( "Raises a move's\n" From 3066e09e6806f337bd297fa601d21018c624d479 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sat, 4 Sep 2021 08:43:33 -0400 Subject: [PATCH 2/3] decap pokemon in mental herb --- src/data/text/item_descriptions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 83edfdbdbc..941ff50bb9 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -1044,7 +1044,7 @@ static const u8 sSootheBellDesc[] = _( #ifdef BATTLE_ENGINE static const u8 sMentalHerbDesc[] = _( "A hold item that\n" - "snaps POKéMON out\n" + "snaps Pokémon out\n" "of infatuation."); #else static const u8 sMentalHerbDesc[] = _( From 136fbb58623f40657a7e96f828d7aef2b366ec37 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Mon, 20 Sep 2021 21:33:50 -0400 Subject: [PATCH 3/3] fix swapped descs --- src/data/text/item_descriptions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 941ff50bb9..98328b3749 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -1041,7 +1041,7 @@ static const u8 sSootheBellDesc[] = _( "calms spirits and\n" "fosters friendship."); -#ifdef BATTLE_ENGINE +#ifndef BATTLE_ENGINE static const u8 sMentalHerbDesc[] = _( "A hold item that\n" "snaps Pokémon out\n"