Various Naming (#445)

* Mass renames

1 files changed, 41 insertions, 43 deletions

diff --git a/src/camera.c b/src/camera.c
index 5a3029d0f..551f5b2e7 100644
--- a/src/camera.c
+++ b/src/camera.c
@@ -226,7 +226,7 @@ void func_8001CA78(UNUSED Player *player, Camera *camera, Vec3f arg2, f32 *arg3,
     arg2[0] = camera->lookAt[0];
     arg2[1] = camera->lookAt[1];
     arg2[2] = camera->lookAt[2];
-    func_802B6540(sp74, 0, 1, 0, -0x00008000);
+    calculate_orientation_matrix(sp74, 0, 1, 0, -0x00008000);
     mtxf_translate_vec3f_mat3(sp5C, sp74);
     if (gCurrentCourseId == COURSE_TOADS_TURNPIKE) {
         var_f14 = sp5C[0];
@@ -330,7 +330,7 @@ void func_8001CCEC(Player *player, Camera *camera, Vec3f arg2, f32 *arg3, f32 *a
                 move_f32_towards(&D_80164AA0[index], 10, 0.02f);
             break;
             default:
-                if (gCurrentCourseId == 4) {
+                if (gCurrentCourseId == COURSE_YOSHI_VALLEY) {
                     move_f32_towards(&D_80164A90[index], 50, 0.04f);
                     move_f32_towards(&D_80164AA0[index], 35, 0.04f);
                 } else {
@@ -352,10 +352,10 @@ void func_8001CCEC(Player *player, Camera *camera, Vec3f arg2, f32 *arg3, f32 *a
     arg2[0] = camera->lookAt[0];
     arg2[1] = camera->lookAt[1];
     arg2[2] = camera->lookAt[2];
-    if ((player->unk_0BC & 0x01000000) == 0x01000000) {
+    if ((player->effects & 0x01000000) == 0x01000000) {
         sp84[2] /= 3.0f;
     }
-    func_802B6540(sp9C, 0, 1, 0, arg7);
+    calculate_orientation_matrix(sp9C, 0, 1, 0, arg7);
     mtxf_translate_vec3f_mat3(sp84, sp9C);
 
     x = player->pos[0] + sp84[0];
@@ -365,7 +365,7 @@ void func_8001CCEC(Player *player, Camera *camera, Vec3f arg2, f32 *arg3, f32 *a
     arg2[0] += (x - camera->lookAt[0]) * D_80164A78[index];
     arg2[2] += ((z - camera->lookAt[2]) * D_80164A78[index]);
 
-    if ((((player->unk_094 / 18) * 216) <= 5.0f) && ((player->unk_0BC & 2) == 2)) {
+    if ((((player->unk_094 / 18) * 216) <= 5.0f) && ((player->effects & 2) == 2)) {
         arg2[1] += ((y - camera->lookAt[1]) * 0.02);
     } else {
         arg2[1] += ((y - camera->lookAt[1]) * 0.5);
@@ -373,7 +373,7 @@ void func_8001CCEC(Player *player, Camera *camera, Vec3f arg2, f32 *arg3, f32 *a
     mtxf_translate_vec3f_mat3(sp90, sp9C);
     x = player->pos[0] + sp90[0];
     z = player->pos[2] + sp90[2];
-    if ((player->unk_0BC & 0x01000000) != 0x01000000) {
+    if ((player->effects & 0x01000000) != 0x01000000) {
         var_f0 = player->pos[1] + sp90[1];
         // permute
         y = var_f0;
@@ -384,7 +384,7 @@ void func_8001CCEC(Player *player, Camera *camera, Vec3f arg2, f32 *arg3, f32 *a
     *arg3 = camera->pos[0] + ((x - camera->pos[0]) * D_80164A78[index]);
     *arg5 = camera->pos[2] + ((z - camera->pos[2]) * D_80164A78[index]);
 
-    if ((((player->unk_094 / 18) * 216) <= 5.0f) && ((player->unk_0BC & 2) == 2)) {
+    if ((((player->unk_094 / 18) * 216) <= 5.0f) && ((player->effects & 2) == 2)) {
         *arg4 = camera->pos[1] + (((y - camera->pos[1]) * 0.01));
     } else {
         *arg4 = camera->pos[1] + (((y - camera->pos[1]) * 0.15));
@@ -423,7 +423,7 @@ void func_8001D53C(Player *player, Camera *camera, Vec3f arg2, f32 *arg3, f32 *a
     arg2[0] = camera->lookAt[0];
     arg2[1] = camera->lookAt[1];
     arg2[2] = camera->lookAt[2];
-    func_802B6540(sp74, 0.0f, 1.0f, 0.0f, arg6);
+    calculate_orientation_matrix(sp74, 0.0f, 1.0f, 0.0f, arg6);
     mtxf_translate_vec3f_mat3(sp5C, sp74);
     stackPadding0 = player->pos[0] + sp5C[0];
     stackPadding2 = player->pos[2] + sp5C[2];
@@ -466,7 +466,7 @@ void func_8001D794(Player *player, Camera *camera, Vec3f arg2, f32 *arg3, f32 *a
     arg2[1] = camera->lookAt[1];
     arg2[2] = camera->lookAt[2];
 
-    func_802B6540(sp6C, 0, 1, 0, arg6);
+    calculate_orientation_matrix(sp6C, 0, 1, 0, arg6);
     mtxf_translate_vec3f_mat3(sp54, sp6C);
 
     test1 = player->pos[0] + sp54[0];
@@ -569,10 +569,10 @@ void func_8001D944(Player *player, Camera *camera, Vec3f arg2, f32 *arg3, f32 *a
     arg2[0] = camera->lookAt[0];
     arg2[1] = camera->lookAt[1];
     arg2[2] = camera->lookAt[2];
-    if ((player->unk_0BC & 0x01000000) == 0x01000000) {
+    if ((player->effects & 0x01000000) == 0x01000000) {
         sp84[2] /= 3.0f;
     }
-    func_802B6540(sp9C, 0, 1, 0, arg7);
+    calculate_orientation_matrix(sp9C, 0, 1, 0, arg7);
     mtxf_translate_vec3f_mat3(sp84, sp9C);
 
     x = player->pos[0] + sp84[0];
@@ -582,7 +582,7 @@ void func_8001D944(Player *player, Camera *camera, Vec3f arg2, f32 *arg3, f32 *a
     arg2[0] += (x - camera->lookAt[0]) * D_80164A78[index];
     arg2[2] += ((z - camera->lookAt[2]) * D_80164A78[index]);
 
-    if ((((player->unk_094 / 18) * 216) <= 5.0f) && ((player->unk_0BC & 2) == 2)) {
+    if ((((player->unk_094 / 18) * 216) <= 5.0f) && ((player->effects & 2) == 2)) {
         arg2[1] += ((y - camera->lookAt[1]) * 0.02);
     } else {
         arg2[1] += ((y - camera->lookAt[1]) * 0.5);
@@ -590,7 +590,7 @@ void func_8001D944(Player *player, Camera *camera, Vec3f arg2, f32 *arg3, f32 *a
     mtxf_translate_vec3f_mat3(sp90, sp9C);
     x = player->pos[0] + sp90[0];
     z = player->pos[2] + sp90[2];
-    if ((player->unk_0BC & 0x01000000) != 0x01000000) {
+    if ((player->effects & 0x01000000) != 0x01000000) {
         var_f0 = player->pos[1] + sp90[1];
         // permute
         y = var_f0;
@@ -601,7 +601,7 @@ void func_8001D944(Player *player, Camera *camera, Vec3f arg2, f32 *arg3, f32 *a
     *arg3 = camera->pos[0] + ((x - camera->pos[0]) * D_80164A78[index]);
     *arg5 = camera->pos[2] + ((z - camera->pos[2]) * D_80164A78[index]);
 
-    if ((((player->unk_094 / 18) * 216) <= 5.0f) && ((player->unk_0BC & 2) == 2)) {
+    if ((((player->unk_094 / 18) * 216) <= 5.0f) && ((player->effects & 2) == 2)) {
         *arg4 = camera->pos[1] + (((y - camera->pos[1]) * 0.01));
     } else {
         *arg4 = camera->pos[1] + (((y - camera->pos[1]) * 0.15));
@@ -691,21 +691,21 @@ void func_8001E45C(Camera *camera, Player *player, s8 arg2) {
     UNUSED s16 pad6;
     s16 temp;
 
-    if ((player->unk_0BC & 0x10) == 0x10) {
+    if ((player->effects & 0x10) == 0x10) {
         var_a3 = 100;
         if (player->unk_078 == 0) {
             camera->unk_B0 = 0;
         } else {
             if (player->unk_078 < 0) {
                 var_a3 = 0xA5 - (player->unk_078 / 2);
-                if ((player->unk_0BC & 0x20000000) == 0x20000000) {
+                if ((player->effects & 0x20000000) == 0x20000000) {
                     move_s16_towards(&camera->unk_B0, -0x0B60, 0.1f);
                 } else {
                     move_s16_towards(&camera->unk_B0, -0x0888, 0.1f);
                 }
             } else {
                 var_a3 = (player->unk_078 / 2) + 0xA5;
-                if ((player->unk_0BC & 0x20000000) == 0x20000000) {
+                if ((player->effects & 0x20000000) == 0x20000000) {
                     move_s16_towards(&camera->unk_B0, 0x0B60, 0.1f);
                 } else {
                     move_s16_towards(&camera->unk_B0, 0x0888, 0.1f);
@@ -716,7 +716,7 @@ void func_8001E45C(Camera *camera, Player *player, s8 arg2) {
         move_s16_towards(&camera->unk_B0, 0, 0.05f);
         var_a3 = ((s16) camera->unk_2C / 182) - ((s16) player->unk_02C[1] / 182);
         if (player->unk_078 == 0) {
-            if ((player->unk_0BC & 0x20) == 0x20) {
+            if ((player->effects & 0x20) == 0x20) {
                 var_a3 = 0x02D8;
             } else {
                 var_a3 = 0x01F4;
@@ -733,10 +733,10 @@ void func_8001E45C(Camera *camera, Player *player, s8 arg2) {
             var_a3 = (player->unk_078 / 2) + 0xA5;
         }
     }
-    if (((player->unk_0BC & 0x80) == 0x80) || ((player->unk_0BC & 0x40) == 0x40) ||
-    ((player->unk_0BC & 0x4000) == 0x4000) || ((player->unk_0BC & 0x80000) == 0x80000) ||
-    ((player->unk_0BC & 0x800000) == 0x800000) || (((player->unk_0BC & 0x20) == 0x20) && (player->unk_078 != 0)) ||
-    (player->unk_110.unk3C[0] <= 0.0f) || (player->unk_110.unk3C[1] <= 0.0f) || ((player->unk_0BC & 0x20000) == 0x20000)) {
+    if (((player->effects & 0x80) == 0x80) || ((player->effects & 0x40) == 0x40) ||
+    ((player->effects & 0x4000) == 0x4000) || ((player->effects & 0x80000) == 0x80000) ||
+    ((player->effects & 0x800000) == 0x800000) || (((player->effects & 0x20) == 0x20) && (player->unk_078 != 0)) ||
+    (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 {
         func_800224F0(&camera->unk_2C, (s16) (player->unk_02C[1] + camera->unk_B0), var_a3);
@@ -812,16 +812,14 @@ void func_8001EA0C(Camera *camera, Player *player, s8 arg2) {
     UNUSED s16 pad6;
     s16 temp;
 
-    //temp_v0 = player->unk_0BC;
-    if ((player->unk_0BC & 0x10) == 0x10) {
-        //temp_v1 = player->unk_078;
+    if ((player->effects & 0x10) == 0x10) {
         var_a3 = 100;
         if (player->unk_078 == 0) {
             camera->unk_B0 = 0;
         } else {
             if (player->unk_078 < 0) {
                 var_a3 = 0xA5 - (player->unk_078 / 2);
-                if ((player->unk_0BC & 0x20000000) == 0x20000000) {
+                if ((player->effects & 0x20000000) == 0x20000000) {
                     //sp4E = temp_a3;
                     move_s16_towards(&camera->unk_B0, -0x0B60, 0.1f);
                 } else {
@@ -830,7 +828,7 @@ void func_8001EA0C(Camera *camera, Player *player, s8 arg2) {
                 }
             } else {
                 var_a3 = (player->unk_078 / 2) + 0xA5;
-                if ((player->unk_0BC & 0x20000000) == 0x20000000) {
+                if ((player->effects & 0x20000000) == 0x20000000) {
                     //sp4E = temp_a3_2;
                     move_s16_towards(&camera->unk_B0, 0x0B60, 0.1f);
                 } else {
@@ -845,7 +843,7 @@ void func_8001EA0C(Camera *camera, Player *player, s8 arg2) {
         //temp_v1_2 = player->unk_078;
         var_a3 = ((s16) camera->unk_2C / 182) - ((s16) player->unk_02C[1] / 182);
         if (player->unk_078 == 0) {
-            if ((player->unk_0BC & 0x20) == 0x20) {
+            if ((player->effects & 0x20) == 0x20) {
                 var_a3 = 0x02D8;
             } else {
                 var_a3 = 0x01F4;
@@ -862,10 +860,10 @@ void func_8001EA0C(Camera *camera, Player *player, s8 arg2) {
             var_a3 = (player->unk_078 / 2) + 0xA5;
         }
     }
-    if (((player->unk_0BC & 0x80) == 0x80) || ((player->unk_0BC & 0x40) == 0x40) ||
-    ((player->unk_0BC & 0x4000) == 0x4000) || ((player->unk_0BC & 0x80000) == 0x80000) ||
-    ((player->unk_0BC & 0x800000) == 0x800000) || (((player->unk_0BC & 0x20) == 0x20) && (player->unk_078 != 0)) ||
-    (player->unk_110.unk3C[0] <= 0.0f) || (player->unk_110.unk3C[1] <= 0.0f) || ((player->unk_0BC & 0x20000) == 0x20000)) {
+    if (((player->effects & 0x80) == 0x80) || ((player->effects & 0x40) == 0x40) ||
+    ((player->effects & 0x4000) == 0x4000) || ((player->effects & 0x80000) == 0x80000) ||
+    ((player->effects & 0x800000) == 0x800000) || (((player->effects & 0x20) == 0x20) && (player->unk_078 != 0)) ||
+    (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 {
         func_800224F0(&camera->unk_2C, (s16) (player->unk_02C[1] + camera->unk_B0), var_a3);
@@ -910,7 +908,7 @@ void func_8001EE98(Player *player, Camera *camera, s8 index) {
     switch (gModeSelection) {
         case GRAND_PRIX:
 
-            if (((player->unk_000 & PLAYER_CINEMATIC_MODE) == PLAYER_CINEMATIC_MODE) || (gDemoMode == 1)) { D_80152300[cameraIndex] = 3;
+            if (((player->type & PLAYER_CINEMATIC_MODE) == PLAYER_CINEMATIC_MODE) || (gDemoMode == 1)) { D_80152300[cameraIndex] = 3;
             //             -->                 -->        Scroll right        -->      bit more     -->     ^ Required for matching
             } else if (gIsGamePaused == 1) {
                 func_8001A0A4(&D_80152300[cameraIndex], camera, player, index, cameraIndex);
@@ -939,7 +937,7 @@ void func_8001EE98(Player *player, Camera *camera, s8 index) {
             }
             break;
         case TIME_TRIALS:
-            if (((gPlayerOne->unk_000 & PLAYER_CINEMATIC_MODE) == PLAYER_CINEMATIC_MODE) || (gDemoMode == 1)) {
+            if (((gPlayerOne->type & PLAYER_CINEMATIC_MODE) == PLAYER_CINEMATIC_MODE) || (gDemoMode == 1)) {
                 D_80152300[0] = 3;
                 D_80152300[1] = 3;
                 D_80152300[2] = 3;
@@ -954,7 +952,7 @@ void func_8001EE98(Player *player, Camera *camera, s8 index) {
             }
             break;
         case VERSUS:
-            if (((player->unk_000 & PLAYER_CINEMATIC_MODE) == PLAYER_CINEMATIC_MODE) || (gDemoMode == 1) || (D_8015F894 == 2)) {
+            if (((player->type & PLAYER_CINEMATIC_MODE) == PLAYER_CINEMATIC_MODE) || (gDemoMode == 1) || (D_8015F894 == 2)) {
                 D_80152300[cameraIndex] = 3;
             } else {
                 if (gIsGamePaused == 1) {
@@ -1017,16 +1015,16 @@ void func_8001F394(Player *player, f32 *arg1) {
         if (player->statusEffects & 0x40000) {
             D_80164A08[playerIndex] = 1;
         }
-        if ((player->unk_0BC & 0x2000) == 0x2000) {
+        if ((player->effects & 0x2000) == 0x2000) {
             D_80164A08[playerIndex] = 2;
         }
-        if ((player->unk_0BC & 0x100000) == 0x100000) {
+        if ((player->effects & 0x100000) == 0x100000) {
             D_80164A08[playerIndex] = 3;
         }
         if ((player->statusEffects & 0x100) == 0x100) {
             D_80164A08[playerIndex] = 4;
         }
-        if (((player->unk_0BC & 0x80) == 0x80) || ((player->unk_0BC & 0x40) == 0x40)) {
+        if (((player->effects & 0x80) == 0x80) || ((player->effects & 0x40) == 0x40)) {
             D_80164A08[playerIndex] = 5;
         }
         D_80164498[playerIndex] = 0.0f;
@@ -1045,7 +1043,7 @@ void func_8001F394(Player *player, f32 *arg1) {
         }
         break;
     case 2:
-        if ((player->unk_0BC & 0x2000) == 0x2000) {
+        if ((player->effects & 0x2000) == 0x2000) {
             if (player->boostTimer != 0) {
                 move_f32_towards(&D_80164498[playerIndex], 8.0f, 0.2f);
             }
@@ -1059,7 +1057,7 @@ void func_8001F394(Player *player, f32 *arg1) {
         }
         break;
     case 3:
-        if (((player->unk_0BC & 0x100000) == 0x100000) && ((player->unk_0BC & 8) == 8)) {
+        if (((player->effects & 0x100000) == 0x100000) && ((player->effects & 8) == 8)) {
             move_f32_towards(&D_80164498[playerIndex], 20.0f, 0.1f);
         } else {
             if (D_80164498[playerIndex] > 1.0f) {
@@ -1083,7 +1081,7 @@ void func_8001F394(Player *player, f32 *arg1) {
         }
         break;
     case 5:
-        if (((player->unk_0BC & 0x80) == 0x80) || ((player->unk_0BC & 0x40) == 0x40)) {
+        if (((player->effects & 0x80) == 0x80) || ((player->effects & 0x40) == 0x40)) {
             move_f32_towards(&D_80164498[playerIndex], 18.0f, 0.2f);
         } else {
             if (D_80164498[playerIndex] > 1.0f) {
@@ -1128,10 +1126,10 @@ void func_8001F87C(s32 cameraId) {
     s32 id = cameraId;
 
     if(gPlayerOne){}
-    if (gActiveScreenMode == 0) {
+    if (gActiveScreenMode == SCREEN_MODE_1P) {
         if (gModeSelection == 0) {
             for (playerIndex = 0; playerIndex < 8; playerIndex++) {
-                if ((gPlayerOne[playerIndex].unk_000 & 0x200) || (gPlayerOne[playerIndex].unk_000 & 0x80)) break;
+                if ((gPlayerOne[playerIndex].type & 0x200) || (gPlayerOne[playerIndex].type & 0x80)) break;
                 if (playerIndex == 7) {
                     D_80164A2C += 1;
                 }