diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
| commit | 1e9143e0b22bc72cb77866e10817bc509064842a (patch) | |
| tree | 87b77fdd2c19d34cb7ac10870fdc4c30188e2d70 /asm/easy_chat.s | |
| parent | c9d486a5d3ea6bf7d256c2d7ca7f10339e498427 (diff) | |
| parent | 06b3ce408f774c7192202308e783cc22bb8e7643 (diff) | |
merge union room with master
Diffstat (limited to 'asm/easy_chat.s')
| -rw-r--r-- | asm/easy_chat.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 7f2a7ca88..1d8753fa0 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5988,7 +5988,7 @@ sub_811D0BC: @ 811D0BC movs r0, 0x1 movs r1, 0x1 movs r2, 0xE0 - bl sub_809882C + bl LoadUserWindowBorderGfx movs r0, 0x1 movs r1, 0x1 movs r2, 0xE @@ -8988,7 +8988,7 @@ _0811E852: adds r1, r5, 0 movs r2, 0x4C movs r3, 0x28 - bl AddPseudoFieldObject + bl AddPseudoEventObject lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 @@ -9019,7 +9019,7 @@ _0811E8A0: adds r1, r5, 0 movs r2, 0x34 movs r3, 0x28 - bl AddPseudoFieldObject + bl AddPseudoEventObject lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 |