diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:32:58 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:32:58 -0500 |
| commit | 65e35eb2195277214cfaecec183a2fba64e8e538 (patch) | |
| tree | c073aceff1ceba29fdb4d65767a18a07c15c7117 /asm/easy_chat.s | |
| parent | 6675a6782f3c9be808672aa12c061f1d3f1f5d2e (diff) | |
| parent | aa13f45ebb79aed62171fbfe654d8b542fc9aa6c (diff) | |
Merge branch 'master' into decompile_data
Diffstat (limited to 'asm/easy_chat.s')
| -rw-r--r-- | asm/easy_chat.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 547ce174e..e08d71083 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -1578,13 +1578,13 @@ _080E6D3E: beq _080E6D58 b _080E6D72 _080E6D44: - ldr r0, _080E6D50 @ =gScriptResult + ldr r0, _080E6D50 @ =gSpecialVar_Result strh r1, [r0] ldr r0, _080E6D54 @ =sub_80E752C bl sub_80E682C b _080E6D72 .align 2, 0 -_080E6D50: .4byte gScriptResult +_080E6D50: .4byte gSpecialVar_Result _080E6D54: .4byte sub_80E752C _080E6D58: ldr r1, _080E6D60 @ =gSharedMem + 0x1000 @@ -1722,7 +1722,7 @@ _080E6E56: beq _080E6EDC b _080E6F5E _080E6E5C: - ldr r7, _080E6EC8 @ =gScriptResult + ldr r7, _080E6EC8 @ =gSpecialVar_Result bl sub_80E7FA8 lsls r0, 24 lsrs r0, 24 @@ -1774,7 +1774,7 @@ _080E6EBE: bl sub_80E682C b _080E6F5E .align 2, 0 -_080E6EC8: .4byte gScriptResult +_080E6EC8: .4byte gSpecialVar_Result _080E6ECC: .4byte gSpecialVar_0x8004 _080E6ED0: .4byte 0x00009c7c _080E6ED4: .4byte 0x0000ffff |