From a25190f35773a1f2d90e98d0755ef2efa1b7ea92 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 10 Nov 2020 10:34:51 -0300 Subject: [PATCH] A few things. -Introduced a Gen. 8 styled text string for Intimidate -Added an ability popup to BattleScript_IntimidatePrevented --- data/battle_scripts_1.s | 5 ++++- include/constants/battle_string_ids.h | 3 ++- src/battle_message.c | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index fbad1db5ea..1fa38f04fb 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -6776,7 +6776,10 @@ BattleScript_IntimidateActivatesReturn: return BattleScript_IntimidatePrevented: pause 0x20 - printstring STRINGID_PREVENTEDFROMWORKING + call BattleScript_AbilityPopUp + setbyte gBattleCommunication STAT_ATK + stattextbuffer BS_ATTACKER + printstring STRINGID_STATWASNOTLOWERED waitmessage 0x40 call BattleScript_TryAdrenalineOrb goto BattleScript_IntimidateActivatesLoopIncrement diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index 2f66f97f91..3406621111 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -549,7 +549,8 @@ #define STRINGID_NOONEWILLBEABLETORUNAWAY 545 #define STRINGID_DESTINYKNOTACTIVATES 546 #define STRINGID_CLOAKEDINAFREEZINGLIGHT 547 +#define STRINGID_STATWASNOTLOWERED 548 -#define BATTLESTRINGS_COUNT 548 +#define BATTLESTRINGS_COUNT 549 #endif // GUARD_CONSTANTS_BATTLE_STRING_IDS_H diff --git a/src/battle_message.c b/src/battle_message.c index 7e0b501b36..22697772bd 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -676,9 +676,11 @@ static const u8 sText_PkmnAbsorbingPower[] = _("{B_ATK_NAME_WITH_PREFIX} is abso static const u8 sText_NoOneWillBeAbleToRun[] = _("No one will be able to run away\nduring the next turn!"); static const u8 sText_DestinyKnotActivates[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} fell in love\nfrom the {B_LAST_ITEM}!"); static const u8 sText_CloakedInAFreezingLight[] = _("{B_ATK_NAME_WITH_PREFIX} became cloaked\nin a freezing light!"); +static const u8 sText_StatWasNotLowered[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\nwas not lowered!"); const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = { + [STRINGID_STATWASNOTLOWERED - 12] = sText_StatWasNotLowered, [STRINGID_CLOAKEDINAFREEZINGLIGHT - 12] = sText_CloakedInAFreezingLight, [STRINGID_DESTINYKNOTACTIVATES - 12] = sText_DestinyKnotActivates, [STRINGID_NOONEWILLBEABLETORUNAWAY - 12] = sText_NoOneWillBeAbleToRun,