through MapGridGetMetatileIdAt

1 files changed, 1 insertions, 247 deletions

diff --git a/asm/fieldmap.s b/asm/fieldmap.s
index 15a18b775..035a601dd 100644
--- a/asm/fieldmap.s
+++ b/asm/fieldmap.s
@@ -5,252 +5,6 @@
 
 	.text
 
-	thumb_func_start MapGridGetZCoordAt
-MapGridGetZCoordAt: @ 8058D44
-	push {r4-r7,lr}
-	adds r2, r0, 0
-	adds r7, r1, 0
-	cmp r2, 0
-	blt _08058D74
-	ldr r1, _08058D70 @ =VMap
-	ldr r3, [r1]
-	cmp r2, r3
-	bge _08058D74
-	cmp r7, 0
-	blt _08058D74
-	ldr r0, [r1, 0x4]
-	cmp r7, r0
-	bge _08058D74
-	adds r0, r3, 0
-	muls r0, r7
-	adds r0, r2, r0
-	ldr r1, [r1, 0x8]
-	lsls r0, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	b _08058DA8
-	.align 2, 0
-_08058D70: .4byte VMap
-_08058D74:
-	ldr r0, _08058DB4 @ =gMapHeader
-	ldr r6, [r0]
-	subs r0, r2, 0x7
-	ldrb r5, [r6, 0x18]
-	lsls r1, r5, 3
-	adds r0, r1
-	adds r1, r5, 0
-	bl __modsi3
-	adds r4, r0, 0
-	subs r0, r7, 0x7
-	ldrb r1, [r6, 0x19]
-	lsls r2, r1, 3
-	adds r0, r2
-	bl __modsi3
-	muls r0, r5
-	adds r4, r0
-	ldr r0, [r6, 0x8]
-	lsls r4, 1
-	adds r4, r0
-	ldrh r1, [r4]
-	movs r2, 0xC0
-	lsls r2, 4
-	adds r0, r2, 0
-	orrs r1, r0
-_08058DA8:
-	ldr r0, _08058DB8 @ =0x000003ff
-	cmp r1, r0
-	beq _08058DBC
-	lsrs r0, r1, 12
-	b _08058DBE
-	.align 2, 0
-_08058DB4: .4byte gMapHeader
-_08058DB8: .4byte 0x000003ff
-_08058DBC:
-	movs r0, 0
-_08058DBE:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end MapGridGetZCoordAt
-
-	thumb_func_start sub_8058DC4
-sub_8058DC4: @ 8058DC4
-	push {r4-r7,lr}
-	adds r2, r0, 0
-	adds r7, r1, 0
-	cmp r2, 0
-	blt _08058DF4
-	ldr r1, _08058DF0 @ =VMap
-	ldr r3, [r1]
-	cmp r2, r3
-	bge _08058DF4
-	cmp r7, 0
-	blt _08058DF4
-	ldr r0, [r1, 0x4]
-	cmp r7, r0
-	bge _08058DF4
-	adds r0, r3, 0
-	muls r0, r7
-	adds r0, r2, r0
-	ldr r1, [r1, 0x8]
-	lsls r0, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	b _08058E28
-	.align 2, 0
-_08058DF0: .4byte VMap
-_08058DF4:
-	ldr r0, _08058E38 @ =gMapHeader
-	ldr r6, [r0]
-	subs r0, r2, 0x7
-	ldrb r5, [r6, 0x18]
-	lsls r1, r5, 3
-	adds r0, r1
-	adds r1, r5, 0
-	bl __modsi3
-	adds r4, r0, 0
-	subs r0, r7, 0x7
-	ldrb r1, [r6, 0x19]
-	lsls r2, r1, 3
-	adds r0, r2
-	bl __modsi3
-	muls r0, r5
-	adds r4, r0
-	ldr r0, [r6, 0x8]
-	lsls r4, 1
-	adds r4, r0
-	ldrh r1, [r4]
-	movs r2, 0xC0
-	lsls r2, 4
-	adds r0, r2, 0
-	orrs r1, r0
-_08058E28:
-	ldr r0, _08058E3C @ =0x000003ff
-	cmp r1, r0
-	beq _08058E40
-	movs r0, 0xC0
-	lsls r0, 4
-	ands r1, r0
-	lsrs r0, r1, 10
-	b _08058E42
-	.align 2, 0
-_08058E38: .4byte gMapHeader
-_08058E3C: .4byte 0x000003ff
-_08058E40:
-	movs r0, 0x1
-_08058E42:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8058DC4
-
-	thumb_func_start sub_8058E48
-sub_8058E48: @ 8058E48
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	mov r8, r0
-	mov r9, r1
-	cmp r0, 0
-	blt _08058E80
-	ldr r1, _08058E7C @ =VMap
-	ldr r2, [r1]
-	cmp r8, r2
-	bge _08058E80
-	mov r0, r9
-	cmp r0, 0
-	blt _08058E80
-	ldr r0, [r1, 0x4]
-	cmp r9, r0
-	bge _08058E80
-	mov r0, r9
-	muls r0, r2
-	add r0, r8
-	ldr r1, [r1, 0x8]
-	lsls r0, 1
-	adds r0, r1
-	ldrh r7, [r0]
-	b _08058EBA
-	.align 2, 0
-_08058E7C: .4byte VMap
-_08058E80:
-	ldr r0, _08058EC8 @ =gMapHeader
-	ldr r6, [r0]
-	mov r0, r8
-	subs r0, 0x7
-	ldrb r5, [r6, 0x18]
-	lsls r1, r5, 3
-	adds r0, r1
-	adds r1, r5, 0
-	bl __modsi3
-	adds r4, r0, 0
-	mov r0, r9
-	subs r0, 0x7
-	ldrb r1, [r6, 0x19]
-	lsls r2, r1, 3
-	adds r0, r2
-	bl __modsi3
-	muls r0, r5
-	adds r4, r0
-	ldr r0, [r6, 0x8]
-	lsls r4, 1
-	adds r4, r0
-	ldrh r1, [r4]
-	movs r2, 0xC0
-	lsls r2, 4
-	adds r0, r2, 0
-	adds r7, r0, 0
-	orrs r7, r1
-_08058EBA:
-	ldr r0, _08058ECC @ =0x000003ff
-	cmp r7, r0
-	beq _08058ED0
-	ands r7, r0
-	adds r0, r7, 0
-	b _08058F0A
-	.align 2, 0
-_08058EC8: .4byte gMapHeader
-_08058ECC: .4byte 0x000003ff
-_08058ED0:
-	ldr r0, _08058F18 @ =gMapHeader
-	ldr r6, [r0]
-	mov r0, r8
-	subs r0, 0x7
-	ldrb r5, [r6, 0x18]
-	lsls r1, r5, 3
-	adds r0, r1
-	adds r1, r5, 0
-	bl __modsi3
-	adds r4, r0, 0
-	mov r0, r9
-	subs r0, 0x7
-	ldrb r1, [r6, 0x19]
-	lsls r2, r1, 3
-	adds r0, r2
-	bl __modsi3
-	muls r0, r5
-	adds r4, r0
-	ldr r0, [r6, 0x8]
-	lsls r4, 1
-	adds r4, r0
-	ldrh r0, [r4]
-	movs r2, 0xC0
-	lsls r2, 4
-	adds r1, r2, 0
-	orrs r0, r1
-	ands r0, r7
-_08058F0A:
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08058F18: .4byte gMapHeader
-	thumb_func_end sub_8058E48
-
 	thumb_func_start sub_8058F1C
 sub_8058F1C: @ 8058F1C
 	push {lr}
@@ -287,7 +41,7 @@ sub_8058F48: @ 8058F48
 	asrs r0, 16
 	lsls r1, 16
 	asrs r1, 16
-	bl sub_8058E48
+	bl MapGridGetMetatileIdAt
 	adds r1, r0, 0
 	lsls r1, 16
 	lsrs r1, 16