diff --git a/asm/code_803D110.s b/asm/code_803D110.s
index f5d2ba2c2..51c4c2465 100644
--- a/asm/code_803D110.s
+++ b/asm/code_803D110.s
@@ -5178,8 +5178,8 @@ _0803F984:
 	bx r0
 	thumb_func_end sub_803F878
 
-	thumb_func_start sub_803F994
-sub_803F994:
+	thumb_func_start GetCameraXPos
+GetCameraXPos:
 	ldr r0, _0803F9A8
 	ldr r0, [r0]
 	ldr r1, _0803F9AC
@@ -5192,10 +5192,10 @@ sub_803F994:
 	.align 2, 0
 _0803F9A8: .4byte gDungeonGlobalData
 _0803F9AC: .4byte 0x000181e8
-	thumb_func_end sub_803F994
+	thumb_func_end GetCameraXPos
 
-	thumb_func_start sub_803F9B0
-sub_803F9B0:
+	thumb_func_start GetCameraYPos
+GetCameraYPos:
 	ldr r0, _0803F9C4
 	ldr r0, [r0]
 	ldr r1, _0803F9C8
@@ -5208,7 +5208,7 @@ sub_803F9B0:
 	.align 2, 0
 _0803F9C4: .4byte gDungeonGlobalData
 _0803F9C8: .4byte 0x000181e8
-	thumb_func_end sub_803F9B0
+	thumb_func_end GetCameraYPos
 
 	thumb_func_start sub_803F9CC
 sub_803F9CC:
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s
index 0052de8bb..393cfe850 100644
--- a/asm/code_80521D0.s
+++ b/asm/code_80521D0.s
@@ -4259,7 +4259,7 @@ _08054968:
 	adds r1, r5, 0
 	mov r2, r8
 	mov r3, r9
-	bl sub_8057A0C
+	bl PainSplitMoveAction
 	bl _080554BA
 _08054978:
 	adds r0, r7, 0
diff --git a/asm/code_80848F0.s b/asm/code_80848F0.s
index 01d27da17..4d405e727 100644
--- a/asm/code_80848F0.s
+++ b/asm/code_80848F0.s
@@ -309,7 +309,7 @@ _080854C0:
 	cmp r5, 0x3
 	ble _08085490
 	movs r0, 0x2
-	bl sub_8085680
+	bl GetEntityFromClientType
 _080854CC:
 	pop {r4,r5}
 	pop {r1}
@@ -550,8 +550,8 @@ _08085678: .4byte gDungeonGlobalData
 _0808567C: .4byte 0x0001358c
 	thumb_func_end sub_808563C
 
-	thumb_func_start sub_8085680
-sub_8085680:
+	thumb_func_start GetEntityFromClientType
+GetEntityFromClientType:
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
@@ -588,7 +588,7 @@ _080856C0:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8085680
+	thumb_func_end GetEntityFromClientType
 
 	thumb_func_start sub_80856C8
 sub_80856C8:
diff --git a/asm/code_8085B0C.s b/asm/code_8085B0C.s
index fa3b3f500..4c96aaffc 100644
--- a/asm/code_8085B0C.s
+++ b/asm/code_8085B0C.s
@@ -5,40 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8085B0C
-sub_8085B0C:
-	push {r4,r5,lr}
-	sub sp, 0x1C
-	adds r5, r0, 0
-	ldr r1, _08085B48
-	mov r0, sp
-	movs r2, 0x19
-	bl memcpy
-	mov r0, sp
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08085B3E
-	mov r4, sp
-_08085B26:
-	ldrb r1, [r4]
-	adds r0, r5, 0
-	bl SetFacingDirection
-	movs r0, 0x6
-	movs r1, 0x46
-	bl sub_803E708
-	adds r4, 0x1
-	ldrb r0, [r4]
-	cmp r0, 0
-	bne _08085B26
-_08085B3E:
-	add sp, 0x1C
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08085B48: .4byte gUnknown_8107358
-	thumb_func_end sub_8085B0C
-
 	thumb_func_start sub_8085B4C
 sub_8085B4C:
 	push {r4-r6,lr}
@@ -180,8 +146,8 @@ _08085C4C: .4byte gAdjacentTileOffsets
 _08085C50: .4byte gUnknown_202F3D8
 	thumb_func_end sub_8085B80
 
-	thumb_func_start sub_8085C54
-sub_8085C54:
+	thumb_func_start SetDungeonBGColorRGB
+SetDungeonBGColorRGB:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -482,7 +448,7 @@ _08085E88: .4byte 0xffff0000
 _08085E8C: .4byte gUnknown_202EE8C
 _08085E90: .4byte gUnknown_202ECA4
 _08085E94: .4byte 0x000181e4
-	thumb_func_end sub_8085C54
+	thumb_func_end SetDungeonBGColorRGB
 
 	thumb_func_start sub_8085E98
 sub_8085E98:
diff --git a/asm/code_8086A3C.s b/asm/code_8086A3C.s
index 0d2aead54..f53e75bab 100644
--- a/asm/code_8086A3C.s
+++ b/asm/code_8086A3C.s
@@ -108,7 +108,7 @@ TeamMeaniesPreFightDialogue:
 	adds r4, 0xC
 	adds r0, r4, 0
 	movs r1, 0x10
-	bl sub_80858AC
+	bl ShiftCameraToPosition
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -186,7 +186,7 @@ TeamMeaniesReFightDialogue:
 	adds r4, 0xC
 	adds r0, r4, 0
 	movs r1, 0x10
-	bl sub_80858AC
+	bl ShiftCameraToPosition
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -219,13 +219,13 @@ sub_8087144:
 	push {r6,r7}
 	sub sp, 0xF0
 	movs r0, 0x5
-	bl sub_8085680
+	bl GetEntityFromClientType
 	adds r7, r0, 0
 	movs r0, 0x6
-	bl sub_8085680
+	bl GetEntityFromClientType
 	mov r8, r0
 	movs r0, 0x7
-	bl sub_8085680
+	bl GetEntityFromClientType
 	mov r9, r0
 	ldr r1, _080871E0
 	mov r0, sp
@@ -324,7 +324,7 @@ sub_8087230:
 	bl xxx_call_GetLeaderEntity
 	adds r6, r0, 0
 	movs r0, 0x8
-	bl sub_8085680
+	bl GetEntityFromClientType
 	adds r5, r0, 0
 	movs r0, 0x72
 	bl sub_8083E88
@@ -370,7 +370,7 @@ sub_808729C:
 	bl xxx_call_GetLeaderEntity
 	adds r5, r0, 0
 	movs r0, 0x8
-	bl sub_8085680
+	bl GetEntityFromClientType
 	adds r4, r0, 0
 	bl sub_80854D4
 	movs r0, 0x4
@@ -471,7 +471,7 @@ ZapdosPreFightDialogue:
 	bl GetPartnerEntity
 	adds r6, r0, 0
 	movs r0, 0x8
-	bl sub_8085680
+	bl GetEntityFromClientType
 	str r0, [sp, 0x68]
 	bl sub_8086448
 	movs r0, 0xA
@@ -687,7 +687,7 @@ _0808752A:
 	bl SetupBossFightHP
 	adds r0, r4, 0
 	movs r1, 0x10
-	bl sub_80858AC
+	bl ShiftCameraToPosition
 	add sp, 0x70
 	pop {r3-r5}
 	mov r8, r3
diff --git a/asm/jirachi_wish.s b/asm/jirachi_wish.s
index ef24a1c11..bdb509ad5 100644
--- a/asm/jirachi_wish.s
+++ b/asm/jirachi_wish.s
@@ -14,7 +14,7 @@ JirachiWish:
 	push {r5-r7}
 	sub sp, 0x78
 	movs r0, 0x1A
-	bl sub_8085680
+	bl GetEntityFromClientType
 	adds r6, r0, 0
 	ldr r0, _0808B82C
 	ldr r1, _0808B830
@@ -507,8 +507,8 @@ _0808BA70: .4byte gUnknown_81058E0
 _0808BA74: .4byte gUnknown_810593C
 	thumb_func_end JirachiWish
 
-	thumb_func_start JirachiPreFightDialogue1
-JirachiPreFightDialogue1:
+	thumb_func_start JirachiReFightDialogue
+JirachiReFightDialogue:
 	push {lr}
 	ldr r0, _0808BA94
 	bl HasRecruitedMon
@@ -521,16 +521,16 @@ JirachiPreFightDialogue1:
 	b _0808BAA0
 	.align 2, 0
 _0808BA94: .4byte 0x0000019d
-_0808BA98: .4byte gUnknown_8105E14
+_0808BA98: .4byte gJirachiReFightDialogue_1
 _0808BA9C:
 	bl JirachiPreFightDialogue
 _0808BAA0:
 	pop {r0}
 	bx r0
-	thumb_func_end JirachiPreFightDialogue1
+	thumb_func_end JirachiReFightDialogue
 
-	thumb_func_start sub_808BAA4
-sub_808BAA4:
+	thumb_func_start JirachiWishGrantFlash
+JirachiWishGrantFlash:
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r0, _0808BB34
@@ -546,7 +546,7 @@ _0808BAB8:
 	adds r1, r4, 0
 	adds r2, r4, 0
 	movs r3, 0x1
-	bl sub_8085C54
+	bl SetDungeonBGColorRGB
 	movs r0, 0x46
 	bl sub_803E46C
 	subs r4, 0xA
@@ -563,7 +563,7 @@ _0808BADE:
 	adds r1, r4, 0
 	adds r2, r4, 0
 	movs r3, 0x1
-	bl sub_8085C54
+	bl SetDungeonBGColorRGB
 	movs r0, 0x46
 	bl sub_803E46C
 	subs r4, 0xA
@@ -580,7 +580,7 @@ _0808BB04:
 	adds r1, r4, 0
 	adds r2, r4, 0
 	movs r3, 0x1
-	bl sub_8085C54
+	bl SetDungeonBGColorRGB
 	movs r0, 0x46
 	bl sub_803E46C
 	subs r4, 0xA
@@ -597,7 +597,7 @@ _0808BB04:
 	.align 2, 0
 _0808BB34: .4byte 0x000002c1
 _0808BB38: .4byte gUnknown_202EDC8
-	thumb_func_end sub_808BAA4
+	thumb_func_end JirachiWishGrantFlash
 
 	thumb_func_start sub_808BB3C
 sub_808BB3C:
diff --git a/data/data_80DED44.s b/data/data_80DED44.s
index 234b75f58..c28f4a43d 100644
--- a/data/data_80DED44.s
+++ b/data/data_80DED44.s
@@ -223,13 +223,13 @@ gUnknown_80E04B4: @ 80E04B4
 
 	.global gUnknown_80E04F4
 gUnknown_80E04F4: @ 80E04F4
-        .string "#+...Oh~2c wait~2c sorry.#P"
-        .string "#+You already have the \n"
-        .string "#+#C4$h Friend Area#R.#P"
-        .string "#+I~27m sorry that my reward is\n"
-        .string "#+something you already have.#P"
-        .string "#+In its place~2c #CN$m0#R~2c\n"
-        .string "#+you can have #CG1~2c000#R {POKE}.\0"
+        .string "{CENTER_ALIGN}...Oh{COMMA} wait{COMMA} sorry.{EXTRA_MSG}"
+        .string "{CENTER_ALIGN}You already have the \n"
+        .string "{CENTER_ALIGN}{COLOR_1 GREEN}$h Friend Area{END_COLOR_TEXT_1}.{EXTRA_MSG}"
+        .string "{CENTER_ALIGN}I{APOSTROPHE}m sorry that my reward is\n"
+        .string "{CENTER_ALIGN}something you already have.{EXTRA_MSG}"
+        .string "{CENTER_ALIGN}In its place{COMMA} {COLOR_1 YELLOW_5}$m0{END_COLOR_TEXT_1}{COMMA}\n"
+        .string "{CENTER_ALIGN}you can have {COLOR_1 LIGHT_BLUE_2}1{COMMA}000{END_COLOR_TEXT_1} {POKE}.\0"
         .align 2, 0
 
 	.global gUnknown_80E05C0
diff --git a/data/data_80F59C8.s b/data/data_80F59C8.s
index 99d22b3b8..c2078cf7a 100644
--- a/data/data_80F59C8.s
+++ b/data/data_80F59C8.s
@@ -4846,183 +4846,183 @@ gUnknown_810178C: @ 810178C
 gUnknown_81017B4: @ 81017B4
 	.incbin "baserom.gba", 0x1017B4, 0x30
 
-	.global gUnknown_81017E4
-gUnknown_81017E4: @ 81017E4
+	.global gZapdosReFightDialogue_1
+gZapdosReFightDialogue_1: @ 81017E4
 	.incbin "baserom.gba", 0x1017E4, 0xB4
 
-	.global gUnknown_8101898
-gUnknown_8101898: @ 8101898
+	.global gZapdosReFightDialogue_2
+gZapdosReFightDialogue_2: @ 8101898
 	.incbin "baserom.gba", 0x101898, 0x54
 
-	.global gUnknown_81018EC
-gUnknown_81018EC: @ 81018EC
+	.global gZapdosReFightDialogue_3
+gZapdosReFightDialogue_3: @ 81018EC
 	.incbin "baserom.gba", 0x1018EC, 0x2C
 
-	.global gUnknown_8101918
-gUnknown_8101918: @ 8101918
+	.global gZapdosReFightDialogue_4
+gZapdosReFightDialogue_4: @ 8101918
 	.incbin "baserom.gba", 0x101918, 0x24
 
-	.global gUnknown_810193C
-gUnknown_810193C: @ 810193C
+	.global gZapdosPostStoryPreFightDialogue_1
+gZapdosPostStoryPreFightDialogue_1: @ 810193C
 	.incbin "baserom.gba", 0x10193C, 0x34
 
-	.global gUnknown_8101970
-gUnknown_8101970: @ 8101970
+	.global gZapdosPostStoryPreFightDialogue_2
+gZapdosPostStoryPreFightDialogue_2: @ 8101970
 	.incbin "baserom.gba", 0x101970, 0x24
 
-	.global gUnknown_8101994
-gUnknown_8101994: @ 8101994
+	.global gZapdosPostStoryPreFightDialogue_3
+gZapdosPostStoryPreFightDialogue_3: @ 8101994
 	.incbin "baserom.gba", 0x101994, 0x50
 
-	.global gUnknown_81019E4
-gUnknown_81019E4: @ 81019E4
+	.global gZapdosPostStoryPreFightDialogue_4
+gZapdosPostStoryPreFightDialogue_4: @ 81019E4
 	.incbin "baserom.gba", 0x1019E4, 0x20
 
-	.global gUnknown_8101A04
-gUnknown_8101A04: @ 8101A04
+	.global gZapdosPostStoryPreFightDialogue_5
+gZapdosPostStoryPreFightDialogue_5: @ 8101A04
 	.incbin "baserom.gba", 0x101A04, 0x34
 
-	.global gUnknown_8101A38
-gUnknown_8101A38: @ 8101A38
+	.global gZapdosPostStoryPreFightDialogue_6
+gZapdosPostStoryPreFightDialogue_6: @ 8101A38
 	.incbin "baserom.gba", 0x101A38, 0x64
 
-	.global gUnknown_8101A9C
-gUnknown_8101A9C: @ 8101A9C
+	.global gMoltresPreFightDialogue_1
+gMoltresPreFightDialogue_1: @ 8101A9C
 	.incbin "baserom.gba", 0x101A9C, 0x38
 
-	.global gUnknown_8101AD4
-gUnknown_8101AD4: @ 8101AD4
+	.global gMoltresPreFightDialogue_2
+gMoltresPreFightDialogue_2: @ 8101AD4
 	.incbin "baserom.gba", 0x101AD4, 0x15C
 
-	.global gUnknown_8101C30
-gUnknown_8101C30: @ 8101C30
+	.global gMoltresPreFightDialogue_3
+gMoltresPreFightDialogue_3: @ 8101C30
 	.incbin "baserom.gba", 0x101C30, 0x8C
 
-	.global gUnknown_8101CBC
-gUnknown_8101CBC: @ 8101CBC
+	.global gMoltresPreFightDialogue_4
+gMoltresPreFightDialogue_4: @ 8101CBC
 	.incbin "baserom.gba", 0x101CBC, 0xD0
 
-	.global gUnknown_8101D8C
-gUnknown_8101D8C: @ 8101D8C
+	.global gMoltresPreFightDialogue_5
+gMoltresPreFightDialogue_5: @ 8101D8C
 	.incbin "baserom.gba", 0x101D8C, 0x14
 
-	.global gUnknown_8101DA0
-gUnknown_8101DA0: @ 8101DA0
+	.global gMoltresPreFightDialogue_6
+gMoltresPreFightDialogue_6: @ 8101DA0
 	.incbin "baserom.gba", 0x101DA0, 0x7C
 
-	.global gUnknown_8101E1C
-gUnknown_8101E1C: @ 8101E1C
+	.global gMoltresPreFightDialogue_7
+gMoltresPreFightDialogue_7: @ 8101E1C
 	.incbin "baserom.gba", 0x101E1C, 0x90
 
-	.global gUnknown_8101EAC
-gUnknown_8101EAC: @ 8101EAC
+	.global gMoltresPreFightDialogue_8
+gMoltresPreFightDialogue_8: @ 8101EAC
 	.incbin "baserom.gba", 0x101EAC, 0x1C4
 
-	.global gUnknown_8102070
-gUnknown_8102070: @ 8102070
+	.global gMoltresPreFightDialogue_9
+gMoltresPreFightDialogue_9: @ 8102070
 	.incbin "baserom.gba", 0x102070, 0x34
 
-	.global gUnknown_81020A4
-gUnknown_81020A4: @ 81020A4
+	.global gMoltresPreFightDialogue_10
+gMoltresPreFightDialogue_10: @ 81020A4
 	.incbin "baserom.gba", 0x1020A4, 0x30
 
-	.global gUnknown_81020D4
-gUnknown_81020D4: @ 81020D4
+	.global gMoltresPreFightDialogue_11
+gMoltresPreFightDialogue_11: @ 81020D4
 	.incbin "baserom.gba", 0x1020D4, 0x34
 
-	.global gUnknown_8102108
-gUnknown_8102108: @ 8102108
+	.global gMoltresPreFightDialogue_12
+gMoltresPreFightDialogue_12: @ 8102108
 	.incbin "baserom.gba", 0x102108, 0x50
 
-	.global gUnknown_8102158
-gUnknown_8102158: @ 8102158
+	.global gMoltresReFightDialogue_1
+gMoltresReFightDialogue_1: @ 8102158
 	.incbin "baserom.gba", 0x102158, 0x38
 
-	.global gUnknown_8102190
-gUnknown_8102190: @ 8102190
+	.global gMoltresReFightDialogue_2
+gMoltresReFightDialogue_2: @ 8102190
 	.incbin "baserom.gba", 0x102190, 0x70
 
-	.global gUnknown_8102200
-gUnknown_8102200: @ 8102200
+	.global gMoltresReFightDialogue_3
+gMoltresReFightDialogue_3: @ 8102200
 	.incbin "baserom.gba", 0x102200, 0x54
 
-	.global gUnknown_8102254
-gUnknown_8102254: @ 8102254
+	.global gMoltresReFightDialogue_4
+gMoltresReFightDialogue_4: @ 8102254
 	.incbin "baserom.gba", 0x102254, 0xA4
 
-	.global gUnknown_81022F8
-gUnknown_81022F8: @ 81022F8
+	.global gMoltresReFightDialogue_5
+gMoltresReFightDialogue_5: @ 81022F8
 	.incbin "baserom.gba", 0x1022F8, 0x34
 
-	.global gUnknown_810232C
-gUnknown_810232C: @ 810232C
+	.global gMoltresPostStoryPreFightDialogue_1
+gMoltresPostStoryPreFightDialogue_1: @ 810232C
 	.incbin "baserom.gba", 0x10232C, 0x6C
 
-	.global gUnknown_8102398
-gUnknown_8102398: @ 8102398
+	.global gMoltresPostStoryPreFightDialogue_2
+gMoltresPostStoryPreFightDialogue_2: @ 8102398
 	.incbin "baserom.gba", 0x102398, 0x2C
 
-	.global gUnknown_81023C4
-gUnknown_81023C4: @ 81023C4
+	.global gMoltresPostStoryPreFightDialogue_3
+gMoltresPostStoryPreFightDialogue_3: @ 81023C4
 	.incbin "baserom.gba", 0x1023C4, 0x3C
 
-	.global gUnknown_8102400
-gUnknown_8102400: @ 8102400
+	.global gMoltresPostStoryPreFightDialogue_4
+gMoltresPostStoryPreFightDialogue_4: @ 8102400
 	.incbin "baserom.gba", 0x102400, 0x54
 
-	.global gUnknown_8102454
-gUnknown_8102454: @ 8102454
+	.global gMoltresPostStoryPreFightDialogue_5
+gMoltresPostStoryPreFightDialogue_5: @ 8102454
 	.incbin "baserom.gba", 0x102454, 0x24
 
-	.global gUnknown_8102478
-gUnknown_8102478: @ 8102478
+	.global gArticunoPreFightDialogue_1
+gArticunoPreFightDialogue_1: @ 8102478
 	.incbin "baserom.gba", 0x102478, 0x13C
 
-	.global gUnknown_81025B4
-gUnknown_81025B4: @ 81025B4
+	.global gArticunoPreFightDialogue_2
+gArticunoPreFightDialogue_2: @ 81025B4
 	.incbin "baserom.gba", 0x1025B4, 0x20
 
-	.global gUnknown_81025D4
-gUnknown_81025D4: @ 81025D4
+	.global gArticunoPreFightDialogue_3
+gArticunoPreFightDialogue_3: @ 81025D4
 	.incbin "baserom.gba", 0x1025D4, 0x3C
 
-	.global gUnknown_8102610
-gUnknown_8102610: @ 8102610
+	.global gArticunoPreFightDialogue_4
+gArticunoPreFightDialogue_4: @ 8102610
 	.incbin "baserom.gba", 0x102610, 0xB4
 
-	.global gUnknown_81026C4
-gUnknown_81026C4: @ 81026C4
+	.global gArticunoPreFightDialogue_5
+gArticunoPreFightDialogue_5: @ 81026C4
 	.incbin "baserom.gba", 0x1026C4, 0x48
 
-	.global gUnknown_810270C
-gUnknown_810270C: @ 810270C
+	.global gArticunoPreFightDialogue_6
+gArticunoPreFightDialogue_6: @ 810270C
 	.incbin "baserom.gba", 0x10270C, 0x20
 
-	.global gUnknown_810272C
-gUnknown_810272C: @ 810272C
+	.global gArticunoPreFightDialogue_7
+gArticunoPreFightDialogue_7: @ 810272C
 	.incbin "baserom.gba", 0x10272C, 0x90
 
-	.global gUnknown_81027BC
-gUnknown_81027BC: @ 81027BC
+	.global gArticunoPreFightDialogue_8
+gArticunoPreFightDialogue_8: @ 81027BC
 	.incbin "baserom.gba", 0x1027BC, 0x54
 
-	.global gUnknown_8102810
-gUnknown_8102810: @ 8102810
+	.global gArticunoPreFightDialogue_9
+gArticunoPreFightDialogue_9: @ 8102810
 	.incbin "baserom.gba", 0x102810, 0x30
 
-	.global gUnknown_8102840
-gUnknown_8102840: @ 8102840
+	.global gArticunoPreFightDialogue_10
+gArticunoPreFightDialogue_10: @ 8102840
         .4byte 0x0d000000
         .4byte 0x000001ab
         .4byte gUnknown_810284C
 
 	.global gUnknown_810284C
         gUnknown_810284C:
-        .string " I am $m2!#W\n"
+        .string " I am {ARG_POKEMON_2}!{WAIT_PRESS}\n"
         .string "The warder of ice!\0"
 
-	.global gUnknown_810286C
-gUnknown_810286C: @ 810286C
+	.global gArticunoPreFightDialogue_11
+gArticunoPreFightDialogue_11: @ 810286C
 @ replacing .incbin "baserom.gba", 0x0010286c, 0x4c
         .4byte 0x0d000000
         .4byte 0x00000090
@@ -5033,8 +5033,8 @@ gUnknown_810286C: @ 810286C
         .string " Those that enter the forest\n"
         .string "I shall destroy with all my might!\0"
 
-	.global gUnknown_81028B8
-gUnknown_81028B8: @ 81028B8
+	.global gArticunoPreFightDialogue_12
+gArticunoPreFightDialogue_12: @ 81028B8
         .4byte 0x0d000000
         .4byte 0x00000090
         .4byte gUnknown_81028C4
@@ -5043,24 +5043,24 @@ gUnknown_81028B8: @ 81028B8
         gUnknown_81028C4:
         .string " Let us begin!\0\0"
 
-	.global gUnknown_81028D4
-gUnknown_81028D4: @ 81028D4
+	.global gArticunoReFightDialogue_1
+gArticunoReFightDialogue_1: @ 81028D4
 	.incbin "baserom.gba", 0x1028D4, 0x44
 
-	.global gUnknown_8102918
-gUnknown_8102918: @ 8102918
+	.global gArticunoReFightDialogue_2
+gArticunoReFightDialogue_2: @ 8102918
 	.incbin "baserom.gba", 0x102918, 0x30
 
-	.global gUnknown_8102948
-gUnknown_8102948: @ 8102948
+	.global gArticunoReFightDialogue_3
+gArticunoReFightDialogue_3: @ 8102948
 	.incbin "baserom.gba", 0x102948, 0x3C
 
-	.global gUnknown_8102984
-gUnknown_8102984: @ 8102984
+	.global gArticunoPostStoryPreFightDialogue_1
+gArticunoPostStoryPreFightDialogue_1: @ 8102984
 	.incbin "baserom.gba", 0x102984, 0x30
 
-	.global gUnknown_81029B4
-gUnknown_81029B4: @ 81029B4
+	.global gArticunoPostStoryPreFightDialogue_2
+gArticunoPostStoryPreFightDialogue_2: @ 81029B4
 @ replacing .incbin "baserom.gba", 0x001029b4, 0x64
         .4byte 0x0d000000
         .4byte 0x00000090
@@ -5069,18 +5069,18 @@ gUnknown_81029B4: @ 81029B4
 	.global gUnknown_81029C0
         gUnknown_81029C0:
         .string " Your arrival in this frozen\n"
-        .string "forest means only one thing...#P You mean to challenge me!\0"
+        .string "forest means only one thing...{EXTRA_MSG} You mean to challenge me!\0"
 
-	.global gUnknown_8102A18
-gUnknown_8102A18: @ 8102A18
+	.global gArticunoPostStoryPreFightDialogue_3
+gArticunoPostStoryPreFightDialogue_3: @ 8102A18
 	.incbin "baserom.gba", 0x102A18, 0xC
 
-	.global gUnknown_8102A24
-gUnknown_8102A24: @ 8102A24
+	.global gArticunoPostStoryPreFightDialogue_4
+gArticunoPostStoryPreFightDialogue_4: @ 8102A24
 	.incbin "baserom.gba", 0x102A24, 0x50
 
-	.global gUnknown_8102A74
-gUnknown_8102A74: @ 8102A74
+	.global gArticunoPostStoryPreFightDialogue_5
+gArticunoPostStoryPreFightDialogue_5: @ 8102A74
 	.incbin "baserom.gba", 0x102A74, 0x28
 
 	.global gUnknown_8102A9C
@@ -5091,8 +5091,8 @@ gUnknown_8102A9C: @ 8102A9C
 gUnknown_8102B10: @ 8102B10
 	.incbin "baserom.gba", 0x102B10, 0xC
 
-	.global gUnknown_8102B1C
-gUnknown_8102B1C: @ 8102B1C
+	.global MagmaCavernMidDialogue_1
+MagmaCavernMidDialogue_1: @ 8102B1C
 @ replacing .incbin "baserom.gba", 0x00102b1c, 0x38
         .4byte 0x02040000
         .4byte 0x000001aa
@@ -5100,31 +5100,31 @@ gUnknown_8102B1C: @ 8102B1C
 
 	.global gUnknown_8102B28
         gUnknown_8102B28:
-        .string " Let~27s see...#W\n"
+        .string " Let{APOSTROPHE}s see...{WAIT_PRESS}\n"
         .string "...I wonder where we are?\0"
 
-	.global gUnknown_8102B54
-gUnknown_8102B54: @ 8102B54
+	.global MagmaCavernMidDialogue_2
+MagmaCavernMidDialogue_2: @ 8102B54
 	.incbin "baserom.gba", 0x102B54, 0x70
 
-	.global gUnknown_8102BC4
-gUnknown_8102BC4: @ 8102BC4
+	.global MagmaCavernMidDialogue_3
+MagmaCavernMidDialogue_3: @ 8102BC4
 	.incbin "baserom.gba", 0x102BC4, 0x20
 
-	.global gUnknown_8102BE4
-gUnknown_8102BE4: @ 8102BE4
+	.global MagmaCavernMidDialogue_4
+MagmaCavernMidDialogue_4: @ 8102BE4
 	.incbin "baserom.gba", 0x102BE4, 0x4C
 
-	.global gUnknown_8102C30
-gUnknown_8102C30: @ 8102C30
+	.global MagmaCavernMidDialogue_5
+MagmaCavernMidDialogue_5: @ 8102C30
 	.incbin "baserom.gba", 0x102C30, 0x24
 
-	.global gUnknown_8102C54
-gUnknown_8102C54: @ 8102C54
+	.global MagmaCavernMidDialogue_6
+MagmaCavernMidDialogue_6: @ 8102C54
 	.incbin "baserom.gba", 0x102C54, 0x44
 
-	.global gUnknown_8102C98
-gUnknown_8102C98: @ 8102C98
+	.global MagmaCavernMidDialogue_7
+MagmaCavernMidDialogue_7: @ 8102C98
 @ replacing .incbin "baserom.gba", 0x00102c98, 0x18
         .4byte 0x0e030000
         .4byte 0x00000006
@@ -5134,32 +5134,32 @@ gUnknown_8102C98: @ 8102C98
         gUnknown_8102CA4:
         .string " Urrrrgh...\0"
 
-	.global gUnknown_8102CB0
-gUnknown_8102CB0: @ 8102CB0
+	.global MagmaCavernMidDialogue_8
+MagmaCavernMidDialogue_8: @ 8102CB0
 	.incbin "baserom.gba", 0x102CB0, 0x48
 
-	.global gUnknown_8102CF8
-gUnknown_8102CF8: @ 8102CF8
+	.global MagmaCavernMidDialogue_9
+MagmaCavernMidDialogue_9: @ 8102CF8
 	.incbin "baserom.gba", 0x102CF8, 0x3C
 
-	.global gUnknown_8102D34
-gUnknown_8102D34: @ 8102D34
+	.global MagmaCavernMidDialogue_10
+MagmaCavernMidDialogue_10: @ 8102D34
 	.incbin "baserom.gba", 0x102D34, 0x18
 
-	.global gUnknown_8102D4C
-gUnknown_8102D4C: @ 8102D4C
+	.global MagmaCavernMidDialogue_11
+MagmaCavernMidDialogue_11: @ 8102D4C
 	.incbin "baserom.gba", 0x102D4C, 0x30
 
-	.global gUnknown_8102D7C
-gUnknown_8102D7C: @ 8102D7C
+	.global MagmaCavernMidDialogue_12
+MagmaCavernMidDialogue_12: @ 8102D7C
 	.incbin "baserom.gba", 0x102D7C, 0x80
 
-	.global gUnknown_8102DFC
-gUnknown_8102DFC: @ 8102DFC
+	.global MagmaCavernMidDialogue_13
+MagmaCavernMidDialogue_13: @ 8102DFC
 	.incbin "baserom.gba", 0x102DFC, 0x30
 
-	.global gUnknown_8102E2C
-gUnknown_8102E2C: @ 8102E2C
+	.global MagmaCavernMidDialogue_14
+MagmaCavernMidDialogue_14: @ 8102E2C
 @ replacing .incbin "baserom.gba", 0x00102e2c, 0x28
         .4byte 0x020c0000
         .4byte 0x000001aa
@@ -5168,10 +5168,10 @@ gUnknown_8102E2C: @ 8102E2C
 	.global gUnknown_8102E38
         gUnknown_8102E38:
         .string " $m0!\n"
-        .string "We~27ve got to hurry!\0"
+        .string "We{APOSTROPHE}ve got to hurry!\0"
 
-	.global gUnknown_8102E54
-gUnknown_8102E54: @ 8102E54
+	.global MagmaCavernMidDialogue_15
+MagmaCavernMidDialogue_15: @ 8102E54
 @ replacing .incbin "baserom.gba", 0x00102e54, 0x1c
         .4byte 0x0e030000
         .4byte 0x00000006
@@ -5181,16 +5181,16 @@ gUnknown_8102E54: @ 8102E54
         gUnknown_8102E60:
         .string " ...Be careful!\0"
 
-	.global gUnknown_8102E70
-gUnknown_8102E70: @ 8102E70
+	.global GroudonPreFightDialogue_1
+GroudonPreFightDialogue_1: @ 8102E70
 	.incbin "baserom.gba", 0x102E70, 0x4C
 
-	.global gUnknown_8102EBC
-gUnknown_8102EBC: @ 8102EBC
+	.global GroudonPreFightDialogue_2
+GroudonPreFightDialogue_2: @ 8102EBC
 	.incbin "baserom.gba", 0x102EBC, 0x24
 
-	.global gUnknown_8102EE0
-gUnknown_8102EE0: @ 8102EE0
+	.global GroudonPreFightDialogue_3
+GroudonPreFightDialogue_3: @ 8102EE0
 @ replacing .incbin "baserom.gba", 0x00102ee0, 0x18
         .4byte 0x0f000000
         .4byte 0x00000041
@@ -5200,24 +5200,24 @@ gUnknown_8102EE0: @ 8102EE0
         gUnknown_8102EEC:
         .string " Stay back!\0"
 
-	.global gUnknown_8102EF8
-gUnknown_8102EF8: @ 8102EF8
+	.global GroudonPreFightDialogue_4
+GroudonPreFightDialogue_4: @ 8102EF8
 	.incbin "baserom.gba", 0x102EF8, 0x38
 
-	.global gUnknown_8102F30
-gUnknown_8102F30: @ 8102F30
+	.global GroudonPreFightDialogue_5
+GroudonPreFightDialogue_5: @ 8102F30
 	.incbin "baserom.gba", 0x102F30, 0x34
 
-	.global gUnknown_8102F64
-gUnknown_8102F64: @ 8102F64
+	.global GroudonPreFightDialogue_6
+GroudonPreFightDialogue_6: @ 8102F64
 	.incbin "baserom.gba", 0x102F64, 0x20
 
-	.global gUnknown_8102F84
-gUnknown_8102F84: @ 8102F84
+	.global GroudonPreFightDialogue_7
+GroudonPreFightDialogue_7: @ 8102F84
 	.incbin "baserom.gba", 0x102F84, 0x28
 
-	.global gUnknown_8102FAC
-gUnknown_8102FAC: @ 8102FAC
+	.global GroudonPreFightDialogue_8
+GroudonPreFightDialogue_8: @ 8102FAC
 @ replacing .incbin "baserom.gba", 0x00102fac, 0x18
         .4byte 0x0f010000
         .4byte 0x00000041
@@ -5227,8 +5227,8 @@ gUnknown_8102FAC: @ 8102FAC
         gUnknown_8102FB8:
         .string " Wraaaaaah!\0"
 
-	.global gUnknown_8102FC4
-gUnknown_8102FC4: @ 8102FC4
+	.global GroudonPreFightDialogue_9
+GroudonPreFightDialogue_9: @ 8102FC4
         @ replacing .incbin "baserom.gba", 0x00102fc4, 0x14
         .4byte 0x020c0000
         .4byte 0x000001aa
@@ -5238,36 +5238,36 @@ gUnknown_8102FC4: @ 8102FC4
         gUnknown_8102FD0:
         .string " A-$m3!\0"
 
-	.global gUnknown_8102FD8
-gUnknown_8102FD8: @ 8102FD8
+	.global GroudonPreFightDialogue_10
+GroudonPreFightDialogue_10: @ 8102FD8
 	.incbin "baserom.gba", 0x102FD8, 0x7C
 
-	.global gUnknown_8103054
-gUnknown_8103054: @ 8103054
+	.global GroudonPreFightDialogue_11
+GroudonPreFightDialogue_11: @ 8103054
         .incbin "baserom.gba", 0x00103054, 0x84
 
-	.global gUnknown_81030D8
-gUnknown_81030D8: @ 81030D8
+	.global GroudonPreFightDialogue_12
+GroudonPreFightDialogue_12: @ 81030D8
 	.incbin "baserom.gba", 0x1030D8, 0x38
 
-	.global gUnknown_8103110
-gUnknown_8103110: @ 8103110
+	.global GroudonPreFightDialogue_13
+GroudonPreFightDialogue_13: @ 8103110
 	.incbin "baserom.gba", 0x103110, 0x30
 
-	.global gUnknown_8103140
-gUnknown_8103140: @ 8103140
+	.global GroudonPreFightDialogue_14
+GroudonPreFightDialogue_14: @ 8103140
 	.incbin "baserom.gba", 0x103140, 0x48
 
-	.global gUnknown_8103188
-gUnknown_8103188: @ 8103188
+	.global gGroudonReFightDialogue_1
+gGroudonReFightDialogue_1: @ 8103188
 	.incbin "baserom.gba", 0x103188, 0xA0
 
-	.global gUnknown_8103228
-gUnknown_8103228: @ 8103228
+	.global gGroudonReFightDialogue_2
+gGroudonReFightDialogue_2: @ 8103228
         .incbin "baserom.gba", 0x00103228, 0xe8
 
-	.global gUnknown_8103310
-gUnknown_8103310: @ 8103310
+	.global gGroudonReFightDialogue_3
+gGroudonReFightDialogue_3: @ 8103310
 @ replacing .incbin "baserom.gba", 0x00103310, 0x30
         .4byte 0x00000005
         .4byte 0x00000000
@@ -5278,20 +5278,20 @@ gUnknown_8103310: @ 8103310
         .string "Grgaaaaaaaah!\n"
         .string "                     \0"
 
-	.global gUnknown_8103340
-gUnknown_8103340: @ 8103340
+	.global gGroudonReFightDialogue_4
+gGroudonReFightDialogue_4: @ 8103340
         .incbin "baserom.gba", 0x00103340, 0x60
 
-	.global gUnknown_81033A0
-gUnknown_81033A0: @ 81033A0
+	.global gGroudonPostStoryPreFightDialogue_1
+gGroudonPostStoryPreFightDialogue_1: @ 81033A0
 	.incbin "baserom.gba", 0x1033A0, 0xC
 
-	.global gUnknown_81033AC
-gUnknown_81033AC: @ 81033AC
+	.global gGroudonPostStoryPreFightDialogue_2
+gGroudonPostStoryPreFightDialogue_2: @ 81033AC
 	.incbin "baserom.gba", 0x1033AC, 0x90
 
-	.global gUnknown_810343C
-gUnknown_810343C: @ 810343C
+	.global gGroudonPostStoryPreFightDialogue_3
+gGroudonPostStoryPreFightDialogue_3: @ 810343C
 @ replacing .incbin "baserom.gba", 0x0010343c, 0x40
         .4byte 0x0d000000
         .4byte 0x0000019b
@@ -5300,11 +5300,11 @@ gUnknown_810343C: @ 810343C
 	.global gUnknown_8103448
         gUnknown_8103448:
         .string " Those that disturb my\n"
-        .string "sleep...#W\n"
+        .string "sleep...{WAIT_PRESS}\n"
         .string "Shall be crushed!\0"
 
-	.global gUnknown_810347C
-gUnknown_810347C: @ 810347C
+	.global gGroudonPostStoryPreFightDialogue_4
+gGroudonPostStoryPreFightDialogue_4: @ 810347C
 	.incbin "baserom.gba", 0x10347C, 0xC
 
 	.global gUnknown_8103488
@@ -5316,24 +5316,24 @@ gUnknown_8103488: @ 8103488
 
 	.global gUnknown_8103494
         gUnknown_8103494:
-        .string "#+This appears to be the deepest level.#P"
-        .string "#+It~27s impossible to go any farther.#W\n"
-        .string "#+It~27s time to go back.\0"
+        .string "{CENTER_ALIGN}This appears to be the deepest level.{EXTRA_MSG}"
+        .string "{CENTER_ALIGN}It{APOSTROPHE}s impossible to go any farther.{WAIT_PRESS}\n"
+        .string "{CENTER_ALIGN}It{APOSTROPHE}s time to go back.\0"
 
-	.global gUnknown_8103500
-gUnknown_8103500: @ 8103500
+	.global gRayquazaPreFightDialogue_1
+gRayquazaPreFightDialogue_1: @ 8103500
 	.incbin "baserom.gba", 0x103500, 0x2C
 
-	.global gUnknown_810352C
-gUnknown_810352C: @ 810352C
+	.global gRayquazaPreFightDialogue_2
+gRayquazaPreFightDialogue_2: @ 810352C
 	.incbin "baserom.gba", 0x10352C, 0x4C
 
-	.global gUnknown_8103578
-gUnknown_8103578: @ 8103578
+	.global gRayquazaPreFightDialogue_3
+gRayquazaPreFightDialogue_3: @ 8103578
 	.incbin "baserom.gba", 0x103578, 0x5C
 
-	.global gUnknown_81035D4
-gUnknown_81035D4: @ 81035D4
+	.global gRayquazaPreFightDialogue_4
+gRayquazaPreFightDialogue_4: @ 81035D4
         @ replacing .incbin "baserom.gba", 0x001035d4, 0x44
         .4byte 0x0d800000
         .4byte 0x0000019c
@@ -5341,16 +5341,16 @@ gUnknown_81035D4: @ 81035D4
 
 	.global gUnknown_81035E0
         gUnknown_81035E0:
-        .string " Indeed I am.#W\n"
-        .string "The sky is my domain.#P Depart at once!\0"
+        .string " Indeed I am.{WAIT_PRESS}\n"
+        .string "The sky is my domain.{EXTRA_MSG} Depart at once!\0"
         .align 2,0
 
-	.global gUnknown_8103618
-gUnknown_8103618: @ 8103618
+	.global gRayquazaPreFightDialogue_5
+gRayquazaPreFightDialogue_5: @ 8103618
 	.incbin "baserom.gba", 0x103618, 0x64
 
-	.global gUnknown_810367C
-gUnknown_810367C: @ 810367C
+	.global gRayquazaPreFightDialogue_6
+gRayquazaPreFightDialogue_6: @ 810367C
 @ replacing .incbin "baserom.gba", 0x0010367c, 0x14
         .4byte 0x0d800000
         .4byte 0x0000019c
@@ -5361,16 +5361,16 @@ gUnknown_810367C: @ 810367C
         .string " Never!\0"
         .align 2,0
 
-	.global gUnknown_8103690
-gUnknown_8103690: @ 8103690
+	.global gRayquazaPreFightDialogue_7
+gRayquazaPreFightDialogue_7: @ 8103690
 	.incbin "baserom.gba", 0x103690, 0x38
 
-	.global gUnknown_81036C8
-gUnknown_81036C8: @ 81036C8
+	.global gRayquazaPreFightDialogue_8
+gRayquazaPreFightDialogue_8: @ 81036C8
 	.incbin "baserom.gba", 0x1036C8, 0xD8
 
-	.global gUnknown_81037A0
-gUnknown_81037A0: @ 81037A0
+	.global gRayquazaPreFightDialogue_9
+gRayquazaPreFightDialogue_9: @ 81037A0
 @ replacing .incbin "baserom.gba", 0x001037a0, 0x34
         .4byte 0x0d000000
         .4byte 0x0000019c
@@ -5382,20 +5382,20 @@ gUnknown_81037A0: @ 81037A0
         .string "hold true!\0"
         .align 2,0
 
-	.global gUnknown_81037D4
-gUnknown_81037D4: @ 81037D4
+	.global gRayquazaPreFightDialogue_10
+gRayquazaPreFightDialogue_10: @ 81037D4
 	.incbin "baserom.gba", 0x1037D4, 0x4C
 
-	.global gUnknown_8103820
-gUnknown_8103820: @ 8103820
+	.global gRayquazaPreFightDialogue_11
+gRayquazaPreFightDialogue_11: @ 8103820
 	.incbin "baserom.gba", 0x103820, 0x24
 
-	.global gUnknown_8103844
-gUnknown_8103844: @ 8103844
+	.global gRayquazaReFightDialogue_1
+gRayquazaReFightDialogue_1: @ 8103844
 	.incbin "baserom.gba", 0x103844, 0x30
 
-	.global gUnknown_8103874
-gUnknown_8103874: @ 8103874
+	.global gRayquazaReFightDialogue_2
+gRayquazaReFightDialogue_2: @ 8103874
 @ replacing .incbin "baserom.gba", 0x00103874, 0x34
         .4byte 0x0d000000
         .4byte 0x0000019c
@@ -5407,36 +5407,36 @@ gUnknown_8103874: @ 8103874
         .string "likes of you!\0"
         .align 2,0
 
-	.global gUnknown_81038A8
-gUnknown_81038A8: @ 81038A8
+	.global gRayquazaReFightDialogue_3
+gRayquazaReFightDialogue_3: @ 81038A8
 	.incbin "baserom.gba", 0x1038A8, 0x50
 
-	.global gUnknown_81038F8
-gUnknown_81038F8: @ 81038F8
+	.global gRayquazaReFightDialogue_4
+gRayquazaReFightDialogue_4: @ 81038F8
 	.incbin "baserom.gba", 0x1038F8, 0xC
 
-	.global gUnknown_8103904
-gUnknown_8103904: @ 8103904
+	.global gRayquazaPostStoryPreFightDialogue_1
+gRayquazaPostStoryPreFightDialogue_1: @ 8103904
 	.incbin "baserom.gba", 0x103904, 0x34
 
-	.global gUnknown_8103938
-gUnknown_8103938: @ 8103938
+	.global gRayquazaPostStoryPreFightDialogue_2
+gRayquazaPostStoryPreFightDialogue_2: @ 8103938
 	.incbin "baserom.gba", 0x103938, 0x16C
 
-	.global gUnknown_8103AA4
-gUnknown_8103AA4: @ 8103AA4
+	.global gRayquazaPostStoryPreFightDialogue_3
+gRayquazaPostStoryPreFightDialogue_3: @ 8103AA4
 	.incbin "baserom.gba", 0x103AA4, 0x40
 
-	.global gUnknown_8103AE4
-gUnknown_8103AE4: @ 8103AE4
+	.global gRayquazaPostStoryPreFightDialogue_4
+gRayquazaPostStoryPreFightDialogue_4: @ 8103AE4
 	.incbin "baserom.gba", 0x103AE4, 0x4C
 
-	.global gUnknown_8103B30
-gUnknown_8103B30: @ 8103B30
+	.global gRayquazaPostStoryPreFightDialogue_5
+gRayquazaPostStoryPreFightDialogue_5: @ 8103B30
 	.incbin "baserom.gba", 0x103B30, 0x28
 
-	.global gUnknown_8103B58
-gUnknown_8103B58: @ 8103B58
+	.global gRayquazaPostStoryPreFightDialogue_6
+gRayquazaPostStoryPreFightDialogue_6: @ 8103B58
 	.incbin "baserom.gba", 0x103B58, 0x80
 
 	.global gUnknown_8103BD8
@@ -5496,292 +5496,292 @@ gUnknown_8103E40: @ 8103E40
 	.string "{CENTER_ALIGN}It{APOSTROPHE}s time to go back.\0"
 	.align 2, 0
 
-	.global gUnknown_8103EA4
-gUnknown_8103EA4: @ 8103EA4
+	.global gMewtwoPreFightDialogue_1
+gMewtwoPreFightDialogue_1: @ 8103EA4
 	.incbin "baserom.gba", 0x103EA4, 0x68
 
-	.global gUnknown_8103F0C
-gUnknown_8103F0C: @ 8103F0C
+	.global gMewtwoPreFightDialogue_2
+gMewtwoPreFightDialogue_2: @ 8103F0C
 	.incbin "baserom.gba", 0x103F0C, 0x40
 
-	.global gUnknown_8103F4C
-gUnknown_8103F4C: @ 8103F4C
+	.global gMewtwoPreFightDialogue_3
+gMewtwoPreFightDialogue_3: @ 8103F4C
 	.incbin "baserom.gba", 0x103F4C, 0x80
 
-	.global gUnknown_8103FCC
-gUnknown_8103FCC: @ 8103FCC
+	.global gMewtwoPreFightDialogue_4
+gMewtwoPreFightDialogue_4: @ 8103FCC
 	.incbin "baserom.gba", 0x103FCC, 0x3C
 
-	.global gUnknown_8104008
-gUnknown_8104008: @ 8104008
+	.global gMewtwoPreFightDialogue_5
+gMewtwoPreFightDialogue_5: @ 8104008
 	.incbin "baserom.gba", 0x104008, 0x3C
 
-	.global gUnknown_8104044
-gUnknown_8104044: @ 8104044
+	.global gMewtwoReFightDialogue_1
+gMewtwoReFightDialogue_1: @ 8104044
 	.incbin "baserom.gba", 0x104044, 0xC
 
-	.global gUnknown_8104050
-gUnknown_8104050: @ 8104050
+	.global gMewtwoReFightDialogue_2
+gMewtwoReFightDialogue_2: @ 8104050
 	.incbin "baserom.gba", 0x104050, 0x7C
 
-	.global gUnknown_81040CC
-gUnknown_81040CC: @ 81040CC
+	.global gMewtwoReFightDialogue_3
+gMewtwoReFightDialogue_3: @ 81040CC
 	.incbin "baserom.gba", 0x1040CC, 0x48
 
-	.global gUnknown_8104114
-gUnknown_8104114: @ 8104114
+	.global gMewtwoReFightDialogue_4
+gMewtwoReFightDialogue_4: @ 8104114
 	.incbin "baserom.gba", 0x104114, 0x30
 
-	.global gUnknown_8104144
-gUnknown_8104144: @ 8104144
+	.global gMewtwoReFightDialogue_5
+gMewtwoReFightDialogue_5: @ 8104144
 	.incbin "baserom.gba", 0x104144, 0xC
 
-	.global gUnknown_8104150
-gUnknown_8104150: @ 8104150
+	.global gEnteiPreFightDialogue_1
+gEnteiPreFightDialogue_1: @ 8104150
 	.incbin "baserom.gba", 0x104150, 0x5C
 
-	.global gUnknown_81041AC
-gUnknown_81041AC: @ 81041AC
+	.global gEnteiPreFightDialogue_2
+gEnteiPreFightDialogue_2: @ 81041AC
 	.incbin "baserom.gba", 0x1041AC, 0x4C
 
-	.global gUnknown_81041F8
-gUnknown_81041F8: @ 81041F8
+	.global gEnteiPreFightDialogue_3
+gEnteiPreFightDialogue_3: @ 81041F8
 	.incbin "baserom.gba", 0x1041F8, 0x48
 
-	.global gUnknown_8104240
-gUnknown_8104240: @ 8104240
+	.global gEnteiReFightDialogue_1
+gEnteiReFightDialogue_1: @ 8104240
 	.incbin "baserom.gba", 0x104240, 0x6C
 
-	.global gUnknown_81042AC
-gUnknown_81042AC: @ 81042AC
+	.global gEnteiReFightDialogue_2
+gEnteiReFightDialogue_2: @ 81042AC
 	.incbin "baserom.gba", 0x1042AC, 0xC
 
-	.global gUnknown_81042B8
-gUnknown_81042B8: @ 81042B8
+	.global gEnteiReFightDialogue_3
+gEnteiReFightDialogue_3: @ 81042B8
 	.incbin "baserom.gba", 0x1042B8, 0x58
 
-	.global gUnknown_8104310
-gUnknown_8104310: @ 8104310
+	.global gEnteiPostStoryPreFightDialogue_1
+gEnteiPostStoryPreFightDialogue_1: @ 8104310
 	.incbin "baserom.gba", 0x104310, 0x8C
 
-	.global gUnknown_810439C
-gUnknown_810439C: @ 810439C
+	.global gEnteiPostStoryPreFightDialogue_2
+gEnteiPostStoryPreFightDialogue_2: @ 810439C
 	.incbin "baserom.gba", 0x10439C, 0x24
 
-	.global gUnknown_81043C0
-gUnknown_81043C0: @ 81043C0
+	.global gEnteiPostStoryPreFightDialogue_3
+gEnteiPostStoryPreFightDialogue_3: @ 81043C0
 	.incbin "baserom.gba", 0x1043C0, 0x1C
 
-	.global gUnknown_81043DC
-gUnknown_81043DC: @ 81043DC
+	.global gEnteiPostStoryPreFightDialogue_4
+gEnteiPostStoryPreFightDialogue_4: @ 81043DC
 	.incbin "baserom.gba", 0x1043DC, 0x74
 
-	.global gUnknown_8104450
-gUnknown_8104450: @ 8104450
+	.global gRaikouPreFightDialogue_1
+gRaikouPreFightDialogue_1: @ 8104450
 	.incbin "baserom.gba", 0x104450, 0x64
 
-	.global gUnknown_81044B4
-gUnknown_81044B4: @ 81044B4
+	.global gRaikouPreFightDialogue_2
+gRaikouPreFightDialogue_2: @ 81044B4
 	.incbin "baserom.gba", 0x1044B4, 0x5C
 
-	.global gUnknown_8104510
-gUnknown_8104510: @ 8104510
+	.global gRaikouPreFightDialogue_3
+gRaikouPreFightDialogue_3: @ 8104510
 	.incbin "baserom.gba", 0x104510, 0x2C
 
-	.global gUnknown_810453C
-gUnknown_810453C: @ 810453C
+	.global gRaikouPreFightDialogue_4
+gRaikouPreFightDialogue_4: @ 810453C
 	.incbin "baserom.gba", 0x10453C, 0x34
 
-	.global gUnknown_8104570
-gUnknown_8104570: @ 8104570
+	.global gRaikouPreFightDialogue_5
+gRaikouPreFightDialogue_5: @ 8104570
 	.incbin "baserom.gba", 0x104570, 0x40
 
-	.global gUnknown_81045B0
-gUnknown_81045B0: @ 81045B0
+	.global gRaikouPreFightDialogue_6
+gRaikouPreFightDialogue_6: @ 81045B0
 	.incbin "baserom.gba", 0x1045B0, 0x48
 
-	.global gUnknown_81045F8
-gUnknown_81045F8: @ 81045F8
+	.global gRaikouReFightDialogue_1
+gRaikouReFightDialogue_1: @ 81045F8
 	.incbin "baserom.gba", 0x1045F8, 0x7C
 
-	.global gUnknown_8104674
-gUnknown_8104674: @ 8104674
+	.global gRaikouReFightDialogue_2
+gRaikouReFightDialogue_2: @ 8104674
 	.incbin "baserom.gba", 0x104674, 0x2C
 
-	.global gUnknown_81046A0
-gUnknown_81046A0: @ 81046A0
+	.global gRaikouReFightDialogue_3
+gRaikouReFightDialogue_3: @ 81046A0
 	.incbin "baserom.gba", 0x1046A0, 0x2C
 
-	.global gUnknown_81046CC
-gUnknown_81046CC: @ 81046CC
+	.global gRaikouPostStoryPreFightDialogue_1
+gRaikouPostStoryPreFightDialogue_1: @ 81046CC
 	.incbin "baserom.gba", 0x1046CC, 0x78
 
-	.global gUnknown_8104744
-gUnknown_8104744: @ 8104744
+	.global gRaikouPostStoryPreFightDialogue_2
+gRaikouPostStoryPreFightDialogue_2: @ 8104744
 	.incbin "baserom.gba", 0x104744, 0x28
 
-	.global gUnknown_810476C
-gUnknown_810476C: @ 810476C
+	.global gRaikouPostStoryPreFightDialogue_3
+gRaikouPostStoryPreFightDialogue_3: @ 810476C
 	.incbin "baserom.gba", 0x10476C, 0xC
 
-	.global gUnknown_8104778
-gUnknown_8104778: @ 8104778
+	.global gRaikouPostStoryPreFightDialogue_4
+gRaikouPostStoryPreFightDialogue_4: @ 8104778
 	.incbin "baserom.gba", 0x104778, 0xC
 
-	.global gUnknown_8104784
-gUnknown_8104784: @ 8104784
+	.global gSuicunePreFightDialogue_1
+gSuicunePreFightDialogue_1: @ 8104784
 	.incbin "baserom.gba", 0x104784, 0xC
 
-	.global gUnknown_8104790
-gUnknown_8104790: @ 8104790
+	.global gSuicunePreFightDialogue_2
+gSuicunePreFightDialogue_2: @ 8104790
 	.incbin "baserom.gba", 0x104790, 0x20
 
-	.global gUnknown_81047B0
-gUnknown_81047B0: @ 81047B0
+	.global gSuicunePreFightDialogue_3
+gSuicunePreFightDialogue_3: @ 81047B0
 	.incbin "baserom.gba", 0x1047B0, 0x9C
 
-	.global gUnknown_810484C
-gUnknown_810484C: @ 810484C
+	.global gSuicunePreFightDialogue_4
+gSuicunePreFightDialogue_4: @ 810484C
 	.incbin "baserom.gba", 0x10484C, 0x3C
 
-	.global gUnknown_8104888
-gUnknown_8104888: @ 8104888
+	.global gSuicunePreFightDialogue_5
+gSuicunePreFightDialogue_5: @ 8104888
 	.incbin "baserom.gba", 0x104888, 0x40
 
-	.global gUnknown_81048C8
-gUnknown_81048C8: @ 81048C8
+	.global gSuicunePreFightDialogue_6
+gSuicunePreFightDialogue_6: @ 81048C8
 	.incbin "baserom.gba", 0x1048C8, 0x4C
 
-	.global gUnknown_8104914
-gUnknown_8104914: @ 8104914
+	.global gSuicunePreFightDialogue_7
+gSuicunePreFightDialogue_7: @ 8104914
 	.incbin "baserom.gba", 0x104914, 0x1C
 
-	.global gUnknown_8104930
-gUnknown_8104930: @ 8104930
+	.global gSuicuneReFightDialogue_1
+gSuicuneReFightDialogue_1: @ 8104930
 	.incbin "baserom.gba", 0x104930, 0x50
 
-	.global gUnknown_8104980
-gUnknown_8104980: @ 8104980
+	.global gSuicuneReFightDialogue_2
+gSuicuneReFightDialogue_2: @ 8104980
 	.incbin "baserom.gba", 0x104980, 0x18
 
-	.global gUnknown_8104998
-gUnknown_8104998: @ 8104998
+	.global gSuicuneReFightDialogue_3
+gSuicuneReFightDialogue_3: @ 8104998
 	.incbin "baserom.gba", 0x104998, 0x3C
 
-	.global gUnknown_81049D4
-gUnknown_81049D4: @ 81049D4
+	.global gSuicunePostStoryPreFightDialogue_1
+gSuicunePostStoryPreFightDialogue_1: @ 81049D4
 	.incbin "baserom.gba", 0x1049D4, 0xAC
 
-	.global gUnknown_8104A80
-gUnknown_8104A80: @ 8104A80
+	.global gSuicunePostStoryPreFightDialogue_2
+gSuicunePostStoryPreFightDialogue_2: @ 8104A80
 	.incbin "baserom.gba", 0x104A80, 0x1C
 
-	.global gUnknown_8104A9C
-gUnknown_8104A9C: @ 8104A9C
+	.global gSuicunePostStoryPreFightDialogue_3
+gSuicunePostStoryPreFightDialogue_3: @ 8104A9C
 	.incbin "baserom.gba", 0x104A9C, 0x2C
 
-	.global gUnknown_8104AC8
-gUnknown_8104AC8: @ 8104AC8
+	.global gSuicunePostStoryPreFightDialogue_4
+gSuicunePostStoryPreFightDialogue_4: @ 8104AC8
 	.incbin "baserom.gba", 0x104AC8, 0xC
 
-	.global gUnknown_8104AD4
-gUnknown_8104AD4: @ 8104AD4
+	.global gHoOhPreFightDialogue_1
+gHoOhPreFightDialogue_1: @ 8104AD4
 	.incbin "baserom.gba", 0x104AD4, 0x118
 
-	.global gUnknown_8104BEC
-gUnknown_8104BEC: @ 8104BEC
+	.global gHoOhPreFightDialogue_2
+gHoOhPreFightDialogue_2: @ 8104BEC
 	.incbin "baserom.gba", 0x104BEC, 0x24
 
-	.global gUnknown_8104C10
-gUnknown_8104C10: @ 8104C10
+	.global gHoOhPreFightDialogue_3
+gHoOhPreFightDialogue_3: @ 8104C10
 	.incbin "baserom.gba", 0x104C10, 0x44
 
-	.global gUnknown_8104C54
-gUnknown_8104C54: @ 8104C54
+	.global gHoOhPreFightDialogue_4
+gHoOhPreFightDialogue_4: @ 8104C54
 	.incbin "baserom.gba", 0x104C54, 0x60
 
-	.global gUnknown_8104CB4
-gUnknown_8104CB4: @ 8104CB4
+	.global gHoOhPreFightDialogue_5
+gHoOhPreFightDialogue_5: @ 8104CB4
 	.incbin "baserom.gba", 0x104CB4, 0x2C
 
-	.global gUnknown_8104CE0
-gUnknown_8104CE0: @ 8104CE0
+	.global gHoOhPreFightDialogue_6
+gHoOhPreFightDialogue_6: @ 8104CE0
 	.incbin "baserom.gba", 0x104CE0, 0xC
 
-	.global gUnknown_8104CEC
-gUnknown_8104CEC: @ 8104CEC
+	.global HoOhReFightDialogue_1
+HoOhReFightDialogue_1: @ 8104CEC
 	.incbin "baserom.gba", 0x104CEC, 0x74
 
-	.global gUnknown_8104D60
-gUnknown_8104D60: @ 8104D60
+	.global HoOhReFightDialogue_2
+HoOhReFightDialogue_2: @ 8104D60
 	.incbin "baserom.gba", 0x104D60, 0x7C
 
-	.global gUnknown_8104DDC
-gUnknown_8104DDC: @ 8104DDC
+	.global HoOhReFightDialogue_3
+HoOhReFightDialogue_3: @ 8104DDC
 	.incbin "baserom.gba", 0x104DDC, 0x30
 
-	.global gUnknown_8104E0C
-gUnknown_8104E0C: @ 8104E0C
+	.global HoOhReFightDialogue_4
+HoOhReFightDialogue_4: @ 8104E0C
 	.incbin "baserom.gba", 0x104E0C, 0x48
 
-	.global gUnknown_8104E54
-gUnknown_8104E54: @ 8104E54
+	.global HoOhReFightDialogue_5
+HoOhReFightDialogue_5: @ 8104E54
 	.incbin "baserom.gba", 0x104E54, 0xC
 
-	.global gUnknown_8104E60
-gUnknown_8104E60: @ 8104E60
+	.global gLatiosPreFightDialogue_1
+gLatiosPreFightDialogue_1: @ 8104E60
 	.incbin "baserom.gba", 0x104E60, 0x9C
 
-	.global gUnknown_8104EFC
-gUnknown_8104EFC: @ 8104EFC
+	.global gLatiosPreFightDialogue_2
+gLatiosPreFightDialogue_2: @ 8104EFC
 	.incbin "baserom.gba", 0x104EFC, 0x34
 
-	.global gUnknown_8104F30
-gUnknown_8104F30: @ 8104F30
+	.global gLatiosPreFightDialogue_3
+gLatiosPreFightDialogue_3: @ 8104F30
 	.incbin "baserom.gba", 0x104F30, 0x34
 
-	.global gUnknown_8104F64
-gUnknown_8104F64: @ 8104F64
+	.global gLatiosReFightDialogue_1
+gLatiosReFightDialogue_1: @ 8104F64
 	.incbin "baserom.gba", 0x104F64, 0x64
 
 	.global gUnknown_8104FC8
 gUnknown_8104FC8: @ 8104FC8
 	.incbin "baserom.gba", 0x104FC8, 0xC
 
-	.global gUnknown_8104FD4
-gUnknown_8104FD4: @ 8104FD4
+	.global gRegirockPreFightDialogue_1
+gRegirockPreFightDialogue_1: @ 8104FD4
 	.incbin "baserom.gba", 0x104FD4, 0x54
 
-	.global gUnknown_8105028
-gUnknown_8105028: @ 8105028
+	.global gRegicePreFightDialogue_1
+gRegicePreFightDialogue_1: @ 8105028
 	.incbin "baserom.gba", 0x105028, 0xC
 
-	.global gUnknown_8105034
-gUnknown_8105034: @ 8105034
+	.global gRegisteelPreFightDialogue_1
+gRegisteelPreFightDialogue_1: @ 8105034
 	.incbin "baserom.gba", 0x105034, 0xC
 
-	.global gUnknown_8105040
-gUnknown_8105040: @ 8105040
+	.global gRegirockPostFightDialogue_1
+gRegirockPostFightDialogue_1: @ 8105040
 	.incbin "baserom.gba", 0x105040, 0x74
 
-	.global gUnknown_81050B4
-gUnknown_81050B4: @ 81050B4
+	.global gRegirockPostFightDialogue_2
+gRegirockPostFightDialogue_2: @ 81050B4
 	.incbin "baserom.gba", 0x1050B4, 0x58
 
-	.global gUnknown_810510C
-gUnknown_810510C: @ 810510C
+	.global gRegicePostFightDialogue_1
+gRegicePostFightDialogue_1: @ 810510C
 	.incbin "baserom.gba", 0x10510C, 0x70
 
-	.global gUnknown_810517C
-gUnknown_810517C: @ 810517C
+	.global gRegicePostFightDialogue_2
+gRegicePostFightDialogue_2: @ 810517C
 	.incbin "baserom.gba", 0x10517C, 0x54
 
-	.global gUnknown_81051D0
-gUnknown_81051D0: @ 81051D0
+	.global gRegisteelPostFightDialogue_1
+gRegisteelPostFightDialogue_1: @ 81051D0
 	.incbin "baserom.gba", 0x1051D0, 0x74
 
-	.global gUnknown_8105244
-gUnknown_8105244: @ 8105244
+	.global gRegisteelPostFightDialogue_2
+gRegisteelPostFightDialogue_2: @ 8105244
 	.incbin "baserom.gba", 0x105244, 0xD8
 
 	.global gUnknown_810531C
@@ -5800,20 +5800,20 @@ gUnknown_81053A8: @ 81053A8
 gUnknown_8105434: @ 8105434
 	.incbin "baserom.gba", 0x105434, 0x4
 
-	.global gUnknown_8105438
-gUnknown_8105438: @ 8105438
+	.global gJirachiPreFightDialogue_1
+gJirachiPreFightDialogue_1: @ 8105438
 	.incbin "baserom.gba", 0x105438, 0x68
 
-	.global gUnknown_81054A0
-gUnknown_81054A0: @ 81054A0
+	.global gJirachiPreFightDialogue_2
+gJirachiPreFightDialogue_2: @ 81054A0
 	.incbin "baserom.gba", 0x1054A0, 0x44
 
-	.global gUnknown_81054E4
-gUnknown_81054E4: @ 81054E4
+	.global gJirachiPreFightDialogue_3
+gJirachiPreFightDialogue_3: @ 81054E4
 	.incbin "baserom.gba", 0x1054E4, 0x28
 
-	.global gUnknown_810550C
-gUnknown_810550C: @ 810550C
+	.global gJirachiPreFightDialogue_4
+gJirachiPreFightDialogue_4: @ 810550C
 	.incbin "baserom.gba", 0x10550C, 0x40
 
 	.global gUnknown_810554C
@@ -5912,104 +5912,104 @@ gUnknown_8105D80: @ 8105D80
 gUnknown_8105D9C: @ 8105D9C
 	.incbin "baserom.gba", 0x105D9C, 0x78
 
-	.global gUnknown_8105E14
-gUnknown_8105E14: @ 8105E14
+	.global gJirachiReFightDialogue_1
+gJirachiReFightDialogue_1: @ 8105E14
 	.incbin "baserom.gba", 0x105E14, 0x74
 
 @ Lugia Fight Dialogue
 
-	.global gUnknown_8105E88
-gUnknown_8105E88: @ 8105E88
+	.global gLugiaPreFightDialogue_1
+gLugiaPreFightDialogue_1: @ 8105E88
 	.incbin "baserom.gba", 0x105E88, 0x70
 
-	.global gUnknown_8105EF8
-gUnknown_8105EF8: @ 8105EF8
+	.global gLugiaPreFightDialogue_2
+gLugiaPreFightDialogue_2: @ 8105EF8
 	.incbin "baserom.gba", 0x105EF8, 0x40
 
-	.global gUnknown_8105F38
-gUnknown_8105F38: @ 8105F38
+	.global gLugiaPreFightDialogue_3
+gLugiaPreFightDialogue_3: @ 8105F38
 	.incbin "baserom.gba", 0x105F38, 0x3C
 
-	.global gUnknown_8105F74
-gUnknown_8105F74: @ 8105F74
+	.global gLugiaPreFightDialogue_4
+gLugiaPreFightDialogue_4: @ 8105F74
 	.incbin "baserom.gba", 0x105F74, 0x2C
 
-	.global gUnknown_8105FA0
-gUnknown_8105FA0: @ 8105FA0
+	.global gLugiaPreFightDialogue_5
+gLugiaPreFightDialogue_5: @ 8105FA0
 	.incbin "baserom.gba", 0x105FA0, 0x38
 
-	.global gUnknown_8105FD8
-gUnknown_8105FD8: @ 8105FD8
+	.global gLugiaPreFightDialogue_6
+gLugiaPreFightDialogue_6: @ 8105FD8
 	.incbin "baserom.gba", 0x105FD8, 0x4C
 
-	.global gUnknown_8106024
-gUnknown_8106024: @ 8106024
+	.global gLugiaPreFightDialogue_7
+gLugiaPreFightDialogue_7: @ 8106024
 	.incbin "baserom.gba", 0x106024, 0x44
 
+	.global gLugiaPreFightDialogue_8
+gLugiaPreFightDialogue_8: @ 8106068
+	.incbin "baserom.gba", 0x106068, 0xC
+
 @ Kyogre Fight Dialogue
 
-	.global gUnknown_8106068
-gUnknown_8106068: @ 8106068
-	.incbin "baserom.gba", 0x106068, 0xC
-
-	.global gUnknown_8106074
-gUnknown_8106074: @ 8106074
+	.global gKyogrePreFightDialogue_1
+gKyogrePreFightDialogue_1: @ 8106074
 	.incbin "baserom.gba", 0x106074, 0x48
 
-	.global gUnknown_81060BC
-gUnknown_81060BC: @ 81060BC
+	.global gKyogrePreFightDialogue_2
+gKyogrePreFightDialogue_2: @ 81060BC
 	.incbin "baserom.gba", 0x1060BC, 0x48
 
-	.global gUnknown_8106104
-gUnknown_8106104: @ 8106104
+	.global gKyogrePreFightDialogue_3
+gKyogrePreFightDialogue_3: @ 8106104
 	.incbin "baserom.gba", 0x106104, 0x3C
 
-	.global gUnknown_8106140
-gUnknown_8106140: @ 8106140
+	.global gKyogrePreFightDialogue_4
+gKyogrePreFightDialogue_4: @ 8106140
 	.incbin "baserom.gba", 0x106140, 0xD4
 
-	.global gUnknown_8106214
-gUnknown_8106214: @ 8106214
+	.global gKyogrePreFightDialogue_5
+gKyogrePreFightDialogue_5: @ 8106214
 	.incbin "baserom.gba", 0x106214, 0x30
 
-	.global gUnknown_8106244
-gUnknown_8106244: @ 8106244
+	.global gKyogrePreFightDialogue_6
+gKyogrePreFightDialogue_6: @ 8106244
 	.incbin "baserom.gba", 0x106244, 0x38
 
-	.global gUnknown_810627C
-gUnknown_810627C: @ 810627C
+	.global gKyogrePreFightDialogue_7
+gKyogrePreFightDialogue_7: @ 810627C
 	.incbin "baserom.gba", 0x10627C, 0x2C
 
-	.global gUnknown_81062A8
-gUnknown_81062A8: @ 81062A8
+	.global gKyogrePreFightDialogue_8
+gKyogrePreFightDialogue_8: @ 81062A8
 	.incbin "baserom.gba", 0x1062A8, 0xC
 
-	.global gUnknown_81062B4
-gUnknown_81062B4: @ 81062B4
+	.global gDeoxysPreFightDialogue_1
+gDeoxysPreFightDialogue_1: @ 81062B4
 	.incbin "baserom.gba", 0x1062B4, 0x34
 
-	.global gUnknown_81062E8
-gUnknown_81062E8: @ 81062E8
+	.global gDeoxysPreFightDialogue_2
+gDeoxysPreFightDialogue_2: @ 81062E8
 	.incbin "baserom.gba", 0x1062E8, 0x80
 
-	.global gUnknown_8106368
-gUnknown_8106368: @ 8106368
+	.global gDeoxysPreFightDialogue_3
+gDeoxysPreFightDialogue_3: @ 8106368
 	.incbin "baserom.gba", 0x106368, 0x28
 
-	.global gUnknown_8106390
-gUnknown_8106390: @ 8106390
+	.global gDeoxysPreFightDialogue_4
+gDeoxysPreFightDialogue_4: @ 8106390
 	.incbin "baserom.gba", 0x106390, 0x34
 
-	.global gUnknown_81063C4
-gUnknown_81063C4: @ 81063C4
+	.global gDeoxysPreFightDialogue_5
+gDeoxysPreFightDialogue_5: @ 81063C4
 	.byte 0x04, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00
 	.4byte gUnknown_8103E40
 
 @ Dialogue for Purity Forest
 
-	.global gUnknown_81063D0
-gUnknown_81063D0: @ 81063D0
+	.global gCelebiJoinDialogue_1
+gCelebiJoinDialogue_1: @ 81063D0
 	.byte 0x04, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00
 	.4byte gPurityForestSomeoneThereText
@@ -6020,8 +6020,8 @@ gPurityForestSomeoneThereText: @ 81063DC
 	.string "{CENTER_ALIGN}There{APOSTROPHE}s someone there.\0"
 	.align 2, 0
 
-	.global gUnknown_8106400
-gUnknown_8106400: @ 8106400
+	.global gCelebiJoinDialogue_2
+gCelebiJoinDialogue_2: @ 8106400
 	.byte 0x04, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00
 	.4byte gPurityForestCelebiIntroText
@@ -6032,8 +6032,8 @@ gPurityForestCelebiIntroText: @ 810640C
 	.string "{CENTER_ALIGN}The Time Travel Pokémon {ARG_POKEMON_2}!\0"
 	.align 2, 0
 
-	.global gUnknown_810643C
-gUnknown_810643C: @ 810643C
+	.global gCelebiJoinDialogue_3
+gCelebiJoinDialogue_3: @ 810643C
 	.byte 0x04, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00
 	.4byte gPurityForestCelebiWantsToJoinText
@@ -6043,8 +6043,8 @@ gPurityForestCelebiWantsToJoinText: @ 8106448
 	.string "{CENTER_ALIGN}{ARG_POKEMON_2} wants to join the team.\0"
 	.align 2, 0
 
-	.global gUnknown_8106468
-gUnknown_8106468: @ 8106468
+	.global gCelebiJoinDialogue_4
+gCelebiJoinDialogue_4: @ 8106468
 	.byte 0x04, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00
 	.4byte gPurityForestCelebiJoinedText
@@ -6054,8 +6054,8 @@ gPurityForestCelebiJoinedText: @ 8106474
 	.string "{CENTER_ALIGN}{ARG_POKEMON_2} joined the team! \0"
 	.align 2, 0
 
-	.global gUnknown_810648C
-gUnknown_810648C: @ 810648C
+	.global gCelebiJoinDialogue_5
+gCelebiJoinDialogue_5: @ 810648C
 	.byte 0x04, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00
 	.4byte gPurityForestCelebiVeryHappyText
@@ -6066,8 +6066,8 @@ gPurityForestCelebiVeryHappyText: @ 8106498
 	.string "{CENTER_ALIGN}be very happy!\0"
 	.align 2, 0
 
-	.global gUnknown_81064BC
-gUnknown_81064BC: @ 81064BC
+	.global gCelebiJoinDialogue_6
+gCelebiJoinDialogue_6: @ 81064BC
 	.byte 0x04, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00
 	.4byte gPurityForestCelebiDelightedToJoinText
@@ -6078,8 +6078,8 @@ gPurityForestCelebiDelightedToJoinText: @ 81064C8
 	.string "{CENTER_ALIGN}joined the rescue team!\0"
 	.align 2, 0
 
-	.global gUnknown_8106500
-gUnknown_8106500: @ 8106500
+	.global gCelebiJoinDialogue_7
+gCelebiJoinDialogue_7: @ 8106500
 	.byte 0x04, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00
 	.4byte gPurityForestTurnedDownOfferText
@@ -6090,8 +6090,8 @@ gPurityForestTurnedDownOfferText: @ 810650C
 	.string "{CENTER_ALIGN}the offer to join.\0"
 	.align 2, 0
 
-	.global gUnknown_8106534
-gUnknown_8106534: @ 8106534
+	.global gCelebiJoinDialogue_8
+gCelebiJoinDialogue_8: @ 8106534
 	.byte 0x04, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00
 	.4byte gPurityForestCelebiDisappointedText
@@ -6101,8 +6101,8 @@ gPurityForestCelebiDisappointedText: @ 8106540
 	.string "{CENTER_ALIGN}Celebi is very disappointed.\0"
 	.align 2, 0
 
-	.global gUnknown_8106560
-gUnknown_8106560: @ 8106560
+	.global gCelebiJoinDialogue_9
+gCelebiJoinDialogue_9: @ 8106560
 	.byte 0x04, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00
 	.4byte gPurityForestCelebiLeftDejectedlyText
@@ -6171,8 +6171,8 @@ gPurityForestRefuseCelebiReconsiderText: @ 8106630
 	.string "Reconsider.\0"
 	.align 2, 0
 
-	.global gUnknown_810663C
-gUnknown_810663C: @ 810663C
+	.global gCelebiJoinDialogue_10
+gCelebiJoinDialogue_10: @ 810663C
 	.incbin "baserom.gba", 0x10663C, 0x20
 
 	.global gUnknown_810665C
@@ -6199,36 +6199,36 @@ gUnknown_810671C: @ 810671C
 gUnknown_8106720: @ 8106720
 	.incbin "baserom.gba", 0x106720, 0x58
 
-	.global gUnknown_8106778
-gUnknown_8106778: @ 8106778
+	.global gMedichamRescueDialogue_1
+gMedichamRescueDialogue_1: @ 8106778
 	.incbin "baserom.gba", 0x106778, 0x44
 
-	.global gUnknown_81067BC
-gUnknown_81067BC: @ 81067BC
+	.global gMedichamRescueDialogue_2
+gMedichamRescueDialogue_2: @ 81067BC
 	.incbin "baserom.gba", 0x1067BC, 0x24
 
-	.global gUnknown_81067E0
-gUnknown_81067E0: @ 81067E0
+	.global gMedichamRescueDialogue_3
+gMedichamRescueDialogue_3: @ 81067E0
 	.incbin "baserom.gba", 0x1067E0, 0x54
 
-	.global gUnknown_8106834
-gUnknown_8106834: @ 8106834
+	.global gMedichamRescueDialogue_4
+gMedichamRescueDialogue_4: @ 8106834
 	.incbin "baserom.gba", 0x106834, 0x58
 
-	.global gUnknown_810688C
-gUnknown_810688C: @ 810688C
+	.global gSmeargleRescueDialogue_1
+gSmeargleRescueDialogue_1: @ 810688C
 	.incbin "baserom.gba", 0x10688C, 0x44
 
-	.global gUnknown_81068D0
-gUnknown_81068D0: @ 81068D0
+	.global gSmeargleRescueDialogue_2
+gSmeargleRescueDialogue_2: @ 81068D0
 	.incbin "baserom.gba", 0x1068D0, 0x48
 
-	.global gUnknown_8106918
-gUnknown_8106918: @ 8106918
+	.global gSmeargleRescueDialogue_3
+gSmeargleRescueDialogue_3: @ 8106918
 	.incbin "baserom.gba", 0x106918, 0x1C
 
-	.global gUnknown_8106934
-gUnknown_8106934: @ 8106934
+	.global gSmeargleRescueDialogue_4
+gSmeargleRescueDialogue_4: @ 8106934
 	.incbin "baserom.gba", 0x106934, 0x48
 
 	.global gUnknown_810697C
diff --git a/include/dungeon_global_data.h b/include/dungeon_global_data.h
index 9f95b773e..f679e6b6f 100644
--- a/include/dungeon_global_data.h
+++ b/include/dungeon_global_data.h
@@ -77,7 +77,7 @@ struct DungeonGlobalData
     u8 unkE26B;
     u8 weatherTurnsLeft;
     u8 fillE26D[0xE26F - 0xE26D];
-    /* 0xE26F */ u8 unkE26F[8]; // The weather at the start of the floor. If the weather changes, then expires, revert back to the starting weather.
+    /* 0xE26F */ u8 startingWeather[8]; // The weather at the start of the floor. If the weather changes, then expires, revert back to the starting weather.
     /* 0xE277 */ u8 mudSportTurnsLeft;
     /* 0xE278 */ u8 waterSportTurnsLeft;
     /* 0xE279 */ u8 unkE279;
diff --git a/include/dungeon_util_1.h b/include/dungeon_util_1.h
index 070e6d882..f964fc0d6 100644
--- a/include/dungeon_util_1.h
+++ b/include/dungeon_util_1.h
@@ -4,5 +4,6 @@
 #include "dungeon_entity.h"
 
 bool8 IsMovingClient(struct DungeonEntity *entity);
+void ShiftCameraToPosition(struct Position32 *posStruct, s32 cameraSteps);
 
 #endif
diff --git a/src/code_80521D0_1.c b/src/code_80521D0_1.c
index 53f5586e7..e0e96a1b9 100644
--- a/src/code_80521D0_1.c
+++ b/src/code_80521D0_1.c
@@ -6,68 +6,69 @@
 #include "dungeon_map_access.h"
 #include "dungeon_random.h"
 #include "dungeon_util.h"
+#include "dungeon_util_1.h"
 #include "friend_area.h"
 #include "map.h"
 #include "pokemon.h"
 
 extern struct DungeonEntity *xxx_call_GetLeaderEntity(void);
-extern struct DungeonEntity *sub_8085680(u32);
+extern struct DungeonEntity *GetEntityFromClientType(u32);
 extern char gUnknown_202E038[0x50];
 extern u32 gUnknown_202EDC8;
 
-extern u32 gUnknown_81062A8;
-extern u32 gUnknown_8106074;
-extern u32 gUnknown_81060BC;
-extern u32 gUnknown_8106104;
-extern u32 gUnknown_8106140;
-extern u32 gUnknown_8106214;
-extern u32 gUnknown_8106244;
-extern u32 gUnknown_810627C;
+extern u32 gKyogrePreFightDialogue_8;
+extern u32 gKyogrePreFightDialogue_1;
+extern u32 gKyogrePreFightDialogue_2;
+extern u32 gKyogrePreFightDialogue_3;
+extern u32 gKyogrePreFightDialogue_4;
+extern u32 gKyogrePreFightDialogue_5;
+extern u32 gKyogrePreFightDialogue_6;
+extern u32 gKyogrePreFightDialogue_7;
 extern u32 gUnknown_810697C;
 extern u64 gUnknown_8107544[];
-extern u32 gUnknown_8106778;
-extern u32 gUnknown_81067BC;
-extern u32 gUnknown_81067E0;
-extern u32 gUnknown_8106834;
-extern u32 gUnknown_810688C;
-extern u32 gUnknown_81068D0;
-extern u32 gUnknown_8106918;
-extern u32 gUnknown_8106934;
+extern u32 gMedichamRescueDialogue_1;
+extern u32 gMedichamRescueDialogue_2;
+extern u32 gMedichamRescueDialogue_3;
+extern u32 gMedichamRescueDialogue_4;
+extern u32 gSmeargleRescueDialogue_1;
+extern u32 gSmeargleRescueDialogue_2;
+extern u32 gSmeargleRescueDialogue_3;
+extern u32 gSmeargleRescueDialogue_4;
 extern u32 gUnknown_8106720;
 
-extern u32 gUnknown_810663C;
-extern u32 gUnknown_81063D0;
-extern u32 gUnknown_8106400;
-extern u32 gUnknown_810643C;
-extern u32 gUnknown_8106468;
-extern u32 gUnknown_810648C;
-extern u32 gUnknown_81064BC;
-extern u32 gUnknown_8106500;
-extern u32 gUnknown_8106534;
-extern u32 gUnknown_8106560;
+extern u32 gCelebiJoinDialogue_10;
+extern u32 gCelebiJoinDialogue_1;
+extern u32 gCelebiJoinDialogue_2;
+extern u32 gCelebiJoinDialogue_3;
+extern u32 gCelebiJoinDialogue_4;
+extern u32 gCelebiJoinDialogue_5;
+extern u32 gCelebiJoinDialogue_6;
+extern u32 gCelebiJoinDialogue_7;
+extern u32 gCelebiJoinDialogue_8;
+extern u32 gCelebiJoinDialogue_9;
 extern u32 *gPtrPurityForestAllowCelebiToJoinText;
 extern u32 gPurityForestAllowCelebiToJoinPrompt;
 extern u32 *gPtrPurityForestRefuseCelebiConfirmText;
 extern u32 gPurityForestRefuseCelebiConfirmPrompt;
-extern u32 gUnknown_81062B4;
-extern u32 gUnknown_81062E8;
-extern u32 gUnknown_8106368;
-extern u32 gUnknown_8106390;
-extern u32 gUnknown_81063C4;
-extern u32 gUnknown_8106068;
-extern u32 gUnknown_8105E88;
-extern u32 gUnknown_8105EF8;
-extern u32 gUnknown_8105F38;
-extern u32 gUnknown_8105F74;
-extern u32 gUnknown_8105FA0;
-extern u32 gUnknown_8105FD8;
-extern u32 gUnknown_8106024;
+extern u32 gDeoxysPreFightDialogue_1;
+extern u32 gDeoxysPreFightDialogue_2;
+extern u32 gDeoxysPreFightDialogue_3;
+extern u32 gDeoxysPreFightDialogue_4;
+extern u32 gDeoxysPreFightDialogue_5;
+extern u32 gLugiaPreFightDialogue_8;
+extern u32 gLugiaPreFightDialogue_1;
+extern u32 gLugiaPreFightDialogue_2;
+extern u32 gLugiaPreFightDialogue_3;
+extern u32 gLugiaPreFightDialogue_4;
+extern u32 gLugiaPreFightDialogue_5;
+extern u32 gLugiaPreFightDialogue_6;
+extern u32 gLugiaPreFightDialogue_7;
 
 extern u32 gUnknown_81058C4;
 extern u32 gUnknown_81058A8;
 extern u8 sub_800E9A8(u32);
 extern void sub_800DC14(u32);
-extern void sub_808BAA4();
+extern void JirachiWishGrantFlash();
 
 extern void sub_8086A3C(struct DungeonEntity *r0);
 extern void sub_8083E88(u32);
@@ -105,16 +106,15 @@ extern void sub_80861D4(struct DungeonEntity *, u32, u32);
 extern void sub_806FDF4(struct DungeonEntity *, struct DungeonEntity *, struct DungeonEntity **);
 extern u32 sub_80861F8(u32, struct DungeonEntity *, u32);
 extern void sub_8083ED8(u32);
-extern u32 sub_803F994();
-extern s32 sub_803F9B0();
+extern s32 GetCameraXPos();
+extern s32 GetCameraYPos();
 extern void sub_803F878(u32, s32);
 extern void SetupBossFightHP(struct DungeonEntity *, u32, u32);
-extern void sub_8085C54(u32, u32, u32, u32, u32);
+extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern void sub_803E9D0(void);
 extern void DeoxysScreenFlash(void);
 extern void sub_8085EB0();
 extern void sub_808563C(void *);
-extern void sub_80858AC(u32 *, u32);
 
 void SetupDeoxysFightHP(struct DungeonEntity *r0);
 void sub_808C550(void);
@@ -126,8 +126,8 @@ void sub_808C360(void);
 void KyogreScreenFlash();
 
 void sub_808C0CC();
-void sub_808BFA0();
-void sub_808C02C();
+void LugiaScreenFlash();
+void LugiaScreenFlash2();
 extern void sub_80861B8(struct DungeonEntity *, u32, u32);
 
 void nullsub_99();
@@ -200,7 +200,7 @@ void JirachiWishGrantDialogue(struct DungeonEntity *param_1)
     sub_800DC14(uVar2);
   }
   sub_803E708(10,0x46);
-  sub_808BAA4();
+  JirachiWishGrantFlash();
 }
 
 void sub_808BCE4(void)
@@ -272,7 +272,7 @@ void sub_808BDEC(void)
   struct DungeonEntity * LugiaEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  LugiaEntity = sub_8085680(0x1b);
+  LugiaEntity = GetEntityFromClientType(0x1b);
   sub_8083F14();
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -303,89 +303,89 @@ void LugiaPreFightDialogue(void)
   struct DungeonEntity * LugiaEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  LugiaEntity = sub_8085680(0x1b);
+  LugiaEntity = GetEntityFromClientType(0x1b);
   if (HasRecruitedMon(SPECIES_LUGIA)) {
     sub_8086448();
-    sub_80866C4(&gUnknown_8106068);
+    sub_80866C4(&gLugiaPreFightDialogue_8);
   }
   else {
     sub_8083F14();
     sub_8086448();
-    DisplayDungeonDialogue(&gUnknown_8105E88);
+    DisplayDungeonDialogue(&gLugiaPreFightDialogue_1);
     sub_8083EA8(0x23,0x3c);
     sub_808C0CC();
-    DisplayDungeonDialogue(&gUnknown_8105EF8);
-    sub_808BFA0();
-    DisplayDungeonDialogue(&gUnknown_8105F38);
+    DisplayDungeonDialogue(&gLugiaPreFightDialogue_2);
+    LugiaScreenFlash();
+    DisplayDungeonDialogue(&gLugiaPreFightDialogue_3);
     sub_803E708(10,0x46);
-    DisplayDungeonDialogue(&gUnknown_8105F74);
+    DisplayDungeonDialogue(&gLugiaPreFightDialogue_4);
     PlaySoundEffect(0x1f8);
     sub_80861D4(LugiaEntity,0xd,0);
     sub_803E708(0x2b,0x46);
     sub_80861B8(LugiaEntity,0,0);
-    DisplayDungeonDialogue(&gUnknown_8105FA0);
-    sub_808BFA0();
-    DisplayDungeonDialogue(&gUnknown_8105FD8);
-    sub_808C02C();
-    sub_8085C54(0xffffff06,0xffffff06,0xffffff06,1,0);
+    DisplayDungeonDialogue(&gLugiaPreFightDialogue_5);
+    LugiaScreenFlash();
+    DisplayDungeonDialogue(&gLugiaPreFightDialogue_6);
+    LugiaScreenFlash2();
+    SetDungeonBGColorRGB(0xffffff06,0xffffff06,0xffffff06,1,0);
     sub_8083F14();
     sub_80861D4(LugiaEntity,7,0);
-    DisplayDungeonDialogue(&gUnknown_8106024);
-    sub_808BFA0();
+    DisplayDungeonDialogue(&gLugiaPreFightDialogue_7);
+    LugiaScreenFlash();
     SetupBossFightHP(LugiaEntity,800,0x20);
     sub_8083E88(0x23);
-    sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+    ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
   }
 }
 
-void sub_808BFA0(void)
+void LugiaScreenFlash(void)
 {
   s32 iVar1;
 
   PlaySoundEffect(0x1f6);
   for(iVar1 = 250; iVar1 > 149; iVar1 -= 10){
-    sub_8085C54(0,0,iVar1,1,1);
+    SetDungeonBGColorRGB(0,0,iVar1,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
   for(iVar1 = 250; iVar1 > 199; iVar1 -= 10){
-    sub_8085C54(0,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(0,iVar1,iVar1,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
   for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10){
-    sub_8085C54(0,0,iVar1,1,1);
+    SetDungeonBGColorRGB(0,0,iVar1,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
   sub_8085EB0();
 }
 
-void sub_808C02C(void)
+void LugiaScreenFlash2(void)
 {
   s32 iVar1;
 
   PlaySoundEffect(0x1f6);
 
   for(iVar1 = 0; iVar1 < 200; iVar1 += 100){
-    sub_8085C54(iVar1,iVar1,iVar1,1,0);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,0);
     sub_803E46C(0x46);
   }
 
   for(iVar1 = 200; iVar1 >= 0; iVar1 -= 100){
-    sub_8085C54(iVar1,iVar1,iVar1,1,0);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,0);
     sub_803E46C(0x46);
   }
 
   sub_803E708(4,0x46);
 
   for(iVar1 = 0; iVar1 < 200; iVar1 += 100){
-    sub_8085C54(iVar1,iVar1,iVar1,1,0);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,0);
     sub_803E46C(0x46);
   }
 
   for(iVar1 = 200; iVar1 >= 0; iVar1 -= 100){
-    sub_8085C54(iVar1,iVar1,iVar1,1,0);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,0);
     sub_803E46C(0x46);
   }
 
@@ -396,11 +396,11 @@ void sub_808C02C(void)
 void sub_808C0CC(void)
 {
   gUnknown_202EDC8 = 0x1f;
-  sub_8085C54(0,0,0,1,1);
+  SetDungeonBGColorRGB(0,0,0,1,1);
   sub_803E9D0();
   sub_803E46C(0x46);
   gDungeonGlobalData->unk7 = 0;
-  sub_808BFA0();
+  LugiaScreenFlash();
 }
 
 void sub_808C10C(void)
@@ -412,7 +412,7 @@ void sub_808C10C(void)
   s32 iVar2;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  KyogreEntity = sub_8085680(0x1c);
+  KyogreEntity = GetEntityFromClientType(0x1c);
   sub_8083F14();
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -424,8 +424,8 @@ void sub_808C10C(void)
     SetFacingDirection(KyogreEntity, DIRECTION_SOUTH);
   }
   sub_8085860(LeaderEntity->posWorld.x,LeaderEntity->posWorld.y);
-  uVar3 = sub_803F994();
-  iVar2 = sub_803F9B0();
+  uVar3 = GetCameraXPos();
+  iVar2 = GetCameraYPos();
   sub_803F878(uVar3,iVar2 + -0x1000);
   CopySpeciesNametoBuffer(gUnknown_202E038,SPECIES_KYOGRE);
   // TODO: gUnknown_202E088 doesn't match but gUnknown_202E038 + 0x50 does
@@ -446,45 +446,45 @@ void KyogrePreFightDialogue(void)
   struct DungeonEntity *KyogreEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  KyogreEntity = sub_8085680(0x1c);
+  KyogreEntity = GetEntityFromClientType(0x1c);
   sub_8083F14();
   if (HasRecruitedMon(SPECIES_KYOGRE)) {
     sub_8083EA8(0x23,0x3c);
     SpriteLookAroundEffect(LeaderEntity);
     sub_803E708(10,0x46);
-    DisplayDungeonDialogue(&gUnknown_81062A8);
+    DisplayDungeonDialogue(&gKyogrePreFightDialogue_8);
     sub_803E708(10,0x46);
     gDungeonGlobalData->unk2 = 1;
   }
   else {
-    DisplayDungeonDialogue(&gUnknown_8106074);
+    DisplayDungeonDialogue(&gKyogrePreFightDialogue_1);
     sub_803E708(10,0x46);
-    DisplayDungeonDialogue(&gUnknown_81060BC);
+    DisplayDungeonDialogue(&gKyogrePreFightDialogue_2);
     sub_803E708(10,0x46);
     nullsub_99();
     sub_803E708(10,0x46);
     // Gwwwwwooooooooh
-    DisplayDungeonDialogue(&gUnknown_8106104);
+    DisplayDungeonDialogue(&gKyogrePreFightDialogue_3);
     sub_803E708(10,0x46);
     sub_8083EA8(0x23,0x3c);
     sub_808C360();
     // My duels against {ARG_POKEMON_3} (Groudon) left us both exhausted
-    DisplayDungeonDialogue(&gUnknown_8106140);
+    DisplayDungeonDialogue(&gKyogrePreFightDialogue_4);
     KyogreScreenFlash();
     // I am {ARG_POKEMON_2} (Kyogre)!
     // The lord of the sea!
-    DisplayDungeonDialogue(&gUnknown_8106214);
+    DisplayDungeonDialogue(&gKyogrePreFightDialogue_5);
     KyogreScreenFlash();
     // Witness the destructive force of my waves!
-    DisplayDungeonDialogue(&gUnknown_8106244);
+    DisplayDungeonDialogue(&gKyogrePreFightDialogue_6);
     KyogreScreenFlash();
     // Marvel at my awesome
     // power!
-    DisplayDungeonDialogue(&gUnknown_810627C);
+    DisplayDungeonDialogue(&gKyogrePreFightDialogue_7);
     sub_803E708(10,0x46);
     SetupBossFightHP(KyogreEntity,600,0xb);
     sub_8083E88(0x23);
-    sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+    ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
   }
 }
 
@@ -498,17 +498,17 @@ void KyogreScreenFlash(void)
 
   PlaySoundEffect(0x1f8);
   for(iVar1 = 250; iVar1 > 149; iVar1 -= 10){
-    sub_8085C54(0,0,iVar1,1,1);
+    SetDungeonBGColorRGB(0,0,iVar1,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
   for(iVar1 = 250; iVar1 > 199; iVar1 -= 10){
-    sub_8085C54(0,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(0,iVar1,iVar1,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
   for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10){
-    sub_8085C54(0,0,iVar1,1,1);
+    SetDungeonBGColorRGB(0,0,iVar1,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
@@ -518,7 +518,7 @@ void KyogreScreenFlash(void)
 void sub_808C360(void)
 {
   gUnknown_202EDC8 = 0x1f;
-  sub_8085C54(0,0,0,1,1);
+  SetDungeonBGColorRGB(0,0,0,1,1);
   sub_803E9D0();
   sub_803E46C(0x46);
   gDungeonGlobalData->unk7 = 0;
@@ -562,20 +562,20 @@ void DeoxysPreFightDialogue(void)
   if (HasRecruitedMon(SPECIES_DEOXYS_NORMAL)) {
     // There appears to be no one here.
     // It's impossible to go any further
-    sub_80866C4(&gUnknown_81063C4);
+    sub_80866C4(&gDeoxysPreFightDialogue_5);
   }
   else {
-    DisplayDungeonDialogue(&gUnknown_81062B4);
+    DisplayDungeonDialogue(&gDeoxysPreFightDialogue_1);
     sub_8083EA8(0x1a,0x3c);
     sub_808C550();
-    DisplayDungeonDialogue(&gUnknown_81062E8);
+    DisplayDungeonDialogue(&gDeoxysPreFightDialogue_2);
     DeoxysScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_8106368);
+    DisplayDungeonDialogue(&gDeoxysPreFightDialogue_3);
     DeoxysScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_8106390);
+    DisplayDungeonDialogue(&gDeoxysPreFightDialogue_4);
     sub_803E708(10,0x46);
     sub_808563C(SetupDeoxysFightHP);
-    sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+    ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
   }
 }
 
@@ -585,17 +585,17 @@ void DeoxysScreenFlash(void)
 
   PlaySoundEffect(0x2c1);
   for(iVar1 = 250; iVar1 > 149; iVar1 -= 10){
-    sub_8085C54(iVar1,0,0,1,1);
+    SetDungeonBGColorRGB(iVar1,0,0,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
   for(iVar1 = 250; iVar1 > 199; iVar1 -= 10){
-    sub_8085C54(iVar1,iVar1,0,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,0,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
   for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10){
-    sub_8085C54(iVar1,0,0,1,1);
+    SetDungeonBGColorRGB(iVar1,0,0,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
@@ -605,7 +605,7 @@ void DeoxysScreenFlash(void)
 void sub_808C550(void)
 {
   gUnknown_202EDC8 = 0x1f;
-  sub_8085C54(0,0,0,1,1);
+  SetDungeonBGColorRGB(0,0,0,1,1);
   sub_803E9D0();
   sub_803E46C(0x46);
   gDungeonGlobalData->unk7 = 0;
@@ -636,14 +636,14 @@ void sub_808C5C0(void)
   s32 iVar2;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  CelebiEntity = sub_8085680(0x1e);
+  CelebiEntity = GetEntityFromClientType(0x1e);
   sub_8083E88(0x7f);
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
   SetFacingDirection(CelebiEntity, DIRECTION_SOUTH);
   sub_8085860(LeaderEntity->posWorld.x,LeaderEntity->posWorld.y);
-  uVar3 = sub_803F994();
-  iVar2 = sub_803F9B0();
+  uVar3 = GetCameraXPos();
+  iVar2 = GetCameraYPos();
   sub_803F878(uVar3,iVar2 + 0xfffff000);
   CopySpeciesNametoBuffer(gUnknown_202E038, SPECIES_CELEBI);
 }
@@ -662,14 +662,14 @@ void CelebiJoinDialogue(void)
   struct DungeonEntity *CelebiEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  CelebiEntity = sub_8085680(0x1e);
+  CelebiEntity = GetEntityFromClientType(0x1e);
   if ((HasRecruitedMon(SPECIES_CELEBI)) || (sub_806FD18(CelebiEntity) == '\0'))
   {
     sub_8068FE0(local_1c,0x21c,0);
     SpriteLookAroundEffect(LeaderEntity);
     sub_803E708(10,0x46);
     // .........
-    DisplayDungeonDialogue(&gUnknown_810663C);
+    DisplayDungeonDialogue(&gCelebiJoinDialogue_10);
   }
   else
   {
@@ -678,14 +678,14 @@ void CelebiJoinDialogue(void)
     sub_80862BC(LeaderEntity);
     sub_803E708(10,0x46);
     // Oh? There's someone there.
-    DisplayDungeonDialogue(&gUnknown_81063D0);
+    DisplayDungeonDialogue(&gCelebiJoinDialogue_1);
     sub_803E708(10,0x46);
     sub_8086598();
     sub_8086598();
     sub_8086598();
     sub_8086598();
     // The Time-Traveling Pokemon {ARG_POKEMON_2} (Celebi)!
-    DisplayDungeonDialogue(&gUnknown_8106400);
+    DisplayDungeonDialogue(&gCelebiJoinDialogue_2);
     PlaySoundEffect(0x1c7);
     sub_806CDD4(CelebiEntity,10,DIRECTION_SOUTH);
     sub_803E708(0x14,0x46);
@@ -693,7 +693,7 @@ void CelebiJoinDialogue(void)
     sub_803E708(4,0x46);
     PlaySoundEffect(0x1c7);
     sub_806CDD4(CelebiEntity,10,DIRECTION_SOUTH);
-    DisplayDungeonDialogue(&gUnknown_810643C);
+    DisplayDungeonDialogue(&gCelebiJoinDialogue_3);
     sub_803E708(10,0x46);
     state = 0;
     do {
@@ -721,11 +721,11 @@ void CelebiJoinDialogue(void)
                 sub_803E708(0x1a,0x46);
                 PlaySoundEffect(0x1d5);
                 sub_803E708(0x1c,0x46);
-                DisplayDungeonDialogue(&gUnknown_8106468);
+                DisplayDungeonDialogue(&gCelebiJoinDialogue_4);
                 sub_803E708(10,0x46);
                 sub_806FDF4(LeaderEntity,CelebiEntity,&CelebiEntity);
                 sub_8083E88(0x7f);
-                DisplayDungeonDialogue(&gUnknown_810648C);
+                DisplayDungeonDialogue(&gCelebiJoinDialogue_5);
                 sub_803E708(10,0x46);
                 PlaySoundEffect(0x1c7);
                 sub_80861D4(CelebiEntity,0xd,0);
@@ -734,7 +734,7 @@ void CelebiJoinDialogue(void)
                 sub_803E708(0x1a,0x46);
                 PlaySoundEffect(0x1d5);
                 sub_803E708(0x1b,0x46);
-                DisplayDungeonDialogue(&gUnknown_81064BC);
+                DisplayDungeonDialogue(&gCelebiJoinDialogue_6);
                 sub_803E708(10,0x46);
                 state = 2;
             }
@@ -754,15 +754,15 @@ void CelebiJoinDialogue(void)
             else
             {
                 sub_803E708(10,0x46);
-                DisplayDungeonDialogue(&gUnknown_8106500);
+                DisplayDungeonDialogue(&gCelebiJoinDialogue_7);
                 sub_80861F8(0x3e,CelebiEntity,1);
                 sub_803E708(0x18,0x46);
                 sub_80861F8(0x3e,CelebiEntity,1);
                 sub_803E708(0xe,0x46);
-                DisplayDungeonDialogue(&gUnknown_8106534);
+                DisplayDungeonDialogue(&gCelebiJoinDialogue_8);
                 sub_803E708(10,0x46);
                 sub_808C8E0(CelebiEntity);
-                DisplayDungeonDialogue(&gUnknown_8106560);
+                DisplayDungeonDialogue(&gCelebiJoinDialogue_9);
                 sub_803E708(10,0x46);
                 state = 2;
             }
@@ -786,7 +786,7 @@ void CelebiJoinDialogue(void)
 	"\tbl xxx_call_GetLeaderEntity\n"
 	"\tadds r7, r0, 0\n"
 	"\tmovs r0, 0x1E\n"
-	"\tbl sub_8085680\n"
+	"\tbl GetEntityFromClientType\n"
 	"\tstr r0, [sp]\n"
 	"\tmovs r0, 0x8A\n"
 	"\tlsls r0, 1\n"
@@ -814,7 +814,7 @@ void CelebiJoinDialogue(void)
 	"\tbl DisplayDungeonDialogue\n"
 	"\tb _0808C8AC\n"
 	"\t.align 2, 0\n"
-"_0808C67C: .4byte gUnknown_810663C\n"
+"_0808C67C: .4byte gCelebiJoinDialogue_10\n"
 "_0808C680:\n"
 	"\tadds r0, r7, 0\n"
 	"\tbl SpriteLookAroundEffect\n"
@@ -876,10 +876,10 @@ void CelebiJoinDialogue(void)
 "_0808C718:\n"
 	"\tb _0808C8A6\n"
 	"\t.align 2, 0\n"
-"_0808C71C: .4byte gUnknown_81063D0\n"
-"_0808C720: .4byte gUnknown_8106400\n"
+"_0808C71C: .4byte gCelebiJoinDialogue_1\n"
+"_0808C720: .4byte gCelebiJoinDialogue_2\n"
 "_0808C724: .4byte 0x000001c7\n"
-"_0808C728: .4byte gUnknown_810643C\n"
+"_0808C728: .4byte gCelebiJoinDialogue_3\n"
 "_0808C72C: .4byte 0x000001d5\n"
 "_0808C730:\n"
 	"\tldr r5, _0808C75C\n"
@@ -973,9 +973,9 @@ void CelebiJoinDialogue(void)
 	"\tldr r0, _0808C820\n"
 	"\tb _0808C898\n"
 	"\t.align 2, 0\n"
-"_0808C818: .4byte gUnknown_8106468\n"
-"_0808C81C: .4byte gUnknown_810648C\n"
-"_0808C820: .4byte gUnknown_81064BC\n"
+"_0808C818: .4byte gCelebiJoinDialogue_4\n"
+"_0808C81C: .4byte gCelebiJoinDialogue_5\n"
+"_0808C820: .4byte gCelebiJoinDialogue_6\n"
 "_0808C824:\n"
 	"movs r0, 0x1\n"
 	"b _0808C8A6\n"
@@ -1053,9 +1053,9 @@ void CelebiJoinDialogue(void)
 	"\tpop {r0}\n"
 	"\tbx r0\n"
 	"\t.align 2, 0\n"
-"_0808C8D0: .4byte gUnknown_8106500\n"
-"_0808C8D4: .4byte gUnknown_8106534\n"
-"_0808C8D8: .4byte gUnknown_8106560\n"
+"_0808C8D0: .4byte gCelebiJoinDialogue_7\n"
+"_0808C8D4: .4byte gCelebiJoinDialogue_8\n"
+"_0808C8D8: .4byte gCelebiJoinDialogue_9\n"
 "_0808C8DC: .4byte gDungeonGlobalData");
 }
 #endif
@@ -1123,7 +1123,7 @@ void sub_808C9C4(void)
     struct DungeonEntity *MedichamEntity;
 
     LeaderEntity = xxx_call_GetLeaderEntity();
-    MedichamEntity = sub_8085680(7);
+    MedichamEntity = GetEntityFromClientType(7);
     sub_8083E88(0x72);
     sub_80854D4();
     sub_8085930(DIRECTION_NORTH);
@@ -1139,16 +1139,16 @@ void MedichamRescueDialogue(void)
     struct DungeonEntity *MedichamEntity;
     s32 counter;
 
-    MedichamEntity = sub_8085680(7);
+    MedichamEntity = GetEntityFromClientType(7);
     SpriteLookAroundEffect(MedichamEntity);
     sub_803E708(0xA, 0x46);
     // Oh my I can't seem to find a way out...
-    DisplayDungeonDialogue(&gUnknown_8106778);
+    DisplayDungeonDialogue(&gMedichamRescueDialogue_1);
     sub_803E708(0xA, 0x46);
     sub_80869E4(MedichamEntity, 4, 2, 4);
     sub_803E708(0xA, 0x46);
     // What am I to do...?
-    DisplayDungeonDialogue(&gUnknown_81067BC);
+    DisplayDungeonDialogue(&gMedichamRescueDialogue_2);
     sub_803E708(0xA, 0x46);
     sub_8086448();
     sub_8086598();
@@ -1156,7 +1156,7 @@ void MedichamRescueDialogue(void)
     sub_80862BC(MedichamEntity);
     sub_803E708(0x20, 0x46);
     sub_80869E4(MedichamEntity, 4, 2, 0);
-    DisplayDungeonDialogue(&gUnknown_81067E0);
+    DisplayDungeonDialogue(&gMedichamRescueDialogue_3);
     sub_803E708(0xA, 0x46);
     PlaySoundEffect(0x1c7);
     sub_806CDD4(MedichamEntity, 0xA, DIRECTION_SOUTH);
@@ -1170,7 +1170,7 @@ void MedichamRescueDialogue(void)
     // I am so lucky
     //
     // There appears to be no one here
-    DisplayDungeonDialogue(&gUnknown_8106834);
+    DisplayDungeonDialogue(&gMedichamRescueDialogue_4);
     sub_803E708(0xA, 0x46);
     sub_806CDD4(MedichamEntity, 0, DIRECTION_SOUTH);
     for(counter = 0x17; counter >= 0; counter--)
@@ -1192,7 +1192,7 @@ void sub_808CB5C(void)
     struct DungeonEntity *MedichamEntity;
 
     LeaderEntity = xxx_call_GetLeaderEntity();
-    MedichamEntity = sub_8085680(7);
+    MedichamEntity = GetEntityFromClientType(7);
     sub_8083E88(0x72);
     sub_80854D4();
     sub_8085930(DIRECTION_NORTH);
@@ -1211,7 +1211,7 @@ void sub_808CBB0(void)
     struct DungeonEntity *SmeargleEntity;
 
     LeaderEntity = xxx_call_GetLeaderEntity();
-    SmeargleEntity = sub_8085680(0x1F);
+    SmeargleEntity = GetEntityFromClientType(0x1F);
     sub_8083E88(0x72);
     sub_80854D4();
     sub_8085930(DIRECTION_NORTH);
@@ -1227,19 +1227,19 @@ void SmeargleRescueDialogue(void)
     struct DungeonEntity *SmeargleEntity;
     s32 counter;
 
-    SmeargleEntity = sub_8085680(0x1F);
+    SmeargleEntity = GetEntityFromClientType(0x1F);
     SpriteLookAroundEffect(SmeargleEntity);
     sub_803E708(0xA, 0x46);
     // Ohhh...
     // I've lost my bearings
-    DisplayDungeonDialogue(&gUnknown_810688C);
+    DisplayDungeonDialogue(&gSmeargleRescueDialogue_1);
     sub_803E708(0xA, 0x46);
     sub_80869E4(SmeargleEntity, 4, 2, 4);
     sub_803E708(0xA, 0x46);
     // I can't get out...
     // I'm hungry...
     // I'm in trouble
-    DisplayDungeonDialogue(&gUnknown_81068D0);
+    DisplayDungeonDialogue(&gSmeargleRescueDialogue_2);
     sub_803E708(0xA, 0x46);
     sub_8086448();
     sub_8086598();
@@ -1248,7 +1248,7 @@ void SmeargleRescueDialogue(void)
     sub_803E708(0x20, 0x46);
     sub_80869E4(SmeargleEntity, 4, 2, 0);
     // Oh! You are?
-    DisplayDungeonDialogue(&gUnknown_8106918);
+    DisplayDungeonDialogue(&gSmeargleRescueDialogue_3);
     sub_803E708(0xA, 0x46);
     PlaySoundEffect(0x1c7);
     sub_806CDD4(SmeargleEntity, 0xA, DIRECTION_SOUTH);
@@ -1260,7 +1260,7 @@ void SmeargleRescueDialogue(void)
     sub_803E708(0x14, 0x46);
     // Did you maybe come to rescue me?
     // Am I glad to see you
-    DisplayDungeonDialogue(&gUnknown_8106934);
+    DisplayDungeonDialogue(&gSmeargleRescueDialogue_4);
     sub_803E708(0xA, 0x46);
     sub_806CDD4(SmeargleEntity, 0, DIRECTION_SOUTH);
     for(counter = 0x17; counter >= 0; counter--)
@@ -1283,7 +1283,7 @@ void sub_808CD44(void)
     struct DungeonEntity *SmeargleEntity;
 
     LeaderEntity = xxx_call_GetLeaderEntity();
-    SmeargleEntity = sub_8085680(0x1F);
+    SmeargleEntity = GetEntityFromClientType(0x1F);
     sub_8083E88(0x72);
     sub_80854D4();
     sub_8085930(DIRECTION_NORTH);
diff --git a/src/code_8057824.c b/src/code_8057824.c
index a8d6ef2f3..cc950883a 100644
--- a/src/code_8057824.c
+++ b/src/code_8057824.c
@@ -148,7 +148,7 @@ bool32 sub_8057974(struct DungeonEntity *pokemon, struct DungeonEntity *target,
   return local_24;
 }
 
-bool8 sub_8057A0C(struct DungeonEntity *pokemon, struct DungeonEntity *target)
+bool8 PainSplitMoveAction(struct DungeonEntity *pokemon, struct DungeonEntity *target)
 {
   s32 newHP;
   struct DungeonEntityData *iVar2;
diff --git a/src/code_8057824_1.c b/src/code_8057824_1.c
index 68923570e..9d5dc9385 100644
--- a/src/code_8057824_1.c
+++ b/src/code_8057824_1.c
@@ -4,6 +4,7 @@
 #include "dungeon_global_data.h"
 #include "dungeon_entity.h"
 #include "dungeon_util.h"
+#include "dungeon_util_1.h"
 #include "item.h"
 #include "pokemon.h"
 
@@ -27,200 +28,200 @@ extern u32 gUnknown_8103C74;
 extern u32 gUnknown_8103CC4;
 extern u32 gUnknown_8103D0C;
 extern u32 gUnknown_8103D50;
-extern u32 gUnknown_8103B58;
-extern u32 gUnknown_8103904;
-extern u32 gUnknown_8103938;
-extern u32 gUnknown_8103AA4;
-extern u32 gUnknown_8103AE4;
-extern u32 gUnknown_8103B30;
-extern u32 gUnknown_8103690;
-extern u32 gUnknown_8103844;
-extern u32 gUnknown_8103874;
-extern u32 gUnknown_81038A8;
-extern u32 gUnknown_81038F8;
-extern u32 gUnknown_8103500;
-extern u32 gUnknown_810352C;
-extern u32 gUnknown_8103578;
-extern u32 gUnknown_81035D4;
-extern u32 gUnknown_8103618;
-extern u32 gUnknown_810367C;
-extern u32 gUnknown_8103690;
-extern u32 gUnknown_81036C8;
-extern u32 gUnknown_81037A0;
-extern u32 gUnknown_81037D4;
-extern u32 gUnknown_8103820;
-extern u32 gUnknown_8102C30;
-extern u32 gUnknown_8102C54;
-extern u32 gUnknown_8102C98;
-extern u32 gUnknown_8102CB0;
-extern u32 gUnknown_8102CF8;
-extern u32 gUnknown_8102D34;
-extern u32 gUnknown_8102D4C;
-extern u32 gUnknown_8102D7C;
-extern u32 gUnknown_8102DFC;
-extern u32 gUnknown_8102E2C;
-extern u32 gUnknown_8102E54;
-extern u32 gUnknown_8102BE4;
-extern u32 gUnknown_8102BC4;
-extern u32 gUnknown_8102B54;
-extern u32 gUnknown_8102B1C;
+extern u32 gRayquazaPostStoryPreFightDialogue_6;
+extern u32 gRayquazaPostStoryPreFightDialogue_1;
+extern u32 gRayquazaPostStoryPreFightDialogue_2;
+extern u32 gRayquazaPostStoryPreFightDialogue_3;
+extern u32 gRayquazaPostStoryPreFightDialogue_4;
+extern u32 gRayquazaPostStoryPreFightDialogue_5;
+extern u32 gRayquazaPreFightDialogue_7;
+extern u32 gRayquazaReFightDialogue_1;
+extern u32 gRayquazaReFightDialogue_2;
+extern u32 gRayquazaReFightDialogue_3;
+extern u32 gRayquazaReFightDialogue_4;
+extern u32 gRayquazaPreFightDialogue_1;
+extern u32 gRayquazaPreFightDialogue_2;
+extern u32 gRayquazaPreFightDialogue_3;
+extern u32 gRayquazaPreFightDialogue_4;
+extern u32 gRayquazaPreFightDialogue_5;
+extern u32 gRayquazaPreFightDialogue_6;
+extern u32 gRayquazaPreFightDialogue_7;
+extern u32 gRayquazaPreFightDialogue_8;
+extern u32 gRayquazaPreFightDialogue_9;
+extern u32 gRayquazaPreFightDialogue_10;
+extern u32 gRayquazaPreFightDialogue_11;
+extern u32 MagmaCavernMidDialogue_5;
+extern u32 MagmaCavernMidDialogue_6;
+extern u32 MagmaCavernMidDialogue_7;
+extern u32 MagmaCavernMidDialogue_8;
+extern u32 MagmaCavernMidDialogue_9;
+extern u32 MagmaCavernMidDialogue_10;
+extern u32 MagmaCavernMidDialogue_11;
+extern u32 MagmaCavernMidDialogue_12;
+extern u32 MagmaCavernMidDialogue_13;
+extern u32 MagmaCavernMidDialogue_14;
+extern u32 MagmaCavernMidDialogue_15;
+extern u32 MagmaCavernMidDialogue_4;
+extern u32 MagmaCavernMidDialogue_3;
+extern u32 MagmaCavernMidDialogue_2;
+extern u32 MagmaCavernMidDialogue_1;
 extern u32 gUnknown_8103488;
-extern u32 gUnknown_81033A0;
-extern u32 gUnknown_81033AC;
-extern u32 gUnknown_810343C;
-extern u32 gUnknown_810347C;
-extern u32 gUnknown_8103188;
-extern u32 gUnknown_8103228;
-extern u32 gUnknown_8103310;
-extern u32 gUnknown_8103340;
-extern u32 gUnknown_8102E70;
-extern u32 gUnknown_8102EBC;
-extern u32 gUnknown_8102EE0;
-extern u32 gUnknown_8102EF8;
-extern u32 gUnknown_8102F30;
-extern u32 gUnknown_8102F64;
-extern u32 gUnknown_8102F84;
-extern u32 gUnknown_8102FAC;
-extern u32 gUnknown_8102FC4;
-extern u32 gUnknown_8102FD8;
-extern u32 gUnknown_8103054;
-extern u32 gUnknown_81030D8;
-extern u32 gUnknown_8103110;
-extern u32 gUnknown_8103140;
+extern u32 gGroudonPostStoryPreFightDialogue_1;
+extern u32 gGroudonPostStoryPreFightDialogue_2;
+extern u32 gGroudonPostStoryPreFightDialogue_3;
+extern u32 gGroudonPostStoryPreFightDialogue_4;
+extern u32 gGroudonReFightDialogue_1;
+extern u32 gGroudonReFightDialogue_2;
+extern u32 gGroudonReFightDialogue_3;
+extern u32 gGroudonReFightDialogue_4;
+extern u32 GroudonPreFightDialogue_1;
+extern u32 GroudonPreFightDialogue_2;
+extern u32 GroudonPreFightDialogue_3;
+extern u32 GroudonPreFightDialogue_4;
+extern u32 GroudonPreFightDialogue_5;
+extern u32 GroudonPreFightDialogue_6;
+extern u32 GroudonPreFightDialogue_7;
+extern u32 GroudonPreFightDialogue_8;
+extern u32 GroudonPreFightDialogue_9;
+extern u32 GroudonPreFightDialogue_10;
+extern u32 GroudonPreFightDialogue_11;
+extern u32 GroudonPreFightDialogue_12;
+extern u32 GroudonPreFightDialogue_13;
+extern u32 GroudonPreFightDialogue_14;
 extern u32 gUnknown_8102B10;
-extern u32 gUnknown_8105244;
-extern u32 gUnknown_810517C;
-extern u32 gUnknown_81050B4;
-extern u32 gUnknown_81051D0;
-extern u32 gUnknown_810510C;
-extern u32 gUnknown_8105040;
+extern u32 gRegisteelPostFightDialogue_2;
+extern u32 gRegicePostFightDialogue_2;
+extern u32 gRegirockPostFightDialogue_2;
+extern u32 gRegisteelPostFightDialogue_1;
+extern u32 gRegicePostFightDialogue_1;
+extern u32 gRegirockPostFightDialogue_1;
 extern u32 gUnknown_810554C;
 extern u32 gUnknown_8105558;
 extern u32 gUnknown_81055F4;
-extern u32 gUnknown_8105028;
-extern u32 gUnknown_8104FD4;
-extern u32 gUnknown_8104930;
-extern u32 gUnknown_8104980;
-extern u32 gUnknown_8104998;
-extern u32 gUnknown_8105034;
-extern u32 gUnknown_8105438;
-extern u32 gUnknown_81054A0;
-extern u32 gUnknown_81054E4;
-extern u32 gUnknown_810550C;
-extern u32 gUnknown_8104F64;
-extern u32 gUnknown_8104EFC;
-extern u32 gUnknown_8104F30;
-extern u32 gUnknown_8104E60;
-extern u32 gUnknown_8104CEC;
-extern u32 gUnknown_8104D60;
-extern u32 gUnknown_8104DDC;
-extern u32 gUnknown_8104E0C;
-extern u32 gUnknown_8104E54;
-extern u32 gUnknown_8104AD4;
-extern u32 gUnknown_8104BEC;
-extern u32 gUnknown_8104C10;
-extern u32 gUnknown_8104C54;
-extern u32 gUnknown_8104CB4;
-extern u32 gUnknown_8104CE0;
-extern u32 gUnknown_8104AC8;
-extern u32 gUnknown_81049D4;
-extern u32 gUnknown_8104A80;
-extern u32 gUnknown_8104A9C;
-extern u32 gUnknown_8104784;
-extern u32 gUnknown_8104790;
-extern u32 gUnknown_81047B0;
-extern u32 gUnknown_810484C;
-extern u32 gUnknown_8104888;
-extern u32 gUnknown_81048C8;
-extern u32 gUnknown_8104914;
-extern u32 gUnknown_810476C;
-extern u32 gUnknown_8104778;
-extern u32 gUnknown_81046CC;
-extern u32 gUnknown_8104744;
-extern u32 gUnknown_81045F8;
-extern u32 gUnknown_8104674;
-extern u32 gUnknown_81046A0;
-extern u32 gUnknown_8104450;
-extern u32 gUnknown_81044B4;
-extern u32 gUnknown_8104510;
-extern u32 gUnknown_810453C;
-extern u32 gUnknown_8104570;
-extern u32 gUnknown_81045B0;
-extern u32 gUnknown_81043DC;
-extern u32 gUnknown_8104310;
-extern u32 gUnknown_810439C;
-extern u32 gUnknown_81043C0;
-extern u32 gUnknown_8104240;
-extern u32 gUnknown_81042AC;
-extern u32 gUnknown_81042B8;
+extern u32 gRegicePreFightDialogue_1;
+extern u32 gRegirockPreFightDialogue_1;
+extern u32 gSuicuneReFightDialogue_1;
+extern u32 gSuicuneReFightDialogue_2;
+extern u32 gSuicuneReFightDialogue_3;
+extern u32 gRegisteelPreFightDialogue_1;
+extern u32 gJirachiPreFightDialogue_1;
+extern u32 gJirachiPreFightDialogue_2;
+extern u32 gJirachiPreFightDialogue_3;
+extern u32 gJirachiPreFightDialogue_4;
+extern u32 gLatiosReFightDialogue_1;
+extern u32 gLatiosPreFightDialogue_2;
+extern u32 gLatiosPreFightDialogue_3;
+extern u32 gLatiosPreFightDialogue_1;
+extern u32 HoOhReFightDialogue_1;
+extern u32 HoOhReFightDialogue_2;
+extern u32 HoOhReFightDialogue_3;
+extern u32 HoOhReFightDialogue_4;
+extern u32 HoOhReFightDialogue_5;
+extern u32 gHoOhPreFightDialogue_1;
+extern u32 gHoOhPreFightDialogue_2;
+extern u32 gHoOhPreFightDialogue_3;
+extern u32 gHoOhPreFightDialogue_4;
+extern u32 gHoOhPreFightDialogue_5;
+extern u32 gHoOhPreFightDialogue_6;
+extern u32 gSuicunePostStoryPreFightDialogue_4;
+extern u32 gSuicunePostStoryPreFightDialogue_1;
+extern u32 gSuicunePostStoryPreFightDialogue_2;
+extern u32 gSuicunePostStoryPreFightDialogue_3;
+extern u32 gSuicunePreFightDialogue_1;
+extern u32 gSuicunePreFightDialogue_2;
+extern u32 gSuicunePreFightDialogue_3;
+extern u32 gSuicunePreFightDialogue_4;
+extern u32 gSuicunePreFightDialogue_5;
+extern u32 gSuicunePreFightDialogue_6;
+extern u32 gSuicunePreFightDialogue_7;
+extern u32 gRaikouPostStoryPreFightDialogue_3;
+extern u32 gRaikouPostStoryPreFightDialogue_4;
+extern u32 gRaikouPostStoryPreFightDialogue_1;
+extern u32 gRaikouPostStoryPreFightDialogue_2;
+extern u32 gRaikouReFightDialogue_1;
+extern u32 gRaikouReFightDialogue_2;
+extern u32 gRaikouReFightDialogue_3;
+extern u32 gRaikouPreFightDialogue_1;
+extern u32 gRaikouPreFightDialogue_2;
+extern u32 gRaikouPreFightDialogue_3;
+extern u32 gRaikouPreFightDialogue_4;
+extern u32 gRaikouPreFightDialogue_5;
+extern u32 gRaikouPreFightDialogue_6;
+extern u32 gEnteiPostStoryPreFightDialogue_4;
+extern u32 gEnteiPostStoryPreFightDialogue_1;
+extern u32 gEnteiPostStoryPreFightDialogue_2;
+extern u32 gEnteiPostStoryPreFightDialogue_3;
+extern u32 gEnteiReFightDialogue_1;
+extern u32 gEnteiReFightDialogue_2;
+extern u32 gEnteiReFightDialogue_3;
 extern u32 gUnknown_8104FC8;
-extern u32 gUnknown_8104150;
-extern u32 gUnknown_81041AC;
-extern u32 gUnknown_81041F8;
-extern u32 gUnknown_8104144;
-extern u32 gUnknown_8104114;
-extern u32 gUnknown_81040CC;
-extern u32 gUnknown_8104050;
-extern u32 gUnknown_8104044;
-extern u32 gUnknown_8104008;
-extern u32 gUnknown_8103EA4;
-extern u32 gUnknown_8103F0C;
-extern u32 gUnknown_8103F4C;
-extern u32 gUnknown_8103FCC;
+extern u32 gEnteiPreFightDialogue_1;
+extern u32 gEnteiPreFightDialogue_2;
+extern u32 gEnteiPreFightDialogue_3;
+extern u32 gMewtwoReFightDialogue_5;
+extern u32 gMewtwoReFightDialogue_4;
+extern u32 gMewtwoReFightDialogue_3;
+extern u32 gMewtwoReFightDialogue_2;
+extern u32 gMewtwoReFightDialogue_1;
+extern u32 gMewtwoPreFightDialogue_5;
+extern u32 gMewtwoPreFightDialogue_1;
+extern u32 gMewtwoPreFightDialogue_2;
+extern u32 gMewtwoPreFightDialogue_3;
+extern u32 gMewtwoPreFightDialogue_4;
 extern u32 gUnknown_8103E34;
 extern u32 gUnknown_8102A9C;
-extern u32 gUnknown_8102984;
-extern u32 gUnknown_81029B4;
-extern u32 gUnknown_8102A18;
-extern u32 gUnknown_8102A24;
-extern u32 gUnknown_8102A74;
-extern u32 gUnknown_81028D4;
-extern u32 gUnknown_8102918;
-extern u32 gUnknown_8102948;
-extern u32 gUnknown_8102478;
-extern u32 gUnknown_81025B4;
-extern u32 gUnknown_81025D4;
-extern u32 gUnknown_8102610;
-extern u32 gUnknown_81026C4;
-extern u32 gUnknown_810270C;
-extern u32 gUnknown_810272C;
-extern u32 gUnknown_81027BC;
-extern u32 gUnknown_8102810;
-extern u32 gUnknown_8102840;
-extern u32 gUnknown_810286C;
-extern u32 gUnknown_81028B8;
-extern u32 gUnknown_810232C;
-extern u32 gUnknown_8102398;
-extern u32 gUnknown_81023C4;
-extern u32 gUnknown_8102400;
-extern u32 gUnknown_8102454;
+extern u32 gArticunoPostStoryPreFightDialogue_1;
+extern u32 gArticunoPostStoryPreFightDialogue_2;
+extern u32 gArticunoPostStoryPreFightDialogue_3;
+extern u32 gArticunoPostStoryPreFightDialogue_4;
+extern u32 gArticunoPostStoryPreFightDialogue_5;
+extern u32 gArticunoReFightDialogue_1;
+extern u32 gArticunoReFightDialogue_2;
+extern u32 gArticunoReFightDialogue_3;
+extern u32 gArticunoPreFightDialogue_1;
+extern u32 gArticunoPreFightDialogue_2;
+extern u32 gArticunoPreFightDialogue_3;
+extern u32 gArticunoPreFightDialogue_4;
+extern u32 gArticunoPreFightDialogue_5;
+extern u32 gArticunoPreFightDialogue_6;
+extern u32 gArticunoPreFightDialogue_7;
+extern u32 gArticunoPreFightDialogue_8;
+extern u32 gArticunoPreFightDialogue_9;
+extern u32 gArticunoPreFightDialogue_10;
+extern u32 gArticunoPreFightDialogue_11;
+extern u32 gArticunoPreFightDialogue_12;
+extern u32 gMoltresPostStoryPreFightDialogue_1;
+extern u32 gMoltresPostStoryPreFightDialogue_2;
+extern u32 gMoltresPostStoryPreFightDialogue_3;
+extern u32 gMoltresPostStoryPreFightDialogue_4;
+extern u32 gMoltresPostStoryPreFightDialogue_5;
 extern u32 gUnknown_8100D3C;
-extern u32 gUnknown_8102158;
-extern u32 gUnknown_8102190;
-extern u32 gUnknown_8102200;
-extern u32 gUnknown_8102254;
-extern u32 gUnknown_81022F8;
-extern u32 gUnknown_8101A9C;
-extern u32 gUnknown_8101AD4;
-extern u32 gUnknown_8101C30;
-extern u32 gUnknown_8101CBC;
-extern u32 gUnknown_8101D8C;
-extern u32 gUnknown_8101DA0;
-extern u32 gUnknown_8101E1C;
-extern u32 gUnknown_8101EAC;
-extern u32 gUnknown_8102070;
-extern u32 gUnknown_81020A4;
-extern u32 gUnknown_81020D4;
-extern u32 gUnknown_8102108;
-extern u32 gUnknown_810193C;
-extern u32 gUnknown_8101970;
-extern u32 gUnknown_8101994;
-extern u32 gUnknown_81019E4;
-extern u32 gUnknown_8101A04;
-extern u32 gUnknown_8101A38;
+extern u32 gMoltresReFightDialogue_1;
+extern u32 gMoltresReFightDialogue_2;
+extern u32 gMoltresReFightDialogue_3;
+extern u32 gMoltresReFightDialogue_4;
+extern u32 gMoltresReFightDialogue_5;
+extern u32 gMoltresPreFightDialogue_1;
+extern u32 gMoltresPreFightDialogue_2;
+extern u32 gMoltresPreFightDialogue_3;
+extern u32 gMoltresPreFightDialogue_4;
+extern u32 gMoltresPreFightDialogue_5;
+extern u32 gMoltresPreFightDialogue_6;
+extern u32 gMoltresPreFightDialogue_7;
+extern u32 gMoltresPreFightDialogue_8;
+extern u32 gMoltresPreFightDialogue_9;
+extern u32 gMoltresPreFightDialogue_10;
+extern u32 gMoltresPreFightDialogue_11;
+extern u32 gMoltresPreFightDialogue_12;
+extern u32 gZapdosPostStoryPreFightDialogue_1;
+extern u32 gZapdosPostStoryPreFightDialogue_2;
+extern u32 gZapdosPostStoryPreFightDialogue_3;
+extern u32 gZapdosPostStoryPreFightDialogue_4;
+extern u32 gZapdosPostStoryPreFightDialogue_5;
+extern u32 gZapdosPostStoryPreFightDialogue_6;
 
 extern struct DungeonEntity *xxx_call_GetLeaderEntity(void);
-extern struct DungeonEntity *sub_8085680(u32);
+extern struct DungeonEntity *GetEntityFromClientType(u32);
 extern void sub_808BBA8(struct DungeonEntity * );
 extern void sub_80855E4(void *);
 extern void sub_8041888(u32);
@@ -236,7 +237,6 @@ extern void sub_8086448();
 extern void SpriteLookAroundEffect(struct DungeonEntity *);
 extern u32 sub_80861F8(u32, struct DungeonEntity *, u32);
 extern void SetupBossFightHP(struct DungeonEntity *, u32, u32);
-extern void sub_80858AC(u32 *, u32);
 
 extern void sub_8097FA8(u32);
 extern void JirachiWish();
@@ -262,7 +262,7 @@ extern void sub_808B1CC(u8);
 extern void sub_80464C8(struct DungeonEntity *, u32 *, struct ItemSlot *);
 extern void sub_8098044(u32);
 extern void PlaySoundEffect(u32);
-extern void sub_8085C54(u32, u32, u32, u32, u32);
+extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern void sub_803E46C(u32);
 extern void sub_8085EB0();
 extern void sub_80866C4(u32 *);
@@ -331,8 +331,8 @@ extern void sub_8086738();
 extern void sub_8086A54(struct DungeonEntity *);
 extern void sub_8086764();
 
-extern u32 sub_803F994();
-extern s32 sub_803F9B0();
+extern s32 GetCameraXPos();
+extern s32 GetCameraYPos();
 extern void sub_803F878(u32,s32);
 
 void SceneGroudonMovement(struct DungeonEntity * param_1);
@@ -358,11 +358,11 @@ extern void sub_808663C(void);
 void sub_8087704(struct DungeonEntity *param_1);
 void sub_808775C(int param_1);
 
-extern u32 gUnknown_81017E4;
+extern u32 gZapdosReFightDialogue_1;
 extern u32 gUnknown_81015A0;
-extern u32 gUnknown_8101898;
-extern u32 gUnknown_81018EC;
-extern u32 gUnknown_8101918;
+extern u32 gZapdosReFightDialogue_2;
+extern u32 gZapdosReFightDialogue_3;
+extern u32 gZapdosReFightDialogue_4;
 
 
 void ZapdosReFightDialogue(void)
@@ -371,23 +371,23 @@ void ZapdosReFightDialogue(void)
   struct DungeonEntity *ZapdosEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  ZapdosEntity = sub_8085680(8);
+  ZapdosEntity = GetEntityFromClientType(8);
   sub_8086448();
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_81017E4);
+  DisplayDungeonDialogue(&gZapdosReFightDialogue_1);
   sub_803E708(10,0x46);
   PlaySoundEffect(0x1da);
   DisplayDungeonDialogue(&gUnknown_81015A0);
   sub_803E708(10,0x46);
   sub_8087704(ZapdosEntity);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_8101898);
+  DisplayDungeonDialogue(&gZapdosReFightDialogue_2);
   sub_808775C(1);
-  DisplayDungeonDialogue(&gUnknown_81018EC);
+  DisplayDungeonDialogue(&gZapdosReFightDialogue_3);
   sub_808775C(2);
-  DisplayDungeonDialogue(&gUnknown_8101918);
+  DisplayDungeonDialogue(&gZapdosReFightDialogue_4);
   SetupBossFightHP(ZapdosEntity,300,0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 void ZapdosPostStoryPreFightDialogue(void)
@@ -396,26 +396,26 @@ void ZapdosPostStoryPreFightDialogue(void)
   struct DungeonEntity * ZapdosEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  ZapdosEntity = sub_8085680(8);
+  ZapdosEntity = GetEntityFromClientType(8);
   sub_8086448();
   if (sub_8086AE4(SPECIES_ZAPDOS)) {
-    sub_80866C4(&gUnknown_8101A38);
+    sub_80866C4(&gZapdosPostStoryPreFightDialogue_6);
   }
   else {
     sub_808775C(1);
     PlaySoundEffect(0x1da);
-    DisplayDungeonDialogue(&gUnknown_810193C);
+    DisplayDungeonDialogue(&gZapdosPostStoryPreFightDialogue_1);
     sub_8087704(ZapdosEntity);
-    DisplayDungeonDialogue(&gUnknown_8101970);
+    DisplayDungeonDialogue(&gZapdosPostStoryPreFightDialogue_2);
     sub_808775C(1);
-    DisplayDungeonDialogue(&gUnknown_8101994);
+    DisplayDungeonDialogue(&gZapdosPostStoryPreFightDialogue_3);
     sub_808775C(2);
-    DisplayDungeonDialogue(&gUnknown_81019E4);
+    DisplayDungeonDialogue(&gZapdosPostStoryPreFightDialogue_4);
     sub_808775C(2);
-    DisplayDungeonDialogue(&gUnknown_8101A04);
+    DisplayDungeonDialogue(&gZapdosPostStoryPreFightDialogue_5);
     sub_803E708(10,0x46);
     SetupBossFightHP(ZapdosEntity,300,0xb);
-    sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+    ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
   }
 }
 
@@ -445,14 +445,14 @@ void sub_808775C(int param_1)
   if (2 < param_1) {
     for(iVar2 = 250; iVar2 > 199; iVar2 -= 10)
     {
-      sub_8085C54(iVar2,iVar2,iVar2 / 2,1,1);
+      SetDungeonBGColorRGB(iVar2,iVar2,iVar2 / 2,1,1);
       sub_803E46C(0x46);
     }
   }
   if (1 < param_1) {
     for(iVar2 = 250; iVar2 > 199; iVar2 -= 10)
     {
-      sub_8085C54(iVar2,iVar2,iVar2 / 2,1,1);
+      SetDungeonBGColorRGB(iVar2,iVar2,iVar2 / 2,1,1);
       sub_803E46C(0x46);
     }
   }
@@ -462,7 +462,7 @@ void sub_808775C(int param_1)
     if (iVar2 < 0) {
       iVar1 = iVar2 + 3;
     }
-    sub_8085C54(iVar2,iVar2,iVar1 >> 2,1,1);
+    SetDungeonBGColorRGB(iVar2,iVar2,iVar1 >> 2,1,1);
     sub_803E46C(0x46);
   }
   sub_8085EB0();
@@ -476,7 +476,7 @@ void sub_80877E8(void)
   struct DungeonEntity * MoltresEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  MoltresEntity = sub_8085680(9);
+  MoltresEntity = GetEntityFromClientType(9);
   sub_8083E88(0x26);
   sub_8085374();
   sub_80854D4();
@@ -497,7 +497,7 @@ void sub_8087848(void)
   s32 iVar3;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  MoltresEntity = sub_8085680(9);
+  MoltresEntity = GetEntityFromClientType(9);
   sub_8083E88(0x26);
   sub_80854D4();
   sub_8085930(DIRECTION_WEST);
@@ -511,8 +511,8 @@ void sub_8087848(void)
     sub_8086A3C(MoltresEntity);
   }
   sub_8085860(LeaderEntity->posWorld.x - 5, LeaderEntity->posWorld.y);
-  uVar4 = sub_803F994();
-  iVar3 = sub_803F9B0();
+  uVar4 = GetCameraXPos();
+  iVar3 = GetCameraYPos();
   sub_803F878(uVar4,iVar3 + -0x1000);
   CopySpeciesNametoBuffer(gUnknown_202E038,SPECIES_MOLTRES);
 }
@@ -535,29 +535,29 @@ void MoltresPreFightDialogue(void)
 
   LeaderEntity = xxx_call_GetLeaderEntity();
   PartnerEntity = GetPartnerEntity();
-  MoltresEntity = sub_8085680(9);
+  MoltresEntity = GetEntityFromClientType(9);
   sub_8087D80(0xc,5);
   sub_8086500();
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_8101A9C);
+  DisplayDungeonDialogue(&gMoltresPreFightDialogue_1);
   sub_803E708(10,0x46);
   sub_80869E4(PartnerEntity,4,1,5);
   sub_803E708(4,0x46);
   SpriteLookAroundEffect(PartnerEntity);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_8101AD4);
+  DisplayDungeonDialogue(&gMoltresPreFightDialogue_2);
   sub_803E708(10,0x46);
   sub_8087D80(0xc,5);
   sub_8087DE8(9,5);
-  DisplayDungeonDialogue(&gUnknown_8101C30);
+  DisplayDungeonDialogue(&gMoltresPreFightDialogue_3);
   sub_803E708(10,0x46);
   sub_80869E4(PartnerEntity,4,1,2);
   sub_80869E4(LeaderEntity,4,2,6);
-  DisplayDungeonDialogue(&gUnknown_8101CBC);
+  DisplayDungeonDialogue(&gMoltresPreFightDialogue_4);
   sub_803E708(10,0x46);
   sub_80869E4(PartnerEntity,4,2,6);
   sub_8086690();
-  DisplayDungeonDialogue(&gUnknown_8101D8C);
+  DisplayDungeonDialogue(&gMoltresPreFightDialogue_5);
   sub_803E708(10,0x46);
   sub_8085930(DIRECTION_NORTHWEST);
   sub_803E708(4,0x46);
@@ -565,35 +565,35 @@ void MoltresPreFightDialogue(void)
   PlaySoundEffect(0x2f2);
   sub_8083F14();
   sub_8087F24();
-  DisplayDungeonDialogue(&gUnknown_8101DA0);
+  DisplayDungeonDialogue(&gMoltresPreFightDialogue_6);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_8101E1C);
+  DisplayDungeonDialogue(&gMoltresPreFightDialogue_7);
   sub_803E708(10,0x46);
   PlaySoundEffect(0x1cf);
   sub_80856E0(PartnerEntity,4);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_8101EAC);
+  DisplayDungeonDialogue(&gMoltresPreFightDialogue_8);
   sub_803E708(10,0x46);
   sub_8087EB0();
   PlaySoundEffect(0x1da);
-  DisplayDungeonDialogue(&gUnknown_8102070);
+  DisplayDungeonDialogue(&gMoltresPreFightDialogue_9);
   sub_803E708(10,0x46);
   sub_8087D80(9,5);
   sub_8087DE8(0xb,5);
-  DisplayDungeonDialogue(&gUnknown_81020A4);
+  DisplayDungeonDialogue(&gMoltresPreFightDialogue_10);
   sub_803E708(10,0x46);
   sub_8087D80(0xc,5);
   sub_8087DE8(9,5);
   sub_8087D30(MoltresEntity);
   sub_808663C();
   sub_8087EB0();
-  DisplayDungeonDialogue(&gUnknown_81020D4);
+  DisplayDungeonDialogue(&gMoltresPreFightDialogue_11);
   sub_803E708(10,0x46);
   sub_8087DE8(0xb,6);
-  DisplayDungeonDialogue(&gUnknown_8102108);
+  DisplayDungeonDialogue(&gMoltresPreFightDialogue_12);
   sub_803E708(10,0x46);
   SetupBossFightHP(MoltresEntity,400,0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 
@@ -605,17 +605,17 @@ void MoltresReFightDialogue(void)
 
   LeaderEntity = xxx_call_GetLeaderEntity();
   PartnerEntity = GetPartnerEntity();
-  MoltresEntity = sub_8085680(9);
+  MoltresEntity = GetEntityFromClientType(9);
   sub_8087D80(10,5);
   sub_8086500();
   sub_803E708(10,0x46);
   SpriteLookAroundEffect(PartnerEntity);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_8102158);
+  DisplayDungeonDialogue(&gMoltresReFightDialogue_1);
   sub_803E708(10,0x46);
   sub_80869E4(PartnerEntity,4,1,2);
   sub_80869E4(LeaderEntity,4,2,6);
-  DisplayDungeonDialogue(&gUnknown_8102190);
+  DisplayDungeonDialogue(&gMoltresReFightDialogue_2);
   sub_803E708(10,0x46);
   sub_80869E4(PartnerEntity,4,2,6);
   sub_80869E4(LeaderEntity,4,2,6);
@@ -628,15 +628,15 @@ void MoltresReFightDialogue(void)
   sub_8087D30(MoltresEntity);
   sub_808663C();
   sub_8087EB0();
-  DisplayDungeonDialogue(&gUnknown_8102200);
+  DisplayDungeonDialogue(&gMoltresReFightDialogue_3);
   sub_803E708(10,0x46);
   sub_8087DE8(0xb,6);
-  DisplayDungeonDialogue(&gUnknown_8102254);
+  DisplayDungeonDialogue(&gMoltresReFightDialogue_4);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_81022F8);
+  DisplayDungeonDialogue(&gMoltresReFightDialogue_5);
   sub_803E708(10,0x46);
   SetupBossFightHP(MoltresEntity,400,0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 void MoltresPostStoryPreFightDialogue(void)
@@ -645,7 +645,7 @@ void MoltresPostStoryPreFightDialogue(void)
   struct DungeonEntity * MoltresEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  MoltresEntity = sub_8085680(9);
+  MoltresEntity = GetEntityFromClientType(9);
   sub_8087D80(0xc,5);
   sub_808654C();
   if (sub_8086AE4(SPECIES_MOLTRES)) {
@@ -659,22 +659,22 @@ void MoltresPostStoryPreFightDialogue(void)
     gDungeonGlobalData->unk2 = 1;
   }
   else {
-    DisplayDungeonDialogue(&gUnknown_810232C);
+    DisplayDungeonDialogue(&gMoltresPostStoryPreFightDialogue_1);
     sub_8085930(DIRECTION_NORTHWEST);
     sub_803E708(4,0x46);
     sub_8085930(DIRECTION_NORTH);
     sub_8087D30(MoltresEntity);
-    DisplayDungeonDialogue(&gUnknown_8102398);
+    DisplayDungeonDialogue(&gMoltresPostStoryPreFightDialogue_2);
     sub_8087D80(0xc,5);
     sub_8087DE8(9,5);
-    DisplayDungeonDialogue(&gUnknown_81023C4);
+    DisplayDungeonDialogue(&gMoltresPostStoryPreFightDialogue_3);
     sub_8087EB0();
-    DisplayDungeonDialogue(&gUnknown_8102400);
+    DisplayDungeonDialogue(&gMoltresPostStoryPreFightDialogue_4);
     sub_8087DE8(0xb,6);
-    DisplayDungeonDialogue(&gUnknown_8102454);
+    DisplayDungeonDialogue(&gMoltresPostStoryPreFightDialogue_5);
     sub_803E708(10,0x46);
     SetupBossFightHP(MoltresEntity,400,0xb);
-    sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+    ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
   }
 }
 
@@ -810,7 +810,7 @@ void sub_8087DE8(s32 r0, s32 r1)
 	"\tmovs r1, 0\n"
 	"\tmovs r2, 0\n"
 	"\tmovs r3, 0x1\n"
-	"\tbl sub_8085C54\n"
+	"\tbl SetDungeonBGColorRGB\n"
 	"\tmovs r0, 0x46\n"
 	"\tbl sub_803E46C\n"
 	"\tsubs r4, 0xA\n"
@@ -827,7 +827,7 @@ void sub_8087DE8(s32 r0, s32 r1)
 	"\tmovs r1, 0\n"
 	"\tmovs r2, 0\n"
 	"\tmovs r3, 0x1\n"
-	"\tbl sub_8085C54\n"
+	"\tbl SetDungeonBGColorRGB\n"
 	"\tmovs r0, 0x46\n"
 	"\tbl sub_803E46C\n"
 	"\tsubs r4, 0xA\n"
@@ -856,14 +856,14 @@ void sub_8087EB0(void)
   iVar1 = 0xfa;
   for(iVar1 = 250; iVar1 > 9; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,iVar1 / 2,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1 / 2,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(0x1e,0x46);
   PlaySoundEffect(0x1ed);
   for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,iVar1 / 2,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1 / 2,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(0x1e,0x46);
@@ -876,7 +876,7 @@ void sub_8087F24(void)
 
   for(iVar1 = 0; iVar1 >= -80; iVar1 -= 8)
   {
-    sub_8085C54(iVar1,iVar1,iVar1,0,0);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,0,0);
     sub_803E46C(0x46);
   }
 }
@@ -888,7 +888,7 @@ void sub_8087F54(void)
   struct DungeonEntity *ArticunoEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  ArticunoEntity = sub_8085680(0xd);
+  ArticunoEntity = GetEntityFromClientType(0xd);
   sub_8083E88(0x72);
   sub_8085374();
   sub_80854D4();
@@ -904,7 +904,7 @@ void sub_8087FB4(void)
 {
   struct DungeonEntity  *ArticunoEntity;
 
-  ArticunoEntity = sub_8085680(0xd);
+  ArticunoEntity = GetEntityFromClientType(0xd);
   sub_8083E88(0x72);
   sub_8085374();
   sub_80854D4();
@@ -920,7 +920,7 @@ void sub_8087FF8(void)
   struct DungeonEntity *ArticunoEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  ArticunoEntity = sub_8085680(0xd);
+  ArticunoEntity = GetEntityFromClientType(0xd);
   sub_8085374();
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -955,18 +955,18 @@ void ArticunoPreFightDialogue(void)
 
   LeaderEntity = xxx_call_GetLeaderEntity();
   PartnerEntity = GetPartnerEntity();
-  ArticunoEntity = sub_8085680(0xd);
+  ArticunoEntity = GetEntityFromClientType(0xd);
   sub_8086448();
   SpriteLookAroundEffect(PartnerEntity);
-  DisplayDungeonDialogue(&gUnknown_8102478);
+  DisplayDungeonDialogue(&gArticunoPreFightDialogue_1);
   sub_803E708(10,0x46);
   sub_8086598();
   sub_8083F14();
-  DisplayDungeonDialogue(&gUnknown_81025B4);
+  DisplayDungeonDialogue(&gArticunoPreFightDialogue_2);
   sub_803E708(10,0x46);
   sub_80869E4(PartnerEntity,4,1,2);
   sub_80869E4(LeaderEntity,4,2,6);
-  DisplayDungeonDialogue(&gUnknown_81025D4);
+  DisplayDungeonDialogue(&gArticunoPreFightDialogue_3);
   sub_803E708(10,0x46);
   SetFacingDirection(LeaderEntity, DIRECTION_WEST);
   sub_803E708(4,0x46);
@@ -982,9 +982,9 @@ void ArticunoPreFightDialogue(void)
   sub_803E708(4,0x46);
   SetFacingDirection(LeaderEntity, DIRECTION_WEST);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_8102610);
+  DisplayDungeonDialogue(&gArticunoPreFightDialogue_4);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_81026C4);
+  DisplayDungeonDialogue(&gArticunoPreFightDialogue_5);
   sub_803E708(10,0x46);
   sub_80869E4(LeaderEntity,4,1,4);
   sub_80869E4(PartnerEntity,4,2,4);
@@ -992,37 +992,37 @@ void ArticunoPreFightDialogue(void)
   SpriteLookAroundEffect(PartnerEntity);
   PlaySoundEffect(0x1d5);
   SpriteLookAroundEffect(LeaderEntity);
-  DisplayDungeonDialogue(&gUnknown_810270C);
+  DisplayDungeonDialogue(&gArticunoPreFightDialogue_6);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_810272C);
+  DisplayDungeonDialogue(&gArticunoPreFightDialogue_7);
   sub_803E708(10,0x46);
   PlaySoundEffect(0); // snow flurry
   gDungeonGlobalData->unkE265 = WEATHER_SNOW;
   sub_807EAA0(0,1);
   PlaySoundEffect(0x1ee); // flash effect?
   sub_8088574();
-  DisplayDungeonDialogue(&gUnknown_81027BC);
+  DisplayDungeonDialogue(&gArticunoPreFightDialogue_8);
   sub_803E708(10,0x46);
   ArticunoScreenFlash();
   sub_8086738();
   PlaySoundEffect(0x1da);
-  DisplayDungeonDialogue(&gUnknown_8102810);
+  DisplayDungeonDialogue(&gArticunoPreFightDialogue_9);
   sub_803E708(10,0x46);
   PlaySoundEffect(0x1ea);
   sub_8088484(ArticunoEntity);
   sub_80865E8();
   ArticunoScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8102840);
+  DisplayDungeonDialogue(&gArticunoPreFightDialogue_10);
   sub_806CDD4(ArticunoEntity,0xf,DIRECTION_SOUTH);
   ArticunoScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_810286C);
+  DisplayDungeonDialogue(&gArticunoPreFightDialogue_11);
   sub_806CDD4(ArticunoEntity,0x10,DIRECTION_SOUTH);
   ArticunoScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_81028B8);
+  DisplayDungeonDialogue(&gArticunoPreFightDialogue_12);
   sub_806CDD4(ArticunoEntity,0xf,DIRECTION_SOUTH);
   sub_803E708(0x10,0x46);
   SetupBossFightHP(ArticunoEntity,0x1c2,0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 void ArticunoReFightDialogue(void)
@@ -1031,20 +1031,20 @@ void ArticunoReFightDialogue(void)
   struct DungeonEntity *ArticunoEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  ArticunoEntity = sub_8085680(0xd);
+  ArticunoEntity = GetEntityFromClientType(0xd);
   gDungeonGlobalData->unkE265 = WEATHER_SNOW;
   sub_807EAA0(0,1);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_81028D4);
+  DisplayDungeonDialogue(&gArticunoReFightDialogue_1);
   sub_806CDD4(ArticunoEntity,0x10,DIRECTION_SOUTH);
   ArticunoScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8102918);
+  DisplayDungeonDialogue(&gArticunoReFightDialogue_2);
   ArticunoScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8102948);
+  DisplayDungeonDialogue(&gArticunoReFightDialogue_3);
   sub_806CDD4(ArticunoEntity,0xf,DIRECTION_SOUTH);
   sub_803E708(0x28,0x46);
   SetupBossFightHP(ArticunoEntity,0x1c2,0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 void ArticunoPostStoryPreFightDialogue(void)
@@ -1053,7 +1053,7 @@ void ArticunoPostStoryPreFightDialogue(void)
   struct DungeonEntity *ArticunoEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  ArticunoEntity = sub_8085680(0xd);
+  ArticunoEntity = GetEntityFromClientType(0xd);
   sub_8086448();
   if (sub_8086AE4(SPECIES_ARTICUNO)) {
     sub_80866C4(&gUnknown_8102A9C);
@@ -1064,23 +1064,23 @@ void ArticunoPostStoryPreFightDialogue(void)
     ArticunoScreenFlash();
     sub_8086738();
     PlaySoundEffect(0x1da);
-    DisplayDungeonDialogue(&gUnknown_8102984);
+    DisplayDungeonDialogue(&gArticunoPostStoryPreFightDialogue_1);
     sub_803E708(10,0x46);
     sub_8088484(ArticunoEntity);
     ArticunoScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_81029B4);
+    DisplayDungeonDialogue(&gArticunoPostStoryPreFightDialogue_2);
     sub_806CDD4(ArticunoEntity,0xf,DIRECTION_SOUTH);
     ArticunoScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_8102A18);
+    DisplayDungeonDialogue(&gArticunoPostStoryPreFightDialogue_3);
     sub_806CDD4(ArticunoEntity,0x10,DIRECTION_SOUTH);
     ArticunoScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_8102A24);
+    DisplayDungeonDialogue(&gArticunoPostStoryPreFightDialogue_4);
     ArticunoScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_8102A74);
+    DisplayDungeonDialogue(&gArticunoPostStoryPreFightDialogue_5);
     sub_806CDD4(ArticunoEntity,0xf,DIRECTION_SOUTH);
     sub_803E708(0x28,0x46);
     SetupBossFightHP(ArticunoEntity,0x1c2,0xb);
-    sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+    ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
   }
 }
 
@@ -1094,7 +1094,7 @@ void sub_8088484(struct DungeonEntity *param_1)
   for(iVar1 = 250; iVar1 >= 0; iVar1 -= 5)
   {
     param_1->entityData->unk174 = iVar1 * 256;
-    sub_8085C54(iVar1,iVar1,iVar1 / 2,1,0);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1 / 2,1,0);
     sub_803E46C(0x46);
   }
 }
@@ -1106,19 +1106,19 @@ void ArticunoScreenFlash(void)
   PlaySoundEffect(0x2ad);
   for(iVar1 = 250; iVar1 > 0x95; iVar1 -= 10)
   {
-    sub_8085C54(iVar1 / 2,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(iVar1 / 2,iVar1,iVar1,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(4,0x46);
   for(iVar1 = 250; iVar1 > 199; iVar1 -= 10)
   {
-    sub_8085C54(0,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(0,iVar1,iVar1,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(4,0x46);
   for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10)
   {
-    sub_8085C54(iVar1 / 2,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(iVar1 / 2,iVar1,iVar1,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(4,0x46);
@@ -1131,7 +1131,7 @@ void sub_8088574(void)
 
   for(iVar1 = 0; iVar1 <= 80; iVar1 += 8)
   {
-    sub_8085C54(iVar1,iVar1,iVar1,0,0);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,0,0);
     sub_803E46C(0x46);
   }
 }
@@ -1179,8 +1179,8 @@ void sub_808862C(void)
   struct DungeonEntity * GroudonEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  AlakazamEntity = sub_8085680(10);
-  GroudonEntity = sub_8085680(0xe);
+  AlakazamEntity = GetEntityFromClientType(10);
+  GroudonEntity = GetEntityFromClientType(0xe);
   sub_8083E88(0x72);
   sub_80867F4();
   sub_8085374();
@@ -1206,8 +1206,8 @@ void sub_80886C4(void)
   s32 iVar2;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  AlakazamEntity = sub_8085680(10);
-  GroudonEntity = sub_8085680(0xe);
+  AlakazamEntity = GetEntityFromClientType(10);
+  GroudonEntity = GetEntityFromClientType(0xe);
   PlaySoundEffect(0x3e5);
   sub_80867F4();
   sub_8085374();
@@ -1217,8 +1217,8 @@ void sub_80886C4(void)
   SetFacingDirection(GroudonEntity, DIRECTION_SOUTH);
   sub_8086A3C(GroudonEntity);
   sub_8085860(LeaderEntity->posWorld.x,LeaderEntity->posWorld.y);
-  uVar4 = sub_803F994();
-  iVar2 = sub_803F9B0();
+  uVar4 = GetCameraXPos();
+  iVar2 = GetCameraYPos();
   sub_803F878(uVar4,iVar2 + -0x1000);
   CopySpeciesNametoBuffer(gUnknown_202E038, SPECIES_GROUDON);
   CopySpeciesNametoBuffer(gUnknown_202E038 + 0x50, SPECIES_ALAKAZAM);
@@ -1231,8 +1231,8 @@ void sub_808875C(void)
   struct DungeonEntity * GroudonEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  AlakazamEntity = sub_8085680(10);
-  GroudonEntity = sub_8085680(0xe);
+  AlakazamEntity = GetEntityFromClientType(10);
+  GroudonEntity = GetEntityFromClientType(0xe);
   sub_80867F4();
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -1273,34 +1273,34 @@ void GroudonPreFightDialogue(void)
 
   LeaderEntity = xxx_call_GetLeaderEntity();
   PartnerEntity = GetPartnerEntity();
-  AlakazamEntity = sub_8085680(10);
-  GroudonEntity = sub_8085680(0xe);
+  AlakazamEntity = GetEntityFromClientType(10);
+  GroudonEntity = GetEntityFromClientType(0xe);
   sub_8086448();
-  DisplayDungeonDialogue(&gUnknown_8102E70);
+  DisplayDungeonDialogue(&GroudonPreFightDialogue_1);
   sub_803E708(10,0x46);
   sub_803E708(0x3c,0x46);
-  DisplayDungeonDialogue(&gUnknown_8102EBC);
+  DisplayDungeonDialogue(&GroudonPreFightDialogue_2);
   sub_803E708(10,0x46);
   sub_8086838(1,1,1);
   sub_808680C();
   sub_803E708(0x3c,0x46);
   sub_808682C();
   sub_803E708(0x1e,0x46);
-  DisplayDungeonDialogue(&gUnknown_8102EE0);
+  DisplayDungeonDialogue(&GroudonPreFightDialogue_3);
   sub_803E708(10,0x46);
   sub_8086838(1,1,1);
   sub_808680C();
   sub_803E708(0x3c,0x46);
-  DisplayDungeonDialogue(&gUnknown_8102EF8);
+  DisplayDungeonDialogue(&GroudonPreFightDialogue_4);
   sub_803E708(10,0x46);
   GroudonScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8102F30);
+  DisplayDungeonDialogue(&GroudonPreFightDialogue_5);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_8102F64);
+  DisplayDungeonDialogue(&GroudonPreFightDialogue_6);
   sub_803E708(10,0x46);
   PlaySoundEffect(0x1d5);
   SpriteLookAroundEffect(PartnerEntity);
-  DisplayDungeonDialogue(&gUnknown_8102F84);
+  DisplayDungeonDialogue(&GroudonPreFightDialogue_7);
   sub_803E708(10,0x46);
   sub_808682C();
   sub_803E708(0x3c,0x46);
@@ -1308,28 +1308,28 @@ void GroudonPreFightDialogue(void)
   PlaySoundEffect(0x205);
   sub_8086738();
   sub_8068FE0(AlakazamEntity,0x21c,0);
-  DisplayDungeonDialogue(&gUnknown_8102FAC);
+  DisplayDungeonDialogue(&GroudonPreFightDialogue_8);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_8102FC4);
+  DisplayDungeonDialogue(&GroudonPreFightDialogue_9);
   sub_803E708(10,0x46);
   sub_8085930(DIRECTION_NORTH);
   sub_8086764();
   sub_803E708(0x28,0x46);
   PlaySoundEffect(0x1d5);
   SpriteLookAroundEffect(PartnerEntity);
-  DisplayDungeonDialogue(&gUnknown_8102FD8);
+  DisplayDungeonDialogue(&GroudonPreFightDialogue_10);
   sub_803E708(10,0x46);
   sub_8086838(1,1,1);
   sub_808680C();
   sub_803E708(0x3c,0x46);
-  DisplayDungeonDialogue(&gUnknown_8103054);
+  DisplayDungeonDialogue(&GroudonPreFightDialogue_11);
   sub_803E708(10,0x46);
   sub_8083F14();
   GroudonScreenFlash2();
   sub_803E708(0x1e,0x46);
-  DisplayDungeonDialogue(&gUnknown_81030D8);
+  DisplayDungeonDialogue(&GroudonPreFightDialogue_12);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_8103110);
+  DisplayDungeonDialogue(&GroudonPreFightDialogue_13);
   sub_803E708(10,0x46);
   sub_803E708(0x1e,0x46);
   sub_808682C();
@@ -1337,13 +1337,13 @@ void GroudonPreFightDialogue(void)
   PlaySoundEffect(0x1fa);
   sub_8086738();
   sub_8085930(DIRECTION_NORTH);
-  DisplayDungeonDialogue(&gUnknown_8103140);
+  DisplayDungeonDialogue(&GroudonPreFightDialogue_14);
   sub_803E708(10,0x46);
   sub_8086A54(GroudonEntity);
   sub_8085930(DIRECTION_NORTH);
   sub_8086764();
   SetupBossFightHP(GroudonEntity,500,0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 void GroudonReFightDialogue(void)
@@ -1352,30 +1352,30 @@ void GroudonReFightDialogue(void)
   struct DungeonEntity * GroudonEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  GroudonEntity = sub_8085680(0xe);
+  GroudonEntity = GetEntityFromClientType(0xe);
   sub_8086838(1,1,1);
   sub_808680C();
   sub_803E708(0x3c,0x46);
-  DisplayDungeonDialogue(&gUnknown_8103188);
+  DisplayDungeonDialogue(&gGroudonReFightDialogue_1);
   sub_803E708(10,0x46);
   GroudonScreenFlash();
   sub_803E708(0x1e,0x46);
-  DisplayDungeonDialogue(&gUnknown_8103228);
+  DisplayDungeonDialogue(&gGroudonReFightDialogue_2);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_8103310);
+  DisplayDungeonDialogue(&gGroudonReFightDialogue_3);
   sub_803E708(10,0x46);
   sub_808682C();
   sub_803E708(0x3c,0x46);
   sub_8083F14();
   PlaySoundEffect(0x1fa);
   sub_8086738();
-  DisplayDungeonDialogue(&gUnknown_8103340);
+  DisplayDungeonDialogue(&gGroudonReFightDialogue_4);
   sub_803E708(10,0x46);
   sub_8086A54(GroudonEntity);
   sub_8085930(DIRECTION_NORTH);
   sub_8086764();
   SetupBossFightHP(GroudonEntity,500,0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 void GroudonPostStoryPreFightDialogue(void)
@@ -1384,26 +1384,26 @@ void GroudonPostStoryPreFightDialogue(void)
   struct DungeonEntity * GroudonEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  GroudonEntity = sub_8085680(0xe);
+  GroudonEntity = GetEntityFromClientType(0xe);
   sub_8086448();
   if (sub_8086AE4(SPECIES_GROUDON)) {
       sub_80866C4(&gUnknown_8103488);
   }
   else{
-    DisplayDungeonDialogue(&gUnknown_81033A0);
+    DisplayDungeonDialogue(&gGroudonPostStoryPreFightDialogue_1);
     sub_803E708(10,0x46);
     SceneGroudonMovement(GroudonEntity);
     SceneGroudonMovement(GroudonEntity);
-    DisplayDungeonDialogue(&gUnknown_81033AC);
+    DisplayDungeonDialogue(&gGroudonPostStoryPreFightDialogue_2);
     PlaySoundEffect(0x1f6);
     GroudonScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_810343C);
+    DisplayDungeonDialogue(&gGroudonPostStoryPreFightDialogue_3);
     PlaySoundEffect(0x1f6);
     GroudonScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_810347C);
+    DisplayDungeonDialogue(&gGroudonPostStoryPreFightDialogue_4);
     sub_803E708(10,0x46);
     SetupBossFightHP(GroudonEntity,500,0xb);
-    sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+    ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
   }
 }
 
@@ -1440,21 +1440,21 @@ void GroudonScreenFlash(void)
 
   for(iVar1 = 250; iVar1 > 0x95; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1 / 2,iVar1 / 2,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1 / 2,iVar1 / 2,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
 
   for(iVar1 = 250; iVar1 > 199; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1 / 2,0,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1 / 2,0,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
 
   for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1 / 2,iVar1 / 2,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1 / 2,iVar1 / 2,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
@@ -1467,21 +1467,21 @@ void GroudonScreenFlash2(void)
 
   for(iVar1 = 250; iVar1 > 0x95; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1 / 2,iVar1 / 2,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1 / 2,iVar1 / 2,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
 
   for(iVar1 = 250; iVar1 > 199; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1 / 2,0,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1 / 2,0,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
 
   for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1 / 2,iVar1 / 2,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1 / 2,iVar1 / 2,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
@@ -1496,8 +1496,8 @@ void sub_8088DC0(void)
   struct DungeonEntity * uVar3;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  uVar2 = sub_8085680(0xb);
-  uVar3 = sub_8085680(0xc);
+  uVar2 = GetEntityFromClientType(0xb);
+  uVar3 = GetEntityFromClientType(0xc);
   sub_80867F4();
   sub_8086838(0,1,0);
   sub_8085374();
@@ -1520,8 +1520,8 @@ void sub_8088E5C(void)
   struct DungeonEntity * uVar3;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  uVar2 = sub_8085680(0xb);
-  uVar3 = sub_8085680(0xc);
+  uVar2 = GetEntityFromClientType(0xb);
+  uVar3 = GetEntityFromClientType(0xc);
   sub_80867F4();
   sub_8086838(0,1,0);
   sub_80854D4();
@@ -1547,18 +1547,18 @@ void MagmaCavernMidDialogue(void)
   struct DungeonEntity * iVar3;
   struct DungeonEntity * iVar4;
   u8 auStack36 [4];
-  s32 local_20[2];
+  struct Position32 local_20;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
   PartnerEntity = GetPartnerEntity();
-  iVar3 = sub_8085680(0xb);
-  iVar4 = sub_8085680(0xc);
+  iVar3 = GetEntityFromClientType(0xb);
+  iVar4 = GetEntityFromClientType(0xc);
   sub_8052D44(auStack36,LeaderEntity,PartnerEntity);
   sub_8086448();
   SpriteLookAroundEffect(PartnerEntity);
   // Let's see..
   // I wonder where we are?
-  DisplayDungeonDialogue(&gUnknown_8102B1C);
+  DisplayDungeonDialogue(&MagmaCavernMidDialogue_1);
   sub_803E708(10,0x46);
   sub_80869E4(PartnerEntity,4,1,2);
   sub_80869E4(LeaderEntity,4,2,6);
@@ -1567,7 +1567,7 @@ void MagmaCavernMidDialogue(void)
   //
   // I'm certain we've come quite
   // far already..
-  DisplayDungeonDialogue(&gUnknown_8102B54);
+  DisplayDungeonDialogue(&MagmaCavernMidDialogue_2);
   sub_803E708(10,0x46);
   sub_8083F14();
   sub_80855E4(sub_80868F4);
@@ -1576,7 +1576,7 @@ void MagmaCavernMidDialogue(void)
   sub_803E708(0x28,0x46);
   // Waaah!
   // Qu-quake!
-  DisplayDungeonDialogue(&gUnknown_8102BC4);
+  DisplayDungeonDialogue(&MagmaCavernMidDialogue_3);
   sub_803E708(0x78,0x46);
   sub_8083E58(0x1c5);
   sub_808682C();
@@ -1589,7 +1589,7 @@ void MagmaCavernMidDialogue(void)
   //
   // Whew
   // It's over.
-  DisplayDungeonDialogue(&gUnknown_8102BE4);
+  DisplayDungeonDialogue(&MagmaCavernMidDialogue_4);
   sub_803E708(10,0x46);
   PlaySoundEffect(0x1d5);
   SpriteLookAroundEffect(PartnerEntity);
@@ -1597,12 +1597,12 @@ void MagmaCavernMidDialogue(void)
   sub_80856E0(PartnerEntity,4);
   // Hey! {ARG_POKEMON_0}!
   // Over there!
-  DisplayDungeonDialogue(&gUnknown_8102C30);
+  DisplayDungeonDialogue(&MagmaCavernMidDialogue_5);
   iVar3->entityData->unk15E = 0;
   iVar4->entityData->unk15E =0;
-  local_20[0] = (iVar3->posPixel.x + iVar4->posPixel.x) / 2;
-  local_20[1] = (iVar3->posPixel.y + iVar4->posPixel.y) / 2 + 0x800;
-  sub_80858AC(local_20,0x20);
+  local_20.x = (iVar3->posPixel.x + iVar4->posPixel.x) / 2;
+  local_20.y = (iVar3->posPixel.y + iVar4->posPixel.y) / 2 + 0x800;
+  ShiftCameraToPosition(&local_20,0x20);
   sub_803E708(0x3c,0x46);
   sub_80891F0();
   // Hey!
@@ -1610,29 +1610,29 @@ void MagmaCavernMidDialogue(void)
   //
   // Hey!
   // Snap out of it!
-  DisplayDungeonDialogue(&gUnknown_8102C54);
+  DisplayDungeonDialogue(&MagmaCavernMidDialogue_6);
   sub_803E708(10,0x46);
   // Urrrrgh...
-  DisplayDungeonDialogue(&gUnknown_8102C98);
+  DisplayDungeonDialogue(&MagmaCavernMidDialogue_7);
   sub_803E708(10,0x46);
   sub_80869E4(LeaderEntity,4,2,5);
   // What happened to you?
   //
   // What happened here?
-  DisplayDungeonDialogue(&gUnknown_8102CB0);
+  DisplayDungeonDialogue(&MagmaCavernMidDialogue_8);
   sub_803E708(10,0x46);
   // We challenged..
   // {ARG_POKEMON_2}...
   // And wiped out..
-  DisplayDungeonDialogue(&gUnknown_8102CF8);
+  DisplayDungeonDialogue(&MagmaCavernMidDialogue_9);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_8102D34);
+  DisplayDungeonDialogue(&MagmaCavernMidDialogue_10);
   sub_803E708(10,0x46);
   sub_80869E4(LeaderEntity,4,1,3);
   sub_80869E4(PartnerEntity,4,1,3);
   // Grrgh..
   // We... It crushed us
-  DisplayDungeonDialogue(&gUnknown_8102D4C);
+  DisplayDungeonDialogue(&MagmaCavernMidDialogue_11);
   sub_803E708(10,0x46);
   PlaySoundEffect(0x1d5);
   SpriteLookAroundEffect(PartnerEntity);
@@ -1643,20 +1643,20 @@ void MagmaCavernMidDialogue(void)
   // Wait...
   // What about {ARG_POKEMON_3}?
   // Where did {ARG_POKEMON_3} go?
-  DisplayDungeonDialogue(&gUnknown_8102D7C);
+  DisplayDungeonDialogue(&MagmaCavernMidDialogue_12);
   sub_803E708(0x1e,0x46);
   // {ARG_POKEMON_3} is...
   // Still battling {ARG_POKEMON_2}...
-  DisplayDungeonDialogue(&gUnknown_8102DFC);
+  DisplayDungeonDialogue(&MagmaCavernMidDialogue_13);
   sub_803E708(10,0x46);
   sub_80869E4(PartnerEntity,4,1,2);
   sub_80869E4(LeaderEntity,4,2,6);
   // {ARG_POKEMON_0}!
   // We've got to hurry!
-  DisplayDungeonDialogue(&gUnknown_8102E2C);
+  DisplayDungeonDialogue(&MagmaCavernMidDialogue_14);
   sub_8089294();
   // Be careful!
-  DisplayDungeonDialogue(&gUnknown_8102E54);
+  DisplayDungeonDialogue(&MagmaCavernMidDialogue_15);
   sub_803E708(10,0x46);
   gDungeonGlobalData->unk2 = 1;
 }
@@ -1670,7 +1670,7 @@ void sub_8089168(void)
   sub_803E708(10,0x46);
   SpriteLookAroundEffect(LeaderEntity);
   sub_803E708(10,0x46);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 void sub_808919C(struct DungeonEntity *r0)
@@ -1765,7 +1765,7 @@ void sub_80892C8(void)
   struct DungeonEntity * RayquazaEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  RayquazaEntity = sub_8085680(0xf);
+  RayquazaEntity = GetEntityFromClientType(0xf);
   sub_8083E88(0x1a);
   sub_8085374();
   sub_80854D4();
@@ -1783,7 +1783,7 @@ void sub_8089328(void)
   struct DungeonEntity * RayquazaEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  RayquazaEntity = sub_8085680(0xf);
+  RayquazaEntity = GetEntityFromClientType(0xf);
   sub_8083E88(0x1a);
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -1815,37 +1815,37 @@ void RayquazaPreFightDialogue(void)
 
   LeaderEntity = xxx_call_GetLeaderEntity();
   PartnerEntity = GetPartnerEntity();
-  RayquazaEntity = sub_8085680(0xf);
+  RayquazaEntity = GetEntityFromClientType(0xf);
   sub_8086448();
-  DisplayDungeonDialogue(&gUnknown_8103500);
+  DisplayDungeonDialogue(&gRayquazaPreFightDialogue_1);
   RayquazaScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_810352C);
+  DisplayDungeonDialogue(&gRayquazaPreFightDialogue_2);
   sub_80856E0(PartnerEntity,4);
   SpriteLookAroundEffect(PartnerEntity);
   sub_803E708(10,0x46);
   sub_80869E4(PartnerEntity,4,1,2);
   sub_80869E4(LeaderEntity,4,2,6);
-  DisplayDungeonDialogue(&gUnknown_8103578);
+  DisplayDungeonDialogue(&gRayquazaPreFightDialogue_3);
   sub_80869E4(PartnerEntity,4,2,4);
   sub_80869E4(LeaderEntity,4,1,4);
-  DisplayDungeonDialogue(&gUnknown_81035D4);
+  DisplayDungeonDialogue(&gRayquazaPreFightDialogue_4);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_8103618);
+  DisplayDungeonDialogue(&gRayquazaPreFightDialogue_5);
   sub_803E708(10,0x46);
-  DisplayDungeonDialogue(&gUnknown_810367C);
+  DisplayDungeonDialogue(&gRayquazaPreFightDialogue_6);
   RayquazaScreenFlash();
   PlaySoundEffect(0x1da); // Rayquaza Cry
-  DisplayDungeonDialogue(&gUnknown_8103690);
+  DisplayDungeonDialogue(&gRayquazaPreFightDialogue_7);
   sub_8089620(RayquazaEntity);
-  DisplayDungeonDialogue(&gUnknown_81036C8);
+  DisplayDungeonDialogue(&gRayquazaPreFightDialogue_8);
   RayquazaScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_81037A0);
+  DisplayDungeonDialogue(&gRayquazaPreFightDialogue_9);
   RayquazaScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_81037D4);
+  DisplayDungeonDialogue(&gRayquazaPreFightDialogue_10);
   RayquazaScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8103820);
+  DisplayDungeonDialogue(&gRayquazaPreFightDialogue_11);
   SetupBossFightHP(RayquazaEntity,600,0x20);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 void RayquazaReFightDialogue(void)
@@ -1854,22 +1854,22 @@ void RayquazaReFightDialogue(void)
   struct DungeonEntity *RayquazaEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  RayquazaEntity = sub_8085680(0xf);
+  RayquazaEntity = GetEntityFromClientType(0xf);
   sub_8086448();
   RayquazaScreenFlash();
   PlaySoundEffect(0x1da); // Rayquaza Cry
-  DisplayDungeonDialogue(&gUnknown_8103690);
+  DisplayDungeonDialogue(&gRayquazaPreFightDialogue_7);
   sub_803E708(10,0x46);
   sub_8089620(RayquazaEntity);
-  DisplayDungeonDialogue(&gUnknown_8103844);
+  DisplayDungeonDialogue(&gRayquazaReFightDialogue_1);
   RayquazaScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8103874);
+  DisplayDungeonDialogue(&gRayquazaReFightDialogue_2);
   RayquazaScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_81038A8);
+  DisplayDungeonDialogue(&gRayquazaReFightDialogue_3);
   RayquazaScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_81038F8);
+  DisplayDungeonDialogue(&gRayquazaReFightDialogue_4);
   SetupBossFightHP(RayquazaEntity,600,0x20);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 void RayquazaPostStoryPreFightDialogue(void)
@@ -1878,24 +1878,24 @@ void RayquazaPostStoryPreFightDialogue(void)
   struct DungeonEntity *RayquazaEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  RayquazaEntity = sub_8085680(0xf);
+  RayquazaEntity = GetEntityFromClientType(0xf);
   sub_8086448();
   if (sub_8086AE4(SPECIES_RAYQUAZA)) {
-    sub_80866C4(&gUnknown_8103B58);
+    sub_80866C4(&gRayquazaPostStoryPreFightDialogue_6);
   }
   else {
     PlaySoundEffect(0x1da); // Rayquaza Cry
-    DisplayDungeonDialogue(&gUnknown_8103904);
+    DisplayDungeonDialogue(&gRayquazaPostStoryPreFightDialogue_1);
     sub_8089620(RayquazaEntity);
-    DisplayDungeonDialogue(&gUnknown_8103938);
+    DisplayDungeonDialogue(&gRayquazaPostStoryPreFightDialogue_2);
     RayquazaScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_8103AA4);
+    DisplayDungeonDialogue(&gRayquazaPostStoryPreFightDialogue_3);
     RayquazaScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_8103AE4);
+    DisplayDungeonDialogue(&gRayquazaPostStoryPreFightDialogue_4);
     RayquazaScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_8103B30);
+    DisplayDungeonDialogue(&gRayquazaPostStoryPreFightDialogue_5);
     SetupBossFightHP(RayquazaEntity,600,0xb);
-    sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+    ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
   }
 }
 
@@ -1928,19 +1928,19 @@ void RayquazaScreenFlash(void)
   PlaySoundEffect(0x1f6);
   for(iVar1 = 250; iVar1 > 149; iVar1 -= 10)
   {
-    sub_8085C54(iVar1 / 2, iVar1, iVar1 / 2, 1, 1);
+    SetDungeonBGColorRGB(iVar1 / 2, iVar1, iVar1 / 2, 1, 1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
   for(iVar1 = 250; iVar1 > 199; iVar1 -= 10)
   {
-    sub_8085C54(iVar1 / 2, iVar1, 0, 1, 1);
+    SetDungeonBGColorRGB(iVar1 / 2, iVar1, 0, 1, 1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
   for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10)
   {
-    sub_8085C54(iVar1 / 2, iVar1, iVar1 / 2, 1, 1);
+    SetDungeonBGColorRGB(iVar1 / 2, iVar1, iVar1 / 2, 1, 1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
@@ -2029,7 +2029,7 @@ void sub_80897F0(void)
   // Get 'em! It's frenzy time!
   DisplayDungeonDialogue(&gUnknown_8103D50);
   sub_803E708(10,0x46);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 
@@ -2049,7 +2049,7 @@ void sub_8089878(void)
   DisplayDungeonDialogue(&gUnknown_8103DD8);
   DisplayDungeonDialogue(&gUnknown_8103E28);
   sub_803E708(10,0x46);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 void sub_80898E4(void)
@@ -2074,7 +2074,7 @@ void sub_8089914(void)
   struct DungeonEntity *MewtwoEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  MewtwoEntity = sub_8085680(0x11);
+  MewtwoEntity = GetEntityFromClientType(0x11);
   sub_8083F14();
   gDungeonGlobalData->unk7 = 1;
   sub_80854D4();
@@ -2092,7 +2092,7 @@ void sub_8089978(void)
   struct DungeonEntity *MewtwoEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  MewtwoEntity = sub_8085680(0x11);
+  MewtwoEntity = GetEntityFromClientType(0x11);
   sub_8083F14();
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -2124,51 +2124,51 @@ void MewtwoPreFightDialogue(void)
   struct DungeonEntity *MewtwoEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  MewtwoEntity = sub_8085680(0x11);
+  MewtwoEntity = GetEntityFromClientType(0x11);
   sub_8086448();
-  DisplayDungeonDialogue(&gUnknown_8103EA4);
+  DisplayDungeonDialogue(&gMewtwoPreFightDialogue_1);
   sub_803E708(10,0x46);
   sub_8083E88(0x23);
   sub_8086794();
   sub_803E708(0x1e,0x46);
   sub_8089B64(MewtwoEntity);
   sub_803E708(0x3c,0x46);
-  DisplayDungeonDialogue(&gUnknown_8103F0C);
-  DisplayDungeonDialogue(&gUnknown_8103F4C);
+  DisplayDungeonDialogue(&gMewtwoPreFightDialogue_2);
+  DisplayDungeonDialogue(&gMewtwoPreFightDialogue_3);
   sub_803E708(10,0x46);
   MewtwoScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8103FCC);
+  DisplayDungeonDialogue(&gMewtwoPreFightDialogue_4);
   MewtwoScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8104008);
+  DisplayDungeonDialogue(&gMewtwoPreFightDialogue_5);
   sub_803E708(10,0x46);
   SetupBossFightHP(MewtwoEntity,900,0x20);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
-void MewtwoPreFightDialogue1(void)
+void MewtwoReFightDialogue(void)
 {
   struct DungeonEntity *LeaderEntity;
   struct DungeonEntity *MewtwoEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  MewtwoEntity = sub_8085680(0x11);
+  MewtwoEntity = GetEntityFromClientType(0x11);
   sub_8086448();
   if(HasRecruitedMon(SPECIES_MEWTWO)) {
-    sub_80866C4(&gUnknown_8104144);
+    sub_80866C4(&gMewtwoReFightDialogue_5);
   }
   else {
-    DisplayDungeonDialogue(&gUnknown_8104044);
+    DisplayDungeonDialogue(&gMewtwoReFightDialogue_1);
     sub_8083E88(0x23);
     sub_8086794();
     sub_8089B64(MewtwoEntity);
     sub_803E708(0x3c,0x46);
-    DisplayDungeonDialogue(&gUnknown_8104050);
+    DisplayDungeonDialogue(&gMewtwoReFightDialogue_2);
     MewtwoScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_81040CC);
+    DisplayDungeonDialogue(&gMewtwoReFightDialogue_3);
     MewtwoScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_8104114);
+    DisplayDungeonDialogue(&gMewtwoReFightDialogue_4);
     SetupBossFightHP(MewtwoEntity,900,0x20);
-    sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+    ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
   }
 }
 
@@ -2201,19 +2201,19 @@ void MewtwoScreenFlash(void)
   PlaySoundEffect(0x1f6);
   for(iVar1 = 250; iVar1 > 149; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
   for(iVar1 = 250; iVar1 > 199; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,0,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,0,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
   for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1);
     sub_803E46C(0x46);
   }
   sub_803E708(10,0x46);
@@ -2226,7 +2226,7 @@ void sub_8089C44(void)
   struct DungeonEntity * EnteiEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  EnteiEntity = sub_8085680(0x12);
+  EnteiEntity = GetEntityFromClientType(0x12);
   sub_8083E88(0x72);
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -2242,7 +2242,7 @@ void sub_8089C90(void)
   struct DungeonEntity * EnteiEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  EnteiEntity = sub_8085680(0x12);
+  EnteiEntity = GetEntityFromClientType(0x12);
   sub_8083E88(0x72);
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -2272,56 +2272,56 @@ void EnteiPreFightDialogue(void)
   struct DungeonEntity * EnteiEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  EnteiEntity = sub_8085680(0x12);
+  EnteiEntity = GetEntityFromClientType(0x12);
   EnteiScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8104150);
+  DisplayDungeonDialogue(&gEnteiPreFightDialogue_1);
   EnteiScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_81041AC);
+  DisplayDungeonDialogue(&gEnteiPreFightDialogue_2);
   EnteiScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_81041F8);
+  DisplayDungeonDialogue(&gEnteiPreFightDialogue_3);
   sub_803E708(10,70);
   SetupBossFightHP(EnteiEntity,600,0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
-void EnteiPreFightDialogue1(void)
+void EnteiReFightDialogue(void)
 {
   struct DungeonEntity * LeaderEntity;
   struct DungeonEntity * EnteiEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  EnteiEntity = sub_8085680(0x12);
+  EnteiEntity = GetEntityFromClientType(0x12);
   EnteiScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8104240);
+  DisplayDungeonDialogue(&gEnteiReFightDialogue_1);
   EnteiScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_81042AC);
+  DisplayDungeonDialogue(&gEnteiReFightDialogue_2);
   EnteiScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_81042B8);
+  DisplayDungeonDialogue(&gEnteiReFightDialogue_3);
   sub_803E708(10,70);
   SetupBossFightHP(EnteiEntity,600,0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
-void EnteiPreFightDialogue2(void)
+void EnteiPostStoryPreFightDialogue(void)
 {
   struct DungeonEntity * LeaderEntity;
   struct DungeonEntity * EnteiEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  EnteiEntity = sub_8085680(0x12);
+  EnteiEntity = GetEntityFromClientType(0x12);
   if (HasRecruitedMon(SPECIES_ENTEI)) {
-    sub_80866C4(&gUnknown_81043DC);
+    sub_80866C4(&gEnteiPostStoryPreFightDialogue_4);
   }
   else {
     EnteiScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_8104310);
+    DisplayDungeonDialogue(&gEnteiPostStoryPreFightDialogue_1);
     EnteiScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_810439C);
+    DisplayDungeonDialogue(&gEnteiPostStoryPreFightDialogue_2);
     EnteiScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_81043C0);
+    DisplayDungeonDialogue(&gEnteiPostStoryPreFightDialogue_3);
     sub_803E708(10,70);
     SetupBossFightHP(EnteiEntity,600,0xb);
-    sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+    ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
   }
 }
 
@@ -2332,19 +2332,19 @@ void EnteiScreenFlash(void)
   PlaySoundEffect(0x1ed);
   for(iVar1 = 250; iVar1 > 149; iVar1 -= 10)
   {
-    sub_8085C54(iVar1, iVar1 / 2, iVar1 / 2, 1, 1);
+    SetDungeonBGColorRGB(iVar1, iVar1 / 2, iVar1 / 2, 1, 1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
   for(iVar1 = 250; iVar1 > 199; iVar1 -= 10)
   {
-    sub_8085C54(iVar1, 0, 0, 1, 1);
+    SetDungeonBGColorRGB(iVar1, 0, 0, 1, 1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
   for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10)
   {
-    sub_8085C54(iVar1, iVar1 / 2, iVar1 / 2, 1, 1);
+    SetDungeonBGColorRGB(iVar1, iVar1 / 2, iVar1 / 2, 1, 1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
@@ -2357,7 +2357,7 @@ void sub_8089EFC(void)
   struct DungeonEntity * RaikouEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  RaikouEntity = sub_8085680(0x13);
+  RaikouEntity = GetEntityFromClientType(0x13);
   sub_8083E88(0x72);
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -2373,7 +2373,7 @@ void sub_8089F44(void)
   struct DungeonEntity * RaikouEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  RaikouEntity = sub_8085680(0x13);
+  RaikouEntity = GetEntityFromClientType(0x13);
   sub_8083E88(0x72);
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -2389,7 +2389,7 @@ void sub_8089F8C(void)
   struct DungeonEntity * RaikouEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  RaikouEntity = sub_8085680(0x13);
+  RaikouEntity = GetEntityFromClientType(0x13);
   sub_8083E88(0x72);
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -2418,66 +2418,66 @@ void RaikouPreFightDialogue(void)
   struct DungeonEntity * RaikouEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  RaikouEntity = sub_8085680(0x13);
-  DisplayDungeonDialogue(&gUnknown_8104450);
+  RaikouEntity = GetEntityFromClientType(0x13);
+  DisplayDungeonDialogue(&gRaikouPreFightDialogue_1);
   RaikouScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_81044B4);
+  DisplayDungeonDialogue(&gRaikouPreFightDialogue_2);
   gDungeonGlobalData->unkE265 = WEATHER_RAIN;
   sub_807EAA0(0,1);
   sub_803E708(10,70);
-  DisplayDungeonDialogue(&gUnknown_8104510);
+  DisplayDungeonDialogue(&gRaikouPreFightDialogue_3);
   RaikouScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_810453C);
+  DisplayDungeonDialogue(&gRaikouPreFightDialogue_4);
   RaikouScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8104570);
+  DisplayDungeonDialogue(&gRaikouPreFightDialogue_5);
   RaikouScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_81045B0);
+  DisplayDungeonDialogue(&gRaikouPreFightDialogue_6);
   sub_803E708(10,70);
   SetupBossFightHP(RaikouEntity,0x28a,0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
-void RaikouPreFightDialogue1(void)
+void RaikouReFightDialogue(void)
 {
   struct DungeonEntity * LeaderEntity;
   struct DungeonEntity * RaikouEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  RaikouEntity = sub_8085680(0x13);
+  RaikouEntity = GetEntityFromClientType(0x13);
   gDungeonGlobalData->unkE265 = WEATHER_RAIN;
   sub_807EAA0(0,1);
   RaikouScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_81045F8);
+  DisplayDungeonDialogue(&gRaikouReFightDialogue_1);
   RaikouScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8104674);
+  DisplayDungeonDialogue(&gRaikouReFightDialogue_2);
   RaikouScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_81046A0);
+  DisplayDungeonDialogue(&gRaikouReFightDialogue_3);
   sub_803E708(10,70);
   SetupBossFightHP(RaikouEntity,0x28a,0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
-void RaikouPreFightDialogue2(void)
+void RaikouPostStoryPreFightDialogue(void)
 {
   struct DungeonEntity * LeaderEntity;
   struct DungeonEntity * RaikouEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  RaikouEntity = sub_8085680(0x13);
+  RaikouEntity = GetEntityFromClientType(0x13);
   if (HasRecruitedMon(SPECIES_RAIKOU)) {
-    sub_80866C4(&gUnknown_8104778);
+    sub_80866C4(&gRaikouPostStoryPreFightDialogue_4);
   }
   else {
     gDungeonGlobalData->unkE265 = WEATHER_RAIN;
     sub_807EAA0(0,1);
-    DisplayDungeonDialogue(&gUnknown_81046CC);
+    DisplayDungeonDialogue(&gRaikouPostStoryPreFightDialogue_1);
     RaikouScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_8104744);
+    DisplayDungeonDialogue(&gRaikouPostStoryPreFightDialogue_2);
     RaikouScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_810476C);
+    DisplayDungeonDialogue(&gRaikouPostStoryPreFightDialogue_3);
     sub_803E708(10,70);
     SetupBossFightHP(RaikouEntity,0x28a,0xb);
-    sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+    ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
   }
 }
 
@@ -2488,19 +2488,19 @@ void RaikouScreenFlash(void)
   PlaySoundEffect(0x1f6);
   for(iVar1 = 250; iVar1 > 149; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
   for(iVar1 = 250; iVar1 > 199; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
   for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
@@ -2513,7 +2513,7 @@ void sub_808A264(void)
   struct DungeonEntity * SuicuneEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  SuicuneEntity = sub_8085680(0x14);
+  SuicuneEntity = GetEntityFromClientType(0x14);
   sub_8083E88(0x72);
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -2530,7 +2530,7 @@ void sub_808A2C0(void)
   struct DungeonEntity * SuicuneEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  SuicuneEntity = sub_8085680(0x14);
+  SuicuneEntity = GetEntityFromClientType(0x14);
   sub_8083E88(0x72);
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -2545,7 +2545,7 @@ void sub_808A308(void)
   struct DungeonEntity * SuicuneEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  SuicuneEntity = sub_8085680(0x14);
+  SuicuneEntity = GetEntityFromClientType(0x14);
   sub_8083E88(0x72);
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -2573,64 +2573,64 @@ void SuicunePreFightDialogue(void)
   struct DungeonEntity * SuicuneEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  SuicuneEntity = sub_8085680(0x14);
+  SuicuneEntity = GetEntityFromClientType(0x14);
   sub_8086448();
-  DisplayDungeonDialogue(&gUnknown_8104784);
+  DisplayDungeonDialogue(&gSuicunePreFightDialogue_1);
   sub_803E708(10,70);
-  DisplayDungeonDialogue(&gUnknown_8104790);
+  DisplayDungeonDialogue(&gSuicunePreFightDialogue_2);
   sub_803E708(10,70);
   sub_80426C8(1,2);
   sub_803E708(0x3c,70);
-  DisplayDungeonDialogue(&gUnknown_81047B0);
+  DisplayDungeonDialogue(&gSuicunePreFightDialogue_3);
   sub_803E708(10,70);
   sub_808A528(SuicuneEntity);
-  DisplayDungeonDialogue(&gUnknown_810484C);
-  DisplayDungeonDialogue(&gUnknown_8104888);
+  DisplayDungeonDialogue(&gSuicunePreFightDialogue_4);
+  DisplayDungeonDialogue(&gSuicunePreFightDialogue_5);
   SuicuneScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_81048C8);
+  DisplayDungeonDialogue(&gSuicunePreFightDialogue_6);
   SuicuneScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8104914);
+  DisplayDungeonDialogue(&gSuicunePreFightDialogue_7);
   sub_803E708(10,70);
   SetupBossFightHP(SuicuneEntity,0x28a,0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
-void SuicunePreFightDialogue1(void)
+void SuicuneReFightDialogue(void)
 {
   struct DungeonEntity * LeaderEntity;
   struct DungeonEntity * SuicuneEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  SuicuneEntity = sub_8085680(0x14);
-  DisplayDungeonDialogue(&gUnknown_8104930);
+  SuicuneEntity = GetEntityFromClientType(0x14);
+  DisplayDungeonDialogue(&gSuicuneReFightDialogue_1);
   SuicuneScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8104980);
+  DisplayDungeonDialogue(&gSuicuneReFightDialogue_2);
   SuicuneScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8104998);
+  DisplayDungeonDialogue(&gSuicuneReFightDialogue_3);
   sub_803E708(10,70);
   SetupBossFightHP(SuicuneEntity,0x28a,0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
-void SuicunePreFightDialogue2(void)
+void SuicunePostStoryPreFightDialogue(void)
 {
   struct DungeonEntity * LeaderEntity;
   struct DungeonEntity * SuicuneEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  SuicuneEntity = sub_8085680(0x14);
+  SuicuneEntity = GetEntityFromClientType(0x14);
   if (HasRecruitedMon(SPECIES_SUICUNE)) {
-    sub_80866C4(&gUnknown_8104AC8);
+    sub_80866C4(&gSuicunePostStoryPreFightDialogue_4);
   }
   else {
-    DisplayDungeonDialogue(&gUnknown_81049D4);
+    DisplayDungeonDialogue(&gSuicunePostStoryPreFightDialogue_1);
     SuicuneScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_8104A80);
+    DisplayDungeonDialogue(&gSuicunePostStoryPreFightDialogue_2);
     SuicuneScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_8104A9C);
+    DisplayDungeonDialogue(&gSuicunePostStoryPreFightDialogue_3);
     sub_803E708(10,70);
     SetupBossFightHP(SuicuneEntity,0x28a,0xb);
-    sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+    ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
   }
 }
 
@@ -2663,19 +2663,19 @@ void SuicuneScreenFlash(void)
   PlaySoundEffect(0x1ee);
   for(iVar1 = 250; iVar1 > 149; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
   for(iVar1 = 250; iVar1 > 199; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
   for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
@@ -2688,7 +2688,7 @@ void sub_808A608(void)
   struct DungeonEntity * HoOhEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  HoOhEntity = sub_8085680(0x15);
+  HoOhEntity = GetEntityFromClientType(0x15);
   sub_8083E88(0x1c);
   sub_80867F4();
   sub_8086838(0,0,0);
@@ -2706,7 +2706,7 @@ void sub_808A668(void)
   struct DungeonEntity * HoOhEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  HoOhEntity = sub_8085680(0x15);
+  HoOhEntity = GetEntityFromClientType(0x15);
   sub_8083E88(0x1c);
   sub_80867F4();
   sub_8086838(0,0,0);
@@ -2741,18 +2741,18 @@ void HoOhPreFightDialogue(void)
 {
   struct DungeonEntity * LeaderEntity;
   struct DungeonEntity * HoOhEntity;
-  int local_14[2];
+  struct Position32 local_14;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  HoOhEntity = sub_8085680(0x15);
-  local_14[0] = LeaderEntity->posPixel.x;
-  local_14[1] = LeaderEntity->posPixel.y + -0x1000;
-  sub_80858AC(local_14,0x88);
+  HoOhEntity = GetEntityFromClientType(0x15);
+  local_14.x = LeaderEntity->posPixel.x;
+  local_14.y = LeaderEntity->posPixel.y + -0x1000;
+  ShiftCameraToPosition(&local_14,0x88);
   sub_803E708(0x40,70);
-  DisplayDungeonDialogue(&gUnknown_8104AD4);
+  DisplayDungeonDialogue(&gHoOhPreFightDialogue_1);
   sub_803E708(10,70);
   HoOhScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8104BEC);
+  DisplayDungeonDialogue(&gHoOhPreFightDialogue_2);
   sub_803E708(10,70);
   sub_80855E4(sub_80868F4);
   sub_808680C();
@@ -2763,37 +2763,37 @@ void HoOhPreFightDialogue(void)
   sub_808682C();
   sub_80855E4(sub_8086910);
   sub_8085930(DIRECTION_NORTH);
-  DisplayDungeonDialogue(&gUnknown_8104C10);
-  DisplayDungeonDialogue(&gUnknown_8104C54);
+  DisplayDungeonDialogue(&gHoOhPreFightDialogue_3);
+  DisplayDungeonDialogue(&gHoOhPreFightDialogue_4);
   sub_803E708(0x1e,70);
   sub_803E708(0x1e,70);
   HoOhScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8104CB4);
+  DisplayDungeonDialogue(&gHoOhPreFightDialogue_5);
   HoOhScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8104CE0);
+  DisplayDungeonDialogue(&gHoOhPreFightDialogue_6);
   sub_803E708(10,70);
   SetupBossFightHP(HoOhEntity,800,0x20);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
-void HoOhPreFightDialogue1(void)
+void HoOhReFightDialogue(void)
 {
   struct DungeonEntity * LeaderEntity;
   struct DungeonEntity * HoOhEntity;
-  u32 local_14[2];
+  struct Position32 local_14;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  HoOhEntity = sub_8085680(0x15);
+  HoOhEntity = GetEntityFromClientType(0x15);
 
-  local_14[0] = LeaderEntity->posPixel.x;
-  local_14[1] = LeaderEntity->posPixel.y + -0x1000;
-  sub_80858AC(local_14,0x88);
+  local_14.x = LeaderEntity->posPixel.x;
+  local_14.y = LeaderEntity->posPixel.y + -0x1000;
+  ShiftCameraToPosition(&local_14,0x88);
   sub_803E708(0x40,70);
   if (HasRecruitedMon(SPECIES_HO_OH)) {
-    sub_80866C4(&gUnknown_8104E54);
+    sub_80866C4(&HoOhReFightDialogue_5);
   }
   else {
-    DisplayDungeonDialogue(&gUnknown_8104CEC);
+    DisplayDungeonDialogue(&HoOhReFightDialogue_1);
     HoOhScreenFlash();
     sub_80855E4(sub_80868F4);
     sub_808680C();
@@ -2802,14 +2802,14 @@ void HoOhPreFightDialogue1(void)
     sub_808682C();
     sub_80855E4(sub_8086910);
     sub_8085930(DIRECTION_NORTH);
-    DisplayDungeonDialogue(&gUnknown_8104D60);
+    DisplayDungeonDialogue(&HoOhReFightDialogue_2);
     HoOhScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_8104DDC);
+    DisplayDungeonDialogue(&HoOhReFightDialogue_3);
     HoOhScreenFlash();
-    DisplayDungeonDialogue(&gUnknown_8104E0C);
+    DisplayDungeonDialogue(&HoOhReFightDialogue_4);
     sub_803E708(10,70);
     SetupBossFightHP(HoOhEntity,800,0x20);
-    sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+    ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
   }
 }
 
@@ -2842,19 +2842,19 @@ void HoOhScreenFlash(void)
   PlaySoundEffect(0x1ed);
   for(iVar1 = 250; iVar1 > 149; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
   for(iVar1 = 250; iVar1 > 199; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
   for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
@@ -2867,7 +2867,7 @@ void sub_808A9E4(void)
   struct DungeonEntity * LatiosEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  LatiosEntity = sub_8085680(0x16);
+  LatiosEntity = GetEntityFromClientType(0x16);
   sub_8083E88(0x72);
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -2883,7 +2883,7 @@ void sub_808AA3C(void)
   struct DungeonEntity * LatiosEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  LatiosEntity = sub_8085680(0x16);
+  LatiosEntity = GetEntityFromClientType(0x16);
   sub_8083E88(0x72);
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -2899,7 +2899,7 @@ void sub_808AA94(void)
   struct DungeonEntity * LatiosEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  LatiosEntity = sub_8085680(0x16);
+  LatiosEntity = GetEntityFromClientType(0x16);
   sub_8083E88(0x72);
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -2921,31 +2921,32 @@ void LatiosPreFightDialogue(void)
 {
   struct DungeonEntity * LeaderEntity;
   struct DungeonEntity * LatiosEntity;
-  u32 local_18[3];
+  struct Position32 local_18;
+  u32 local_19;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  LatiosEntity = sub_8085680(0x16);
+  LatiosEntity = GetEntityFromClientType(0x16);
 
-  local_18[0] = LatiosEntity->posPixel.x;
-  local_18[1] = LatiosEntity->posPixel.y + (0x80 << 6);
-  local_18[2] = 0x7000fc;
-  sub_8085EC8(0x1bd,0,0,&local_18[2],1);
+  local_18.x = LatiosEntity->posPixel.x;
+  local_18.y = LatiosEntity->posPixel.y + (0x80 << 6);
+  local_19 = 0x7000fc;
+  sub_8085EC8(0x1bd,0,0,&local_19,1);
 
   sub_803E708(0x1e,70);
   sub_8086448();
-  sub_80858AC(local_18,0x18);
+  ShiftCameraToPosition(&local_18,0x18);
   sub_803E708(2,70);
   sub_80862BC(LatiosEntity);
   sub_803E708(0x20,70);
   sub_808692C();
-  DisplayDungeonDialogue(&gUnknown_8104E60);
+  DisplayDungeonDialogue(&gLatiosPreFightDialogue_1);
   LatiosScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8104EFC);
+  DisplayDungeonDialogue(&gLatiosPreFightDialogue_2);
   LatiosScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8104F30);
+  DisplayDungeonDialogue(&gLatiosPreFightDialogue_3);
   sub_803E708(10,70);
   SetupBossFightHP(LatiosEntity,600,0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 void LatiosReFightDialogue(void)
@@ -2954,17 +2955,17 @@ void LatiosReFightDialogue(void)
   struct DungeonEntity * LatiosEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  LatiosEntity = sub_8085680(0x16);
+  LatiosEntity = GetEntityFromClientType(0x16);
   sub_8086448();
   sub_808692C();
-  DisplayDungeonDialogue(&gUnknown_8104F64);
+  DisplayDungeonDialogue(&gLatiosReFightDialogue_1);
   LatiosScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8104EFC);
+  DisplayDungeonDialogue(&gLatiosPreFightDialogue_2);
   LatiosScreenFlash();
-  DisplayDungeonDialogue(&gUnknown_8104F30);
+  DisplayDungeonDialogue(&gLatiosPreFightDialogue_3);
   sub_803E708(10,70);
   SetupBossFightHP(LatiosEntity,600,0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 void sub_808AC3C(void)
@@ -2982,13 +2983,13 @@ void LatiosScreenFlash(void)
   gUnknown_202EDC8 = 0x1f;
   for(iVar1 = 250; iVar1 > 149; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
   for(iVar1 = 250; iVar1 >= 0; iVar1 -= 10)
   {
-    sub_8085C54(iVar1,iVar1,iVar1,1,1);
+    SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1);
     sub_803E46C(70);
   }
   sub_803E708(10,70);
@@ -3000,30 +3001,25 @@ void sub_808ACC0(void)
   struct DungeonEntity * uVar2;
 
   if (HasRecruitedMon(SPECIES_REGIROCK)) {
-    uVar2 = sub_8085680(0x17);
+    uVar2 = GetEntityFromClientType(0x17);
     sub_8068FE0(uVar2,0x21c,0);
     sub_8097FA8(0x22);
     sub_8097FA8(0x1d);
     sub_808B1CC(ITEM_ID_ROCK_PART);
   }
+  else if (sub_80860A8(ITEM_ID_ROCK_PART) != 0) {
+        sub_8098044(0x22);
+        sub_8097FA8(0x1d);
+  }
+  else if (sub_80860A8(ITEM_ID_MUSIC_BOX) != 0) {
+        sub_8098044(0x22);
+        sub_8097FA8(0x1d);
+  }
   else {
-    if (sub_80860A8(ITEM_ID_ROCK_PART) != 0) {
-        sub_8098044(0x22);
-        sub_8097FA8(0x1d);
-    }
-    else
-    {
-      if (sub_80860A8(ITEM_ID_MUSIC_BOX) != 0) {
-        sub_8098044(0x22);
-        sub_8097FA8(0x1d);
-      }
-      else {
         sub_8098044(0x22);
         sub_8098044(0x1d);
         sub_80855E4(SetupRegiFacingDirection);
         CopySpeciesNametoBuffer(gUnknown_202E038, SPECIES_REGIROCK);
-     }
-    }
   }
 }
 
@@ -3032,30 +3028,25 @@ void sub_808AD48(void)
   struct DungeonEntity * uVar2;
 
   if (HasRecruitedMon(SPECIES_REGICE)) {
-    uVar2 = sub_8085680(0x18);
+    uVar2 = GetEntityFromClientType(0x18);
     sub_8068FE0(uVar2,0x21c,0);
     sub_8097FA8(0x22);
     sub_8097FA8(0x1d);
     sub_808B1CC(ITEM_ID_ICE_PART);
   }
+  else if (sub_80860A8(ITEM_ID_ICE_PART) != 0) {
+        sub_8098044(0x22);
+        sub_8097FA8(0x1d);
+  }
+  else if (sub_80860A8(ITEM_ID_MUSIC_BOX) != 0) {
+        sub_8098044(0x22);
+        sub_8097FA8(0x1d);
+  }
   else {
-    if (sub_80860A8(ITEM_ID_ICE_PART) != 0) {
-        sub_8098044(0x22);
-        sub_8097FA8(0x1d);
-    }
-    else
-    {
-      if (sub_80860A8(ITEM_ID_MUSIC_BOX) != 0) {
-        sub_8098044(0x22);
-        sub_8097FA8(0x1d);
-      }
-      else {
         sub_8098044(0x22);
         sub_8098044(0x1d);
         sub_80855E4(SetupRegiFacingDirection);
         CopySpeciesNametoBuffer(gUnknown_202E038, SPECIES_REGICE);
-     }
-    }
   }
 }
 
@@ -3065,30 +3056,25 @@ void sub_808ADCC(void)
   struct DungeonEntity * uVar2;
 
   if (HasRecruitedMon(SPECIES_REGISTEEL)) {
-    uVar2 = sub_8085680(0x19);
+    uVar2 = GetEntityFromClientType(0x19);
     sub_8068FE0(uVar2,0x21c,0);
     sub_8097FA8(0x22);
     sub_8097FA8(0x1d);
     sub_808B1CC(ITEM_ID_STEEL_PART);
   }
+  else if (sub_80860A8(ITEM_ID_STEEL_PART) != 0) {
+        sub_8098044(0x22);
+        sub_8097FA8(0x1d);
+  }
+  else if (sub_80860A8(ITEM_ID_MUSIC_BOX) != 0) {
+        sub_8098044(0x22);
+        sub_8097FA8(0x1d);
+  }
   else {
-    if (sub_80860A8(ITEM_ID_STEEL_PART) != 0) {
-        sub_8098044(0x22);
-        sub_8097FA8(0x1d);
-    }
-    else
-    {
-      if (sub_80860A8(ITEM_ID_MUSIC_BOX) != 0) {
-        sub_8098044(0x22);
-        sub_8097FA8(0x1d);
-      }
-      else {
         sub_8098044(0x22);
         sub_8098044(0x1d);
         sub_80855E4(SetupRegiFacingDirection);
         CopySpeciesNametoBuffer(gUnknown_202E038, SPECIES_REGISTEEL);
-     }
-    }
   }
 }
 
@@ -3109,7 +3095,7 @@ void sub_808AE54(char param_1,char param_2,u32 *param_3)
       sub_8083E88(0x72);
       // Something fell from Regirock's body
       // Regirock was apparently guarding this item
-      DisplayDungeonDialogue(&gUnknown_8105040);
+      DisplayDungeonDialogue(&gRegirockPostFightDialogue_1);
     }
   }
 }
@@ -3132,7 +3118,7 @@ void sub_808AEC8(char param_1,char param_2,u32 *param_3)
       sub_8083E88(0x72);
       // Something fell from Regice's body
       // Regice was apparently guarding this item
-      DisplayDungeonDialogue(&gUnknown_810510C);
+      DisplayDungeonDialogue(&gRegicePostFightDialogue_1);
     }
   }
 }
@@ -3154,7 +3140,7 @@ void sub_808AF3C(char param_1,char param_2,u32 *param_3)
       sub_8083E88(0x72);
       // Something fell from Registeel's body
       // Registeel was apparently guarding this item
-      DisplayDungeonDialogue(&gUnknown_81051D0);
+      DisplayDungeonDialogue(&gRegisteelPostFightDialogue_1);
     }
   }
 }
@@ -3170,7 +3156,7 @@ void sub_808AFB0(char param_1)
     sub_8097FD0(0x1d);
     SetMessageArgument(gAvailablePokemonNames,GetLeaderEntity(),0);
     // {ARG_POKEMON_0} obtained the Rock Part that Regirock was guarding
-    DisplayDungeonDialogue(&gUnknown_81050B4);
+    DisplayDungeonDialogue(&gRegirockPostFightDialogue_2);
     sub_80421C0(0,0xd4);
     sub_803E708(10,70);
     sub_8046D20();
@@ -3188,7 +3174,7 @@ void sub_808B030(char param_1)
     sub_8097FD0(0x1d);
     SetMessageArgument(gAvailablePokemonNames,GetLeaderEntity(),0);
     // {ARG_POKEMON_0} obtained the Ice Part that Regice was guarding
-    DisplayDungeonDialogue(&gUnknown_810517C);
+    DisplayDungeonDialogue(&gRegicePostFightDialogue_2);
     sub_80421C0(0,0xd4);
     sub_803E708(10,70);
     sub_8046D20();
@@ -3206,7 +3192,7 @@ void sub_808B0B0(char param_1)
     sub_8097FD0(0x1d);
     SetMessageArgument(gAvailablePokemonNames, GetLeaderEntity(), 0);
     // {ARG_POKEMON_0} obtained the Steel Part that Registeel was guarding
-    DisplayDungeonDialogue(&gUnknown_8105244);
+    DisplayDungeonDialogue(&gRegisteelPostFightDialogue_2);
     sub_80421C0(0,0xd4);
     sub_803E708(10,70);
     sub_8046D20();
@@ -3219,7 +3205,7 @@ void RegirockPreFightDialogue(void)
     sub_8085930(DIRECTION_NORTH);
     // INTRUDER ALERT
     // EXTERMINATE
-    DisplayDungeonDialogue(&gUnknown_8104FD4);
+    DisplayDungeonDialogue(&gRegirockPreFightDialogue_1);
     sub_803E708(10,70);
     sub_808563C(SetupRegirockFightHP);
   }
@@ -3231,7 +3217,7 @@ void RegicePreFightDialogue(void)
     sub_8085930(DIRECTION_NORTH);
     // INTRUDER ALERT
     // EXTERMINATE
-    DisplayDungeonDialogue(&gUnknown_8105028);
+    DisplayDungeonDialogue(&gRegicePreFightDialogue_1);
     sub_803E708(10,70);
     sub_808563C(SetupRegiceFightHP);
   }
@@ -3243,7 +3229,7 @@ void RegisteelPreFightDialogue(void)
     sub_8085930(DIRECTION_NORTH);
     // INTRUDER ALERT
     // EXTERMINATE
-    DisplayDungeonDialogue(&gUnknown_8105034);
+    DisplayDungeonDialogue(&gRegisteelPreFightDialogue_1);
     sub_803E708(10,70);
     sub_808563C(SetupRegisteelFightHP);
   }
@@ -3370,19 +3356,19 @@ void SetupRegiFacingDirection(struct DungeonEntity *r0)
 
 void SetupRegirockFightHP(struct DungeonEntity *r0)
 {
-    SetupBossFightHP(r0, 0xE1 << 1, 0xB);
+    SetupBossFightHP(r0, 450, 0xB);
 }
 
 
 void SetupRegiceFightHP(struct DungeonEntity *r0)
 {
-    SetupBossFightHP(r0, 0xE1 << 1, 0xB);
+    SetupBossFightHP(r0, 450, 0xB);
 }
 
 
 void SetupRegisteelFightHP(struct DungeonEntity *r0)
 {
-    SetupBossFightHP(r0, 0xE1 << 1, 0xB);
+    SetupBossFightHP(r0, 450, 0xB);
 }
 
 void sub_808B2F4(void)
@@ -3391,7 +3377,7 @@ void sub_808B2F4(void)
   struct DungeonEntity * JirachiEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  JirachiEntity = sub_8085680(0x1a);
+  JirachiEntity = GetEntityFromClientType(0x1a);
   sub_8083E88(0x79);
   sub_808BCE4();
   sub_8049ED4();
@@ -3410,7 +3396,7 @@ void sub_808B35C(void)
   struct DungeonEntity * JirachiEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  JirachiEntity = sub_8085680(0x1a);
+  JirachiEntity = GetEntityFromClientType(0x1a);
   sub_8083E88(0x79);
   sub_80854D4();
   sub_8085930(DIRECTION_NORTH);
@@ -3524,32 +3510,32 @@ void JirachiPreFightDialogue(void)
   struct DungeonEntity * JirachiEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  JirachiEntity = sub_8085680(0x1a);
+  JirachiEntity = GetEntityFromClientType(0x1a);
   sub_8086448();
   sub_803E708(0x40,70);
-  DisplayDungeonDialogue(&gUnknown_8105438);
+  DisplayDungeonDialogue(&gJirachiPreFightDialogue_1);
   sub_803E708(10,70);
   SpriteLookAroundEffect(LeaderEntity);
   sub_803E708(10,70);
-  DisplayDungeonDialogue(&gUnknown_81054A0);
+  DisplayDungeonDialogue(&gJirachiPreFightDialogue_2);
   sub_80861F8(0x37,JirachiEntity,1);
   sub_80855E4(sub_80862BC);
   sub_803E708(0x3c,70);
   sub_808BBB8(JirachiEntity);
   sub_803E708(0x5a,70);
-  DisplayDungeonDialogue(&gUnknown_81054E4);
+  DisplayDungeonDialogue(&gJirachiPreFightDialogue_3);
   sub_803E708(10,70);
-  DisplayDungeonDialogue(&gUnknown_810550C);
+  DisplayDungeonDialogue(&gJirachiPreFightDialogue_4);
   sub_803E708(10,70);
   SetupBossFightHP(JirachiEntity,0x15e,0x20);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 void sub_808B50C(void)
 {
   struct DungeonEntity * JirachiEntity;
 
-  JirachiEntity = sub_8085680(0x1a);
+  JirachiEntity = GetEntityFromClientType(0x1a);
   CopySpeciesNametoBuffer(gUnknown_202E038, SPECIES_JIRACHI);
   sub_80855E4(sub_808BBA8);
   sub_808BBA8(JirachiEntity);
diff --git a/src/code_80848F0.c b/src/code_80848F0.c
index a5cb17a2f..43c23efe8 100644
--- a/src/code_80848F0.c
+++ b/src/code_80848F0.c
@@ -30,18 +30,18 @@ extern void sub_80897F0();
 extern void sub_8089878();
 extern void sub_80898E4();
 extern void MewtwoPreFightDialogue();
-extern void MewtwoPreFightDialogue1();
+extern void MewtwoReFightDialogue();
 extern void EnteiPreFightDialogue();
-extern void EnteiPreFightDialogue1();
-extern void EnteiPreFightDialogue2();
+extern void EnteiReFightDialogue();
+extern void EnteiPostStoryPreFightDialogue();
 extern void RaikouPreFightDialogue();
-extern void RaikouPreFightDialogue1();
-extern void RaikouPreFightDialogue2();
+extern void RaikouReFightDialogue();
+extern void RaikouPostStoryPreFightDialogue();
 extern void SuicunePreFightDialogue();
-extern void SuicunePreFightDialogue1();
-extern void SuicunePreFightDialogue2();
+extern void SuicuneReFightDialogue();
+extern void SuicunePostStoryPreFightDialogue();
 extern void HoOhPreFightDialogue();
-extern void HoOhPreFightDialogue1();
+extern void HoOhReFightDialogue();
 extern void LatiosPreFightDialogue();
 extern void LatiosReFightDialogue();
 extern void sub_808AC3C();
@@ -49,7 +49,7 @@ extern void RegirockPreFightDialogue();
 extern void RegicePreFightDialogue();
 extern void RegisteelPreFightDialogue();
 extern void JirachiPreFightDialogue();
-extern void JirachiPreFightDialogue1();
+extern void JirachiReFightDialogue();
 extern void LugiaPreFightDialogue();
 extern void KyogrePreFightDialogue();
 extern void DeoxysPreFightDialogue();
@@ -418,40 +418,40 @@ void DisplayPreFightDialogue(void)
         MewtwoPreFightDialogue();
         break;
       case 0x1f:
-        MewtwoPreFightDialogue1();
+        MewtwoReFightDialogue();
         break;
       case 0x20:
         EnteiPreFightDialogue();
         break;
       case 0x21:
-        EnteiPreFightDialogue1();
+        EnteiReFightDialogue();
         break;
       case 0x22:
-        EnteiPreFightDialogue2();
+        EnteiPostStoryPreFightDialogue();
         break;
       case 0x23:
         RaikouPreFightDialogue();
         break;
       case 0x24:
-        RaikouPreFightDialogue1();
+        RaikouReFightDialogue();
         break;
       case 0x25:
-        RaikouPreFightDialogue2();
+        RaikouPostStoryPreFightDialogue();
         break;
       case 0x26:
         SuicunePreFightDialogue();
         break;
       case 0x27:
-        SuicunePreFightDialogue1();
+        SuicuneReFightDialogue();
         break;
       case 0x28:
-        SuicunePreFightDialogue2();
+        SuicunePostStoryPreFightDialogue();
         break;
       case 0x29:
         HoOhPreFightDialogue();
         break;
       case 0x2a:
-        HoOhPreFightDialogue1();
+        HoOhReFightDialogue();
         break;
       case 0x2b:
         LatiosPreFightDialogue();
@@ -475,7 +475,7 @@ void DisplayPreFightDialogue(void)
         JirachiPreFightDialogue();
         break;
       case 0x32:
-        JirachiPreFightDialogue1();
+        JirachiReFightDialogue();
         break;
       case 0x33:
         LugiaPreFightDialogue();
diff --git a/src/code_80869E4.c b/src/code_80869E4.c
index bdcfd6d56..1d24061d9 100644
--- a/src/code_80869E4.c
+++ b/src/code_80869E4.c
@@ -22,7 +22,7 @@ void sub_80869E4(struct DungeonEntity *r0, u32, u8, s8);
 extern void sub_80859F0(u32);
 extern void sub_803E46C(u32);
 extern void sub_803E9D0(void);
-extern void sub_8085C54(u32, u32, u32, u32, u32);
+extern void SetDungeonBGColorRGB(u32, u32, u32, u32, u32);
 extern void PlaySoundEffect(u32);
 extern struct DungeonEntity *xxx_call_GetLeaderEntity(void);
 void SpriteLookAroundEffect(struct DungeonEntity *r0);
@@ -36,8 +36,8 @@ extern u32 gUnknown_202EDC8;
 extern void sub_8085EB0(void);
 extern void sub_803E748(void);
 extern void sub_80855E4(void *);
-extern u32 sub_803F994(void);
-extern u32 sub_803F9B0(void);
+extern s32 GetCameraXPos(void);
+extern s32 GetCameraYPos(void);
 extern void sub_803F878(u32, u32);
 extern void sub_8086384(struct DungeonEntity *r0);
 extern void sub_8085930(u32);
@@ -156,8 +156,8 @@ void sub_8086448(void)
 
     for(iVar1 = 0; iVar1 < 0x38; iVar1++)
     {
-        retVar = sub_803F994();
-        retVar2 = sub_803F9B0();
+        retVar = GetCameraXPos();
+        retVar2 = GetCameraYPos();
         retVar2 += (0x80 << 1);
         sub_803F878(retVar, retVar2);
         sub_80855E4(sub_8086410);
@@ -201,9 +201,9 @@ void sub_8086500(void)
 
     for(iVar1 = 0; iVar1 < 0x48; iVar1++)
     {
-        retVar = sub_803F994();
+        retVar = GetCameraXPos();
         retVar += (0x80 << 1);
-        retVar2 = sub_803F9B0();
+        retVar2 = GetCameraYPos();
         sub_803F878(retVar, retVar2);
         sub_80855E4(sub_8086434);
         sub_803E46C(0x46);
@@ -221,9 +221,9 @@ void sub_808654C(void)
 
     for(iVar1 = 0; iVar1 < 0x78; iVar1++)
     {
-        retVar = sub_803F994();
+        retVar = GetCameraXPos();
         retVar += (0x80 << 1);
-        retVar2 = sub_803F9B0();
+        retVar2 = GetCameraYPos();
         sub_803F878(retVar, retVar2);
         sub_80855E4(sub_8086434);
         sub_803E46C(0x46);
@@ -241,8 +241,8 @@ void sub_8086598(void)
 
     for(iVar1 = 0; iVar1 < 0x18; iVar1++)
     {
-        retVar = sub_803F994();
-        retVar2 = sub_803F9B0();
+        retVar = GetCameraXPos();
+        retVar2 = GetCameraYPos();
         sub_803F878(retVar, retVar2 + (0xffffff00));
         sub_80855E4(sub_8086410);
         sub_803E46C(0x46);
@@ -260,8 +260,8 @@ void sub_80865E8(void)
 
     for(iVar1 = 0; iVar1 < 0xC; iVar1++)
     {
-        retVar = sub_803F994();
-        retVar2 = sub_803F9B0();
+        retVar = GetCameraXPos();
+        retVar2 = GetCameraYPos();
         sub_803F878(retVar, retVar2 + (0x80 << 2));
         sub_80855E4(sub_8086424);
         sub_80855E4(sub_8086424);
@@ -280,8 +280,8 @@ void sub_808663C(void)
 
     for(iVar1 = 0; iVar1 < 0x10; iVar1++)
     {
-        retVar = sub_803F994();
-        retVar2 = sub_803F9B0();
+        retVar = GetCameraXPos();
+        retVar2 = GetCameraYPos();
         sub_803F878(retVar, retVar2 + (0x80 << 2));
         sub_80855E4(sub_8086424);
         sub_80855E4(sub_8086424);
@@ -323,7 +323,7 @@ void sub_80866FC(void)
 
     for(iVar1 = 0; iVar1 >= -0xFA; iVar1 -= 0xA)
     {
-        sub_8085C54(iVar1, iVar1, iVar1, 1, 0);
+        SetDungeonBGColorRGB(iVar1, iVar1, iVar1, 1, 0);
         sub_803E46C(0x46);
     }
 }
@@ -339,7 +339,7 @@ void sub_8086738(void)
 
     for(iVar1 = 0; iVar1 < 0xFA; iVar1 += 0xA)
     {
-        sub_8085C54(iVar1, iVar1, iVar1, 1, 0);
+        SetDungeonBGColorRGB(iVar1, iVar1, iVar1, 1, 0);
         sub_803E46C(0x46);
     }
 }
@@ -350,7 +350,7 @@ void sub_8086764(void)
 
     for(iVar1 = 0xFA; iVar1 >= 0; iVar1 -= 5)
     {
-        sub_8085C54(iVar1, iVar1, iVar1, 1, 0);
+        SetDungeonBGColorRGB(iVar1, iVar1, iVar1, 1, 0);
         sub_803E46C(0x46);
     }
     sub_8085EB0();
@@ -364,7 +364,7 @@ void sub_8086794(void)
 
     for(iVar1 = 0; iVar1 < 0xC8; iVar1++)
     {
-        sub_8085C54(0, 0, 0, 1, 0);
+        SetDungeonBGColorRGB(0, 0, 0, 1, 0);
         sub_803E9D0();
         sub_803E46C(0x46);
         if((iVar1 & 3) == 0)
diff --git a/src/code_8086A3C.c b/src/code_8086A3C.c
index 1c15056bb..be1ef3eda 100644
--- a/src/code_8086A3C.c
+++ b/src/code_8086A3C.c
@@ -3,11 +3,12 @@
 #include "dungeon_entity.h"
 #include "dungeon_global_data.h"
 #include "pokemon.h"
+#include "dungeon_util_1.h"
 
 extern void LoadIQSkills(struct DungeonEntity *);
 extern struct DungeonEntity *GetPartnerEntity();
 extern struct DungeonEntity *xxx_call_GetLeaderEntity(void);
-extern struct DungeonEntity *sub_8085680(u32);
+extern struct DungeonEntity *GetEntityFromClientType(u32);
 extern void SetDefaultIQSkills(u8 *param_1, u8 param_2);
 extern void sub_8097FF8(void);
 extern u8 sub_8044B28(void);
@@ -21,7 +22,6 @@ extern void sub_80855E4(void *);
 extern void sub_8085860(s32 r0, u32 r1);
 extern void sub_8068FE0(struct DungeonEntity *, u32, u32);
 extern void sub_8097FA8(u32);
-extern void sub_80858AC(void *, u32);
 extern void DisplayDungeonDialogue(u8 *);
 extern void sub_806CDD4(struct DungeonEntity *, u32, u32);
 extern void sub_80869E4(struct DungeonEntity *, u32, u32, u32);
@@ -35,13 +35,6 @@ extern void sub_8086A54(struct DungeonEntity *);
 extern void PlaySoundEffect(u32);
 extern void sub_808563C(void *);
 
-// X / Y Coords??
-struct subStruct_Skarmory
-{
-    int x;
-    int y;
-};
-
 extern u8 gUnknown_8100768;
 extern u8 gUnknown_8100798;
 extern u8 gUnknown_8100820;
@@ -119,8 +112,8 @@ void sub_8086B14(void)
   struct DungeonEntity * SkarmoryEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  DiglettEntity = sub_8085680(4);
-  SkarmoryEntity = sub_8085680(3);
+  DiglettEntity = GetEntityFromClientType(4);
+  SkarmoryEntity = GetEntityFromClientType(3);
   sub_8083E88(0x72);
   sub_8085374();
   sub_80854D4();
@@ -140,8 +133,8 @@ void sub_8086B94(void)
   struct DungeonEntity * SkarmoryEntity;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  DiglettEntity = sub_8085680(4);
-  SkarmoryEntity = sub_8085680(3);
+  DiglettEntity = GetEntityFromClientType(4);
+  SkarmoryEntity = GetEntityFromClientType(3);
 
   sub_8068FE0(SkarmoryEntity,0x21c,0);
   sub_8068FE0(DiglettEntity,0x21c,0);
@@ -165,13 +158,13 @@ void SkarmoryPreFightDialogue(void)
   struct DungeonEntity * DiglettEntity;
   struct DungeonEntity * SkarmoryEntity;
 
-  struct subStruct_Skarmory local_1c;
-  struct subStruct_Skarmory local_20;
+  struct Position32 local_1c;
+  struct Position32 local_20;
 
   LeaderEntity = xxx_call_GetLeaderEntity(); // Player
   PartnerEntity = GetPartnerEntity(); // Partner
-  DiglettEntity = sub_8085680(4); // Diglett
-  SkarmoryEntity = sub_8085680(3); // Skarmory
+  DiglettEntity = GetEntityFromClientType(4); // Diglett
+  SkarmoryEntity = GetEntityFromClientType(3); // Skarmory
 
   local_1c.x = DiglettEntity->posPixel.x;
   local_1c.y = DiglettEntity->posPixel.y + 0x3000;
@@ -185,16 +178,16 @@ void SkarmoryPreFightDialogue(void)
   sub_803E708(0x20,0x46);
   sub_803E708(10,0x46);
   DisplayDungeonDialogue(&gUnknown_8100768);
-  sub_80858AC(&local_1c,0x40);
+  ShiftCameraToPosition(&local_1c,0x40);
   sub_803E708(0x40,0x46);
-  sub_80858AC(&local_20,0x30);
+  ShiftCameraToPosition(&local_20,0x30);
   DisplayDungeonDialogue(&gUnknown_8100798);
   sub_803E708(10,0x46);
   DiglettEntity->entityData->unk15D = 1;
-  sub_80858AC(&local_1c,0x30);
+  ShiftCameraToPosition(&local_1c,0x30);
   DisplayDungeonDialogue(&gUnknown_8100820); // Diglett: ...I...\nI'm scared.
   sub_803E708(10,0x46);
-  sub_80858AC(&local_20,0x20);
+  ShiftCameraToPosition(&local_20,0x20);
   sub_803E708(0x20,0x46);
   sub_8086E74(SkarmoryEntity);
   DisplayDungeonDialogue(&gUnknown_8100844); // Skarmory: You!\nWhat do you think you're doing here?!
@@ -215,23 +208,23 @@ void SkarmoryPreFightDialogue(void)
   sub_80869E4(LeaderEntity,4,1,4);
   sub_803E708(10,0x46);
   sub_8083E88(0xb);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
 }
 
 void SkarmoryReFightDialogue(void)
 {
   struct DungeonEntity * LeaderEntity;
   struct DungeonEntity * SkarmoryEntity;
-  struct subStruct_Skarmory local_14;
+  struct Position32 local_14;
 
   LeaderEntity = xxx_call_GetLeaderEntity();
-  SkarmoryEntity = sub_8085680(3);
+  SkarmoryEntity = GetEntityFromClientType(3);
   local_14.x = SkarmoryEntity->posPixel.x;
   local_14.y = SkarmoryEntity->posPixel.y + 0x2000;
   sub_8086448();
   sub_803E708(10,0x46);
   sub_8086E74(SkarmoryEntity);
-  sub_80858AC(&local_14,0x10);
+  ShiftCameraToPosition(&local_14,0x10);
   DisplayDungeonDialogue(&gUnknown_8100C90);
   sub_803E708(10,0x46);
   DisplayDungeonDialogue(&gUnknown_8100CBC);
@@ -239,7 +232,7 @@ void SkarmoryReFightDialogue(void)
   sub_806CDD4(SkarmoryEntity,0xd,0);
   DisplayDungeonDialogue(&gUnknown_8100CDC);
   sub_803E708(10,0x46);
-  sub_80858AC(&LeaderEntity->posPixel.x,0x10);
+  ShiftCameraToPosition(&LeaderEntity->posPixel,0x10);
   sub_8083E88(0xb);
 }
 
diff --git a/src/dungeon_util_1.c b/src/dungeon_util_1.c
index 564cd1253..cdaa9b878 100644
--- a/src/dungeon_util_1.c
+++ b/src/dungeon_util_1.c
@@ -6,13 +6,16 @@
 #include "dungeon_util.h"
 #include "random.h"
 
+extern const u8 gUnknown_8107358[25];
+
 extern void sub_806CE68(struct DungeonEntity *, s32);
 
-extern s32 sub_803F994(void);
-extern s32 sub_803F9B0(void);
+extern s32 GetCameraXPos(void);
+extern s32 GetCameraYPos(void);
 extern void sub_803F4A0(u32);
 extern void sub_803F878(s32, s32);
 extern void sub_803E46C(u32);
+extern void sub_803E708(u32, u32);
 
 void sub_8085860(s32 x, s32 y)
 {
@@ -27,28 +30,28 @@ void sub_8085890(s32 x, s32 y)
     sub_803F878(x, y);
 }
 
-void sub_80858AC(s32 *param_1, s32 param_2)
+void ShiftCameraToPosition(struct Position32 *posStruct, s32 cameraSteps)
 {
-  s32 iVar1;
-  s32 iVar2;
-  s32 iVar3;
-  s32 iVar4;
+  s32 XPos;
+  s32 YPos;
+  s32 XIncrement;
+  s32 YIncrement;
 
-  iVar1 = sub_803F994();
-  iVar2 = sub_803F9B0();
-  iVar3 = (param_1[0] - iVar1) / param_2;
-  iVar4 = (param_1[1] - iVar2) / param_2;
+  XPos = GetCameraXPos();
+  YPos = GetCameraYPos();
+  XIncrement = (posStruct->x - XPos) / cameraSteps;
+  YIncrement = (posStruct->y - YPos) / cameraSteps;
   sub_803F4A0(0);
-  if (0 < param_2) {
+  if (0 < cameraSteps) {
     do {
-      iVar1 += iVar3;
-      iVar2 += iVar4;
-      sub_803F878(iVar1,iVar2);
+      XPos += XIncrement;
+      YPos += YIncrement;
+      sub_803F878(XPos,YPos);
       sub_803E46C(0x46);
-      param_2--;
-    } while (param_2 != 0);
+      cameraSteps--;
+    } while (cameraSteps != 0);
   }
-  sub_803F878(param_1[0],param_1[1]);
+  sub_803F878(posStruct->x,posStruct->y);
   sub_803E46C(0x46);
 }
 
@@ -168,3 +171,18 @@ bool8 IsMovingClient(struct DungeonEntity *pokemon)
             return FALSE;
     }
 }
+
+void sub_8085B0C(struct DungeonEntity *pokemon)
+{
+  s32 index;
+  u8 local_28 [25];
+
+  index = 0;
+
+  memcpy(local_28, gUnknown_8107358, 25);
+  while (local_28[index] != 0) {
+    SetFacingDirection(pokemon, local_28[index]);
+    sub_803E708(6,0x46);
+    index++;
+  }
+}
diff --git a/src/status_checker.c b/src/status_checker.c
index 9f2908434..040d73440 100644
--- a/src/status_checker.c
+++ b/src/status_checker.c
@@ -183,13 +183,13 @@ bool8 FillInOrbAction(struct DungeonEntity *pokemon,struct DungeonEntity *target
   struct MapTile *tileToFill;
   struct DungeonEntityData *iVar5;
   int y;
-  bool8 didWork; // TODO better name for this... signifies that orb worked
+  bool8 filledInTile;
   int x;
   u16 cast_x;
   u32 cast_y;
   struct Position_Alt tileCoords;
 
-  didWork = FALSE;
+  filledInTile = FALSE;
   iVar5 = target->entityData;
   if (IsBossBattle()) {
     SendMessage(pokemon,*gUnknown_80FD0B8);
@@ -197,7 +197,7 @@ bool8 FillInOrbAction(struct DungeonEntity *pokemon,struct DungeonEntity *target
   }
   else
   {
-    // Calcuate the coordinates of the tile in front of the user
+    // Calculate the coordinates of the tile in front of the user
     cast_x = target->posWorld.x + gAdjacentTileOffsets[iVar5->action.facingDir].x;
     tileCoords.temp.full_bits = (tileCoords.temp.full_bits & 0xffff0000) | cast_x;
 
@@ -212,7 +212,7 @@ bool8 FillInOrbAction(struct DungeonEntity *pokemon,struct DungeonEntity *target
       for(y = -1; y < 2; y++)
         for(x = -1; x < 2; x++)
           sub_80498A8(tileCoords.temp.norm.x + x, tileCoords.temp.norm.y + y);
-      didWork = TRUE;
+      filledInTile = TRUE;
       sub_806CF60();
     }
 
@@ -220,7 +220,7 @@ bool8 FillInOrbAction(struct DungeonEntity *pokemon,struct DungeonEntity *target
       for(x = 0; x < DUNGEON_MAX_SIZE_X; x++)
           sub_8049BB0(x,y);
 
-    if (didWork) {
+    if (filledInTile) {
         sub_8042A64((struct Position *)&tileCoords);
         sub_80522F4(pokemon,target,*gUnknown_80FD0B4);
     }
@@ -229,7 +229,7 @@ bool8 FillInOrbAction(struct DungeonEntity *pokemon,struct DungeonEntity *target
     }
     sub_8040A84();
     sub_8049ED4();
-    return didWork;
+    return filledInTile;
   }
 }
 
diff --git a/src/weather.c b/src/weather.c
index 58e0b6ca8..fb951a008 100644
--- a/src/weather.c
+++ b/src/weather.c
@@ -41,7 +41,7 @@ void sub_807E5E4(u8 weather)
   gDungeonGlobalData->unkE279 = 0;
   for(index = 0; index < 8; index++) {
     gDungeonGlobalData->unkE267[index] = 0;
-    gDungeonGlobalData->unkE26F[index] = 0;
+    gDungeonGlobalData->startingWeather[index] = 0;
   }
   preload = &gDungeonGlobalData->weatherDamageTimer;
   index = 0;