dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor weird logic in TypeChatMessage_HandleDPad

Browse Source
This commit is contained in:
PikalaxALT
2020-01-25 21:45:58 -05:00
parent 78864c88bb
commit 905912e278
1 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/union_room_chat.c
+25 -26
View File
@@ -4,7 +4,6 @@
#include "help_system.h" #include "help_system.h"
#include "link.h" #include "link.h"
#include "link_rfu.h" #include "link_rfu.h"
#include "list_menu.h"
#include "load_save.h" #include "load_save.h"
#include "menu.h" #include "menu.h"
#include "overworld.h" #include "overworld.h"
@@ -911,53 +910,53 @@ static void GoToRoutine(u16 routineNo)
static bool32 TypeChatMessage_HandleDPad(void) static bool32 TypeChatMessage_HandleDPad(void)
{ {
if (!(gMain.newAndRepeatedKeys & DPAD_UP)) do
{ {
if (gMain.newAndRepeatedKeys & DPAD_DOWN) if (JOY_REPT(DPAD_UP))
{
if (sWork->currentRow)
sWork->currentRow--;
else
sWork->currentRow = sKeyboardPageMaxRow[sWork->currentPage];
break;
}
if (JOY_REPT(DPAD_DOWN))
{ {
if (sWork->currentRow < sKeyboardPageMaxRow[sWork->currentPage]) if (sWork->currentRow < sKeyboardPageMaxRow[sWork->currentPage])
{
sWork->currentRow++; sWork->currentRow++;
}
else else
{
sWork->currentRow = 0; sWork->currentRow = 0;
}
return TRUE; break;
} }
if (sWork->currentPage != UNION_ROOM_KB_PAGE_COUNT) if (sWork->currentPage != UNION_ROOM_KB_PAGE_COUNT)
{ {
if (gMain.newAndRepeatedKeys & DPAD_LEFT) if (JOY_REPT(DPAD_LEFT))
{ {
if (sWork->currentCol) if (sWork->currentCol)
sWork->currentCol--; sWork->currentCol--;
else else
sWork->currentCol = 4; sWork->currentCol = 4;
break;
} }
else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) if (JOY_REPT(DPAD_RIGHT))
{ {
if (sWork->currentCol > 3) if (sWork->currentCol < 4)
sWork->currentCol = 0;
else
sWork->currentCol++; sWork->currentCol++;
else
sWork->currentCol = 0;
break;
} }
else
{
return FALSE;
}
return TRUE;
} }
return FALSE; return FALSE;
} } while (0);
else return TRUE;
{
if (sWork->currentRow)
sWork->currentRow--;
else
sWork->currentRow = sKeyboardPageMaxRow[sWork->currentPage];
return TRUE;
}
} }
static void AppendCharacterToChatMessageBuffer(void) static void AppendCharacterToChatMessageBuffer(void)