diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
| commit | 32153295edc1e93bd27894f75f2ab01f9140bed5 (patch) | |
| tree | 397bb2852fbacc95b66a2b121c0a7eeb31c5c44d /asm/easy_chat.s | |
| parent | e78f49f1efc2eadb674d00c00ffc9a4018b3cdbd (diff) | |
| parent | 242af849cb56ce0c4469c4e2be82a3ad5dbd3434 (diff) | |
Merge remote-tracking branch 'upstream/master' into decompile_battle_2
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 b8bfaac18..b9f27b895 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -825,8 +825,8 @@ _080E675C: .4byte 0x00009da4 _080E6760: .4byte 0x00009f6e thumb_func_end sub_80E6690 - thumb_func_start sub_80E6764 -sub_80E6764: @ 80E6764 + thumb_func_start InitEasyChatPhrases +InitEasyChatPhrases: @ 80E6764 push {r4-r6,lr} movs r3, 0 ldr r4, _080E680C @ =gSaveBlock1 + 0x2B1C @@ -926,7 +926,7 @@ _080E681C: .4byte gSaveBlock1 + 0x2B34 _080E6820: .4byte 0x0000ffff _080E6824: .4byte gSaveBlock1 + 0x2B4C _080E6828: .4byte gSaveBlock1 + 0x2D8C - thumb_func_end sub_80E6764 + thumb_func_end InitEasyChatPhrases thumb_func_start sub_80E682C sub_80E682C: @ 80E682C |