diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 13:53:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 13:53:31 -0500 |
| commit | 058d30fe806f4fd512ec6708bc68f54d6d98e356 (patch) | |
| tree | bf9d1569a453a085493a8cbb2efad390562cba63 /asm/easy_chat_2.s | |
| parent | a1ea8cc82958679baee1c65acc30069d051463c6 (diff) | |
| parent | 13357596b7ed70246a00d438ee37dc1c84b78415 (diff) | |
Merge branch 'master' into doc-routes1
Diffstat (limited to 'asm/easy_chat_2.s')
| -rw-r--r-- | asm/easy_chat_2.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/easy_chat_2.s b/asm/easy_chat_2.s index c88c5deeb..40b0eeb1f 100644 --- a/asm/easy_chat_2.s +++ b/asm/easy_chat_2.s @@ -334,8 +334,8 @@ sub_80FEE24: @ 80FEE24 bx r0 thumb_func_end sub_80FEE24 - thumb_func_start sub_80FEE44 -sub_80FEE44: @ 80FEE44 + thumb_func_start ShowEasyChatScreen +ShowEasyChatScreen: @ 80FEE44 push {lr} ldr r0, _080FEE58 @ =gSpecialVar_0x8004 ldrh r0, [r0] @@ -431,7 +431,7 @@ _080FEF1C: .4byte gSpecialVar_0x8005 _080FEF20: .4byte 0x00002cd0 _080FEF24: .4byte gSpecialVar_0x8004 _080FEF28: .4byte sub_80568C4 - thumb_func_end sub_80FEE44 + thumb_func_end ShowEasyChatScreen thumb_func_start sub_80FEF2C sub_80FEF2C: @ 80FEF2C |