diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-24 08:44:21 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-24 08:44:21 -0500 |
commit | bb8c712f75e6ed5ec66b2ee94c6da1157693c284 (patch) | |
tree | dc8d135873f6a7cc8ca1fad8bb5d1a7a84e4b0f7 /asm/link_rfu.s | |
parent | 2177f1f40b4dda2091ac3be3522c1bc4f6690e88 (diff) | |
parent | 2b2dfa7e49a0d28983a4e516ca44aee8cb7c66bb (diff) |
Merge pull request #160 from jiangzhengwenjz/party_menu
party_menu
Diffstat (limited to 'asm/link_rfu.s')
-rw-r--r-- | asm/link_rfu.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/link_rfu.s b/asm/link_rfu.s index 0ccbda9eb..df112d1ad 100644 --- a/asm/link_rfu.s +++ b/asm/link_rfu.s @@ -3172,8 +3172,8 @@ _080FEBA6: bx r0 thumb_func_end sub_80FEB3C - thumb_func_start sub_80FEBAC -sub_80FEBAC: @ 80FEBAC + thumb_func_start DoEasyChatScreen +DoEasyChatScreen: @ 80FEBAC push {r4-r6,lr} mov r6, r8 push {r6} @@ -3214,7 +3214,7 @@ sub_80FEBAC: @ 80FEBAC _080FEC00: .4byte sub_80FEC54 _080FEC04: .4byte gTasks _080FEC08: .4byte sub_80FEC0C - thumb_func_end sub_80FEBAC + thumb_func_end DoEasyChatScreen thumb_func_start sub_80FEC0C sub_80FEC0C: @ 80FEC0C @@ -3588,7 +3588,7 @@ _080FEF08: ldr r0, _080FEF24 @ =gSpecialVar_0x8004 ldrb r0, [r0] ldr r2, _080FEF28 @ =sub_80568C4 - bl sub_80FEBAC + bl DoEasyChatScreen _080FEF12: pop {r0} bx r0 |