28 files changed, 2784 insertions, 2814 deletions

diff --git a/asm/code_80428A0.s b/asm/code_80428A0.s
index bb4e09e..5febc6a 100644
--- a/asm/code_80428A0.s
+++ b/asm/code_80428A0.s
@@ -2853,1348 +2853,4 @@ _080441E2:
 	bx r1
 	thumb_func_end IsBossBattle
 
-	thumb_func_start IsFixedDungeon
-IsFixedDungeon:
-	push {lr}
-	ldr r0, _08044200
-	ldr r0, [r0]
-	ldr r1, _08044204
-	adds r0, r1
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0x3F
-	bgt _08044208
-	movs r0, 0
-	b _0804420A
-	.align 2, 0
-_08044200: .4byte gDungeonGlobalData
-_08044204: .4byte 0x00003a0e
-_08044208:
-	movs r0, 0x1
-_0804420A:
-	pop {r1}
-	bx r1
-	thumb_func_end IsFixedDungeon
-
-	thumb_func_start sub_8044210
-sub_8044210:
-	push {lr}
-	ldr r0, _0804422C
-	ldr r0, [r0]
-	ldr r1, _08044230
-	adds r0, r1
-	ldrb r0, [r0]
-	subs r0, 0x4B
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x16
-	bls _08044234
-	movs r0, 0
-	b _08044236
-	.align 2, 0
-_0804422C: .4byte gDungeonGlobalData
-_08044230: .4byte 0x00000644
-_08044234:
-	movs r0, 0x1
-_08044236:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8044210
-
-	thumb_func_start RunDungeon
-RunDungeon:
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _080442C6
-	bl sub_8044994
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _080442C6
-	adds r0, r4, 0
-	bl xxx_dungeon_80442D0
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _080442C6
-	cmp r4, 0
-	beq _08044280
-	bl sub_807E378
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _080442C6
-_08044280:
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _080442C6
-	bl sub_8044574
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _080442C6
-	bl sub_8044820
-	bl sub_8044B28
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	bne _080442C6
-	bl sub_8044AB4
-	ldr r0, _080442CC
-	ldr r0, [r0]
-	movs r2, 0xCC
-	lsls r2, 3
-	adds r1, r0, r2
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x18
-	bne _080442C6
-	strh r4, [r1]
-_080442C6:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080442CC: .4byte gDungeonGlobalData
-	thumb_func_end RunDungeon
-
-	thumb_func_start xxx_dungeon_80442D0
-xxx_dungeon_80442D0:
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r7, r0, 24
-	bl GetLeaderEntity
-	adds r5, r0, 0
-	cmp r5, 0
-	beq _0804431A
-	bl TriggerWeatherAbilities
-	adds r0, r5, 0
-	bl GetMovementSpeed
-	ldr r3, _08044320
-	ldr r1, _08044324
-	ldr r1, [r1]
-	movs r2, 0xCC
-	lsls r2, 3
-	adds r1, r2
-	movs r2, 0
-	ldrsh r1, [r1, r2]
-	lsls r1, 1
-	movs r2, 0x32
-	muls r0, r2
-	adds r1, r0
-	adds r1, r3
-	movs r3, 0
-	ldrsh r0, [r1, r3]
-	cmp r0, 0
-	beq _0804431A
-	ldr r0, [r5, 0x70]
-	movs r1, 0xA4
-	lsls r1, 1
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08044328
-_0804431A:
-	movs r0, 0
-	b _0804444E
-	.align 2, 0
-_08044320: .4byte gSpeedTurns
-_08044324: .4byte gDungeonGlobalData
-_08044328:
-	bl GetLeaderEntity
-	adds r5, r0, 0
-	cmp r5, 0
-	beq _0804431A
-	movs r0, 0
-	bl UseAttack
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804435C
-	ldr r0, _08044388
-	ldr r1, [r0]
-	ldr r2, _0804438C
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08044356
-	ldr r3, _08044390
-	adds r0, r1, r3
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0804435C
-_08044356:
-	movs r0, 0xC
-	bl sub_803E46C
-_0804435C:
-	ldr r0, [r5, 0x70]
-	adds r0, 0xF8
-	movs r1, 0
-	strb r1, [r0]
-	bl sub_8044B28
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0
-	bne _0804431A
-	ldr r0, _08044388
-	ldr r1, [r0]
-	adds r0, r1, 0
-	adds r0, 0xB8
-	str r5, [r0]
-	adds r1, 0xBC
-	str r2, [r1]
-	cmp r7, 0
-	beq _08044394
-	movs r7, 0
-	b _0804439A
-	.align 2, 0
-_08044388: .4byte gDungeonGlobalData
-_0804438C: .4byte 0x0000066c
-_08044390: .4byte 0x00000673
-_08044394:
-	adds r0, r5, 0
-	bl TickStatusHeal
-_0804439A:
-	bl sub_8044B28
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	bne _0804431A
-	adds r0, r5, 0
-	bl sub_8071DA4
-	ldr r6, _08044434
-	ldr r1, [r6]
-	movs r0, 0x1
-	strb r0, [r1, 0xF]
-	bl sub_805D8C8
-	ldr r0, [r6]
-	strb r4, [r0, 0xF]
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804444C
-	adds r0, r5, 0
-	bl sub_8072CF4
-	bl sub_8086AC0
-	movs r0, 0
-	bl sub_8043ED0
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804444C
-	ldr r2, [r5, 0x70]
-	ldrh r1, [r2]
-	movs r3, 0x80
-	lsls r3, 8
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _08044400
-	subs r3, 0x1
-	adds r0, r3, 0
-	ands r0, r1
-	movs r3, 0x80
-	lsls r3, 7
-	adds r1, r3, 0
-	orrs r0, r1
-	strh r0, [r2]
-_08044400:
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804444C
-	bl sub_8044454
-	bl sub_8044B28
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	bne _0804444C
-	ldr r2, [r6]
-	adds r0, r2, 0
-	adds r0, 0xBC
-	ldr r1, [r0]
-	cmp r1, 0
-	beq _08044438
-	bl sub_805F02C
-	ldr r0, [r6]
-	adds r0, 0xBC
-	str r4, [r0]
-	movs r7, 0x1
-	b _08044328
-	.align 2, 0
-_08044434: .4byte gDungeonGlobalData
-_08044438:
-	ldr r0, [r5, 0x70]
-	adds r0, 0xF8
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0804444C
-	movs r3, 0xCC
-	lsls r3, 3
-	adds r0, r2, r3
-	strh r1, [r0]
-	b _08044328
-_0804444C:
-	movs r0, 0x1
-_0804444E:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end xxx_dungeon_80442D0
-
-	thumb_func_start sub_8044454
-sub_8044454:
-	push {r4-r6,lr}
-	ldr r0, _080444E8
-	ldr r1, [r0]
-	ldrb r0, [r1, 0xE]
-	cmp r0, 0
-	beq _080444E2
-	movs r0, 0
-	strb r0, [r1, 0xE]
-	movs r6, 0
-_08044466:
-	ldr r0, _080444E8
-	ldr r0, [r0]
-	lsls r1, r6, 2
-	ldr r2, _080444EC
-	adds r0, r2
-	adds r0, r1
-	ldr r4, [r0]
-	adds r0, r4, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _080444DC
-	ldr r5, [r4, 0x70]
-	ldrh r0, [r5]
-	movs r2, 0x80
-	lsls r2, 8
-	adds r1, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _080444DC
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _080444E2
-	adds r0, r4, 0
-	bl TickStatusHeal
-	adds r0, r4, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _080444DC
-	adds r0, r4, 0
-	bl sub_8071DA4
-	adds r0, r4, 0
-	movs r1, 0
-	bl DecideAction
-	adds r0, r4, 0
-	bl sub_8072CF4
-	bl sub_8086AC0
-	movs r0, 0
-	bl sub_8043ED0
-	ldrh r0, [r5]
-	ldr r2, _080444F0
-	adds r1, r2, 0
-	ands r0, r1
-	movs r2, 0x80
-	lsls r2, 7
-	adds r1, r2, 0
-	orrs r0, r1
-	strh r0, [r5]
-_080444DC:
-	adds r6, 0x1
-	cmp r6, 0x13
-	ble _08044466
-_080444E2:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080444E8: .4byte gDungeonGlobalData
-_080444EC: .4byte 0x000135cc
-_080444F0: .4byte 0x00007fff
-	thumb_func_end sub_8044454
-
-	thumb_func_start sub_80444F4
-sub_80444F4:
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	bl GetLeaderEntity
-	cmp r6, r0
-	bne _08044566
-	ldr r0, _0804456C
-	ldr r1, [r0]
-	ldrb r0, [r1, 0xE]
-	cmp r0, 0
-	beq _08044566
-	movs r0, 0
-	strb r0, [r1, 0xE]
-	movs r5, 0
-_08044510:
-	ldr r0, _0804456C
-	ldr r0, [r0]
-	lsls r1, r5, 2
-	ldr r2, _08044570
-	adds r0, r2
-	adds r0, r1
-	ldr r4, [r0]
-	adds r0, r4, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _08044560
-	cmp r6, r4
-	beq _08044560
-	ldr r0, [r4, 0x70]
-	ldrh r0, [r0]
-	movs r2, 0x80
-	lsls r2, 8
-	adds r1, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _08044560
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _08044566
-	adds r0, r4, 0
-	movs r1, 0
-	bl DecideAction
-	adds r0, r4, 0
-	bl sub_8072CF4
-	bl sub_8086AC0
-	movs r0, 0
-	bl sub_8043ED0
-_08044560:
-	adds r5, 0x1
-	cmp r5, 0x13
-	ble _08044510
-_08044566:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804456C: .4byte gDungeonGlobalData
-_08044570: .4byte 0x000135cc
-	thumb_func_end sub_80444F4
-
-	thumb_func_start sub_8044574
-sub_8044574:
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x44
-	bl GetLeaderEntity
-	mov r10, r0
-	movs r7, 0
-	mov r0, sp
-	adds r0, 0x4
-	str r0, [sp, 0x40]
-	ldr r1, _08044634
-	mov r9, r1
-_08044592:
-	mov r2, r9
-	ldr r0, [r2]
-	lsls r1, r7, 2
-	ldr r3, _08044638
-	adds r0, r3
-	adds r0, r1
-	ldr r5, [r0]
-	adds r0, r5, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _080446A4
-	ldr r6, [r5, 0x70]
-	mov r8, r6
-	ldrb r0, [r6, 0x7]
-	cmp r0, 0
-	bne _080446A4
-	bl sub_8044B28
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	bne _080446AC
-	mov r1, r9
-	ldr r0, [r1]
-	adds r0, 0xB8
-	str r5, [r0]
-	bl TriggerWeatherAbilities
-	movs r2, 0xA2
-	lsls r2, 1
-	adds r0, r6, r2
-	strb r4, [r0]
-	adds r0, r5, 0
-	bl GetMovementSpeed
-	mov r3, r9
-	ldr r1, [r3]
-	movs r2, 0xCC
-	lsls r2, 3
-	adds r1, r2
-	movs r3, 0
-	ldrsh r1, [r1, r3]
-	lsls r1, 1
-	movs r2, 0x32
-	muls r0, r2
-	adds r1, r0
-	ldr r0, _0804463C
-	adds r1, r0
-	movs r2, 0
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	beq _080446A4
-	movs r3, 0xA4
-	lsls r3, 1
-	adds r0, r6, r3
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080446A4
-	ldrh r1, [r6]
-	movs r2, 0x80
-	lsls r2, 8
-	adds r0, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _080446A4
-	movs r3, 0x80
-	lsls r3, 7
-	adds r0, r3, 0
-	ands r0, r1
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0
-	beq _08044644
-	ldr r2, _08044640
-	adds r0, r2, 0
-	ands r0, r1
-	strh r0, [r6]
-	b _080446A4
-	.align 2, 0
-_08044634: .4byte gDungeonGlobalData
-_08044638: .4byte 0x0001357c
-_0804463C: .4byte gSpeedTurns
-_08044640: .4byte 0x0000bfff
-_08044644:
-	ldr r1, _08044668
-	add r1, r8
-	strb r0, [r1]
-	adds r0, r5, 0
-	bl TickStatusHeal
-	adds r0, r5, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _080446A4
-	adds r0, r5, 0
-	bl sub_8071DA4
-	movs r4, 0
-	b _0804466E
-	.align 2, 0
-_08044668: .4byte 0x00000145
-_0804466C:
-	adds r4, 0x1
-_0804466E:
-	cmp r4, 0x2
-	bgt _080446A4
-	adds r0, r5, 0
-	movs r1, 0
-	bl DecideAction
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _080446A4
-	adds r0, r5, 0
-	bl sub_8072CF4
-	lsls r0, 24
-	cmp r0, 0
-	beq _080446A4
-	bl sub_8086AC0
-	movs r0, 0
-	bl sub_8043ED0
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	beq _0804466C
-_080446A4:
-	adds r7, 0x1
-	cmp r7, 0x3
-	bgt _080446AC
-	b _08044592
-_080446AC:
-	movs r0, 0
-	mov r8, r0
-_080446B0:
-	adds r0, 0x1
-	mov r9, r0
-	add r2, sp, 0x8
-	ldr r1, [sp, 0x40]
-	mov r0, sp
-	movs r7, 0x2
-_080446BC:
-	mov r3, r8
-	str r3, [r0]
-	str r2, [r1]
-	adds r2, 0x8
-	adds r1, 0x8
-	adds r0, 0x8
-	subs r7, 0x1
-	cmp r7, 0
-	bge _080446BC
-	str r3, [sp, 0x18]
-	str r3, [sp, 0x1C]
-	movs r7, 0
-_080446D4:
-	ldr r0, _08044710
-	ldr r0, [r0]
-	lsls r1, r7, 2
-	ldr r2, _08044714
-	adds r0, r2
-	adds r0, r1
-	ldr r4, [r0]
-	adds r0, r4, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _08044760
-	ldr r1, [r4, 0x70]
-	movs r3, 0xA2
-	lsls r3, 1
-	adds r2, r1, r3
-	ldrb r0, [r2]
-	cmp r0, 0
-	beq _08044760
-	ldrb r0, [r1, 0x7]
-	cmp r0, 0
-	beq _08044718
-	adds r3, 0x1
-	adds r0, r1, r3
-	mov r1, r8
-	strb r1, [r0]
-	strb r1, [r2]
-	b _08044760
-	.align 2, 0
-_08044710: .4byte gDungeonGlobalData
-_08044714: .4byte 0x0001357c
-_08044718:
-	mov r2, r10
-	movs r3, 0x4
-	ldrsh r1, [r2, r3]
-	movs r2, 0x4
-	ldrsh r0, [r4, r2]
-	subs r2, r1, r0
-	cmp r2, 0
-	bge _0804472A
-	negs r2, r2
-_0804472A:
-	mov r3, r10
-	movs r0, 0x6
-	ldrsh r1, [r3, r0]
-	movs r3, 0x6
-	ldrsh r0, [r4, r3]
-	subs r1, r0
-	cmp r1, 0
-	bge _0804473C
-	negs r1, r1
-_0804473C:
-	cmp r1, r2
-	bge _08044742
-	adds r1, r2, 0
-_08044742:
-	cmp r1, 0x2
-	ble _08044748
-	movs r1, 0x2
-_08044748:
-	add r3, sp, 0x20
-	lsls r0, r7, 3
-	adds r3, r0
-	str r4, [r3]
-	add r2, sp, 0x24
-	adds r2, r0
-	lsls r1, 3
-	ldr r0, [sp, 0x40]
-	adds r1, r0, r1
-	ldr r0, [r1]
-	str r0, [r2]
-	str r3, [r1]
-_08044760:
-	adds r7, 0x1
-	cmp r7, 0x3
-	ble _080446D4
-	mov r5, sp
-	movs r6, 0
-_0804476A:
-	ldr r4, [r5]
-	cmp r4, 0
-	beq _080447A0
-	ldr r1, [r4, 0x70]
-	ldr r3, _08044814
-	adds r2, r1, r3
-	movs r0, 0x1
-	strb r0, [r2]
-	movs r2, 0xA2
-	lsls r2, 1
-	adds r0, r1, r2
-	strb r6, [r0]
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl DecideAction
-	adds r0, r4, 0
-	bl sub_8072CF4
-	bl sub_8086AC0
-	movs r0, 0
-	bl sub_8043ED0
-	adds r0, r4, 0
-	bl EntityExists
-_080447A0:
-	ldr r5, [r5, 0x4]
-	cmp r5, 0
-	bne _0804476A
-	mov r0, r9
-	cmp r0, 0x2
-	ble _080446B0
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _08044802
-	movs r7, 0
-_080447B8:
-	ldr r0, _08044818
-	ldr r0, [r0]
-	lsls r1, r7, 2
-	ldr r3, _0804481C
-	adds r0, r3
-	adds r0, r1
-	ldr r4, [r0]
-	adds r0, r4, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _080447FC
-	ldr r0, [r4, 0x70]
-	movs r1, 0xA2
-	lsls r1, 1
-	adds r5, r0, r1
-	ldrb r0, [r5]
-	cmp r0, 0
-	beq _080447FC
-	adds r0, r4, 0
-	bl sub_8074094
-	adds r0, r4, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _080447FC
-	adds r0, r4, 0
-	bl sub_8071DA4
-	movs r0, 0
-	strb r0, [r5]
-_080447FC:
-	adds r7, 0x1
-	cmp r7, 0x3
-	ble _080447B8
-_08044802:
-	add sp, 0x44
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08044814: .4byte 0x00000145
-_08044818: .4byte gDungeonGlobalData
-_0804481C: .4byte 0x0001357c
-	thumb_func_end sub_8044574
-
-	thumb_func_start sub_8044820
-sub_8044820:
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	movs r7, 0
-	ldr r0, _08044830
-	mov r8, r0
-	b _080448FC
-	.align 2, 0
-_08044830: .4byte gSpeedTurns
-_08044834:
-	ldr r4, [r5, 0x70]
-	ldr r0, [r6]
-	adds r0, 0xB8
-	str r5, [r0]
-	bl TriggerWeatherAbilities
-	ldrh r2, [r4]
-	movs r1, 0x80
-	lsls r1, 8
-	adds r0, r1, 0
-	ands r0, r2
-	cmp r0, 0
-	bne _080448FA
-	movs r1, 0x80
-	lsls r1, 7
-	adds r0, r1, 0
-	ands r0, r2
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r1, 0
-	beq _0804486C
-	ldr r1, _08044868
-	adds r0, r1, 0
-	ands r0, r2
-	strh r0, [r4]
-	b _080448FA
-	.align 2, 0
-_08044868: .4byte 0x0000bfff
-_0804486C:
-	movs r2, 0xA2
-	lsls r2, 1
-	adds r0, r4, r2
-	strb r1, [r0]
-	adds r0, r5, 0
-	bl GetMovementSpeed
-	ldr r1, [r6]
-	movs r2, 0xCC
-	lsls r2, 3
-	adds r1, r2
-	movs r2, 0
-	ldrsh r1, [r1, r2]
-	lsls r1, 1
-	movs r2, 0x32
-	muls r0, r2
-	adds r1, r0
-	add r1, r8
-	movs r2, 0
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	beq _080448FA
-	movs r1, 0xA4
-	lsls r1, 1
-	adds r0, r4, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _080448FA
-	ldrh r1, [r4]
-	ldr r2, _08044984
-	adds r0, r2, 0
-	ands r1, r0
-	movs r0, 0
-	strh r1, [r4]
-	ldr r2, _08044988
-	adds r1, r4, r2
-	strb r0, [r1]
-	adds r0, r5, 0
-	bl TickStatusHeal
-	adds r0, r5, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _080448FA
-	adds r0, r5, 0
-	bl sub_8071DA4
-	adds r0, r5, 0
-	movs r1, 0
-	bl DecideAction
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _08044924
-	adds r0, r5, 0
-	bl sub_8072CF4
-	bl sub_8086AC0
-	movs r0, 0
-	bl sub_8043ED0
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _08044924
-_080448FA:
-	adds r7, 0x1
-_080448FC:
-	cmp r7, 0xF
-	bgt _08044924
-	ldr r6, _0804498C
-	ldr r0, [r6]
-	lsls r1, r7, 2
-	ldr r2, _08044990
-	adds r0, r2
-	adds r0, r1
-	ldr r5, [r0]
-	adds r0, r5, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _080448FA
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	beq _08044834
-_08044924:
-	bl sub_8044B28
-	lsls r0, 24
-	cmp r0, 0
-	bne _0804497A
-	movs r7, 0
-_08044930:
-	ldr r0, _0804498C
-	ldr r0, [r0]
-	lsls r1, r7, 2
-	ldr r2, _08044990
-	adds r0, r2
-	adds r0, r1
-	ldr r4, [r0]
-	adds r0, r4, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _08044974
-	ldr r0, [r4, 0x70]
-	movs r1, 0xA2
-	lsls r1, 1
-	adds r5, r0, r1
-	ldrb r0, [r5]
-	cmp r0, 0
-	beq _08044974
-	adds r0, r4, 0
-	bl sub_8074094
-	adds r0, r4, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _08044974
-	adds r0, r4, 0
-	bl sub_8071DA4
-	movs r0, 0
-	strb r0, [r5]
-_08044974:
-	adds r7, 0x1
-	cmp r7, 0xF
-	ble _08044930
-_0804497A:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08044984: .4byte 0x00003fff
-_08044988: .4byte 0x00000145
-_0804498C: .4byte gDungeonGlobalData
-_08044990: .4byte 0x0001358c
-	thumb_func_end sub_8044820
-
-	thumb_func_start sub_8044994
-sub_8044994:
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	ldr r1, _08044A94
-	ldr r4, _08044A98
-	ldr r0, [r4]
-	movs r2, 0xCC
-	lsls r2, 3
-	adds r0, r2
-	movs r3, 0
-	ldrsh r0, [r0, r3]
-	lsls r0, 1
-	adds r1, 0x32
-	adds r0, r1
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	beq _08044A8A
-	bl sub_8071B48
-	ldr r0, [r4]
-	ldr r2, _08044A9C
-	adds r0, r2
-	movs r2, 0
-	strb r2, [r0]
-	ldr r0, [r4]
-	ldr r3, _08044AA0
-	adds r0, r3
-	strb r2, [r0]
-	ldr r0, [r4]
-	ldr r1, _08044AA4
-	adds r0, r1
-	strb r2, [r0]
-	ldr r0, [r4]
-	adds r3, 0x2
-	adds r0, r3
-	strb r2, [r0]
-	ldr r0, [r4]
-	ldr r3, _08044AA8
-	adds r1, r0, r3
-	str r2, [r1]
-	ldr r1, _08044AAC
-	adds r0, r1
-	movs r1, 0x2
-	str r1, [r0]
-	mov r8, r2
-	adds r7, r4, 0
-_080449F2:
-	ldr r0, [r7]
-	mov r2, r8
-	lsls r1, r2, 2
-	ldr r3, _08044AB0
-	adds r0, r3
-	adds r0, r1
-	ldr r5, [r0]
-	adds r0, r5, 0
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _08044A7A
-	ldr r0, [r5, 0x70]
-	adds r4, r0, 0
-	movs r0, 0xA4
-	lsls r0, 1
-	adds r1, r4, r0
-	movs r0, 0
-	strb r0, [r1]
-	ldrb r0, [r4, 0x6]
-	movs r6, 0x1
-	cmp r0, 0
-	beq _08044A24
-	movs r6, 0
-_08044A24:
-	adds r0, r5, 0
-	movs r1, 0x32
-	bl HasAbility
-	lsls r0, 24
-	cmp r0, 0
-	beq _08044A46
-	ldr r1, [r7]
-	ldr r2, _08044AA8
-	adds r0, r1, r2
-	str r5, [r0]
-	ldr r3, _08044AAC
-	adds r1, r3
-	adds r0, r4, 0
-	adds r0, 0x98
-	ldr r0, [r0]
-	str r0, [r1]
-_08044A46:
-	adds r0, r5, 0
-	movs r1, 0x3F
-	bl HasAbility
-	lsls r0, 24
-	cmp r0, 0
-	beq _08044A60
-	ldr r0, [r7]
-	ldr r1, _08044AA4
-	adds r0, r1
-	adds r0, r6
-	movs r1, 0x1
-	strb r1, [r0]
-_08044A60:
-	adds r0, r5, 0
-	movs r1, 0x38
-	bl HasAbility
-	lsls r0, 24
-	cmp r0, 0
-	beq _08044A7A
-	ldr r0, [r7]
-	ldr r2, _08044A9C
-	adds r0, r2
-	adds r0, r6
-	movs r1, 0x1
-	strb r1, [r0]
-_08044A7A:
-	movs r3, 0x1
-	add r8, r3
-	mov r0, r8
-	cmp r0, 0x13
-	ble _080449F2
-	movs r0, 0
-	bl sub_8043ED0
-_08044A8A:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08044A94: .4byte gSpeedTurns
-_08044A98: .4byte gDungeonGlobalData
-_08044A9C: .4byte 0x000037f8
-_08044AA0: .4byte 0x000037f9
-_08044AA4: .4byte 0x000037fa
-_08044AA8: .4byte 0x00017b2c
-_08044AAC: .4byte 0x00017b38
-_08044AB0: .4byte 0x000135cc
-	thumb_func_end sub_8044994
-
-	thumb_func_start sub_8044AB4
-sub_8044AB4:
-	push {r4,lr}
-	ldr r1, _08044ADC
-	ldr r0, _08044AE0
-	ldr r0, [r0]
-	movs r2, 0xCC
-	lsls r2, 3
-	adds r0, r2
-	movs r2, 0
-	ldrsh r0, [r0, r2]
-	adds r0, 0x1
-	lsls r0, 1
-	adds r1, 0x32
-	adds r0, r1
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	beq _08044B1A
-	movs r4, 0
-	b _08044AE6
-	.align 2, 0
-_08044ADC: .4byte gSpeedTurns
-_08044AE0: .4byte gDungeonGlobalData
-_08044AE4:
-	adds r4, 0x1
-_08044AE6:
-	cmp r4, 0x13
-	bgt _08044B08
-	ldr r0, _08044B20
-	ldr r0, [r0]
-	lsls r1, r4, 2
-	ldr r2, _08044B24
-	adds r0, r2
-	adds r0, r1
-	ldr r0, [r0]
-	bl EntityExists
-	lsls r0, 24
-	cmp r0, 0
-	beq _08044AE4
-	movs r0, 0
-	bl UseAttack
-_08044B08:
-	movs r0, 0x1
-	movs r1, 0
-	bl sub_807EAA0
-	bl sub_8086AC0
-	movs r0, 0
-	bl sub_8043ED0
-_08044B1A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08044B20: .4byte gDungeonGlobalData
-_08044B24: .4byte 0x000135cc
-	thumb_func_end sub_8044AB4
-
-	thumb_func_start sub_8044B28
-sub_8044B28:
-	push {r4,lr}
-	ldr r4, _08044B48
-	ldr r0, [r4]
-	ldrb r0, [r0, 0x4]
-	cmp r0, 0
-	bne _08044B76
-	bl GetLeaderEntity
-	cmp r0, 0
-	bne _08044B50
-	ldr r0, [r4]
-	ldr r1, _08044B4C
-	adds r0, r1
-	movs r1, 0x1
-	strb r1, [r0]
-	b _08044B76
-	.align 2, 0
-_08044B48: .4byte gDungeonGlobalData
-_08044B4C: .4byte 0x00000654
-_08044B50:
-	ldr r0, [r4]
-	ldrb r2, [r0, 0x2]
-	cmp r2, 0x1
-	bne _08044B68
-	ldr r2, _08044B64
-	adds r1, r0, r2
-	movs r0, 0x2
-	strb r0, [r1]
-	b _08044B76
-	.align 2, 0
-_08044B64: .4byte 0x00000654
-_08044B68:
-	cmp r2, 0x2
-	beq _08044B70
-	movs r0, 0
-	b _08044B78
-_08044B70:
-	ldr r1, _08044B80
-	adds r0, r1
-	strb r2, [r0]
-_08044B76:
-	movs r0, 0x1
-_08044B78:
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08044B80: .4byte 0x00000654
-	thumb_func_end sub_8044B28
-
-	thumb_func_start sub_8044B84
-sub_8044B84:
-	push {lr}
-	ldr r0, _08044B9C
-	ldr r0, [r0]
-	ldrb r0, [r0, 0x10]
-	cmp r0, 0
-	bne _08044BA0
-	bl sub_8044B28
-	lsls r0, 24
-	lsrs r0, 24
-	b _08044BA2
-	.align 2, 0
-_08044B9C: .4byte gDungeonGlobalData
-_08044BA0:
-	movs r0, 0x1
-_08044BA2:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8044B84
-
-	thumb_func_start sub_8044BA8
-sub_8044BA8:
-	push {r4,r5,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	lsls r1, 24
-	lsrs r5, r1, 24
-	cmp r4, 0x26
-	bne _08044BCC
-	bl sub_8043D10
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x2
-	bne _08044BCC
-	ldr r0, _08044BC8
-	b _08044C02
-	.align 2, 0
-_08044BC8: .4byte gUnknown_80F91EC
-_08044BCC:
-	ldr r1, _08044BEC
-	lsls r0, r4, 3
-	adds r4, r0, r1
-	ldr r0, [r4]
-	ldr r1, _08044BF0
-	bl strcmp
-	cmp r0, 0
-	beq _08044BE0
-	movs r0, 0x1
-_08044BE0:
-	lsls r0, 24
-	cmp r0, 0
-	beq _08044BF4
-	ldr r0, [r4]
-	b _08044C04
-	.align 2, 0
-_08044BEC: .4byte gUnknown_80F7C50
-_08044BF0: .4byte gUnknown_80F697C
-_08044BF4:
-	ldr r4, _08044C0C
-	adds r0, r5, 0
-	bl GetItemCategory
-	lsls r0, 3
-	adds r4, 0x4
-	adds r0, r4
-_08044C02:
-	ldr r0, [r0]
-_08044C04:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08044C0C: .4byte gActions
-	thumb_func_end sub_8044BA8
-
-	thumb_func_start sub_8044C10
-sub_8044C10:
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl sub_8083654
-	adds r2, r0, 0
-	adds r1, r2, 0
-	adds r1, 0x44
-	movs r3, 0
-	movs r0, 0
-	strh r0, [r1]
-	cmp r4, 0
-	beq _08044C44
-	adds r0, r2, 0
-	adds r0, 0x48
-	strb r3, [r0]
-	adds r0, 0x8
-	strb r3, [r0]
-	adds r1, 0x14
-	ldr r0, _08044C4C
-	strh r0, [r1]
-	adds r1, 0x2
-	movs r0, 0x1
-	negs r0, r0
-	strh r0, [r1]
-_08044C44:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08044C4C: .4byte 0x0000ffff
-	thumb_func_end sub_8044C10
-
-	thumb_func_start sub_8044C50
-sub_8044C50:
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	bl sub_8083654
-	adds r2, r0, 0
-	adds r0, 0x44
-	movs r1, 0
-	strh r4, [r0]
-	adds r0, 0x4
-	strb r1, [r0]
-	adds r0, 0x8
-	strb r1, [r0]
-	adds r1, r2, 0
-	adds r1, 0x58
-	ldr r0, _08044C84
-	strh r0, [r1]
-	adds r1, 0x2
-	movs r0, 0x1
-	negs r0, r0
-	strh r0, [r1]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08044C84: .4byte 0x0000ffff
-	thumb_func_end sub_8044C50
-
-	thumb_func_start ResetAction
-ResetAction:
-	movs r2, 0
-	movs r1, 0
-	strh r1, [r0]
-	strb r2, [r0, 0x4]
-	strb r2, [r0, 0xC]
-	bx lr
-	thumb_func_end ResetAction
-
-	.align 2, 0
+	.align 2, 0
\ No newline at end of file
diff --git a/asm/code_8044210.s b/asm/code_8044210.s
new file mode 100644
index 0000000..282af3b
--- /dev/null
+++ b/asm/code_8044210.s
@@ -0,0 +1,1329 @@
+	#include "asm/constants/gba_constants.inc"
+  	#include "asm/macros.inc"
+
+  	.syntax unified
+
+  	.text
+  
+	thumb_func_start sub_8044210
+sub_8044210:
+	push {lr}
+	ldr r0, _0804422C
+	ldr r0, [r0]
+	ldr r1, _08044230
+	adds r0, r1
+	ldrb r0, [r0]
+	subs r0, 0x4B
+	lsls r0, 24
+	lsrs r0, 24
+	cmp r0, 0x16
+	bls _08044234
+	movs r0, 0
+	b _08044236
+	.align 2, 0
+_0804422C: .4byte gDungeonGlobalData
+_08044230: .4byte 0x00000644
+_08044234:
+	movs r0, 0x1
+_08044236:
+	pop {r1}
+	bx r1
+	thumb_func_end sub_8044210
+
+	thumb_func_start RunDungeon
+RunDungeon:
+	push {r4,lr}
+	lsls r0, 24
+	lsrs r4, r0, 24
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _080442C6
+	bl sub_8044994
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _080442C6
+	adds r0, r4, 0
+	bl xxx_dungeon_80442D0
+	lsls r0, 24
+	lsrs r4, r0, 24
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _080442C6
+	cmp r4, 0
+	beq _08044280
+	bl sub_807E378
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _080442C6
+_08044280:
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _080442C6
+	bl sub_8044574
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _080442C6
+	bl sub_8044820
+	bl sub_8044B28
+	lsls r0, 24
+	lsrs r4, r0, 24
+	cmp r4, 0
+	bne _080442C6
+	bl sub_8044AB4
+	ldr r0, _080442CC
+	ldr r0, [r0]
+	movs r2, 0xCC
+	lsls r2, 3
+	adds r1, r0, r2
+	ldrh r0, [r1]
+	adds r0, 0x1
+	strh r0, [r1]
+	lsls r0, 16
+	asrs r0, 16
+	cmp r0, 0x18
+	bne _080442C6
+	strh r4, [r1]
+_080442C6:
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_080442CC: .4byte gDungeonGlobalData
+	thumb_func_end RunDungeon
+
+	thumb_func_start xxx_dungeon_80442D0
+xxx_dungeon_80442D0:
+	push {r4-r7,lr}
+	lsls r0, 24
+	lsrs r7, r0, 24
+	bl GetLeaderEntity
+	adds r5, r0, 0
+	cmp r5, 0
+	beq _0804431A
+	bl TriggerWeatherAbilities
+	adds r0, r5, 0
+	bl GetMovementSpeed
+	ldr r3, _08044320
+	ldr r1, _08044324
+	ldr r1, [r1]
+	movs r2, 0xCC
+	lsls r2, 3
+	adds r1, r2
+	movs r2, 0
+	ldrsh r1, [r1, r2]
+	lsls r1, 1
+	movs r2, 0x32
+	muls r0, r2
+	adds r1, r0
+	adds r1, r3
+	movs r3, 0
+	ldrsh r0, [r1, r3]
+	cmp r0, 0
+	beq _0804431A
+	ldr r0, [r5, 0x70]
+	movs r1, 0xA4
+	lsls r1, 1
+	adds r0, r1
+	ldrb r0, [r0]
+	cmp r0, 0
+	beq _08044328
+_0804431A:
+	movs r0, 0
+	b _0804444E
+	.align 2, 0
+_08044320: .4byte gSpeedTurns
+_08044324: .4byte gDungeonGlobalData
+_08044328:
+	bl GetLeaderEntity
+	adds r5, r0, 0
+	cmp r5, 0
+	beq _0804431A
+	movs r0, 0
+	bl UseAttack
+	lsls r0, 24
+	cmp r0, 0
+	bne _0804435C
+	ldr r0, _08044388
+	ldr r1, [r0]
+	ldr r2, _0804438C
+	adds r0, r1, r2
+	ldrb r0, [r0]
+	cmp r0, 0
+	bne _08044356
+	ldr r3, _08044390
+	adds r0, r1, r3
+	ldrb r0, [r0]
+	cmp r0, 0
+	beq _0804435C
+_08044356:
+	movs r0, 0xC
+	bl sub_803E46C
+_0804435C:
+	ldr r0, [r5, 0x70]
+	adds r0, 0xF8
+	movs r1, 0
+	strb r1, [r0]
+	bl sub_8044B28
+	lsls r0, 24
+	lsrs r2, r0, 24
+	cmp r2, 0
+	bne _0804431A
+	ldr r0, _08044388
+	ldr r1, [r0]
+	adds r0, r1, 0
+	adds r0, 0xB8
+	str r5, [r0]
+	adds r1, 0xBC
+	str r2, [r1]
+	cmp r7, 0
+	beq _08044394
+	movs r7, 0
+	b _0804439A
+	.align 2, 0
+_08044388: .4byte gDungeonGlobalData
+_0804438C: .4byte 0x0000066c
+_08044390: .4byte 0x00000673
+_08044394:
+	adds r0, r5, 0
+	bl TickStatusHeal
+_0804439A:
+	bl sub_8044B28
+	lsls r0, 24
+	lsrs r4, r0, 24
+	cmp r4, 0
+	bne _0804431A
+	adds r0, r5, 0
+	bl sub_8071DA4
+	ldr r6, _08044434
+	ldr r1, [r6]
+	movs r0, 0x1
+	strb r0, [r1, 0xF]
+	bl sub_805D8C8
+	ldr r0, [r6]
+	strb r4, [r0, 0xF]
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _0804444C
+	adds r0, r5, 0
+	bl sub_8072CF4
+	bl sub_8086AC0
+	movs r0, 0
+	bl sub_8043ED0
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _0804444C
+	ldr r2, [r5, 0x70]
+	ldrh r1, [r2]
+	movs r3, 0x80
+	lsls r3, 8
+	adds r0, r3, 0
+	ands r0, r1
+	cmp r0, 0
+	beq _08044400
+	subs r3, 0x1
+	adds r0, r3, 0
+	ands r0, r1
+	movs r3, 0x80
+	lsls r3, 7
+	adds r1, r3, 0
+	orrs r0, r1
+	strh r0, [r2]
+_08044400:
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _0804444C
+	bl sub_8044454
+	bl sub_8044B28
+	lsls r0, 24
+	lsrs r4, r0, 24
+	cmp r4, 0
+	bne _0804444C
+	ldr r2, [r6]
+	adds r0, r2, 0
+	adds r0, 0xBC
+	ldr r1, [r0]
+	cmp r1, 0
+	beq _08044438
+	bl sub_805F02C
+	ldr r0, [r6]
+	adds r0, 0xBC
+	str r4, [r0]
+	movs r7, 0x1
+	b _08044328
+	.align 2, 0
+_08044434: .4byte gDungeonGlobalData
+_08044438:
+	ldr r0, [r5, 0x70]
+	adds r0, 0xF8
+	ldrb r0, [r0]
+	cmp r0, 0
+	beq _0804444C
+	movs r3, 0xCC
+	lsls r3, 3
+	adds r0, r2, r3
+	strh r1, [r0]
+	b _08044328
+_0804444C:
+	movs r0, 0x1
+_0804444E:
+	pop {r4-r7}
+	pop {r1}
+	bx r1
+	thumb_func_end xxx_dungeon_80442D0
+
+	thumb_func_start sub_8044454
+sub_8044454:
+	push {r4-r6,lr}
+	ldr r0, _080444E8
+	ldr r1, [r0]
+	ldrb r0, [r1, 0xE]
+	cmp r0, 0
+	beq _080444E2
+	movs r0, 0
+	strb r0, [r1, 0xE]
+	movs r6, 0
+_08044466:
+	ldr r0, _080444E8
+	ldr r0, [r0]
+	lsls r1, r6, 2
+	ldr r2, _080444EC
+	adds r0, r2
+	adds r0, r1
+	ldr r4, [r0]
+	adds r0, r4, 0
+	bl EntityExists
+	lsls r0, 24
+	cmp r0, 0
+	beq _080444DC
+	ldr r5, [r4, 0x70]
+	ldrh r0, [r5]
+	movs r2, 0x80
+	lsls r2, 8
+	adds r1, r2, 0
+	ands r0, r1
+	cmp r0, 0
+	beq _080444DC
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _080444E2
+	adds r0, r4, 0
+	bl TickStatusHeal
+	adds r0, r4, 0
+	bl EntityExists
+	lsls r0, 24
+	cmp r0, 0
+	beq _080444DC
+	adds r0, r4, 0
+	bl sub_8071DA4
+	adds r0, r4, 0
+	movs r1, 0
+	bl DecideAction
+	adds r0, r4, 0
+	bl sub_8072CF4
+	bl sub_8086AC0
+	movs r0, 0
+	bl sub_8043ED0
+	ldrh r0, [r5]
+	ldr r2, _080444F0
+	adds r1, r2, 0
+	ands r0, r1
+	movs r2, 0x80
+	lsls r2, 7
+	adds r1, r2, 0
+	orrs r0, r1
+	strh r0, [r5]
+_080444DC:
+	adds r6, 0x1
+	cmp r6, 0x13
+	ble _08044466
+_080444E2:
+	pop {r4-r6}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_080444E8: .4byte gDungeonGlobalData
+_080444EC: .4byte 0x000135cc
+_080444F0: .4byte 0x00007fff
+	thumb_func_end sub_8044454
+
+	thumb_func_start sub_80444F4
+sub_80444F4:
+	push {r4-r6,lr}
+	adds r6, r0, 0
+	bl GetLeaderEntity
+	cmp r6, r0
+	bne _08044566
+	ldr r0, _0804456C
+	ldr r1, [r0]
+	ldrb r0, [r1, 0xE]
+	cmp r0, 0
+	beq _08044566
+	movs r0, 0
+	strb r0, [r1, 0xE]
+	movs r5, 0
+_08044510:
+	ldr r0, _0804456C
+	ldr r0, [r0]
+	lsls r1, r5, 2
+	ldr r2, _08044570
+	adds r0, r2
+	adds r0, r1
+	ldr r4, [r0]
+	adds r0, r4, 0
+	bl EntityExists
+	lsls r0, 24
+	cmp r0, 0
+	beq _08044560
+	cmp r6, r4
+	beq _08044560
+	ldr r0, [r4, 0x70]
+	ldrh r0, [r0]
+	movs r2, 0x80
+	lsls r2, 8
+	adds r1, r2, 0
+	ands r0, r1
+	cmp r0, 0
+	beq _08044560
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _08044566
+	adds r0, r4, 0
+	movs r1, 0
+	bl DecideAction
+	adds r0, r4, 0
+	bl sub_8072CF4
+	bl sub_8086AC0
+	movs r0, 0
+	bl sub_8043ED0
+_08044560:
+	adds r5, 0x1
+	cmp r5, 0x13
+	ble _08044510
+_08044566:
+	pop {r4-r6}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_0804456C: .4byte gDungeonGlobalData
+_08044570: .4byte 0x000135cc
+	thumb_func_end sub_80444F4
+
+	thumb_func_start sub_8044574
+sub_8044574:
+	push {r4-r7,lr}
+	mov r7, r10
+	mov r6, r9
+	mov r5, r8
+	push {r5-r7}
+	sub sp, 0x44
+	bl GetLeaderEntity
+	mov r10, r0
+	movs r7, 0
+	mov r0, sp
+	adds r0, 0x4
+	str r0, [sp, 0x40]
+	ldr r1, _08044634
+	mov r9, r1
+_08044592:
+	mov r2, r9
+	ldr r0, [r2]
+	lsls r1, r7, 2
+	ldr r3, _08044638
+	adds r0, r3
+	adds r0, r1
+	ldr r5, [r0]
+	adds r0, r5, 0
+	bl EntityExists
+	lsls r0, 24
+	cmp r0, 0
+	beq _080446A4
+	ldr r6, [r5, 0x70]
+	mov r8, r6
+	ldrb r0, [r6, 0x7]
+	cmp r0, 0
+	bne _080446A4
+	bl sub_8044B28
+	lsls r0, 24
+	lsrs r4, r0, 24
+	cmp r4, 0
+	bne _080446AC
+	mov r1, r9
+	ldr r0, [r1]
+	adds r0, 0xB8
+	str r5, [r0]
+	bl TriggerWeatherAbilities
+	movs r2, 0xA2
+	lsls r2, 1
+	adds r0, r6, r2
+	strb r4, [r0]
+	adds r0, r5, 0
+	bl GetMovementSpeed
+	mov r3, r9
+	ldr r1, [r3]
+	movs r2, 0xCC
+	lsls r2, 3
+	adds r1, r2
+	movs r3, 0
+	ldrsh r1, [r1, r3]
+	lsls r1, 1
+	movs r2, 0x32
+	muls r0, r2
+	adds r1, r0
+	ldr r0, _0804463C
+	adds r1, r0
+	movs r2, 0
+	ldrsh r0, [r1, r2]
+	cmp r0, 0
+	beq _080446A4
+	movs r3, 0xA4
+	lsls r3, 1
+	adds r0, r6, r3
+	ldrb r0, [r0]
+	cmp r0, 0
+	bne _080446A4
+	ldrh r1, [r6]
+	movs r2, 0x80
+	lsls r2, 8
+	adds r0, r2, 0
+	ands r0, r1
+	cmp r0, 0
+	bne _080446A4
+	movs r3, 0x80
+	lsls r3, 7
+	adds r0, r3, 0
+	ands r0, r1
+	lsls r0, 16
+	lsrs r0, 16
+	cmp r0, 0
+	beq _08044644
+	ldr r2, _08044640
+	adds r0, r2, 0
+	ands r0, r1
+	strh r0, [r6]
+	b _080446A4
+	.align 2, 0
+_08044634: .4byte gDungeonGlobalData
+_08044638: .4byte 0x0001357c
+_0804463C: .4byte gSpeedTurns
+_08044640: .4byte 0x0000bfff
+_08044644:
+	ldr r1, _08044668
+	add r1, r8
+	strb r0, [r1]
+	adds r0, r5, 0
+	bl TickStatusHeal
+	adds r0, r5, 0
+	bl EntityExists
+	lsls r0, 24
+	cmp r0, 0
+	beq _080446A4
+	adds r0, r5, 0
+	bl sub_8071DA4
+	movs r4, 0
+	b _0804466E
+	.align 2, 0
+_08044668: .4byte 0x00000145
+_0804466C:
+	adds r4, 0x1
+_0804466E:
+	cmp r4, 0x2
+	bgt _080446A4
+	adds r0, r5, 0
+	movs r1, 0
+	bl DecideAction
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _080446A4
+	adds r0, r5, 0
+	bl sub_8072CF4
+	lsls r0, 24
+	cmp r0, 0
+	beq _080446A4
+	bl sub_8086AC0
+	movs r0, 0
+	bl sub_8043ED0
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	beq _0804466C
+_080446A4:
+	adds r7, 0x1
+	cmp r7, 0x3
+	bgt _080446AC
+	b _08044592
+_080446AC:
+	movs r0, 0
+	mov r8, r0
+_080446B0:
+	adds r0, 0x1
+	mov r9, r0
+	add r2, sp, 0x8
+	ldr r1, [sp, 0x40]
+	mov r0, sp
+	movs r7, 0x2
+_080446BC:
+	mov r3, r8
+	str r3, [r0]
+	str r2, [r1]
+	adds r2, 0x8
+	adds r1, 0x8
+	adds r0, 0x8
+	subs r7, 0x1
+	cmp r7, 0
+	bge _080446BC
+	str r3, [sp, 0x18]
+	str r3, [sp, 0x1C]
+	movs r7, 0
+_080446D4:
+	ldr r0, _08044710
+	ldr r0, [r0]
+	lsls r1, r7, 2
+	ldr r2, _08044714
+	adds r0, r2
+	adds r0, r1
+	ldr r4, [r0]
+	adds r0, r4, 0
+	bl EntityExists
+	lsls r0, 24
+	cmp r0, 0
+	beq _08044760
+	ldr r1, [r4, 0x70]
+	movs r3, 0xA2
+	lsls r3, 1
+	adds r2, r1, r3
+	ldrb r0, [r2]
+	cmp r0, 0
+	beq _08044760
+	ldrb r0, [r1, 0x7]
+	cmp r0, 0
+	beq _08044718
+	adds r3, 0x1
+	adds r0, r1, r3
+	mov r1, r8
+	strb r1, [r0]
+	strb r1, [r2]
+	b _08044760
+	.align 2, 0
+_08044710: .4byte gDungeonGlobalData
+_08044714: .4byte 0x0001357c
+_08044718:
+	mov r2, r10
+	movs r3, 0x4
+	ldrsh r1, [r2, r3]
+	movs r2, 0x4
+	ldrsh r0, [r4, r2]
+	subs r2, r1, r0
+	cmp r2, 0
+	bge _0804472A
+	negs r2, r2
+_0804472A:
+	mov r3, r10
+	movs r0, 0x6
+	ldrsh r1, [r3, r0]
+	movs r3, 0x6
+	ldrsh r0, [r4, r3]
+	subs r1, r0
+	cmp r1, 0
+	bge _0804473C
+	negs r1, r1
+_0804473C:
+	cmp r1, r2
+	bge _08044742
+	adds r1, r2, 0
+_08044742:
+	cmp r1, 0x2
+	ble _08044748
+	movs r1, 0x2
+_08044748:
+	add r3, sp, 0x20
+	lsls r0, r7, 3
+	adds r3, r0
+	str r4, [r3]
+	add r2, sp, 0x24
+	adds r2, r0
+	lsls r1, 3
+	ldr r0, [sp, 0x40]
+	adds r1, r0, r1
+	ldr r0, [r1]
+	str r0, [r2]
+	str r3, [r1]
+_08044760:
+	adds r7, 0x1
+	cmp r7, 0x3
+	ble _080446D4
+	mov r5, sp
+	movs r6, 0
+_0804476A:
+	ldr r4, [r5]
+	cmp r4, 0
+	beq _080447A0
+	ldr r1, [r4, 0x70]
+	ldr r3, _08044814
+	adds r2, r1, r3
+	movs r0, 0x1
+	strb r0, [r2]
+	movs r2, 0xA2
+	lsls r2, 1
+	adds r0, r1, r2
+	strb r6, [r0]
+	adds r0, r4, 0
+	movs r1, 0x1
+	bl DecideAction
+	adds r0, r4, 0
+	bl sub_8072CF4
+	bl sub_8086AC0
+	movs r0, 0
+	bl sub_8043ED0
+	adds r0, r4, 0
+	bl EntityExists
+_080447A0:
+	ldr r5, [r5, 0x4]
+	cmp r5, 0
+	bne _0804476A
+	mov r0, r9
+	cmp r0, 0x2
+	ble _080446B0
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _08044802
+	movs r7, 0
+_080447B8:
+	ldr r0, _08044818
+	ldr r0, [r0]
+	lsls r1, r7, 2
+	ldr r3, _0804481C
+	adds r0, r3
+	adds r0, r1
+	ldr r4, [r0]
+	adds r0, r4, 0
+	bl EntityExists
+	lsls r0, 24
+	cmp r0, 0
+	beq _080447FC
+	ldr r0, [r4, 0x70]
+	movs r1, 0xA2
+	lsls r1, 1
+	adds r5, r0, r1
+	ldrb r0, [r5]
+	cmp r0, 0
+	beq _080447FC
+	adds r0, r4, 0
+	bl sub_8074094
+	adds r0, r4, 0
+	bl EntityExists
+	lsls r0, 24
+	cmp r0, 0
+	beq _080447FC
+	adds r0, r4, 0
+	bl sub_8071DA4
+	movs r0, 0
+	strb r0, [r5]
+_080447FC:
+	adds r7, 0x1
+	cmp r7, 0x3
+	ble _080447B8
+_08044802:
+	add sp, 0x44
+	pop {r3-r5}
+	mov r8, r3
+	mov r9, r4
+	mov r10, r5
+	pop {r4-r7}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_08044814: .4byte 0x00000145
+_08044818: .4byte gDungeonGlobalData
+_0804481C: .4byte 0x0001357c
+	thumb_func_end sub_8044574
+
+	thumb_func_start sub_8044820
+sub_8044820:
+	push {r4-r7,lr}
+	mov r7, r8
+	push {r7}
+	movs r7, 0
+	ldr r0, _08044830
+	mov r8, r0
+	b _080448FC
+	.align 2, 0
+_08044830: .4byte gSpeedTurns
+_08044834:
+	ldr r4, [r5, 0x70]
+	ldr r0, [r6]
+	adds r0, 0xB8
+	str r5, [r0]
+	bl TriggerWeatherAbilities
+	ldrh r2, [r4]
+	movs r1, 0x80
+	lsls r1, 8
+	adds r0, r1, 0
+	ands r0, r2
+	cmp r0, 0
+	bne _080448FA
+	movs r1, 0x80
+	lsls r1, 7
+	adds r0, r1, 0
+	ands r0, r2
+	lsls r0, 16
+	lsrs r1, r0, 16
+	cmp r1, 0
+	beq _0804486C
+	ldr r1, _08044868
+	adds r0, r1, 0
+	ands r0, r2
+	strh r0, [r4]
+	b _080448FA
+	.align 2, 0
+_08044868: .4byte 0x0000bfff
+_0804486C:
+	movs r2, 0xA2
+	lsls r2, 1
+	adds r0, r4, r2
+	strb r1, [r0]
+	adds r0, r5, 0
+	bl GetMovementSpeed
+	ldr r1, [r6]
+	movs r2, 0xCC
+	lsls r2, 3
+	adds r1, r2
+	movs r2, 0
+	ldrsh r1, [r1, r2]
+	lsls r1, 1
+	movs r2, 0x32
+	muls r0, r2
+	adds r1, r0
+	add r1, r8
+	movs r2, 0
+	ldrsh r0, [r1, r2]
+	cmp r0, 0
+	beq _080448FA
+	movs r1, 0xA4
+	lsls r1, 1
+	adds r0, r4, r1
+	ldrb r0, [r0]
+	cmp r0, 0
+	bne _080448FA
+	ldrh r1, [r4]
+	ldr r2, _08044984
+	adds r0, r2, 0
+	ands r1, r0
+	movs r0, 0
+	strh r1, [r4]
+	ldr r2, _08044988
+	adds r1, r4, r2
+	strb r0, [r1]
+	adds r0, r5, 0
+	bl TickStatusHeal
+	adds r0, r5, 0
+	bl EntityExists
+	lsls r0, 24
+	cmp r0, 0
+	beq _080448FA
+	adds r0, r5, 0
+	bl sub_8071DA4
+	adds r0, r5, 0
+	movs r1, 0
+	bl DecideAction
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _08044924
+	adds r0, r5, 0
+	bl sub_8072CF4
+	bl sub_8086AC0
+	movs r0, 0
+	bl sub_8043ED0
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _08044924
+_080448FA:
+	adds r7, 0x1
+_080448FC:
+	cmp r7, 0xF
+	bgt _08044924
+	ldr r6, _0804498C
+	ldr r0, [r6]
+	lsls r1, r7, 2
+	ldr r2, _08044990
+	adds r0, r2
+	adds r0, r1
+	ldr r5, [r0]
+	adds r0, r5, 0
+	bl EntityExists
+	lsls r0, 24
+	cmp r0, 0
+	beq _080448FA
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	beq _08044834
+_08044924:
+	bl sub_8044B28
+	lsls r0, 24
+	cmp r0, 0
+	bne _0804497A
+	movs r7, 0
+_08044930:
+	ldr r0, _0804498C
+	ldr r0, [r0]
+	lsls r1, r7, 2
+	ldr r2, _08044990
+	adds r0, r2
+	adds r0, r1
+	ldr r4, [r0]
+	adds r0, r4, 0
+	bl EntityExists
+	lsls r0, 24
+	cmp r0, 0
+	beq _08044974
+	ldr r0, [r4, 0x70]
+	movs r1, 0xA2
+	lsls r1, 1
+	adds r5, r0, r1
+	ldrb r0, [r5]
+	cmp r0, 0
+	beq _08044974
+	adds r0, r4, 0
+	bl sub_8074094
+	adds r0, r4, 0
+	bl EntityExists
+	lsls r0, 24
+	cmp r0, 0
+	beq _08044974
+	adds r0, r4, 0
+	bl sub_8071DA4
+	movs r0, 0
+	strb r0, [r5]
+_08044974:
+	adds r7, 0x1
+	cmp r7, 0xF
+	ble _08044930
+_0804497A:
+	pop {r3}
+	mov r8, r3
+	pop {r4-r7}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_08044984: .4byte 0x00003fff
+_08044988: .4byte 0x00000145
+_0804498C: .4byte gDungeonGlobalData
+_08044990: .4byte 0x0001358c
+	thumb_func_end sub_8044820
+
+	thumb_func_start sub_8044994
+sub_8044994:
+	push {r4-r7,lr}
+	mov r7, r8
+	push {r7}
+	ldr r1, _08044A94
+	ldr r4, _08044A98
+	ldr r0, [r4]
+	movs r2, 0xCC
+	lsls r2, 3
+	adds r0, r2
+	movs r3, 0
+	ldrsh r0, [r0, r3]
+	lsls r0, 1
+	adds r1, 0x32
+	adds r0, r1
+	movs r1, 0
+	ldrsh r0, [r0, r1]
+	cmp r0, 0
+	beq _08044A8A
+	bl sub_8071B48
+	ldr r0, [r4]
+	ldr r2, _08044A9C
+	adds r0, r2
+	movs r2, 0
+	strb r2, [r0]
+	ldr r0, [r4]
+	ldr r3, _08044AA0
+	adds r0, r3
+	strb r2, [r0]
+	ldr r0, [r4]
+	ldr r1, _08044AA4
+	adds r0, r1
+	strb r2, [r0]
+	ldr r0, [r4]
+	adds r3, 0x2
+	adds r0, r3
+	strb r2, [r0]
+	ldr r0, [r4]
+	ldr r3, _08044AA8
+	adds r1, r0, r3
+	str r2, [r1]
+	ldr r1, _08044AAC
+	adds r0, r1
+	movs r1, 0x2
+	str r1, [r0]
+	mov r8, r2
+	adds r7, r4, 0
+_080449F2:
+	ldr r0, [r7]
+	mov r2, r8
+	lsls r1, r2, 2
+	ldr r3, _08044AB0
+	adds r0, r3
+	adds r0, r1
+	ldr r5, [r0]
+	adds r0, r5, 0
+	bl EntityExists
+	lsls r0, 24
+	cmp r0, 0
+	beq _08044A7A
+	ldr r0, [r5, 0x70]
+	adds r4, r0, 0
+	movs r0, 0xA4
+	lsls r0, 1
+	adds r1, r4, r0
+	movs r0, 0
+	strb r0, [r1]
+	ldrb r0, [r4, 0x6]
+	movs r6, 0x1
+	cmp r0, 0
+	beq _08044A24
+	movs r6, 0
+_08044A24:
+	adds r0, r5, 0
+	movs r1, 0x32
+	bl HasAbility
+	lsls r0, 24
+	cmp r0, 0
+	beq _08044A46
+	ldr r1, [r7]
+	ldr r2, _08044AA8
+	adds r0, r1, r2
+	str r5, [r0]
+	ldr r3, _08044AAC
+	adds r1, r3
+	adds r0, r4, 0
+	adds r0, 0x98
+	ldr r0, [r0]
+	str r0, [r1]
+_08044A46:
+	adds r0, r5, 0
+	movs r1, 0x3F
+	bl HasAbility
+	lsls r0, 24
+	cmp r0, 0
+	beq _08044A60
+	ldr r0, [r7]
+	ldr r1, _08044AA4
+	adds r0, r1
+	adds r0, r6
+	movs r1, 0x1
+	strb r1, [r0]
+_08044A60:
+	adds r0, r5, 0
+	movs r1, 0x38
+	bl HasAbility
+	lsls r0, 24
+	cmp r0, 0
+	beq _08044A7A
+	ldr r0, [r7]
+	ldr r2, _08044A9C
+	adds r0, r2
+	adds r0, r6
+	movs r1, 0x1
+	strb r1, [r0]
+_08044A7A:
+	movs r3, 0x1
+	add r8, r3
+	mov r0, r8
+	cmp r0, 0x13
+	ble _080449F2
+	movs r0, 0
+	bl sub_8043ED0
+_08044A8A:
+	pop {r3}
+	mov r8, r3
+	pop {r4-r7}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_08044A94: .4byte gSpeedTurns
+_08044A98: .4byte gDungeonGlobalData
+_08044A9C: .4byte 0x000037f8
+_08044AA0: .4byte 0x000037f9
+_08044AA4: .4byte 0x000037fa
+_08044AA8: .4byte 0x00017b2c
+_08044AAC: .4byte 0x00017b38
+_08044AB0: .4byte 0x000135cc
+	thumb_func_end sub_8044994
+
+	thumb_func_start sub_8044AB4
+sub_8044AB4:
+	push {r4,lr}
+	ldr r1, _08044ADC
+	ldr r0, _08044AE0
+	ldr r0, [r0]
+	movs r2, 0xCC
+	lsls r2, 3
+	adds r0, r2
+	movs r2, 0
+	ldrsh r0, [r0, r2]
+	adds r0, 0x1
+	lsls r0, 1
+	adds r1, 0x32
+	adds r0, r1
+	movs r1, 0
+	ldrsh r0, [r0, r1]
+	cmp r0, 0
+	beq _08044B1A
+	movs r4, 0
+	b _08044AE6
+	.align 2, 0
+_08044ADC: .4byte gSpeedTurns
+_08044AE0: .4byte gDungeonGlobalData
+_08044AE4:
+	adds r4, 0x1
+_08044AE6:
+	cmp r4, 0x13
+	bgt _08044B08
+	ldr r0, _08044B20
+	ldr r0, [r0]
+	lsls r1, r4, 2
+	ldr r2, _08044B24
+	adds r0, r2
+	adds r0, r1
+	ldr r0, [r0]
+	bl EntityExists
+	lsls r0, 24
+	cmp r0, 0
+	beq _08044AE4
+	movs r0, 0
+	bl UseAttack
+_08044B08:
+	movs r0, 0x1
+	movs r1, 0
+	bl sub_807EAA0
+	bl sub_8086AC0
+	movs r0, 0
+	bl sub_8043ED0
+_08044B1A:
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_08044B20: .4byte gDungeonGlobalData
+_08044B24: .4byte 0x000135cc
+	thumb_func_end sub_8044AB4
+
+	thumb_func_start sub_8044B28
+sub_8044B28:
+	push {r4,lr}
+	ldr r4, _08044B48
+	ldr r0, [r4]
+	ldrb r0, [r0, 0x4]
+	cmp r0, 0
+	bne _08044B76
+	bl GetLeaderEntity
+	cmp r0, 0
+	bne _08044B50
+	ldr r0, [r4]
+	ldr r1, _08044B4C
+	adds r0, r1
+	movs r1, 0x1
+	strb r1, [r0]
+	b _08044B76
+	.align 2, 0
+_08044B48: .4byte gDungeonGlobalData
+_08044B4C: .4byte 0x00000654
+_08044B50:
+	ldr r0, [r4]
+	ldrb r2, [r0, 0x2]
+	cmp r2, 0x1
+	bne _08044B68
+	ldr r2, _08044B64
+	adds r1, r0, r2
+	movs r0, 0x2
+	strb r0, [r1]
+	b _08044B76
+	.align 2, 0
+_08044B64: .4byte 0x00000654
+_08044B68:
+	cmp r2, 0x2
+	beq _08044B70
+	movs r0, 0
+	b _08044B78
+_08044B70:
+	ldr r1, _08044B80
+	adds r0, r1
+	strb r2, [r0]
+_08044B76:
+	movs r0, 0x1
+_08044B78:
+	pop {r4}
+	pop {r1}
+	bx r1
+	.align 2, 0
+_08044B80: .4byte 0x00000654
+	thumb_func_end sub_8044B28
+
+	thumb_func_start sub_8044B84
+sub_8044B84:
+	push {lr}
+	ldr r0, _08044B9C
+	ldr r0, [r0]
+	ldrb r0, [r0, 0x10]
+	cmp r0, 0
+	bne _08044BA0
+	bl sub_8044B28
+	lsls r0, 24
+	lsrs r0, 24
+	b _08044BA2
+	.align 2, 0
+_08044B9C: .4byte gDungeonGlobalData
+_08044BA0:
+	movs r0, 0x1
+_08044BA2:
+	pop {r1}
+	bx r1
+	thumb_func_end sub_8044B84
+
+	thumb_func_start sub_8044BA8
+sub_8044BA8:
+	push {r4,r5,lr}
+	lsls r0, 16
+	lsrs r4, r0, 16
+	lsls r1, 24
+	lsrs r5, r1, 24
+	cmp r4, 0x26
+	bne _08044BCC
+	bl sub_8043D10
+	lsls r0, 24
+	lsrs r0, 24
+	cmp r0, 0x2
+	bne _08044BCC
+	ldr r0, _08044BC8
+	b _08044C02
+	.align 2, 0
+_08044BC8: .4byte gUnknown_80F91EC
+_08044BCC:
+	ldr r1, _08044BEC
+	lsls r0, r4, 3
+	adds r4, r0, r1
+	ldr r0, [r4]
+	ldr r1, _08044BF0
+	bl strcmp
+	cmp r0, 0
+	beq _08044BE0
+	movs r0, 0x1
+_08044BE0:
+	lsls r0, 24
+	cmp r0, 0
+	beq _08044BF4
+	ldr r0, [r4]
+	b _08044C04
+	.align 2, 0
+_08044BEC: .4byte gUnknown_80F7C50
+_08044BF0: .4byte gUnknown_80F697C
+_08044BF4:
+	ldr r4, _08044C0C
+	adds r0, r5, 0
+	bl GetItemCategory
+	lsls r0, 3
+	adds r4, 0x4
+	adds r0, r4
+_08044C02:
+	ldr r0, [r0]
+_08044C04:
+	pop {r4,r5}
+	pop {r1}
+	bx r1
+	.align 2, 0
+_08044C0C: .4byte gActions
+	thumb_func_end sub_8044BA8
+
+	thumb_func_start sub_8044C10
+sub_8044C10:
+	push {r4,lr}
+	adds r4, r0, 0
+	lsls r4, 24
+	lsrs r4, 24
+	bl sub_8083654
+	adds r2, r0, 0
+	adds r1, r2, 0
+	adds r1, 0x44
+	movs r3, 0
+	movs r0, 0
+	strh r0, [r1]
+	cmp r4, 0
+	beq _08044C44
+	adds r0, r2, 0
+	adds r0, 0x48
+	strb r3, [r0]
+	adds r0, 0x8
+	strb r3, [r0]
+	adds r1, 0x14
+	ldr r0, _08044C4C
+	strh r0, [r1]
+	adds r1, 0x2
+	movs r0, 0x1
+	negs r0, r0
+	strh r0, [r1]
+_08044C44:
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_08044C4C: .4byte 0x0000ffff
+	thumb_func_end sub_8044C10
+
+	thumb_func_start sub_8044C50
+sub_8044C50:
+	push {r4,lr}
+	adds r4, r0, 0
+	lsls r4, 16
+	lsrs r4, 16
+	bl sub_8083654
+	adds r2, r0, 0
+	adds r0, 0x44
+	movs r1, 0
+	strh r4, [r0]
+	adds r0, 0x4
+	strb r1, [r0]
+	adds r0, 0x8
+	strb r1, [r0]
+	adds r1, r2, 0
+	adds r1, 0x58
+	ldr r0, _08044C84
+	strh r0, [r1]
+	adds r1, 0x2
+	movs r0, 0x1
+	negs r0, r0
+	strh r0, [r1]
+	pop {r4}
+	pop {r0}
+	bx r0
+	.align 2, 0
+_08044C84: .4byte 0x0000ffff
+	thumb_func_end sub_8044C50
+
+	thumb_func_start ResetAction
+ResetAction:
+	movs r2, 0
+	movs r1, 0
+	strh r1, [r0]
+	strb r2, [r0, 0x4]
+	strb r2, [r0, 0xC]
+	bx lr
+	thumb_func_end ResetAction
+
+	.align 2, 0
diff --git a/asm/code_8049590.s b/asm/code_8049590.s
index 846f24c..07f51c4 100644
--- a/asm/code_8049590.s
+++ b/asm/code_8049590.s
@@ -4,7 +4,7 @@
   	.syntax unified
 
   	.text
-  
+
 	thumb_func_start GetMapEntity
 GetMapEntity:
 	push {r4,r5,lr}
@@ -292,7 +292,7 @@ _080497F8: .4byte 0x00003a0e
 _080497FC: .4byte gDungeonFileArchive
 _08049800: .4byte gUnknown_202F18C
 _08049804: .4byte gUnknown_202EE8C
-_08049808: .4byte gUnknown_202F314
+_08049808: .4byte gWalkableTileToCrossableTerrain
 _0804980C: .4byte gDungeonWaterType
 _08049810:
 	strb r6, [r2, 0x4]
diff --git a/asm/code_8057824.s b/asm/code_8057824.s
index 84d3407..2856506 100644
--- a/asm/code_8057824.s
+++ b/asm/code_8057824.s
@@ -12949,7 +12949,7 @@ _0805E0C2:
 	mov r0, r10
 	adds r1, r5, 0
 	str r3, [sp, 0x20]
-	bl CanMoveForward2
+	bl CanMoveInDirection
 	lsls r0, 24
 	ldr r3, [sp, 0x20]
 	cmp r0, 0
@@ -14878,7 +14878,7 @@ _0805EFF6:
 	bne _0805F008
 	mov r0, r8
 	adds r1, r4, 0
-	bl CanMoveForward2
+	bl CanMoveInDirection
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805F014
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
diff --git a/asm/code_807034C.s b/asm/code_807034C.s
new file mode 100644
index 0000000..8ce57cc
--- /dev/null
+++ b/asm/code_807034C.s
@@ -0,0 +1,970 @@
+	#include "asm/constants/gba_constants.inc"
+  	#include "asm/macros.inc"
+
+  	.syntax unified
+
+  	.text
+  
+	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
diff --git a/asm/code_8070D04.s b/asm/code_8070E3C.s
index ce9f343..7af381e 100644
--- a/asm/code_8070D04.s
+++ b/asm/code_8070E3C.s
@@ -1,115 +1,10 @@
 	#include "asm/constants/gba_constants.inc"
-	#include "asm/macros.inc"
+  	#include "asm/macros.inc"
 
-	.syntax unified
-
-	.text
-
-	thumb_func_start CanMoveForward2
-CanMoveForward2:
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	adds r6, r1, 0
-	ldr r0, [r4, 0x70]
-	movs r1, 0x2
-	ldrsh r0, [r0, r1]
-	bl GetCrossableTerrain
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r2, 0x4
-	ldrsh r0, [r4, r2]
-	ldr r1, _08070DD8
-	lsls r2, r6, 2
-	adds r2, r1
-	movs r3, 0
-	ldrsh r1, [r2, r3]
-	adds r0, r1
-	movs r3, 0x6
-	ldrsh r1, [r4, r3]
-	movs r3, 0x2
-	ldrsh r2, [r2, r3]
-	adds r1, r2
-	bl GetMapTileAtPosition
-	adds r2, r0, 0
-	ldrh r1, [r2]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	bne _08070E34
-	ldr r0, [r2, 0x10]
-	cmp r0, 0
-	bne _08070E34
-	bl IsFixedDungeon
-	lsls r0, 24
-	cmp r0, 0
-	bne _08070E04
-	ldr r0, [r4, 0x70]
-	adds r0, 0xE4
-	ldrb r0, [r0]
-	cmp r0, 0x3
-	beq _08070DD2
-	adds r0, r4, 0
-	movs r1, 0x9
-	bl HasItem
-	lsls r0, 24
-	cmp r0, 0
-	beq _08070DDC
-_08070DD2:
-	movs r5, 0x3
-	b _08070E04
-	.align 2, 0
-_08070DD8: .4byte gAdjacentTileOffsets
-_08070DDC:
-	adds r0, r4, 0
-	movs r1, 0xC
-	bl HasIQSkill
-	lsls r0, 24
-	cmp r0, 0
-	bne _08070E02
-	adds r0, r4, 0
-	movs r1, 0xD
-	bl HasIQSkill
-	lsls r0, 24
-	cmp r0, 0
-	beq _08070E04
-	movs r0, 0x1
-	ands r0, r6
-	movs r5, 0x3
-	cmp r0, 0
-	beq _08070E04
-_08070E02:
-	movs r5, 0x2
-_08070E04:
-	movs r1, 0x4
-	ldrsh r0, [r4, r1]
-	movs r2, 0x6
-	ldrsh r1, [r4, r2]
-	bl GetMapTileAtPosition
-	adds r2, r0, 0
-	adds r1, r2, 0
-	adds r1, 0xA
-	adds r1, r5
-	ldr r2, _08070E30
-	movs r0, 0x7
-	ands r0, r6
-	adds r0, r2
-	ldrb r1, [r1]
-	ldrb r0, [r0]
-	ands r0, r1
-	cmp r0, 0
-	beq _08070E34
-	movs r0, 0x1
-	b _08070E36
-	.align 2, 0
-_08070E30: .4byte gDirectionBitMasks
-_08070E34:
-	movs r0, 0
-_08070E36:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end CanMoveForward2
+  	.syntax unified
 
+  	.text
+  
 	thumb_func_start sub_8070E3C
 sub_8070E3C:
 	push {r4-r7,lr}
diff --git a/asm/code_80718D8.s b/asm/code_80718D8.s
index 4ee7f09..030fd72 100644
--- a/asm/code_80718D8.s
+++ b/asm/code_80718D8.s
@@ -2652,7 +2652,7 @@ _08072F84:
 	bne _08072FCC
 	adds r0, r4, 0
 	adds r1, r3, 0
-	bl CanMoveForward2
+	bl CanMoveInDirection
 	lsls r0, 24
 	cmp r0, 0
 	bne _08072FCC
diff --git a/data/cutscenes_1.s b/data/cutscenes_1.s
index 096fae4..2c76b68 100644
--- a/data/cutscenes_1.s
+++ b/data/cutscenes_1.s
@@ -9080,7 +9080,7 @@
     .byte 0xf6, 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xdb, 0x26, 0x08
     changeTileSet 0xDE
     .byte 0x0c, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    playMusic MUS_IN_THE_DEPTHS_OF_PIT
+    playMusic MUS_IN_THE_DEPTHS_OF_THE_PIT
     .byte 0x22, 0x01, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     waitFlag 3
     fadeMusicOut 0x78
diff --git a/data/data_8106A4C.s b/data/data_8106A4C.s
index 902cb73..d8e604b 100644
--- a/data/data_8106A4C.s
+++ b/data/data_8106A4C.s
@@ -362,38 +362,3 @@ gUnknown_8106F7C: @ 8106F7C
 	.global gUnknown_8106FA4
 gUnknown_8106FA4: @ 8106FA4
         .string "{COLOR_2}%c%s{END_COLOR_TEXT_2}\0"
-
-	.global gDirectionBitMasks
-gDirectionBitMasks: @ 8106FAD
-@ replacing .incbin "baserom.gba", 0x00106fad, 0x8
-        .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
-
-	.global gUnknown_8106FB5
-gUnknown_8106FB5: @ 8106FB5
-@ replacing .incbin "baserom.gba", 0x00106fb5, 0x8
-        .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
-
-	.global gUnknown_8106FBD
-gUnknown_8106FBD: @ 8106FBD
-@ replacing .incbin "baserom.gba", 0x00106fbd, 0x8
-        .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
-
-	.global gUnknown_8106FC5
-gUnknown_8106FC5: @ 8106FC5
-@ replacing .incbin "baserom.gba", 0x00106fc5, 0x8
-        .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
-
-	.global gUnknown_8106FCD
-gUnknown_8106FCD: @ 8106FCD
-@ replacing .incbin "baserom.gba", 0x00106fcd, 0x8
-        .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
-
-	.global gDirectionBitMasks_2
-gDirectionBitMasks_2: @ 8106FD5
-@ replacing .incbin "baserom.gba", 0x00106fd5, 0x8
-        .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
-
-	.global gDirectionBitMasks_3
-gDirectionBitMasks_3: @ 8106FDD
-@ replacing .incbin "baserom.gba", 0x00106fdd, 0x8
-        .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
diff --git a/data/data_8106FB5.s b/data/data_8106FB5.s
new file mode 100644
index 0000000..dc32b18
--- /dev/null
+++ b/data/data_8106FB5.s
@@ -0,0 +1,31 @@
+        .section .rodata
+
+	.global gUnknown_8106FB5
+gUnknown_8106FB5: @ 8106FB5
+@ replacing .incbin "baserom.gba", 0x00106fb5, 0x8
+        .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
+
+	.global gUnknown_8106FBD
+gUnknown_8106FBD: @ 8106FBD
+@ replacing .incbin "baserom.gba", 0x00106fbd, 0x8
+        .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
+
+	.global gUnknown_8106FC5
+gUnknown_8106FC5: @ 8106FC5
+@ replacing .incbin "baserom.gba", 0x00106fc5, 0x8
+        .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
+
+	.global gUnknown_8106FCD
+gUnknown_8106FCD: @ 8106FCD
+@ replacing .incbin "baserom.gba", 0x00106fcd, 0x8
+        .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
+
+	.global gDirectionBitMasks_2
+gDirectionBitMasks_2: @ 8106FD5
+@ replacing .incbin "baserom.gba", 0x00106fd5, 0x8
+        .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
+
+	.global gDirectionBitMasks_3
+gDirectionBitMasks_3: @ 8106FDD
+@ replacing .incbin "baserom.gba", 0x00106fdd, 0x8
+        .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
diff --git a/data/scripts/personality_test.inc b/data/scripts/personality_test.inc
index e6de4a1..ae7cd06 100644
--- a/data/scripts/personality_test.inc
+++ b/data/scripts/personality_test.inc
@@ -27,7 +27,7 @@
     floatingText InterviewBegin_826E108
     closeTextBox
     StartSceneRunCall 0
-    playMusic MUS_WELCOME_TO_WORLD_POKEMON
+    playMusic MUS_WELCOME_TO_THE_WORLD_OF_POKEMON
     .byte 0x22, 0x01, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     .byte 0x3c, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     fadeMusicOut 0x1E
diff --git a/include/constants/bg_music.h b/include/constants/bg_music.h
index 86fb4e9..53bfade 100644
--- a/include/constants/bg_music.h
+++ b/include/constants/bg_music.h
@@ -1,51 +1,51 @@
 #ifndef GUARD_CONSTANTS_BG_MUSIC_H
-#define GUARD_CONSTANTS_BG_MUSIC_H 
+#define GUARD_CONSTANTS_BG_MUSIC_H
 
-#define MUS_TEAM_BASE 1
+#define MUS_RESCUE_TEAM_BASE 1
 #define MUS_FRIEND_AREA_SWAMP 2
 #define MUS_FRIEND_AREA_CAVES 3
 #define MUS_DREAM 4
-#define MUS_BENEVOLENT_SPIRT 5
+#define MUS_BENEVOLENT_SPIRIT 5
 #define MUS_LEGEND_OF_NINETALES 6
 #define MUS_POKEMON_SQUARE 7
-#define MUS_LOADING_SCREEN 8
+#define MUS_FILE_SELECT 8
 #define MUS_RISING_FEAR 9
 #define MUS_THERES_TROUBLE 10
-#define MUS_DECISIVE_BATTLE 11
-#define MUS_WELCOME_TO_WORLD_POKEMON 12
-#define MUS_BURIED_RELIC 13
+#define MUS_BOSS_BATTLE 11
+#define MUS_WELCOME_TO_THE_WORLD_OF_POKEMON 12
+#define MUS_A_NEW_ADVENTURE 13 // Plays in Buried Relic and Southern Cavern
 #define MUS_THUNDERWAVE_CAVE 14
 #define MUS_SINISTER_WOODS 15
 #define MUS_FRIEND_AREA_POND 16
 #define MUS_KECLEON_SHOP 17
 #define MUS_STOP_THIEF 18
 #define MUS_WORLD_CALAMITY 19 // GIANT_STAR_APPROACHING
-#define MUS_GRAND_CANYON 20
+#define MUS_GREAT_CANYON 20
 #define MUS_STORMY_SEA 21
 #define MUS_SKY_TOWER 22
 #define MUS_SKY_TOWER_SUMMIT 23
-#define MUS_RUN_AWAY 24
+#define MUS_THE_ESCAPE 24
 #define MUS_MT_BLAZE 25
-#define MUS_SKY_TOWER_END 26
+#define MUS_RAYQUAZAS_DOMAIN 26
 #define MUS_FRIEND_AREA_STRATOS_LOOKOUT 27
 #define MUS_FRIEND_AREA_RAINBOW_PEAK 28
-#define MUS_GENGAR_DREAM 29
+#define MUS_DREAM_EATER 29
 #define MUS_FRIEND_AREA_DEEPSEA_CURRENT 30
 #define MUS_FRIEND_AREA_SEAFLOOR_CAVE 31
-#define MUS_LAST_BATTLE 32
+#define MUS_BATTLE_WITH_RAYQUAZA 32
 #define MUS_MT_BLAZE_PEAK 33
 #define MUS_FRIEND_AREA_VOLCANIC_PIT 34
 #define MUS_FRIEND_AREA_CRYPTIC_CAVE 35
-#define MUS_THROUGH_THE_LAND_OF_ICE_AND_SNOW 36
-#define MUS_GENGAR_DARK_WORLD 37
-#define MUS_MT_BLAZE_END 38
+#define MUS_ESCAPE_THROUGH_THE_SNOW 36
+#define MUS_THE_OTHER_SIDE 37
+#define MUS_THE_MOUNTAIN_OF_FIRE 38
 #define MUS_FROSTY_GROTTO 39
 #define MUS_INTRO 40
-#define MUS_AFTER_THE_BATTLE 41
-#define MUS_NEVER_FORGET 42
+#define MUS_AFTERMATH 41
+#define MUS_FAREWELL 42
 #define MUS_TITLE_SCREEN 43
 #define MUS_CREDITS 44
-#define MUS_EPILOGUE 45
+#define MUS_TIME_OF_REUNION 45
 #define MUS_OPENING_TITLE 46
 #define MUS_DUNGEON_FAIL 51
 #define MUS_DUNGEON_COMPLETE 52
@@ -53,7 +53,7 @@
 // 53 - 99 are blank/empty slots for BG Music
 
 #define MUS_FRIEND_AREA_UNUSED_1 100
-#define MUS_MEETING_WITH_PARTNER 101
+#define MUS_HEARTWARMING 101
 #define MUS_LAPIS_CAVE 102
 #define MUS_A_SUCCESSFUL_RESCUE 103
 #define MUS_FROSTY_FOREST 104
@@ -66,7 +66,7 @@
 #define MUS_MT_THUNDER 111
 #define MUS_FRIEND_AREA_LAB 112
 #define MUS_SILENT_CHASM 113
-#define MUS_IN_THE_DEPTHS_OF_PIT 114
+#define MUS_IN_THE_DEPTHS_OF_THE_PIT 114
 #define MUS_MT_FREEZE 115
 #define MUS_FRIEND_AREA_WILDS 116
 #define MUS_FRIEND_AREA_LEGENDARY_ISLAND 117
diff --git a/include/dungeon_ai_movement.h b/include/dungeon_ai_movement.h
new file mode 100644
index 0000000..27bb00f
--- /dev/null
+++ b/include/dungeon_ai_movement.h
@@ -0,0 +1,9 @@
+#ifndef GUARD_DUNGEON_AI_MOVEMENT_H
+#define GUARD_DUNGEON_AI_MOVEMENT_H
+
+#include "dungeon_entity.h"
+
+// 0x75990
+void DecideAction(struct DungeonEntity *pokemon);
+
+#endif
diff --git a/include/dungeon_capabilities_1.h b/include/dungeon_capabilities_1.h
index 1d10a0f..c19391b 100644
--- a/include/dungeon_capabilities_1.h
+++ b/include/dungeon_capabilities_1.h
@@ -7,5 +7,7 @@
 bool8 CannotUseItems(struct DungeonEntity *pokemon);
 // 0x70CD0
 bool8 CannotAct(struct DungeonEntity *pokemon);
+// 0x70D6C
+bool8 CanMoveInDirection(struct DungeonEntity *pokemon, u32 facingDir);
 
 #endif
diff --git a/include/dungeon_engine.h b/include/dungeon_engine.h
new file mode 100644
index 0000000..f987b11
--- /dev/null
+++ b/include/dungeon_engine.h
@@ -0,0 +1,7 @@
+#ifndef GUARD_DUNGEON_ENGINE_H
+#define GUARD_DUNGEON_ENGINE_H
+
+// 0x441E8
+bool8 IsFixedDungeon();
+
+#endif
diff --git a/include/dungeon_movement.h b/include/dungeon_movement.h
index e3ab174..d15ef1b 100644
--- a/include/dungeon_movement.h
+++ b/include/dungeon_movement.h
@@ -1,9 +1,7 @@
 #ifndef GUARD_DUNGEON_MOVEMENT_H
 #define GUARD_DUNGEON_MOVEMENT_H
 
-#include "dungeon_entity.h"
-
-// 0x75990
-void DecideAction(struct DungeonEntity *pokemon);
+// 0x70328
+u8 GetCrossableTerrain(s16 species);
 
 #endif
diff --git a/include/map.h b/include/map.h
index bb991ff..9122f00 100644
--- a/include/map.h
+++ b/include/map.h
@@ -7,6 +7,27 @@
 #define MAX_ROOM_COUNT 24 // Empirical max, not sure if the code supports any more.
 #define CORRIDOR_ROOM_INDEX 0xFF
 
+enum TileType
+{
+    TILE_TYPE_FLOOR = 1 << 0,
+    TILE_TYPE_LIQUID = 1 << 1, // Water or lava depending on the dungeon.
+    TILE_TYPE_UNK_2 = 1 << 2,
+    TILE_TYPE_ROOM_EXIT = 1 << 3,
+    TILE_TYPE_MAP_EDGE = 1 << 4,
+    TILE_TYPE_SHOP = 1 << 5,
+    TILE_TYPE_MONSTER_HOUSE = 1 << 6,
+    TILE_TYPE_STAIRS = 1 << 9
+};
+
+enum CrossableTerrain
+{
+    CROSSABLE_TERRAIN_REGULAR = 0,
+    CROSSABLE_TERRAIN_LIQUID = 1,
+    CROSSABLE_TERRAIN_CREVICE = 2,
+    CROSSABLE_TERRAIN_WALL = 3,
+    NUM_CROSSABLE_TERRAIN
+};
+
 struct MapTile
 {
     // Uses the TileType bit flags.
@@ -17,11 +38,8 @@ struct MapTile
     u8 unk8;
     /* 0x9 */ u8 roomIndex;
     // Bitwise flags for whether Pokémon can move to an adjacent tile. Bits correspond to directions in direction.h.
-    // Different sets of flags are used for Pokémon that can cross special terrain.
-    /* 0xA */ u8 canMoveAdjacent;
-    /* 0xB */ u8 canMoveAdjacentLiquid;
-    /* 0xC */ u8 canMoveAdjacentCrevice;
-    /* 0xD */ u8 canMoveAdjacentWall;
+    // Different sets of flags are used for Pokémon that can cross special terrain, corresponding to Cthe rossableTerrain enum.
+    /* 0xA */ u8 canMoveAdjacent[NUM_CROSSABLE_TERRAIN];
     u8 fillE[0x10 - 0xE];
     /* 0x10 */ struct DungeonEntity *pokemon; // Pokémon on the tile.
     /* 0x14 */ struct DungeonEntity *mapObject; // Item or trap on the tile.
@@ -39,24 +57,4 @@ struct MapRoom
     u8 fillA[0x1A - 0xA];
 };
 
-enum TileType
-{
-    TILE_TYPE_FLOOR = 1 << 0,
-    TILE_TYPE_LIQUID = 1 << 1, // Water or lava depending on the dungeon.
-    TILE_TYPE_UNK_2 = 1 << 2,
-    TILE_TYPE_ROOM_EXIT = 1 << 3,
-    TILE_TYPE_MAP_EDGE = 1 << 4,
-    TILE_TYPE_SHOP = 1 << 5,
-    TILE_TYPE_MONSTER_HOUSE = 1 << 6,
-    TILE_TYPE_STAIRS = 1 << 9
-};
-
-enum CrossableTerrain
-{
-    CROSSABLE_TERRAIN_REGULAR = 0,
-    CROSSABLE_TERRAIN_LIQUID = 1,
-    CROSSABLE_TERRAIN_CREVICE = 2,
-    CROSSABLE_TERRAIN_WALL = 3,
-};
-
 #endif
diff --git a/ld_script.txt b/ld_script.txt
index 23ea939..4390af2 100755
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -186,6 +186,8 @@ SECTIONS {
         asm/code_8041AD0.o(.text);
         src/code_80428A0.o(.text);
         asm/code_80428A0.o(.text);
+        src/dungeon_engine.o(.text);
+        asm/code_8044210.o(.text);
         src/dungeon_action.o(.text);
         asm/code_8044CC8.o(.text);
         src/dungeon_util.o(.text);
@@ -209,12 +211,14 @@ SECTIONS {
         asm/code_806CD90.o(.text);
         src/status_checks.o(.text);
         asm/code_80701A4.o(.text);
+        src/dungeon_movement.o(.text);
+        asm/code_807034C.o(.text);
         src/status_checks_1.o(.text);
         asm/code_8070B48.o(.text);
         src/dungeon_capabilities.o(.text);
         asm/code_8070BC0.o(.text);
         src/dungeon_capabilities_1.o(.text);
-        asm/code_8070D04.o(.text);
+        asm/code_8070E3C.o(.text);
         src/dungeon_ai.o(.text);
         asm/code_8071518.o(.text);
         src/dungeon_ai_1.o(.text);
@@ -225,7 +229,7 @@ SECTIONS {
         asm/code_80718D8.o(.text);
         src/dungeon_ai_items.o(.text);
         asm/code_8073CF0.o(.text);
-        src/dungeon_movement.o(.text);
+        src/dungeon_ai_movement.o(.text);
         asm/code_8075BA4.o(.text);
         src/dungeon_ai_attack.o(.text);
         asm/code_807CABC.o(.text);
@@ -400,6 +404,8 @@ SECTIONS {
         data/data_80F59C8.o(.rodata);
         src/charge_move.o(.rodata);
         data/data_8106A4C.o(.rodata);
+        src/dungeon_capabilities_1.o(.rodata);
+        data/data_8106FB5.o(.rodata);
         src/dungeon_ai_1.o(.rodata);
         data/data_8107010.o(.rodata);
         src/friend_area.o(.rodata);
diff --git a/src/code_2.c b/src/code_2.c
index 29f1088..8a6987b 100644
--- a/src/code_2.c
+++ b/src/code_2.c
@@ -138,7 +138,7 @@ void GameLoop(void)
             FinishReadSavePak();
         }
         tmp3 = 1;
-        StartNewBGM(MUS_LOADING_SCREEN);
+        StartNewBGM(MUS_FILE_SELECT);
         flag = TRUE;
         sub_80095CC(0, 20);
         InitMainMenu();
diff --git a/src/dungeon_ai_movement.c b/src/dungeon_ai_movement.c
new file mode 100644
index 0000000..bc109eb
--- /dev/null
+++ b/src/dungeon_ai_movement.c
@@ -0,0 +1,287 @@
+#include "global.h"
+#include "dungeon_ai_movement.h"
+
+#include "constants/dungeon_action.h"
+#include "constants/direction.h"
+#include "constants/iq_skill.h"
+#include "constants/status.h"
+#include "constants/targeting.h"
+#include "code_80521D0.h"
+#include "dungeon_action.h"
+#include "dungeon_ai_items.h"
+#include "dungeon_capabilities_1.h"
+#include "dungeon_global_data.h"
+#include "dungeon_pokemon_attributes_1.h"
+#include "dungeon_random.h"
+#include "dungeon_util.h"
+#include "dungeon_util_1.h"
+#include "dungeon_visibility.h"
+#include "map.h"
+#include "pokemon.h"
+#include "status_checks.h"
+
+extern char gAvailablePokemonNames[];
+extern char *gPtrCouldntBeUsedMessage;
+extern char *gPtrItsaMonsterHouseMessage;
+
+extern void SendImmobilizeEndMessage(struct DungeonEntity*, struct DungeonEntity*);
+extern void SetMessageArgument(char[], struct DungeonEntity*, u32);
+extern void ResetAction(u16*);
+extern void DecideAttack(struct DungeonEntity*);
+extern void MoveIfPossible(struct DungeonEntity*, bool8);
+extern u8 sub_8044B28(void);
+extern void sub_807AB38(struct DungeonEntity *, u32);
+extern void sub_8041888(u32);
+extern u8 sub_803F428(s16 *);
+extern void sub_803E708(u32, u32);
+extern struct DungeonEntity *GetLeaderEntity();
+extern void TargetTileInFront(struct DungeonEntity *);
+
+u32 sub_8075818(struct DungeonEntity *entity)
+{
+    struct MapTile *tile;
+    struct DungeonEntityData *entityData;
+    struct DungeonEntity *subEntity;
+    struct ItemSlot *item;
+    u8 *trapData; // TODO: turn into struct when more research is done..
+    u8 r1;
+
+    entityData = entity->entityData;
+    if(EntityExists(entity))
+    {
+        tile = GetMapEntityForDungeonEntity(entity);
+        if(HasIQSkill(entity, IQ_SKILL_SUPER_MOBILE))
+            if(!(tile->tileType & (TILE_TYPE_FLOOR | TILE_TYPE_LIQUID)))
+                return 1;
+        subEntity = tile->mapObject;
+        if(subEntity != NULL)
+        {
+            switch(GetEntityType(subEntity))
+            {
+                case ENTITY_NONE:
+                case ENTITY_POKEMON:
+                case 4:
+                case 5:
+                    break;
+                case ENTITY_TRAP:
+                    trapData = (u8*) GetTrapData(subEntity);
+                    r1 = 0;
+                    if(trapData[1] == 0)
+                    {
+                        if(!subEntity->visible || entityData->isEnemy)
+                            goto flag_check;
+                        else
+                            goto error;
+                    }
+                    else if(trapData[1] == 1)
+                    {
+                        if(!entityData->isEnemy)
+                            goto flag_check;
+                        else
+                            goto error;
+                    }
+                    else if(trapData[1] == 2)
+                    {
+                        if(!entityData->isEnemy)
+                            r1 = 1;
+                    }
+flag_check:
+                    if(r1 == 0)
+                        break;
+                    else
+                        goto error;
+                case ENTITY_ITEM:
+                    if(!entityData->isLeader)
+                    {
+                        if(!(entityData->heldItem.itemFlags & ITEM_FLAG_EXISTS))
+                        {
+                            if(!(tile->tileType & (TILE_TYPE_FLOOR | TILE_TYPE_LIQUID)))
+                            {
+                                if(entityData->isEnemy)
+                                    break;
+                                else
+                                {
+                                    item = GetItemData(subEntity);
+                                    if(!(item->itemFlags & ITEM_FLAG_FOR_SALE))
+                                    {
+                                        return 1;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                item = GetItemData(subEntity);
+                                if(!(item->itemFlags & ITEM_FLAG_FOR_SALE))
+                                {
+error:
+                                    return 1;
+                                }
+                            }
+                        }
+                    }
+                    break;
+            }
+        }
+    }
+    return 0;
+}
+
+void sub_8075900(struct DungeonEntity *pokemon, u8 r1)
+{
+    if(EntityExists(pokemon))
+    {
+        if(!pokemon->entityData->isEnemy)
+        {
+            if(!sub_8044B28())
+            {
+                if(!gDungeonGlobalData->monsterHouseActive)
+                {
+                    if((GetMapEntityForDungeonEntity(pokemon)->tileType & TILE_TYPE_MONSTER_HOUSE))
+                    {
+                        // It's a monster house!
+                        SendMessage(GetLeaderEntity(), gPtrItsaMonsterHouseMessage);
+                        gDungeonGlobalData->unk672 = 1;
+                        sub_807AB38(pokemon, r1);
+                        sub_8041888(0);
+                        if(sub_803F428(&pokemon->posWorld.x) != 0)
+                            sub_803E708(0x78, 0x39);
+                    }
+                }
+            }
+        }
+    }
+}
+
+void DecideAction(struct DungeonEntity *pokemon)
+{
+    struct DungeonEntityData *pokemonData = pokemon->entityData;
+    if (pokemonData->flags & MOVEMENT_FLAG_SWAPPED_PLACES_PETRIFIED)
+    {
+        if (pokemonData->immobilizeStatus == IMMOBILIZE_STATUS_PETRIFIED)
+        {
+            SendImmobilizeEndMessage(pokemon, pokemon);
+        }
+    }
+    else
+    {
+        pokemonData->targetingDecoy = TARGETING_DECOY_NONE;
+        if (pokemonData->clientType == CLIENT_TYPE_NONE || IsMovingClient(pokemon))
+        {
+            if (pokemonData->clientType != CLIENT_TYPE_CLIENT && pokemonData->useHeldItem)
+            {
+                if (CannotUseItems(pokemon))
+                {
+                    pokemonData->useHeldItem = FALSE;
+                    SetMessageArgument(gAvailablePokemonNames, pokemon, 0);
+                    SendMessage(pokemon, gPtrCouldntBeUsedMessage);
+                    return;
+                }
+                DecideUseItem(pokemon);
+                if (pokemonData->action.action != DUNGEON_ACTION_NONE)
+                {
+                    return;
+                }
+            }
+            if (!HasStatusAffectingActions(pokemon))
+            {
+                if (gDungeonGlobalData->decoyActive)
+                {
+                    s32 i;
+                    struct DungeonEntity *target;
+                    for (i = 0; i < DUNGEON_MAX_POKEMON; i++)
+                    {
+                        target = gDungeonGlobalData->allPokemon[i];
+                        if (EntityExists(target) &&
+                            target->entityData->waitingStatus == WAITING_STATUS_DECOY &&
+                            CanSee(pokemon, target))
+                        {
+                            bool8 enemyDecoy = target->entityData->enemyDecoy;
+                            u8 targetingDecoy = TARGETING_DECOY_TEAM;
+                            if (enemyDecoy)
+                            {
+                                targetingDecoy = TARGETING_DECOY_WILD;
+                            }
+                            pokemonData->targetingDecoy = targetingDecoy;
+                            break;
+                        }
+                    }
+                }
+                ResetAction(&pokemonData->action.action);
+                if (pokemonData->clientType == CLIENT_TYPE_CLIENT)
+                {
+                    SetWalkAction(&pokemonData->action, pokemonData->entityID);
+                    pokemonData->action.facingDir = DungeonRandomCapped(NUM_DIRECTIONS);
+                    pokemonData->targetPosition.x = pokemon->posWorld.x;
+                    pokemonData->targetPosition.y = pokemon->posWorld.y - 1;
+                }
+                else
+                {
+                    DecideUseItem(pokemon);
+                    if (pokemonData->action.action == DUNGEON_ACTION_NONE)
+                    {
+                        if (!HasIQSkill(pokemon, IQ_SKILL_DEDICATED_TRAVELER))
+                        {
+                            DecideAttack(pokemon);
+                            if (pokemonData->action.action != DUNGEON_ACTION_NONE)
+                            {
+                                return;
+                            }
+                            if (pokemonData->volatileStatus == VOLATILE_STATUS_CONFUSED)
+                            {
+                                SetWalkAction(&pokemonData->action, pokemonData->entityID);
+                            }
+                            else
+                            {
+                                if (!GetIsMoving(pokemonData->entityID))
+                                {
+                                    return;
+                                }
+                                MoveIfPossible(pokemon, TRUE);
+                            }
+                        }
+                        else
+                        {
+                            if (pokemonData->volatileStatus == VOLATILE_STATUS_CONFUSED)
+                            {
+                                SetWalkAction(&pokemonData->action, pokemonData->entityID);
+                            }
+                            else
+                            {
+                                if (GetIsMoving(pokemonData->entityID))
+                                {
+                                    MoveIfPossible(pokemon, TRUE);
+                                }
+                                if (pokemonData->action.action > DUNGEON_ACTION_WAIT)
+                                {
+                                    return;
+                                }
+                                DecideAttack(pokemon);
+                                if (pokemonData->action.action <= DUNGEON_ACTION_WAIT)
+                                {
+                                    return;
+                                }
+                                pokemonData->notAdjacentToTarget = FALSE;
+                                pokemonData->movingIntoTarget = FALSE;
+                                pokemonData->waiting = FALSE;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+void sub_8075BA4(struct DungeonEntity *param_1,char param_2)
+{
+  struct DungeonEntityData * iVar2 = param_1->entityData;
+
+  if ((param_2 != '\0') && (iVar2->volatileStatus == VOLATILE_STATUS_COWERING)) {
+      iVar2->action.facingDir = (iVar2->action.facingDir + 4) & DIRECTION_MASK;
+      TargetTileInFront(param_1);
+  }
+  else if (iVar2->volatileStatus == VOLATILE_STATUS_CONFUSED) {
+      iVar2->action.facingDir = DungeonRandomCapped(NUM_DIRECTIONS);
+      TargetTileInFront(param_1);
+  }
+}
diff --git a/src/dungeon_capabilities_1.c b/src/dungeon_capabilities_1.c
index 721bdcb..bbe48bc 100644
--- a/src/dungeon_capabilities_1.c
+++ b/src/dungeon_capabilities_1.c
@@ -2,10 +2,20 @@
 #include "dungeon_capabilities_1.h"
 
 #include "constants/dungeon.h"
+#include "constants/iq_skill.h"
 #include "constants/status.h"
 #include "charge_move.h"
 #include "dungeon_ai.h"
 #include "dungeon_capabilities.h"
+#include "dungeon_engine.h"
+#include "dungeon_items.h"
+#include "dungeon_map_access.h"
+#include "dungeon_movement.h"
+#include "dungeon_pokemon_attributes_1.h"
+#include "dungeon_util.h"
+#include "map.h"
+
+const u8 gDirectionBitMasks[] = {0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80};
 
 static inline bool8 JoinLocationCannotUseItems(struct DungeonEntityData *pokemonData)
 {
@@ -75,3 +85,43 @@ bool8 CannotAttack(struct DungeonEntity *pokemon, bool8 skipSleep)
   }
   return TRUE;
 }
+
+bool8 CanMoveInDirection(struct DungeonEntity *pokemon, u32 facingDir)
+{
+    u8 crossableTerrain = GetCrossableTerrain(pokemon->entityData->entityID);
+    struct MapTile *currentMapTile = GetMapTileAtPosition(pokemon->posWorld.x + gAdjacentTileOffsets[facingDir].x,
+        pokemon->posWorld.y + gAdjacentTileOffsets[facingDir].y);
+    if (currentMapTile->tileType & TILE_TYPE_MAP_EDGE || currentMapTile->pokemon != NULL)
+    {
+        return FALSE;
+    }
+    if (!IsFixedDungeon())
+    {
+        if (pokemon->entityData->transformStatus == TRANSFORM_STATUS_MOBILE || HasItem(pokemon, ITEM_ID_MOBILE_SCARF))
+        {
+            crossableTerrain = CROSSABLE_TERRAIN_WALL;
+        }
+        else if (HasIQSkill(pokemon, IQ_SKILL_ALL_TERRAIN_HIKER))
+        {
+            crossableTerrain = CROSSABLE_TERRAIN_CREVICE;
+        }
+        else if (HasIQSkill(pokemon, IQ_SKILL_SUPER_MOBILE))
+        {
+            if (facingDir & 1)
+            {
+                // Super Mobile can't break walls diagonally.
+                crossableTerrain = CROSSABLE_TERRAIN_CREVICE;
+            }
+            else
+            {
+                crossableTerrain = CROSSABLE_TERRAIN_WALL;
+            }
+        }
+    }
+    currentMapTile = GetMapTileAtPosition(pokemon->posWorld.x, pokemon->posWorld.y);
+    if (!(currentMapTile->canMoveAdjacent[crossableTerrain] & gDirectionBitMasks[facingDir & DIRECTION_MASK]))
+    {
+        return FALSE;
+    }
+    return TRUE;
+}
diff --git a/src/dungeon_engine.c b/src/dungeon_engine.c
new file mode 100644
index 0000000..dd25441
--- /dev/null
+++ b/src/dungeon_engine.c
@@ -0,0 +1,13 @@
+#include "global.h"
+#include "dungeon_engine.h"
+#include "constants/dungeon.h"
+#include "dungeon_global_data.h"
+
+bool8 IsFixedDungeon()
+{
+    if (gDungeonGlobalData->tileset > DUNGEON_OUT_ON_RESCUE)
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
diff --git a/src/dungeon_movement.c b/src/dungeon_movement.c
index d342262..0ff0509 100644
--- a/src/dungeon_movement.c
+++ b/src/dungeon_movement.c
@@ -1,287 +1,26 @@
 #include "global.h"
 #include "dungeon_movement.h"
-
-#include "constants/dungeon_action.h"
-#include "constants/direction.h"
-#include "constants/iq_skill.h"
-#include "constants/status.h"
-#include "constants/targeting.h"
-#include "code_80521D0.h"
-#include "dungeon_action.h"
-#include "dungeon_ai_items.h"
-#include "dungeon_capabilities_1.h"
-#include "dungeon_global_data.h"
-#include "dungeon_pokemon_attributes_1.h"
-#include "dungeon_random.h"
-#include "dungeon_util.h"
-#include "dungeon_util_1.h"
-#include "dungeon_visibility.h"
 #include "map.h"
 #include "pokemon.h"
-#include "status_checks.h"
-
-extern char gAvailablePokemonNames[];
-extern char *gPtrCouldntBeUsedMessage;
-extern char *gPtrItsaMonsterHouseMessage;
 
-extern void SendImmobilizeEndMessage(struct DungeonEntity*, struct DungeonEntity*);
-extern void SetMessageArgument(char[], struct DungeonEntity*, u32);
-extern void ResetAction(u16*);
-extern void DecideAttack(struct DungeonEntity*);
-extern void MoveIfPossible(struct DungeonEntity*, bool8);
-extern u8 sub_8044B28(void);
-extern void sub_807AB38(struct DungeonEntity *, u32);
-extern void sub_8041888(u32);
-extern u8 sub_803F428(s16 *);
-extern void sub_803E708(u32, u32);
-extern struct DungeonEntity *GetLeaderEntity();
-extern void TargetTileInFront(struct DungeonEntity *);
+extern u8 gWalkableTileToCrossableTerrain[8];
 
-u32 sub_8075818(struct DungeonEntity *entity)
+u8 GetCrossableTerrain(s16 species)
 {
-    struct MapTile *tile;
-    struct DungeonEntityData *entityData;
-    struct DungeonEntity *subEntity;
-    struct ItemSlot *item;
-    u8 *trapData; // TODO: turn into struct when more research is done..
-    u8 r1;
-
-    entityData = entity->entityData;
-    if(EntityExists(entity))
+    u8 walkableTiles = GetWalkableTiles(species);
+    if (walkableTiles >= NUM_CROSSABLE_TERRAIN)
     {
-        tile = GetMapEntityForDungeonEntity(entity);
-        if(HasIQSkill(entity, IQ_SKILL_SUPER_MOBILE))
-            if(!(tile->tileType & (TILE_TYPE_FLOOR | TILE_TYPE_LIQUID)))
-                return 1;
-        subEntity = tile->mapObject;
-        if(subEntity != NULL)
-        {
-            switch(GetEntityType(subEntity))
-            {
-                case ENTITY_NONE:
-                case ENTITY_POKEMON:
-                case 4:
-                case 5:
-                    break;
-                case ENTITY_TRAP:
-                    trapData = (u8*) GetTrapData(subEntity);
-                    r1 = 0;
-                    if(trapData[1] == 0)
-                    {
-                        if(!subEntity->visible || entityData->isEnemy)
-                            goto flag_check;
-                        else
-                            goto error;
-                    }
-                    else if(trapData[1] == 1)
-                    {
-                        if(!entityData->isEnemy)
-                            goto flag_check;
-                        else
-                            goto error;
-                    }
-                    else if(trapData[1] == 2)
-                    {
-                        if(!entityData->isEnemy)
-                            r1 = 1;
-                    }
-flag_check:
-                    if(r1 == 0)
-                        break;
-                    else
-                        goto error;
-                case ENTITY_ITEM:
-                    if(!entityData->isLeader)
-                    {
-                        if(!(entityData->heldItem.itemFlags & ITEM_FLAG_EXISTS))
-                        {
-                            if(!(tile->tileType & (TILE_TYPE_FLOOR | TILE_TYPE_LIQUID)))
-                            {
-                                if(entityData->isEnemy)
-                                    break;
-                                else
-                                {
-                                    item = GetItemData(subEntity);
-                                    if(!(item->itemFlags & ITEM_FLAG_FOR_SALE))
-                                    {
-                                        return 1;
-                                    }
-                                }
-                            }
-                            else
-                            {
-                                item = GetItemData(subEntity);
-                                if(!(item->itemFlags & ITEM_FLAG_FOR_SALE))
-                                {
-error:
-                                    return 1;
-                                }
-                            }
-                        }
-                    }
-                    break;
-            }
-        }
-    }
-    return 0;
-}
-
-void sub_8075900(struct DungeonEntity *pokemon, u8 r1)
-{
-    if(EntityExists(pokemon))
-    {
-        if(!pokemon->entityData->isEnemy)
-        {
-            if(!sub_8044B28())
-            {
-                if(!gDungeonGlobalData->monsterHouseActive)
-                {
-                    if((GetMapEntityForDungeonEntity(pokemon)->tileType & TILE_TYPE_MONSTER_HOUSE))
-                    {
-                        // It's a monster house!
-                        SendMessage(GetLeaderEntity(), gPtrItsaMonsterHouseMessage);
-                        gDungeonGlobalData->unk672 = 1;
-                        sub_807AB38(pokemon, r1);
-                        sub_8041888(0);
-                        if(sub_803F428(&pokemon->posWorld.x) != 0)
-                            sub_803E708(0x78, 0x39);
-                    }
-                }
-            }
-        }
-    }
-}
-
-void DecideAction(struct DungeonEntity *pokemon)
-{
-    struct DungeonEntityData *pokemonData = pokemon->entityData;
-    if (pokemonData->flags & MOVEMENT_FLAG_SWAPPED_PLACES_PETRIFIED)
-    {
-        if (pokemonData->immobilizeStatus == IMMOBILIZE_STATUS_PETRIFIED)
-        {
-            SendImmobilizeEndMessage(pokemon, pokemon);
-        }
+        // Pokémon that can cross water or lava have a walkable tile value of 4 (WALKABLE_TILE_LAVA) or 5 (WALKABLE_TILE_WATER), respectively.
+        // Indices 4 and 5 in this array are assigned either CROSSABLE_TERRAIN_REGULAR or CROSSABLE_TERRAIN_LIQUID
+        // depending on whether the dungeon's liquid is water or lava.
+        // For example, a lava dungeon like Mt. Blaze would have these values:
+        //   gWalkableTileToCrossableTerrain[WALKABLE_TILE_LAVA]: CROSSABLE_TERRAIN_LIQUID
+        //   gWalkableTileToCrossableTerrain[WALKABLE_TILE_WATER]: CROSSABLE_TERRAIN_REGULAR
+        // This means a Fire-type can cross the dungeon's liquid, while a Water-type cannot.
+        return gWalkableTileToCrossableTerrain[walkableTiles];
     }
     else
     {
-        pokemonData->targetingDecoy = TARGETING_DECOY_NONE;
-        if (pokemonData->clientType == CLIENT_TYPE_NONE || IsMovingClient(pokemon))
-        {
-            if (pokemonData->clientType != CLIENT_TYPE_CLIENT && pokemonData->useHeldItem)
-            {
-                if (CannotUseItems(pokemon))
-                {
-                    pokemonData->useHeldItem = FALSE;
-                    SetMessageArgument(gAvailablePokemonNames, pokemon, 0);
-                    SendMessage(pokemon, gPtrCouldntBeUsedMessage);
-                    return;
-                }
-                DecideUseItem(pokemon);
-                if (pokemonData->action.action != DUNGEON_ACTION_NONE)
-                {
-                    return;
-                }
-            }
-            if (!HasStatusAffectingActions(pokemon))
-            {
-                if (gDungeonGlobalData->decoyActive)
-                {
-                    s32 i;
-                    struct DungeonEntity *target;
-                    for (i = 0; i < DUNGEON_MAX_POKEMON; i++)
-                    {
-                        target = gDungeonGlobalData->allPokemon[i];
-                        if (EntityExists(target) &&
-                            target->entityData->waitingStatus == WAITING_STATUS_DECOY &&
-                            CanSee(pokemon, target))
-                        {
-                            bool8 enemyDecoy = target->entityData->enemyDecoy;
-                            u8 targetingDecoy = TARGETING_DECOY_TEAM;
-                            if (enemyDecoy)
-                            {
-                                targetingDecoy = TARGETING_DECOY_WILD;
-                            }
-                            pokemonData->targetingDecoy = targetingDecoy;
-                            break;
-                        }
-                    }
-                }
-                ResetAction(&pokemonData->action.action);
-                if (pokemonData->clientType == CLIENT_TYPE_CLIENT)
-                {
-                    SetWalkAction(&pokemonData->action, pokemonData->entityID);
-                    pokemonData->action.facingDir = DungeonRandomCapped(NUM_DIRECTIONS);
-                    pokemonData->targetPosition.x = pokemon->posWorld.x;
-                    pokemonData->targetPosition.y = pokemon->posWorld.y - 1;
-                }
-                else
-                {
-                    DecideUseItem(pokemon);
-                    if (pokemonData->action.action == DUNGEON_ACTION_NONE)
-                    {
-                        if (!HasIQSkill(pokemon, IQ_SKILL_DEDICATED_TRAVELER))
-                        {
-                            DecideAttack(pokemon);
-                            if (pokemonData->action.action != DUNGEON_ACTION_NONE)
-                            {
-                                return;
-                            }
-                            if (pokemonData->volatileStatus == VOLATILE_STATUS_CONFUSED)
-                            {
-                                SetWalkAction(&pokemonData->action, pokemonData->entityID);
-                            }
-                            else
-                            {
-                                if (!GetIsMoving(pokemonData->entityID))
-                                {
-                                    return;
-                                }
-                                MoveIfPossible(pokemon, TRUE);
-                            }
-                        }
-                        else
-                        {
-                            if (pokemonData->volatileStatus == VOLATILE_STATUS_CONFUSED)
-                            {
-                                SetWalkAction(&pokemonData->action, pokemonData->entityID);
-                            }
-                            else
-                            {
-                                if (GetIsMoving(pokemonData->entityID))
-                                {
-                                    MoveIfPossible(pokemon, TRUE);
-                                }
-                                if (pokemonData->action.action > DUNGEON_ACTION_WAIT)
-                                {
-                                    return;
-                                }
-                                DecideAttack(pokemon);
-                                if (pokemonData->action.action <= DUNGEON_ACTION_WAIT)
-                                {
-                                    return;
-                                }
-                                pokemonData->notAdjacentToTarget = FALSE;
-                                pokemonData->movingIntoTarget = FALSE;
-                                pokemonData->waiting = FALSE;
-                            }
-                        }
-                    }
-                }
-            }
-        }
+        return walkableTiles;
     }
 }
-
-void sub_8075BA4(struct DungeonEntity *param_1,char param_2)
-{
-  struct DungeonEntityData * iVar2 = param_1->entityData;
-
-  if ((param_2 != '\0') && (iVar2->volatileStatus == VOLATILE_STATUS_COWERING)) {
-      iVar2->action.facingDir = (iVar2->action.facingDir + 4) & DIRECTION_MASK;
-      TargetTileInFront(param_1);
-  }
-  else if (iVar2->volatileStatus == VOLATILE_STATUS_CONFUSED) {
-      iVar2->action.facingDir = DungeonRandomCapped(NUM_DIRECTIONS);
-      TargetTileInFront(param_1);
-  }
-}
diff --git a/src/dungeon_util.c b/src/dungeon_util.c
index 5b6bd5a..c5b5695 100644
--- a/src/dungeon_util.c
+++ b/src/dungeon_util.c
@@ -3,7 +3,7 @@
 
 #include "dungeon_map_access.h"
 
-const struct Position gAdjacentTileOffsets[NUM_DIRECTIONS] = {
+const struct Position gAdjacentTileOffsets[] = {
     {0, 1},
     {1, 1},
     {1, 0},
diff --git a/src/luminous_cave.c b/src/luminous_cave.c
index eef6acd..2b5afa3 100644
--- a/src/luminous_cave.c
+++ b/src/luminous_cave.c
@@ -132,7 +132,7 @@ extern void sub_808F468(struct PokemonStruct *, u8 *, u32);
 
 bool8 LuminousCave_HasOnly1Member(void);
 
-enum 
+enum
 {
     LUMINOUS_CAVE_ENTRY,
     LUMINOUS_CAVE_ASK_EVOLVE,
@@ -284,7 +284,7 @@ void sub_8024804(void)
 void UpdateLuminousCaveDialogue(void)
 {
   char *monName;
-  
+
   switch(gUnknown_203B2B0->state) {
     case LUMINOUS_CAVE_ENTRY:
         if (LuminousCave_HasOnly1Member()) {
@@ -306,7 +306,7 @@ void UpdateLuminousCaveDialogue(void)
         break;
     case LUMINOUS_CAVE_SHALL_RETURN:
         gUnknown_203B2B0->fallbackState = 4;
-        xxx_call_fade_in_new_bgm(MUS_LOADING_SCREEN,0x3c);
+        xxx_call_fade_in_new_bgm(MUS_FILE_SELECT,0x3c);
         sub_80141B4(gLuminousCaveYeShallReturn,0,0,0x305);
         break;
 
diff --git a/src/status_checks.c b/src/status_checks.c
index ed39e99..b371934 100644
--- a/src/status_checks.c
+++ b/src/status_checks.c
@@ -6,6 +6,7 @@
 #include "constants/status.h"
 #include "code_80521D0.h"
 #include "dungeon_action.h"
+#include "dungeon_capabilities_1.h"
 #include "dungeon_random.h"
 
 extern char *gPtrFrozenMessage;
@@ -17,7 +18,6 @@ extern char *gPtrInfatuatedMessage;
 extern char gAvailablePokemonNames[];
 
 extern void SetMessageArgument(char[], struct DungeonEntity*, u32);
-extern bool8 CanMoveForward2(struct DungeonEntity*, u8);
 extern void DecideAttack(struct DungeonEntity*);
 
 bool8 HasStatusAffectingActions(struct DungeonEntity *pokemon)
@@ -74,7 +74,7 @@ bool8 HasStatusAffectingActions(struct DungeonEntity *pokemon)
     }
     if (pokemonData->eyesightStatus == EYESIGHT_STATUS_BLINKER)
     {
-        if (!CanMoveForward2(pokemon, pokemonData->action.facingDir))
+        if (!CanMoveInDirection(pokemon, pokemonData->action.facingDir))
         {
             if (DungeonRandomCapped(2) != 0)
             {
diff --git a/sym_ewram.txt b/sym_ewram.txt
index ab64731..d9b257e 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -831,7 +831,7 @@ gUnknown_202F30C = .; /* 202F30C */
 gUnknown_202F310 = .; /* 202F310 */
 	. += 0x4;
 
-gUnknown_202F314 = .; /* 202F314 */
+gWalkableTileToCrossableTerrain = .; /* 202F314 */
 	. += 0x8;
 
 gUnknown_202F31C = .; /* 202F31C */