From 3bcfa355eb1261bbd6fe515415f2a85174c56718 Mon Sep 17 00:00:00 2001 From: hedara90 <90hedara@gmail.com> Date: Fri, 17 Jan 2025 23:03:01 +0100 Subject: [PATCH] Config for move slot rearrangement in battle (#6017) Co-authored-by: Hedara --- include/config/battle.h | 3 +++ src/battle_controller_player.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/config/battle.h b/include/config/battle.h index 016b8044cc7..41b796e1492 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -300,4 +300,7 @@ #define B_ENEMY_MON_SHADOW_STYLE GEN_3 // In Gen4+, all enemy Pokemon will have a shadow drawn beneath them. // Currently Gen4+ shadows don't properly work with Trainerslides +// Battle UI settings +#define B_MOVE_REARRANGEMENT_IN_BATTLE GEN_LATEST // In Gen 4+ move slots cannot be rearranged in battle + #endif // GUARD_CONFIG_BATTLE_H diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index eacf2d3fb7a..1e5996f780e 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -843,7 +843,7 @@ void HandleInputChooseMove(u32 battler) TryChangeZTrigger(battler, gMoveSelectionCursor[battler]); } } - else if (JOY_NEW(SELECT_BUTTON) && !gBattleStruct->zmove.viewing && !gBattleStruct->descriptionSubmenu) + else if (B_MOVE_REARRANGEMENT_IN_BATTLE < GEN_4 && JOY_NEW(SELECT_BUTTON) && !gBattleStruct->zmove.viewing && !gBattleStruct->descriptionSubmenu) { if (gNumberOfMovesToChoose > 1 && !(gBattleTypeFlags & BATTLE_TYPE_LINK)) {