Some more functions related to FMO camera and special anims

1 files changed, 0 insertions, 259 deletions

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 6878512e6..95e8c7949 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -1353,265 +1353,6 @@ sub_805FD08: @ 805FD08
 
 	.section .text_805fd18
 
-	thumb_func_start sub_80603CC
-sub_80603CC: @ 80603CC
-	push {r4-r7,lr}
-	adds r7, r2, 0
-	mov r12, r3
-	lsls r0, 16
-	lsrs r5, r0, 16
-	lsls r1, 16
-	lsrs r6, r1, 16
-	ldr r0, _0806045C @ =gUnknown_0300489C
-	ldrh r0, [r0]
-	negs r0, r0
-	ldr r1, _08060460 @ =gUnknown_03004880
-	ldr r2, [r1, 0x10]
-	subs r0, r2
-	lsls r0, 16
-	lsrs r3, r0, 16
-	ldr r0, _08060464 @ =gUnknown_03004898
-	ldrh r0, [r0]
-	negs r0, r0
-	ldr r1, [r1, 0x14]
-	subs r0, r1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r2, 0
-	ble _08060406
-	lsls r0, r3, 16
-	movs r3, 0x80
-	lsls r3, 13
-	adds r0, r3
-	lsrs r3, r0, 16
-_08060406:
-	cmp r2, 0
-	bge _08060412
-	lsls r0, r3, 16
-	ldr r2, _08060468 @ =0xfff00000
-	adds r0, r2
-	lsrs r3, r0, 16
-_08060412:
-	cmp r1, 0
-	ble _08060420
-	lsls r0, r4, 16
-	movs r2, 0x80
-	lsls r2, 13
-	adds r0, r2
-	lsrs r4, r0, 16
-_08060420:
-	cmp r1, 0
-	bge _0806042C
-	lsls r0, r4, 16
-	ldr r1, _08060468 @ =0xfff00000
-	adds r0, r1
-	lsrs r4, r0, 16
-_0806042C:
-	ldr r2, _0806046C @ =gSaveBlock1
-	ldrh r1, [r2]
-	lsls r0, r5, 16
-	asrs r0, 16
-	subs r0, r1
-	lsls r0, 4
-	lsls r1, r3, 16
-	asrs r1, 16
-	adds r1, r0
-	strh r1, [r7]
-	ldrh r1, [r2, 0x2]
-	lsls r0, r6, 16
-	asrs r0, 16
-	subs r0, r1
-	lsls r0, 4
-	lsls r1, r4, 16
-	asrs r1, 16
-	adds r1, r0
-	mov r2, r12
-	strh r1, [r2]
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806045C: .4byte gUnknown_0300489C
-_08060460: .4byte gUnknown_03004880
-_08060464: .4byte gUnknown_03004898
-_08060468: .4byte 0xfff00000
-_0806046C: .4byte gSaveBlock1
-	thumb_func_end sub_80603CC
-
-	thumb_func_start sub_8060470
-sub_8060470: @ 8060470
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	adds r6, r0, 0
-	mov r8, r1
-	adds r4, r2, 0
-	adds r5, r3, 0
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r5, 16
-	lsrs r5, 16
-	movs r1, 0
-	ldrsh r0, [r6, r1]
-	mov r2, r8
-	movs r3, 0
-	ldrsh r1, [r2, r3]
-	adds r2, r6, 0
-	mov r3, r8
-	bl sub_80603CC
-	lsls r4, 16
-	asrs r4, 16
-	ldrh r0, [r6]
-	adds r4, r0
-	strh r4, [r6]
-	lsls r5, 16
-	asrs r5, 16
-	mov r1, r8
-	ldrh r1, [r1]
-	adds r5, r1
-	mov r2, r8
-	strh r5, [r2]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8060470
-
-	thumb_func_start GetFieldObjectMovingCameraOffset
-GetFieldObjectMovingCameraOffset: @ 80604BC
-	push {lr}
-	adds r2, r0, 0
-	movs r0, 0
-	strh r0, [r2]
-	strh r0, [r1]
-	ldr r3, _080604F8 @ =gUnknown_03004880
-	ldr r0, [r3, 0x10]
-	cmp r0, 0
-	ble _080604D2
-	movs r0, 0x1
-	strh r0, [r2]
-_080604D2:
-	ldr r0, [r3, 0x10]
-	cmp r0, 0
-	bge _080604DE
-	ldrh r0, [r2]
-	subs r0, 0x1
-	strh r0, [r2]
-_080604DE:
-	ldr r2, [r3, 0x14]
-	cmp r2, 0
-	ble _080604EA
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-_080604EA:
-	cmp r2, 0
-	bge _080604F4
-	ldrh r0, [r1]
-	subs r0, 0x1
-	strh r0, [r1]
-_080604F4:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080604F8: .4byte gUnknown_03004880
-	thumb_func_end GetFieldObjectMovingCameraOffset
-
-	thumb_func_start FieldObjectMoveDestCoords
-FieldObjectMoveDestCoords: @ 80604FC
-	push {r4,lr}
-	lsls r1, 24
-	lsrs r1, 24
-	ldrh r4, [r0, 0x10]
-	strh r4, [r2]
-	ldrh r0, [r0, 0x12]
-	strh r0, [r3]
-	adds r0, r1, 0
-	adds r1, r2, 0
-	adds r2, r3, 0
-	bl MoveCoords
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end FieldObjectMoveDestCoords
-
-	thumb_func_start FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive: @ 806051C
-	push {lr}
-	ldrb r1, [r0]
-	movs r0, 0x42
-	ands r0, r1
-	cmp r0, 0
-	bne _0806052C
-	movs r0, 0
-	b _0806052E
-_0806052C:
-	movs r0, 0x1
-_0806052E:
-	pop {r1}
-	bx r1
-	thumb_func_end FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-
-	thumb_func_start FieldObjectIsSpecialAnimActive
-FieldObjectIsSpecialAnimActive: @ 8060534
-	push {lr}
-	adds r1, r0, 0
-	ldrb r0, [r1]
-	lsls r0, 25
-	cmp r0, 0
-	bge _0806054A
-	ldrb r0, [r1, 0x1C]
-	cmp r0, 0xFF
-	beq _0806054A
-	movs r0, 0x1
-	b _0806054C
-_0806054A:
-	movs r0, 0
-_0806054C:
-	pop {r1}
-	bx r1
-	thumb_func_end FieldObjectIsSpecialAnimActive
-
-	thumb_func_start FieldObjectSetSpecialAnim
-FieldObjectSetSpecialAnim: @ 8060550
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	lsls r1, 24
-	lsrs r5, r1, 24
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-	lsls r0, 24
-	lsrs r6, r0, 24
-	cmp r6, 0
-	bne _08060590
-	adds r0, r4, 0
-	bl UnfreezeMapObject
-	strb r5, [r4, 0x1C]
-	ldrb r0, [r4]
-	movs r1, 0x40
-	orrs r0, r1
-	movs r1, 0x7F
-	ands r0, r1
-	strb r0, [r4]
-	ldr r2, _0806058C @ =gSprites
-	ldrb r1, [r4, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	strh r6, [r0, 0x32]
-	movs r0, 0
-	b _08060592
-	.align 2, 0
-_0806058C: .4byte gSprites
-_08060590:
-	movs r0, 0x1
-_08060592:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end FieldObjectSetSpecialAnim
-
 	thumb_func_start FieldObjectForceSetSpecialAnim
 FieldObjectForceSetSpecialAnim: @ 8060598
 	push {r4,r5,lr}