diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-07 20:01:56 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-07 20:01:56 -0500 |
| commit | dd2d49144be1d50af742c05c5efc984326585a91 (patch) | |
| tree | 0fbe13e24ff77684b61e1e03df731a458dc3ee19 /asm/easy_chat.s | |
| parent | d1e08c88bfb92f99b52ba95697d447dde75c5bc5 (diff) | |
| parent | 5c00be143da47ae0a3c0fb3349f6751f8759acb6 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into assert
Diffstat (limited to 'asm/easy_chat.s')
| -rw-r--r-- | asm/easy_chat.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s index b7a35d964..86c78d2cf 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -6075,7 +6075,7 @@ _0811D19C: b _0811D1BC .pool _0811D1A8: - ldr r0, =gText_CombineTwoWordsOrPhrases + ldr r0, =gText_CombineTwoWordsOrPhrases3 str r0, [sp, 0xC] b _0811D1BC .pool |