diff options
| author | Garak <garakmon@gmail.com> | 2018-08-07 22:21:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 22:21:10 -0400 |
| commit | 96ab357bedfb7d4e07a52b518e2bd02375b1f5f5 (patch) | |
| tree | 92c8775f554e682a05c5995c7baa2d130ebd8aa3 /asm/easy_chat.s | |
| parent | 1ab872c68e951837b6925dbbdf25c4e8d0b63c82 (diff) | |
| parent | 85ebd76cd03e1ee84f182585060b3a79b8653e85 (diff) | |
Merge pull request #3 from pret/master
syncing with source repo
Diffstat (limited to 'asm/easy_chat.s')
| -rw-r--r-- | asm/easy_chat.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 1d8753fa0..4ee0fa2ae 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -623,7 +623,7 @@ _0811A7C2: bl overworld_free_bg_tilemaps ldr r0, =gSpecialVar_0x8004 ldrb r0, [r0] - ldr r2, =sub_80861B0 + ldr r2, =CB2_ReturnToFieldContinueScript adds r1, r4, 0 adds r3, r5, 0 bl sub_811A20C @@ -760,7 +760,7 @@ sub_811A8CC: @ 811A8CC ldr r1, [r0] ldr r0, =0x00003b6e adds r1, r0 - ldr r2, =sub_80861B0 + ldr r2, =CB2_ReturnToFieldContinueScript movs r0, 0xF movs r3, 0x3 bl sub_811A20C @@ -776,7 +776,7 @@ sub_811A8F0: @ 811A8F0 ldr r1, [r0] ldr r0, =0x00003b5a adds r1, r0 - ldr r2, =sub_80861B0 + ldr r2, =CB2_ReturnToFieldContinueScript movs r0, 0x10 movs r3, 0x3 bl sub_811A20C @@ -792,7 +792,7 @@ sub_811A914: @ 811A914 ldr r1, [r0] ldr r0, =0x00003b6c adds r1, r0 - ldr r2, =sub_80861B0 + ldr r2, =CB2_ReturnToFieldContinueScript movs r0, 0x12 movs r3, 0x3 bl sub_811A20C @@ -808,7 +808,7 @@ sub_811A938: @ 811A938 ldr r1, [r0] ldr r0, =0x00003b5a adds r1, r0 - ldr r2, =sub_80861B0 + ldr r2, =CB2_ReturnToFieldContinueScript movs r0, 0x11 movs r3, 0x3 bl sub_811A20C @@ -3691,7 +3691,7 @@ sub_811BDF0: @ 811BDF0 adds r6, r0, 0 ldr r0, =gSaveBlock1Ptr ldr r4, [r0] - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset ldr r0, =0x00003b70 adds r5, r4, r0 adds r0, r5, 0 @@ -3707,17 +3707,17 @@ sub_811BDF0: @ 811BDF0 bl TVShowConvertInternationalString movs r0, 0 mov r1, sp - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr b _0811BE3C .pool _0811BE34: ldr r1, =gText_Lady movs r0, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr _0811BE3C: ldr r1, =gText_F700sQuiz adds r0, r6, 0 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders add sp, 0x20 pop {r4-r6} pop {r0} |