diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-28 17:46:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 17:46:17 -0400 |
| commit | e06de33cbdab8ca853bcdd1b4c8909a61aabfcef (patch) | |
| tree | d8fc5465a98e738792297ab08ba7216b18696fec /src/easy_chat.c | |
| parent | 4a42e2a710ee550c88a56e48f436b88279337eea (diff) | |
| parent | 96b904bf808805daa3de09080e10cc92e24c1f8e (diff) | |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'src/easy_chat.c')
| -rw-r--r-- | src/easy_chat.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/easy_chat.c b/src/easy_chat.c index 44a7b90c1..c839c0070 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -2537,7 +2537,7 @@ u8 sub_811BBBC(void) return sEasyChatScreen->unk_0c; } -void sub_811BBC8(u8 *arg0, u8 *arg1) +static void sub_811BBC8(s8 *arg0, s8 *arg1) { *arg0 = sEasyChatScreen->unk_10; *arg1 = sEasyChatScreen->unk_11; @@ -4529,18 +4529,18 @@ static void sub_811E30C(void) x = var0 * 13; x = x * 8 + 28; y = var1 * 16 + 96; - sub_811E34C(x, y); + sub_811E34C((u8)x, (u8)y); } static void sub_811E34C(u8 x, u8 y) { - 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; - } + 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; } static void sub_811E380(void) |