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
@@ -53,7 +53,7 @@ _081D9A44:
 	bl sub_80D2578
 	cmp r0, 0
 	beq _081D9A5C
-	ldr r0, =gUnknown_085EE49A
+	ldr r0, =gText_Peekaboo
 	bl sub_80D255C
 	b _081D9A68
 	.pool