From 66c34e0f429130a923ab730507a5a6dbef4c7cea Mon Sep 17 00:00:00 2001 From: Hedara Date: Mon, 13 Jan 2025 10:34:07 +0100 Subject: [PATCH 1/3] Added config for move slot rearrangement in battle --- include/config/battle.h | 2 ++ src/battle_controller_player.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/config/battle.h b/include/config/battle.h index a834d01869d3..252cefbd632d 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -299,4 +299,6 @@ #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 6+ 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 bdf13d310193..f08f8c2c60b3 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -847,7 +847,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_6 && JOY_NEW(SELECT_BUTTON) && !gBattleStruct->zmove.viewing && !gBattleStruct->descriptionSubmenu) { if (gNumberOfMovesToChoose > 1 && !(gBattleTypeFlags & BATTLE_TYPE_LINK)) { From 61d998001c70392dfcf3849111455b35fda953c3 Mon Sep 17 00:00:00 2001 From: Hedara Date: Mon, 13 Jan 2025 11:19:31 +0100 Subject: [PATCH 2/3] Fixed wrong gen cutoff --- include/config/battle.h | 2 +- src/battle_controller_player.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/config/battle.h b/include/config/battle.h index 252cefbd632d..58f7cc91773a 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -300,5 +300,5 @@ // Currently Gen4+ shadows don't properly work with Trainerslides // Battle UI settings -#define B_MOVE_REARRANGEMENT_IN_BATTLE GEN_LATEST // In Gen 6+ move slots cannot be rearranged in battle +#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 f08f8c2c60b3..db339de7b3a2 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -847,7 +847,7 @@ void HandleInputChooseMove(u32 battler) TryChangeZTrigger(battler, gMoveSelectionCursor[battler]); } } - else if (B_MOVE_REARRANGEMENT_IN_BATTLE < GEN_6 && 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)) { From 9d9b54b379668acf02cc426018d3388d4a690604 Mon Sep 17 00:00:00 2001 From: Hedara Date: Fri, 17 Jan 2025 22:29:42 +0100 Subject: [PATCH 3/3] Added a line --- include/config/battle.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/config/battle.h b/include/config/battle.h index 58f7cc91773a..ac5e26eea92d 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -301,4 +301,5 @@ // 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