summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-02-01 10:22:28 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2020-02-01 10:22:28 -0500
commit01fedfa61c12ed9637124dd1f306e8b8f54ea116 (patch)
treea3015241bc431121f3aa6538ef59deb69de38a59
parent5ca03c0e32a723f9551b93e5aceb7b39d8ea10e6 (diff)
Minor style consistency edit in union_room_chat
-rw-r--r--include/global.h4
-rw-r--r--src/union_room_chat.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/global.h b/include/global.h
index 2f87a0c29..2ed7476e7 100644
--- a/include/global.h
+++ b/include/global.h
@@ -74,8 +74,8 @@
// GameFreak never ceases to amaze.
// TODO: Propagate use of this macro
#define TEST_BUTTON(field, button) ({(field) & (button);})
-#define JOY_NEW(button) TEST_BUTTON(gMain.newKeys, button)
-#define JOY_HELD(button) TEST_BUTTON(gMain.heldKeys, button)
+#define JOY_NEW(button) TEST_BUTTON(gMain.newKeys, button)
+#define JOY_HELD(button) TEST_BUTTON(gMain.heldKeys, button)
#define JOY_REPT(button) TEST_BUTTON(gMain.newAndRepeatedKeys, button)
extern u8 gStringVar1[];
diff --git a/src/union_room_chat.c b/src/union_room_chat.c
index 9fe268495..fb5860ef8 100644
--- a/src/union_room_chat.c
+++ b/src/union_room_chat.c
@@ -914,7 +914,7 @@ static bool32 TypeChatMessage_HandleDPad(void)
{
if (JOY_REPT(DPAD_UP))
{
- if (sWork->currentRow)
+ if (sWork->currentRow > 0)
sWork->currentRow--;
else
sWork->currentRow = sKeyboardPageMaxRow[sWork->currentPage];
@@ -938,7 +938,7 @@ static bool32 TypeChatMessage_HandleDPad(void)
{
if (JOY_REPT(DPAD_LEFT))
{
- if (sWork->currentCol)
+ if (sWork->currentCol > 0)
sWork->currentCol--;
else
sWork->currentCol = 4;