diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
| commit | d0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch) | |
| tree | cb5e1c81baaf882f2bb8f323b04a7b41d316be7b /asm/easy_chat.s | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
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 e9565dfa9..eb20e68fa 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -1659,7 +1659,7 @@ _0811AFAC: b _0811AFE6 .pool _0811AFC0: - ldr r0, =gScriptResult + ldr r0, =gSpecialVar_Result strh r1, [r0] ldr r0, =gUnknown_0203A118 ldr r0, [r0] @@ -1709,7 +1709,7 @@ _0811B00C: .pool _0811B020: bl sub_811BE9C - ldr r4, =gScriptResult + ldr r4, =gSpecialVar_Result bl sub_811B4EC strh r0, [r4] bl sub_811B3E4 @@ -1860,7 +1860,7 @@ _0811B118: b _0811B14A .pool _0811B134: - ldr r4, =gScriptResult + ldr r4, =gSpecialVar_Result bl sub_811B4EC strh r0, [r4] bl sub_811B3E4 |