diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-03-04 23:32:12 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-03-04 23:32:12 -0600 |
| commit | d12fd5c5ce574dd920a968794591afe7d42659fb (patch) | |
| tree | 95a469d0243864473d13cd19082827cc89fe1a69 /asm/field_message_box.s | |
| parent | 56f5e8bdabdc9cb18f65eccc4de66b2932489db1 (diff) | |
| parent | 83ae14e2b9e2af7ce3eb01383fe3466357ac30b1 (diff) | |
Merge remote-tracking branch 'refs/remotes/pret/master'
Diffstat (limited to 'asm/field_message_box.s')
| -rw-r--r-- | asm/field_message_box.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/field_message_box.s b/asm/field_message_box.s index 1bff785c2..6f5e6dda8 100644 --- a/asm/field_message_box.s +++ b/asm/field_message_box.s @@ -160,9 +160,9 @@ sub_8098238: @ 8098238 ldrb r0, [r5] cmp r0, 0 bne _08098270 - ldr r0, =gUnknown_02021FC4 + ldr r0, =gStringVar4 adds r1, r4, 0 - bl ExpandStringRefs + bl StringExpandPlaceholders ldr r0, =sub_8098214 movs r1, 0 bl CreateTask @@ -243,9 +243,9 @@ textbox_fdecode_auto_and_task_add: @ 80982DC push {r4,lr} adds r2, r0, 0 adds r4, r1, 0 - ldr r0, =gUnknown_02021FC4 + ldr r0, =gStringVar4 adds r1, r2, 0 - bl ExpandStringRefs + bl StringExpandPlaceholders lsls r4, 24 lsrs r4, 24 adds r0, r4, 0 |