mirror
/
SpaghettiKart
mirror of https://github.com/HarbourMasters/SpaghettiKart
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some const placement and one rename (#529) 

* some const placement and one rename
This commit is contained in:
coco875 2024-01-06 15:46:59 +01:00 committed by GitHub
parent 4429c49062
commit 03843d77fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 632 additions and 632 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common_structs.h
View File

@ -118,7 +118,7 @@ typedef struct {
/* 0x0C */ Vec3f unk3C;
/* 0x18 */ Vec3f unk48;
/* 0x24 */ Vec3f unk54;
/* 0x30 */ Vec3f unk60;
/* 0x30 */ Vec3f orientationVector;
/* 0x3C */ f32 unk6C;
} Collision;

6
src/actors/falling_rocks.inc.c
View File

@ -63,9 +63,9 @@ void update_actor_falling_rocks(struct FallingRock *rock) {
func_802ADDC8(&rock->unk30, 10.0f, rock->pos[0], rock->pos[1], rock->pos[2]);
pad0 = rock->unk30.unk3C[2];
if (pad0 < 0.0f) {
unkVec[0] = -rock->unk30.unk60[0];
unkVec[1] = -rock->unk30.unk60[1];
unkVec[2] = -rock->unk30.unk60[2];
unkVec[0] = -rock->unk30.orientationVector[0];
unkVec[1] = -rock->unk30.orientationVector[1];
unkVec[2] = -rock->unk30.orientationVector[2];
rock->pos[0] += unkVec[0] * rock->unk30.unk3C[2];
rock->pos[1] += unkVec[1] * rock->unk30.unk3C[2];
rock->pos[2] += unkVec[2] * rock->unk30.unk3C[2];

6
src/camera.c
View File

@ -642,9 +642,9 @@ void func_8001E0C4(Camera *camera, Player *player, s8 arg2) {
camera->someBitFlags &= ~0x0004;
temp_t7 = func_802ADDC8(&camera->unk_54, test, sp74, sp70, sp6C);
if (camera->unk_54.unk3C[2] < 0.0f) {
sp74 += -camera->unk_54.unk60[0] * camera->unk_54.unk3C[2] * 1;
sp70 += -camera->unk_54.unk60[1] * camera->unk_54.unk3C[2] * 0.5;
sp6C += -camera->unk_54.unk60[2] * camera->unk_54.unk3C[2] * 1;
sp74 += -camera->unk_54.orientationVector[0] * camera->unk_54.unk3C[2] * 1;
sp70 += -camera->unk_54.orientationVector[1] * camera->unk_54.unk3C[2] * 0.5;
sp6C += -camera->unk_54.orientationVector[2] * camera->unk_54.unk3C[2] * 1;
}
if (camera->unk_54.unk3C[0] < 0.0f) {
camera->someBitFlags = camera->someBitFlags | 4 | 2;

4
src/code_80005FD0.c
View File

@ -8188,14 +8188,14 @@ void func_8001C14C(void) {
}
}
void func_8001C3C4(s32 arg0) {
void func_8001C3C4(s32 cameraId) {
if (gCurrentCourseId == COURSE_AWARD_CEREMONY) {
if (gBombKarts[0].waypointIndex >= 16) {
func_80057114(3);
}
} else {
if (gModeSelection == VERSUS) {
func_80057114(arg0);
func_80057114(cameraId);
}
}
}

20
src/code_8003DC40.c
View File

@ -63,7 +63,7 @@ void func_8003E048(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
*arg6 += arg1[1] * player->unk_110.unk3C[2] * 0.1;
*arg7 += arg1[2] * player->unk_110.unk3C[2] * 1;
func_8002A5F4(arg1, *arg4, arg2, 1, 2);
if (player->unk_110.unk60[1] <= 0.8829f) {
if (player->unk_110.orientationVector[1] <= 0.8829f) {
arg3[0] = ((player->unk_206 / 182) * 0xB4);
arg3[2] = (-(player->slopeAccel / 182) * 0xB4);
func_80031F48(player, 4.0f);
@ -89,7 +89,7 @@ void func_8003E37C(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
*arg6 += arg1[1] * player->unk_110.unk3C[2] * 0.2;
*arg7 += arg1[2] * player->unk_110.unk3C[2] * 1;
func_8002A5F4(arg1, *arg4, arg2, 0.5f, 2);
if ((player->unk_110.unk60[1] <= 0.7318f) || (player->unk_0F8 == 0x000C)) {
if ((player->unk_110.orientationVector[1] <= 0.7318f) || (player->unk_0F8 == 0x000C)) {
arg3[0] = ((player->unk_206 / 182) * 0xB4);
arg3[2] = (-(player->slopeAccel / 182) * 0xB4);
if (((player->unk_094 / 18.0f) * 216.0f) >= 8.0f) {
@ -117,7 +117,7 @@ void func_8003E6EC(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
*arg6 += arg1[1] * player->unk_110.unk3C[2] * 0.1;
*arg7 += arg1[2] * player->unk_110.unk3C[2] * 1;
func_8002A5F4(arg1, *arg4, arg2, 0.5f, 2);
if (player->unk_110.unk60[1] <= 0.8829f) {
if (player->unk_110.orientationVector[1] <= 0.8829f) {
arg3[0] = ((player->unk_206 / 182) * 0xB4);
arg3[2] = (-(player->slopeAccel / 182) * 0xB4);
func_80031F48(player, 4.0f);
@ -138,7 +138,7 @@ void func_8003E9EC(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
*arg6 += arg1[1] * player->unk_110.unk3C[2] * 0.1;
*arg7 += arg1[2] * player->unk_110.unk3C[2] * 1;
func_8002A5F4(arg1, *arg4, arg2, 1.2f, 2);
if (player->unk_110.unk60[1] <= 0.8357f) {
if (player->unk_110.orientationVector[1] <= 0.8357f) {
arg3[0] = ((player->unk_206 / 182) * 0x78);
arg3[2] = (-(player->slopeAccel / 182) * 0xB4);
func_80031F48(player, 4.0f);
@ -169,7 +169,7 @@ void func_8003EE2C(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
*arg6 += arg1[1] * player->unk_110.unk3C[2] * 0.1;
*arg7 += arg1[2] * player->unk_110.unk3C[2] * 1;
func_8002A5F4(arg1, *arg4, arg2, 0.5f, 2);
if (player->unk_110.unk60[1] <= 0.8357f) {
if (player->unk_110.orientationVector[1] <= 0.8357f) {
arg3[0] = ((player->unk_206 / 182) * 0x78);
arg3[2] = (-(player->slopeAccel / 182) * 0xB4);
func_80031F48(player, 4.0f);
@ -193,7 +193,7 @@ void func_8003F138(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
if (player->unk_0F8 == 8) {
player->unk_044 &= ~1;
}
if (player->unk_110.unk60[1] <= 0.8357f) {
if (player->unk_110.orientationVector[1] <= 0.8357f) {
arg3[0] = ((player->unk_206 / 182) * 0xC8);
arg3[2] = (-(player->slopeAccel / 182) * 0xC8);
func_80031F48(player, 4.0f);
@ -213,10 +213,10 @@ void func_8003F138(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
}
void func_8003F46C(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4, f32 *arg5, f32 *arg6, f32 *arg7) {
arg1[0] = -player->unk_110.unk60[0];
arg1[1] = -player->unk_110.unk60[1];
arg1[2] = -player->unk_110.unk60[2];
if ((player->unk_110.unk60[1] < 0.0f) && ((player->unk_0CA & 2) == 0)) {
arg1[0] = -player->unk_110.orientationVector[0];
arg1[1] = -player->unk_110.orientationVector[1];
arg1[2] = -player->unk_110.orientationVector[2];
if ((player->unk_110.orientationVector[1] < 0.0f) && ((player->unk_0CA & 2) == 0)) {
*arg5 += arg1[0] * player->unk_110.unk3C[2] * 1;
*arg6 += arg1[1] * player->unk_110.unk3C[2] * 1;
*arg7 += arg1[2] * player->unk_110.unk3C[2] * 1;

975
src/code_80057C60.c
View File

File diff suppressed because it is too large Load Diff

6
src/code_80057C60.h
View File

@ -15,7 +15,9 @@ typedef struct {
char unk_18[0x8];
} struct_D_8018CE10; // size = 0x20
void func_8005C674(s8 arg0, s16 *arg1, s16 *arg2, s16 *arg3);
/** @cond */
void func_8005C674(s8, s16 *, s16 *, s16 *);
void func_80057C60(void);
void func_80057CE4(void);
void func_80057DD0(void);
@ -649,4 +651,6 @@ extern Vec3s D_8018D890[];
extern s16 gPlayerBalloonCount[]; // D_8018D8C0
extern Vec3s D_8018D8D0[];
/** @endcond */
#endif

64
src/code_8006E9C0.c
View File

@ -46,19 +46,19 @@ void init_object_list(void) {
}
void reset_object_variable(void) {
s32 thing;
s32 thing2;
s32 i;
s32 j;
func_8006EB10();
clear_object_list();
bzero(playerHUD, HUD_PLAYERS_SIZE * sizeof(hud_player));
for (thing = 0; thing < HUD_PLAYERS_SIZE; thing++) {
playerHUD[thing].lapCount = 0;
playerHUD[thing].alsoLapCount = 0;
playerHUD[thing].unk_81 = 0;
for (i = 0; i < HUD_PLAYERS_SIZE; i++) {
playerHUD[i].lapCount = 0;
playerHUD[i].alsoLapCount = 0;
playerHUD[i].unk_81 = 0;
}
for (thing2 = 0; thing2 < HUD_PLAYERS_SIZE; thing2++) {
playerHUD[thing2].raceCompleteBool = 0;
for (j = 0; j < HUD_PLAYERS_SIZE; j++) {
playerHUD[j].raceCompleteBool = 0;
}
}
@ -1114,28 +1114,28 @@ void init_hud_one_player(void) {
func_8007055C();
func_8007055C();
init_course_object();
playerHUD[0].speedometerX = 0x0156;
playerHUD[0].speedometerY = 0x0106;
D_8018CFEC = playerHUD[0].speedometerX + 0x18;
D_8018CFF4 = playerHUD[0].speedometerY + 6;
playerHUD[PLAYER_ONE].speedometerX = 0x0156;
playerHUD[PLAYER_ONE].speedometerY = 0x0106;
D_8018CFEC = playerHUD[PLAYER_ONE].speedometerX + 0x18;
D_8018CFF4 = playerHUD[PLAYER_ONE].speedometerY + 6;
D_8016579E = 0xDD00;
playerHUD[0].rankX = 0x0034;
playerHUD[0].rankY = 0x00C8;
playerHUD[0].slideRankX = 0;
playerHUD[0].slideRankY = 0;
playerHUD[0].stagingPosition = gGPCurrentRaceRankByPlayerId[0];
playerHUD[0].timerX = 0x012C;
playerHUD[0].lapCompletionTimeXs[0] = 0x012C;
playerHUD[0].lapCompletionTimeXs[1] = 0x012C;
playerHUD[0].timerY = 0x0011;
playerHUD[0].lapX = -0x0028;
playerHUD[0].lapAfterImage1X = -0x0028;
playerHUD[0].lapAfterImage2X = -0x0028;
playerHUD[0].lapY = 0x0019;
playerHUD[0].itemBoxX = 0x00A0;
playerHUD[0].itemBoxY = -0x0020;
playerHUD[0].slideItemBoxX = 0;
playerHUD[0].slideItemBoxY = 0;
playerHUD[PLAYER_ONE].rankX = 0x0034;
playerHUD[PLAYER_ONE].rankY = 0x00C8;
playerHUD[PLAYER_ONE].slideRankX = 0;
playerHUD[PLAYER_ONE].slideRankY = 0;
playerHUD[PLAYER_ONE].stagingPosition = gGPCurrentRaceRankByPlayerId[0];
playerHUD[PLAYER_ONE].timerX = 0x012C;
playerHUD[PLAYER_ONE].lapCompletionTimeXs[0] = 0x012C;
playerHUD[PLAYER_ONE].lapCompletionTimeXs[1] = 0x012C;
playerHUD[PLAYER_ONE].timerY = 0x0011;
playerHUD[PLAYER_ONE].lapX = -0x0028;
playerHUD[PLAYER_ONE].lapAfterImage1X = -0x0028;
playerHUD[PLAYER_ONE].lapAfterImage2X = -0x0028;
playerHUD[PLAYER_ONE].lapY = 0x0019;
playerHUD[PLAYER_ONE].itemBoxX = 0x00A0;
playerHUD[PLAYER_ONE].itemBoxY = -0x0020;
playerHUD[PLAYER_ONE].slideItemBoxX = 0;
playerHUD[PLAYER_ONE].slideItemBoxY = 0;
// permuter magic
why = 0x000000A0;
init_item_window(gItemWindowObjectByPlayerId[0]);
@ -1155,9 +1155,9 @@ void init_hud_one_player(void) {
D_8018D3EC = 0x000000FF;
D_8018D3F0 = 0x000000FF;
D_8018D3F4 = one;
playerHUD[0].unk_4C = 0x0078;
playerHUD[0].unk_4A = 0x00A0;
playerHUD[0].rankScaling = 0.5f;
playerHUD[PLAYER_ONE].unk_4C = 0x0078;
playerHUD[PLAYER_ONE].unk_4A = 0x00A0;
playerHUD[PLAYER_ONE].rankScaling = 0.5f;
D_801656B0 = 0;
D_80165708 = 0x0028;
D_8018D00C = 5.0f;

20
src/code_80086E70.c
View File

@ -531,8 +531,8 @@ s32 func_80088538(s32 objectIndex) {
set_object_flag_unk_054_true(objectIndex, 0x00800000);
}
gObjectList[objectIndex].unk_044 = func_802ABE30(gObjectList[objectIndex].pos[0], 0.0f, gObjectList[objectIndex].pos[2], D_8018C3B0.unk3A);
gObjectList[objectIndex].unk_0B8[0] = atan2s(D_8018C3B0.unk60[2], D_8018C3B0.unk60[1]) + 0x4000;
gObjectList[objectIndex].unk_0B8[2] = atan2s(D_8018C3B0.unk60[0], D_8018C3B0.unk60[1]);
gObjectList[objectIndex].unk_0B8[0] = atan2s(D_8018C3B0.orientationVector[2], D_8018C3B0.orientationVector[1]) + 0x4000;
gObjectList[objectIndex].unk_0B8[2] = atan2s(D_8018C3B0.orientationVector[0], D_8018C3B0.orientationVector[1]);
}
return sp2C;
}
@ -549,9 +549,9 @@ s32 func_8008861C(s32 objectIndex) {
set_object_flag_unk_054_true(objectIndex, 0x00800000);
}
gObjectList[objectIndex].unk_044 = func_802ABE30(gObjectList[objectIndex].pos[0], 0.0f, gObjectList[objectIndex].pos[2], D_8018C3B0.unk3A);
gObjectList[objectIndex].unk_01C[0] = D_8018C3B0.unk60[0];
gObjectList[objectIndex].unk_01C[1] = D_8018C3B0.unk60[1];
gObjectList[objectIndex].unk_01C[2] = D_8018C3B0.unk60[2];
gObjectList[objectIndex].unk_01C[0] = D_8018C3B0.orientationVector[0];
gObjectList[objectIndex].unk_01C[1] = D_8018C3B0.orientationVector[1];
gObjectList[objectIndex].unk_01C[2] = D_8018C3B0.orientationVector[2];
}
return sp2C;
}
@ -561,8 +561,8 @@ void func_800886F4(s32 objectIndex) {
if (D_8018C3B0.unk34 == 1) {
set_object_flag_unk_054_true(objectIndex, 0x00800000);
gObjectList[objectIndex].unk_044 = func_802ABE30(gObjectList[objectIndex].pos[0], 0.0f, gObjectList[objectIndex].pos[2], D_8018C3B0.unk3A);
gObjectList[objectIndex].unk_0B8[0] = atan2s(D_8018C3B0.unk60[2], D_8018C3B0.unk60[1]) + 0x4000;
gObjectList[objectIndex].unk_0B8[2] = atan2s(D_8018C3B0.unk60[0], D_8018C3B0.unk60[1]);
gObjectList[objectIndex].unk_0B8[0] = atan2s(D_8018C3B0.orientationVector[2], D_8018C3B0.orientationVector[1]) + 0x4000;
gObjectList[objectIndex].unk_0B8[2] = atan2s(D_8018C3B0.orientationVector[0], D_8018C3B0.orientationVector[1]);
return;
}
set_object_flag_unk_054_false(objectIndex, 0x00800000);
@ -573,9 +573,9 @@ void func_800887C0(s32 objectIndex) {
if (D_8018C3B0.unk34 == 1) {
set_object_flag_unk_054_true(objectIndex, 0x00800000);
gObjectList[objectIndex].unk_044 = func_802ABE30(gObjectList[objectIndex].pos[0], 0.0f, gObjectList[objectIndex].pos[2], D_8018C3B0.unk3A);
gObjectList[objectIndex].unk_038[0] = D_8018C3B0.unk60[0];
gObjectList[objectIndex].unk_038[1] = D_8018C3B0.unk60[1];
gObjectList[objectIndex].unk_038[2] = D_8018C3B0.unk60[2];
gObjectList[objectIndex].unk_038[0] = D_8018C3B0.orientationVector[0];
gObjectList[objectIndex].unk_038[1] = D_8018C3B0.orientationVector[1];
gObjectList[objectIndex].unk_038[2] = D_8018C3B0.orientationVector[2];
return;
}
set_object_flag_unk_054_false(objectIndex, 0x00800000);

4
src/code_80091750.c
View File

@ -9085,10 +9085,10 @@ void func_800A4550(s32 lapNumber, s32 column, s32 row) {
struct_8018D9E0_entry *temp_v0_2;
if (lapNumber < 3) {
sp40 = playerHUD[0].lapDurations[lapNumber];
sp40 = playerHUD[PLAYER_ONE].lapDurations[lapNumber];
set_text_color(2);
} else {
sp40 = playerHUD[0].someTimer;
sp40 = playerHUD[PLAYER_ONE].someTimer;
set_text_color(1);
}
func_800936B8(column + 0x21, row, D_800E7734[lapNumber], 0, 0.7f, 0.7f);

2
src/ending/camera_junk.c
View File

@ -37,7 +37,7 @@ void func_802816B8(void) {
cameras[0].up[1] = 1.0f;
cameras[0].up[2] = 0.0f;
gCameraZoom[0] = 40.0f;
D_80150148 = 1.33333333f;
gScreenAspect = 1.33333333f;
D_80150150 = 3.0f;
D_8015014C = 6800.0f;
init_cinematic_camera();

2
src/ending/code_80280000.c
View File

@ -52,7 +52,7 @@ void func_80280038(void) {
func_80057FC4(0);
gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], D_80150148, D_80150150, D_8015014C, 1.0f);
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], gScreenAspect, D_80150150, D_8015014C, 1.0f);
gSPPerspNormalize(gDisplayListHead++, perspNorm);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPersp[0]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
guLookAt(&gGfxPool->mtxLookAt[0], camera->pos[0], camera->pos[1], camera->pos[2], camera->lookAt[0], camera->lookAt[1], camera->lookAt[2], camera->up[0], camera->up[1], camera->up[2]);

2
src/ending/code_80281C40.c
View File

@ -68,7 +68,7 @@ void func_80281D00(void) {
}
func_8028150C();
gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
guPerspective((Mtx*) &gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], D_80150148, D_80150150, D_8015014C, 1.0f);
guPerspective((Mtx*) &gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], gScreenAspect, D_80150150, D_8015014C, 1.0f);
gSPPerspNormalize(gDisplayListHead++, perspNorm);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPersp[0]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
guLookAt((Mtx*) &gGfxPool->mtxLookAt[0], camera->pos[0], camera->pos[1], camera->pos[2], camera->lookAt[0], camera->lookAt[1], camera->lookAt[2], camera->up[0], camera->up[1], camera->up[2]);

10
src/hud_renderer.c
View File

@ -1195,7 +1195,7 @@ void func_8004A630(Collision *arg0, Vec3f arg1, f32 arg2) {
D_80183E50[0] = arg1[0];
D_80183E50[1] = func_802ABE30(arg1[0], 0.0f, arg1[2], arg0->unk3A) + 0.8;
D_80183E50[2] = arg1[2];
rsp_set_matrix_transl_rot_scale(D_80183E50, arg0->unk60, arg2);
rsp_set_matrix_transl_rot_scale(D_80183E50, arg0->orientationVector, arg2);
gSPDisplayList(gDisplayListHead++, D_0D007B98);
}
}
@ -4239,7 +4239,7 @@ void func_800568A0(s32 objectIndex, s32 playerId) {
D_80183E50[0] = gObjectList[objectIndex].pos[0];
D_80183E50[1] = gObjectList[objectIndex].unk_044 + 0.8;
D_80183E50[2] = gObjectList[objectIndex].pos[2];
set_transform_matrix(sp30, player->unk_110.unk60, D_80183E50, 0U, 0.5f);
set_transform_matrix(sp30, player->unk_110.orientationVector, D_80183E50, 0U, 0.5f);
convert_to_fixed_point_matrix(&gGfxPool->mtxHud[gMatrixHudCount], sp30);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxHud[gMatrixHudCount++]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gDisplayListHead++, D_0D007B98);
@ -4338,15 +4338,15 @@ void func_80056E24(s32 bombIndex, Vec3f arg1) {
}
void func_80056FCC(s32 bombIndex) {
Mat4 sp30;
Mat4 mat;
BombKart *temp_v0;
temp_v0 = &gBombKarts[bombIndex];
D_80183E50[0] = temp_v0->bombPos[0];
D_80183E50[1] = temp_v0->yPos + 1.0;
D_80183E50[2] = temp_v0->bombPos[2];
set_transform_matrix(sp30, D_80164038[bombIndex].unk60, D_80183E50, 0U, 0.5f);
convert_to_fixed_point_matrix(&gGfxPool->mtxHud[gMatrixHudCount], sp30);
set_transform_matrix(mat, D_80164038[bombIndex].orientationVector, D_80183E50, 0U, 0.5f);
convert_to_fixed_point_matrix(&gGfxPool->mtxHud[gMatrixHudCount], mat);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxHud[gMatrixHudCount++]), G_MTX_LOAD | G_MTX_NOPUSH| G_MTX_MODELVIEW);
gSPDisplayList(gDisplayListHead++, D_0D007B98);
}

1
src/hud_renderer.h
View File

@ -445,7 +445,6 @@ extern f32 D_8018CFF4;
extern s16 D_8018D2E0;
extern s16 D_8018D2E8;
extern s32 D_8018D400;
extern u8* D_8018D4BC;
extern u8* D_8018D4C0;

2
src/main.c
View File

@ -125,7 +125,7 @@ f32 gCameraZoom[4]; // look like to be the fov of each character
//f32 D_8015013C;
UNUSED s32 D_80150140;
UNUSED s32 D_80150144;
f32 D_80150148;
f32 gScreenAspect;
f32 D_8015014C;
f32 D_80150150;
UNUSED f32 D_80150154;

2
src/main.h
View File

@ -171,7 +171,7 @@ extern s32 D_80150120;
extern s32 gMenuSelectionFromQuit;
extern f32 gCameraZoom[];
extern f32 D_80150148;
extern f32 gScreenAspect;
extern f32 D_8015014C;
extern f32 D_80150150;

18
src/player_controller.c
View File

@ -2249,18 +2249,18 @@ void func_8002D268(Player *player, UNUSED Camera *camera, s8 arg2, s8 playerId)
player->unk_064[2] *= -1.0f;
}
if ((player->boundingBoxCorners[2].surfaceType == 1) && (player->boundingBoxCorners[3].surfaceType == 1)) {
spB4 = (-1 * (player->unk_064[0] + sp16C[0])) + ((-player->unk_110.unk60[0] * player->kartGravity) * 0.925);
spB0 = (-player->unk_110.unk60[1] * player->kartGravity);
spAC = (-1 * (player->unk_064[2] + sp16C[2])) + ((-player->unk_110.unk60[2] * player->kartGravity) * 0.925);
spB4 = (-1 * (player->unk_064[0] + sp16C[0])) + ((-player->unk_110.orientationVector[0] * player->kartGravity) * 0.925);
spB0 = (-player->unk_110.orientationVector[1] * player->kartGravity);
spAC = (-1 * (player->unk_064[2] + sp16C[2])) + ((-player->unk_110.orientationVector[2] * player->kartGravity) * 0.925);
} else {
temp3 = (((player->unk_094 / 18.0f) * 216.0f) / 10.0f);
if (temp3 >= 10)
{
temp3 = 10;
}
spB4 = -1 * (player->unk_064[0] + sp16C[0]) + ((-player->unk_110.unk60[0] * player->kartGravity) * sp104[temp3]);
spB0 = (-player->unk_110.unk60[1] * player->kartGravity);
spAC = -1 * (player->unk_064[2] + sp16C[2]) + ((-player->unk_110.unk60[2] * player->kartGravity) * sp104[temp3]);
spB4 = -1 * (player->unk_064[0] + sp16C[0]) + ((-player->unk_110.orientationVector[0] * player->kartGravity) * sp104[temp3]);
spB0 = (-player->unk_110.orientationVector[1] * player->kartGravity);
spAC = -1 * (player->unk_064[2] + sp16C[2]) + ((-player->unk_110.orientationVector[2] * player->kartGravity) * sp104[temp3]);
}
if (((player->effects & 8) != 8) && ((player->effects & 0x20) == 0x20)) {
spB4 = 0 * (player->unk_064[0] + sp16C[0]);
@ -2548,9 +2548,9 @@ void func_8002E594(Player *player, UNUSED Camera *camera, s8 arg2, s8 arg3) {
if ((((player->effects & 0x80) == 0x80)
|| ((player->effects & 0x40) == 0x40))
|| ((player->effects & 0x20000) == 0x20000)) {
sp80 = -1 * (player->unk_064[0]) + (((-player->unk_110.unk60[0]) * player->kartGravity) * 0.1);
sp7C = (-player->unk_110.unk60[1]) * player->kartGravity;
sp78 = -1 * (player->unk_064[2]) + (((-player->unk_110.unk60[2]) * player->kartGravity) * 0.1);
sp80 = -1 * (player->unk_064[0]) + (((-player->unk_110.orientationVector[0]) * player->kartGravity) * 0.1);
sp7C = (-player->unk_110.orientationVector[1]) * player->kartGravity;
sp78 = -1 * (player->unk_064[2]) + (((-player->unk_110.orientationVector[2]) * player->kartGravity) * 0.1);
} else {
sp80 = -1 * player->unk_064[0];
sp7C = -1 * player->kartGravity;

6
src/racing/actors.c
View File

@ -359,9 +359,9 @@ void func_802976EC(Collision *arg0, Vec3s arg1) {
}
//sp1C = arg0->unk30;
x = arg0->unk60[0];
y = arg0->unk60[1];
z = arg0->unk60[2];
x = arg0->orientationVector[0];
y = arg0->orientationVector[1];
z = arg0->orientationVector[2];
arg1[0] = atan2s(z, y) + 0x4000;
arg1[1] = 0;

14
src/racing/actors_extended.c
View File

@ -28,7 +28,7 @@ void func_802B0210(Collision *arg0, Collision *arg1) {
vec3f_copy_return(arg1->unk48, arg0->unk48);
vec3f_copy_return(arg1->unk54, arg0->unk54);
vec3f_copy_return(arg1->unk60, arg0->unk60);
vec3f_copy_return(arg1->orientationVector, arg0->orientationVector);
}
void func_802B02B4(struct ShellActor *shell, s32 shellType) {
@ -769,9 +769,9 @@ void update_actor_banana(struct BananaActor *banana) {
func_802ADDC8(&banana->unk30, banana->boundingBoxSize + 1.0f, banana->pos[0], banana->pos[1], banana->pos[2]);
banana->unk30.unk34 = 1;
if ((banana->unk30.unk34 != 0) && (banana->unk30.unk3C[2] < 0.0f)) {
someOtherVelocity[0] = -banana->unk30.unk60[0];
someOtherVelocity[1] = -banana->unk30.unk60[1];
someOtherVelocity[2] = -banana->unk30.unk60[2];
someOtherVelocity[0] = -banana->unk30.orientationVector[0];
someOtherVelocity[1] = -banana->unk30.orientationVector[1];
someOtherVelocity[2] = -banana->unk30.orientationVector[2];
banana->pos[0] += someOtherVelocity[0] * banana->unk30.unk3C[2];
banana->pos[1] += someOtherVelocity[1] * banana->unk30.unk3C[2];
banana->pos[2] += someOtherVelocity[2] * banana->unk30.unk3C[2];
@ -1770,9 +1770,9 @@ void update_actor_red_blue_shell(struct ShellActor *shell) {
void func_802B4E30(struct Actor *arg0) {
if ((arg0->unk30.unk3C[2] < 0.0f) && (arg0->unk30.unk34 == 1)) {
arg0->pos[0] -= (arg0->unk30.unk60[0] * arg0->unk30.unk3C[2]);
arg0->pos[1] -= (arg0->unk30.unk60[1] * arg0->unk30.unk3C[2]);
arg0->pos[2] -= (arg0->unk30.unk60[2] * arg0->unk30.unk3C[2]);
arg0->pos[0] -= (arg0->unk30.orientationVector[0] * arg0->unk30.unk3C[2]);
arg0->pos[1] -= (arg0->unk30.orientationVector[1] * arg0->unk30.unk3C[2]);
arg0->pos[2] -= (arg0->unk30.orientationVector[2] * arg0->unk30.unk3C[2]);
}
if ((arg0->unk30.unk3C[0] < 0.0f) && (arg0->unk30.unk30 == 1)) {
arg0->pos[0] -= (arg0->unk30.unk48[0] * arg0->unk30.unk3C[0]);

30
src/racing/collision.c
View File

@ -36,7 +36,7 @@ void func_802AAAAC(Collision *collision) {
collision->unk3C[2] = 0;
vec3f_set(collision->unk48, 0.0f, 0.0f, 1.0f);
vec3f_set(collision->unk54, 1.0f, 0.0f, 0.0f);
vec3f_set(collision->unk60, 0.0f, 1.0f, 0.0f);
vec3f_set(collision->orientationVector, 0.0f, 1.0f, 0.0f);
}
f32 func_802AAB4C(Player *player) {
@ -196,9 +196,9 @@ s32 func_802AAE4C(Collision *collision, f32 boundingBoxSize, f32 posX, f32 posY,
collision->unk34 = 1;
collision->unk3A = index;
collision->unk3C[2] = temp_f0_5;
collision->unk60[0] = surfaceMap->height;
collision->unk60[1] = surfaceMap->gravity;
collision->unk60[2] = surfaceMap->rotation;
collision->orientationVector[0] = surfaceMap->height;
collision->orientationVector[1] = surfaceMap->gravity;
collision->orientationVector[2] = surfaceMap->rotation;
}
return 0;
}
@ -207,9 +207,9 @@ s32 func_802AAE4C(Collision *collision, f32 boundingBoxSize, f32 posX, f32 posY,
collision->unk34 = 1;
collision->unk3A = index;
collision->unk3C[2] = temp_f0_5;
collision->unk60[0] = surfaceMap->height;
collision->unk60[1] = surfaceMap->gravity;
collision->unk60[2] = surfaceMap->rotation;
collision->orientationVector[0] = surfaceMap->height;
collision->orientationVector[1] = surfaceMap->gravity;
collision->orientationVector[2] = surfaceMap->rotation;
return 1;
}
return 0;
@ -848,9 +848,9 @@ s32 is_colliding_with_drivable_surface(Collision *collision, f32 boundingBoxSize
collision->unk34 = 1;
collision->unk3A = index;
collision->unk3C[2] = temp_f0_4 - boundingBoxSize;
collision->unk60[0] = tile->height;
collision->unk60[1] = tile->gravity;
collision->unk60[2] = tile->rotation;
collision->orientationVector[0] = tile->height;
collision->orientationVector[1] = tile->gravity;
collision->orientationVector[2] = tile->rotation;
}
return 0;
}
@ -863,9 +863,9 @@ s32 is_colliding_with_drivable_surface(Collision *collision, f32 boundingBoxSize
collision->unk34 = 1;
collision->unk3A = index;
collision->unk3C[2] = temp_f0_4 - boundingBoxSize;
collision->unk60[0] = tile->height;
collision->unk60[1] = tile->gravity;
collision->unk60[2] = tile->rotation;
collision->orientationVector[0] = tile->height;
collision->orientationVector[1] = tile->gravity;
collision->orientationVector[2] = tile->rotation;
return 1;
}
@ -2197,7 +2197,7 @@ u16 process_collision(Player *player, KartBoundingBoxCorner *corner, f32 cornerP
temp_f0 = func_802ABE30(cornerPos1, cornerPos2, cornerPos3, corner->surfaceMapIndex);
if (!(player->pos[1] < temp_f0) && !((2 * boundingBoxSize) < (player->pos[1] - temp_f0))) {
corner->cornerGroundY = temp_f0;
subtract_scaled_vector(collision->unk60, collision->unk3C[2], corner->cornerPos);
subtract_scaled_vector(collision->orientationVector, collision->unk3C[2], corner->cornerPos);
return 1;
}
}
@ -2249,7 +2249,7 @@ u16 process_collision(Player *player, KartBoundingBoxCorner *corner, f32 cornerP
temp_f0 = func_802ABE30(cornerPos1, cornerPos2, cornerPos3, surfaceMapIndex);
if (!(player->pos[1] < temp_f0) && !((2 * boundingBoxSize) < (player->pos[1] - temp_f0))) {
subtract_scaled_vector(collision->unk60, collision->unk3C[2], corner->cornerPos);
subtract_scaled_vector(collision->orientationVector, collision->unk3C[2], corner->cornerPos);
corner->cornerGroundY = temp_f0;
corner->surfaceType = (u8) gSurfaceMap[surfaceMapIndex].surfaceType;
corner->surfaceFlags = 0x40;

8
src/racing/race_logic.c
View File

@ -210,7 +210,7 @@ void func_8028E438(void) {
if (temp_v0->screenStartX == 160) {
phi_v1_4++;
}
D_80150148 = (f32) ((f32) temp_v0->screenWidth / (f32) temp_v0->screenHeight);
gScreenAspect = (f32) ((f32) temp_v0->screenWidth / (f32) temp_v0->screenHeight);
if (phi_v1_4 == 4) {
D_8015F894 = 2;
gActiveScreenMode = SCREEN_MODE_1P;
@ -292,7 +292,7 @@ void func_8028E678(void) {
phi_a0_10++;
}
D_80150148 = (f32) ((f32) D_800DC5EC->screenWidth / (f32) D_800DC5EC->screenHeight);
gScreenAspect = (f32) ((f32) D_800DC5EC->screenWidth / (f32) D_800DC5EC->screenHeight);
if (phi_a0_10 == 4) {
D_8015F894 = 3;
func_80092500();
@ -326,7 +326,7 @@ void func_8028E678(void) {
phi_a0_10++;
}
D_80150148 = (f32) ((f32) D_800DC5EC->screenWidth / (f32) D_800DC5EC->screenHeight);
gScreenAspect = (f32) ((f32) D_800DC5EC->screenWidth / (f32) D_800DC5EC->screenHeight);
if (phi_a0_10 == 4) {
D_8015F894 = 3;
func_80092500();
@ -349,7 +349,7 @@ void func_8028E678(void) {
D_800DC5F0->screenStartY = D_800DC5EC->screenStartY;
gActiveScreenMode = SCREEN_MODE_2P_SPLITSCREEN_VERTICAL;
D_80150148 = 1.33333337;
gScreenAspect = 1.33333337;
gPlayerCountSelection1 = 2;
func_8003DB5C();
func_8005994C();

46
src/racing/skybox_and_splitscreen.c
View File

@ -462,7 +462,7 @@ void func_802A4A0C(Vtx *vtx, struct UnkStruct_800DC5EC *arg1, UNUSED s32 arg2, U
sp5C[0] = 0.0f;
sp5C[1] = 0.0f;
sp5C[2] = 30000.0f;
func_802B5564(matrix1, &sp128, camera->unk_B4, D_80150148, D_80150150, D_8015014C, 1.0f);
func_802B5564(matrix1, &sp128, camera->unk_B4, gScreenAspect, D_80150150, D_8015014C, 1.0f);
func_802B5794(matrix2, camera->pos, camera->lookAt);
mtxf_multiplication(matrix3, matrix1, matrix2);
@ -551,16 +551,16 @@ void func_802A4D18(void) {
}
switch (gScreenModeSelection) { /* switch 1; irregular */
case SCREEN_MODE_1P: /* switch 1 */
D_80150148 = 1.33333334f;
gScreenAspect = 1.33333334f;
return;
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: /* switch 1 */
D_80150148 = 0.66666667f;
gScreenAspect = 0.66666667f;
return;
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL: /* switch 1 */
D_80150148 = 2.66666667f;
gScreenAspect = 2.66666667f;
return;
case SCREEN_MODE_3P_4P_SPLITSCREEN: /* switch 1 */
D_80150148 = 1.33333334f;
gScreenAspect = 1.33333334f;
return;
}
}
@ -778,7 +778,7 @@ void func_802A59A4(void) {
Mat4 matrix;
#ifdef VERSION_EU
sp9C = D_80150148 * 1.2f;
sp9C = gScreenAspect * 1.2f;
#endif
func_802A53A4();
init_rdp();
@ -788,7 +788,7 @@ void func_802A59A4(void) {
#ifdef VERSION_EU
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], sp9C, D_80150150, D_8015014C, 1.0f);
#else
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], D_80150148, D_80150150, D_8015014C, 1.0f);
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], gScreenAspect, D_80150150, D_8015014C, 1.0f);
#endif
gSPPerspNormalize(gDisplayListHead++, perspNorm);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPersp[0]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
@ -835,7 +835,7 @@ void func_802A5CB4(void) {
func_802A50EC();
#ifdef VERSION_EU
sp9C = D_80150148 * 1.2f;
sp9C = gScreenAspect * 1.2f;
#endif
init_rdp();
func_802A3730(D_800DC5EC);
@ -843,7 +843,7 @@ void func_802A5CB4(void) {
#ifdef VERSION_EU
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], sp9C, D_80150150, D_8015014C, 1.0f);
#else
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], D_80150148, D_80150150, D_8015014C, 1.0f);
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], gScreenAspect, D_80150150, D_8015014C, 1.0f);
#endif
gSPPerspNormalize(gDisplayListHead++, perspNorm);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPersp[0]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
@ -894,13 +894,13 @@ void func_802A5FAC(void) {
init_rdp();
func_802A3730(D_800DC5F0);
#ifdef VERSION_EU
sp9C = D_80150148 * 1.2f;
sp9C = gScreenAspect * 1.2f;
#endif
gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
#ifdef VERSION_EU
guPerspective(&gGfxPool->mtxPersp[1], &perspNorm, gCameraZoom[1], sp9C, D_80150150, D_8015014C, 1.0f);
#else
guPerspective(&gGfxPool->mtxPersp[1], &perspNorm, gCameraZoom[1], D_80150148, D_80150150, D_8015014C, 1.0f);
guPerspective(&gGfxPool->mtxPersp[1], &perspNorm, gCameraZoom[1], gScreenAspect, D_80150150, D_8015014C, 1.0f);
#endif
gSPPerspNormalize(gDisplayListHead++, perspNorm);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPersp[1]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
@ -951,13 +951,13 @@ void func_802A62A4(void) {
init_rdp();
func_802A3730(D_800DC5EC);
#ifdef VERSION_EU
sp9C = D_80150148 * 1.2f;
sp9C = gScreenAspect * 1.2f;
#endif
gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
#ifdef VERSION_EU
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], sp9C, D_80150150, D_8015014C, 1.0f);
#else
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], D_80150148, D_80150150, D_8015014C, 1.0f);
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], gScreenAspect, D_80150150, D_8015014C, 1.0f);
#endif
gSPPerspNormalize(gDisplayListHead++, perspNorm);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPersp[0]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
@ -1009,13 +1009,13 @@ void func_802A65B8(void) {
init_rdp();
func_802A3730(D_800DC5F0);
#ifdef VERSION_EU
sp9C = D_80150148 * 1.2f;
sp9C = gScreenAspect * 1.2f;
#endif
gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH);
#ifdef VERSION_EU
guPerspective(&gGfxPool->mtxPersp[1], &perspNorm, gCameraZoom[1], sp9C, D_80150150, D_8015014C, 1.0f);
#else
guPerspective(&gGfxPool->mtxPersp[1], &perspNorm, gCameraZoom[1], D_80150148, D_80150150, D_8015014C, 1.0f);
guPerspective(&gGfxPool->mtxPersp[1], &perspNorm, gCameraZoom[1], gScreenAspect, D_80150150, D_8015014C, 1.0f);
#endif
gSPPerspNormalize(gDisplayListHead++, perspNorm);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPersp[1]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
@ -1059,7 +1059,7 @@ void func_802A68CC(void) {
Mat4 matrix;
#ifdef VERSION_EU
f32 sp9C;
sp9C = D_80150148 * 1.2f;
sp9C = gScreenAspect * 1.2f;
#endif
func_802A54A8();
@ -1069,7 +1069,7 @@ void func_802A68CC(void) {
#ifdef VERSION_EU
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], sp9C, D_80150150, D_8015014C, 1.0f);
#else
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], D_80150148, D_80150150, D_8015014C, 1.0f);
guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], gScreenAspect, D_80150150, D_8015014C, 1.0f);
#endif
gSPPerspNormalize(gDisplayListHead++, perspNorm);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPersp[0]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
@ -1113,7 +1113,7 @@ void func_802A6BB0(void) {
Mat4 matrix;
#ifdef VERSION_EU
f32 sp9C;
sp9C = D_80150148 * 1.2f;
sp9C = gScreenAspect * 1.2f;
#endif
func_802A5590();
@ -1123,7 +1123,7 @@ void func_802A6BB0(void) {
#ifdef VERSION_EU
guPerspective(&gGfxPool->mtxPersp[1], &perspNorm, gCameraZoom[1], sp9C, D_80150150, D_8015014C, 1.0f);
#else
guPerspective(&gGfxPool->mtxPersp[1], &perspNorm, gCameraZoom[1], D_80150148, D_80150150, D_8015014C, 1.0f);
guPerspective(&gGfxPool->mtxPersp[1], &perspNorm, gCameraZoom[1], gScreenAspect, D_80150150, D_8015014C, 1.0f);
#endif
gSPPerspNormalize(gDisplayListHead++, perspNorm);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPersp[1]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
@ -1167,7 +1167,7 @@ void func_802A6E94(void) {
Mat4 matrix;
#ifdef VERSION_EU
f32 sp9C;
sp9C = D_80150148 * 1.2f;
sp9C = gScreenAspect * 1.2f;
#endif
func_802A5678();
@ -1178,7 +1178,7 @@ void func_802A6E94(void) {
#ifdef VERSION_EU
guPerspective(&gGfxPool->mtxPersp[2], &perspNorm, gCameraZoom[2], sp9C, D_80150150, D_8015014C, 1.0f);
#else
guPerspective(&gGfxPool->mtxPersp[2], &perspNorm, gCameraZoom[2], D_80150148, D_80150150, D_8015014C, 1.0f);
guPerspective(&gGfxPool->mtxPersp[2], &perspNorm, gCameraZoom[2], gScreenAspect, D_80150150, D_8015014C, 1.0f);
#endif
gSPPerspNormalize(gDisplayListHead++, perspNorm);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPersp[2]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
@ -1222,7 +1222,7 @@ void func_802A7178(void) {
Mat4 matrix;
#ifdef VERSION_EU
f32 sp9C;
sp9C = D_80150148 * 1.2f;
sp9C = gScreenAspect * 1.2f;
#endif
func_802A5760();
@ -1242,7 +1242,7 @@ void func_802A7178(void) {
#ifdef VERSION_EU
guPerspective(&gGfxPool->mtxPersp[3], &perspNorm, gCameraZoom[3], sp9C, D_80150150, D_8015014C, 1.0f);
#else
guPerspective(&gGfxPool->mtxPersp[3], &perspNorm, gCameraZoom[3], D_80150148, D_80150150, D_8015014C, 1.0f);
guPerspective(&gGfxPool->mtxPersp[3], &perspNorm, gCameraZoom[3], gScreenAspect, D_80150150, D_8015014C, 1.0f);
#endif
gSPPerspNormalize(gDisplayListHead++, perspNorm);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPersp[3]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);

6
src/render_player.c
View File

@ -1249,9 +1249,9 @@ void render_player_shadow(Player *player, s8 arg1, s8 arg2) {
var_f2 = (f32) (1.0 - ((f64) player->unk_110.unk3C[2] * 0.02));
if (var_f2 < 0.0f) {var_f2 = 0.0f;}
if (var_f2 > 1.0f) {var_f2 = 1.0f;}
spB4[0] = player->unk_110.unk60[0];
spB4[2] = player->unk_110.unk60[2];
spB4[1] = player->unk_110.unk60[1];
spB4[0] = player->unk_110.orientationVector[0];
spB4[2] = player->unk_110.orientationVector[2];
spB4[1] = player->unk_110.orientationVector[1];
spCC[0] = player->pos[0] + ((spB0 * sins(spC0)) + (spAC * coss(spC0)));
spCC[1] = player->unk_074 + 1.0f;

6
src/spawn_players.c
View File

@ -346,9 +346,9 @@ void spawn_player(Player *player, s8 playerIndex, f32 startingRow, f32 startingC
player->unk_110.unk54[0] = 0.0f;
player->unk_110.unk54[1] = 0.0f;
player->unk_110.unk54[2] = 0.0f;
player->unk_110.unk60[0] = 0.0f;
player->unk_110.unk60[1] = 0.0f;
player->unk_110.unk60[2] = 0.0f;
player->unk_110.orientationVector[0] = 0.0f;
player->unk_110.orientationVector[1] = 0.0f;
player->unk_110.orientationVector[2] = 0.0f;
D_80165300[playerIndex] = 0;
D_8018CE10[playerIndex].unk_04[0] = 0.0f;

2
tools/doxygen_syms.md
View File

@ -4006,7 +4006,7 @@ Variable Name | Memory Address
[gCameraZoom](@ref gCameraZoom) | 0x80150130
[D_80150140](@ref D_80150140) | 0x80150140
[D_80150144](@ref D_80150144) | 0x80150144
[D_80150148](@ref D_80150148) | 0x80150148
[gScreenAspect](@ref gScreenAspect) | 0x80150148
[D_8015014C](@ref D_8015014C) | 0x8015014C
[D_80150150](@ref D_80150150) | 0x80150150
[D_80150154](@ref D_80150154) | 0x80150154