From 5b0afffd91cfbb1145163e33ffe729d8a200ad71 Mon Sep 17 00:00:00 2001 From: sneed Date: Sun, 22 May 2022 13:10:51 +0300 Subject: [PATCH] popup and flower gift description fixes --- data/battle_scripts_1.s | 2 ++ src/data/text/abilities.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 0afe8837a4..ba748258b0 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -8174,10 +8174,12 @@ BattleScript_WeatherFormChange:: BattleScript_DoWeatherFormChange:: copybyte gBattlerAbility, sBATTLER +.if B_WEATHER_FORMS >= GEN_5 jumpifspecies BS_SCRIPTING, SPECIES_CASTFORM, BattleScript_DoWeatherFormChange_ForecastCheck BattleScript_DoWeatherFormChange_FlowerGiftCheck: jumpifability BS_SCRIPTING, ABILITY_FLOWER_GIFT, BattleScript_DoWeatherFormChange_PopUp goto BattleScript_DoWeatherFormChange_AfterPopUp +.endif BattleScript_DoWeatherFormChange_ForecastCheck: jumpifability BS_SCRIPTING, ABILITY_FORECAST, BattleScript_DoWeatherFormChange_PopUp goto BattleScript_DoWeatherFormChange_AfterPopUp diff --git a/src/data/text/abilities.h b/src/data/text/abilities.h index cdc3276082..ac11b9de8b 100644 --- a/src/data/text/abilities.h +++ b/src/data/text/abilities.h @@ -119,7 +119,7 @@ static const u8 sHoneyGatherDescription[] = _("May gather Honey."); static const u8 sFriskDescription[] = _("Checks a foe's item."); static const u8 sRecklessDescription[] = _("Boosts moves with recoil."); static const u8 sMultitypeDescription[] = _("Changes type to its Plate."); -static const u8 sFlowerGiftDescription[] = _("Transforms in sunshine."); +static const u8 sFlowerGiftDescription[] = _("Allies power up in sunshine."); static const u8 sBadDreamsDescription[] = _("Damages sleeping Pokémon."); static const u8 sPickpocketDescription[] = _("Steals the foe's held item."); static const u8 sSheerForceDescription[] = _("Trades effects for power.");