summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSonic Dreamcaster <alejandro.asenjo88@gmail.com>2025-05-17 20:33:28 -0300
committerSonic Dreamcaster <alejandro.asenjo88@gmail.com>2025-05-17 20:33:28 -0300
commit3b2efbb81ae7020d2bccb0b7a15a4f5eb14b1f63 (patch)
treebbbc6c2a465c9e9e2eb5ecfef70a29d471b182b2
parentd52831e4ba9de27fdc70cd824a81f812011b81ce (diff)
fthismigration/vec-struct
Diffstat
-rw-r--r--include/common_structs.h4
-rw-r--r--src/actors/banana/update.inc.c4
-rw-r--r--src/actors/blue_and_red_shells/update.inc.c18
-rw-r--r--src/actors/green_shell/update.inc.c4
-rw-r--r--src/code_80005FD0.c36
-rw-r--r--src/code_80057C60.c680
-rw-r--r--src/code_80057C60.h34
-rw-r--r--src/code_80057C60_var.c28
-rw-r--r--src/effects.c60
-rw-r--r--src/engine/objects/Trophy.cpp2
-rw-r--r--src/player_controller.c52
-rw-r--r--src/racing/actors_extended.c10
-rw-r--r--src/render_objects.c8
13 files changed, 472 insertions, 468 deletions
diff --git a/include/common_structs.h b/include/common_structs.h
index 7bab26f8e..032f0874a 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -20,12 +20,16 @@ typedef struct {
/* 0x8 */ f32 z;
} Vec3f; // size = 0xC
+typedef f32 Vec3fa[3];
+
typedef struct {
/* 0x0 */ s16 x;
/* 0x2 */ s16 y;
/* 0x4 */ s16 z;
} Vec3s; // size = 0x6;
+typedef s16 Vec3sa[3];
+
typedef s32 Vec3iu[3];
typedef u16 Vec3su[3];
diff --git a/src/actors/banana/update.inc.c b/src/actors/banana/update.inc.c
index def009af0..7af4b5b6e 100644
--- a/src/actors/banana/update.inc.c
+++ b/src/actors/banana/update.inc.c
@@ -72,7 +72,7 @@ void update_actor_banana(struct BananaActor* banana) {
temp_f0 = (player->unk_094 * 0.75f) + 3.5f + pad3;
}
vec3f_set(someVelocity, 0, pad3, temp_f0);
- func_802B64C4(someVelocity, player->rotation[1] + player->unk_0C0);
+ func_802B64C4(someVelocity, player->rotation.y + player->unk_0C0);
banana->velocity.x = someVelocity[0];
banana->velocity.y = someVelocity[1];
banana->velocity.z = someVelocity[2];
@@ -121,7 +121,7 @@ void update_actor_banana(struct BananaActor* banana) {
someVelocity[0] = 0.0f;
someVelocity[1] = 0.0f;
someVelocity[2] = -5.0f;
- func_802B64C4(someVelocity, player->rotation[1] + player->unk_0C0);
+ func_802B64C4(someVelocity, player->rotation.y + player->unk_0C0);
unkX = player->pos.x + someVelocity[0];
unkY = player->pos.y + someVelocity[1];
unkZ = player->pos.z + someVelocity[2];
diff --git a/src/actors/blue_and_red_shells/update.inc.c b/src/actors/blue_and_red_shells/update.inc.c
index 3ae65e218..37a99a346 100644
--- a/src/actors/blue_and_red_shells/update.inc.c
+++ b/src/actors/blue_and_red_shells/update.inc.c
@@ -27,7 +27,7 @@ void func_802B3B44(struct ShellActor* shell) {
f32 temp_f18_3;
f32 temp_f16_3;
f32 temp_f26;
- Vec3f origPos;
+ Vec3fa origPos;
currentWaypoint = shell->pathIndex;
temp_f2 = D_80164490[currentWaypoint].posX;
@@ -116,7 +116,7 @@ void func_802B3E7C(struct ShellActor* shell, Player* player) {
f32 x_velocity;
f32 z_velocity;
f32 xz_dist;
- Vec3f newPosition;
+ Vec3fa newPosition;
x_velocity = player->pos.x;
x_velocity -= shell->pos.x;
@@ -186,13 +186,13 @@ s16 func_802B3FD0(Player* owner, struct ShellActor* shell) {
}
void func_802B4104(struct ShellActor* shell) {
- if ((shell->unk30.surfaceDistance[0] < 0.0f) &&
- ((shell->unk30.unk48[1] < 0.25f) || (shell->unk30.unk48[1] > -0.25f))) {
+ if ((shell->unk30.surfaceDistance.x < 0.0f) &&
+ ((shell->unk30.unk48.y < 0.25f) || (shell->unk30.unk48.y > -0.25f))) {
destroy_destructable_actor((struct Actor*) shell);
func_800C98B8(shell->pos, shell->velocity, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x54));
shell->flags |= 0x80;
- } else if ((shell->unk30.surfaceDistance[1] < 0.0f) &&
- ((shell->unk30.unk54[1] < 0.25f) || (shell->unk30.unk54[1] < -0.25f))) {
+ } else if ((shell->unk30.surfaceDistance.y < 0.0f) &&
+ ((shell->unk30.unk54.y < 0.25f) || (shell->unk30.unk54.y < -0.25f))) {
destroy_destructable_actor((struct Actor*) shell);
func_800C98B8(shell->pos, shell->velocity, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x54));
shell->flags |= 0x80;
@@ -212,7 +212,7 @@ void update_actor_red_blue_shell(struct ShellActor* shell) {
f32 temp_f2;
s16 temp_v0;
UNUSED s16 pad3;
- Vec3f somePosVel;
+ Vec3fa somePosVel;
struct Controller* controller;
TripleShellParent* parent;
UNUSED f32 pad0;
@@ -232,7 +232,7 @@ void update_actor_red_blue_shell(struct ShellActor* shell) {
UNUSED f32 pad15;
UNUSED f32 pad16;
UNUSED f32 pad17;
- Vec3f origPos;
+ Vec3fa origPos;
pad1 = shell->pos.x;
pad0 = shell->pos.z;
@@ -324,7 +324,7 @@ void update_actor_red_blue_shell(struct ShellActor* shell) {
somePosVel[0] = 0.0f;
somePosVel[1] = 0.0f;
somePosVel[2] = height;
- func_802B64C4(somePosVel, (s16) (player->rotation[1] + player->unk_0C0));
+ func_802B64C4(somePosVel, (s16) (player->rotation.y + player->unk_0C0));
shell->velocity.x = somePosVel[0];
shell->velocity.y = somePosVel[1];
shell->velocity.z = somePosVel[2];
diff --git a/src/actors/green_shell/update.inc.c b/src/actors/green_shell/update.inc.c
index 04f8e2d95..0eb1b1e2a 100644
--- a/src/actors/green_shell/update.inc.c
+++ b/src/actors/green_shell/update.inc.c
@@ -67,7 +67,7 @@ void update_actor_green_shell(struct ShellActor* shell) {
somePosVel[0] = 0.0f;
somePosVel[1] = 0.0f;
somePosVel[2] = -var_f2;
- func_802B64C4(somePosVel, player->rotation[1] + player->unk_0C0);
+ func_802B64C4(somePosVel, player->rotation.y + player->unk_0C0);
shell->velocity.x = somePosVel[0];
shell->velocity.y = somePosVel[1];
shell->velocity.z = somePosVel[2];
@@ -119,7 +119,7 @@ void update_actor_green_shell(struct ShellActor* shell) {
somePosVel[0] = 0.0f;
somePosVel[1] = 0.0f;
somePosVel[2] = var_f2;
- func_802B64C4(somePosVel, player->rotation[1] + player->unk_0C0);
+ func_802B64C4(somePosVel, player->rotation.y + player->unk_0C0);
shell->velocity.x = somePosVel[0];
shell->velocity.y = somePosVel[1];
shell->velocity.z = somePosVel[2];
diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c
index 03b9d5b0e..92398fda7 100644
--- a/src/code_80005FD0.c
+++ b/src/code_80005FD0.c
@@ -688,7 +688,7 @@ void func_800065D0(s32 playerId, Player* player) {
a = (s16) gPathIndexByPlayerId[playerId];
b = gNearestWaypointByPlayerId[playerId];
- temp_t2 = (s16) ((s16) player->rotation[1] / 182);
+ temp_t2 = (s16) ((s16) player->rotation.y / 182);
temp_t3 = (s16) ((s16) D_80164590[a][b] / 182);
var_t1 = temp_t2 - temp_t3;
@@ -1775,9 +1775,9 @@ void func_80009B60(s32 playerId) {
func_8000BBD8(stackPadding1A, D_80163090[playerId], D_80163448);
}
}
- player->rotation[1] = -get_angle_between_two_vectors(player->pos, D_80162FA0);
+ player->rotation.y = -get_angle_between_two_vectors(player->pos, D_80162FA0);
} else {
- player->rotation[1] = D_80164590[D_80163448][(D_801630E0 + 4) % D_80164430];
+ player->rotation.y = D_80164590[D_80163448][(D_801630E0 + 4) % D_80164430];
}
}
func_8003680C(player, 0);
@@ -1900,8 +1900,8 @@ void func_80009B60(s32 playerId) {
// MISMATCH2
// This fixes part of the register allocation problems, makes fixing others
// harder though. Needs more investigation
- // var_a2 = (-get_angle_between_two_vectors(player->pos, D_80162FA0)) - (var_a1 = player->rotation[1]);
- stackPadding19 = -get_angle_between_two_vectors(player->pos, D_80162FA0) - player->rotation[1];
+ // var_a2 = (-get_angle_between_two_vectors(player->pos, D_80162FA0)) - (var_a1 = player->rotation.y);
+ stackPadding19 = -get_angle_between_two_vectors(player->pos, D_80162FA0) - player->rotation.y;
var_a1 = stackPadding19;
var_a2 = var_a1;
if ((s16) temp_f2 < var_a1) {
@@ -4846,13 +4846,13 @@ void initialize_toads_turnpike_vehicle(f32 speedA, f32 speedB, s32 numVehicles,
} else {
veh->speed = speedB;
}
- veh->rotation[0] = 0;
- veh->rotation[2] = 0;
+ veh->rotation.x = 0;
+ veh->rotation.z = 0;
if (D_8016347A == 0) {
- veh->rotation[1] = func_8000D6D0(veh->position, (s16*) &veh->waypointIndex, veh->speed,
+ veh->rotation.y = func_8000D6D0(veh->position, (s16*) &veh->waypointIndex, veh->speed,
veh->someMultiplierTheSequel, 0, 3);
} else {
- veh->rotation[1] =
+ veh->rotation.y =
func_8000D940(veh->position, (s16*) &veh->waypointIndex, veh->speed, veh->someMultiplierTheSequel, 0);
}
}
@@ -4931,14 +4931,14 @@ void update_vehicle_follow_waypoint(VehicleStuff* vehicle) {
var_a1 = func_8000D940(vehicle->position, (s16*) &vehicle->waypointIndex, vehicle->speed,
vehicle->someMultiplierTheSequel, 0);
}
- adjust_angle(&vehicle->rotation[1], var_a1, 100);
+ adjust_angle(&vehicle->rotation.y, var_a1, 100);
temp_f0_3 = vehicle->position.x - sp5C;
temp_f2_2 = vehicle->position.z - sp54;
sp34[0] = vehicle->position.y;
sp34[1] = 0.0f;
sp34[2] = sqrtf((temp_f0_3 * temp_f0_3) + (temp_f2_2 * temp_f2_2));
thing = get_angle_between_two_vectors(sp40, sp34);
- adjust_angle(&vehicle->rotation[0], -thing, 100);
+ adjust_angle(&vehicle->rotation.x, -thing, 100);
vehicle->velocity.x = vehicle->position.x - sp5C;
vehicle->velocity.y = vehicle->position.y - sp58;
vehicle->velocity.z = vehicle->position.z - sp54;
@@ -4946,13 +4946,13 @@ void update_vehicle_follow_waypoint(VehicleStuff* vehicle) {
vehicleActor->pos.x = vehicle->position.x;
vehicleActor->pos.y = vehicle->position.y;
vehicleActor->pos.z = vehicle->position.z;
- vehicleActor->rot.x = vehicle->rotation[0];
+ vehicleActor->rot.x = vehicle->rotation.x;
if (gIsMirrorMode != 0) {
- vehicleActor->rot.y = -vehicle->rotation[1];
+ vehicleActor->rot.y = -vehicle->rotation.y;
} else {
- vehicleActor->rot.y = vehicle->rotation[1];
+ vehicleActor->rot.y = vehicle->rotation.y;
}
- vehicleActor->rot.z = vehicle->rotation[2];
+ vehicleActor->rot.z = vehicle->rotation.z;
vehicleActor->velocity.x = vehicle->velocity.x;
vehicleActor->velocity.y = vehicle->velocity.y;
vehicleActor->velocity.z = vehicle->velocity.z;
@@ -5426,7 +5426,7 @@ void func_80015314(s32 playerId, UNUSED f32 arg1, s32 cameraId) {
temp_a0 = camera1;
temp_a1 += playerId;
temp_a0 += cameraId;
- temp_a0->unk_2C = temp_a1->rotation[1];
+ temp_a0->unk_2C = temp_a1->rotation.y;
func_80015390(temp_a0, temp_a1, 0);
}
@@ -5459,7 +5459,7 @@ void func_80015390(Camera* camera, UNUSED Player* player, UNUSED s32 arg2) {
var_a2 = 0xA0 + (temp_s1->unk_078 / 16);
}
if (!((temp_s1->effects & 0x80) || (temp_s1->effects & 0x40))) {
- adjust_angle(&camera->unk_2C, temp_s1->rotation[1], var_a2);
+ adjust_angle(&camera->unk_2C, temp_s1->rotation.y, var_a2);
}
func_8001D794(temp_s1, camera, sp64, &sp84, &sp80, &sp7C, camera->unk_2C);
check_bounding_collision(&camera->collision, 10.0f, sp84, sp80, sp7C);
@@ -7490,7 +7490,7 @@ void func_8001BE78(void) {
temp_s1->pos.y =
spawn_actor_on_surface((f32) temp_s0->posX, 2000.0f, (f32) temp_s0->posZ) + temp_s1->boundingBoxSize;
temp_s1->pos.z = (f32) temp_s0->posZ;
- temp_s1->rotation[1] = (s16) *D_80164590[i];
+ temp_s1->rotation.y = (s16) *D_80164590[i];
func_8003680C(temp_s1, 0);
temp_s1++;
D_80163410[i] = 0;
diff --git a/src/code_80057C60.c b/src/code_80057C60.c
index 761d2198b..3dec8d60e 100644
--- a/src/code_80057C60.c
+++ b/src/code_80057C60.c
@@ -1454,7 +1454,7 @@ void func_8005A14C(s32 playerId) {
if (player->effects & 0x03000000) {
func_80087D24(objectIndex, 6.0f, 1.5f, 0.0f);
} else {
- f32_step_towards(&gObjectList[objectIndex].offset[1], 0.0f, 1.0f);
+ f32_step_towards(&gObjectList[objectIndex].offset.y, 0.0f, 1.0f);
}
if ((player->type & PLAYER_INVISIBLE_OR_BOMB) || (player->effects & BOO_EFFECT)) {
gObjectList[objectIndex].primAlpha = 0x0050;
@@ -1465,9 +1465,9 @@ void func_8005A14C(s32 playerId) {
gObjectList[objectIndex].direction_angle[2] = 0;
gObjectList[objectIndex].direction_angle[1] = 0;
gObjectList[objectIndex].direction_angle[0] = 0;
- gObjectList[objectIndex].offset[2] = 0.0f;
- gObjectList[objectIndex].offset[1] = 0.0f;
- gObjectList[objectIndex].offset[0] = 0.0f;
+ gObjectList[objectIndex].offset.z = 0.0f;
+ gObjectList[objectIndex].offset.y = 0.0f;
+ gObjectList[objectIndex].offset.x = 0.0f;
gObjectList[objectIndex].sizeScaling = 0.6f;
gObjectList[objectIndex].primAlpha = 0x00FF;
}
@@ -2807,10 +2807,10 @@ void func_8005D6C0(Player* player) {
}
void func_8005D794(Player* player, UnkPlayerStruct258* arg1, f32 arg2, f32 arg3, f32 arg4, s8 surfaceType, s8 arg6) {
- arg1->unk_000[2] = arg4;
- arg1->unk_000[0] = arg2;
- arg1->unk_000[1] = arg3;
- arg1->unk_020 = -player->rotation[1];
+ arg1->unk_000.x = arg2;
+ arg1->unk_000.y = arg3;
+ arg1->unk_000.z = arg4;
+ arg1->unk_020 = -player->rotation.y;
arg1->unk_014 = surfaceType;
arg1->unk_010 = arg6;
}
@@ -2994,7 +2994,7 @@ void func_8005DAF4(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8
player->unk_258[10 + arg1].unk_03A -= arg1 * 8;
player->unk_258[10 + arg1].unk_03C -= arg1 * 8;
}
- player->unk_258[10 + arg1].unk_000[1] -= 1.5;
+ player->unk_258[10 + arg1].unk_000.y -= 1.5;
break;
case SAND_OFFROAD:
if ((arg1 == 0) &&
@@ -3256,7 +3256,7 @@ void func_8005ED48(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8
player->unk_258[10 + arg1].unk_03A -= arg1 * 8;
player->unk_258[10 + arg1].unk_03C -= arg1 * 8;
}
- player->unk_258[10 + arg1].unk_000[1] -= 1.5;
+ player->unk_258[10 + arg1].unk_000.y -= 1.5;
break;
case SAND_OFFROAD:
if ((arg1 == 0) &&
@@ -3455,7 +3455,7 @@ void func_8005F90C(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8
player->unk_258[10 + arg1].unk_03A -= arg1 * 8;
player->unk_258[10 + arg1].unk_03C -= arg1 * 8;
}
- player->unk_258[10 + arg1].unk_000[1] -= 1.5;
+ player->unk_258[10 + arg1].unk_000.y -= 1.5;
break;
case SAND_OFFROAD:
if ((arg1 == 0) &&
@@ -3613,10 +3613,10 @@ void func_80060504(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8
}
func_80062B18(&sp50, &sp4C, &sp48, 0.0f, 4.5f, (player->unk_258[arg1].unk_01E * var_f0) + -5.5, -thing2,
-player->unk_206 * 2);
- player->unk_258[arg1].unk_000[0] = player->pos.x + sp50;
+ player->unk_258[arg1].unk_000.x = player->pos.x + sp50;
sp4C = sp4C + (player->pos.y - player->boundingBoxSize);
- player->unk_258[arg1].unk_000[2] = player->pos.z + sp48;
- player->unk_258[arg1].unk_000[1] = player->unk_258[arg1].unk_024 + sp4C;
+ player->unk_258[arg1].unk_000.z = player->pos.z + sp48;
+ player->unk_258[arg1].unk_000.y = player->unk_258[arg1].unk_024 + sp4C;
player->unk_258[arg1].unk_010 = 0;
}
@@ -3645,9 +3645,9 @@ void func_800608E0(Player* player, s16 arg1, UNUSED s32 arg2, s8 arg3, UNUSED s8
func_80062B18(&sp50, &sp4C, &sp48, 0.0f, sp4C,
((-player->unk_258[arg1].unk_01E * (player->unk_094 / 18.0f) * 216.0f) / 10.0f) + -4.0f,
-player->unk_258[arg1].unk_020, -player->unk_206 * 2);
- player->unk_258[arg1].unk_000[0] = player->pos.x + sp50;
- player->unk_258[arg1].unk_000[2] = player->pos.z + sp48;
- player->unk_258[arg1].unk_000[1] = player->pos.y + sp4C;
+ player->unk_258[arg1].unk_000.x = player->pos.x + sp50;
+ player->unk_258[arg1].unk_000.z = player->pos.z + sp48;
+ player->unk_258[arg1].unk_000.y = player->pos.y + sp4C;
}
void func_80060B14(Player* player, s16 arg1, s32 arg2, s8 arg3, s8 arg4) {
@@ -3684,18 +3684,18 @@ void func_80060BCC(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8
func_8005D794(player, &player->unk_258[arg1 + 10], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0);
func_8005D7D8(&player->unk_258[arg1 + 10], 0x0B, 0.4f);
func_8005D800(&player->unk_258[arg1 + 10], 0x00FFFFFF, 0x00FF);
- player->unk_258[arg1 + 10].unk_000[2] = player->pos.z + (coss(sp54 * 0xB6) * -1.8);
- player->unk_258[arg1 + 10].unk_000[0] = player->pos.x + (sins(sp54 * 0xB6) * -1.8);
- player->unk_258[arg1 + 10].unk_000[1] = (player->pos.y - player->boundingBoxSize) + sp4C + 2.0f;
+ player->unk_258[arg1 + 10].unk_000.z = player->pos.z + (coss(sp54 * 0xB6) * -1.8);
+ player->unk_258[arg1 + 10].unk_000.x = player->pos.x + (sins(sp54 * 0xB6) * -1.8);
+ player->unk_258[arg1 + 10].unk_000.y = (player->pos.y - player->boundingBoxSize) + sp4C + 2.0f;
player->unk_258[arg1 + 10].unk_018 = sp44 + 1.0f;
player->unk_258[arg1 + 10].unk_00C = (sp48 + 2.0f) / 10.0f;
} else if (player->unk_258[arg2 + 10].unk_01E > 0) {
func_8005D794(player, &player->unk_258[arg1 + 10], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0);
func_8005D7D8(&player->unk_258[arg1 + 10], 0x0B, 0.4f);
func_8005D800(&player->unk_258[arg1 + 10], 0x00FFFFFF, 0x00FF);
- player->unk_258[arg1 + 10].unk_000[2] = player->pos.z + (coss(sp54 * 0xB6) * -1.8);
- player->unk_258[arg1 + 10].unk_000[0] = player->pos.x + (sins(sp54 * 0xB6) * -1.8);
- player->unk_258[arg1 + 10].unk_000[1] = (player->pos.y - player->boundingBoxSize) + sp4C + 2.0f;
+ player->unk_258[arg1 + 10].unk_000.z = player->pos.z + (coss(sp54 * 0xB6) * -1.8);
+ player->unk_258[arg1 + 10].unk_000.x = player->pos.x + (sins(sp54 * 0xB6) * -1.8);
+ player->unk_258[arg1 + 10].unk_000.y = (player->pos.y - player->boundingBoxSize) + sp4C + 2.0f;
player->unk_258[arg1 + 10].unk_018 = sp44 + 1.0f;
player->unk_258[arg1 + 10].unk_00C = (sp48 + 2.0f) / 10.0f;
}
@@ -3711,9 +3711,9 @@ void func_80060F50(Player* player, s16 arg1, UNUSED s32 arg2, s8 arg3, UNUSED s8
func_8005D800(&player->unk_258[arg1], 0xFFFFFF, 0xFF);
}
- player->unk_258[arg1].unk_000[2] = player->pos.z + (coss(player->unk_258[arg1].unk_020) * -5.8);
- player->unk_258[arg1].unk_000[0] = player->pos.x + (sins(player->unk_258[arg1].unk_020) * -5.8);
- player->unk_258[arg1].unk_000[1] = D_801652A0[arg3];
+ player->unk_258[arg1].unk_000.z = player->pos.z + (coss(player->unk_258[arg1].unk_020) * -5.8);
+ player->unk_258[arg1].unk_000.x = player->pos.x + (sins(player->unk_258[arg1].unk_020) * -5.8);
+ player->unk_258[arg1].unk_000.y = D_801652A0[arg3];
player->unk_0DE &= ~0x0008;
}
@@ -3733,9 +3733,9 @@ void func_80061130(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s8 arg3, UN
func_8005D7D8(&player->unk_258[arg1], 7, 0.6f);
func_8005D800(&player->unk_258[arg1], 0xFFFFFF, 0xD0);
- player->unk_258[arg1].unk_000[2] = player->pos.z + (coss(player->unk_258[arg1].unk_020) * 6.0f);
- player->unk_258[arg1].unk_000[0] = player->pos.x + (sins(player->unk_258[arg1].unk_020) * 6.0f);
- player->unk_258[arg1].unk_000[1] = player->pos.y - 5.0f;
+ player->unk_258[arg1].unk_000.z = player->pos.z + (coss(player->unk_258[arg1].unk_020) * 6.0f);
+ player->unk_258[arg1].unk_000.x = player->pos.x + (sins(player->unk_258[arg1].unk_020) * 6.0f);
+ player->unk_258[arg1].unk_000.y = player->pos.y - 5.0f;
player->unk_258[arg1].unk_040 = 0;
player->unk_258[arg1].unk_024 = 0.0f;
}
@@ -3757,14 +3757,14 @@ void func_800612F8(Player* player, UNUSED s32 arg1, UNUSED s32 arg2, UNUSED s8 a
for (var_s2 = 0; var_s2 < 10; var_s2++) {
player->unk_258[0x1E + var_s2].unk_01C = 1;
player->unk_258[0x1E + var_s2].unk_028 = player->pos.y + 5.0f;
- player->unk_258[0x1E + var_s2].unk_020 = (0x1C70 * var_s2) - player->rotation[1];
+ player->unk_258[0x1E + var_s2].unk_020 = (0x1C70 * var_s2) - player->rotation.y;
player->unk_258[0x1E + var_s2].unk_024 = (random_int(0x0064U) / 100.0f) + 1.5;
player->unk_258[0x1E + var_s2].unk_03A = 0;
player->unk_258[0x1E + var_s2].unk_012 = 1;
player->unk_258[0x1E + var_s2].unk_01E = 0;
player->unk_258[0x1E + var_s2].unk_03E = 0x00FF;
- player->unk_258[0x1E + var_s2].unk_000[2] = player->pos.z;
- player->unk_258[0x1E + var_s2].unk_000[0] = player->pos.x;
+ player->unk_258[0x1E + var_s2].unk_000.z = player->pos.z;
+ player->unk_258[0x1E + var_s2].unk_000.x = player->pos.x;
}
player->unk_046 &= ~0x0008;
}
@@ -3775,7 +3775,7 @@ void func_80061430(Player* player, UNUSED s32 arg1, UNUSED s32 arg2, UNUSED s8 a
for (var_s2 = 0; var_s2 < 7; var_s2++) {
player->unk_258[0x1E + var_s2].unk_01C = 1;
player->unk_258[0x1E + var_s2].unk_028 = player->pos.y - 4.0f;
- player->unk_258[0x1E + var_s2].unk_020 = (0x1C70 * var_s2) - player->rotation[1];
+ player->unk_258[0x1E + var_s2].unk_020 = (0x1C70 * var_s2) - player->rotation.y;
// ???
player->unk_258[0x1E + var_s2].unk_024 = (random_int(0x0064U) / 100.0f) + 1.9;
player->unk_258[0x1E + var_s2].unk_024 = (random_int(0x0064U) / 100.0f) + 1.5;
@@ -3783,8 +3783,8 @@ void func_80061430(Player* player, UNUSED s32 arg1, UNUSED s32 arg2, UNUSED s8 a
player->unk_258[0x1E + var_s2].unk_012 = 9;
player->unk_258[0x1E + var_s2].unk_01E = 0;
player->unk_258[0x1E + var_s2].unk_03E = 0x00FF;
- player->unk_258[0x1E + var_s2].unk_000[2] = player->pos.z;
- player->unk_258[0x1E + var_s2].unk_000[0] = player->pos.x;
+ player->unk_258[0x1E + var_s2].unk_000.z = player->pos.z;
+ player->unk_258[0x1E + var_s2].unk_000.x = player->pos.x;
}
player->unk_044 &= ~0x1000;
}
@@ -3798,14 +3798,14 @@ void func_800615AC(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s8 arg3, UN
if (random_int(3U) == 2.0f) {
player->unk_258[0x1E + arg1].unk_01C = 1;
- player->unk_258[0x1E + arg1].unk_000[0] = player->pos.x;
- player->unk_258[0x1E + arg1].unk_000[2] = player->pos.z;
- player->unk_258[0x1E + arg1].unk_020 = -player->rotation[1] + sp28[arg1];
+ player->unk_258[0x1E + arg1].unk_000.x = player->pos.x;
+ player->unk_258[0x1E + arg1].unk_000.z = player->pos.z;
+ player->unk_258[0x1E + arg1].unk_020 = -player->rotation.y + sp28[arg1];
player->unk_258[0x1E + arg1].unk_018 = random_int(1U) + 2.0f;
temp_f0 = random_int(4U);
temp_f0 -= test;
player->unk_258[0x1E + arg1].unk_014 = temp_f0;
- player->unk_258[0x1E + arg1].unk_000[1] = player->pos.y + temp_f0;
+ player->unk_258[0x1E + arg1].unk_000.y = player->pos.y + temp_f0;
player->unk_258[0x1E + arg1].unk_00C = 0.15f;
player->unk_258[0x1E + arg1].unk_012 = 5;
player->unk_258[0x1E + arg1].unk_01E = 0;
@@ -3840,9 +3840,9 @@ void func_80061754(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s32 arg3, U
player->unk_258[0x1E + arg1].unk_03A += temp_s1;
player->unk_258[0x1E + arg1].unk_03C += temp_s1;
}
- player->unk_258[0x1E + arg1].unk_000[2] = player->pos.z + (coss(sp54 * 0xB6) * -5.0f);
- player->unk_258[0x1E + arg1].unk_000[0] = player->pos.x + (sins(sp54 * 0xB6) * -5.0f);
- player->unk_258[0x1E + arg1].unk_000[1] = (player->pos.y - player->boundingBoxSize) + sp4C + 2.0f;
+ player->unk_258[0x1E + arg1].unk_000.z = player->pos.z + (coss(sp54 * 0xB6) * -5.0f);
+ player->unk_258[0x1E + arg1].unk_000.x = player->pos.x + (sins(sp54 * 0xB6) * -5.0f);
+ player->unk_258[0x1E + arg1].unk_000.y = (player->pos.y - player->boundingBoxSize) + sp4C + 2.0f;
player->unk_258[0x1E + arg1].unk_018 = sp44 + 1.0f;
player->unk_258[0x1E + arg1].unk_00C = sp48 + 1.0f;
}
@@ -3870,17 +3870,17 @@ void func_80061A34(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8
func_8005D794(player, &player->unk_258[0x1E + arg1], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0);
func_8005D7D8(&player->unk_258[0x1E + arg1], 7, 1.0f);
func_8005D800(&player->unk_258[0x1E + arg1], 0x00FFFFFF, 0x00FF);
- player->unk_258[0x1E + arg1].unk_000[2] = player->pos.z + (coss(sp54 * 0xB6) * -2.0);
- player->unk_258[0x1E + arg1].unk_000[0] = player->pos.x + (sins(sp54 * 0xB6) * -2.0);
- player->unk_258[0x1E + arg1].unk_000[1] = (player->pos.y - player->boundingBoxSize) + sp4C + 2.0f;
+ player->unk_258[0x1E + arg1].unk_000.z = player->pos.z + (coss(sp54 * 0xB6) * -2.0);
+ player->unk_258[0x1E + arg1].unk_000.x = player->pos.x + (sins(sp54 * 0xB6) * -2.0);
+ player->unk_258[0x1E + arg1].unk_000.y = (player->pos.y - player->boundingBoxSize) + sp4C + 2.0f;
player->unk_258[0x1E + arg1].unk_00C = (sp48 + 2.0f) / 10.0f;
} else if (player->unk_258[0x1E + arg2].unk_01E > 0) {
func_8005D794(player, &player->unk_258[0x1E + arg1], 0.0f, 0.0f, 0.0f, (s8) 0, (s8) 0);
func_8005D7D8(&player->unk_258[0x1E + arg1], 7, 1.0f);
func_8005D800(&player->unk_258[0x1E + arg1], 0x00FFFFFF, 0x00FF);
- player->unk_258[0x1E + arg1].unk_000[2] = player->pos.z + (coss(sp54 * 0xB6) * -2.0);
- player->unk_258[0x1E + arg1].unk_000[0] = player->pos.x + (sins(sp54 * 0xB6) * -2.0);
- player->unk_258[0x1E + arg1].unk_000[1] = (player->pos.y - player->boundingBoxSize) + (f32) sp4C + 2.0f;
+ player->unk_258[0x1E + arg1].unk_000.z = player->pos.z + (coss(sp54 * 0xB6) * -2.0);
+ player->unk_258[0x1E + arg1].unk_000.x = player->pos.x + (sins(sp54 * 0xB6) * -2.0);
+ player->unk_258[0x1E + arg1].unk_000.y = (player->pos.y - player->boundingBoxSize) + (f32) sp4C + 2.0f;
player->unk_258[0x1E + arg1].unk_00C = (sp48 + 2.0f) / 10.0f;
}
}
@@ -3894,10 +3894,10 @@ void func_80061D4C(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s8 arg3, UN
if (random_int(3U) == 2.0f) {
player->unk_258[0x1E + arg1].unk_01C = 1;
- player->unk_258[0x1E + arg1].unk_000[0] = player->pos.x;
- player->unk_258[0x1E + arg1].unk_000[1] = player->pos.y + 2.0f;
- player->unk_258[0x1E + arg1].unk_000[2] = player->pos.z;
- player->unk_258[0x1E + arg1].unk_020 = -player->rotation[1] + sp20[arg1];
+ player->unk_258[0x1E + arg1].unk_000.x = player->pos.x;
+ player->unk_258[0x1E + arg1].unk_000.y = player->pos.y + 2.0f;
+ player->unk_258[0x1E + arg1].unk_000.z = player->pos.z;
+ player->unk_258[0x1E + arg1].unk_020 = -player->rotation.y + sp20[arg1];
player->unk_258[0x1E + arg1].unk_018 = random_int(3U) + 2.0f;
player->unk_258[0x1E + arg1].unk_014 = random_int(4U);
player->unk_258[0x1E + arg1].unk_014 -= test;
@@ -3940,12 +3940,12 @@ void func_80061EF4(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8
} else {
player->unk_258[0x1E + arg1].unk_020 -= 0x888;
}
- player->unk_258[0x1E + arg1].unk_000[2] =
+ player->unk_258[0x1E + arg1].unk_000.z =
player->pos.z +
- (coss(player->unk_258[0x1E + arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f);
- player->unk_258[0x1E + arg1].unk_000[0] =
+ (coss(player->unk_258[0x1E + arg1].unk_020 - player->rotation.y - player->unk_0C0) * 5.0f);
+ player->unk_258[0x1E + arg1].unk_000.x =
player->pos.x +
- (sins(player->unk_258[0x1E + arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f);
+ (sins(player->unk_258[0x1E + arg1].unk_020 - player->rotation.y - player->unk_0C0) * 5.0f);
} else if (player->unk_258[0x1E + arg2].unk_01E > 0) {
func_8005D794(player, &player->unk_258[0x1E + arg1], 0.0f, var_f2, 0.0f, (s8) var_t0, (s8) var_t1);
func_8005D7D8(&player->unk_258[0x1E + arg1], 3, 0.5f);
@@ -3956,12 +3956,12 @@ void func_80061EF4(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8
} else {
player->unk_258[0x1E + arg1].unk_020 -= 0x888;
}
- player->unk_258[0x1E + arg1].unk_000[2] =
+ player->unk_258[0x1E + arg1].unk_000.z =
player->pos.z +
- (coss(player->unk_258[0x1E + arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f);
- player->unk_258[0x1E + arg1].unk_000[0] =
+ (coss(player->unk_258[0x1E + arg1].unk_020 - player->rotation.y - player->unk_0C0) * 5.0f);
+ player->unk_258[0x1E + arg1].unk_000.x =
player->pos.x +
- (sins(player->unk_258[0x1E + arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f);
+ (sins(player->unk_258[0x1E + arg1].unk_020 - player->rotation.y - player->unk_0C0) * 5.0f);
}
}
}
@@ -4003,12 +4003,12 @@ void func_800621BC(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8
player->unk_258[30 + arg1].unk_020 -= 2184;
}
- player->unk_258[30 + arg1].unk_000[2] =
+ player->unk_258[30 + arg1].unk_000.z =
player->pos.z +
- (coss((player->unk_258[30 + arg1].unk_020 - player->rotation[1]) - player->unk_0C0) * 5.0f);
- player->unk_258[30 + arg1].unk_000[0] =
+ (coss((player->unk_258[30 + arg1].unk_020 - player->rotation.y) - player->unk_0C0) * 5.0f);
+ player->unk_258[30 + arg1].unk_000.z =
player->pos.x +
- (sins((player->unk_258[30 + arg1].unk_020 - player->rotation[1]) - player->unk_0C0) * 5.0f);
+ (sins((player->unk_258[30 + arg1].unk_020 - player->rotation.y) - player->unk_0C0) * 5.0f);
return;
}
@@ -4025,22 +4025,22 @@ void func_800621BC(Player* player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8
}
new_var = new_var2;
- new_var->unk_258[30 + arg1].unk_000[2] =
+ new_var->unk_258[30 + arg1].unk_000.z =
new_var->pos.z +
- (coss((new_var->unk_258[30 + arg1].unk_020 - new_var->rotation[1]) - new_var->unk_0C0) * 5.0f);
- new_var->unk_258[30 + arg1].unk_000[0] =
+ (coss((new_var->unk_258[30 + arg1].unk_020 - new_var->rotation.y) - new_var->unk_0C0) * 5.0f);
+ new_var->unk_258[30 + arg1].unk_000.x =
new_var->pos.x +
- (sins((new_var->unk_258[30 + arg1].unk_020 - new_var->rotation[1]) - new_var->unk_0C0) * 5.0f);
+ (sins((new_var->unk_258[30 + arg1].unk_020 - new_var->rotation.y) - new_var->unk_0C0) * 5.0f);
}
}
}
void func_80062484(Player* player, UnkPlayerStruct258* arg1, s32 arg2) {
arg1->unk_01C = 1;
- arg1->unk_000[1] = player->unk_074 + 1.0f;
- arg1->unk_000[2] = player->pos.z;
- arg1->unk_000[0] = player->pos.x;
- arg1->unk_020 = (arg2 * 0x1998) - player->rotation[1];
+ arg1->unk_000.x = player->pos.x;
+ arg1->unk_000.y = player->unk_074 + 1.0f;
+ arg1->unk_000.z = player->pos.z;
+ arg1->unk_020 = (arg2 * 0x1998) - player->rotation.y;
arg1->unk_012 = 4;
arg1->unk_01E = 0;
}
@@ -4137,7 +4137,7 @@ void func_800624D8(Player* player, UNUSED s32 arg1, UNUSED s32 arg2, UNUSED s8 a
void func_800628C0(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) {
player->unk_258[20 + arg3].unk_01C = 1;
- player->unk_258[20 + arg3].unk_020 = -player->rotation[1];
+ player->unk_258[20 + arg3].unk_020 = -player->rotation.y;
player->unk_258[20 + arg3].unk_012 = 2;
player->unk_258[20 + arg3].unk_01E = 0;
player->unk_258[20 + arg3].unk_00C = 0.2f;
@@ -4145,7 +4145,7 @@ void func_800628C0(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) {
void func_80062914(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) {
player->unk_258[20 + arg3].unk_01C = 1;
- player->unk_258[20 + arg3].unk_020 = -player->rotation[1];
+ player->unk_258[20 + arg3].unk_020 = -player->rotation.y;
player->unk_258[20 + arg3].unk_012 = 4;
player->unk_258[20 + arg3].unk_01E = 0;
player->unk_258[20 + arg3].unk_00C = 1.0f;
@@ -4153,7 +4153,7 @@ void func_80062914(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) {
void func_80062968(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) {
player->unk_258[20 + arg3].unk_01C = 1;
- player->unk_258[20 + arg3].unk_020 = -player->rotation[1];
+ player->unk_258[20 + arg3].unk_020 = -player->rotation.y;
player->unk_258[20 + arg3].unk_012 = 5;
player->unk_258[20 + arg3].unk_01E = 0;
player->unk_258[20 + arg3].unk_00C = 0.2f;
@@ -4161,11 +4161,11 @@ void func_80062968(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) {
void func_800629BC(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) {
player->unk_258[20 + arg3].unk_01C = 1;
- player->unk_258[20 + arg3].unk_020 = -player->rotation[1];
+ player->unk_258[20 + arg3].unk_020 = -player->rotation.y;
player->unk_258[20 + arg3].unk_012 = 6;
player->unk_258[20 + arg3].unk_01E = 0;
player->unk_258[20 + arg3].unk_00C = 0.2f;
- player->unk_258[20 + arg3].unk_000[1] = 0.0f;
+ player->unk_258[20 + arg3].unk_000.y = 0.0f;
}
void func_80062A18(Player* player, s8 arg1, UNUSED s8 arg2, s8 arg3) {
@@ -4175,9 +4175,9 @@ void func_80062A18(Player* player, s8 arg1, UNUSED s8 arg2, s8 arg3) {
player->unk_258[20 + arg3].unk_01E = 1;
player->unk_258[20 + arg3].unk_020 = 0;
player->unk_0B6 &= ~0x0080;
- player->unk_258[20 + arg3].unk_000[2] = player->pos.z;
- player->unk_258[20 + arg3].unk_000[0] = player->pos.x;
- player->unk_258[20 + arg3].unk_000[1] = (player->pos.y + 4.0f);
+ player->unk_258[20 + arg3].unk_000.x = player->pos.x;
+ player->unk_258[20 + arg3].unk_000.y = (player->pos.y + 4.0f);
+ player->unk_258[20 + arg3].unk_000.z = player->pos.z;
}
void func_80062AA8(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) {
@@ -4185,7 +4185,7 @@ void func_80062AA8(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) {
player->unk_258[20 + arg3].unk_012 = 5;
player->unk_258[20 + arg3].unk_00C = 0.1f;
player->unk_258[20 + arg3].unk_01E = 0;
- player->unk_258[20 + arg3].unk_000[1] = (player->pos.y + player->boundingBoxSize) - 2.5;
+ player->unk_258[20 + arg3].unk_000.y = (player->pos.y + player->boundingBoxSize) - 2.5;
}
void func_80062B18(f32* outX, f32* outY, f32* outZ, f32 inX, f32 inY, f32 inZ, u16 theta, u16 phi) {
@@ -4260,10 +4260,10 @@ void func_80062C74(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s32 arg3) {
}
func_80062B18(&sp40, &sp38, &sp3C, 0.0f, sp48[player->characterId], (player->unk_258[arg1].unk_01E * var_f6) + -5.5,
-thing, -player->unk_206 * 2);
- player->unk_258[arg1].unk_000[0] = player->pos.x + sp40;
+ player->unk_258[arg1].unk_000.x = player->pos.x + sp40;
sp38 = (player->pos.y - player->boundingBoxSize) + sp38;
- player->unk_258[arg1].unk_000[2] = player->pos.z + sp3C;
- player->unk_258[arg1].unk_000[1] = player->unk_258[arg1].unk_024 + sp38;
+ player->unk_258[arg1].unk_000.z = player->pos.z + sp3C;
+ player->unk_258[arg1].unk_000.y = player->unk_258[arg1].unk_024 + sp38;
}
void func_80062F98(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) {
@@ -4271,17 +4271,17 @@ void func_80062F98(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) {
temp_f0 = player->unk_258[10 + arg1].unk_018 / 10.0f;
++player->unk_258[10 + arg1].unk_01E;
- player->unk_258[10 + arg1].unk_000[1] += temp_f0;
+ player->unk_258[10 + arg1].unk_000.y += temp_f0;
if ((player->unk_0CA & 1) == 1) {
- player->unk_258[10 + arg1].unk_000[1] += (temp_f0 + 0.3);
+ player->unk_258[10 + arg1].unk_000.y += (temp_f0 + 0.3);
if ((player->unk_258[10 + arg1].unk_01E == 0x10) ||
- ((D_801652A0[arg2] - player->unk_258[10 + arg1].unk_000[1]) < 3.0f)) {
+ ((D_801652A0[arg2] - player->unk_258[10 + arg1].unk_000.y) < 3.0f)) {
player->unk_258[10 + arg1].unk_01C = 0;
player->unk_258[10 + arg1].unk_01E = 0;
player->unk_258[10 + arg1].unk_012 = 0;
}
} else if ((player->unk_258[10 + arg1].unk_01E == 0xA) ||
- ((D_801652A0[arg2] - player->unk_258[10 + arg1].unk_000[1]) < 3.0f)) {
+ ((D_801652A0[arg2] - player->unk_258[10 + arg1].unk_000.y) < 3.0f)) {
player->unk_258[10 + arg1].unk_01C = 0;
player->unk_258[10 + arg1].unk_01E = 0;
player->unk_258[10 + arg1].unk_012 = 0;
@@ -4290,9 +4290,9 @@ void func_80062F98(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) {
void func_800630C0(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) {
++player->unk_258[arg1].unk_01E;
- player->unk_258[arg1].unk_000[2] = player->pos.z + coss(player->unk_258[arg1].unk_020) * -5.8;
- player->unk_258[arg1].unk_000[0] = player->pos.x + sins(player->unk_258[arg1].unk_020) * -5.8;
- player->unk_258[arg1].unk_000[1] = D_801652A0[arg2];
+ player->unk_258[arg1].unk_000.z = player->pos.z + coss(player->unk_258[arg1].unk_020) * -5.8;
+ player->unk_258[arg1].unk_000.x = player->pos.x + sins(player->unk_258[arg1].unk_020) * -5.8;
+ player->unk_258[arg1].unk_000.y = D_801652A0[arg2];
if (player->unk_258[arg1].unk_01E == 15) {
player->unk_258[arg1].unk_01C = 0;
player->unk_258[arg1].unk_01E = 0;
@@ -4333,11 +4333,11 @@ void func_80063268(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
}
player->unk_258[arg1].unk_024 += 0.25;
- player->unk_258[arg1].unk_000[2] =
+ player->unk_258[arg1].unk_000.z =
player->pos.z + (coss((player->unk_258[arg1].unk_020 + player->unk_258[arg1].unk_040)) * 5.5);
- player->unk_258[arg1].unk_000[0] =
+ player->unk_258[arg1].unk_000.x =
player->pos.x + (sins((player->unk_258[arg1].unk_020 + player->unk_258[arg1].unk_040)) * 5.5);
- player->unk_258[arg1].unk_000[1] = ((player->pos.y - 5.0f) + player->unk_258[arg1].unk_024);
+ player->unk_258[arg1].unk_000.y = ((player->pos.y - 5.0f) + player->unk_258[arg1].unk_024);
++player->unk_258[arg1].unk_01E;
player->unk_258[arg1].unk_00C += 0.05;
player->unk_258[arg1].unk_03E -= 5;
@@ -4355,23 +4355,23 @@ void func_80063268(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
void func_80063408(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
if (player->unk_258[10 + arg1].unk_010 == 1) {
- player->unk_258[10 + arg1].unk_000[2] =
+ player->unk_258[10 + arg1].unk_000.z =
player->tyres[BACK_LEFT].pos.z +
(player->unk_258[10 + arg1].unk_01E * -7) * coss(player->unk_258[10 + arg1].unk_020);
- player->unk_258[10 + arg1].unk_000[0] =
+ player->unk_258[10 + arg1].unk_000.x =
player->tyres[BACK_LEFT].pos.x +
(player->unk_258[10 + arg1].unk_01E * -7) * sins(player->unk_258[10 + arg1].unk_020);
} else {
- player->unk_258[10 + arg1].unk_000[2] =
+ player->unk_258[10 + arg1].unk_000.z =
player->tyres[BACK_RIGHT].pos.z +
(player->unk_258[10 + arg1].unk_01E * -7) * coss(player->unk_258[10 + arg1].unk_020);
- player->unk_258[10 + arg1].unk_000[0] =
+ player->unk_258[10 + arg1].unk_000.x =
player->tyres[BACK_RIGHT].pos.x +
(player->unk_258[10 + arg1].unk_01E * -7) * sins(player->unk_258[10 + arg1].unk_020);
}
++player->unk_258[10 + arg1].unk_01E;
- player->unk_258[10 + arg1].unk_000[1] += 1.0f;
+ player->unk_258[10 + arg1].unk_000.y += 1.0f;
if (((player->effects & 0x80) != 0) || ((player->effects & 0x40) != 0)) {
player->unk_258[10 + arg1].unk_01C = 0;
@@ -4404,14 +4404,14 @@ void func_800635D4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
func_80062B18(&sp44, &sp40, &sp3C, -2.0f, 0.0f,
(-player->unk_258[10 + arg1].unk_01E * (player->unk_094 / 18.0f) * 216.0f) / 16,
-player->unk_258[10 + arg1].unk_020, 2 * -player->unk_206);
- player->unk_258[10 + arg1].unk_000[0] = player->tyres[BACK_LEFT].pos.x + sp44;
- player->unk_258[10 + arg1].unk_000[2] = player->tyres[BACK_LEFT].pos.z + sp3C;
+ player->unk_258[10 + arg1].unk_000.x = player->tyres[BACK_LEFT].pos.x + sp44;
+ player->unk_258[10 + arg1].unk_000.z = player->tyres[BACK_LEFT].pos.z + sp3C;
} else {
- player->unk_258[10 + arg1].unk_000[2] =
+ player->unk_258[10 + arg1].unk_000.z =
player->tyres[BACK_LEFT].pos.z +
((-player->unk_258[10 + arg1].unk_01E * (player->unk_094 / 18.0f) * 216.0f) / 16) *
coss(player->unk_258[10 + arg1].unk_020);
- player->unk_258[10 + arg1].unk_000[0] =
+ player->unk_258[10 + arg1].unk_000.x =
player->tyres[BACK_LEFT].pos.x +
((-player->unk_258[10 + arg1].unk_01E * (player->unk_094 / 18.0f) * 216.0f) / 16) *
sins(player->unk_258[10 + arg1].unk_020);
@@ -4420,21 +4420,21 @@ void func_800635D4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
func_80062B18(&sp44, &sp40, &sp3C, 2.0f, 0.0f,
(-player->unk_258[10 + arg1].unk_01E * (player->unk_094 / 18.0f) * 216.0f) / 16,
-player->unk_258[10 + arg1].unk_020, 2 * -player->unk_206);
- player->unk_258[10 + arg1].unk_000[0] = player->tyres[BACK_RIGHT].pos.x + sp44;
- player->unk_258[10 + arg1].unk_000[2] = player->tyres[BACK_RIGHT].pos.z + sp3C;
+ player->unk_258[10 + arg1].unk_000.x = player->tyres[BACK_RIGHT].pos.x + sp44;
+ player->unk_258[10 + arg1].unk_000.z = player->tyres[BACK_RIGHT].pos.z + sp3C;
} else {
- player->unk_258[10 + arg1].unk_000[2] =
+ player->unk_258[10 + arg1].unk_000.z =
player->tyres[BACK_RIGHT].pos.z +
((-player->unk_258[10 + arg1].unk_01E * (player->unk_094 / 18.0f) * 216.0f) / 16) *
coss(player->unk_258[10 + arg1].unk_020);
- player->unk_258[10 + arg1].unk_000[0] =
+ player->unk_258[10 + arg1].unk_000.x =
player->tyres[BACK_RIGHT].pos.x +
((-player->unk_258[10 + arg1].unk_01E * (player->unk_094 / 18.0f) * 216.0f) / 16) *
sins(player->unk_258[10 + arg1].unk_020);
}
++player->unk_258[10 + arg1].unk_01E;
- player->unk_258[10 + arg1].unk_000[1] += 0.2;
+ player->unk_258[10 + arg1].unk_000.y += 0.2;
if (((player->effects & 0x80) != 0) || ((player->effects & 0x40) != 0)) {
player->unk_258[10 + arg1].unk_01C = 0;
player->unk_258[10 + arg1].unk_01E = 0;
@@ -4466,22 +4466,22 @@ void func_800635D4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
void func_800639DC(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
if (player->unk_258[10 + arg1].unk_010 == 1) {
- player->unk_258[10 + arg1].unk_000[2] =
+ player->unk_258[10 + arg1].unk_000.z =
player->tyres[BACK_LEFT].pos.z +
(-1.8f * player->unk_258[10 + arg1].unk_01E) * coss(player->unk_258[10 + arg1].unk_020);
- player->unk_258[10 + arg1].unk_000[0] =
+ player->unk_258[10 + arg1].unk_000.x =
player->tyres[BACK_LEFT].pos.x +
(-1.8f * player->unk_258[10 + arg1].unk_01E) * sins(player->unk_258[10 + arg1].unk_020);
} else {
- player->unk_258[10 + arg1].unk_000[2] =
+ player->unk_258[10 + arg1].unk_000.z =
player->tyres[BACK_RIGHT].pos.z +
(-1.8f * player->unk_258[10 + arg1].unk_01E) * coss(player->unk_258[10 + arg1].unk_020);
- player->unk_258[10 + arg1].unk_000[0] =
+ player->unk_258[10 + arg1].unk_000.x =
player->tyres[BACK_RIGHT].pos.x +
(-1.8f * player->unk_258[10 + arg1].unk_01E) * sins(player->unk_258[10 + arg1].unk_020);
}
++player->unk_258[10 + arg1].unk_01E;
- player->unk_258[10 + arg1].unk_000[1] += 0.3;
+ player->unk_258[10 + arg1].unk_000.y += 0.3;
if (player->unk_258[10 + arg1].unk_01E == 8) {
player->unk_258[10 + arg1].unk_01C = 0;
player->unk_258[10 + arg1].unk_01E = 0;
@@ -4509,23 +4509,23 @@ void func_800639DC(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
void func_80063BD4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
if (player->unk_258[10 + arg1].unk_010 == 1) {
- player->unk_258[10 + arg1].unk_000[2] =
+ player->unk_258[10 + arg1].unk_000.z =
player->tyres[BACK_LEFT].pos.z +
(-2 * player->unk_258[10 + arg1].unk_01E * coss(player->unk_258[10 + arg1].unk_020));
- player->unk_258[10 + arg1].unk_000[0] =
+ player->unk_258[10 + arg1].unk_000.x =
player->tyres[BACK_LEFT].pos.x +
(-2 * player->unk_258[10 + arg1].unk_01E * sins(player->unk_258[10 + arg1].unk_020));
} else {
- player->unk_258[10 + arg1].unk_000[2] =
+ player->unk_258[10 + arg1].unk_000.z =
player->tyres[BACK_RIGHT].pos.z +
(-2 * player->unk_258[10 + arg1].unk_01E * coss(player->unk_258[10 + arg1].unk_020));
- player->unk_258[10 + arg1].unk_000[0] =
+ player->unk_258[10 + arg1].unk_000.x =
player->tyres[BACK_RIGHT].pos.x +
(-2 * player->unk_258[10 + arg1].unk_01E * sins(player->unk_258[10 + arg1].unk_020));
}
++player->unk_258[10 + arg1].unk_01E;
- player->unk_258[10 + arg1].unk_000[1] += 0.2;
+ player->unk_258[10 + arg1].unk_000.y += 0.2;
if (player->unk_258[10 + arg1].unk_01E == 8) {
player->unk_258[10 + arg1].unk_01C = 0;
player->unk_258[10 + arg1].unk_01E = 0;
@@ -4538,20 +4538,20 @@ void func_80063BD4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
void func_80063D58(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
if (player->unk_258[10 + arg1].unk_010 == 1) {
- player->unk_258[10 + arg1].unk_000[2] =
+ player->unk_258[10 + arg1].unk_000.z =
player->tyres[BACK_LEFT].pos.z +
((-player->unk_258[10 + arg1].unk_01E * (player->unk_094 / 18.0f) * 216.0f) / 20.0f) *
coss(player->unk_258[10 + arg1].unk_020);
- player->unk_258[10 + arg1].unk_000[0] =
+ player->unk_258[10 + arg1].unk_000.x =
player->tyres[BACK_LEFT].pos.x +
((-player->unk_258[10 + arg1].unk_01E * (player->unk_094 / 18.0f) * 216.0f) / 20.0f) *
sins(player->unk_258[10 + arg1].unk_020);
} else {
- player->unk_258[10 + arg1].unk_000[2] =
+ player->unk_258[10 + arg1].unk_000.z =
player->tyres[BACK_RIGHT].pos.z +
((-player->unk_258[10 + arg1].unk_01E * (player->unk_094 / 18.0f) * 216.0f) / 20.0f) *
coss(player->unk_258[10 + arg1].unk_020);
- player->unk_258[10 + arg1].unk_000[0] =
+ player->unk_258[10 + arg1].unk_000.x =
player->tyres[BACK_RIGHT].pos.x +
((-player->unk_258[10 + arg1].unk_01E * (player->unk_094 / 18.0f) * 216.0f) / 20.0f) *
sins(player->unk_258[10 + arg1].unk_020);
@@ -4567,9 +4567,9 @@ void func_80063D58(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
player->unk_258[10 + arg1].unk_00C += 0.2;
if (player->unk_258[10 + arg1].unk_01E >= 4) {
player->unk_258[10 + arg1].unk_03E -= 18;
- player->unk_258[10 + arg1].unk_000[1] -= 0.1;
+ player->unk_258[10 + arg1].unk_000.y -= 0.1;
} else {
- player->unk_258[10 + arg1].unk_000[1] += 0.4;
+ player->unk_258[10 + arg1].unk_000.y += 0.4;
}
if (player->unk_258[10 + arg1].unk_03E <= 0) {
@@ -4591,9 +4591,9 @@ void func_80063FBC(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s32 arg3) {
-5.5 - (player->unk_258[10 + arg1].unk_01E * (((player->unk_094 / 18.0f) * 216.0f) / 15.0f)),
-player->unk_258[10 + arg1].unk_020, 0);
}
- player->unk_258[10 + arg1].unk_000[0] = player->pos.x + sp3C;
- player->unk_258[10 + arg1].unk_000[2] = player->pos.z + sp38;
- player->unk_258[10 + arg1].unk_000[1] = (player->pos.y - player->boundingBoxSize) + sp34;
+ player->unk_258[10 + arg1].unk_000.x = player->pos.x + sp3C;
+ player->unk_258[10 + arg1].unk_000.z = player->pos.z + sp38;
+ player->unk_258[10 + arg1].unk_000.y = (player->pos.y - player->boundingBoxSize) + sp34;
player->unk_258[10 + arg1].unk_01E++;
if (player->unk_258[10 + arg1].unk_01E == 6) {
player->unk_258[10 + arg1].unk_01C = 0;
@@ -4615,9 +4615,9 @@ void func_80064184(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) {
func_80062B18(&sp44, &sp40, &sp3C, 0.0f, sp40,
-4.0f + ((-player->unk_258[arg1].unk_01E * (player->unk_094 / 18.0f) * 216.0f) / 10.0f),
-player->unk_258[arg1].unk_020, 2 * -player->unk_206);
- player->unk_258[arg1].unk_000[0] = player->pos.x + sp44;
- player->unk_258[arg1].unk_000[2] = player->pos.z + sp3C;
- player->unk_258[arg1].unk_000[1] = player->pos.y + sp40;
+ player->unk_258[arg1].unk_000.x = player->pos.x + sp44;
+ player->unk_258[arg1].unk_000.z = player->pos.z + sp3C;
+ player->unk_258[arg1].unk_000.y = player->pos.y + sp40;
++player->unk_258[arg1].unk_01E;
if ((player->unk_258[arg1].unk_01E == 12) || (D_801652A0[arg2] <= (player->pos.y - player->boundingBoxSize))) {
player->unk_258[arg1].unk_01C = 0;
@@ -4637,11 +4637,11 @@ void func_80064184(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) {
}
void func_800643A8(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
- player->unk_258[10 + arg1].unk_000[2] =
+ player->unk_258[10 + arg1].unk_000.z =
player->pos.z + (-1.2 * player->unk_258[10 + arg1].unk_01E * coss(player->unk_258[10 + arg1].unk_020));
- player->unk_258[10 + arg1].unk_000[0] =
+ player->unk_258[10 + arg1].unk_000.x =
player->pos.x + (-1.2 * player->unk_258[10 + arg1].unk_01E * sins(player->unk_258[10 + arg1].unk_020));
- player->unk_258[10 + arg1].unk_000[1] = player->unk_258[10 + arg1].unk_000[1] + 0.5;
+ player->unk_258[10 + arg1].unk_000.y = player->unk_258[10 + arg1].unk_000.y + 0.5;
++player->unk_258[10 + arg1].unk_01E;
if (player->unk_258[10 + arg1].unk_01E == 10) {
@@ -4668,12 +4668,12 @@ void func_800644E8(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
}
thing2 = player->unk_258[30 + arg1].unk_024;
thing = player->unk_258[30 + arg1].unk_01E;
- player->unk_258[30 + arg1].unk_000[2] =
+ player->unk_258[30 + arg1].unk_000.z =
player->pos.z + (coss(player->unk_258[30 + arg1].unk_020) * (-0.7 * thing));
- player->unk_258[30 + arg1].unk_000[0] =
+ player->unk_258[30 + arg1].unk_000.z =
player->pos.x + (sins(player->unk_258[30 + arg1].unk_020) * (-0.7 * thing));
player->unk_258[30 + arg1].unk_01E++;
- player->unk_258[30 + arg1].unk_000[1] =
+ player->unk_258[30 + arg1].unk_000.y =
player->unk_258[30 + arg1].unk_028 + (f32) ((thing * thing2) - (0.2 * (thing * thing)));
if (player->unk_258[30 + arg1].unk_01E == 0x000A) {
player->unk_258[30 + arg1].unk_01E = 0;
@@ -4696,12 +4696,12 @@ void func_80064664(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
temp_v1 = player->unk_258[30 + arg1].unk_01E;
temp_f4 = player->unk_258[30 + arg1].unk_024;
- player->unk_258[30 + arg1].unk_000[2] =
+ player->unk_258[30 + arg1].unk_000.z =
player->pos.z + (coss(player->unk_258[30 + arg1].unk_020) * (-0.6 * temp_v1));
- player->unk_258[30 + arg1].unk_000[0] =
+ player->unk_258[30 + arg1].unk_000.z =
player->pos.x + (sins(player->unk_258[30 + arg1].unk_020) * (-0.6 * temp_v1));
player->unk_258[30 + arg1].unk_01E++;
- player->unk_258[30 + arg1].unk_000[1] =
+ player->unk_258[30 + arg1].unk_000.y =
player->unk_258[30 + arg1].unk_028 + (f32) ((temp_v1 * temp_f4) - (0.1 * (temp_v1 * temp_v1)));
if (player->unk_258[30 + arg1].unk_01E == 0x0019) {
player->unk_258[30 + arg1].unk_01E = 0;
@@ -4719,11 +4719,11 @@ void func_80064664(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
void func_800647C8(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
++player->unk_258[30 + arg1].unk_01E;
- player->unk_258[30 + arg1].unk_000[2] =
+ player->unk_258[30 + arg1].unk_000.z =
player->pos.z + ((-0.8 * (player->unk_258[30 + arg1].unk_01E)) * coss(player->unk_258[30 + arg1].unk_020));
- player->unk_258[30 + arg1].unk_000[0] =
+ player->unk_258[30 + arg1].unk_000.z =
player->pos.x + ((-0.8 * (player->unk_258[30 + arg1].unk_01E)) * sins(player->unk_258[30 + arg1].unk_020));
- player->unk_258[30 + arg1].unk_000[1] = (player->unk_074 + 2.0f);
+ player->unk_258[30 + arg1].unk_000.y = (player->unk_074 + 2.0f);
if (player->unk_258[30 + arg1].unk_01E == 14) {
player->unk_258[30 + arg1].unk_01C = 0;
@@ -4740,7 +4740,7 @@ void func_800647C8(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
void func_800648E4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
++player->unk_258[30 + arg1].unk_01E;
player->unk_258[30 + arg1].unk_00C -= 0.06;
- player->unk_258[30 + arg1].unk_000[1] += 0.1;
+ player->unk_258[30 + arg1].unk_000.y += 0.1;
player->unk_258[30 + arg1].unk_03E -= 12;
if (player->unk_258[30 + arg1].unk_03E <= 0) {
@@ -4756,7 +4756,7 @@ void func_800648E4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
void func_80064988(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
++player->unk_258[30 + arg1].unk_01E;
- player->unk_258[30 + arg1].unk_000[1] -= 0.3;
+ player->unk_258[30 + arg1].unk_000.y -= 0.3;
if (player->unk_258[30 + arg1].unk_01E == 10) {
player->unk_258[30 + arg1].unk_01C = 0;
@@ -4769,11 +4769,11 @@ void func_800649F4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
f32 temp;
temp = player->unk_258[30 + arg1].unk_018;
- player->unk_258[30 + arg1].unk_000[2] =
+ player->unk_258[30 + arg1].unk_000.z =
player->unk_21C + (((-temp) * player->unk_258[30 + arg1].unk_01E) * coss(player->unk_258[30 + arg1].unk_020));
- player->unk_258[30 + arg1].unk_000[0] =
+ player->unk_258[30 + arg1].unk_000.z =
player->unk_218 + (((-temp) * player->unk_258[30 + arg1].unk_01E) * sins(player->unk_258[30 + arg1].unk_020));
- player->unk_258[30 + arg1].unk_000[1] = player->pos.y + player->unk_258[30 + arg1].unk_014;
+ player->unk_258[30 + arg1].unk_000.y = player->pos.y + player->unk_258[30 + arg1].unk_014;
player->unk_258[30 + arg1].unk_00C += 0.04;
++player->unk_258[30 + arg1].unk_01E;
@@ -4795,11 +4795,11 @@ void func_80064B30(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
f32 temp;
temp = player->unk_258[30 + arg1].unk_018 * 1.2;
- player->unk_258[30 + arg1].unk_000[2] =
+ player->unk_258[30 + arg1].unk_000.z =
(player->pos.z + (-temp * player->unk_258[30 + arg1].unk_01E) * (coss(player->unk_258[30 + arg1].unk_020)));
- player->unk_258[30 + arg1].unk_000[0] =
+ player->unk_258[30 + arg1].unk_000.z =
(player->pos.x + (-temp * player->unk_258[30 + arg1].unk_01E) * (sins(player->unk_258[30 + arg1].unk_020)));
- player->unk_258[30 + arg1].unk_000[1] += 0.1;
+ player->unk_258[30 + arg1].unk_000.y += 0.1;
++player->unk_258[30 + arg1].unk_01E;
if (player->unk_258[30 + arg1].unk_01E == 10) {
@@ -4825,11 +4825,11 @@ void func_80064C74(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
player->unk_258[30 + arg1].unk_020 -= 2184;
}
- player->unk_258[30 + arg1].unk_000[2] =
- player->pos.z + (coss(player->unk_258[30 + arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f);
- player->unk_258[30 + arg1].unk_000[0] =
- player->pos.x + (sins(player->unk_258[30 + arg1].unk_020 - player->rotation[1] - player->unk_0C0) * 5.0f);
- player->unk_258[30 + arg1].unk_000[1] = player->pos.y - 1.0f;
+ player->unk_258[30 + arg1].unk_000.z =
+ player->pos.z + (coss(player->unk_258[30 + arg1].unk_020 - player->rotation.y - player->unk_0C0) * 5.0f);
+ player->unk_258[30 + arg1].unk_000.z =
+ player->pos.x + (sins(player->unk_258[30 + arg1].unk_020 - player->rotation.y - player->unk_0C0) * 5.0f);
+ player->unk_258[30 + arg1].unk_000.y = player->pos.y - 1.0f;
player->unk_258[30 + arg1].unk_00C += 0.4;
++player->unk_258[30 + arg1].unk_01E;
@@ -4848,7 +4848,7 @@ void func_80064C74(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) {
void func_80064DEC(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) {
- player->unk_258[20 + arg3].unk_000[1] = player->pos.y;
+ player->unk_258[20 + arg3].unk_000.y = player->pos.y;
++player->unk_258[20 + arg3].unk_01E;
if (player->unk_258[20 + arg3].unk_01E == 9) {
@@ -4900,7 +4900,7 @@ void func_80064F88(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) {
void func_80065030(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) {
++player->unk_258[20 + arg3].unk_01E;
- player->unk_258[20 + arg3].unk_000[1] += 0.8;
+ player->unk_258[20 + arg3].unk_000.y += 0.8;
player->unk_258[20 + arg3].unk_00C += 0.4;
if (player->unk_258[20 + arg3].unk_00C >= (f64) 1.5) {
player->unk_258[20 + arg3].unk_00C = 1.5f;
@@ -4915,9 +4915,9 @@ void func_80065030(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) {
}
void func_800650FC(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) {
- player->unk_258[20 + arg3].unk_000[2] = (f32) player->pos.z;
- player->unk_258[20 + arg3].unk_000[0] = (f32) player->pos.x;
- player->unk_258[20 + arg3].unk_000[1] = (f32) (player->pos.y + 4.0f);
+ player->unk_258[20 + arg3].unk_000.x = (f32) player->pos.x;
+ player->unk_258[20 + arg3].unk_000.y = (f32)(player->pos.y + 4.0f);
+ player->unk_258[20 + arg3].unk_000.z = (f32) player->pos.z;
if ((player->effects & 0x80) == 0x80) {
player->unk_258[20 + arg3].unk_020 += 4732;
} else {
@@ -4980,12 +4980,12 @@ void func_8006538C(Player* player, s8 arg1, s16 arg2, s8 arg3) {
s16 envBlue;
if (player->unk_258[arg2].unk_01C == 1) {
- spB4[0] = player->unk_258[arg2].unk_000[0];
- spB4[1] = player->unk_258[arg2].unk_000[1];
- spB4[2] = player->unk_258[arg2].unk_000[2];
- spAC[0] = 0;
- spAC[1] = player->unk_048[arg3];
- spAC[2] = 0;
+ spB4.x = player->unk_258[arg2].unk_000.x;
+ spB4.y = player->unk_258[arg2].unk_000.y;
+ spB4.z = player->unk_258[arg2].unk_000.z;
+ spAC.x = 0;
+ spAC.y = player->unk_048[arg3];
+ spAC.z = 0;
if ((player->effects & STAR_EFFECT) && (((s32) gCourseTimer - D_8018D930[arg1]) < 9)) {
primRed = (primColors[1] >> 0x10) & 0xFF;
primGreen = (primColors[1] >> 0x08) & 0xFF;
@@ -5035,12 +5035,12 @@ void func_800658A0(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
green = player->unk_258[arg2].unk_03A;
blue = player->unk_258[arg2].unk_03C;
alpha = player->unk_258[arg2].unk_03E;
- sp54[0] = player->unk_258[arg2].unk_000[0];
- sp54[1] = player->unk_258[arg2].unk_000[1];
- sp54[2] = player->unk_258[arg2].unk_000[2];
- sp4C[0] = 0;
- sp4C[1] = player->unk_048[arg3];
- sp4C[2] = 0;
+ sp54.x = player->unk_258[arg2].unk_000.x;
+ sp54.y = player->unk_258[arg2].unk_000.y;
+ sp54.z = player->unk_258[arg2].unk_000.z;
+ sp4C.x = 0;
+ sp4C.y = player->unk_048[arg3];
+ sp4C.z = 0;
func_800652D4(sp54, sp4C, player->unk_258[arg2].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, D_8018D48C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0,
@@ -5197,12 +5197,12 @@ void func_800664E0(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
green = player->unk_258[10 + arg2].unk_03A;
blue = player->unk_258[10 + arg2].unk_03C;
alpha = player->unk_258[10 + arg2].unk_03E;
- sp54[0] = player->unk_258[10 + arg2].unk_000[0];
- sp54[1] = player->unk_258[10 + arg2].unk_000[1];
- sp54[2] = player->unk_258[10 + arg2].unk_000[2];
- sp4C[0] = 0;
- sp4C[1] = player->unk_048[arg3];
- sp4C[2] = 0;
+ sp54.x = player->unk_258[10 + arg2].unk_000.x;
+ sp54.y = player->unk_258[10 + arg2].unk_000.y;
+ sp54.z = player->unk_258[10 + arg2].unk_000.z;
+ sp4C.x = 0;
+ sp4C.y = player->unk_048[arg3];
+ sp4C.z = 0;
func_800652D4(sp54, sp4C, player->unk_258[10 + arg2].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPSetAlphaCompare(gDisplayListHead++, G_AC_DITHER);
@@ -5228,12 +5228,12 @@ void func_80066714(Player* player, UNUSED s32 arg1, s16 arg2, s8 arg3) {
green = player->unk_258[10 + arg2].unk_03A;
blue = player->unk_258[10 + arg2].unk_03C;
alpha = player->unk_258[10 + arg2].unk_03E;
- sp5C[0] = player->unk_258[10 + arg2].unk_000[0];
- sp5C[1] = player->unk_258[10 + arg2].unk_000[1];
- sp5C[2] = player->unk_258[10 + arg2].unk_000[2];
- sp54[0] = 0;
- sp54[1] = player->unk_048[arg3];
- sp54[2] = 0;
+ sp5C.x = player->unk_258[10 + arg2].unk_000.x;
+ sp5C.y = player->unk_258[10 + arg2].unk_000.y;
+ sp5C.z = player->unk_258[10 + arg2].unk_000.z;
+ sp54.x = 0;
+ sp54.y = player->unk_048[arg3];
+ sp54.z = 0;
func_800652D4(sp5C, sp54, player->unk_258[10 + arg2].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008C90);
gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE);
@@ -5261,12 +5261,12 @@ void func_80066998(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
green = player->unk_258[arg2].unk_03A;
blue = player->unk_258[arg2].unk_03C;
alpha = player->unk_258[arg2].unk_03E;
- sp54[0] = player->unk_258[arg2].unk_000[0];
- sp54[1] = player->unk_258[arg2].unk_000[1];
- sp54[2] = player->unk_258[arg2].unk_000[2];
- sp4C[0] = 0x4000;
- sp4C[1] = player->unk_048[arg3];
- sp4C[2] = 0;
+ sp54.x = player->unk_258[arg2].unk_000.x;
+ sp54.y = player->unk_258[arg2].unk_000.y;
+ sp54.z = player->unk_258[arg2].unk_000.z;
+ sp4C.x = 0x4000;
+ sp4C.y = player->unk_048[arg3];
+ sp4C.z = 0;
func_800652D4(sp54, sp4C, player->unk_258[arg2].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, D_8018D48C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0,
@@ -5313,20 +5313,20 @@ void func_80066BAC(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
if ((player->unk_258[arg2].unk_01C == 1) && (player->unk_258[arg2].unk_038 != 0x00FF)) {
- if (player->collision.surfaceDistance[2] >= 300.0f) {
- spDC[1] = player->pos.y + 5.0f;
+ if (player->collision.surfaceDistance.z >= 300.0f) {
+ spDC.y = player->pos.y + 5.0f;
} else {
- spDC[1] = player->pos.y - 3.0f;
+ spDC.y = player->pos.y - 3.0f;
}
- spDC[2] = player->pos.z + (coss(player->unk_048[arg3]) * -10.0f);
- spDC[0] = player->pos.x + (sins(player->unk_048[arg3]) * -10.0f);
- if (player->collision.surfaceDistance[2] >= 300.0f) {
- spD4[0] = cameras[arg3].rot.x - 0x4000;
+ spDC.z = player->pos.z + (coss(player->unk_048[arg3]) * -10.0f);
+ spDC.x = player->pos.x + (sins(player->unk_048[arg3]) * -10.0f);
+ if (player->collision.surfaceDistance.z >= 300.0f) {
+ spD4.x = cameras[arg3].rot.x - 0x4000;
} else {
- spD4[0] = 0;
+ spD4.x = 0;
}
- spD4[1] = player->unk_048[arg3];
- spD4[2] = 0;
+ spD4.y = player->unk_048[arg3];
+ spD4.z = 0;
func_800652D4(spDC, spD4, player->unk_258[arg2].unk_00C * player->size);
if (player->unk_258[arg2].unk_038 == 0) {
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
@@ -5374,13 +5374,13 @@ void func_80067280(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
green = player->unk_258[30 + arg2].unk_03A;
blue = player->unk_258[30 + arg2].unk_03C;
alpha = player->unk_258[30 + arg2].unk_03E;
- sp7C[0] = player->unk_258[30 + arg2].unk_000[0];
- sp7C[1] = player->unk_258[30 + arg2].unk_000[1];
- sp7C[2] = player->unk_258[30 + arg2].unk_000[2];
- sp74[0] = -0x071C;
- sp74[2] = 0;
+ sp7C.x = player->unk_258[30 + arg2].unk_000.x;
+ sp7C.y = player->unk_258[30 + arg2].unk_000.y;
+ sp7C.z = player->unk_258[30 + arg2].unk_000.z;
+ sp74.x = -0x071C;
+ sp74.z = 0;
if (player->unk_258[30 + arg2].unk_010 == 1) {
- sp74[1] = player->unk_048[arg3] - 0x2000;
+ sp74.y = player->unk_048[arg3] - 0x2000;
func_800652D4(sp7C, sp74, player->unk_258[30 + arg2].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, D_8018D48C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0,
@@ -5389,7 +5389,7 @@ void func_80067280(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
func_8004B35C(red, green, blue, alpha);
gSPDisplayList(gDisplayListHead++, D_0D008E70);
} else {
- sp74[1] = player->unk_048[arg3] + 0x2000;
+ sp74.y = player->unk_048[arg3] + 0x2000;
func_800652D4(sp7C, sp74, player->unk_258[30 + arg2].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, D_8018D48C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0,
@@ -5408,12 +5408,12 @@ void func_80067604(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
UNUSED s32 stackPadding[4];
if (player->unk_258[30 + arg2].unk_01C == 1) {
- sp8C[0] = player->unk_258[30 + arg2].unk_000[0];
- sp8C[1] = player->unk_258[30 + arg2].unk_000[1];
- sp8C[2] = player->unk_258[30 + arg2].unk_000[2];
- sp84[0] = 0;
- sp84[1] = player->unk_048[arg3];
- sp84[2] = 0;
+ sp8C.x = player->unk_258[30 + arg2].unk_000.x;
+ sp8C.y = player->unk_258[30 + arg2].unk_000.y;
+ sp8C.z = player->unk_258[30 + arg2].unk_000.z;
+ sp84.x = 0;
+ sp84.y = player->unk_048[arg3];
+ sp84.z = 0;
func_800652D4(sp8C, sp84, player->unk_258[30 + arg2].unk_00C * player->size);
if (player->unk_258[30 + arg2].unk_010 == 1) {
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
@@ -5440,12 +5440,12 @@ void func_80067964(Player* player, UNUSED s8 arg1, f32 arg2, UNUSED s8 arg3, s8
UNUSED s32 stackPadding[2];
if (player->unk_258[20 + arg4].unk_01C == 1) {
- sp9C[0] = player->unk_258[20 + arg4].unk_000[0];
- sp9C[1] = player->unk_258[20 + arg4].unk_000[1];
- sp9C[2] = player->unk_258[20 + arg4].unk_000[2];
- sp94[0] = 0;
- sp94[1] = player->unk_258[20 + arg4].unk_020;
- sp94[2] = 0;
+ sp9C.x = player->unk_258[20 + arg4].unk_000.x;
+ sp9C.y = player->unk_258[20 + arg4].unk_000.y;
+ sp9C.z = player->unk_258[20 + arg4].unk_000.z;
+ sp94.x = 0;
+ sp94.y = player->unk_258[20 + arg4].unk_020;
+ sp94.z = 0;
func_800652D4(sp9C, sp94, player->size * arg2);
gSPDisplayList(gDisplayListHead++, D_0D008C90);
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH);
@@ -5476,12 +5476,12 @@ void func_80067D3C(Player* player, s8 arg1, u8* texture, s8 arg3, f32 arg4, s32
// ????????????????????????????????????????
if (player->unk_258[20 + arg3].unk_01C == 1) {
- sp74[0] = 0;
- sp74[1] = player->unk_048[arg1];
- sp74[2] = 0;
- sp7C[0] = player->pos.x + (sins((0x4000 & 0xFFFFFFFF) - (player->rotation[1] + player->unk_0C0)) * arg4);
- sp7C[1] = player->pos.y + player->boundingBoxSize - sp54[player->characterId] - 2.0f;
- sp7C[2] = player->pos.z + (coss((0x4000 & 0xFFFFFFFF) - (player->rotation[1] + player->unk_0C0)) * arg4);
+ sp74.x = 0;
+ sp74.y = player->unk_048[arg1];
+ sp74.z = 0;
+ sp7C.x = player->pos.x + (sins((0x4000 & 0xFFFFFFFF) - (player->rotation.y + player->unk_0C0)) * arg4);
+ sp7C.y = player->pos.y + player->boundingBoxSize - sp54[player->characterId] - 2.0f;
+ sp7C.z = player->pos.z + (coss((0x4000 & 0xFFFFFFFF) - (player->rotation.y + player->unk_0C0)) * arg4);
func_800652D4(sp7C, sp74, player->unk_258[20 + arg3].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, texture, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
@@ -5504,12 +5504,12 @@ void func_8006801C(Player* player, s8 arg1, u8* texture, s8 arg3, f32 arg4, s32
// ????????????????????????????????????????
if (player->unk_258[20 + arg3].unk_01C == 1) {
- sp74[0] = 0;
- sp74[1] = player->unk_048[arg1];
- sp74[2] = 0;
- sp7C[0] = player->pos.x + (sins((0x4000 & 0xFFFFFFFF) - (player->rotation[1] + player->unk_0C0)) * arg4);
- sp7C[1] = player->pos.y + player->boundingBoxSize - sp54[player->characterId] - 2.0f;
- sp7C[2] = player->pos.z + (coss((0x4000 & 0xFFFFFFFF) - (player->rotation[1] + player->unk_0C0)) * arg4);
+ sp74.x = 0;
+ sp74.y = player->unk_048[arg1];
+ sp74.z = 0;
+ sp7C.x = player->pos.x + (sins((0x4000 & 0xFFFFFFFF) - (player->rotation.y + player->unk_0C0)) * arg4);
+ sp7C.y = player->pos.y + player->boundingBoxSize - sp54[player->characterId] - 2.0f;
+ sp7C.z = player->pos.z + (coss((0x4000 & 0xFFFFFFFF) - (player->rotation.y + player->unk_0C0)) * arg4);
func_800652D4(sp7C, sp74, player->unk_258[20 + arg3].unk_00C * player->size * 0.8);
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, texture, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
@@ -5527,12 +5527,12 @@ void func_80068310(Player* player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8
Vec3s sp94;
if (player->unk_258[20 + arg4].unk_01C == 1) {
- sp9C[1] = player->unk_258[20 + arg4].unk_000[1];
- sp9C[2] = player->pos.z + (coss(player->unk_048[arg3]) * -10.0f);
- sp9C[0] = player->pos.x + (sins(player->unk_048[arg3]) * -10.0f);
- sp94[0] = 0;
- sp94[1] = player->unk_048[arg3];
- sp94[2] = 0;
+ sp9C.x = player->pos.x + (sins(player->unk_048[arg3]) * -10.0f);
+ sp9C.y = player->unk_258[20 + arg4].unk_000.y;
+ sp9C.z = player->pos.z + (coss(player->unk_048[arg3]) * -10.0f);
+ sp94.x = 0;
+ sp94.y = player->unk_048[arg3];
+ sp94.z = 0;
func_800652D4(sp9C, sp94, player->unk_258[20 + arg4].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008C90);
gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTOnomatopoeia);
@@ -5557,12 +5557,12 @@ void func_80068724(Player* player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8
Vec3s sp7C;
if (player->unk_258[20 + arg4].unk_01C == 1) {
- sp84[1] = player->pos.y - 3.0f;
- sp84[2] = player->pos.z + (coss(player->unk_048[arg3]) * -10.0f);
- sp84[0] = player->pos.x + (sins(player->unk_048[arg3]) * -10.0f);
- sp7C[0] = 0;
- sp7C[1] = player->unk_048[arg3];
- sp7C[2] = 0;
+ sp84.x = player->pos.x + (sins(player->unk_048[arg3]) * -10.0f);
+ sp84.y = player->pos.y - 3.0f;
+ sp84.z = player->pos.z + (coss(player->unk_048[arg3]) * -10.0f);
+ sp7C.x = 0;
+ sp7C.y = player->unk_048[arg3];
+ sp7C.z = 0;
func_800652D4(sp84, sp7C, player->unk_258[20 + arg4].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA);
@@ -5585,19 +5585,19 @@ void func_80068AA4(Player* player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8
Vec3f sp64;
Vec3s sp5C;
- sp64[1] = player->pos.y;
- sp64[2] = player->pos.z;
- sp64[0] = player->pos.x;
+ sp64.x = player->pos.x;
+ sp64.y = player->pos.y;
+ sp64.z = player->pos.z;
if ((player->unk_258[20 + arg4].unk_01C == 1) && (player->animFrameSelector[arg3] < 0xD)) {
if (gTickVisuals) {
- sp64[1] = player->pos.y - 3.0f;
- sp64[2] = player->pos.z + ((-2.5 * player->unk_258[20 + arg4].unk_01E) * coss(player->unk_048[arg3]));
- sp64[0] = player->pos.x + ((-2.5 * player->unk_258[20 + arg4].unk_01E) * sins(player->unk_048[arg3]));
+ sp64.x = player->pos.x + ((-2.5 * player->unk_258[20 + arg4].unk_01E) * sins(player->unk_048[arg3]));
+ sp64.y = player->pos.y - 3.0f;
+ sp64.z = player->pos.z + ((-2.5 * player->unk_258[20 + arg4].unk_01E) * coss(player->unk_048[arg3]));
}
- sp5C[0] = 0;
- sp5C[1] = player->unk_048[arg3];
- sp5C[2] = 0;
+ sp5C.x = 0;
+ sp5C.y = player->unk_048[arg3];
+ sp5C.z = 0;
func_800652D4(sp64, sp5C, player->unk_258[20 + arg4].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008D58);
gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE);
@@ -5617,12 +5617,12 @@ void func_80068DA0(Player* player, UNUSED s8 arg1, UNUSED f32 arg2, s8 arg3, s8
Vec3s sp94;
if ((player->unk_258[20 + arg4].unk_01C == 1) && ((s32) player->animFrameSelector[arg3] < 0xD)) {
- sp9C[1] = (player->pos.y - 3.0f) + player->unk_258[20 + arg4].unk_000[1];
- sp9C[2] = player->pos.z + (coss(player->unk_048[arg3]) * -10.0f);
- sp9C[0] = player->pos.x + (sins(player->unk_048[arg3]) * -10.0f);
- sp94[0] = 0;
- sp94[1] = player->unk_048[arg3];
- sp94[2] = 0;
+ sp9C.x = player->pos.x + (sins(player->unk_048[arg3]) * -10.0f);
+ sp9C.y = (player->pos.y - 3.0f) + player->unk_258[20 + arg4].unk_000.y;
+ sp9C.z = player->pos.z + (coss(player->unk_048[arg3]) * -10.0f);
+ sp94.x = 0;
+ sp94.y = player->unk_048[arg3];
+ sp94.z = 0;
func_800652D4(sp9C, sp94, player->unk_258[20 + arg4].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008C90);
gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTOnomatopoeia);
@@ -5648,13 +5648,13 @@ void func_800691B8(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
if (player->unk_258[30 + arg2].unk_01C == 1) {
alpha = player->unk_258[30 + arg2].unk_03E;
- sp5C[0] = player->unk_258[30 + arg2].unk_000[0];
- sp5C[1] = player->unk_258[30 + arg2].unk_000[1];
- sp5C[2] = player->unk_258[30 + arg2].unk_000[2];
- sp54[0] = 0;
- sp54[1] = player->unk_048[arg3];
+ sp5C.x = player->unk_258[30 + arg2].unk_000.x;
+ sp5C.y = player->unk_258[30 + arg2].unk_000.y;
+ sp5C.z = player->unk_258[30 + arg2].unk_000.z;
+ sp54.y = 0;
+ sp54.z = player->unk_048[arg3];
player->unk_258[30 + arg2].unk_03A += 0x1C71;
- sp54[2] = player->unk_258[30 + arg2].unk_03A;
+ sp54.z = player->unk_258[30 + arg2].unk_03A;
func_800652D4(sp5C, sp54, player->size * 0.5);
gSPDisplayList(gDisplayListHead++, D_0D008D58);
gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE);
@@ -5690,12 +5690,12 @@ void func_80069444(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
envBlue = D_800E480C[player->unk_258[30 + arg2].unk_038] & 0xFF;
primAlpha = player->unk_258[30 + arg2].unk_03E;
- sp74[0] = player->unk_258[30 + arg2].unk_000[0];
- sp74[1] = player->unk_258[30 + arg2].unk_000[1];
- sp74[2] = player->unk_258[30 + arg2].unk_000[2];
- sp6C[0] = 0;
- sp6C[1] = player->unk_048[arg3];
- sp6C[2] = 0;
+ sp74.x = player->unk_258[30 + arg2].unk_000.x;
+ sp74.y = player->unk_258[30 + arg2].unk_000.y;
+ sp74.z = player->unk_258[30 + arg2].unk_000.z;
+ sp6C.x = 0;
+ sp6C.y = player->unk_048[arg3];
+ sp6C.z = 0;
func_800652D4(sp74, sp6C, player->size * 1.5);
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, D_8018D494, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0,
@@ -5719,12 +5719,12 @@ void func_800696CC(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3, f32 arg4)
if (player->unk_258[30 + arg2].unk_01C == 1) {
alpha = player->unk_258[30 + arg2].unk_03E;
- sp5C[0] = player->unk_258[30 + arg2].unk_000[0];
- sp5C[1] = player->unk_258[30 + arg2].unk_000[1];
- sp5C[2] = player->unk_258[30 + arg2].unk_000[2];
- sp54[0] = 0;
- sp54[1] = player->unk_048[arg3];
- sp54[2] = 0;
+ sp5C.x = player->unk_258[30 + arg2].unk_000.x;
+ sp5C.y = player->unk_258[30 + arg2].unk_000.y;
+ sp5C.z = player->unk_258[30 + arg2].unk_000.z;
+ sp54.x = 0;
+ sp54.y = player->unk_048[arg3];
+ sp54.z = 0;
// @port: Tag the transform.
FrameInterpolation_RecordOpenChild("func_800696CC", TAG_OBJECT(arg2));
@@ -5753,12 +5753,12 @@ void func_80069938(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
if (player->unk_258[30 + arg2].unk_01C == 1) {
alpha = player->unk_258[30 + arg2].unk_03E;
- sp5C[0] = player->unk_258[30 + arg2].unk_000[0];
- sp5C[1] = player->unk_258[30 + arg2].unk_000[1];
- sp5C[2] = player->unk_258[30 + arg2].unk_000[2];
- sp54[0] = 0;
- sp54[1] = player->unk_048[arg3];
- sp54[2] = player->unk_258[30 + arg2].unk_038;
+ sp5C.x = player->unk_258[30 + arg2].unk_000.x;
+ sp5C.y = player->unk_258[30 + arg2].unk_000.y;
+ sp5C.z = player->unk_258[30 + arg2].unk_000.z;
+ sp54.x = 0;
+ sp54.y = player->unk_048[arg3];
+ sp54.z = player->unk_258[30 + arg2].unk_038;
func_800652D4(sp5C, sp54, player->unk_258[30 + arg2].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008D58);
gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE);
@@ -5786,12 +5786,12 @@ void func_80069BA8(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
green = player->unk_258[30 + arg2].unk_03A;
blue = player->unk_258[30 + arg2].unk_03C;
alpha = player->unk_258[30 + arg2].unk_03E;
- sp54[0] = player->unk_258[30 + arg2].unk_000[0];
- sp54[1] = player->unk_258[30 + arg2].unk_000[1];
- sp54[2] = player->unk_258[30 + arg2].unk_000[2];
- sp4C[0] = 0;
- sp4C[1] = player->unk_048[arg3];
- sp4C[2] = 0;
+ sp54.x = player->unk_258[30 + arg2].unk_000.x;
+ sp54.y = player->unk_258[30 + arg2].unk_000.y;
+ sp54.z = player->unk_258[30 + arg2].unk_000.z;
+ sp4C.x = 0;
+ sp4C.y = player->unk_048[arg3];
+ sp4C.z = 0;
func_800652D4(sp54, sp4C, player->unk_258[30 + arg2].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, D_8018D48C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0,
@@ -5809,12 +5809,12 @@ void func_80069DB8(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
UNUSED s32 stackPadding[2];
if (player->unk_258[30 + arg2].unk_01C == 1) {
- sp5C[0] = player->unk_258[30 + arg2].unk_000[0];
- sp5C[1] = player->unk_258[30 + arg2].unk_000[1];
- sp5C[2] = player->unk_258[30 + arg2].unk_000[2];
- sp54[0] = 0;
- sp54[1] = player->unk_048[arg3];
- sp54[2] = 0;
+ sp5C.x = player->unk_258[30 + arg2].unk_000.x;
+ sp5C.y = player->unk_258[30 + arg2].unk_000.y;
+ sp5C.z = player->unk_258[30 + arg2].unk_000.z;
+ sp54.x = 0;
+ sp54.y = player->unk_048[arg3];
+ sp54.z = 0;
func_800652D4(sp5C, sp54, player->unk_258[30 + arg2].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008D58);
gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE);
@@ -5834,12 +5834,12 @@ void func_8006A01C(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
Vec3s sp4C;
if (player->unk_258[arg2].unk_01C == 1) {
- sp54[0] = player->unk_258[10 + arg2].unk_000[0];
- sp54[1] = player->unk_258[10 + arg2].unk_000[1];
- sp54[2] = player->unk_258[10 + arg2].unk_000[2];
- sp4C[0] = 0;
- sp4C[1] = player->unk_048[arg3];
- sp4C[2] = 0;
+ sp54.x = player->unk_258[10 + arg2].unk_000.x;
+ sp54.y = player->unk_258[10 + arg2].unk_000.y;
+ sp54.z = player->unk_258[10 + arg2].unk_000.z;
+ sp4C.x = 0;
+ sp4C.y = player->unk_048[arg3];
+ sp4C.z = 0;
func_800652D4(sp54, sp4C, player->unk_258[10 + arg2].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008D58);
@@ -5866,12 +5866,12 @@ void func_8006A280(Player* player, UNUSED s8 arg1, s16 arg2, s8 arg3) {
red = player->unk_258[arg2].unk_038;
green = player->unk_258[arg2].unk_03A;
blue = player->unk_258[arg2].unk_03C;
- sp5C[0] = player->unk_258[arg2].unk_000[0];
- sp5C[1] = player->unk_258[arg2].unk_000[1];
- sp5C[2] = player->unk_258[arg2].unk_000[2];
- sp54[0] = 0;
- sp54[1] = player->unk_048[arg3];
- sp54[2] = 0;
+ sp5C.x = player->unk_258[arg2].unk_000.x;
+ sp5C.y = player->unk_258[arg2].unk_000.y;
+ sp5C.z = player->unk_258[arg2].unk_000.z;
+ sp54.x = 0;
+ sp54.y = player->unk_048[arg3];
+ sp54.z = 0;
func_800652D4(sp5C, sp54, player->unk_258[arg2].unk_00C * player->size);
gSPDisplayList(gDisplayListHead++, D_0D008D58);
gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE);
@@ -5900,8 +5900,8 @@ void func_8006A50C(Player* player, f32 arg1, f32 arg2, s8 arg3, s8 arg4, s16 arg
D_8018D7D0[arg3][arg4] = 0;
D_8018D800[arg3][arg4] = 5;
D_8018D830[arg3][arg4] = 1;
- D_8018D620[arg3][arg4] = -player->rotation[1] - player->unk_0C0;
- func_80062B18(&someX, &someY, &someZ, arg1, 4.0f, arg2 + -3.8, -player->rotation[1], 0);
+ D_8018D620[arg3][arg4] = -player->rotation.y - player->unk_0C0;
+ func_80062B18(&someX, &someY, &someZ, arg1, 4.0f, arg2 + -3.8, -player->rotation.y, 0);
D_8018D4D0[arg3][arg4] = player->pos.x + someX;
D_8018D590[arg3][arg4] = player->pos.z + someZ;
D_8018D530[arg3][arg4] = (player->pos.y - player->boundingBoxSize) + someY;
@@ -5944,7 +5944,7 @@ void func_8006A7C0(Player* player, f32 arg1, f32 arg2, s8 arg3, s8 arg4) {
D_8018D6B0[arg3][arg4] = 0.0f;
D_8018D710[arg3][arg4] = 0.0f;
}
- D_8018D620[arg3][arg4] = -player->rotation[1] - player->unk_0C0;
+ D_8018D620[arg3][arg4] = -player->rotation.y - player->unk_0C0;
move_s16_towards(&D_8018D890[arg3][arg4], player->unk_094 * 182.0f, 0.1f);
}
if (D_8018D830[arg3][arg4] == 1) {
@@ -6026,7 +6026,7 @@ void render_battle_balloon(Player* player, s8 arg1, s16 arg2, s8 arg3) {
envRed = (envColors[player->characterId] >> 0x10) & 0xFF;
envGreen = (envColors[player->characterId] >> 0x08) & 0xFF;
envBlue = (envColors[player->characterId] >> 0x00) & 0xFF;
- temp_t1 = (((player->unk_048[arg3] + player->rotation[1] + player->unk_0C0) & 0xFFFF) / 128);
+ temp_t1 = (((player->unk_048[arg3] + player->rotation.y + player->unk_0C0) & 0xFFFF) / 128);
temp_t1 <<= 7;
if (arg3 == arg1) {
var_f20 = 0.3f;
@@ -6046,12 +6046,12 @@ void render_battle_balloon(Player* player, s8 arg1, s16 arg2, s8 arg3) {
var_f20 = 0.3f;
}
}
- sp134[0] = D_8018D4D0[arg1][arg2];
- sp134[1] = D_8018D530[arg1][arg2];
- sp134[2] = D_8018D590[arg1][arg2];
- sp12C[0] = -((D_8018D890[arg1][arg2] * 4) * coss(temp_t1));
- sp12C[1] = player->unk_048[arg3];
- sp12C[2] = D_8018D7D0[arg1][arg2] - (D_8018D860[arg1][arg2] * coss(temp_t1)) -
+ sp134.x = D_8018D4D0[arg1][arg2];
+ sp134.y = D_8018D530[arg1][arg2];
+ sp134.z = D_8018D590[arg1][arg2];
+ sp12C.x = -((D_8018D890[arg1][arg2] * 4) * coss(temp_t1));
+ sp12C.y = player->unk_048[arg3];
+ sp12C.z = D_8018D7D0[arg1][arg2] - (D_8018D860[arg1][arg2] * coss(temp_t1)) -
((D_8018D890[arg1][arg2] * 8) * sins(temp_t1));
mtxf_translate_rotate(mtx, sp134, sp12C);
mtxf_scale2(mtx, var_f20);
@@ -6172,12 +6172,12 @@ void render_balloon(Vec3f arg0, f32 arg1, s16 arg2, s16 arg3) {
envRed = (envColors[arg3] >> 0x10) & 0xFF;
envGreen = (envColors[arg3] >> 0x08) & 0xFF;
envBlue = (envColors[arg3] >> 0x00) & 0xFF;
- spFC[0] = arg0[0];
- spFC[1] = arg0[1];
- spFC[2] = arg0[2];
- spF4[0] = 0;
- spF4[1] = camera1->rot.y;
- spF4[2] = arg2;
+ spFC.x = arg0.x;
+ spFC.y = arg0.y;
+ spFC.z = arg0.z;
+ spF4.x = 0;
+ spF4.y = camera1->rot.y;
+ spF4.z = arg2;
mtxf_translate_rotate(mtx, spFC, spF4);
mtxf_scale2(mtx, arg1);
// convert_to_fixed_point_matrix(&gGfxPool->mtxEffect[gMatrixEffectCount], sp108);
@@ -6217,12 +6217,12 @@ void func_8006C0C8(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha) {
s16 green;
s16 blue;
- sp4C[0] = arg0[0];
- sp4C[1] = arg0[1];
- sp4C[2] = arg0[2];
- sp44[0] = 0;
- sp44[1] = camera1->rot.y;
- sp44[2] = 0;
+ sp4C.x = arg0.x;
+ sp4C.y = arg0.y;
+ sp4C.z = arg0.z;
+ sp44.x = 0;
+ sp44.y = camera1->rot.y;
+ sp44.z = 0;
func_800652D4(sp4C, sp44, arg1);
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, D_8018D48C, G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
@@ -6246,12 +6246,12 @@ void func_8006C294(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha) {
s16 blue = ((rgb >> 0x00) & 0xFF) & 0xFF;
// ???????????????????????????????????????
- sp5C[0] = arg0[0];
- sp5C[1] = arg0[1];
- sp5C[2] = arg0[2];
- sp54[0] = 0;
- sp54[1] = camera1->rot.y;
- sp54[2] = 0;
+ sp5C.x = arg0.x;
+ sp5C.y = arg0.y;
+ sp5C.z = arg0.z;
+ sp54.x = 0;
+ sp54.y = camera1->rot.y;
+ sp54.z = 0;
func_800652D4(sp5C, sp54, arg1);
gSPDisplayList(gDisplayListHead++, D_0D008D58);
gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE);
@@ -6273,12 +6273,12 @@ void func_8006C4D4(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha, s16 arg4) {
s16 blue = ((rgb >> 0x00) & 0xFF) & 0xFF;
// ???????????????????????????????????????
- sp4C[0] = arg0[0];
- sp4C[1] = arg0[1];
- sp4C[2] = arg0[2];
- sp44[0] = 0;
- sp44[1] = camera1->rot.y;
- sp44[2] = 0;
+ sp4C.x = arg0.x;
+ sp4C.y = arg0.y;
+ sp4C.z = arg0.z;
+ sp44.x = 0;
+ sp44.y = camera1->rot.y;
+ sp44.z = 0;
func_800652D4(sp4C, sp44, arg1);
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, common_texture_particle_spark[arg4], G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0,
diff --git a/src/code_80057C60.h b/src/code_80057C60.h
index 515378aa1..0055d6531 100644
--- a/src/code_80057C60.h
+++ b/src/code_80057C60.h
@@ -615,25 +615,25 @@ extern u8* D_8018D4BC;
extern u8* D_8018D4C0;
extern u8* D_8018D4C4;
extern u8* D_8018D4C8;
-extern Vec3f D_8018D4D0[];
-extern Vec3f D_8018D530[];
-extern Vec3f D_8018D590[];
+extern Vec3fa D_8018D4D0[];
+extern Vec3fa D_8018D530[];
+extern Vec3fa D_8018D590[];
extern u16 gPlayerBalloonStatus[8][3];
-extern Vec3s D_8018D620[];
-extern Vec3f D_8018D650[];
-extern Vec3f D_8018D6B0[];
-
-extern Vec3f D_8018D710[];
-extern Vec3s D_8018D770[];
-extern Vec3s D_8018D7A0[];
-extern Vec3s D_8018D7D0[];
-
-extern Vec3s D_8018D800[];
-extern Vec3s D_8018D830[];
-extern Vec3s D_8018D860[];
-extern Vec3s D_8018D890[];
+extern Vec3sa D_8018D620[];
+extern Vec3fa D_8018D650[];
+extern Vec3fa D_8018D6B0[];
+
+extern Vec3fa D_8018D710[];
+extern Vec3sa D_8018D770[];
+extern Vec3sa D_8018D7A0[];
+extern Vec3sa D_8018D7D0[];
+
+extern Vec3sa D_8018D800[];
+extern Vec3sa D_8018D830[];
+extern Vec3sa D_8018D860[];
+extern Vec3sa D_8018D890[];
extern s16 gPlayerBalloonCount[]; // D_8018D8C0
-extern Vec3s D_8018D8D0[];
+extern Vec3sa D_8018D8D0[];
/** @endcond */
diff --git a/src/code_80057C60_var.c b/src/code_80057C60_var.c
index 5007e9f48..eeed28d79 100644
--- a/src/code_80057C60_var.c
+++ b/src/code_80057C60_var.c
@@ -204,21 +204,21 @@ u8* D_8018D4BC;
u8* D_8018D4C0;
u8* D_8018D4C4;
u8* D_8018D4C8;
-Vec3f D_8018D4D0[8];
-Vec3f D_8018D530[8];
-Vec3f D_8018D590[8];
+Vec3fa D_8018D4D0[8];
+Vec3fa D_8018D530[8];
+Vec3fa D_8018D590[8];
u16 gPlayerBalloonStatus[8][3];
Vec3s D_8018D620[8];
-Vec3f D_8018D650[8];
-Vec3f D_8018D6B0[8];
-Vec3f D_8018D710[8];
-Vec3s D_8018D770[8];
-Vec3s D_8018D7A0[8];
-Vec3s D_8018D7D0[8];
+Vec3fa D_8018D650[8];
+Vec3fa D_8018D6B0[8];
+Vec3fa D_8018D710[8];
+Vec3sa D_8018D770[8];
+Vec3sa D_8018D7A0[8];
+Vec3sa D_8018D7D0[8];
-Vec3s D_8018D800[8];
-Vec3s D_8018D830[8];
-Vec3s D_8018D860[8];
-Vec3s D_8018D890[8];
+Vec3sa D_8018D800[8];
+Vec3sa D_8018D830[8];
+Vec3sa D_8018D860[8];
+Vec3sa D_8018D890[8];
s16 gPlayerBalloonCount[8];
-Vec3s D_8018D8D0[8];
+Vec3sa D_8018D8D0[8];
diff --git a/src/effects.c b/src/effects.c
index 99c1e1469..0335c0869 100644
--- a/src/effects.c
+++ b/src/effects.c
@@ -268,7 +268,7 @@ void func_8008C73C(Player* player, s8 arg1) {
player->unk_0B6 |= 0x80;
// clang-format off
- player->unk_0C0 = 0; player->unk_07C = 0; player->unk_078 = 0; player->unk_0AE = player->rotation[1]; player->unk_0B2 = 2;
+ player->unk_0C0 = 0; player->unk_07C = 0; player->unk_078 = 0; player->unk_0AE = player->rotation.y; player->unk_0B2 = 2;
// clang-format on
D_80165190[0][arg1] = 1;
D_80165190[1][arg1] = 1;
@@ -294,7 +294,7 @@ void func_8008C8C4(Player* player, s8 playerId) {
player->effects &= ~0x80;
player->effects &= ~0x40;
player->unk_0A8 = 0;
- player->rotation[1] = player->unk_0AE;
+ player->rotation.y = player->unk_0AE;
player->unk_07C = 0;
player->unk_0C0 = 0;
player->effects &= ~0x800;
@@ -335,7 +335,7 @@ void func_8008C9EC(Player* player, s8 arg1) {
}
}
if ((player->effects & 0x80) == 0x80) {
- player->rotation[1] -= sp30[player->unk_0B2];
+ player->rotation.y -= sp30[player->unk_0B2];
D_8018D920[arg1] -= sp30[player->unk_0B2];
stackPadding1 = (u16) D_8018D920[arg1] / (0x10000 / (0x168 / (sp30[player->unk_0B2] / 182)));
if (stackPadding1 == 0) {
@@ -348,7 +348,7 @@ void func_8008C9EC(Player* player, s8 arg1) {
}
}
} else {
- player->rotation[1] += sp30[player->unk_0B2];
+ player->rotation.y += sp30[player->unk_0B2];
D_8018D920[arg1] -= sp30[player->unk_0B2];
stackPadding2 = (u16) D_8018D920[arg1] / (0x10000 / (0x168 / (sp30[player->unk_0B2] / 182)));
if (stackPadding2 == 0) {
@@ -556,7 +556,7 @@ void remove_boost_effect(Player* player) {
void func_8008D570(Player* player, s8 arg1) {
clean_effect(player, arg1);
- player->unk_0AE = player->rotation[1];
+ player->unk_0AE = player->rotation.y;
player->effects |= 0x80000;
player->effects &= ~0x10;
player->soundEffects &= ~0x1000;
@@ -584,10 +584,10 @@ void func_8008D698(Player* player, s8 arg1) {
s16 temp;
if (player->unk_0B2 == 0) {
- player->rotation[1] = player->unk_0AE;
+ player->rotation.y = player->unk_0AE;
temp = 0;
} else {
- player->rotation[1] -= 1820;
+ player->rotation.y -= 1820;
D_8018D920[arg1] -= 1820;
temp = ((u16) D_8018D920[arg1] / 1820);
}
@@ -606,7 +606,7 @@ void func_8008D760(Player* player) {
player->unk_0A8 = 0;
player->unk_07C = 0;
player->unk_0C0 = 0;
- player->rotation[1] = player->unk_0AE;
+ player->rotation.y = player->unk_0AE;
player->effects &= 0xFFF7FFFF;
player->kartGravity = gKartGravityTable[player->characterId];
player->type &= 0xFF7F;
@@ -615,7 +615,7 @@ void func_8008D760(Player* player) {
void func_8008D7B0(Player* player, s8 arg1) {
clean_effect(player, arg1);
- player->unk_0AE = player->rotation[1];
+ player->unk_0AE = player->rotation.y;
player->effects |= 0x800000;
player->effects &= ~0x10;
player->soundEffects &= ~0x20000;
@@ -638,10 +638,10 @@ void func_8008D8B4(Player* player, s8 arg1) {
s16 temp;
if (player->unk_0B2 == 0) {
- player->rotation[1] = player->unk_0AE;
+ player->rotation.y = player->unk_0AE;
temp = 0;
} else {
- player->rotation[1] -= 1820;
+ player->rotation.y -= 1820;
D_8018D920[arg1] -= 1820;
temp = ((u16) (D_8018D920[arg1]) / 1820);
}
@@ -660,7 +660,7 @@ void func_8008D97C(Player* player) {
player->unk_0A8 = 0;
player->unk_07C = 0;
player->unk_0C0 = 0;
- player->rotation[1] = player->unk_0AE;
+ player->rotation.y = player->unk_0AE;
player->effects &= 0xFF7FFFFF;
player->kartGravity = gKartGravityTable[player->characterId];
}
@@ -837,7 +837,7 @@ void apply_hit_rotating_sound_effect(Player* player, s8 arg1) {
player->unk_0B0 = 0;
player->size = 1.0f;
D_8018D930[arg1] = gCourseTimer;
- player->unk_0AE = player->rotation[1];
+ player->unk_0AE = player->rotation.y;
player->unk_0B2 = 2;
player->unk_0C0 = 0;
player->unk_07C = 0;
@@ -868,7 +868,7 @@ void apply_lightning_effect(Player* player, s8 arg1) {
player->unk_0A8 = 0;
player->unk_07C = 0;
player->unk_0C0 = 0;
- player->rotation[1] = player->unk_0AE;
+ player->rotation.y = player->unk_0AE;
remove_lightning_effect(player, arg1);
D_80165190[0][arg1] = 1;
D_80165190[1][arg1] = 1;
@@ -876,7 +876,7 @@ void apply_lightning_effect(Player* player, s8 arg1) {
D_80165190[3][arg1] = 1;
apply_hit_sound_effect(player, arg1);
} else if ((player->effects & 0x20000) == 0x20000) {
- player->rotation[1] -= 0x5B0;
+ player->rotation.y -= 0x5B0;
D_8018D920[arg1] -= 0x5B0;
test = (u16) D_8018D920[arg1] / 1456;
if (test == 0) {
@@ -886,7 +886,7 @@ void apply_lightning_effect(Player* player, s8 arg1) {
player->effects &= ~0x20000;
player->unk_07C = 0;
player->unk_0C0 = 0;
- player->rotation[1] = player->unk_0AE;
+ player->rotation.y = player->unk_0AE;
D_80165190[0][arg1] = 1;
D_80165190[1][arg1] = 1;
D_80165190[2][arg1] = 1;
@@ -925,7 +925,7 @@ void remove_lightning_effect(Player* player, UNUSED s8 arg1) {
player->effects |= 0x08000000;
if ((player->effects & 0x20000) == 0x20000) {
- player->rotation[1] = player->unk_0AE;
+ player->rotation.y = player->unk_0AE;
}
player->effects &= ~0x20000;
@@ -1238,7 +1238,7 @@ void remove_boost_ramp_wood_effect(Player* player) {
void func_8008F104(Player* player, s8 arg1) {
clean_effect(player, arg1);
- player->unk_0AE = player->rotation[1];
+ player->unk_0AE = player->rotation.y;
player->unk_0B2 = 2;
player->unk_0C0 = 0;
player->unk_07C = 0;
@@ -1258,7 +1258,7 @@ void func_8008F1B8(Player* player, s8 arg1) {
player->unk_08C = (player->unk_210 * 0.05);
if (player->unk_0B2 < 0) {
if ((player->unk_044 & 0x80) == 0x80) {
- player->rotation[1] += 182;
+ player->rotation.y += 182;
D_8018D920[arg1] += 182;
temp = ((u16) D_8018D920[arg1] / 182);
@@ -1269,7 +1269,7 @@ void func_8008F1B8(Player* player, s8 arg1) {
}
} else {
- player->rotation[1] -= 182;
+ player->rotation.y -= 182;
D_8018D920[arg1] -= 182;
temp = ((u16) D_8018D920[arg1] / 182);
if (temp == 180) {
@@ -1280,7 +1280,7 @@ void func_8008F1B8(Player* player, s8 arg1) {
}
} else {
if ((player->unk_0B2 & 1) != 0) {
- player->rotation[1] -= 364;
+ player->rotation.y -= 364;
D_8018D920[arg1] -= 364;
temp = ((u16) D_8018D920[arg1] / 364);
if (temp < 71) {
@@ -1290,7 +1290,7 @@ void func_8008F1B8(Player* player, s8 arg1) {
player->unk_044 &= ~0x40;
return;
}
- player->rotation[1] += 364;
+ player->rotation.y += 364;
D_8018D920[arg1] += 364;
temp = ((u16) D_8018D920[arg1] / 364);
if (temp >= 110) {
@@ -1774,7 +1774,7 @@ void func_80090778(Player* player) {
player->unk_0A8 = 0;
player->unk_07C = 0;
player->unk_0C0 = 0;
- player->rotation[1] = player->unk_0AE;
+ player->rotation.y = player->unk_0AE;
}
remove_lightning_effect(player, playerIndex);
}
@@ -1883,7 +1883,7 @@ void func_80090970(Player* player, s8 playerId, s8 arg2) {
case 2:
func_80090178(player, playerId, sp44, sp38);
// Fakematch found by Verti, who knows what's going on here
- player->rotation[1] = (u16) -get_angle_between_two_vectors(sp44, sp38) & 0xFFFF;
+ player->rotation.y = (u16) -get_angle_between_two_vectors(sp44, sp38) & 0xFFFF;
player->pos.x = sp44[0];
player->pos.y = sp44[1] + 40.0f;
player->pos.z = sp44[2];
@@ -1898,8 +1898,8 @@ void func_80090970(Player* player, s8 playerId, s8 arg2) {
player->pos.x = sp44[0];
player->pos.y = sp44[1] + 40.0f;
player->pos.z = sp44[2];
- player->pos.z = player->pos.z + coss((playerId * 0x1C70) - player->rotation[1]) * -5.0f;
- player->pos.x = player->pos.x + sins((playerId * 0x1C70) - player->rotation[1]) * -5.0f;
+ player->pos.z = player->pos.z + coss((playerId * 0x1C70) - player->rotation.y) * -5.0f;
+ player->pos.x = player->pos.x + sins((playerId * 0x1C70) - player->rotation.y) * -5.0f;
player->unk_0C6 += 8;
if (player->unk_0C6 >= 0xF0) {
player->unk_0C6 = 0x00FF;
@@ -1910,8 +1910,8 @@ void func_80090970(Player* player, s8 playerId, s8 arg2) {
break;
case 4:
if ((player->unk_0C8 == 0x0096) || (player->unk_0C8 == 0x00C8) || (player->unk_0C8 == 0x00FA)) {
- player->pos.z = player->pos.z + coss(-player->rotation[1]) * -10.0f;
- player->pos.x = player->pos.x + sins(-player->rotation[1]) * -10.0f;
+ player->pos.z = player->pos.z + coss(-player->rotation.y) * -10.0f;
+ player->pos.x = player->pos.x + sins(-player->rotation.y) * -10.0f;
}
if (player->unk_0C8 == 0x00FC) {
waypoint = D_80164550[0];
@@ -2002,7 +2002,7 @@ bool prevent_item_use(Player* player) {
void func_800911B4(Player* player, s8 arg1) {
s32 temp_v0;
- player->unk_0AE = player->rotation[1];
+ player->unk_0AE = player->rotation.y;
player->unk_044 |= 0x1800;
player->unk_044 &= ~0x0400;
player->unk_044 |= 0x2000;
@@ -2051,7 +2051,7 @@ void func_80091298(Player* player, s8 arg1) {
if (player->unk_0B2 == 0) {
var_v1 = 0;
} else {
- player->rotation[1] -= 0xE38;
+ player->rotation.y -= 0xE38;
D_8018D920[arg1] -= 0xE38;
var_v1 = (u16) D_8018D920[arg1] / 3640;
}
diff --git a/src/engine/objects/Trophy.cpp b/src/engine/objects/Trophy.cpp
index 82882c8a2..cbee4ddbf 100644
--- a/src/engine/objects/Trophy.cpp
+++ b/src/engine/objects/Trophy.cpp
@@ -153,7 +153,7 @@ void OTrophy::Tick() { // func_80086D80
// Get the player's yaw
Player *player = &gPlayers[0];
- float yaw = (player->rotation[1] + 0x4000) * (M_PI / 32768.0f); // Convert degrees to radians
+ float yaw = (player->rotation.y + 0x4000) * (M_PI / 32768.0f); // Convert degrees to radians
// Calculate forward direction based on yaw (same as before)
float lookAtX = player->pos.x + cos(yaw);
diff --git a/src/player_controller.c b/src/player_controller.c
index 2f3185f91..9b21fed27 100644
--- a/src/player_controller.c
+++ b/src/player_controller.c
@@ -727,7 +727,7 @@ void func_8002934C(Player* player, Camera* camera, s8 screenId, s8 playerId) {
player->unk_048[screenId] = atan2s(player->pos.x - camera->pos.x, player->pos.z - camera->pos.z);
player->animFrameSelector[screenId] =
- (u16) ((((player->unk_048[screenId]) + player->rotation[1] + player->unk_0C0))) / 128;
+ (u16) ((((player->unk_048[screenId]) + player->rotation.y + player->unk_0C0))) / 128;
temp_f2 = (gCharacterSize[player->characterId] * 18.0f) * player->size;
temp_f0 = player->unk_230 - player->unk_23C;
@@ -756,7 +756,7 @@ void func_8002934C(Player* player, Camera* camera, s8 screenId, s8 playerId) {
player->unk_0D4[screenId] = (s16) ((s32) player->unk_D9C);
}
func_80029200(player, screenId);
- temp_a0 = ((player->unk_048[screenId] + player->rotation[1]) + player->unk_0C0);
+ temp_a0 = ((player->unk_048[screenId] + player->rotation.y) + player->unk_0C0);
temp_a0 = (s16) player->unk_0D4[screenId] * sins((u16) temp_a0) + player->unk_0CC[screenId] * coss((u16) temp_a0);
move_s16_towards(&player->unk_050[screenId], temp_a0, 0.5f);
var_a0 = player->animFrameSelector[screenId];
@@ -786,7 +786,7 @@ void func_8002934C(Player* player, Camera* camera, s8 screenId, s8 playerId) {
if (((player->effects & 8) == 8) && ((player->unk_0CA & 2) == 2)) {
player->unk_050[screenId] = 0;
}
- var_a0 = (player->unk_048[screenId] + player->rotation[1] + player->unk_0C0);
+ var_a0 = (player->unk_048[screenId] + player->rotation.y + player->unk_0C0);
if (((player->effects & 0x80) == 0x80) || ((player->effects & 0x40) == 0x40) ||
((player->effects & 0x80000) == 0x80000) || ((player->effects & 0x800000) == 0x800000) ||
((player->effects & 0x20000) == 0x20000) || (player->unk_044 & 0x800)) {
@@ -874,7 +874,7 @@ void func_80029B4C(Player* player, UNUSED f32 arg1, f32 arg2, UNUSED f32 arg3) {
var_f12 = 18.0f * (gCharacterSize[player->characterId] / 2);
}
- calculate_orientation_matrix(sp5C, 0.0f, 1.0f, 0.0f, (player->rotation[1] + player->unk_0C0));
+ calculate_orientation_matrix(sp5C, 0.0f, 1.0f, 0.0f, (player->rotation.y + player->unk_0C0));
sp8C[0] = var_f12 - 3.6;
sp8C[1] = -player->boundingBoxSize;
sp8C[2] = var_f12 - 2.0f;
@@ -978,7 +978,7 @@ void func_8002A194(Player* player, f32 arg1, f32 arg2, f32 arg3) {
UNUSED s32 pad2;
f32 temp_f0;
- temp_v1 = -player->rotation[1] - player->unk_0C0;
+ temp_v1 = -player->rotation.y - player->unk_0C0;
if ((player->effects & LIGHTNING_EFFECT) == LIGHTNING_EFFECT) {
var_f20 = (((gCharacterSize[player->characterId] * 18) / 2) * (player->size * 1.5)) - 1;
} else {
@@ -1282,8 +1282,8 @@ void func_8002AE38(Player* player, s8 arg1, f32 arg2, f32 arg3, f32 arg4, f32 ar
s16 temp_a0;
s32 var_v1;
- sp28 = (sins(-player->rotation[1]) * player->unk_094) + arg2;
- temp_f16 = (coss(-player->rotation[1]) * player->unk_094) + arg3;
+ sp28 = (sins(-player->rotation.y) * player->unk_094) + arg2;
+ temp_f16 = (coss(-player->rotation.y) * player->unk_094) + arg3;
if (((player->effects & 0x800) != 0x800) && ((player->effects & 0x10) != 0x10) && !(player->unk_044 & 0x4000) &&
((((player->unk_094 / 18.0f) * 216.0f) <= 8.0f) ||
(((player->unk_07C >> 0x10) < 5) && ((player->unk_07C >> 0x10) > -5)))) {
@@ -1550,7 +1550,7 @@ void func_8002B9CC(Player* player, s8 arg1, UNUSED s32 arg2) {
}
}
temp = (-(s16) get_angle_between_two_vectors(player->pos, &player->oldPos[0]));
- temp2 = (player->rotation[1] - player->unk_0C0);
+ temp2 = (player->rotation.y - player->unk_0C0);
temp = temp - temp2;
player->unk_234 = temp / 182;
}
@@ -1592,7 +1592,7 @@ void func_8002BB9C(Player* player, f32* arg1, f32* arg2, UNUSED s8 arg3, UNUSED
mtxf_translate_vec3f_mat3(sp4C, sp64);
var_v0 = -(s16) get_angle_between_two_vectors(sp58, sp4C);
- t0 = player->rotation[1];
+ t0 = player->rotation.y;
var_v0 = 0x10000 + (t0 - var_v0);
var_v0 /= 182;
@@ -1611,9 +1611,9 @@ void func_8002BB9C(Player* player, f32* arg1, f32* arg2, UNUSED s8 arg3, UNUSED
}
if ((player->unk_07C >> 0x10) < 0) {
- player->rotation[1] -= sp30[var_v0];
+ player->rotation.y -= sp30[var_v0];
} else {
- player->rotation[1] += sp30[var_v0];
+ player->rotation.y += sp30[var_v0];
}
}
@@ -2001,7 +2001,7 @@ void func_8002D028(Player* player, s8 arg1) {
sp4C[2] = D_80165230[D_80165270[arg1]];
temp = -(s16) get_angle_between_two_vectors(player->pos, sp4C);
- temp2 = player->rotation[1];
+ temp2 = player->rotation.y;
temp = (temp - temp2);
thing0 = 8;
@@ -2020,8 +2020,8 @@ void func_8002D028(Player* player, s8 arg1) {
temp_f18 = sqrtf((sp4C[0] - player->pos.x) * (sp4C[0] - player->pos.x) +
(sp4C[2] - player->pos.z) * (sp4C[2] - player->pos.z));
if (temp_f18 <= 8.0f) {
- adjust_angle(&player->rotation[1], -0x8000, 0x016C);
- if ((player->rotation[1] < (-0x7F41)) || (player->rotation[1] > 0x7F41)) {
+ adjust_angle(&player->rotation.y, -0x8000, 0x016C);
+ if ((player->rotation.y < (-0x7F41)) || (player->rotation.y > 0x7F41)) {
player->type &= ~0x0200;
}
player->unk_08C = 0;
@@ -2117,8 +2117,8 @@ void func_8002D268(Player* player, UNUSED Camera* camera, s8 screenId, s8 player
spB0 = -1 * player->kartGravity;
spAC = 0 * (player->unk_064[2] + sp16C[2]);
}
- temp_f2_2 = ((player->oldPos[2] - player->pos.z) * coss(player->rotation[1] + player->unk_0C0)) +
- (-(player->oldPos[0] - player->pos.x) * sins(player->rotation[1] + player->unk_0C0));
+ temp_f2_2 = ((player->oldPos[2] - player->pos.z) * coss(player->rotation.y + player->unk_0C0)) +
+ (-(player->oldPos[0] - player->pos.x) * sins(player->rotation.y + player->unk_0C0));
if (temp_f2_2 > 0.1) {
player->unk_044 |= 8;
} else {
@@ -2206,10 +2206,10 @@ void func_8002D268(Player* player, UNUSED Camera* camera, s8 screenId, s8 player
player->unk_05C = 1.0f;
if ((player->unk_044 & 1) != 1) {
calculate_orientation_matrix(player->orientationMatrix, player->unk_058, player->unk_05C, player->unk_060,
- player->rotation[1]);
+ player->rotation.y);
} else {
calculate_orientation_matrix(player->orientationMatrix, player->unk_058, player->unk_05C, player->unk_060,
- player->rotation[1] + 0x8000);
+ player->rotation.y + 0x8000);
}
player->effects |= 8;
player->unk_0C2 += 1;
@@ -2426,12 +2426,12 @@ void func_8002E594(Player* player, UNUSED Camera* camera, s8 screenId, s8 player
func_8002C7E4(player, playerId, screenId);
if (sp46 == 1) {
calculate_orientation_matrix(player->orientationMatrix, player->unk_058, player->unk_05C, player->unk_060,
- (s16) ((s32) player->rotation[1]));
+ (s16) ((s32) player->rotation.y));
calculate_orientation_matrix(player->unk_150, player->unk_058, player->unk_05C, player->unk_060,
(s16) ((s32) player->unk_0AE));
} else {
calculate_orientation_matrix(player->orientationMatrix, player->unk_058, player->unk_05C, player->unk_060,
- (s16) ((s32) player->rotation[1]));
+ (s16) ((s32) player->rotation.y));
}
spEC[2] = func_80030150(player, playerId);
if (sp46 == 1) {
@@ -2670,7 +2670,7 @@ void control_kart_ai_movement(Player* player, UNUSED Camera* camera, s8 arg2, s8
player->kartHopAcceleration = 0;
player->kartHopVelocity = 0;
calculate_orientation_matrix(player->orientationMatrix, player->unk_058, player->unk_05C, player->unk_060,
- player->rotation[1]);
+ player->rotation.y);
player->unk_0C2 = 0;
player->effects &= ~2;
player->effects &= ~8;
@@ -2757,7 +2757,7 @@ void func_8002F730(Player* player, UNUSED Camera* camera, UNUSED s8 screenId, s8
player->unk_058 = 0.0f;
player->unk_05C = 1.0f;
player->unk_060 = 0.0f;
- calculate_orientation_matrix(player->orientationMatrix, 0.0f, 1.0f, 0.0f, (s16) (s32) player->rotation[1]);
+ calculate_orientation_matrix(player->orientationMatrix, 0.0f, 1.0f, 0.0f, (s16) (s32) player->rotation.y);
player->effects &= ~8;
sp78 = player->collision.surfaceDistance[2];
if (sp78 <= 0.0f) {
@@ -4454,7 +4454,7 @@ void func_80037BB4(Player* player, Vec3f arg1) {
} else {
if (player->unk_078 < 0) {
if (((player->effects & 0x20000000) != 0x20000000) || (player->unk_228 >= 0x64)) {
- player->rotation[1] += player->unk_078;
+ player->rotation.y += player->unk_078;
}
if (!(player->type & PLAYER_KART_AI)) {
if (gModeSelection == BATTLE) {
@@ -4467,7 +4467,7 @@ void func_80037BB4(Player* player, Vec3f arg1) {
}
} else {
if (((player->effects & 0x20000000) != 0x20000000) || (player->unk_228 >= 0x64)) {
- player->rotation[1] += player->unk_078;
+ player->rotation.y += player->unk_078;
}
if (!(player->type & PLAYER_KART_AI)) {
if (gModeSelection == BATTLE) {
@@ -4817,7 +4817,7 @@ void func_80038C6C(Player* player, UNUSED Camera* camera, s8 arg2, s8 playerId)
player->topSpeed = 250.0f;
func_8002B830(player, playerId, arg2);
apply_effect(player, playerId, arg2);
- player->rotation[1] += player->unk_078;
+ player->rotation.y += player->unk_078;
spF0[0] = 0;
spF0[1] = 0;
spF0[2] = 0;
@@ -4864,7 +4864,7 @@ void func_80038C6C(Player* player, UNUSED Camera* camera, s8 arg2, s8 playerId)
player->unk_058 = 0;
player->unk_060 = 0;
player->unk_05C = 1.0f;
- calculate_orientation_matrix(player->orientationMatrix, 0, 1.0f, 0, player->rotation[1]);
+ calculate_orientation_matrix(player->orientationMatrix, 0, 1.0f, 0, player->rotation.y);
player->effects |= 8;
player->unk_0C2 += 1;
sp98 = player->collision.surfaceDistance[2];
diff --git a/src/racing/actors_extended.c b/src/racing/actors_extended.c
index b07f29cdf..5253153b5 100644
--- a/src/racing/actors_extended.c
+++ b/src/racing/actors_extended.c
@@ -194,7 +194,7 @@ void func_802B0788(s16 rawStickY, struct BananaBunchParent* banana_bunch, Player
var_f12 = (player->unk_094 * 0.75f) + 4.5f + var_f0;
}
vec3f_set(velocity, 0.0f, var_f0, var_f12);
- func_802B64C4(velocity, player->rotation[1] + player->unk_0C0);
+ func_802B64C4(velocity, player->rotation.y + player->unk_0C0);
banana->velocity.x = velocity.x;
banana->velocity.y = velocity.y;
banana->velocity.z = velocity.z;
@@ -432,7 +432,7 @@ void update_actor_triple_shell(TripleShellParent* parent, s16 shellType) {
someVelocity[0] = 0;
someVelocity[1] = 0;
someVelocity[2] = 8;
- func_802B64C4(someVelocity, player->rotation[1] + player->unk_0C0);
+ func_802B64C4(someVelocity, player->rotation.y + player->unk_0C0);
shell->velocity.x = someVelocity[0];
shell->velocity.y = someVelocity[1];
shell->velocity.z = someVelocity[2];
@@ -458,7 +458,7 @@ void update_actor_triple_shell(TripleShellParent* parent, s16 shellType) {
someVelocity[0] = 0;
someVelocity[1] = 0;
someVelocity[2] = 8;
- func_802B64C4(someVelocity, player->rotation[1] + player->unk_0C0);
+ func_802B64C4(someVelocity, player->rotation.y + player->unk_0C0);
shell->velocity.x = someVelocity[0];
shell->velocity.y = someVelocity[1];
shell->velocity.z = someVelocity[2];
@@ -484,7 +484,7 @@ void update_actor_triple_shell(TripleShellParent* parent, s16 shellType) {
someVelocity[0] = 0;
someVelocity[1] = 0;
someVelocity[2] = 8;
- func_802B64C4(someVelocity, player->rotation[1] + player->unk_0C0);
+ func_802B64C4(someVelocity, player->rotation.y + player->unk_0C0);
shell->velocity.x = someVelocity[0];
shell->velocity.y = someVelocity[1];
shell->velocity.z = someVelocity[2];
@@ -673,7 +673,7 @@ s32 use_red_shell_item(Player* player) {
func_802B4E30((struct Actor*) shell);
shell->state = HELD_SHELL;
shell->rotVelocity = 0;
- shell->rotAngle = player->rotation[1] - 0x8000;
+ shell->rotAngle = player->rotation.y - 0x8000;
shell->playerId = player - gPlayerOne;
return actorIndex;
}
diff --git a/src/render_objects.c b/src/render_objects.c
index bf9f3d355..cfb146275 100644
--- a/src/render_objects.c
+++ b/src/render_objects.c
@@ -2791,21 +2791,21 @@ void func_8004F168(s32 arg0, s32 playerId, s32 characterId) {
if (characterId != 8) {
if ((gGPCurrentRaceRankByPlayerId[playerId] == 0) && (gModeSelection != 3) && (gModeSelection != 1)) {
#if EXPLICIT_AND == 1
- func_80046424(temp_a0, temp_a1, (player->rotation[1] + 0x8000) & 0xFFFF, 1.0f,
+ func_80046424(temp_a0, temp_a1, (player->rotation.y + 0x8000) & 0xFFFF, 1.0f,
(u8*) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon,
8, 8, 8, 8);
#else
- func_80046424(temp_a0, temp_a1, player->rotation[1] + 0x8000, 1.0f,
+ func_80046424(temp_a0, temp_a1, player->rotation.y + 0x8000, 1.0f,
(u8*) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon,
8, 8, 8, 8);
#endif
} else {
#if EXPLICIT_AND == 1
- func_800463B0(temp_a0, temp_a1, (player->rotation[1] + 0x8000) & 0xFFFF, 1.0f,
+ func_800463B0(temp_a0, temp_a1, (player->rotation.y + 0x8000) & 0xFFFF, 1.0f,
(u8*) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon,
8, 8, 8, 8);
#else
- func_800463B0(temp_a0, temp_a1, player->rotation[1] + 0x8000, 1.0f,
+ func_800463B0(temp_a0, temp_a1, player->rotation.y + 0x8000, 1.0f,
(u8*) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon,
8, 8, 8, 8);
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-02 22:23:24 +0000