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
@@ -2510,7 +2510,7 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8
 	lsls r0, 24
 	cmp r0, 0
 	bne _080FE518
-	ldr r2, =gUnknown_085E96F6
+	ldr r2, =gText_WontHaveEffect
 	ldr r3, =bag_menu_inits_lists_menu
 	adds r0, r4, 0
 	movs r1, 0x1
@@ -2518,7 +2518,7 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8
 	b _080FE53C
 	.pool
 _080FE518:
-	ldr r1, =gUnknown_085E96F6
+	ldr r1, =gText_WontHaveEffect
 	ldr r2, =sub_81C6714
 	adds r0, r4, 0
 	bl DisplayItemMessageInBattlePyramid