3 files changed, 7 insertions, 112 deletions
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_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