From 9f9cedb39f5ab1108b408ab32644d00451a53141 Mon Sep 17 00:00:00 2001
From: voloved <36523934+voloved@users.noreply.github.com>
Date: Sun, 30 Apr 2023 21:21:01 -0400
Subject: [PATCH] Moving the cursor cycles through the descriptions

---
 Add-Description-Submenu.md | 79 +++++++++++++++++++++++++++++++++-----
 1 file changed, 69 insertions(+), 10 deletions(-)

diff --git a/Add-Description-Submenu.md b/Add-Description-Submenu.md
index 08b4856..f694c96 100644
--- a/Add-Description-Submenu.md
+++ b/Add-Description-Submenu.md
@@ -90,6 +90,75 @@ index 6bf2b9d0cb..1d0317c010 100644
          gPlayerDpadHoldFrames = 0;
  
 -    if (JOY_NEW(A_BUTTON))
++    if (JOY_NEW(A_BUTTON) && !sDescriptionSubmenu)
+     {
+         u8 moveTarget;
+ 
+         PlaySE(SE_SELECT);
+@@ -591,9 +578,9 @@ static void HandleInputChooseMove(void)
+ 
+             gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_ShowAsMoveTarget;
+         }
+     }
+-    else if (JOY_NEW(B_BUTTON) || gPlayerDpadHoldFrames > 59)
++    else if ((JOY_NEW(B_BUTTON) || gPlayerDpadHoldFrames > 59)  && !sDescriptionSubmenu)
+     {
+         PlaySE(SE_SELECT);
+         BtlController_EmitTwoReturnValues(BUFFER_B, 10, 0xFFFF);
+         PlayerBufferExecCompleted();
+@@ -607,8 +594,10 @@ static void HandleInputChooseMove(void)
+             PlaySE(SE_SELECT);
+             MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
+             MoveSelectionDisplayPpNumber();
+             MoveSelectionDisplayMoveType();
++            if (sDescriptionSubmenu)
++                MoveSelectionDisplayMoveDescription();
+         }
+     }
+     else if (JOY_NEW(DPAD_RIGHT))
+     {
+@@ -620,8 +609,10 @@ static void HandleInputChooseMove(void)
+             PlaySE(SE_SELECT);
+             MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
+             MoveSelectionDisplayPpNumber();
+             MoveSelectionDisplayMoveType();
++            if (sDescriptionSubmenu)
++                MoveSelectionDisplayMoveDescription();
+         }
+     }
+     else if (JOY_NEW(DPAD_UP))
+     {
+@@ -632,8 +623,10 @@ static void HandleInputChooseMove(void)
+             PlaySE(SE_SELECT);
+             MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
+             MoveSelectionDisplayPpNumber();
+             MoveSelectionDisplayMoveType();
++            if (sDescriptionSubmenu)
++                MoveSelectionDisplayMoveDescription();
+         }
+     }
+     else if (JOY_NEW(DPAD_DOWN))
+     {
+@@ -645,11 +638,13 @@ static void HandleInputChooseMove(void)
+             PlaySE(SE_SELECT);
+             MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
+             MoveSelectionDisplayPpNumber();
+             MoveSelectionDisplayMoveType();
++            if (sDescriptionSubmenu)
++                MoveSelectionDisplayMoveDescription();
+         }
+     }
+-    else if (JOY_NEW(SELECT_BUTTON))
++    else if (JOY_NEW(SELECT_BUTTON)  && !sDescriptionSubmenu)
+     {
+         if (gNumberOfMovesToChoose > 1 && !(gBattleTypeFlags & BATTLE_TYPE_LINK))
+         {
+             MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 29);
+@@ -633,8 +654,13 @@ static void HandleInputChooseMove(void)
+             BattlePutTextOnWindow(gText_BattleSwitchWhich, B_WIN_SWITCH_PROMPT);
+             gBattlerControllerFuncs[gActiveBattler] = HandleMoveSwitching;
+         }
+     }
 +    if (sDescriptionSubmenu)
 +    {
 +        if (JOY_NEW(START_BUTTON) || JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON))
@@ -103,16 +172,6 @@ index 6bf2b9d0cb..1d0317c010 100644
 +            MoveSelectionDisplayMoveType();
 +        }
 +    }
-+    else if (JOY_NEW(A_BUTTON))
-     {
-         u8 moveTarget;
- 
-         PlaySE(SE_SELECT);
-@@ -633,8 +654,13 @@ static void HandleInputChooseMove(void)
-             BattlePutTextOnWindow(gText_BattleSwitchWhich, B_WIN_SWITCH_PROMPT);
-             gBattlerControllerFuncs[gActiveBattler] = HandleMoveSwitching;
-         }
-     }
 +    else if (JOY_NEW(START_BUTTON)) //AdditionalBattleInfo
 +    {
 +        sDescriptionSubmenu = TRUE;