From 5f763a8380852a9ed43158ab93f2dc155dfe3185 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 16 Jun 2020 04:11:37 -0300 Subject: [PATCH] Fixed Freeze Shock's 1st turn battle string --- data/battle_scripts_1.s | 2 +- include/constants/battle_string_ids.h | 3 ++- src/battle_message.c | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index bd55ca97c..1d641b84c 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3080,7 +3080,7 @@ BattleScript_EffectTwoTurnsAttackIceBurn: setbyte sTWOTURN_STRINGID, 0x0 goto BattleScript_EffectTwoTurnsAttackContinue BattleScript_EffectTwoTurnsAttackFreezeShock: - setbyte sTWOTURN_STRINGID, 0x0 + setbyte sTWOTURN_STRINGID, 0xa goto BattleScript_EffectTwoTurnsAttackContinue BattleScript_EffectGeomancy: diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index e68e31d6f..2f66f97f9 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -548,7 +548,8 @@ #define STRINGID_PKNMABSORBINGPOWER 544 #define STRINGID_NOONEWILLBEABLETORUNAWAY 545 #define STRINGID_DESTINYKNOTACTIVATES 546 +#define STRINGID_CLOAKEDINAFREEZINGLIGHT 547 -#define BATTLESTRINGS_COUNT 547 +#define BATTLESTRINGS_COUNT 548 #endif // GUARD_CONSTANTS_BATTLE_STRING_IDS_H diff --git a/src/battle_message.c b/src/battle_message.c index 71f443277..db7aacbe7 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -669,9 +669,11 @@ static const u8 sText_ReceiverAbilityTakeOver[] = _("{B_SCR_ACTIVE_NAME_WITH_PRE static const u8 sText_PkmnAbsorbingPower[] = _("{B_ATK_NAME_WITH_PREFIX} is absorbing power!"); 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!"); const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = { + [STRINGID_CLOAKEDINAFREEZINGLIGHT - 12] = sText_CloakedInAFreezingLight, [STRINGID_DESTINYKNOTACTIVATES - 12] = sText_DestinyKnotActivates, [STRINGID_NOONEWILLBEABLETORUNAWAY - 12] = sText_NoOneWillBeAbleToRun, [STRINGID_PKNMABSORBINGPOWER - 12] = sText_PkmnAbsorbingPower, @@ -1342,7 +1344,7 @@ const u16 gFirstTurnOfTwoStringIds[] = { STRINGID_PKMNWHIPPEDWHIRLWIND, STRINGID_PKMNTOOKSUNLIGHT, STRINGID_PKMNLOWEREDHEAD, STRINGID_PKMNISGLOWING, STRINGID_PKMNFLEWHIGH, STRINGID_PKMNDUGHOLE, STRINGID_PKMNHIDUNDERWATER, STRINGID_PKMNSPRANGUP, STRINGID_VANISHEDINSTANTLY, - STRINGID_PKNMABSORBINGPOWER + STRINGID_PKNMABSORBINGPOWER, STRINGID_CLOAKEDINAFREEZINGLIGHT }; const u16 gWrappedStringIds[] =