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/save_failed_screen.s | |
| parent | 0a88d1042a80bcc703d05f1cf19527272424a03f (diff) | |
| parent | d32ec8bf7246468625ab68a2d62835d70b7ac98c (diff) | |
I hope this fixes merge conflicts
Diffstat (limited to 'asm/save_failed_screen.s')
| -rw-r--r-- | asm/save_failed_screen.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/save_failed_screen.s b/asm/save_failed_screen.s index 247c765b6..182ff8954 100644 --- a/asm/save_failed_screen.s +++ b/asm/save_failed_screen.s @@ -268,7 +268,7 @@ _08178FF8: ldrb r0, [r4] movs r1, 0x1 bl CopyWindowToVram - ldr r0, =gUnknown_085EC816 + ldr r0, =gText_SaveFailedCheckingBackup movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -340,7 +340,7 @@ _0817929C: ldrb r0, [r4] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, =gUnknown_085EC917 + ldr r0, =gText_CheckCompleted movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -353,7 +353,7 @@ _0817929C: ldrb r0, [r4] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, =gUnknown_085EC816 + ldr r0, =gText_SaveFailedCheckingBackup movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -373,7 +373,7 @@ _081792EC: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, =gUnknown_085EC86F + ldr r0, =gText_BackupMemoryDamaged b _08179330 .pool _0817931C: @@ -385,7 +385,7 @@ _0817931C: ldr r0, [r0] cmp r0, 0 bne _08179370 - ldr r0, =gUnknown_085EC94F + ldr r0, =gText_SaveCompleteGameCannotContinue _08179330: movs r1, 0x1 movs r2, 0 @@ -397,7 +397,7 @@ _08179348: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, =gUnknown_085EC86F + ldr r0, =gText_BackupMemoryDamaged movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -406,7 +406,7 @@ _08179348: b _08179380 .pool _08179370: - ldr r0, =gUnknown_085EC9A2 + ldr r0, =gText_SaveCompletePressA movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -436,7 +436,7 @@ sub_8179390: @ 8179390 ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, =gUnknown_085EC8D4 + ldr r0, =gText_GamePlayCannotBeContinued movs r1, 0x1 movs r2, 0 bl sub_8178F44 |