diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-06 18:06:24 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-06 18:06:24 -0400 |
| commit | 736b89ae3d4ffb335ef9e073556bc630c5541b70 (patch) | |
| tree | e97d50e764c52c012092aecb2d80266442677a79 /asm/easy_chat.s | |
| parent | 5620b0ed1a330e38c0d4cdbbfea2c5ce75053925 (diff) | |
| parent | fb9b695f9a366f662b5262f440d77c770b131d0d (diff) | |
Merge branch 'master' into link
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 7019ae3c0..26d7ac8bc 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -868,8 +868,8 @@ _080BDD2C: .4byte gUnknown_83ECED4 _080BDD30: .4byte 0x0000ffff thumb_func_end sub_80BDCB8 - thumb_func_start sub_80BDD34 -sub_80BDD34: @ 80BDD34 + thumb_func_start InitEasyChatPhrases +InitEasyChatPhrases: @ 80BDD34 push {r4-r7,lr} movs r4, 0 ldr r5, _080BDE00 @ =gSaveBlock1Ptr @@ -988,7 +988,7 @@ _080BDE18: .4byte 0x0000ffff _080BDE1C: .4byte 0x00002cc4 _080BDE20: .4byte 0x00002cd0 _080BDE24: .4byte 0x00002f10 - thumb_func_end sub_80BDD34 + thumb_func_end InitEasyChatPhrases thumb_func_start sub_80BDE28 sub_80BDE28: @ 80BDE28 |