I hope this fixes merge conflicts

1 files changed, 46 insertions, 46 deletions

diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index 7f1a1e48f..b243ab3b2 100755
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -2352,7 +2352,7 @@ _081C284A:
 sub_81C286C: @ 81C286C
 	push {r4-r7,lr}
 	sub sp, 0x8
-	ldr r1, =gUnknown_085EA3CF
+	ldr r1, =gText_PkmnInfo
 	movs r5, 0
 	str r5, [sp]
 	movs r6, 0x1
@@ -2361,21 +2361,21 @@ sub_81C286C: @ 81C286C
 	movs r2, 0x2
 	movs r3, 0x1
 	bl sub_81C25A4
-	ldr r1, =gUnknown_085EA3DC
+	ldr r1, =gText_PkmnSkills
 	str r5, [sp]
 	str r6, [sp, 0x4]
 	movs r0, 0x1
 	movs r2, 0x2
 	movs r3, 0x1
 	bl sub_81C25A4
-	ldr r1, =gUnknown_085EA3EB
+	ldr r1, =gText_BattleMoves
 	str r5, [sp]
 	str r6, [sp, 0x4]
 	movs r0, 0x2
 	movs r2, 0x2
 	movs r3, 0x1
 	bl sub_81C25A4
-	ldr r1, =gUnknown_085EA3F8
+	ldr r1, =gText_ContestMoves
 	str r5, [sp]
 	str r6, [sp, 0x4]
 	movs r0, 0x3
@@ -2405,7 +2405,7 @@ _081C28CC:
 	adds r1, r7, 0
 	movs r3, 0x1
 	bl sub_81C25A4
-	ldr r7, =gUnknown_085EA406
+	ldr r7, =gText_Info
 	movs r0, 0x1
 	adds r1, r7, 0
 	movs r2, 0x3E
@@ -2428,7 +2428,7 @@ _081C28FE:
 	adds r1, r7, 0
 	movs r3, 0x1
 	bl sub_81C25A4
-	ldr r7, =gUnknown_085EA3C8
+	ldr r7, =gText_Switch
 	movs r0, 0x1
 	adds r1, r7, 0
 	movs r2, 0x3E
@@ -2451,21 +2451,21 @@ _081C2930:
 	adds r1, r7, 0
 	movs r3, 0x1
 	bl sub_81C25A4
-	ldr r1, =gUnknown_085EA369
+	ldr r1, =gText_RentalPkmn
 	str r5, [sp]
 	str r6, [sp, 0x4]
 	movs r0, 0x8
 	movs r2, 0
 	movs r3, 0x1
 	bl sub_81C25A4
-	ldr r1, =gUnknown_085EA378
+	ldr r1, =gText_TypeSlash
 	str r5, [sp]
 	str r5, [sp, 0x4]
 	movs r0, 0x9
 	movs r2, 0
 	movs r3, 0x1
 	bl sub_81C25A4
-	ldr r4, =gUnknown_085EA361
+	ldr r4, =gText_HP4
 	movs r0, 0x1
 	adds r1, r4, 0
 	movs r2, 0x2A
@@ -2479,7 +2479,7 @@ _081C2930:
 	adds r1, r4, 0
 	movs r3, 0x1
 	bl sub_81C25A4
-	ldr r4, =gUnknown_085EA33C
+	ldr r4, =gText_Attack3
 	movs r0, 0x1
 	adds r1, r4, 0
 	movs r2, 0x2A
@@ -2493,7 +2493,7 @@ _081C2930:
 	adds r1, r4, 0
 	movs r3, 0x11
 	bl sub_81C25A4
-	ldr r4, =gUnknown_085EA343
+	ldr r4, =gText_Defense3
 	movs r0, 0x1
 	adds r1, r4, 0
 	movs r2, 0x2A
@@ -2507,7 +2507,7 @@ _081C2930:
 	adds r1, r4, 0
 	movs r3, 0x21
 	bl sub_81C25A4
-	ldr r4, =gUnknown_085EA34B
+	ldr r4, =gText_SpAtk4
 	movs r0, 0x1
 	adds r1, r4, 0
 	movs r2, 0x24
@@ -2521,7 +2521,7 @@ _081C2930:
 	adds r1, r4, 0
 	movs r3, 0x1
 	bl sub_81C25A4
-	ldr r4, =gUnknown_085EA353
+	ldr r4, =gText_SpDef4
 	movs r0, 0x1
 	adds r1, r4, 0
 	movs r2, 0x24
@@ -2535,7 +2535,7 @@ _081C2930:
 	adds r1, r4, 0
 	movs r3, 0x11
 	bl sub_81C25A4
-	ldr r4, =gUnknown_085EA35B
+	ldr r4, =gText_Speed2
 	movs r0, 0x1
 	adds r1, r4, 0
 	movs r2, 0x24
@@ -2549,49 +2549,49 @@ _081C2930:
 	adds r1, r4, 0
 	movs r3, 0x21
 	bl sub_81C25A4
-	ldr r1, =gUnknown_085EA39F
+	ldr r1, =gText_ExpPoints
 	str r5, [sp]
 	str r6, [sp, 0x4]
 	movs r0, 0xC
 	movs r2, 0x6
 	movs r3, 0x1
 	bl sub_81C25A4
-	ldr r1, =gUnknown_085EA3AB
+	ldr r1, =gText_NextLv
 	str r5, [sp]
 	str r6, [sp, 0x4]
 	movs r0, 0xC
 	movs r2, 0x6
 	movs r3, 0x11
 	bl sub_81C25A4
-	ldr r1, =gUnknown_085EA398
+	ldr r1, =gText_Status
 	str r5, [sp]
 	str r6, [sp, 0x4]
 	movs r0, 0xD
 	movs r2, 0x2
 	movs r3, 0x1
 	bl sub_81C25A4
-	ldr r1, =gUnknown_085EA37E
+	ldr r1, =gText_Power
 	str r5, [sp]
 	str r6, [sp, 0x4]
 	movs r0, 0xE
 	movs r2, 0
 	movs r3, 0x1
 	bl sub_81C25A4
-	ldr r1, =gUnknown_085EA384
+	ldr r1, =gText_Accuracy2
 	str r5, [sp]
 	str r6, [sp, 0x4]
 	movs r0, 0xE
 	movs r2, 0
 	movs r3, 0x11
 	bl sub_81C25A4
-	ldr r1, =gUnknown_085EA38D
+	ldr r1, =gText_Appeal
 	str r5, [sp]
 	str r6, [sp, 0x4]
 	movs r0, 0xF
 	movs r2, 0
 	movs r3, 0x1
 	bl sub_81C25A4
-	ldr r1, =gUnknown_085EA394
+	ldr r1, =gText_Jam
 	str r5, [sp]
 	str r6, [sp, 0x4]
 	movs r0, 0xF
@@ -3065,7 +3065,7 @@ sub_81C2EC4: @ 81C2EC4
 	bl sub_81C2D2C
 	lsls r0, 24
 	lsrs r5, r0, 24
-	ldr r4, =gUnknown_085EA365
+	ldr r4, =gText_OTSlash
 	movs r6, 0
 	str r6, [sp]
 	movs r0, 0x1
@@ -3274,7 +3274,7 @@ sub_81C307C: @ 81C307C
 	bne _081C30E0
 _081C30C2:
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_085EA5DB
+	ldr r1, =gText_XNature
 	bl sub_81AFC28
 	b _081C3182
 	.pool
@@ -3306,25 +3306,25 @@ _081C310C:
 	cmp r0, 0
 	bne _081C3134
 	ldrb r0, [r4, 0x9]
-	ldr r1, =gUnknown_085EA516
+	ldr r1, =gText_XNatureHatchedAtYZ
 	cmp r0, 0xD4
 	bls _081C3170
-	ldr r1, =gUnknown_085EA617
+	ldr r1, =gText_XNatureHatchedSomewhereAt
 	b _081C3170
 	.pool
 _081C3134:
 	ldrb r0, [r4, 0x9]
-	ldr r1, =gUnknown_085EA4EC
+	ldr r1, =gText_XNatureMetAtYZ
 	cmp r0, 0xD4
 	bls _081C3170
-	ldr r1, =gUnknown_085EA5EB
+	ldr r1, =gText_XNatureMetSomewhereAt
 	b _081C3170
 	.pool
 _081C3148:
 	ldrb r0, [r4, 0x9]
 	cmp r0, 0xFF
 	bne _081C3158
-	ldr r1, =gUnknown_085EA56A
+	ldr r1, =gText_XNatureFatefulEncounter
 	b _081C3170
 	.pool
 _081C3158:
@@ -3335,11 +3335,11 @@ _081C3158:
 	cmp r0, 0
 	beq _081C316E
 	ldrb r0, [r4, 0x9]
-	ldr r1, =gUnknown_085EA5A8
+	ldr r1, =gText_XNatureProbablyMetAt
 	cmp r0, 0xD4
 	bls _081C3170
 _081C316E:
-	ldr r1, =gUnknown_085EA544
+	ldr r1, =gText_XNatureObtainedInTrade
 _081C3170:
 	ldr r0, =gStringVar4
 	bl sub_81AFC28
@@ -3388,7 +3388,7 @@ sub_81C31C0: @ 81C31C0
 	ldr r1, [r0]
 	movs r0, 0x2
 	bl sub_81AFC0C
-	ldr r1, =gUnknown_085EA3C0
+	ldr r1, =gText_EmptyString5
 	movs r0, 0x5
 	bl sub_81AFC0C
 	pop {r0}
@@ -3588,7 +3588,7 @@ sub_81C335C: @ 81C335C
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	ldr r0, =gUnknown_085EA365
+	ldr r0, =gText_OTSlash
 	mov r8, r0
 	movs r0, 0x1
 	mov r1, r8
@@ -3675,27 +3675,27 @@ sub_81C3428: @ 81C3428
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _081C3448
-	ldr r4, =gUnknown_085EA40B
+	ldr r4, =gText_EggWillTakeALongTime
 	b _081C346C
 	.pool
 _081C3448:
 	ldrh r0, [r1, 0x30]
 	cmp r0, 0x5
 	bhi _081C3458
-	ldr r4, =gUnknown_085EA4A2
+	ldr r4, =gText_EggAboutToHatch
 	b _081C346C
 	.pool
 _081C3458:
 	cmp r0, 0xA
 	bhi _081C3464
-	ldr r4, =gUnknown_085EA475
+	ldr r4, =gText_EggWillHatchSoon
 	b _081C346C
 	.pool
 _081C3464:
-	ldr r4, =gUnknown_085EA40B
+	ldr r4, =gText_EggWillTakeALongTime
 	cmp r0, 0x28
 	bhi _081C346C
-	ldr r4, =gUnknown_085EA442
+	ldr r4, =gText_EggWillTakeSomeTime
 _081C346C:
 	ldr r0, =gUnknown_0861CCCC
 	movs r1, 0x2
@@ -3731,7 +3731,7 @@ sub_81C349C: @ 81C349C
 	ldrb r0, [r4, 0x9]
 	cmp r0, 0xFF
 	bne _081C34C4
-	ldr r4, =gUnknown_085EA678
+	ldr r4, =gText_PeculiarEggNicePlace
 	b _081C3502
 	.pool
 _081C34C4:
@@ -3744,7 +3744,7 @@ _081C34C4:
 	cmp r0, 0
 	bne _081C34E0
 _081C34D8:
-	ldr r4, =gUnknown_085EA6AB
+	ldr r4, =gText_PeculiarEggTrade
 	b _081C3502
 	.pool
 _081C34E0:
@@ -3754,14 +3754,14 @@ _081C34E0:
 	bl sub_81C32E0
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r4, =gUnknown_085EA702
+	ldr r4, =gText_EggFromTraveler
 	cmp r0, 0x1
 	bne _081C3502
-	ldr r4, =gUnknown_085EA6D7
+	ldr r4, =gText_EggFromHotSprings
 	b _081C3502
 	.pool
 _081C3500:
-	ldr r4, =gUnknown_085EA647
+	ldr r4, =gText_OddEggFoundByCouple
 _081C3502:
 	ldr r0, =gUnknown_0861CCCC
 	movs r1, 0x3
@@ -3960,7 +3960,7 @@ _081C36B0:
 	movs r3, 0x2
 	bl ConvertIntToDecimalStringN
 	ldr r4, =gStringVar4
-	ldr r1, =gUnknown_085EA3B4
+	ldr r1, =gText_RibbonsVar1
 	adds r0, r4, 0
 	bl StringExpandPlaceholders
 	adds r5, r4, 0
@@ -5140,7 +5140,7 @@ sub_81C4154: @ 81C4154
 	adds r0, r4, 0
 	movs r1, 0
 	bl FillWindowPixelBuffer
-	ldr r1, =gUnknown_085EA4CB
+	ldr r1, =gText_HMMovesCantBeForgotten2
 	movs r0, 0
 	str r0, [sp]
 	str r0, [sp, 0x4]
@@ -7369,7 +7369,7 @@ sub_81C540C: @ 81C540C
 	ldr r1, =gStringVar2
 	adds r0, r4, 0
 	bl CopyItemName
-	ldr r1, =gUnknown_085E9210
+	ldr r1, =gText_UnkF908Var1Clear7Var2
 	adds r0, r5, 0
 	bl StringExpandPlaceholders
 	b _081C5458
@@ -7574,7 +7574,7 @@ sub_81C55D8: @ 81C55D8
 	.pool
 _081C561C:
 	ldr r0, =gStringVar1
-	ldr r2, =gUnknown_085E91B0
+	ldr r2, =gReturnToXStringsTable2
 	ldr r1, =gUnknown_0203CF30
 	ldrb r1, [r1, 0x4]
 	lsls r1, 2