summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/mod05_021D74E0.s10
-rw-r--r--arm9/modules/05/asm/mod05_021DA5B8.s28
-rw-r--r--arm9/modules/05/asm/mod05_021DBD84.s16
-rw-r--r--arm9/modules/05/asm/mod05_021DC0B8.s4
-rw-r--r--arm9/modules/05/asm/module_05.s84
-rw-r--r--arm9/modules/06/asm/module_06.s70
-rw-r--r--arm9/modules/07/asm/module_07.s2
-rw-r--r--arm9/modules/08/asm/module_08.s28
-rw-r--r--arm9/modules/12/asm/module_12.s2
-rw-r--r--arm9/modules/18/asm/module_18.s2
-rw-r--r--arm9/modules/63/asm/mod63_021D74E0.s22
-rw-r--r--arm9/modules/63/asm/mod63_021D8890.s44
-rw-r--r--arm9/modules/63/src/mod63_021DB450.c4
-rw-r--r--arm9/modules/64/asm/module_64.s16
-rw-r--r--arm9/modules/65/asm/module_65.s14
-rw-r--r--arm9/modules/68/asm/module_68.s14
-rw-r--r--arm9/modules/69/asm/module_69.s12
-rw-r--r--arm9/modules/77/asm/module_77.s18
-rw-r--r--arm9/modules/78/asm/module_78.s10
-rw-r--r--arm9/modules/81/asm/module_81.s26
-rw-r--r--arm9/modules/84/asm/module_84_thumb1.s14
21 files changed, 220 insertions, 220 deletions
diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s
index 9cea7a32..8bebb5b3 100644
--- a/arm9/modules/05/asm/mod05_021D74E0.s
+++ b/arm9/modules/05/asm/mod05_021D74E0.s
@@ -815,7 +815,7 @@ MOD05_021D7BE0: ; 0x021D7BE0
sub sp, #0x80
add r4, r0, #0
bl FUN_020222AC
- bl FUN_0201EBA4
+ bl Camera_PushLookAtToNNSGlb
add r0, r4, #0
bl FUN_0205E0A8
ldr r0, [r4, #0x24]
@@ -885,7 +885,7 @@ _021D7C1C:
ldr r0, [r4, #4]
ldr r0, [r0, #4]
bl MOD05_021D7FD0
- ldr r1, _021D7CA0 ; =UNK_02105BB8
+ ldr r1, _021D7CA0 ; =g3dDepthBufferingMode
mov r0, #0
ldr r1, [r1]
bl FUN_020222B4
@@ -894,7 +894,7 @@ _021D7C1C:
nop
_021D7C98: .word NNS_G3dGlb + 0x8
_021D7C9C: .word NNS_G3dGlb + 0x80
-_021D7CA0: .word UNK_02105BB8
+_021D7CA0: .word g3dDepthBufferingMode
thumb_func_start MOD05_021D7CA4
MOD05_021D7CA4: ; 0x021D7CA4
@@ -943,7 +943,7 @@ MOD05_021D7CF0: ; 0x021D7CF0
mov r0, #1
mov r1, #0
bl GX_EngineAToggleLayers
- ldr r0, _021D7D44 ; =UNK_02105BB8
+ ldr r0, _021D7D44 ; =g3dDepthBufferingMode
ldr r0, [r0]
lsl r1, r0, #1
ldr r0, _021D7D48 ; =0x04000540
@@ -973,7 +973,7 @@ _021D7D36:
str r0, [r5, #0x30]
pop {r3, r4, r5, pc}
nop
-_021D7D44: .word UNK_02105BB8
+_021D7D44: .word g3dDepthBufferingMode
_021D7D48: .word 0x04000540
thumb_func_start MOD05_021D7D4C
diff --git a/arm9/modules/05/asm/mod05_021DA5B8.s b/arm9/modules/05/asm/mod05_021DA5B8.s
index eb8560b0..fb2b253a 100644
--- a/arm9/modules/05/asm/mod05_021DA5B8.s
+++ b/arm9/modules/05/asm/mod05_021DA5B8.s
@@ -132,7 +132,7 @@ _021DA69A:
cmp r6, #0x4b
beq _021DA6B2
ldr r0, [r5, #0x20]
- bl FUN_0201EC88
+ bl Camera_ClearFixedTarget
mov r0, #1
str r0, [r4, #0x20]
_021DA6B2:
@@ -360,14 +360,14 @@ _021DA864:
pop {r4, r5, r6, r7, pc}
_021DA878:
ldr r0, [r5, #0x20]
- bl FUN_0201F008
+ bl Camera_GetPerspectiveAngle
strh r0, [r4, #0x24]
ldr r0, [sp, #0x1c]
cmp r0, #0x4b
beq _021DA88E
ldr r0, _021DA9D8 ; =0x0000FFA0
ldr r1, [r5, #0x20]
- bl FUN_0201EF2C
+ bl Camera_AdjustPerspectiveAngle
_021DA88E:
ldr r0, [r4]
add r0, r0, #1
@@ -498,7 +498,7 @@ _021DA980:
cmp r0, #0
beq _021DA9BE
ldr r0, [r5, #0x20]
- bl FUN_0201F008
+ bl Camera_GetPerspectiveAngle
ldrh r1, [r4, #0x24]
cmp r1, r0
bne _021DA9BE
@@ -555,7 +555,7 @@ MOD05_021DA9E8: ; 0x021DA9E8
lsr r4, r0, #0x18
_021DAA08:
add r0, r6, #0
- bl FUN_0201F008
+ bl Camera_GetPerspectiveAngle
sub r0, r0, r4
lsl r0, r0, #0x10
lsr r0, r0, #0x10
@@ -564,7 +564,7 @@ _021DAA08:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
add r1, r6, #0
- bl FUN_0201EF2C
+ bl Camera_AdjustPerspectiveAngle
_021DAA22:
ldrb r0, [r5]
add r0, r0, #1
@@ -594,14 +594,14 @@ _021DAA4A:
mov r4, #0x10
_021DAA4C:
add r0, r6, #0
- bl FUN_0201F008
+ bl Camera_GetPerspectiveAngle
add r0, r0, r4
lsl r0, r0, #0x10
lsr r0, r0, #0x10
beq _021DAA62
add r0, r4, #0
add r1, r6, #0
- bl FUN_0201EF2C
+ bl Camera_AdjustPerspectiveAngle
_021DAA62:
ldrb r0, [r5]
add r0, r0, #1
@@ -1391,11 +1391,11 @@ _021DB096:
str r0, [r4, #8]
strb r0, [r4, #4]
ldr r0, [r5, #0x20]
- bl FUN_0201F008
+ bl Camera_GetPerspectiveAngle
strh r0, [r4, #0xc]
ldr r0, _021DB13C ; =0x0000FFA0
ldr r1, [r5, #0x20]
- bl FUN_0201EF2C
+ bl Camera_AdjustPerspectiveAngle
mov r0, #6
str r0, [sp]
mov r1, #1
@@ -1440,7 +1440,7 @@ _021DB106:
cmp r0, #0
beq _021DB126
ldr r0, [r5, #0x20]
- bl FUN_0201F008
+ bl Camera_GetPerspectiveAngle
ldrh r1, [r4, #0xc]
cmp r1, r0
bne _021DB126
@@ -1644,11 +1644,11 @@ _021DB2AA:
str r0, [r4, #8]
strb r0, [r4, #4]
ldr r0, [r5, #0x20]
- bl FUN_0201F008
+ bl Camera_GetPerspectiveAngle
strh r0, [r4, #0xc]
ldr r0, _021DB37C ; =0x0000FFA0
ldr r1, [r5, #0x20]
- bl FUN_0201EF2C
+ bl Camera_AdjustPerspectiveAngle
cmp r7, #3
bhi _021DB2EA
add r0, r7, r7
@@ -1722,7 +1722,7 @@ _021DB348:
cmp r0, #0
beq _021DB368
ldr r0, [r5, #0x20]
- bl FUN_0201F008
+ bl Camera_GetPerspectiveAngle
ldrh r1, [r4, #0xc]
cmp r1, r0
bne _021DB368
diff --git a/arm9/modules/05/asm/mod05_021DBD84.s b/arm9/modules/05/asm/mod05_021DBD84.s
index 9a6cb847..8919e775 100644
--- a/arm9/modules/05/asm/mod05_021DBD84.s
+++ b/arm9/modules/05/asm/mod05_021DBD84.s
@@ -19,7 +19,7 @@ MOD05_021DBD84: ; 0x021DBD84
bl GF_AssertFail
_021DBD9E:
mov r0, #4
- bl FUN_0201EB64
+ bl Camera_Alloc
str r0, [r5, #0x20]
ldrb r0, [r4, #0xc]
add r2, r4, #4
@@ -31,13 +31,13 @@ _021DBD9E:
ldrh r3, [r4, #0xe]
ldr r1, [r4]
add r0, r7, #0
- bl FUN_0201ECA8
+ bl Camera_InitWithTargetAndAngle
ldr r0, [r5, #0x20]
- bl FUN_0201EB8C
+ bl Camera_SetWorkPtr
ldr r0, [r4, #0x10]
ldr r1, [r4, #0x14]
ldr r2, [r5, #0x20]
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
cmp r6, #0
beq _021DBDE2
ldr r0, [r5, #0x20]
@@ -46,7 +46,7 @@ _021DBD9E:
mov r0, #7
mov r2, #2
mov r3, #4
- bl FUN_0201EABC
+ bl Camera_AllocHistory
_021DBDE2:
add sp, #0xc
pop {r4, r5, r6, r7, pc}
@@ -57,11 +57,11 @@ _021DBDE8: .word UNK05_021F6608
MOD05_021DBDEC: ; 0x021DBDEC
push {r4, lr}
add r4, r0, #0
- bl FUN_0201EB98
+ bl Camera_UnsetWorkPtr
ldr r0, [r4, #0x20]
- bl FUN_0201EB48
+ bl Camera_FreeHistory
ldr r0, [r4, #0x20]
- bl FUN_0201EB70
+ bl Camera_Free
pop {r4, pc}
.balign 4, 0
diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s
index 0e77cb4b..a2550744 100644
--- a/arm9/modules/05/asm/mod05_021DC0B8.s
+++ b/arm9/modules/05/asm/mod05_021DC0B8.s
@@ -2261,14 +2261,14 @@ MOD05_021DD180: ; 0x021DD180
lsl r0, r0, #2
ldr r0, [r1, r0]
ldr r0, [r0, #0x20]
- bl FUN_0201F008
+ bl Camera_GetPerspectiveAngle
add r6, r0, #0
mov r0, #0x41
ldr r1, [r5]
lsl r0, r0, #2
ldr r0, [r1, r0]
ldr r0, [r0, #0x20]
- bl FUN_0201F010
+ bl Camera_GetDistance
add r1, r0, #0
add r0, sp, #0xc
str r0, [sp]
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 0157aedb..47360829 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -419,7 +419,7 @@ _021E8952:
ldr r0, [r4, #0x10]
ldr r0, [r0, #0x20]
str r0, [r5]
- bl FUN_0201F010
+ bl Camera_GetDistance
mov r2, #0x32
add r1, r0, #0
mov r0, #6
@@ -438,7 +438,7 @@ _021E899C:
add r6, r0, #0
ldr r0, [r5, #4]
ldr r1, [r5]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
cmp r6, #1
bne _021E8A56
ldr r0, [r4]
@@ -460,7 +460,7 @@ _021E899C:
ldr r0, [r4, #0x10]
ldr r0, [r0, #0x20]
str r0, [r5]
- bl FUN_0201F010
+ bl Camera_GetDistance
mov r2, #0x32
add r1, r0, #0
mov r0, #6
@@ -478,7 +478,7 @@ _021E89F4:
add r6, r0, #0
ldr r0, [r5, #4]
ldr r1, [r5]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
cmp r6, #1
bne _021E8A56
add r0, r4, #0
@@ -601,7 +601,7 @@ _021E8AD2:
ldr r0, [r4, #0x10]
ldr r0, [r0, #0x20]
str r0, [r5]
- bl FUN_0201F010
+ bl Camera_GetDistance
mov r2, #0x32
add r1, r0, #0
mov r0, #6
@@ -620,7 +620,7 @@ _021E8B1C:
add r6, r0, #0
ldr r0, [r5, #4]
ldr r1, [r5]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
cmp r6, #1
bne _021E8BD6
ldr r0, [r4]
@@ -642,7 +642,7 @@ _021E8B1C:
ldr r0, [r4, #0x10]
ldr r0, [r0, #0x20]
str r0, [r5]
- bl FUN_0201F010
+ bl Camera_GetDistance
mov r2, #0x1e
add r1, r0, #0
mov r0, #6
@@ -660,7 +660,7 @@ _021E8B74:
add r6, r0, #0
ldr r0, [r5, #4]
ldr r1, [r5]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
cmp r6, #1
bne _021E8BD6
add r0, r4, #0
@@ -1214,7 +1214,7 @@ _021E8F92:
ldr r0, [r4, #0x10]
ldr r0, [r0, #0x20]
str r0, [r5]
- bl FUN_0201F010
+ bl Camera_GetDistance
mov r2, #0x19
add r1, r0, #0
mov r0, #0xc
@@ -1234,7 +1234,7 @@ _021E8FDC:
bl MOD05_021E36A4
ldr r0, [r5, #4]
ldr r1, [r5]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
bl FUN_0200E308
cmp r0, #0
beq _021E9026
@@ -1349,7 +1349,7 @@ _021E90A2:
ldr r0, [r4, #0x10]
ldr r0, [r0, #0x20]
str r0, [r5]
- bl FUN_0201F010
+ bl Camera_GetDistance
mov r2, #0x32
add r1, r0, #0
mov r0, #0xc
@@ -1369,7 +1369,7 @@ _021E90EC:
bl MOD05_021E36A4
ldr r0, [r5, #4]
ldr r1, [r5]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
bl FUN_0200E308
cmp r0, #0
beq _021E9136
@@ -1669,7 +1669,7 @@ _021E931A:
mov r0, #7
lsl r0, r0, #6
ldr r0, [r4, r0]
- bl FUN_0201F010
+ bl Camera_GetDistance
add r1, r0, #0
mov r0, #6
str r0, [sp]
@@ -1748,7 +1748,7 @@ _021E93A6:
ldr r0, [r4, r1]
sub r1, r1, #4
ldr r1, [r4, r1]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
add r0, r7, #0
bl MOD05_021E35AC
cmp r0, #0
@@ -2079,7 +2079,7 @@ _021E96C8:
mov r0, #0x69
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0201F010
+ bl Camera_GetDistance
add r1, r0, #0
mov r0, #8
str r0, [sp]
@@ -2105,7 +2105,7 @@ _021E9702:
ldr r0, [r4, r1]
sub r1, r1, #4
ldr r1, [r4, r1]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
add r0, r6, #0
bl MOD05_021E35AC
cmp r0, #1
@@ -2483,7 +2483,7 @@ _021E9A12:
mov r0, #0x72
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0201F010
+ bl Camera_GetDistance
add r1, r0, #0
mov r0, #8
str r0, [sp]
@@ -2547,7 +2547,7 @@ _021E9A8E:
ldr r0, [r4, r1]
sub r1, r1, #4
ldr r1, [r4, r1]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
ldr r0, [sp, #0x18]
cmp r0, #1
bne _021E9B2A
@@ -2853,7 +2853,7 @@ _021E9D34:
_021E9D36:
sub r0, #0x1c
ldr r0, [r4, r0]
- bl FUN_0201F010
+ bl Camera_GetDistance
add r1, r0, #0
mov r0, #0x10
str r0, [sp]
@@ -3088,7 +3088,7 @@ _021E9F1C:
ldr r0, [r4, r1]
sub r1, r1, #4
ldr r1, [r4, r1]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
mov r1, #2
lsl r1, r1, #8
ldr r0, [r4, r1]
@@ -3519,7 +3519,7 @@ _021EA2C2:
mov r0, #0x1d
lsl r0, r0, #4
ldr r0, [r4, r0]
- bl FUN_0201F010
+ bl Camera_GetDistance
add r1, r0, #0
mov r0, #8
str r0, [sp]
@@ -3557,7 +3557,7 @@ _021EA310:
ldr r0, [r4, r1]
sub r1, r1, #4
ldr r1, [r4, r1]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
bl FUN_0200E308
cmp r0, #0
beq _021EA382
@@ -4002,7 +4002,7 @@ _021EA6B4:
mov r0, #0x82
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0201F010
+ bl Camera_GetDistance
add r1, r0, #0
mov r0, #0x40
str r0, [sp]
@@ -4040,7 +4040,7 @@ _021EA6FA:
ldr r0, [r4, r1]
sub r1, r1, #4
ldr r1, [r4, r1]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
cmp r5, #1
bne _021EA7DE
ldr r0, [sp, #0x18]
@@ -5612,10 +5612,10 @@ MOD05_021EB414: ; 0x021EB414
add r5, r0, #0
ldrh r0, [r4, #8]
ldr r1, [r5, #0x20]
- bl FUN_0201EEF0
+ bl Camera_SetPerspectiveAngle
ldr r0, [r4]
ldr r1, [r5, #0x20]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
ldrh r1, [r4, #4]
add r0, sp, #0
strh r1, [r0]
@@ -5625,7 +5625,7 @@ MOD05_021EB414: ; 0x021EB414
strh r1, [r0, #4]
ldr r1, [r5, #0x20]
add r0, sp, #0
- bl FUN_0201EF90
+ bl Camera_SetAngle
add sp, #8
pop {r3, r4, r5, pc}
.balign 4, 0
@@ -5891,7 +5891,7 @@ _021EB640:
str r0, [r5]
ldr r0, [r4, #0x10]
ldr r0, [r0, #0x20]
- bl FUN_0201F008
+ bl Camera_GetPerspectiveAngle
mov r2, #1
add r1, r0, #0
add r5, #8
@@ -5915,7 +5915,7 @@ _021EB66E:
lsl r0, r0, #0x10
ldr r1, [r1, #0x20]
lsr r0, r0, #0x10
- bl FUN_0201EEF0
+ bl Camera_SetPerspectiveAngle
cmp r6, #1
bne _021EB754
ldr r0, [r4]
@@ -5932,7 +5932,7 @@ _021EB698:
bpl _021EB754
ldr r0, [r4, #0x10]
ldr r0, [r0, #0x20]
- bl FUN_0201F010
+ bl Camera_GetDistance
mov r3, #8
str r3, [sp]
ldr r2, _021EB758 ; =0x0092E000
@@ -5955,7 +5955,7 @@ _021EB6C6:
add r6, r0, #0
ldr r0, [r5, #0x1c]
ldr r1, [r1, #0x20]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
cmp r6, #1
bne _021EB754
ldr r0, [r4]
@@ -7284,7 +7284,7 @@ _021EC19E:
str r0, [r4, r1]
ldr r1, [r4, r1]
add r0, sp, #0x2c
- bl FUN_0201F014
+ bl Camera_GetAngle
add r1, sp, #0x2c
mov r2, #0x92
ldrh r0, [r1]
@@ -7329,7 +7329,7 @@ _021EC1E8:
sub r0, #8
ldr r1, [r4, r1]
add r0, r4, r0
- bl FUN_0201EF90
+ bl Camera_SetAngle
cmp r6, #1
beq _021EC214
_021EC212:
@@ -7343,7 +7343,7 @@ _021EC21C:
mov r0, #0x8b
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0201F010
+ bl Camera_GetDistance
add r1, r0, #0
mov r0, #0x1e
str r0, [sp]
@@ -7402,7 +7402,7 @@ _021EC284:
ldr r0, [r4, r1]
sub r1, r1, #4
ldr r1, [r4, r1]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
mov r1, #0x2e
ldr r2, [r4]
lsl r1, r1, #0xc
@@ -15713,7 +15713,7 @@ MOD05_021F0318: ; 0x021F0318
ldr r1, [r4, #0x50]
add r0, sp, #0x60
add r6, r2, #0
- bl FUN_0201F02C
+ bl Camera_GetLookAtCamTarget
ldr r3, _021F0434 ; =UNK05_021F8B6C
add r2, sp, #0xc
ldmia r3!, {r0, r1}
@@ -15861,9 +15861,9 @@ MOD05_021F0454: ; 0x021F0454
add r5, r0, #0
add r4, r1, #0
add r0, sp, #0
- bl FUN_0201F014
+ bl Camera_GetAngle
add r0, r4, #0
- bl FUN_0201F008
+ bl Camera_GetPerspectiveAngle
strh r0, [r5]
ldrh r0, [r5]
ldr r2, _021F04F0 ; =FX_SinCosTable_
@@ -15888,10 +15888,10 @@ MOD05_021F0454: ; 0x021F0454
add r1, r4, #0
str r0, [r2]
add r0, sp, #0x14
- bl FUN_0201F03C
+ bl Camera_GetLookAtCamPos
add r0, sp, #8
add r1, r4, #0
- bl FUN_0201F02C
+ bl Camera_GetLookAtCamTarget
add r0, sp, #0x14
add r1, sp, #8
add r2, r5, #4
@@ -28249,7 +28249,7 @@ MOD05_021F61F4: ; 0x021F61F4
str r5, [r4, #0x2c]
ldr r0, [r5, #0x20]
str r0, [r4, #0x30]
- bl FUN_0201F010
+ bl Camera_GetDistance
str r0, [r4, #0x10]
str r0, [r4, #0x20]
ldr r0, _021F622C ; =MOD05_021F6270
@@ -28385,7 +28385,7 @@ MOD05_021F62FC: ; 0x021F62FC
ldr r1, [r1, #0x30]
bx r3
nop
-_021F6308: .word FUN_0201EFE0
+_021F6308: .word Camera_SetDistance
thumb_func_start MOD05_021F630C
MOD05_021F630C: ; 0x021F630C
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index a73dd764..ad23df94 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -1193,10 +1193,10 @@ MOD06_02239F80: ; 0x02239F80
ldr r0, _0223A008 ; =0x00001701
ldr r1, [r5, #0x20]
add r4, r2, #0
- bl FUN_0201EEF0
+ bl Camera_SetPerspectiveAngle
ldr r0, _0223A00C ; =0x000C8A55
ldr r1, [r5, #0x20]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
ldr r0, _0223A010 ; =0x002280EF
str r0, [sp, #8]
ldr r0, _0223A014 ; =0x000CA424
@@ -1205,7 +1205,7 @@ MOD06_02239F80: ; 0x02239F80
str r0, [sp, #0x10]
ldr r1, [r5, #0x20]
add r0, sp, #8
- bl FUN_0201F04C
+ bl Camera_SetLookAtCamTarget
ldr r1, _0223A01C ; =0x000022A2
add r0, sp, #0
strh r1, [r0]
@@ -1220,7 +1220,7 @@ MOD06_02239F80: ; 0x02239F80
strh r1, [r0, #4]
ldr r1, [r5, #0x20]
add r0, sp, #0
- bl FUN_0201EF90
+ bl Camera_SetAngle
.ifdef DIAMOND
mov r0, #2
mov r1, #0x7d
@@ -1233,7 +1233,7 @@ MOD06_02239F80: ; 0x02239F80
.ifdef DIAMOND
lsl r1, r1, #0x10
.endif
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
mov r0, #4
bl MOD06_0223B574
str r0, [r4, #4]
@@ -1242,7 +1242,7 @@ MOD06_02239F80: ; 0x02239F80
str r0, [r4, #8]
ldr r1, [r5, #0x20]
add r0, sp, #8
- bl FUN_0201F02C
+ bl Camera_GetLookAtCamTarget
ldr r0, [r4, #4]
ldr r1, [sp, #8]
ldr r2, [sp, #0xc]
@@ -1282,10 +1282,10 @@ MOD06_0223A020: ; 0x0223A020
ldr r0, _0223A0B8 ; =0x00000F81
ldr r1, [r5, #0x20]
add r4, r2, #0
- bl FUN_0201EEF0
+ bl Camera_SetPerspectiveAngle
ldr r0, _0223A0BC ; =0x0017E532
ldr r1, [r5, #0x20]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
ldr r0, _0223A0C0 ; =0x00F99D58
str r0, [sp, #8]
ldr r0, _0223A0C4 ; =0x000C5502
@@ -1294,7 +1294,7 @@ MOD06_0223A020: ; 0x0223A020
str r0, [sp, #0x10]
ldr r1, [r5, #0x20]
add r0, sp, #8
- bl FUN_0201F04C
+ bl Camera_SetLookAtCamTarget
ldr r1, _0223A0CC ; =0x00000642
add r0, sp, #0
strh r1, [r0]
@@ -1304,13 +1304,13 @@ MOD06_0223A020: ; 0x0223A020
strh r1, [r0, #4]
ldr r1, [r5, #0x20]
add r0, sp, #0
- bl FUN_0201EF90
+ bl Camera_SetAngle
mov r0, #0x16
mov r1, #0x7d
ldr r2, [r5, #0x20]
lsl r0, r0, #0xe
lsl r1, r1, #0x10
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
add r0, r5, #0
add r0, #0x48
bl MOD05_021DB4B0
@@ -1326,7 +1326,7 @@ MOD06_0223A020: ; 0x0223A020
str r0, [r4, #8]
ldr r1, [r5, #0x20]
add r0, sp, #8
- bl FUN_0201F02C
+ bl Camera_GetLookAtCamTarget
ldr r0, [r4, #4]
ldr r1, [sp, #8]
ldr r2, [sp, #0xc]
@@ -1356,10 +1356,10 @@ MOD06_0223A0D4: ; 0x0223A0D4
ldr r0, _0223A16C ; =0x000004C1
ldr r1, [r5, #0x20]
add r4, r2, #0
- bl FUN_0201EEF0
+ bl Camera_SetPerspectiveAngle
ldr r0, _0223A170 ; =0x0026BEC1
ldr r1, [r5, #0x20]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
ldr r0, _0223A174 ; =0x01DF5DFD
str r0, [sp, #8]
ldr r0, _0223A178 ; =0x00073A0C
@@ -1368,7 +1368,7 @@ MOD06_0223A0D4: ; 0x0223A0D4
str r0, [sp, #0x10]
ldr r1, [r5, #0x20]
add r0, sp, #8
- bl FUN_0201F04C
+ bl Camera_SetLookAtCamTarget
ldr r1, _0223A180 ; =0x000004C2
add r0, sp, #0
strh r1, [r0]
@@ -1379,12 +1379,12 @@ MOD06_0223A0D4: ; 0x0223A0D4
strh r1, [r0, #4]
ldr r1, [r5, #0x20]
add r0, sp, #0
- bl FUN_0201EF90
+ bl Camera_SetAngle
mov r0, #0xb
ldr r1, _0223A184 ; =0x005C8000
ldr r2, [r5, #0x20]
lsl r0, r0, #0x10
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
add r0, r5, #0
add r0, #0x48
bl MOD05_021DB4B0
@@ -1400,7 +1400,7 @@ MOD06_0223A0D4: ; 0x0223A0D4
str r0, [r4, #8]
ldr r1, [r5, #0x20]
add r0, sp, #8
- bl FUN_0201F02C
+ bl Camera_GetLookAtCamTarget
ldr r0, [r4, #4]
ldr r1, [sp, #8]
ldr r2, [sp, #0xc]
@@ -1526,7 +1526,7 @@ _0223A234: ; jump table
_0223A242:
ldr r1, [r1, #0x20]
add r0, sp, #0
- bl FUN_0201F02C
+ bl Camera_GetLookAtCamTarget
mov r2, #2
ldr r3, [sp, #4]
lsl r2, r2, #0xc
@@ -1837,7 +1837,7 @@ MOD06_0223A428: ; 0x0223A428
add r4, r0, #0
bl memset
add r0, r5, #0
- bl FUN_0201EB64
+ bl Camera_Alloc
str r0, [r4]
mov r0, #5
str r0, [r4, #0x40]
@@ -1849,7 +1849,7 @@ MOD06_0223A44C: ; 0x0223A44C
push {r4, lr}
add r4, r0, #0
ldr r0, [r4]
- bl FUN_0201EB70
+ bl Camera_Free
add r0, r4, #0
bl FreeToHeap
pop {r4, pc}
@@ -1866,10 +1866,10 @@ MOD06_0223A460: ; 0x0223A460
bl MOD06_0223A5C0
ldr r0, [sp, #0x2c]
ldr r1, [r5]
- bl FUN_0201EB78
+ bl Camera_Copy
ldr r1, [sp, #0x2c]
add r0, sp, #4
- bl FUN_0201F02C
+ bl Camera_GetLookAtCamTarget
add r3, sp, #4
add r2, r5, #0
add r2, #0x28
@@ -1887,9 +1887,9 @@ MOD06_0223A460: ; 0x0223A460
str r0, [r2]
ldr r1, [r5]
add r0, r6, #0
- bl FUN_0201EC68
+ bl Camera_SetFixedTarget
ldr r0, [r5]
- bl FUN_0201EB8C
+ bl Camera_SetWorkPtr
ldr r0, [sp, #0x2c]
mov r1, #0
str r0, [r5, #4]
@@ -2011,7 +2011,7 @@ _0223A598:
pop {r3, r4, r5, pc}
_0223A5A0:
ldr r0, [r4, #4]
- bl FUN_0201EB8C
+ bl Camera_SetWorkPtr
ldr r0, [r4, #0x40]
add r0, r0, #1
str r0, [r4, #0x40]
@@ -8786,7 +8786,7 @@ MOD06_0223D918: ; 0x0223D918
add r0, r4, #0
bl MOD06_0223D978
mov r0, #0xb
- bl FUN_0201EB64
+ bl Camera_Alloc
add r1, r4, #0
add r1, #0x90
str r0, [r1]
@@ -8794,11 +8794,11 @@ MOD06_0223D918: ; 0x0223D918
add r1, #0x90
ldr r0, [r5, #0x20]
ldr r1, [r1]
- bl FUN_0201EB78
+ bl Camera_Copy
add r0, r4, #0
add r0, #0x90
ldr r0, [r0]
- bl FUN_0201EB8C
+ bl Camera_SetWorkPtr
ldr r0, _0223D974 ; =0x0000023D
mov r1, #0
strb r1, [r4, r0]
@@ -9057,7 +9057,7 @@ MOD06_0223DB64: ; 0x0223DB64
add r1, #0x90
ldr r1, [r1]
add r0, r2, #0
- bl FUN_0201EF70
+ bl Camera_OffsetLookAtPosAndTarget
ldr r0, _0223DBC8 ; =0x0000023D
add sp, #0xc
ldrb r1, [r4, r0]
@@ -10832,7 +10832,7 @@ MOD06_0223EA38: ; 0x0223EA38
add r1, #0x90
ldr r1, [r1]
add r0, r2, #0
- bl FUN_0201EF70
+ bl Camera_OffsetLookAtPosAndTarget
ldr r0, _0223EAFC ; =0x0000023D
add sp, #0xc
ldrb r1, [r5, r0]
@@ -10847,13 +10847,13 @@ _0223EA74:
add r0, #0x90
ldr r0, [r0]
ldr r1, [r4, #0x20]
- bl FUN_0201EB78
+ bl Camera_Copy
add r0, r5, #0
add r0, #0x90
ldr r0, [r0]
- bl FUN_0201EB70
+ bl Camera_Free
ldr r0, [r4, #0x20]
- bl FUN_0201EB8C
+ bl Camera_SetWorkPtr
add r0, r5, #0
bl MOD06_0223EBD4
add r1, r5, #0
@@ -17787,7 +17787,7 @@ _02242342:
ldr r1, _022423FC ; =0x006A4000
ldr r2, [r6, #0x20]
lsl r0, r0, #0xe
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
mov r1, #6
str r1, [sp]
ldr r0, _02242400 ; =0x000076A0
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 234e29fe..e4400e3e 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -3047,7 +3047,7 @@ MOD07_022136B4: ; 0x022136B4
mov r1, #0xe1
lsl r0, r0, #0xc
lsl r1, r1, #0xe
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
ldr r2, [r4]
mov r0, #0x3d
ldr r2, [r2, #0x24]
diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s
index 4a0a6d1c..44194a24 100644
--- a/arm9/modules/08/asm/module_08.s
+++ b/arm9/modules/08/asm/module_08.s
@@ -7997,7 +7997,7 @@ MOD08_0221599C: ; 0x0221599C
mov r1, #0xe1
lsl r0, r0, #0xc
lsl r1, r1, #0xe
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
_022159D4:
add r0, r4, #0
add sp, #8
@@ -8031,7 +8031,7 @@ MOD08_022159E4: ; 0x022159E4
mov r1, #0xe1
lsl r0, r0, #0xc
lsl r1, r1, #0xe
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
_02215A1C:
add r0, r4, #0
add sp, #8
@@ -8309,10 +8309,10 @@ _02215BFA:
add r4, r0, #0
add r0, sp, #8
add r1, r4, #0
- bl FUN_0201F014
+ bl Camera_GetAngle
add r0, sp, #8
add r1, r4, #0
- bl FUN_0201EF90
+ bl Camera_SetAngle
add sp, #0x34
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -12154,7 +12154,7 @@ MOD08_02217904: ; 0x02217904
bl FUN_0201343C
add r1, r0, #0
add r0, sp, #0
- bl FUN_0201EF90
+ bl Camera_SetAngle
mov r0, #1
add sp, #8
pop {r3, pc}
@@ -12182,7 +12182,7 @@ MOD08_02217928: ; 0x02217928
bl FUN_02013440
add r0, sp, #0
add r1, r5, #0
- bl FUN_0201EF90
+ bl Camera_SetAngle
mov r0, #1
add sp, #8
pop {r3, r4, r5, pc}
@@ -12214,7 +12214,7 @@ MOD08_02217964: ; 0x02217964
bl FUN_0201343C
add r1, r0, #0
add r0, sp, #0
- bl FUN_0201EF90
+ bl Camera_SetAngle
mov r0, #1
add sp, #0x18
pop {r4, pc}
@@ -12242,7 +12242,7 @@ MOD08_022179A0: ; 0x022179A0
bl FUN_02013440
add r0, sp, #0
add r1, r5, #0
- bl FUN_0201EF90
+ bl Camera_SetAngle
mov r0, #1
add sp, #8
pop {r3, r4, r5, pc}
@@ -12284,12 +12284,12 @@ MOD08_022179DC: ; 0x022179DC
bne _02217A2A
add r0, sp, #8
add r1, r5, #0
- bl FUN_0201EF90
+ bl Camera_SetAngle
b _02217A32
_02217A2A:
add r0, sp, #0
add r1, r5, #0
- bl FUN_0201EF90
+ bl Camera_SetAngle
_02217A32:
mov r0, #1
add sp, #0x10
@@ -12320,7 +12320,7 @@ MOD08_02217A3C: ; 0x02217A3C
bl FUN_02013440
add r0, sp, #0
add r1, r5, #0
- bl FUN_0201EF90
+ bl Camera_SetAngle
mov r0, #1
add sp, #8
pop {r3, r4, r5, pc}
@@ -12350,7 +12350,7 @@ MOD08_02217A78: ; 0x02217A78
bl FUN_02013440
add r0, sp, #0
add r1, r5, #0
- bl FUN_0201EF90
+ bl Camera_SetAngle
mov r0, #1
add sp, #8
pop {r3, r4, r5, pc}
@@ -12371,7 +12371,7 @@ MOD08_02217AB4: ; 0x02217AB4
bl MOD08_022278FC
add r0, sp, #0
add r1, r4, #0
- bl FUN_0201F04C
+ bl Camera_SetLookAtCamTarget
mov r0, #1
add sp, #0xc
pop {r4, r5, pc}
@@ -12391,7 +12391,7 @@ MOD08_02217ADC: ; 0x02217ADC
bl MOD08_022278FC
add r0, sp, #0
add r1, r4, #0
- bl FUN_0201F04C
+ bl Camera_SetLookAtCamTarget
mov r0, #1
add sp, #0xc
pop {r4, r5, pc}
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s
index 5cb61425..e86aa9ee 100644
--- a/arm9/modules/12/asm/module_12.s
+++ b/arm9/modules/12/asm/module_12.s
@@ -6315,7 +6315,7 @@ _022309E8:
mov r1, #0xe1
lsl r0, r0, #0xc
lsl r1, r1, #0xe
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
mov r0, #0x3d
mov r1, #3
mov r2, #0x17
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index 074ed1e0..e75f620e 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -37211,7 +37211,7 @@ MOD18_0224B804: ; 0x0224B804
_0224B83E:
ldr r1, [r4, #0x20]
add r0, sp, #0
- bl FUN_0201EF70
+ bl Camera_OffsetLookAtPosAndTarget
add sp, #0xc
pop {r4, r5, pc}
.align 2, 0
diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s
index 182b8d56..8c95b86c 100644
--- a/arm9/modules/63/asm/mod63_021D74E0.s
+++ b/arm9/modules/63/asm/mod63_021D74E0.s
@@ -623,7 +623,7 @@ _021D79B6:
pop {r4, r5, pc}
_021D79CA:
bl FUN_020222AC
- bl FUN_0201EBA4
+ bl Camera_PushLookAtToNNSGlb
add r1, r4, #0
add r0, sp, #0
add r1, #0x90
@@ -965,7 +965,7 @@ _021D7C52:
add r0, #0xd0
str r1, [r0]
add r0, r4, #0
- bl FUN_0201EB64
+ bl Camera_Alloc
add r1, r5, #0
add r1, #0xa0
str r0, [r1]
@@ -981,23 +981,23 @@ _021D7C52:
add r0, r5, #0
add r0, #0xbc
lsl r2, r2, #4
- bl FUN_0201ED5C
+ bl Camera_InitWithPosAndTarget
add r2, r5, #0
add r2, #0xa0
mov r1, #0x19
ldr r2, [r2]
mov r0, #0
lsl r1, r1, #0xe
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
add r1, r5, #0
add r1, #0xa0
ldr r1, [r1]
mov r0, #0
- bl FUN_0201EE2C
+ bl ApplyPerspectiveType
add r0, r5, #0
add r0, #0xa0
ldr r0, [r0]
- bl FUN_0201EB8C
+ bl Camera_SetWorkPtr
mov r3, #0x42
lsl r3, r3, #2
add r2, r3, #2
@@ -1652,13 +1652,13 @@ _021D81DC:
add r0, r4, #0
ldr r1, [r1]
add r0, #0xbc
- bl FUN_0201F04C
+ bl Camera_SetLookAtCamTarget
add r1, r4, #0
add r1, #0xa0
add r0, r4, #0
ldr r1, [r1]
add r0, #0xc8
- bl FUN_0201F05C
+ bl Camera_SetLookAtCamPos
cmp r5, #1
bne _021D824E
mov r0, #4
@@ -1727,13 +1727,13 @@ _021D8272:
add r0, r5, #0
ldr r1, [r1]
add r0, #0xfc
- bl FUN_0201F04C
+ bl Camera_SetLookAtCamTarget
add r1, r5, #0
add r1, #0xa0
add r0, r5, #0
ldr r1, [r1]
add r0, #0xe4
- bl FUN_0201F05C
+ bl Camera_SetLookAtCamPos
mov r0, #1
add r1, r0, #0
bl GX_EngineAToggleLayers
@@ -1838,7 +1838,7 @@ MOD63_021D8360: ; 0x021D8360
ldr r0, [r0]
add r4, r1, #0
add r6, r2, #0
- bl FUN_0201EB70
+ bl Camera_Free
add r0, r5, #4
bl MOD63_021D7970
add r0, r4, #0
diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s
index 34d50a11..0fd84316 100644
--- a/arm9/modules/63/asm/mod63_021D8890.s
+++ b/arm9/modules/63/asm/mod63_021D8890.s
@@ -1631,9 +1631,9 @@ MOD63_021D95A8: ; 0x021D95A8
ldrb r0, [r0]
cmp r0, #0
beq _021D95F6
- bl FUN_0201EB98
+ bl Camera_UnsetWorkPtr
ldr r0, [r5, #0x78]
- bl FUN_0201EB70
+ bl Camera_Free
mov r4, #0
mov r6, #0x58
_021D95D0:
@@ -2016,7 +2016,7 @@ _021D98BC:
ldr r0, [sp, #0xc]
bl NARC_dtor
mov r0, #0x4c
- bl FUN_0201EB64
+ bl Camera_Alloc
add r3, sp, #0x20
ldr r4, _021D9968 ; =MOD63_021DBAE4
str r0, [r5, #0x44]
@@ -2034,10 +2034,10 @@ _021D98BC:
str r0, [sp, #8]
add r0, r2, #0
ldr r2, _021D9974 ; =MOD63_021DBB80
- bl FUN_0201ECA8
+ bl Camera_InitWithTargetAndAngle
ldr r0, _021D9978 ; =0x00000981
ldr r1, [r5, #0x44]
- bl FUN_0201EEF0
+ bl Camera_SetPerspectiveAngle
ldr r4, _021D997C ; =MOD63_021DBB08
add r3, sp, #0x14
ldmia r4!, {r0, r1}
@@ -2047,9 +2047,9 @@ _021D98BC:
str r0, [r3]
ldr r1, [r5, #0x44]
add r0, r2, #0
- bl FUN_0201EF70
+ bl Camera_OffsetLookAtPosAndTarget
ldr r0, [r5, #0x44]
- bl FUN_0201EB8C
+ bl Camera_SetWorkPtr
mov r0, #1
strb r0, [r5, #4]
add sp, #0x2c
@@ -2091,7 +2091,7 @@ _021D998C:
str r0, [r1, #4]
str r0, [r1, #8]
bl FUN_020222AC
- bl FUN_0201EBA4
+ bl Camera_PushLookAtToNNSGlb
mov r4, #0
add r5, #0x48
add r7, sp, #0
@@ -2773,19 +2773,19 @@ MOD63_021D9F38: ; 0x021D9F38
cmp r5, r1
bgt _021D9FE2
ldr r0, [r4, #0x44]
- bl FUN_0201F008
+ bl Camera_GetPerspectiveAngle
ldr r1, _021DA07C ; =0x000005C1
sub r0, #0x20
cmp r0, r1
ble _021D9F68
ldr r0, _021DA080 ; =0x0000FFE0
ldr r1, [r4, #0x44]
- bl FUN_0201EF2C
+ bl Camera_AdjustPerspectiveAngle
b _021D9F70
_021D9F68:
add r0, r1, #0
ldr r1, [r4, #0x44]
- bl FUN_0201EEF0
+ bl Camera_SetPerspectiveAngle
_021D9F70:
mov r0, #2
ldr r1, [sp, #0x4c]
@@ -2794,7 +2794,7 @@ _021D9F70:
str r0, [sp, #0x4c]
ldr r1, [r4, #0x44]
add r0, sp, #0x44
- bl FUN_0201EF70
+ bl Camera_OffsetLookAtPosAndTarget
ldr r0, _021DA078 ; =0x000004AB
cmp r5, r0
bne _021DA074
@@ -2814,7 +2814,7 @@ _021D9F70:
str r0, [sp, #8]
add r0, r2, #0
ldr r2, _021DA08C ; =MOD63_021DBB80
- bl FUN_0201ECA8
+ bl Camera_InitWithTargetAndAngle
ldr r5, _021DA090 ; =MOD63_021DBB20
add r3, sp, #0x2c
ldmia r5!, {r0, r1}
@@ -2824,7 +2824,7 @@ _021D9F70:
str r0, [r3]
ldr r1, [r4, #0x44]
add r0, r2, #0
- bl FUN_0201EF70
+ bl Camera_OffsetLookAtPosAndTarget
ldr r2, _021DA094 ; =MOD63_021DBAC8
add r1, sp, #0xc
ldrh r3, [r2]
@@ -2837,7 +2837,7 @@ _021D9F70:
strh r3, [r1, #4]
strh r2, [r1, #6]
ldr r1, [r4, #0x44]
- bl FUN_0201EFB4
+ bl Camera_AdjustAngle
add sp, #0x50
pop {r4, r5, r6, pc}
_021D9FE2:
@@ -2850,7 +2850,7 @@ _021D9FE2:
add r1, r2, r1
str r1, [sp, #0x44]
ldr r1, [r4, #0x44]
- bl FUN_0201EF70
+ bl Camera_OffsetLookAtPosAndTarget
ldr r3, _021DA098 ; =0x0000057D
cmp r5, r3
bne _021DA074
@@ -2870,10 +2870,10 @@ _021D9FE2:
str r0, [sp, #8]
add r0, r2, #0
ldr r2, _021DA08C ; =MOD63_021DBB80
- bl FUN_0201ECA8
+ bl Camera_InitWithTargetAndAngle
ldr r0, _021DA07C ; =0x000005C1
ldr r1, [r4, #0x44]
- bl FUN_0201EEF0
+ bl Camera_SetPerspectiveAngle
ldr r5, _021DA0A0 ; =MOD63_021DBAF0
add r3, sp, #0x14
ldmia r5!, {r0, r1}
@@ -2883,7 +2883,7 @@ _021D9FE2:
str r0, [r3]
ldr r1, [r4, #0x44]
add r0, r2, #0
- bl FUN_0201EF70
+ bl Camera_OffsetLookAtPosAndTarget
add sp, #0x50
pop {r4, r5, r6, pc}
_021DA044:
@@ -2891,7 +2891,7 @@ _021DA044:
cmp r5, r0
blt _021DA062
ldr r0, [r4, #0x44]
- bl FUN_0201F008
+ bl Camera_GetPerspectiveAngle
mov r1, #1
add r0, #0x20
lsl r1, r1, #0xe
@@ -2899,7 +2899,7 @@ _021DA044:
bge _021DA062
ldr r1, [r4, #0x44]
mov r0, #0x20
- bl FUN_0201EF2C
+ bl Camera_AdjustPerspectiveAngle
_021DA062:
mov r0, #1
ldr r1, [sp, #0x4c]
@@ -2908,7 +2908,7 @@ _021DA062:
str r0, [sp, #0x4c]
ldr r1, [r4, #0x44]
add r0, sp, #0x44
- bl FUN_0201EF70
+ bl Camera_OffsetLookAtPosAndTarget
_021DA074:
add sp, #0x50
pop {r4, r5, r6, pc}
diff --git a/arm9/modules/63/src/mod63_021DB450.c b/arm9/modules/63/src/mod63_021DB450.c
index 84461fe1..4164ac76 100644
--- a/arm9/modules/63/src/mod63_021DB450.c
+++ b/arm9/modules/63/src/mod63_021DB450.c
@@ -18,7 +18,7 @@ extern struct UnkStruct63_021DB450 * FUN_02006D98(u32);
extern void FUN_02068C00(struct UnkStruct63_021DB49C*, u16, u32, u32, u32, u32, u32);
extern void FUN_02012CC8(void);
extern void FUN_02007558(u32, u32, u32);
-extern void FUN_0201EC94(u32, u32, u32);
+extern void Camera_SetPerspectiveClippingPlane(u32, u32, u32);
extern u32 FUN_0201343C(void);
extern void FUN_02013194(void *, u32, u32, u32);
extern u32 FUN_0201318C(u32, u32, u32);
@@ -87,7 +87,7 @@ THUMB_FUNC void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB450 * arg
FUN_02012CC8();
arg0->field_14 = AllocFromHeap(0x4C, 0x4800);
arg0->field_18 = FUN_02012CDC(MOD63_021DB450, MOD63_021DB474, arg0->field_14, 0x4800, 1, 0x4C);
- FUN_0201EC94(0x1000, 0x384000, FUN_0201343C());
+ Camera_SetPerspectiveClippingPlane(0x1000, 0x384000, FUN_0201343C());
FUN_02013194(arg0->field_18, FUN_0201318C(0x3D, 4, 0x4C), 10, 1);
}
diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s
index 47d2195c..ce6e5e5e 100644
--- a/arm9/modules/64/asm/module_64.s
+++ b/arm9/modules/64/asm/module_64.s
@@ -1653,7 +1653,7 @@ MOD64_021D81D8: ; 0x021D81D8
mov r0, #0x11
add r2, r1, #0
bl NNS_G3dGeBufferOP_N
- bl FUN_0201EBA4
+ bl Camera_PushLookAtToNNSGlb
add r0, r4, #0
bl MOD64_021D8058
mov r2, #1
@@ -1679,7 +1679,7 @@ MOD64_021D824C: ; 0x021D824C
push {r4, lr}
add r4, r0, #0
add r0, r1, #0
- bl FUN_0201EB64
+ bl Camera_Alloc
mov r1, #0x5f
lsl r1, r1, #4
str r0, [r4, r1]
@@ -1713,7 +1713,7 @@ MOD64_021D8268: ; 0x021D8268
lsl r1, r1, #0xe
add r2, sp, #0xc
str r4, [sp, #8]
- bl FUN_0201ECA8
+ bl Camera_InitWithTargetAndAngle
mov r1, #0
mov r0, #1
lsl r0, r0, #0xc
@@ -1722,9 +1722,9 @@ MOD64_021D8268: ; 0x021D8268
str r1, [sp, #0x1c]
add r0, sp, #0x14
add r1, r4, #0
- bl FUN_0201EC58
+ bl Camera_SetLookAtCamUp
add r0, r4, #0
- bl FUN_0201EB8C
+ bl Camera_SetWorkPtr
add sp, #0x20
pop {r4, pc}
.align 2, 0
@@ -1740,7 +1740,7 @@ MOD64_021D82BC: ; 0x021D82BC
ldr r0, [r0, r1]
bx r3
nop
-_021D82C8: .word FUN_0201EB70
+_021D82C8: .word Camera_Free
thumb_func_end MOD64_021D82BC
thumb_func_start MOD64_021D82CC
@@ -2573,10 +2573,10 @@ MOD64_021D88C4: ; 0x021D88C4
strh r1, [r0, #4]
ldr r1, [r5, #0x30]
add r0, sp, #0
- bl FUN_0201EF90
+ bl Camera_SetAngle
ldr r0, [r5, #0x10]
ldr r1, [r5, #0x30]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
ldr r1, [r5, #0x20]
ldr r0, [r5, #0x34]
str r1, [r0, #8]
diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s
index 4fc8d105..0e8bbfba 100644
--- a/arm9/modules/65/asm/module_65.s
+++ b/arm9/modules/65/asm/module_65.s
@@ -5378,7 +5378,7 @@ MOD65_021D9F50: ; 0x021D9F50
push {r4, lr}
add r4, r0, #0
bl FUN_020222AC
- bl FUN_0201EBA4
+ bl Camera_PushLookAtToNNSGlb
ldr r2, _021D9F84 ; =0x04000440
mov r3, #0
add r1, r2, #0
@@ -5406,7 +5406,7 @@ MOD65_021D9F8C: ; 0x021D9F8C
push {r4, lr}
add r4, r0, #0
ldr r0, [r4]
- bl FUN_0201EB70
+ bl Camera_Free
ldr r0, [r4, #4]
bl FUN_020072E8
pop {r4, pc}
@@ -5432,7 +5432,7 @@ MOD65_021D9FA0: ; 0x021D9FA0
strh r0, [r1, #4]
strh r0, [r1, #6]
add r0, r2, #0
- bl FUN_0201EB64
+ bl Camera_Alloc
str r0, [r4]
mov r1, #1
str r1, [sp]
@@ -5442,16 +5442,16 @@ MOD65_021D9FA0: ; 0x021D9FA0
add r0, sp, #0x10
lsl r1, r1, #0x10
add r2, sp, #8
- bl FUN_0201ED10
+ bl Camera_InitWithPosAndAngle
mov r1, #0x19
ldr r2, [r4]
mov r0, #0
lsl r1, r1, #0xe
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
ldr r0, [r4]
- bl FUN_0201EC88
+ bl Camera_ClearFixedTarget
ldr r0, [r4]
- bl FUN_0201EB8C
+ bl Camera_SetWorkPtr
add sp, #0x1c
pop {r4, r5, pc}
.align 2, 0
diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s
index e30ad283..633d7b77 100644
--- a/arm9/modules/68/asm/module_68.s
+++ b/arm9/modules/68/asm/module_68.s
@@ -1470,7 +1470,7 @@ MOD68_021D806C: ; 0x021D806C
push {r4, lr}
add r4, r0, #0
bl FUN_020222AC
- bl FUN_0201EBA4
+ bl Camera_PushLookAtToNNSGlb
ldr r2, _021D80A0 ; =0x04000440
mov r3, #0
add r1, r2, #0
@@ -1501,7 +1501,7 @@ MOD68_021D80A8: ; 0x021D80A8
ldr r0, [r0]
bx r3
.align 2, 0
-_021D80B0: .word FUN_0201EB70
+_021D80B0: .word Camera_Free
thumb_func_end MOD68_021D80A8
thumb_func_start MOD68_021D80B4
@@ -1522,7 +1522,7 @@ MOD68_021D80B4: ; 0x021D80B4
strh r0, [r1, #4]
strh r0, [r1, #6]
mov r0, #0x24
- bl FUN_0201EB64
+ bl Camera_Alloc
add r1, r4, #0
add r1, #0xd0
str r0, [r1]
@@ -1536,21 +1536,21 @@ MOD68_021D80B4: ; 0x021D80B4
add r0, sp, #0x10
lsl r1, r1, #0x10
add r2, sp, #8
- bl FUN_0201ED10
+ bl Camera_InitWithPosAndAngle
add r2, r4, #0
add r2, #0xd0
mov r1, #0x19
ldr r2, [r2]
mov r0, #0
lsl r1, r1, #0xe
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
add r0, r4, #0
add r0, #0xd0
ldr r0, [r0]
- bl FUN_0201EC88
+ bl Camera_ClearFixedTarget
add r4, #0xd0
ldr r0, [r4]
- bl FUN_0201EB8C
+ bl Camera_SetWorkPtr
add sp, #0x1c
pop {r3, r4, pc}
.align 2, 0
diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s
index b29554ea..1667a6f0 100644
--- a/arm9/modules/69/asm/module_69.s
+++ b/arm9/modules/69/asm/module_69.s
@@ -996,7 +996,7 @@ MOD69_0222DDFC: ; 0x0222DDFC
sub sp, #0x18
add r4, r0, #0
mov r0, #0x3f
- bl FUN_0201EB64
+ bl Camera_Alloc
ldr r2, _0222DE80 ; =0x00001B1C
ldr r3, _0222DE84 ; =0x00000FA4
str r0, [r4, r2]
@@ -1029,7 +1029,7 @@ MOD69_0222DDFC: ; 0x0222DDFC
add r0, r4, r0
lsl r1, r1, #0xc
add r2, r4, r2
- bl FUN_0201ECA8
+ bl Camera_InitWithTargetAndAngle
mov r1, #0
mov r0, #1
lsl r0, r0, #0xc
@@ -1039,17 +1039,17 @@ MOD69_0222DDFC: ; 0x0222DDFC
ldr r1, _0222DE80 ; =0x00001B1C
add r0, sp, #0xc
ldr r1, [r4, r1]
- bl FUN_0201EC58
+ bl Camera_SetLookAtCamUp
ldr r0, _0222DE80 ; =0x00001B1C
ldr r0, [r4, r0]
- bl FUN_0201EB8C
+ bl Camera_SetWorkPtr
ldr r2, _0222DE80 ; =0x00001B1C
mov r0, #1
mov r1, #0x7d
ldr r2, [r4, r2]
lsl r0, r0, #0xc
lsl r1, r1, #0xe
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
add sp, #0x18
pop {r4, pc}
nop
@@ -1064,7 +1064,7 @@ MOD69_0222DE88: ; 0x0222DE88
bx r3
.align 2, 0
_0222DE90: .word 0x00001B1C
-_0222DE94: .word FUN_0201EB70
+_0222DE94: .word Camera_Free
thumb_func_start MOD69_0222DE98
MOD69_0222DE98: ; 0x0222DE98
diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s
index 2d4f838a..325e8add 100644
--- a/arm9/modules/77/asm/module_77.s
+++ b/arm9/modules/77/asm/module_77.s
@@ -88,7 +88,7 @@ _021D7540:
ldr r1, _021D75F8 ; =0x0000C070
str r0, [r5, r1]
ldr r0, [r5]
- bl FUN_0201EB64
+ bl Camera_Alloc
ldr r1, _021D75FC ; =0x0000C2CC
str r0, [r5, r1]
mov r0, #0
@@ -817,7 +817,7 @@ MOD77_021D7BAC: ; 0x021D7BAC
bl GX_EngineBToggleLayers
ldr r0, _021D7C14 ; =0x0000C2CC
ldr r0, [r4, r0]
- bl FUN_0201EB70
+ bl Camera_Free
ldr r0, _021D7C18 ; =0x0000C070
ldr r0, [r4, r0]
bl ScrStrBufs_delete
@@ -2490,20 +2490,20 @@ MOD77_021D8970: ; 0x021D8970
ldr r2, _021D89EC ; =0x000005C1
str r0, [sp, #4]
add r0, r7, #0
- bl FUN_0201ED5C
+ bl Camera_InitWithPosAndTarget
ldr r2, _021D89E8 ; =0x0000C2CC
mov r1, #0x19
ldr r2, [r4, r2]
mov r0, #0
lsl r1, r1, #0xe
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
ldr r1, _021D89E8 ; =0x0000C2CC
mov r0, #0
ldr r1, [r4, r1]
- bl FUN_0201EE2C
+ bl ApplyPerspectiveType
ldr r0, _021D89E8 ; =0x0000C2CC
ldr r0, [r4, r0]
- bl FUN_0201EB8C
+ bl Camera_SetWorkPtr
ldr r0, _021D89F0 ; =0x0000C2F4
ldrh r1, [r4, r0]
cmp r1, #0
@@ -2944,7 +2944,7 @@ MOD77_021D8CF8: ; 0x021D8CF8
add r5, r0, #0
ldr r0, _021D8D7C ; =0x0000C2CC
ldr r0, [r5, r0]
- bl FUN_0201F010
+ bl Camera_GetDistance
ldr r1, _021D8D80 ; =0x0000C2D8
mov r4, #0
ldrh r2, [r5, r1]
@@ -3005,7 +3005,7 @@ _021D8D6A:
_021D8D70:
ldr r1, _021D8D7C ; =0x0000C2CC
ldr r1, [r5, r1]
- bl FUN_0201EFE0
+ bl Camera_SetDistance
add r0, r4, #0
pop {r3, r4, r5, pc}
.align 2, 0
@@ -3047,7 +3047,7 @@ _021D8D90:
pop {r3, r4, r5, r6, r7, pc}
_021D8DC2:
bl FUN_020222AC
- bl FUN_0201EBA4
+ bl Camera_PushLookAtToNNSGlb
ldr r1, _021D8E7C ; =0x0000C2B4
add r0, sp, #0x4c
add r1, r5, r1
diff --git a/arm9/modules/78/asm/module_78.s b/arm9/modules/78/asm/module_78.s
index 4b4209f2..f12941f2 100644
--- a/arm9/modules/78/asm/module_78.s
+++ b/arm9/modules/78/asm/module_78.s
@@ -33,7 +33,7 @@ MOD78_021D74E0: ; 0x021D74E0
add r0, #0x9d
strb r1, [r0]
mov r0, #0x48
- bl FUN_0201EB64
+ bl Camera_Alloc
str r0, [r4]
bl MOD78_021D7708
add r0, r4, #0
@@ -50,9 +50,9 @@ MOD78_021D74E0: ; 0x021D74E0
str r1, [sp, #8]
ldr r1, _021D75C8 ; =0x0029AEC1
ldr r3, _021D75CC ; =0x000005C1
- bl FUN_0201ECA8
+ bl Camera_InitWithTargetAndAngle
ldr r0, [r4]
- bl FUN_0201EB8C
+ bl Camera_SetWorkPtr
mov r4, #0
mov r7, #2
mov r6, #4
@@ -209,7 +209,7 @@ _021D7680:
cmp r2, #4
blo _021D7668
bl FUN_020222AC
- bl FUN_0201EBA4
+ bl Camera_PushLookAtToNNSGlb
add r0, r4, #4
add r1, sp, #0
add r2, sp, #0x18
@@ -254,7 +254,7 @@ _021D76C8:
ldr r0, [r6, #0x5c]
bl FreeToHeap
ldr r0, [r6]
- bl FUN_0201EB70
+ bl Camera_Free
ldr r0, [sp]
bl OverlayManager_FreeData
bl FUN_0201B398
diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s
index 09e12fdf..241d9dd6 100644
--- a/arm9/modules/81/asm/module_81.s
+++ b/arm9/modules/81/asm/module_81.s
@@ -1480,7 +1480,7 @@ MOD81_02238940: ; 0x02238940
mov r0, #0x11
add r2, r1, #0
bl NNS_G3dGeBufferOP_N
- bl FUN_0201EBA4
+ bl Camera_PushLookAtToNNSGlb
ldr r0, [r5, #0x1c]
mov r6, #0
cmp r0, #0
@@ -1858,7 +1858,7 @@ MOD81_02238B8C: ; 0x02238B8C
mov r0, #0x11
add r2, r1, #0
bl NNS_G3dGeBufferOP_N
- bl FUN_0201EBA4
+ bl Camera_PushLookAtToNNSGlb
add r1, r4, #0
ldr r0, [r4, #0x5c]
add r4, #0x74
@@ -1887,7 +1887,7 @@ MOD81_02238C40: ; 0x02238C40
add r4, r1, #0
ldr r1, [r2]
add r0, sp, #0
- bl FUN_0201F03C
+ bl Camera_GetLookAtCamPos
add r2, sp, #0
ldmia r2!, {r0, r1}
stmia r4!, {r0, r1}
@@ -1906,7 +1906,7 @@ MOD81_02238C60: ; 0x02238C60
ldr r1, [r2]
bx r3
nop
-_02238C6C: .word FUN_0201EF90
+_02238C6C: .word Camera_SetAngle
thumb_func_end MOD81_02238C60
thumb_func_start MOD81_02238C70
@@ -1917,7 +1917,7 @@ MOD81_02238C70: ; 0x02238C70
ldr r1, [r2]
bx r3
nop
-_02238C7C: .word FUN_0201EFB4
+_02238C7C: .word Camera_AdjustAngle
thumb_func_end MOD81_02238C70
thumb_func_start MOD81_02238C80
@@ -1928,7 +1928,7 @@ MOD81_02238C80: ; 0x02238C80
ldr r1, [r2]
bx r3
nop
-_02238C8C: .word FUN_0201EE2C
+_02238C8C: .word ApplyPerspectiveType
thumb_func_end MOD81_02238C80
thumb_func_start MOD81_02238C90
@@ -1939,7 +1939,7 @@ MOD81_02238C90: ; 0x02238C90
ldr r1, [r2]
bx r3
nop
-_02238C9C: .word FUN_0201EEF0
+_02238C9C: .word Camera_SetPerspectiveAngle
thumb_func_end MOD81_02238C90
thumb_func_start MOD81_02238CA0
@@ -1951,7 +1951,7 @@ MOD81_02238CA0: ; 0x02238CA0
add r4, r1, #0
add r6, r2, #0
add r7, r3, #0
- bl FUN_0201EB64
+ bl Camera_Alloc
str r0, [r5]
str r4, [r5, #4]
str r6, [r5, #8]
@@ -1971,7 +1971,7 @@ MOD81_02238CA0: ; 0x02238CA0
add r0, r5, #4
lsl r1, r1, #0xe
add r2, #0x10
- bl FUN_0201ECA8
+ bl Camera_InitWithTargetAndAngle
mov r1, #0
mov r0, #1
lsl r0, r0, #0xc
@@ -1980,14 +1980,14 @@ MOD81_02238CA0: ; 0x02238CA0
str r1, [sp, #0x14]
ldr r1, [r5]
add r0, sp, #0xc
- bl FUN_0201EC58
+ bl Camera_SetLookAtCamUp
ldr r0, [r5]
- bl FUN_0201EB8C
+ bl Camera_SetWorkPtr
mov r1, #0xfa
ldr r2, [r5]
mov r0, #0
lsl r1, r1, #0xe
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -2000,7 +2000,7 @@ MOD81_02238D0C: ; 0x02238D0C
ldr r0, [r0]
bx r3
nop
-_02238D14: .word FUN_0201EB70
+_02238D14: .word Camera_Free
thumb_func_end MOD81_02238D0C
thumb_func_start MOD81_02238D18
diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s
index ea18857a..c9bff482 100644
--- a/arm9/modules/84/asm/module_84_thumb1.s
+++ b/arm9/modules/84/asm/module_84_thumb1.s
@@ -792,7 +792,7 @@ MOD84_021D7B54: ; 0x021D7B54
sub sp, #0x18
add r4, r0, #0
mov r0, #0x4b
- bl FUN_0201EB64
+ bl Camera_Alloc
str r0, [r4, #0x20]
mov r0, #0
str r0, [r4, #0x24]
@@ -813,7 +813,7 @@ MOD84_021D7B54: ; 0x021D7B54
add r0, #0x24
lsl r1, r1, #0xe
add r2, #0x30
- bl FUN_0201ECA8
+ bl Camera_InitWithTargetAndAngle
mov r1, #0
mov r0, #1
lsl r0, r0, #0xc
@@ -822,14 +822,14 @@ MOD84_021D7B54: ; 0x021D7B54
str r1, [sp, #0x14]
ldr r1, [r4, #0x20]
add r0, sp, #0xc
- bl FUN_0201EC58
+ bl Camera_SetLookAtCamUp
ldr r0, [r4, #0x20]
- bl FUN_0201EB8C
+ bl Camera_SetWorkPtr
mov r1, #0xfa
ldr r2, [r4, #0x20]
mov r0, #0
lsl r1, r1, #0xe
- bl FUN_0201EC94
+ bl Camera_SetPerspectiveClippingPlane
add sp, #0x18
pop {r4, pc}
nop
@@ -842,7 +842,7 @@ MOD84_021D7BBC: ; 0x021D7BBC
ldr r0, [r0, #0x20]
bx r3
nop
-_021D7BC4: .word FUN_0201EB70
+_021D7BC4: .word Camera_Free
thumb_func_end MOD84_021D7BBC
thumb_func_start MOD84_021D7BC8
@@ -1003,7 +1003,7 @@ MOD84_021D7CFC: ; 0x021D7CFC
mov r0, #0x11
add r2, r1, #0
bl NNS_G3dGeBufferOP_N
- bl FUN_0201EBA4
+ bl Camera_PushLookAtToNNSGlb
add r4, #0x38
add r0, sp, #0x28
bl MTX_Identity33_
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-12 18:38:31 +0000