diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-27 20:52:55 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-27 20:52:55 -0400 |
| commit | 47534a1471019a25e25c29a3f5bb529ccbd73e86 (patch) | |
| tree | da4f2abb0fa27f5f07bcbdd4af47ca4eec84a786 /asm/easy_chat.s | |
| parent | b8fec3d9f617ec9a764bb56804c526ff7449631f (diff) | |
| parent | 922411abebd56d0f5d6072bad4924c909c8e2c27 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into trade
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 |