Finish decomping unk_0201E7D8

10 files changed, 34 insertions, 573 deletions

diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s
index ef0c42fa..26b3a3ef 100644
--- a/arm9/asm/scrcmd_asm.s
+++ b/arm9/asm/scrcmd_asm.s
@@ -607,7 +607,7 @@ ScrCmd_Unk0066: ; 0x0203B468
 	ldr r1, [r5, #0x0]
 	add r0, r4, #0x0
 	ldr r1, [r1, #0x20]
-	bl FUN_0201EC68
+	bl Camera_SetFixedTarget
 	mov r0, #0x0
 	add sp, #0xc
 	pop {r4-r7, pc}
@@ -640,7 +640,7 @@ ScrCmd_Unk0067: ; 0x0203B500
 	ldr r1, [r5, #0x0]
 	add r0, r4, #0x0
 	ldr r1, [r1, #0x20]
-	bl FUN_0201EC68
+	bl Camera_SetFixedTarget
 	mov r0, #0x0
 	pop {r3-r5, pc}
 
@@ -854,7 +854,7 @@ _0203B6F8:
 	ldr r1, [r5, #0x0]
 	add r0, sp, #0x0
 	ldr r1, [r1, #0x20]
-	bl FUN_0201EF70
+	bl Camera_OffsetLookAtPosAndTarget
 	mov r0, #0x0
 	add sp, #0xc
 	pop {r4-r7, pc}
diff --git a/arm9/asm/unk_02012CC8.s b/arm9/asm/unk_02012CC8.s
index e54565f1..b9d7da8e 100644
--- a/arm9/asm/unk_02012CC8.s
+++ b/arm9/asm/unk_02012CC8.s
@@ -145,7 +145,7 @@ _02012D14:
 	cmp r0, #0x1
 	bne _02012DA8
 	ldr r0, [sp, #0x2c]
-	bl FUN_0201EB64
+	bl Camera_Alloc
 	str r0, [r4, #0x20]
 	mov r3, #0x0
 	str r3, [r4, #0x24]
@@ -160,13 +160,13 @@ _02012D14:
 	str r0, [sp, #0x4]
 	ldrh r2, [r4, #0x30]
 	ldr r0, _02012DDC ; =UNK_020ED4F0
-	bl FUN_0201ED5C
+	bl Camera_InitWithPosAndTarget
 	add r0, r4, #0x0
 	mov r1, #0x0
 	add r0, #0xdb
 	strb r1, [r0, #0x0]
 	ldr r0, [r4, #0x20]
-	bl FUN_0201EB8C
+	bl Camera_SetWorkPtr
 _02012DA8:
 	mov r0, #0x6
 	str r0, [sp, #0x0]
@@ -291,7 +291,7 @@ _02012E94:
 	ldr r0, [r5, #0x20]
 	cmp r0, #0x0
 	beq _02012E9E
-	bl FUN_0201EB70
+	bl Camera_Free
 _02012E9E:
 	add r0, r5, #0x0
 	bl FreeToHeap
@@ -947,10 +947,10 @@ FUN_02013300: ; 0x02013300
 	beq _0201331C
 	add r0, #0xdb
 	ldrb r0, [r0, #0x0]
-	bl FUN_0201EE2C
+	bl ApplyPerspectiveType
 	ldr r0, [r4, #0x20]
-	bl FUN_0201EB8C
-	bl FUN_0201EBA4
+	bl Camera_SetWorkPtr
+	bl Camera_PushLookAtToNNSGlb
 _0201331C:
 	bl NNS_G3dGlbFlushP
 	ldr r0, [r4, #0x0]
@@ -959,7 +959,7 @@ _0201331C:
 	ldr r0, [r4, #0x20]
 	cmp r0, #0x0
 	beq _02013332
-	bl FUN_0201EB98
+	bl Camera_UnsetWorkPtr
 _02013332:
 	bl NNS_G3dGlbFlushP
 	pop {r4, pc}
@@ -1106,7 +1106,7 @@ FUN_020133FC: ; 0x020133FC
 	str r0, [r2, #0x0]
 	ldr r1, [r5, #0x20]
 	add r0, r4, #0x0
-	bl FUN_0201EC58
+	bl Camera_SetLookAtCamUp
 	pop {r3-r5, pc}
 	.balign 4
 
diff --git a/arm9/asm/unk_0201C7A0.s b/arm9/asm/unk_0201C7A0.s
index cbc055af..0602b2cb 100644
--- a/arm9/asm/unk_0201C7A0.s
+++ b/arm9/asm/unk_0201C7A0.s
@@ -22,8 +22,8 @@ FUN_0201C7A8: ; 0x0201C7A8
 _0201C7AE:
 	bx lr
 
-	thumb_func_start FUN_0201C7B0
-FUN_0201C7B0: ; 0x0201C7B0
+	thumb_func_start CalcAngleBetweenVecs
+CalcAngleBetweenVecs: ; 0x0201C7B0
 	push {r3-r7, lr}
 	sub sp, #0x30
 	add r4, r1, #0x0
diff --git a/arm9/asm/unk_0201E7D8_s.s b/arm9/asm/unk_0201E7D8_s.s
deleted file mode 100644
index 70a62da3..00000000
--- a/arm9/asm/unk_0201E7D8_s.s
+++ /dev/null
@@ -1,539 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.extern NNS_G3dGlb
-	.extern FX_SinCosTable_
-	.extern UNK_02105BB8
-	.extern UNK_021C59A4
-
-	.text
-
-	.extern FUN_0201E7D8
-	.extern FUN_0201E8B8
-	.extern FUN_0201E99C
-	.extern FUN_0201E9E8
-	.extern FUN_0201EA08
-	.extern FUN_0201EABC
-
-	thumb_func_start FUN_0201EC94
-FUN_0201EC94: ; 0x0201EC94
-	str r0, [r2, #0xc]
-	add r0, r2, #0x0
-	str r1, [r2, #0x10]
-	add r0, #0x44
-	ldr r3, _0201ECA4 ; =FUN_0201EE2C
-	ldrb r0, [r0, #0x0]
-	add r1, r2, #0x0
-	bx r3
-	.balign 4
-_0201ECA4: .word FUN_0201EE2C
-
-	thumb_func_start FUN_0201ECA8
-FUN_0201ECA8: ; 0x0201ECA8
-	push {r3-r7, lr}
-	ldr r4, [sp, #0x20]
-	add r5, r0, #0x0
-	add r7, r1, #0x0
-	add r0, r3, #0x0
-	add r1, r4, #0x0
-	add r6, r2, #0x0
-	bl FUN_0201E99C
-	add r3, r5, #0x0
-	add r2, r4, #0x0
-	ldmia r3!, {r0-r1}
-	add r2, #0x20
-	stmia r2!, {r0-r1}
-	ldr r0, [r3, #0x0]
-	str r0, [r2, #0x0]
-	str r7, [r4, #0x38]
-	ldrh r0, [r6, #0x0]
-	strh r0, [r4, #0x3c]
-	ldrh r0, [r6, #0x2]
-	strh r0, [r4, #0x3e]
-	add r0, r4, #0x0
-	ldrh r1, [r6, #0x4]
-	add r0, #0x40
-	strh r1, [r0, #0x0]
-	add r0, r4, #0x0
-	ldrh r1, [r6, #0x6]
-	add r0, #0x42
-	strh r1, [r0, #0x0]
-	add r0, r4, #0x0
-	bl FUN_0201E7D8
-	add r0, sp, #0x8
-	ldrb r0, [r0, #0x10]
-	add r1, r4, #0x0
-	bl FUN_0201EE2C
-	ldr r0, [sp, #0x1c]
-	cmp r0, #0x0
-	beq _0201ED0E
-	str r5, [r4, #0x54]
-	add r2, r4, #0x0
-	ldmia r5!, {r0-r1}
-	add r2, #0x48
-	stmia r2!, {r0-r1}
-	ldr r0, [r5, #0x0]
-	str r0, [r2, #0x0]
-	mov r0, #0x1
-	str r0, [r4, #0x58]
-	str r0, [r4, #0x5c]
-	str r0, [r4, #0x60]
-_0201ED0E:
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_0201ED10
-FUN_0201ED10: ; 0x0201ED10
-	push {r3-r7, lr}
-	ldr r4, [sp, #0x1c]
-	add r6, r0, #0x0
-	add r7, r1, #0x0
-	add r0, r3, #0x0
-	add r1, r4, #0x0
-	add r5, r2, #0x0
-	bl FUN_0201E99C
-	add r2, r4, #0x0
-	ldmia r6!, {r0-r1}
-	add r2, #0x14
-	stmia r2!, {r0-r1}
-	ldr r0, [r6, #0x0]
-	str r0, [r2, #0x0]
-	str r7, [r4, #0x38]
-	ldrh r0, [r5, #0x0]
-	strh r0, [r4, #0x3c]
-	ldrh r0, [r5, #0x2]
-	strh r0, [r4, #0x3e]
-	add r0, r4, #0x0
-	ldrh r1, [r5, #0x4]
-	add r0, #0x40
-	strh r1, [r0, #0x0]
-	add r0, r4, #0x0
-	ldrh r1, [r5, #0x6]
-	add r0, #0x42
-	strh r1, [r0, #0x0]
-	add r0, r4, #0x0
-	bl FUN_0201E8B8
-	add r0, sp, #0x8
-	ldrb r0, [r0, #0x10]
-	add r1, r4, #0x0
-	bl FUN_0201EE2C
-	pop {r3-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_0201ED5C
-FUN_0201ED5C: ; 0x0201ED5C
-	push {r4-r7, lr}
-	sub sp, #0x3c
-	ldr r4, [sp, #0x54]
-	add r5, r0, #0x0
-	add r6, r1, #0x0
-	add r0, r2, #0x0
-	add r1, r4, #0x0
-	add r7, r3, #0x0
-	bl FUN_0201E99C
-	add r3, r5, #0x0
-	add r2, r4, #0x0
-	ldmia r3!, {r0-r1}
-	add r2, #0x20
-	stmia r2!, {r0-r1}
-	ldr r0, [r3, #0x0]
-	add r3, r6, #0x0
-	str r0, [r2, #0x0]
-	add r2, r4, #0x0
-	ldmia r3!, {r0-r1}
-	add r2, #0x14
-	stmia r2!, {r0-r1}
-	ldr r0, [r3, #0x0]
-	add r1, r5, #0x0
-	str r0, [r2, #0x0]
-	add r0, r6, #0x0
-	add r2, sp, #0x30
-	bl VEC_Subtract
-	add r0, sp, #0x30
-	bl VEC_Mag
-	str r0, [r4, #0x38]
-	mov r6, #0x0
-	add r0, sp, #0x24
-	str r6, [r0, #0x0]
-	str r6, [r0, #0x4]
-	str r6, [r0, #0x8]
-	add r0, sp, #0x18
-	str r6, [r0, #0x0]
-	str r6, [r0, #0x4]
-	str r6, [r0, #0x8]
-	add r0, sp, #0xc
-	str r6, [r0, #0x0]
-	str r6, [r0, #0x4]
-	str r6, [r0, #0x8]
-	mov r0, #0x1
-	lsl r0, r0, #0xc
-	add r3, sp, #0x30
-	str r0, [sp, #0x8]
-	ldmia r3!, {r0-r1}
-	add r2, sp, #0xc
-	stmia r2!, {r0-r1}
-	ldr r0, [r3, #0x0]
-	str r6, [sp, #0x0]
-	str r0, [r2, #0x0]
-	str r6, [sp, #0x4]
-	str r6, [sp, #0x10]
-	add r0, sp, #0x0
-	add r1, sp, #0xc
-	bl FUN_0201C7B0
-	strh r0, [r4, #0x3e]
-	add r1, r6, #0x0
-	mov r0, #0x1
-	lsl r0, r0, #0xc
-	str r0, [sp, #0x0]
-	ldr r0, [sp, #0x38]
-	str r1, [sp, #0x4]
-	str r0, [sp, #0xc]
-	ldr r0, [sp, #0x34]
-	str r1, [sp, #0x8]
-	str r0, [sp, #0x14]
-	str r1, [sp, #0x10]
-	add r0, sp, #0x0
-	add r1, sp, #0xc
-	bl FUN_0201C7B0
-	strh r0, [r4, #0x3c]
-	add r0, r4, #0x0
-	add r1, r6, #0x0
-	add r0, #0x40
-	strh r1, [r0, #0x0]
-	add r0, r7, #0x0
-	add r1, r4, #0x0
-	bl FUN_0201EE2C
-	ldr r0, [sp, #0x50]
-	cmp r0, #0x0
-	beq _0201EE26
-	str r5, [r4, #0x54]
-	add r2, r4, #0x0
-	ldmia r5!, {r0-r1}
-	add r2, #0x48
-	stmia r2!, {r0-r1}
-	ldr r0, [r5, #0x0]
-	str r0, [r2, #0x0]
-	mov r0, #0x1
-	str r0, [r4, #0x58]
-	str r0, [r4, #0x5c]
-	str r0, [r4, #0x60]
-_0201EE26:
-	add sp, #0x3c
-	pop {r4-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_0201EE2C
-FUN_0201EE2C: ; 0x0201EE2C
-	push {r3-r6, lr}
-	sub sp, #0x14
-	add r5, r1, #0x0
-	cmp r0, #0x0
-	bne _0201EE6C
-	ldr r0, [r5, #0x10]
-	str r0, [sp, #0x0]
-	mov r0, #0x1
-	lsl r0, r0, #0xc
-	str r0, [sp, #0x4]
-	mov r0, #0x0
-	str r0, [sp, #0x8]
-	ldr r0, _0201EEE4 ; =NNS_G3dGlb + 0x8
-	str r0, [sp, #0xc]
-	ldr r0, [r5, #0x0]
-	ldr r1, [r5, #0x4]
-	ldr r2, [r5, #0x8]
-	ldr r3, [r5, #0xc]
-	bl G3i_PerspectiveW_
-	ldr r1, _0201EEE8 ; =NNS_G3dGlb + 0x80
-	mov r0, #0x50
-	ldr r2, [r1, #0x7c]
-	add r5, #0x44
-	bic r2, r0
-	str r2, [r1, #0x7c]
-	mov r1, #0x0
-	ldr r0, _0201EEEC ; =UNK_02105BB8
-	strb r1, [r5, #0x0]
-	str r1, [r0, #0x0]
-	add sp, #0x14
-	pop {r3-r6, pc}
-_0201EE6C:
-	ldr r4, [r5, #0x38]
-	ldr r0, [r5, #0x0]
-	ldr r1, [r5, #0x4]
-	bl FX_Div
-	asr r1, r0, #0x1f
-	asr r3, r4, #0x1f
-	add r2, r4, #0x0
-	bl _ll_mul
-	mov r2, #0x2
-	mov r3, #0x0
-	lsl r2, r2, #0xa
-	add r2, r0, r2
-	adc r1, r3
-	lsr r4, r2, #0xc
-	lsl r0, r1, #0x14
-	orr r4, r0
-	ldr r2, [r5, #0x8]
-	asr r1, r4, #0x1f
-	add r0, r4, #0x0
-	asr r3, r2, #0x1f
-	bl _ll_mul
-	mov r6, #0x2
-	mov r2, #0x0
-	lsl r6, r6, #0xa
-	add r3, r0, r6
-	adc r1, r2
-	lsl r0, r1, #0x14
-	lsr r3, r3, #0xc
-	orr r3, r0
-	ldr r0, [r5, #0xc]
-	neg r1, r4
-	str r0, [sp, #0x0]
-	ldr r0, [r5, #0x10]
-	str r0, [sp, #0x4]
-	lsl r0, r6, #0x1
-	str r0, [sp, #0x8]
-	str r2, [sp, #0xc]
-	ldr r0, _0201EEE4 ; =NNS_G3dGlb + 0x8
-	neg r2, r3
-	str r0, [sp, #0x10]
-	add r0, r4, #0x0
-	bl G3i_OrthoW_
-	ldr r1, _0201EEE8 ; =NNS_G3dGlb + 0x80
-	mov r0, #0x50
-	ldr r2, [r1, #0x7c]
-	add r5, #0x44
-	bic r2, r0
-	str r2, [r1, #0x7c]
-	mov r0, #0x1
-	strb r0, [r5, #0x0]
-	ldr r0, _0201EEEC ; =UNK_02105BB8
-	mov r1, #0x0
-	str r1, [r0, #0x0]
-	add sp, #0x14
-	pop {r3-r6, pc}
-	nop
-_0201EEE4: .word NNS_G3dGlb + 0x8
-_0201EEE8: .word NNS_G3dGlb + 0x80
-_0201EEEC: .word UNK_02105BB8
-
-	thumb_func_start FUN_0201EEF0
-FUN_0201EEF0: ; 0x0201EEF0
-	add r2, r1, #0x0
-	add r2, #0x46
-	strh r0, [r2, #0x0]
-	add r0, r1, #0x0
-	add r0, #0x46
-	ldrh r0, [r0, #0x0]
-	ldr r3, _0201EF24 ; =FUN_0201EE2C
-	asr r0, r0, #0x4
-	lsl r2, r0, #0x2
-	ldr r0, _0201EF28 ; =FX_SinCosTable_
-	ldrsh r2, [r0, r2]
-	str r2, [r1, #0x0]
-	add r2, r1, #0x0
-	add r2, #0x46
-	ldrh r2, [r2, #0x0]
-	asr r2, r2, #0x4
-	lsl r2, r2, #0x1
-	add r2, r2, #0x1
-	lsl r2, r2, #0x1
-	ldrsh r0, [r0, r2]
-	str r0, [r1, #0x4]
-	add r0, r1, #0x0
-	add r0, #0x44
-	ldrb r0, [r0, #0x0]
-	bx r3
-	nop
-_0201EF24: .word FUN_0201EE2C
-_0201EF28: .word FX_SinCosTable_
-
-	thumb_func_start FUN_0201EF2C
-FUN_0201EF2C: ; 0x0201EF2C
-	add r2, r1, #0x0
-	add r2, #0x46
-	ldrh r2, [r2, #0x0]
-	ldr r3, _0201EF68 ; =FUN_0201EE2C
-	add r2, r2, r0
-	add r0, r1, #0x0
-	add r0, #0x46
-	strh r2, [r0, #0x0]
-	add r0, r1, #0x0
-	add r0, #0x46
-	ldrh r0, [r0, #0x0]
-	asr r0, r0, #0x4
-	lsl r2, r0, #0x2
-	ldr r0, _0201EF6C ; =FX_SinCosTable_
-	ldrsh r2, [r0, r2]
-	str r2, [r1, #0x0]
-	add r2, r1, #0x0
-	add r2, #0x46
-	ldrh r2, [r2, #0x0]
-	asr r2, r2, #0x4
-	lsl r2, r2, #0x1
-	add r2, r2, #0x1
-	lsl r2, r2, #0x1
-	ldrsh r0, [r0, r2]
-	str r0, [r1, #0x4]
-	add r0, r1, #0x0
-	add r0, #0x44
-	ldrb r0, [r0, #0x0]
-	bx r3
-	nop
-_0201EF68: .word FUN_0201EE2C
-_0201EF6C: .word FX_SinCosTable_
-
-	thumb_func_start FUN_0201EF70
-FUN_0201EF70: ; 0x0201EF70
-	push {r3-r5, lr}
-	add r4, r1, #0x0
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x14
-	add r1, r5, #0x0
-	add r2, r0, #0x0
-	bl VEC_Add
-	add r4, #0x20
-	add r0, r4, #0x0
-	add r1, r5, #0x0
-	add r2, r4, #0x0
-	bl VEC_Add
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_0201EF90
-FUN_0201EF90: ; 0x0201EF90
-	ldrh r2, [r0, #0x0]
-	strh r2, [r1, #0x3c]
-	ldrh r2, [r0, #0x2]
-	strh r2, [r1, #0x3e]
-	add r2, r1, #0x0
-	ldrh r3, [r0, #0x4]
-	add r2, #0x40
-	strh r3, [r2, #0x0]
-	ldrh r2, [r0, #0x6]
-	add r0, r1, #0x0
-	add r0, #0x42
-	strh r2, [r0, #0x0]
-	ldr r3, _0201EFB0 ; =FUN_0201E7D8
-	add r0, r1, #0x0
-	bx r3
-	nop
-_0201EFB0: .word FUN_0201E7D8
-
-	thumb_func_start FUN_0201EFB4
-FUN_0201EFB4: ; 0x0201EFB4
-	ldrh r3, [r1, #0x3c]
-	ldrh r2, [r0, #0x0]
-	add r2, r3, r2
-	strh r2, [r1, #0x3c]
-	ldrh r3, [r1, #0x3e]
-	ldrh r2, [r0, #0x2]
-	add r2, r3, r2
-	strh r2, [r1, #0x3e]
-	add r2, r1, #0x0
-	add r2, #0x40
-	ldrh r2, [r2, #0x0]
-	ldrh r0, [r0, #0x4]
-	ldr r3, _0201EFDC ; =FUN_0201E8B8
-	add r2, r2, r0
-	add r0, r1, #0x0
-	add r0, #0x40
-	strh r2, [r0, #0x0]
-	add r0, r1, #0x0
-	bx r3
-	nop
-_0201EFDC: .word FUN_0201E8B8
-
-	thumb_func_start FUN_0201EFE0
-FUN_0201EFE0: ; 0x0201EFE0
-	ldr r3, _0201EFE8 ; =FUN_0201E7D8
-	str r0, [r1, #0x38]
-	add r0, r1, #0x0
-	bx r3
-	.balign 4
-_0201EFE8: .word FUN_0201E7D8
-
-	thumb_func_start FUN_0201EFEC
-FUN_0201EFEC: ; 0x0201EFEC
-	push {r4, lr}
-	add r3, r1, #0x0
-	add r4, r0, #0x0
-	add r2, r3, #0x0
-	ldmia r4!, {r0-r1}
-	add r2, #0x20
-	stmia r2!, {r0-r1}
-	ldr r0, [r4, #0x0]
-	str r0, [r2, #0x0]
-	add r0, r3, #0x0
-	bl FUN_0201E7D8
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_0201F008
-FUN_0201F008: ; 0x0201F008
-	add r0, #0x46
-	ldrh r0, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_0201F010
-FUN_0201F010: ; 0x0201F010
-	ldr r0, [r0, #0x38]
-	bx lr
-
-	thumb_func_start FUN_0201F014
-FUN_0201F014: ; 0x0201F014
-	ldrh r2, [r1, #0x3c]
-	strh r2, [r0, #0x0]
-	ldrh r2, [r1, #0x3e]
-	strh r2, [r0, #0x2]
-	add r2, r1, #0x0
-	add r2, #0x40
-	ldrh r2, [r2, #0x0]
-	add r1, #0x42
-	strh r2, [r0, #0x4]
-	ldrh r1, [r1, #0x0]
-	strh r1, [r0, #0x6]
-	bx lr
-
-	thumb_func_start FUN_0201F02C
-FUN_0201F02C: ; 0x0201F02C
-	add r2, r1, #0x0
-	add r2, #0x20
-	add r3, r0, #0x0
-	ldmia r2!, {r0-r1}
-	stmia r3!, {r0-r1}
-	ldr r0, [r2, #0x0]
-	str r0, [r3, #0x0]
-	bx lr
-
-	thumb_func_start FUN_0201F03C
-FUN_0201F03C: ; 0x0201F03C
-	add r2, r1, #0x0
-	add r2, #0x14
-	add r3, r0, #0x0
-	ldmia r2!, {r0-r1}
-	stmia r3!, {r0-r1}
-	ldr r0, [r2, #0x0]
-	str r0, [r3, #0x0]
-	bx lr
-
-	thumb_func_start FUN_0201F04C
-FUN_0201F04C: ; 0x0201F04C
-	add r3, r0, #0x0
-	add r2, r1, #0x0
-	ldmia r3!, {r0-r1}
-	add r2, #0x20
-	stmia r2!, {r0-r1}
-	ldr r0, [r3, #0x0]
-	str r0, [r2, #0x0]
-	bx lr
-
-	thumb_func_start FUN_0201F05C
-FUN_0201F05C: ; 0x0201F05C
-	add r3, r0, #0x0
-	add r2, r1, #0x0
-	ldmia r3!, {r0-r1}
-	add r2, #0x14
-	stmia r2!, {r0-r1}
-	ldr r0, [r3, #0x0]
-	str r0, [r2, #0x0]
-	bx lr
diff --git a/arm9/asm/unk_02046030.s b/arm9/asm/unk_02046030.s
index 43942b2f..573fba7e 100644
--- a/arm9/asm/unk_02046030.s
+++ b/arm9/asm/unk_02046030.s
@@ -251,10 +251,10 @@ FUN_02046224: ; 0x02046224
 	add r4, r0, #0x0
 	ldr r0, _02046278 ; =0x000008C1
 	ldr r1, [r4, #0x20]
-	bl FUN_0201EEF0
+	bl Camera_SetPerspectiveAngle
 	ldr r0, _0204627C ; =0x000F81B8
 	ldr r1, [r4, #0x20]
-	bl FUN_0201EFE0
+	bl Camera_SetDistance
 	ldr r0, _02046280 ; =0x0350523D
 	str r0, [sp, #0x8]
 	ldr r0, _02046284 ; =0x0015EDB7
@@ -263,7 +263,7 @@ FUN_02046224: ; 0x02046224
 	str r0, [sp, #0x10]
 	ldr r1, [r4, #0x20]
 	add r0, sp, #0x8
-	bl FUN_0201F04C
+	bl Camera_SetLookAtCamTarget
 	ldr r1, _0204628C ; =0x00000823
 	add r0, sp, #0x0
 	strh r1, [r0, #0x0]
@@ -274,12 +274,12 @@ FUN_02046224: ; 0x02046224
 	strh r1, [r0, #0x4]
 	ldr r1, [r4, #0x20]
 	add r0, sp, #0x0
-	bl FUN_0201EF90
+	bl Camera_SetAngle
 	mov r0, #0x3
 	ldr r1, _02046290 ; =0x0061C000
 	ldr r2, [r4, #0x20]
 	lsl r0, r0, #0xe
-	bl FUN_0201EC94
+	bl Camera_SetPerspectiveClippingPlane
 	add sp, #0x14
 	pop {r3-r4, pc}
 	nop
diff --git a/arm9/asm/unk_0204C1B4.s b/arm9/asm/unk_0204C1B4.s
index c7a18f3f..4970ada1 100644
--- a/arm9/asm/unk_0204C1B4.s
+++ b/arm9/asm/unk_0204C1B4.s
@@ -1038,11 +1038,11 @@ _0204C9B4:
 	ldr r0, [r5, #0x38]
 	bl FUN_02055360
 	ldr r1, [r5, #0x20]
-	bl FUN_0201EFEC
+	bl Camera_SetLookAtTargetAndRecalcPos
 	ldr r0, [r5, #0x38]
 	bl FUN_02055360
 	ldr r1, [r5, #0x20]
-	bl FUN_0201EC68
+	bl Camera_SetFixedTarget
 	add sp, #0x10
 	pop {r3-r5, pc}
 
@@ -1104,10 +1104,10 @@ _0204CA48:
 	ldr r0, [r5, #0x38]
 	bl FUN_02055360
 	ldr r1, [r5, #0x20]
-	bl FUN_0201EFEC
+	bl Camera_SetLookAtTargetAndRecalcPos
 	ldr r0, [r5, #0x38]
 	bl FUN_02055360
 	ldr r1, [r5, #0x20]
-	bl FUN_0201EC68
+	bl Camera_SetFixedTarget
 	add sp, #0x10
 	pop {r4-r6, pc}
diff --git a/arm9/asm/unk_020607D4.s b/arm9/asm/unk_020607D4.s
index 92be6430..84ef467a 100644
--- a/arm9/asm/unk_020607D4.s
+++ b/arm9/asm/unk_020607D4.s
@@ -124,11 +124,11 @@ _02060892:
 	add r1, #0x24
 	bl FUN_02055350
 	ldr r0, [r5, #0x20]
-	bl FUN_0201EC88
+	bl Camera_ClearFixedTarget
 	add r0, r4, #0x0
 	ldr r1, [r5, #0x20]
 	add r0, #0x24
-	bl FUN_0201EC68
+	bl Camera_SetFixedTarget
 	mov r0, #0x0
 	ldr r1, [r4, #0x10]
 	mvn r0, r0
diff --git a/arm9/asm/unk_0206DE24.s b/arm9/asm/unk_0206DE24.s
index 46895ddb..d11acd85 100644
--- a/arm9/asm/unk_0206DE24.s
+++ b/arm9/asm/unk_0206DE24.s
@@ -228,7 +228,7 @@ FUN_0206DFB4: ; 0x0206DFB4
 	mov r1, #0xe1
 	lsl r0, r0, #0xc
 	lsl r1, r1, #0xe
-	bl FUN_0201EC94
+	bl Camera_SetPerspectiveClippingPlane
 _0206DFEC:
 	add r0, r4, #0x0
 	add sp, #0x8
diff --git a/arm9/asm/unk_0207EF6C.s b/arm9/asm/unk_0207EF6C.s
index 2d585edb..77550e14 100644
--- a/arm9/asm/unk_0207EF6C.s
+++ b/arm9/asm/unk_0207EF6C.s
@@ -173,7 +173,7 @@ FUN_0207F008: ; 0x0207F008
 	cmp r0, #0x4
 	bne _0207F046
 	bl FUN_020222AC
-	bl FUN_0201EBA4
+	bl Camera_PushLookAtToNNSGlb
 	ldr r2, _0207F060 ; =0x04000440
 	mov r3, #0x0
 	add r1, r2, #0x0
@@ -213,7 +213,7 @@ FUN_0207F068: ; 0x0207F068
 	mov r0, #0xad
 	lsl r0, r0, #0x2
 	ldr r0, [r4, r0]
-	bl FUN_0201EB70
+	bl Camera_Free
 	mov r0, #0x2d
 	lsl r0, r0, #0x4
 	ldr r0, [r4, r0]
@@ -247,7 +247,7 @@ FUN_0207F098: ; 0x0207F098
 	strh r0, [r1, #0x4]
 	strh r0, [r1, #0x6]
 	mov r0, #0x13
-	bl FUN_0201EB64
+	bl Camera_Alloc
 	mov r1, #0xad
 	lsl r1, r1, #0x2
 	str r0, [r4, r1]
@@ -259,22 +259,22 @@ FUN_0207F098: ; 0x0207F098
 	ldr r3, _0207F104 ; =0x000005C1
 	add r0, sp, #0x10
 	add r2, sp, #0x8
-	bl FUN_0201ED10
+	bl Camera_InitWithPosAndAngle
 	mov r2, #0xad
 	lsl r2, r2, #0x2
 	mov r1, #0x19
 	ldr r2, [r4, r2]
 	mov r0, #0x0
 	lsl r1, r1, #0xe
-	bl FUN_0201EC94
+	bl Camera_SetPerspectiveClippingPlane
 	mov r0, #0xad
 	lsl r0, r0, #0x2
 	ldr r0, [r4, r0]
-	bl FUN_0201EC88
+	bl Camera_ClearFixedTarget
 	mov r0, #0xad
 	lsl r0, r0, #0x2
 	ldr r0, [r4, r0]
-	bl FUN_0201EB8C
+	bl Camera_SetWorkPtr
 	add sp, #0x1c
 	pop {r3-r4, pc}
 	nop
diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s
index f01e84e2..00825639 100644
--- a/arm9/asm/unk_02086414.s
+++ b/arm9/asm/unk_02086414.s
@@ -897,7 +897,7 @@ FUN_02086A80: ; 0x02086A80
 	mov r1, #0xe1
 	lsl r0, r0, #0xc
 	lsl r1, r1, #0xe
-	bl FUN_0201EC94
+	bl Camera_SetPerspectiveClippingPlane
 _02086AB8:
 	add r0, r4, #0x0
 	add sp, #0x8