fix merge conflicts

2017-09-21 10:50:15 +02:00
parent 3919b7130b ed9e0e2054
commit 9ee9a20152
131 changed files with 13064 additions and 6461 deletions
@@ -4033,7 +4033,7 @@ sub_80E4EF0: @ 80E4EF0
 	str r1, [sp]
 	movs r1, 0
 	str r1, [sp, 0x4]
-	ldr r1, =gUnknown_085EEAF6
+	ldr r1, =gText_MoveOkBack
 	str r1, [sp, 0x8]
 	movs r1, 0
 	movs r2, 0x2