summaryrefslogtreecommitdiff
path: root/arm9/modules/05/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/05/asm')
-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
5 files changed, 71 insertions, 71 deletions
diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s
index 1aad5cc7..52073cac 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 36143bb3..3cc1b9fe 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