diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
commit | 455202eca00fd1b51e9ba8b75434d97ae5c750a8 (patch) | |
tree | 153b1b85ae6864fec7bf880d9dd90fe6ef9a55c6 /asm/easy_chat.s | |
parent | 14e41d6c508e5c425dff8f2c4933ae4c8b7ab762 (diff) | |
parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) |
Merge branch 'master' into decompile_rom3
Diffstat (limited to 'asm/easy_chat.s')
-rw-r--r-- | asm/easy_chat.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s index fbbc85c25..a85169b61 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -9914,7 +9914,7 @@ _0811EF48: adds r1, r5, 0 bl ConvertEasyChatWordsToString adds r0, r4, 0 - bl box_related_two__3 + bl ShowFieldAutoScrollMessage _0811EF58: pop {r4,r5} pop {r0} |