diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2020-12-10 23:30:52 -0500 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2020-12-10 23:30:52 -0500 |
| commit | 58976ebaa8d73d174940f622ec36f22bcd2fd8a2 (patch) | |
| tree | c27ab24ed83fdb16654b5814d681af487b119601 /src/easy_chat.c | |
| parent | 32ae13f9b66ab1b01146e5746e9350f97f055526 (diff) | |
| parent | 8d29f65c6c7f34aa53ae2e7ae3e4f34a95025602 (diff) | |
Merge remote-tracking branch 'upstream/master' into berry_crush
Diffstat (limited to 'src/easy_chat.c')
| -rw-r--r-- | src/easy_chat.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/src/easy_chat.c b/src/easy_chat.c index e08f0bb75..2590eea1a 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -32,7 +32,6 @@ #include "constants/lilycove_lady.h" #include "constants/mauville_old_man.h" #include "constants/songs.h" -#include "constants/species.h" #include "constants/rgb.h" #define EZCHAT_TASK_STATE 0 @@ -1614,26 +1613,26 @@ static u16 sub_811ACDC(void) { return sub_811B150(); } - if (JOY_NEW(START_BUTTON)) + else if (JOY_NEW(START_BUTTON)) { return sub_811B1B4(); } - if (JOY_NEW(DPAD_UP)) + else if (JOY_NEW(DPAD_UP)) { sEasyChatScreen->mainCursorRow--; break; } - if (JOY_NEW(DPAD_LEFT)) + else if (JOY_NEW(DPAD_LEFT)) { sEasyChatScreen->mainCursorColumn--; break; } - if (JOY_NEW(DPAD_DOWN)) + else if (JOY_NEW(DPAD_DOWN)) { sEasyChatScreen->mainCursorRow = 0; break; } - if (JOY_NEW(DPAD_RIGHT)) + else if (JOY_NEW(DPAD_RIGHT)) { sEasyChatScreen->mainCursorColumn++; break; @@ -2537,7 +2536,7 @@ u8 sub_811BBBC(void) return sEasyChatScreen->unk_0c; } -static void sub_811BBC8(s8 *arg0, s8 *arg1) +void sub_811BBC8(u8 *arg0, u8 *arg1) { *arg0 = sEasyChatScreen->unk_10; *arg1 = sEasyChatScreen->unk_11; @@ -4529,18 +4528,18 @@ static void sub_811E30C(void) x = var0 * 13; x = x * 8 + 28; y = var1 * 16 + 96; - sub_811E34C((u8)x, (u8)y); + sub_811E34C(x, y); } static void sub_811E34C(u8 x, u8 y) { - if (!sUnknown_0203A11C->unk2E4) - return; - - sUnknown_0203A11C->unk2E4->pos1.x = (s16)x; - sUnknown_0203A11C->unk2E4->pos1.y = (s16)y; - sUnknown_0203A11C->unk2E4->pos2.x = 0; - sUnknown_0203A11C->unk2E4->data[0] = 0; + if (sUnknown_0203A11C->unk2E4) + { + sUnknown_0203A11C->unk2E4->pos1.x = x; + sUnknown_0203A11C->unk2E4->pos1.y = y; + sUnknown_0203A11C->unk2E4->pos2.x = 0; + sUnknown_0203A11C->unk2E4->data[0] = 0; + } } static void sub_811E380(void) |