ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

popup and flower gift description fixes

Browse Source
This commit is contained in:
sneed 2022-05-22 13:10:51 +03:00
parent fe42eacdf0
commit 5b0afffd91
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -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

2
src/data/text/abilities.h
View File

@ -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.");