diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2024-01-18 00:19:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-17 16:19:54 -0700 |
| commit | a86b3b0a2ee97eedd44f7a31b1b5bddd817537e6 (patch) | |
| tree | f7e9c183c664862ca28e53a1b0774952aa364a65 /src/camera.c | |
| parent | bd156588072667a4452deaaf226fefaa50192399 (diff) | |
document player and cpu (#534)
* document player and cpu
* cpu_descisions_branch_item to cpu_decisions_branch_item
Diffstat (limited to 'src/camera.c')
| -rw-r--r-- | src/camera.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/camera.c b/src/camera.c index 75859d733..19bbaf03e 100644 --- a/src/camera.c +++ b/src/camera.c @@ -93,8 +93,8 @@ void camera_init(f32 posX, f32 posY, f32 posZ, UNUSED s16 rot, u32 arg4, s32 cam camera->unk_94.unk_0 = 0.0f; player += cameraId; - camera->unk_2C = player->unk_02C[1]; - camera->unk_AC = player->unk_02C[1]; + camera->unk_2C = player->rotation[1]; + camera->unk_AC = player->rotation[1]; switch (gActiveScreenMode) { case SCREEN_MODE_1P: case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: @@ -637,7 +637,7 @@ void func_8001E0C4(Camera *camera, Player *player, s8 arg2) { } else { var_a2 = (player->unk_078 / 3) + 0x87; } - adjust_angle(&camera->unk_2C, player->unk_02C[1], var_a2); + adjust_angle(&camera->unk_2C, player->rotation[1], var_a2); func_8001CA78(player, camera, sp60, &sp74, &sp70, &sp6C, camera->unk_2C, arg2); camera->someBitFlags &= ~0x0004; temp_t7 = func_802ADDC8(&camera->unk_54, test, sp74, sp70, sp6C); @@ -717,7 +717,7 @@ void func_8001E45C(Camera *camera, Player *player, s8 arg2) { } } else { move_s16_towards(&camera->unk_B0, 0, 0.05f); - var_a3 = ((s16) camera->unk_2C / 182) - ((s16) player->unk_02C[1] / 182); + var_a3 = ((s16) camera->unk_2C / 182) - ((s16) player->rotation[1] / 182); if (player->unk_078 == 0) { if ((player->effects & 0x20) == 0x20) { var_a3 = 0x02D8; @@ -742,7 +742,7 @@ void func_8001E45C(Camera *camera, Player *player, s8 arg2) { (player->unk_110.unk3C[0] <= 0.0f) || (player->unk_110.unk3C[1] <= 0.0f) || ((player->effects & 0x20000) == 0x20000)) { func_8001CCEC(player, camera, sp64, &sp84, &sp80, &sp7C, &sp58, (s32) camera->unk_2C, (s32) arg2); } else { - adjust_angle(&camera->unk_2C, (s16) (player->unk_02C[1] + camera->unk_B0), var_a3); + adjust_angle(&camera->unk_2C, (s16) (player->rotation[1] + camera->unk_B0), var_a3); func_8001CCEC(player, camera, sp64, &sp84, &sp80, &sp7C, &sp58, (s32) camera->unk_2C, (s32) arg2); } temp = 3; @@ -780,8 +780,8 @@ void func_8001E8E8(Camera *camera, Player *player, s8 arg2) { UNUSED f32 pad4[10]; camera->unk_B0 = 0; - camera->unk_2C = player->unk_02C[1]; - func_8001D53C(player, camera, sp5C, &sp7C, &sp78, &sp74, (s16) (s32) player->unk_02C[1], (s16) (s32) arg2); + camera->unk_2C = player->rotation[1]; + func_8001D53C(player, camera, sp5C, &sp7C, &sp78, &sp74, (s16) (s32) player->rotation[1], (s16) (s32) arg2); func_802ADDC8(&camera->unk_54, 5.0f, sp7C, sp78, sp74); camera->lookAt[0] = sp5C[0]; camera->lookAt[1] = sp5C[1]; @@ -839,7 +839,7 @@ void func_8001EA0C(Camera *camera, Player *player, s8 arg2) { } } else { move_s16_towards(&camera->unk_B0, 0, 0.05f); - var_a3 = ((s16) camera->unk_2C / 182) - ((s16) player->unk_02C[1] / 182); + var_a3 = ((s16) camera->unk_2C / 182) - ((s16) player->rotation[1] / 182); if (player->unk_078 == 0) { if ((player->effects & 0x20) == 0x20) { var_a3 = 0x02D8; @@ -864,7 +864,7 @@ void func_8001EA0C(Camera *camera, Player *player, s8 arg2) { (player->unk_110.unk3C[0] <= 0.0f) || (player->unk_110.unk3C[1] <= 0.0f) || ((player->effects & 0x20000) == 0x20000)) { func_8001D944(player, camera, sp64, &sp84, &sp80, &sp7C, &sp58, (s32) camera->unk_2C, (s32) arg2); } else { - adjust_angle(&camera->unk_2C, (s16) (player->unk_02C[1] + camera->unk_B0), var_a3); + adjust_angle(&camera->unk_2C, (s16) (player->rotation[1] + camera->unk_B0), var_a3); func_8001D944(player, camera, sp64, &sp84, &sp80, &sp7C, &sp58, (s32) camera->unk_2C, (s32) arg2); } temp = 3; @@ -1134,8 +1134,8 @@ void func_8001F87C(s32 cameraId) { if ((playerIndex == 7) && (D_80164A2C == 0x0000003C)) { D_80164A28 = 2; D_80152300[id] = 1; - cameras[id].rot[1] = gPlayerOne[playerIndex].unk_02C[1]; - cameras[id].unk_2C = gPlayerOne[playerIndex].unk_02C[1]; + cameras[id].rot[1] = gPlayerOne[playerIndex].rotation[1]; + cameras[id].unk_2C = gPlayerOne[playerIndex].rotation[1]; } } } |
