Merge pull request #94 from AnonymousRandomPerson/master

Dungeon movement decomp

1 files changed, 0 insertions, 985 deletions

diff --git a/asm/code_80701A4.s b/asm/code_80701A4.s
index d8549f9..04b317b 100644
--- a/asm/code_80701A4.s
+++ b/asm/code_80701A4.s
@@ -211,989 +211,4 @@ _08070322:
 	bx r1
 	thumb_func_end sub_80701A4
 
-	thumb_func_start GetCrossableTerrain
-GetCrossableTerrain:
-	push {lr}
-	lsls r0, 16
-	asrs r0, 16
-	bl GetWalkableTiles
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0x3
-	bhi _0807033E
-	adds r0, r1, 0
-	b _08070344
-_0807033E:
-	ldr r0, _08070348
-	adds r0, r1, r0
-	ldrb r0, [r0]
-_08070344:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08070348: .4byte gUnknown_202F314
-	thumb_func_end GetCrossableTerrain
-
-	thumb_func_start sub_807034C
-sub_807034C:
-	push {r4,lr}
-	adds r4, r1, 0
-	lsls r0, 16
-	asrs r2, r0, 16
-	ldr r0, [r4, 0x10]
-	cmp r0, 0
-	bne _08070398
-	ldrh r1, [r4]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	bne _08070398
-	adds r0, r2, 0
-	bl GetCrossableTerrain
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldrh r0, [r4]
-	movs r1, 0x3
-	ands r1, r0
-	cmp r2, 0x1
-	beq _08070388
-	cmp r2, 0x1
-	bgt _08070382
-	cmp r2, 0
-	beq _0807038C
-	b _08070390
-_08070382:
-	cmp r2, 0x2
-	beq _08070394
-	b _08070390
-_08070388:
-	cmp r1, 0x2
-	beq _08070390
-_0807038C:
-	cmp r1, 0x1
-	bne _08070398
-_08070390:
-	movs r0, 0
-	b _0807039A
-_08070394:
-	cmp r1, 0
-	bne _08070390
-_08070398:
-	movs r0, 0x1
-_0807039A:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_807034C
-
-	thumb_func_start sub_80703A0
-sub_80703A0:
-	push {r4-r7,lr}
-	adds r6, r0, 0
-	adds r4, r1, 0
-	ldr r7, [r6, 0x70]
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	movs r2, 0x2
-	ldrsh r1, [r4, r2]
-	bl GetMapTileAtPosition
-	adds r5, r0, 0
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	blt _08070456
-	movs r2, 0x2
-	ldrsh r1, [r4, r2]
-	cmp r1, 0
-	blt _08070456
-	cmp r0, 0x37
-	bgt _08070456
-	cmp r1, 0x1F
-	bgt _08070456
-	ldr r0, [r5, 0x10]
-	cmp r0, 0
-	bne _08070456
-	ldrh r1, [r5]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	bne _08070456
-	bl IsFixedDungeon
-	lsls r0, 24
-	cmp r0, 0
-	bne _08070400
-	adds r0, r7, 0
-	adds r0, 0xE4
-	ldrb r0, [r0]
-	cmp r0, 0x3
-	beq _0807044E
-	adds r0, r6, 0
-	movs r1, 0x9
-	bl HasItem
-	lsls r0, 24
-	cmp r0, 0
-	bne _0807044E
-_08070400:
-	movs r1, 0x2
-	ldrsh r0, [r7, r1]
-	bl GetCrossableTerrain
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldrh r0, [r5]
-	movs r5, 0x3
-	ands r5, r0
-	adds r0, r6, 0
-	movs r1, 0xC
-	bl HasIQSkill
-	lsls r0, 24
-	cmp r0, 0
-	beq _08070422
-	movs r4, 0x2
-_08070422:
-	adds r0, r6, 0
-	movs r1, 0xD
-	bl HasIQSkill
-	lsls r0, 24
-	cmp r0, 0
-	beq _08070432
-	movs r4, 0x3
-_08070432:
-	cmp r4, 0x1
-	beq _08070446
-	cmp r4, 0x1
-	bgt _08070440
-	cmp r4, 0
-	beq _0807044A
-	b _0807044E
-_08070440:
-	cmp r4, 0x2
-	beq _08070452
-	b _0807044E
-_08070446:
-	cmp r5, 0x2
-	beq _0807044E
-_0807044A:
-	cmp r5, 0x1
-	bne _08070456
-_0807044E:
-	movs r0, 0
-	b _08070458
-_08070452:
-	cmp r5, 0
-	bne _0807044E
-_08070456:
-	movs r0, 0x1
-_08070458:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80703A0
-
-	thumb_func_start CanCrossWalls
-CanCrossWalls:
-	push {r4,lr}
-	adds r1, r0, 0
-	ldr r0, [r1, 0x70]
-	adds r4, r0, 0
-	adds r0, 0xE4
-	ldrb r0, [r0]
-	cmp r0, 0x3
-	beq _08070492
-	adds r0, r1, 0
-	movs r1, 0x9
-	bl HasItem
-	lsls r0, 24
-	cmp r0, 0
-	bne _08070492
-	movs r1, 0x2
-	ldrsh r0, [r4, r1]
-	bl GetCrossableTerrain
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	beq _08070492
-	movs r0, 0
-	b _08070494
-_08070492:
-	movs r0, 0x1
-_08070494:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end CanCrossWalls
-
-	thumb_func_start sub_807049C
-sub_807049C:
-	push {r4-r7,lr}
-	adds r6, r0, 0
-	adds r4, r1, 0
-	ldr r7, [r6, 0x70]
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	movs r2, 0x2
-	ldrsh r1, [r4, r2]
-	bl GetMapTileAtPosition
-	adds r5, r0, 0
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	blt _0807055A
-	movs r2, 0x2
-	ldrsh r1, [r4, r2]
-	cmp r1, 0
-	blt _0807055A
-	cmp r0, 0x37
-	bgt _0807055A
-	cmp r1, 0x1F
-	bgt _0807055A
-	ldrh r1, [r5]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	bne _0807055A
-	ldr r0, [r5, 0x10]
-	cmp r0, 0
-	beq _080704E2
-	bl GetEntityType
-	cmp r0, 0x1
-	bne _0807055A
-_080704E2:
-	bl IsFixedDungeon
-	lsls r0, 24
-	cmp r0, 0
-	bne _08070504
-	adds r0, r7, 0
-	adds r0, 0xE4
-	ldrb r0, [r0]
-	cmp r0, 0x3
-	beq _08070552
-	adds r0, r6, 0
-	movs r1, 0x9
-	bl HasItem
-	lsls r0, 24
-	cmp r0, 0
-	bne _08070552
-_08070504:
-	movs r1, 0x2
-	ldrsh r0, [r7, r1]
-	bl GetCrossableTerrain
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldrh r0, [r5]
-	movs r5, 0x3
-	ands r5, r0
-	adds r0, r6, 0
-	movs r1, 0xC
-	bl HasIQSkill
-	lsls r0, 24
-	cmp r0, 0
-	beq _08070526
-	movs r4, 0x2
-_08070526:
-	adds r0, r6, 0
-	movs r1, 0xD
-	bl HasIQSkill
-	lsls r0, 24
-	cmp r0, 0
-	beq _08070536
-	movs r4, 0x3
-_08070536:
-	cmp r4, 0x1
-	beq _0807054A
-	cmp r4, 0x1
-	bgt _08070544
-	cmp r4, 0
-	beq _0807054E
-	b _08070552
-_08070544:
-	cmp r4, 0x2
-	beq _08070556
-	b _08070552
-_0807054A:
-	cmp r5, 0x2
-	beq _08070552
-_0807054E:
-	cmp r5, 0x1
-	bne _0807055A
-_08070552:
-	movs r0, 0
-	b _0807055C
-_08070556:
-	cmp r5, 0
-	bne _08070552
-_0807055A:
-	movs r0, 0x1
-_0807055C:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_807049C
-
-	thumb_func_start sub_8070564
-sub_8070564:
-	push {r4-r6,lr}
-	adds r4, r1, 0
-	ldr r6, [r0, 0x70]
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	movs r2, 0x2
-	ldrsh r1, [r4, r2]
-	bl GetMapTileAtPosition
-	adds r5, r0, 0
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	blt _080705E6
-	movs r2, 0x2
-	ldrsh r1, [r4, r2]
-	cmp r1, 0
-	blt _080705E6
-	cmp r0, 0x37
-	bgt _080705E6
-	cmp r1, 0x1F
-	bgt _080705E6
-	ldrh r1, [r5]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	bne _080705E6
-	ldr r0, [r5, 0x10]
-	cmp r0, 0
-	beq _080705A8
-	bl GetEntityType
-	cmp r0, 0x1
-	bne _080705E6
-_080705A8:
-	movs r1, 0x2
-	ldrsh r0, [r6, r1]
-	bl GetCrossableTerrain
-	lsls r0, 24
-	lsrs r2, r0, 24
-	adds r3, r2, 0
-	ldrh r0, [r5]
-	movs r1, 0x3
-	ands r1, r0
-	adds r0, r1, 0
-	cmp r2, 0x1
-	beq _080705DE
-	cmp r2, 0x1
-	bgt _080705CC
-	cmp r2, 0
-	beq _080705D8
-	b _080705D4
-_080705CC:
-	cmp r3, 0x3
-	bgt _080705D4
-	cmp r1, 0
-	beq _080705E6
-_080705D4:
-	movs r0, 0
-	b _080705E8
-_080705D8:
-	cmp r1, 0x1
-	bne _080705E6
-	b _080705D4
-_080705DE:
-	cmp r1, 0x2
-	beq _080705D4
-	cmp r0, 0x1
-	beq _080705D4
-_080705E6:
-	movs r0, 0x1
-_080705E8:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8070564
-
-	thumb_func_start sub_80705F0
-sub_80705F0:
-	push {r4-r7,lr}
-	adds r6, r0, 0
-	adds r4, r1, 0
-	ldr r7, [r6, 0x70]
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	movs r2, 0x2
-	ldrsh r1, [r4, r2]
-	bl GetMapTileAtPosition
-	adds r5, r0, 0
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	blt _0807069A
-	movs r2, 0x2
-	ldrsh r1, [r4, r2]
-	cmp r1, 0
-	blt _0807069A
-	cmp r0, 0x37
-	bgt _0807069A
-	cmp r1, 0x1F
-	bgt _0807069A
-	ldrh r1, [r5]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	bne _0807069A
-	ldr r0, [r5, 0x10]
-	cmp r0, 0
-	beq _08070636
-	bl GetEntityType
-	cmp r0, 0x1
-	bne _0807069A
-_08070636:
-	bl IsFixedDungeon
-	lsls r0, 24
-	cmp r0, 0
-	bne _08070658
-	adds r0, r7, 0
-	adds r0, 0xE4
-	ldrb r0, [r0]
-	cmp r0, 0x3
-	beq _08070696
-	adds r0, r6, 0
-	movs r1, 0x9
-	bl HasItem
-	lsls r0, 24
-	cmp r0, 0
-	bne _08070696
-_08070658:
-	movs r1, 0x2
-	ldrsh r0, [r7, r1]
-	bl GetCrossableTerrain
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldrh r0, [r5]
-	movs r5, 0x3
-	ands r5, r0
-	adds r0, r6, 0
-	movs r1, 0xC
-	bl HasIQSkill
-	lsls r0, 24
-	cmp r0, 0
-	beq _0807067A
-	movs r4, 0x2
-_0807067A:
-	adds r0, r6, 0
-	movs r1, 0xD
-	bl HasIQSkill
-	lsls r0, 24
-	cmp r0, 0
-	beq _0807068A
-	movs r4, 0x3
-_0807068A:
-	cmp r4, 0
-	blt _08070696
-	cmp r4, 0x2
-	bgt _08070696
-	cmp r5, 0
-	beq _0807069A
-_08070696:
-	movs r0, 0
-	b _0807069C
-_0807069A:
-	movs r0, 0x1
-_0807069C:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80705F0
-
-	thumb_func_start sub_80706A4
-sub_80706A4:
-	push {r4-r7,lr}
-	adds r7, r0, 0
-	adds r4, r1, 0
-	ldr r6, [r7, 0x70]
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	movs r2, 0x2
-	ldrsh r1, [r4, r2]
-	bl GetMapTileAtPosition
-	adds r5, r0, 0
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	blt _0807076A
-	movs r2, 0x2
-	ldrsh r1, [r4, r2]
-	cmp r1, 0
-	blt _0807076A
-	cmp r0, 0x37
-	bgt _0807076A
-	cmp r1, 0x1F
-	bgt _0807076A
-	ldrh r1, [r5]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	bne _0807076A
-	ldr r0, [r5, 0x10]
-	cmp r0, 0
-	beq _080706F2
-	bl GetEntityType
-	cmp r0, 0x1
-	bne _0807076A
-	ldr r0, [r5, 0x10]
-	ldr r0, [r0, 0x70]
-	cmp r0, r6
-	bne _0807076A
-_080706F2:
-	bl IsFixedDungeon
-	lsls r0, 24
-	cmp r0, 0
-	bne _08070714
-	adds r0, r6, 0
-	adds r0, 0xE4
-	ldrb r0, [r0]
-	cmp r0, 0x3
-	beq _08070762
-	adds r0, r7, 0
-	movs r1, 0x9
-	bl HasItem
-	lsls r0, 24
-	cmp r0, 0
-	bne _08070762
-_08070714:
-	movs r1, 0x2
-	ldrsh r0, [r6, r1]
-	bl GetCrossableTerrain
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldrh r0, [r5]
-	movs r5, 0x3
-	ands r5, r0
-	adds r0, r7, 0
-	movs r1, 0xC
-	bl HasIQSkill
-	lsls r0, 24
-	cmp r0, 0
-	beq _08070736
-	movs r4, 0x2
-_08070736:
-	adds r0, r7, 0
-	movs r1, 0xD
-	bl HasIQSkill
-	lsls r0, 24
-	cmp r0, 0
-	beq _08070746
-	movs r4, 0x3
-_08070746:
-	cmp r4, 0x1
-	beq _0807075A
-	cmp r4, 0x1
-	bgt _08070754
-	cmp r4, 0
-	beq _0807075E
-	b _08070762
-_08070754:
-	cmp r4, 0x2
-	beq _08070766
-	b _08070762
-_0807075A:
-	cmp r5, 0x2
-	beq _08070762
-_0807075E:
-	cmp r5, 0x1
-	bne _0807076A
-_08070762:
-	movs r0, 0
-	b _0807076C
-_08070766:
-	cmp r5, 0
-	bne _08070762
-_0807076A:
-	movs r0, 0x1
-_0807076C:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80706A4
-
-	thumb_func_start GetMovementSpeed
-GetMovementSpeed:
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	ldr r5, [r6, 0x70]
-	movs r4, 0
-	movs r0, 0x84
-	lsls r0, 1
-	adds r1, r5, r0
-	movs r2, 0x4
-_08070784:
-	ldrb r0, [r1, 0x5]
-	cmp r0, 0
-	beq _0807078C
-	subs r4, 0x1
-_0807078C:
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _08070794
-	adds r4, 0x1
-_08070794:
-	adds r1, 0x1
-	subs r2, 0x1
-	cmp r2, 0
-	bge _08070784
-	adds r0, r5, 0
-	adds r0, 0xAC
-	ldrb r0, [r0]
-	cmp r0, 0x4
-	bne _080707A8
-	subs r4, 0x1
-_080707A8:
-	movs r1, 0x2
-	ldrsh r0, [r5, r1]
-	bl GetMoveSpeed
-	adds r4, r0
-	adds r0, r6, 0
-	movs r1, 0x6
-	bl HasType
-	lsls r0, 24
-	cmp r0, 0
-	beq _080707D0
-	adds r0, r6, 0
-	bl GetWeather
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x7
-	bne _080707D0
-	adds r4, 0x1
-_080707D0:
-	movs r0, 0x4
-	ldrsh r1, [r5, r0]
-	ldr r0, _0807081C
-	cmp r1, r0
-	bne _080707DC
-	adds r4, 0x1
-_080707DC:
-	movs r0, 0x2
-	ldrsh r1, [r5, r0]
-	movs r0, 0xBE
-	lsls r0, 1
-	cmp r1, r0
-	bne _080707FE
-	ldrb r0, [r5, 0x6]
-	cmp r0, 0
-	beq _080707FE
-	ldr r0, _08070820
-	ldr r0, [r0]
-	ldr r1, _08070824
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _080707FE
-	adds r4, 0x1
-_080707FE:
-	cmp r4, 0
-	bge _08070804
-	movs r4, 0
-_08070804:
-	cmp r4, 0x4
-	ble _0807080A
-	movs r4, 0x4
-_0807080A:
-	movs r1, 0x82
-	lsls r1, 1
-	adds r0, r5, r1
-	str r4, [r0]
-	adds r0, r4, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0807081C: .4byte 0x000001a3
-_08070820: .4byte gDungeonGlobalData
-_08070824: .4byte 0x0000066e
-	thumb_func_end GetMovementSpeed
-
-	thumb_func_start sub_8070828
-sub_8070828:
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	lsls r1, 24
-	lsrs r6, r1, 24
-	movs r5, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	bne _08070840
-	movs r0, 0
-	b _080708AE
-_08070840:
-	adds r0, r4, 0
-	movs r1, 0x1B
-	bl HasAbility
-	lsls r0, 24
-	cmp r0, 0
-	beq _0807085E
-	adds r0, r4, 0
-	bl GetWeather
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x4
-	bne _0807085E
-	movs r5, 0x1
-_0807085E:
-	adds r0, r4, 0
-	movs r1, 0x4A
-	bl HasAbility
-	lsls r0, 24
-	cmp r0, 0
-	beq _0807087C
-	adds r0, r4, 0
-	bl GetWeather
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0807087C
-	movs r5, 0x1
-_0807087C:
-	cmp r6, 0
-	beq _080708A0
-	ldr r0, [r4, 0x70]
-	movs r1, 0x40
-	adds r2, r5, 0
-	bl SetVisualFlags
-	lsls r0, 24
-	cmp r0, 0
-	beq _080708A0
-	adds r0, r4, 0
-	bl sub_80429B4
-	ldr r0, _080708A8
-	ldr r1, [r0]
-	adds r0, r4, 0
-	bl SendMessage
-_080708A0:
-	cmp r5, 0
-	bne _080708AC
-	movs r0, 0x1
-	b _080708AE
-	.align 2, 0
-_080708A8: .4byte gUnknown_80FEE80
-_080708AC:
-	movs r0, 0x2
-_080708AE:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8070828
-
-	thumb_func_start SetMessageArgument_2
-SetMessageArgument_2:
-	push {r4,r5,lr}
-	adds r3, r0, 0
-	adds r4, r2, 0
-	ldr r0, _080708E8
-	ldr r2, [r0]
-	ldr r5, _080708EC
-	adds r0, r2, r5
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080708DC
-	adds r5, 0x6
-	adds r0, r2, r5
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080708DC
-	adds r0, r1, 0
-	adds r0, 0xE4
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _080708F4
-_080708DC:
-	ldrb r0, [r1, 0x6]
-	cmp r0, 0
-	beq _080708F4
-	ldr r0, _080708F0
-	b _08070900
-	.align 2, 0
-_080708E8: .4byte gDungeonGlobalData
-_080708EC: .4byte 0x0001820a
-_080708F0: .4byte gUnknown_80F8988
-_080708F4:
-	adds r0, r1, 0
-	adds r0, 0xC8
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _08070910
-	ldr r0, _0807090C
-_08070900:
-	ldr r1, [r0]
-	adds r0, r3, 0
-	bl strcpy
-	b _0807095A
-	.align 2, 0
-_0807090C: .4byte gUnknown_80F8968
-_08070910:
-	ldrb r0, [r1, 0x6]
-	cmp r0, 0
-	beq _08070942
-	adds r0, r1, 0
-	adds r0, 0x40
-	ldrb r0, [r0]
-	cmp r0, 0x4A
-	beq _0807092A
-	adds r0, r1, 0
-	adds r0, 0xA4
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _08070936
-_0807092A:
-	movs r0, 0x4
-	ldrsh r1, [r1, r0]
-	adds r0, r3, 0
-	bl CopyYellowSpeciesNametoBuffer
-	b _0807095A
-_08070936:
-	movs r5, 0x4
-	ldrsh r1, [r1, r5]
-	adds r0, r3, 0
-	bl CopyCyanSpeciesNametoBuffer
-	b _0807095A
-_08070942:
-	ldr r2, _08070960
-	ldrb r1, [r1, 0xA]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _08070964
-	adds r0, r1
-	ldr r1, [r2]
-	adds r1, r0
-	adds r0, r3, 0
-	adds r2, r4, 0
-	bl sub_808D9DC
-_0807095A:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08070960: .4byte gRecruitedPokemonRef
-_08070964: .4byte 0x00008df8
-	thumb_func_end SetMessageArgument_2
-
-	thumb_func_start sub_8070968
-sub_8070968:
-	push {r4,lr}
-	adds r4, r0, 0
-	adds r3, r2, 0
-	adds r0, r1, 0
-	adds r0, 0xC8
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _08070990
-	ldr r1, _08070988
-	adds r2, 0x30
-	ldr r0, _0807098C
-	ldr r3, [r0]
-	adds r0, r4, 0
-	bl ExpandPlaceholdersBuffer
-	b _080709BA
-	.align 2, 0
-_08070988: .4byte gUnknown_8106FA4
-_0807098C: .4byte gUnknown_80F8974
-_08070990:
-	ldrb r0, [r1, 0x6]
-	cmp r0, 0
-	beq _080709A2
-	movs r0, 0x4
-	ldrsh r1, [r1, r0]
-	adds r0, r4, 0
-	bl CopyCyanSpeciesNametoBuffer
-	b _080709BA
-_080709A2:
-	ldr r2, _080709C0
-	ldrb r1, [r1, 0xA]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _080709C4
-	adds r0, r1
-	ldr r1, [r2]
-	adds r1, r0
-	adds r0, r4, 0
-	adds r2, r3, 0
-	bl sub_808D9DC
-_080709BA:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080709C0: .4byte gRecruitedPokemonRef
-_080709C4: .4byte 0x00008df8
-	thumb_func_end sub_8070968
-
-	thumb_func_start sub_80709C8
-sub_80709C8:
-	push {r4,lr}
-	adds r3, r0, 0
-	ldr r0, _080709F8
-	ldr r2, [r0]
-	ldr r4, _080709FC
-	adds r0, r2, r4
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080709EE
-	adds r4, 0x6
-	adds r0, r2, r4
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080709EE
-	adds r0, r1, 0
-	adds r0, 0xE4
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _08070A04
-_080709EE:
-	ldrb r0, [r1, 0x6]
-	cmp r0, 0
-	beq _08070A04
-	ldr r0, _08070A00
-	b _08070A10
-	.align 2, 0
-_080709F8: .4byte gDungeonGlobalData
-_080709FC: .4byte 0x0001820a
-_08070A00: .4byte gUnknown_80F8994
-_08070A04:
-	adds r0, r1, 0
-	adds r0, 0xC8
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _08070A20
-	ldr r0, _08070A1C
-_08070A10:
-	ldr r1, [r0]
-	adds r0, r3, 0
-	bl strcpy
-	b _08070A48
-	.align 2, 0
-_08070A1C: .4byte gUnknown_80F8974
-_08070A20:
-	ldrb r0, [r1, 0x6]
-	cmp r0, 0
-	beq _08070A32
-	movs r0, 0x4
-	ldrsh r1, [r1, r0]
-	adds r0, r3, 0
-	bl CopySpeciesNametoBuffer
-	b _08070A48
-_08070A32:
-	ldr r2, _08070A50
-	ldrb r1, [r1, 0xA]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _08070A54
-	adds r0, r1
-	ldr r1, [r2]
-	adds r1, r0
-	adds r0, r3, 0
-	bl sub_808DA0C
-_08070A48:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08070A50: .4byte gRecruitedPokemonRef
-_08070A54: .4byte 0x00008df8
-	thumb_func_end sub_80709C8
-
 	.align 2, 0
\ No newline at end of file