diff options
| author | hondew <pokehondew@gmail.com> | 2020-08-30 14:14:38 -0400 |
|---|---|---|
| committer | hondew <pokehondew@gmail.com> | 2020-08-30 14:14:38 -0400 |
| commit | e46b35455d1e2af8c8c2d291ce1cc28e682d9095 (patch) | |
| tree | 76855f3dedad94ba34a8f8b40811a1005107b5ae /src/easy_chat.c | |
| parent | 328aecc96e690c437e52663a1445417e8aa78df6 (diff) | |
| parent | a9719c92bfa4c6b6dcf57e9516f184721152ad80 (diff) | |
Merge branch 'master' into pokeball-doc
Diffstat (limited to 'src/easy_chat.c')
| -rw-r--r-- | src/easy_chat.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/easy_chat.c b/src/easy_chat.c index 44a7b90c1..8e1044591 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -2023,7 +2023,7 @@ static int sub_811B368(void) { if (sEasyChatScreen->type == EASY_CHAT_TYPE_BARD_SONG) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); return 0; } else @@ -2038,7 +2038,7 @@ static int sub_811B394(void) u16 easyChatWord = sub_811F578(sub_811B940()); if (sub_811BF88(easyChatWord)) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); return 0; } else @@ -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) |