summaryrefslogtreecommitdiff
path: root/asm/start_menu.s
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-09-23 20:36:00 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-09-23 20:36:00 +0200
commit7bb0fcf182e5a760ab9e08878a381566819dc8f2 (patch)
treebbb0603d41fa6d0d71a838c7e2fde85fe346fbe1 /asm/start_menu.s
parent601fc9e85b383792819768c31728e4855e854f32 (diff)
parenta57915fa5bd8c2e68bc291a371e66e3cafd7e195 (diff)
merge with master and fix conflicts
Diffstat (limited to 'asm/start_menu.s')
-rw-r--r--asm/start_menu.s8
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/start_menu.s b/asm/start_menu.s
index f71df1046..4f8544eea 100644
--- a/asm/start_menu.s
+++ b/asm/start_menu.s
@@ -1862,7 +1862,7 @@ _080A0710:
bl PrintTextOnWindow
movs r4, 0x11
ldrb r0, [r6]
- ldr r2, =gUnknown_085EED26
+ ldr r2, =gText_SavingPlayer
str r4, [sp]
mov r1, r8
str r1, [sp, 0x4]
@@ -1887,7 +1887,7 @@ _080A0710:
bl sub_819A024
movs r4, 0x21
ldrb r0, [r6]
- ldr r2, =gUnknown_085EED2D
+ ldr r2, =gText_SavingBadges
str r4, [sp]
mov r1, r8
str r1, [sp, 0x4]
@@ -1922,7 +1922,7 @@ _080A0710:
bne _080A0802
movs r4, 0x31
ldrb r0, [r6]
- ldr r2, =gUnknown_085EED34
+ ldr r2, =gText_SavingPokedex
str r4, [sp]
mov r1, r8
str r1, [sp, 0x4]
@@ -1952,7 +1952,7 @@ _080A0710:
_080A0802:
adds r4, 0x10
ldrb r0, [r6]
- ldr r2, =gUnknown_085EED3C
+ ldr r2, =gText_SavingTime
lsls r4, 24
lsrs r4, 24
str r4, [sp]