diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-03 15:54:19 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-03 15:54:19 -0400 |
| commit | 1ae3d9b57b0f4ad506a1bd7323e46d2fa768b6b7 (patch) | |
| tree | fca8b14b2e5e3a2390c1b890db2f56f6f8cff744 /asm/clear_save_data_screen.s | |
| parent | 0a88d1042a80bcc703d05f1cf19527272424a03f (diff) | |
| parent | d32ec8bf7246468625ab68a2d62835d70b7ac98c (diff) | |
I hope this fixes merge conflicts
Diffstat (limited to 'asm/clear_save_data_screen.s')
| -rw-r--r-- | asm/clear_save_data_screen.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index 27c32feb5..5efff250c 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -33,7 +33,7 @@ sub_817ACE4: @ 817ACE4 movs r2, 0x2 movs r3, 0xE bl SetWindowBorderStyle - ldr r2, =gUnknown_085EFA8F + ldr r2, =gText_ClearAllSaveData movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -87,7 +87,7 @@ _0817AD68: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EFAAA + ldr r2, =gText_ClearingData movs r0, 0x1 str r0, [sp] str r4, [sp, 0x4] |