diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-25 09:22:50 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-25 09:22:50 +0800 |
| commit | 2f87855072fb4fdca6ce22d60bfb1b7fdc000134 (patch) | |
| tree | a3a6d928910ed170904b5b367084afb2d1fb8b3d /asm/easy_chat.s | |
| parent | 6ca932e5e98fcd69c281d798406e53aee5a4d816 (diff) | |
| parent | 7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (diff) | |
Merge branch 'master' into battle
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 26d7ac8bc..0daa8b2bc 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -576,8 +576,8 @@ _080BDB14: .4byte 0x00002cc4 _080BDB18: .4byte gStringVar4 thumb_func_end sub_80BDA7C - thumb_func_start sub_80BDB1C -sub_80BDB1C: @ 80BDB1C + thumb_func_start BufferRandomHobbyOrLifestyleString +BufferRandomHobbyOrLifestyleString: @ 80BDB1C push {lr} bl Random movs r1, 0x1 @@ -597,7 +597,7 @@ _080BDB2E: bx r0 .align 2, 0 _080BDB44: .4byte gStringVar2 - thumb_func_end sub_80BDB1C + thumb_func_end BufferRandomHobbyOrLifestyleString thumb_func_start sub_80BDB48 sub_80BDB48: @ 80BDB48 |