Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moving the cursor cycles through the descriptions

voloved 2023-04-30 21:21:01 -04:00
parent f206da38f7
commit 9f9cedb39f
1 changed files with 69 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
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;