pokeblock merge conflicts

asm/battle_frontier_1.s

@@ -7383,12 +7383,12 @@ _08192932:
 	ldr r1, [sp, 0x24]
 	cmp r1, r0
 	bne _08192980
-	ldr r0, =gUnknown_0860D1D0
+	ldr r0, =gBattleDomePotentialPointers
 	ldr r0, [r0, 0x40]
 	b _0819298A
 	.pool
 _08192980:
-	ldr r0, =gUnknown_0860D1D0
+	ldr r0, =gBattleDomePotentialPointers
 	ldr r2, [sp, 0x20]
 	lsls r1, r2, 2
 	adds r1, r0
@@ -7503,7 +7503,7 @@ _08192A58:
 	cmp r7, 0x2
 	ble _081929AE
 	movs r7, 0
-	ldr r2, =gUnknown_0860D214
+	ldr r2, =gBattleDomeOpponentStylePointers
 	mov r9, r2
 	ldr r3, =gUnknown_0860C988
 	mov r10, r3
@@ -8071,7 +8071,7 @@ _08192ED0:
 	movs r7, 0x2A
 _08192ED2:
 	lsls r0, r7, 2
-	ldr r3, =gUnknown_0860D294
+	ldr r3, =gBattleDomeOpponentStatsPointers
 	adds r0, r3
 	ldr r0, [r0]
 	str r0, [sp, 0xC]
@@ -9029,7 +9029,7 @@ _081936A0:
 	movs r0, 0xD0
 	strb r0, [r1, 0xD]
 	ldr r4, =gStringVar4
-	ldr r0, =gUnknown_0860D38C
+	ldr r0, =gBattleDomeWinStringsPointers
 	ldr r7, [sp, 0x70]
 	adds r0, r7, r0
 	ldr r1, [r0]
@@ -9167,7 +9167,7 @@ _08193802:
 	bl AddTextPrinter
 	add r0, sp, 0xC
 	strb r6, [r0, 0xA]
-	ldr r0, =gUnknown_0860D350
+	ldr r0, =gBattleDomeMatchNumberPointers
 	ldr r1, [sp, 0x58]
 	adds r0, r1, r0
 	ldr r0, [r0]

asm/battle_frontier_2.s

@@ -29290,7 +29290,7 @@ sub_81A9B04: @ 81A9B04
 	cmp r0, 0
 	beq _081A9B2E
 	movs r0, 0x1
-	bl sub_80B47E0
+	bl GetChosenApproachingTrainerMapObjectId
 	ldr r1, =gSelectedMapObject
 	strb r0, [r1]
 	ldr r0, =gTrainerBattleOpponent_B

asm/contest_painting.s

@@ -386,7 +386,7 @@ sub_813010C: @ 813010C
 	ldr r1, =gText_Space
 	adds r0, r4, 0
 	bl StringAppend
-	ldr r1, =gUnknown_085B07D4
+	ldr r1, =gContestRankTextPointers
 	ldr r0, [r6]
 	ldrb r0, [r0, 0x1E]
 	lsls r0, 2
@@ -415,7 +415,7 @@ _08130190:
 	adds r1, 0xB
 	bl StringCopy
 	ldr r0, =gStringVar4
-	ldr r2, =gUnknown_085B07F4
+	ldr r2, =gContestPaintingDescriptionPointers
 	lsls r1, r5, 2
 	adds r1, r2
 	ldr r1, [r1]

asm/map_obj_lock.s

@@ -345,7 +345,7 @@ sub_8098630: @ 8098630
 	mov r6, r8
 	push {r6,r7}
 	movs r0, 0
-	bl sub_80B47E0
+	bl GetChosenApproachingTrainerMapObjectId
 	lsls r0, 24
 	lsrs r4, r0, 24
 	ldr r0, =gNoOfApproachingTrainers
@@ -353,7 +353,7 @@ sub_8098630: @ 8098630
 	cmp r0, 0x2
 	bne _080986E0
 	movs r0, 0x1
-	bl sub_80B47E0
+	bl GetChosenApproachingTrainerMapObjectId
 	lsls r0, 24
 	lsrs r0, 24
 	adds r5, r0, 0

asm/mystery_event_script.s

@@ -43,7 +43,7 @@ _081537FE:
 sub_8153804: @ 8153804
 	push {lr}
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674C86
+	ldr r1, =gText_MysteryGiftCantBeUsed
 	bl StringExpandPlaceholders
 	movs r0, 0x3
 	bl SetMysteryEventScriptStatus
@@ -461,7 +461,7 @@ sub_8153AE8: @ 8153AE8
 	cmp r0, 0
 	bne _08153B54
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674AE4
+	ldr r1, =gText_MysteryGiftBerry
 	b _08153B74
 	.pool
 _08153B54:
@@ -471,12 +471,12 @@ _08153B54:
 	cmp r0, 0
 	beq _08153B70
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674B16
+	ldr r1, =gText_MysteryGiftBerryTransform
 	b _08153B74
 	.pool
 _08153B70:
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674B42
+	ldr r1, =gText_MysteryGiftBerryObtained
 _08153B74:
 	bl StringExpandPlaceholders
 	movs r0, 0x2
@@ -515,7 +515,7 @@ sub_8153BB0: @ 8153BB0
 	str r2, [r4, 0x8]
 	bl GiveGiftRibbonToParty
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674B6A
+	ldr r1, =gText_MysteryGiftSpecialRibbon
 	bl StringExpandPlaceholders
 	movs r0, 0x2
 	str r0, [r4, 0x6C]
@@ -584,7 +584,7 @@ sub_8153C4C: @ 8153C4C
 	adds r4, r0, 0
 	bl EnableNationalPokedex
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674B9E
+	ldr r1, =gText_MysteryGiftNationalDex
 	bl StringExpandPlaceholders
 	movs r0, 0x2
 	str r0, [r4, 0x6C]
@@ -605,7 +605,7 @@ sub_8153C70: @ 8153C70
 	str r1, [r4, 0x8]
 	bl sub_811EFC0
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674BD4
+	ldr r1, =gText_MysteryGiftRareWord
 	bl StringExpandPlaceholders
 	movs r0, 0x2
 	str r0, [r4, 0x6C]
@@ -685,7 +685,7 @@ _08153D22:
 	cmp r0, 0x6
 	bne _08153D4C
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674C02
+	ldr r1, =gText_MysteryGiftFullParty
 	bl StringExpandPlaceholders
 	movs r0, 0x3
 	b _08153DB6
@@ -732,7 +732,7 @@ _08153DA4:
 	bl CompactPartySlots
 	bl CalculatePlayerPartyCount
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674BF0
+	ldr r1, =gText_MysteryGiftSentOver
 	bl StringExpandPlaceholders
 	movs r0, 0x2
 _08153DB6:
@@ -765,7 +765,7 @@ sub_8153DD4: @ 8153DD4
 	bl memcpy
 	bl sub_81652B4
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674C31
+	ldr r1, =gText_MysteryGiftNewTrainer
 	bl StringExpandPlaceholders
 	movs r0, 0x2
 	str r0, [r4, 0x6C]