From e0c7b630952633a1b2c16b806afc00a4f6986d47 Mon Sep 17 00:00:00 2001 From: wiz1989 <80073265+wiz1989@users.noreply.github.com> Date: Thu, 6 Mar 2025 12:47:03 +0100 Subject: [PATCH] "no additional effect" text for status Z moves without effects (#6368) --- include/config/battle.h | 1 + src/battle_z_move.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/include/config/battle.h b/include/config/battle.h index 8721ef317f..3fdea02ff4 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -243,6 +243,7 @@ #define B_WAIT_TIME_MULTIPLIER 16 // This determines how long text pauses in battle last. Vanilla is 16. Lower values result in faster battles. #define B_QUICK_MOVE_CURSOR_TO_RUN FALSE // If set to TRUE, pushing B in the battle options against a wild encounter will move the cursor to the run option #define B_MOVE_DESCRIPTION_BUTTON L_BUTTON // If set to a button other than B_LAST_USED_BALL_BUTTON, pressing this button will open the move description menu +#define B_SHOW_USELESS_Z_MOVE_INFO FALSE // If set to TRUE, Z-moves without additional effects like newer gen status moves will say "no additional effect" // Catching settings #define B_SEMI_INVULNERABLE_CATCH GEN_LATEST // In Gen4+, you cannot throw a ball against a Pokemon that is in a semi-invulnerable state (dig/fly/etc) diff --git a/src/battle_z_move.c b/src/battle_z_move.c index c878a2c12b..dda776d8ad 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -103,6 +103,7 @@ static const u8 sText_FollowMe[] = _("Follow Me"); static const u8 sText_RecoverHP[] = _("Recover HP"); static const u8 sText_HealAllyHP[] = _("Heal Replacement HP"); static const u8 sText_PowerColon[] = _("Power: "); +static const u8 sText_NoAdditionalEffect[] = _("No Additional Effect"); // Functions bool32 IsZMove(u32 move) @@ -352,6 +353,10 @@ bool32 MoveSelectionDisplayZMove(u16 zmove, u32 battler) PREPARE_STAT_BUFFER(gBattleTextBuff1, zEffect - Z_EFFECT_ATK_UP_3 + 1); ExpandBattleTextBuffPlaceholders(gBattleTextBuff1, gDisplayedStringBattle + 4); break; + default: + if (B_SHOW_USELESS_Z_MOVE_INFO == TRUE) + StringCopy(gDisplayedStringBattle, sText_NoAdditionalEffect); + break; } BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_NAME_3);