diff options
| -rw-r--r-- | asm/easy_chat.s | 24 | ||||
| -rw-r--r-- | src/easy_chat.c | 15 |
2 files changed, 14 insertions, 25 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 5cb89246c..764ed8b8e 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,30 +5,6 @@ .text - thumb_func_start sub_811AB44 -sub_811AB44: @ 811AB44 - push {lr} - bl sub_811BA68 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - beq _0811AB5E - cmp r0, 0x2 - blt _0811AB62 - cmp r0, 0x8 - bgt _0811AB62 - cmp r0, 0x7 - blt _0811AB62 -_0811AB5E: - movs r0, 0x1 - b _0811AB64 -_0811AB62: - movs r0, 0 -_0811AB64: - pop {r1} - bx r1 - thumb_func_end sub_811AB44 - thumb_func_start sub_811AB68 sub_811AB68: @ 811AB68 push {r4-r7,lr} diff --git a/src/easy_chat.c b/src/easy_chat.c index 26f1f08b0..9b69f1d0a 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -65,12 +65,13 @@ u16 sub_811ACDC(void); u16 sub_811AE44(void); u16 sub_811AF00(void); u16 sub_811AF8C(void); -u16 sub_811B040(void); u16 sub_811AFEC(void); +u16 sub_811B040(void); u16 sub_811B08C(void); u16 sub_811B0BC(void); u16 sub_811B0E8(void); u16 sub_811B0F8(void); +u8 sub_811BA68(void); u8 sub_811BCC8(u8); void sub_811BDF0(u8 *); bool8 sub_811BF8C(void); @@ -524,3 +525,15 @@ static u16 sub_811AAAC(void) } return 0; } + +bool8 sub_811AB44(void) +{ + switch (sub_811BA68()) + { + case 2: + case 7: + case 8: + return TRUE; + } + return FALSE; +} |