From 6c9dcd60bc087ea5962619a5c0e8b72a11208bfc Mon Sep 17 00:00:00 2001 From: fakuzatsu <118256341+fakuzatsu@users.noreply.github.com> Date: Tue, 25 Jun 2024 10:09:01 +0100 Subject: [PATCH] simple button config for the move description menu (#4860) * simple button config for the move description menu * change from preproc to normal if --- include/config/battle.h | 1 + src/battle_controller_player.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/config/battle.h b/include/config/battle.h index 113c1201b6..f2ff9e6ffe 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -223,6 +223,7 @@ #define B_EXPANDED_MOVE_NAMES TRUE // If set to FALSE, move names are decreased from 16 characters to 12 characters. #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 // 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_controller_player.c b/src/battle_controller_player.c index 5d231f8d18..6dcea9eb98 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -866,7 +866,7 @@ static void HandleInputChooseMove(u32 battler) } else if (gBattleStruct->descriptionSubmenu) { - if (JOY_NEW(L_BUTTON) || JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) + if (JOY_NEW(B_MOVE_DESCRIPTION_BUTTON) || JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) { gBattleStruct->descriptionSubmenu = FALSE; if (gCategoryIconSpriteId != 0xFF) @@ -883,7 +883,7 @@ static void HandleInputChooseMove(u32 battler) MoveSelectionDisplayMoveType(battler); } } - else if (JOY_NEW(L_BUTTON)) + else if (JOY_NEW(B_MOVE_DESCRIPTION_BUTTON) && B_MOVE_DESCRIPTION_BUTTON != B_LAST_USED_BALL_BUTTON) { gBattleStruct->descriptionSubmenu = TRUE; MoveSelectionDisplayMoveDescription(battler);