mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-07-02 11:16:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename wayPoint to waypoint (#448)

Browse Source 
* Rename wayPoint to waypoint

* other
This commit is contained in:
MegaMech
2023-10-09 20:46:56 -06:00
committed by GitHub
parent 41a0471605
commit 7f14bf80df
63 changed files with 704 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/camera.c
+11 -16
View File
@@ -214,7 +214,7 @@ void func_8001CA78(UNUSED Player *player, Camera *camera, Vec3f arg2, f32 *arg3,
f32 temp_f18;
f32 temp_f16;
UNUSED s32 pad;
struct TrackWayPoint *temp_s2;
TrackWaypoint *temp_s2;
temp_s2 = &D_80164550[0][gWaypointCountByPathIndex[0] - 10];
sp68[0] = camera->unk_30[0];
@@ -231,10 +231,10 @@ void func_8001CA78(UNUSED Player *player, Camera *camera, Vec3f arg2, f32 *arg3,
if (gCurrentCourseId == COURSE_TOADS_TURNPIKE) {
var_f14 = sp5C[0];
} else {
var_f14 = sp5C[0] + temp_s2->wayPointX;
var_f14 = sp5C[0] + temp_s2->posX;
}
temp_f16 = sp5C[2] + D_8016524C;
temp_f18 = sp5C[1] + (temp_s2->wayPointY + D_80164A30);
temp_f18 = sp5C[1] + (temp_s2->posY + D_80164A30);
arg2[0] += (var_f14 - camera->lookAt[0]) * 1;
arg2[1] += (temp_f18 - camera->lookAt[1]) * 1;
arg2[2] += (temp_f16 - camera->lookAt[2]) * 1;
@@ -242,10 +242,10 @@ void func_8001CA78(UNUSED Player *player, Camera *camera, Vec3f arg2, f32 *arg3,
if (gCurrentCourseId == COURSE_TOADS_TURNPIKE) {
var_f14 = sp68[0];
} else {
var_f14 = sp68[0] + temp_s2->wayPointX;
var_f14 = sp68[0] + temp_s2->posX;
}
temp_f16 = sp68[2] + D_8016524C;
temp_f18 = sp68[1] + (temp_s2->wayPointY + D_80164A30 + 6.0f);
temp_f18 = sp68[1] + (temp_s2->posY + D_80164A30 + 6.0f);
move_f32_towards(&D_80164A30, 0, 0.02f);
posX = camera->pos[0];
*arg3 = ((var_f14 - posX) * 1) + posX;
@@ -819,28 +819,23 @@ void func_8001EA0C(Camera *camera, Player *player, s8 arg2) {
} else {
if (player->unk_078 < 0) {
var_a3 = 0xA5 - (player->unk_078 / 2);
if ((player->effects & 0x20000000) == 0x20000000) {
//sp4E = temp_a3;
move_s16_towards(&camera->unk_B0, -0x0B60, 0.1f);
} else {
//sp4E = temp_a3;
move_s16_towards(&camera->unk_B0, -0x0888, 0.1f);
}
} else {
var_a3 = (player->unk_078 / 2) + 0xA5;
if ((player->effects & 0x20000000) == 0x20000000) {
//sp4E = temp_a3_2;
move_s16_towards(&camera->unk_B0, 0x0B60, 0.1f);
} else {
//sp4E = temp_a3_2;
move_s16_towards(&camera->unk_B0, 0x0888, 0.1f);
}
}
//var_a3 = sp4E;
}
} else {
move_s16_towards(&camera->unk_B0, 0, 0.05f);
//temp_v1_2 = player->unk_078;
var_a3 = ((s16) camera->unk_2C / 182) - ((s16) player->unk_02C[1] / 182);
if (player->unk_078 == 0) {
if ((player->effects & 0x20) == 0x20) {
@@ -968,22 +963,22 @@ void func_8001EE98(Player *player, Camera *camera, s8 index) {
switch (D_80152300[cameraIndex]) {
case 3:
func_8001A588(&D_80152300[cameraIndex], camera, player, index, cameraIndex);
return;
break;
case 1:
if (((player->unk_0CA & 1) == 1) || ((player->unk_0CA & 2) == 2)) {
func_8001E8E8(camera, player, index);
return;
break;
}
func_8001E45C(camera, player, index);
return;
break;
case 8:
func_8001E0C4(camera, player, index);
func_8001F87C(cameraIndex);
return;
break;
case 9:
if (((player->unk_0CA & 1) == 1) || ((player->unk_0CA & 2) == 2)) {
func_8001E8E8(camera, player, index);
return;
break;
}
func_8001EA0C(camera, player, index);
break;
src/camera.h
+1 -1
View File
@@ -27,7 +27,7 @@ typedef struct {
// This is expected to be a normalized vector, indicates what direction is "up" for the camera
/* 0x18 */ Vec3f up;
// I think these are the "nautical angles" between pos and lookAt
// rot[0] = pitch, rot[1] = yaw, rot[2] = roll?
// rot[0] = roll? Does nothing?, rot[1] = yaw, rot[2] = pitch
/* 0x24 */ Vec3s rot;
/* 0x2A */ u16 someBitFlags;
/* 0x2C */ s16 unk_2C;
src/code_800029B0.c
+7 -7
View File
@@ -202,18 +202,18 @@ void setup_race(void) {
func_8029E158();
if (gModeSelection != BATTLE) {
D_8015F8D0[1] = (f32) (D_80164490->wayPointY - 15);;
D_8015F8D0[2] = D_80164490->wayPointZ;
D_8015F8D0[1] = (f32) (D_80164490->posY - 15);;
D_8015F8D0[2] = D_80164490->posZ;
if (gCurrentCourseId == COURSE_TOADS_TURNPIKE) {
D_8015F8D0[0] = (gIsMirrorMode != 0) ?
D_80164490->wayPointX + 138.0f :
D_80164490->wayPointX - 138.0f;
D_80164490->posX + 138.0f :
D_80164490->posX - 138.0f;
} else if (gCurrentCourseId == COURSE_WARIO_STADIUM) {
D_8015F8D0[0] = (gIsMirrorMode != 0) ?
D_80164490->wayPointX + 12.0f :
D_80164490->wayPointX - 12.0f;
D_80164490->posX + 12.0f :
D_80164490->posX - 12.0f;
} else {
D_8015F8D0[0] = D_80164490->wayPointX;
D_8015F8D0[0] = D_80164490->posX;
}
}
if (!gDemoMode) {
src/code_80005FD0.c
+433 -423
View File
File diff suppressed because it is too large Load Diff
src/code_80005FD0.h
+1 -1
View File
@@ -168,7 +168,7 @@ void func_8001C42C(void);
// 0 or 1, only 1 when when in extra (mirror) mode
extern s16 D_8016347A;
// Suspected to be the "width" of each wayPoint. See data_0DD0A0_1.s
// Suspected to be the "width" of each waypoint. See data_0DD0A0_1.s
extern f32 D_800DCA4C[];
// See bss_80005FD0.s
src/code_8001F980.c
+2 -2
View File
@@ -376,8 +376,8 @@ Vtx *D_800DDBB4[] = {
};
f32 gCharacterSize[] = {
0.75f, 0.75f, 0.75f, 0.75f,
0.75f, 0.75f, 0.75f, 0.75f
MARIO_SIZE, LUIGI_SIZE, YOSHI_SIZE, TOAD_SIZE,
DK_SIZE, WARIO_SIZE, PEACH_SIZE, BOWSER_SIZE
};
u8 **gKartMarioWheels0[] = {
src/code_80057C60.c
+7 -7
View File
@@ -623,7 +623,7 @@ void func_80058F48(void) {
void func_80058F78(void) {
if (D_801657B0 == 0) {
func_80041EF4();
if ((!gDemoMode) && (D_8018D188 != 0) && (D_801657D8 == 0)) {
if ((!gDemoMode) && (gIsHUDVisible != 0) && (D_801657D8 == 0)) {
func_8004E638(0);
if (D_801657E4 != 2) {
func_8004FA78(0);
@@ -700,7 +700,7 @@ void func_800591B4(void) {
func_80057C60();
gSPDisplayList(gDisplayListHead++, &D_0D0076F8);
if (D_8018D188 != 0) {
if (gIsHUDVisible != 0) {
if (D_801657D8 == 0) {
if (D_801657F0 != FALSE) {
func_800514BC();
@@ -764,7 +764,7 @@ void func_800593F8(void) {
}
void func_80059488(s32 arg0) {
if ((gModeSelection != BATTLE) && (D_80165800[arg0] == 0) && (D_8018D188 != 0)) {
if ((gModeSelection != BATTLE) && (D_80165800[arg0] == 0) && (gIsHUDVisible != 0)) {
func_8004FA78(arg0);
func_8004E78C(arg0);
}
@@ -796,7 +796,7 @@ extern s8 D_801657F8;
void func_80059560(s32 arg0) {
if (gModeSelection != BATTLE) {
if (D_801657F8 && D_8018D188) {
if (D_801657F8 && gIsHUDVisible) {
func_8004CB60(D_8018CA70[arg0].lapX, D_8018CA70[arg0].lapY, D_0D00A958);
func_8004FC78(D_8018CA70[arg0].lapX - 12, D_8018CA70[arg0].lapY + 4, D_8018CA70[arg0].alsoLapCount);
}
@@ -1168,7 +1168,7 @@ void func_8006F824(s32);
void func_8005A3C0(void) {
bool b = FALSE;
if ((gGamestate != 5) && (gGamestate != 9) && !D_8018D204) {
if ((gGamestate != ENDING_SEQUENCE) && (gGamestate != CREDITS_SEQUENCE) && !D_8018D204) {
switch (gPlayerCountSelection1) {
case 1:
if (gControllerOne->buttonPressed & R_CBUTTONS) {
@@ -1336,7 +1336,7 @@ void func_8005A99C(void) {
if (gPlayerCountSelection1 == 3) {
D_801657E8 = TRUE;
}
D_8018D188 = (s32) 1;
gIsHUDVisible = (s32) 1;
D_8018D170 = (s32) 1;
D_8018D190 = (s32) 1;
D_8018D204 = 0;
@@ -2519,7 +2519,7 @@ void func_8005D1F4(s32 arg0)
D_8018CA70[arg0].unk_74 = 0;
for (var_a2 = 0; var_a2 < NUM_BOMB_KARTS_VERSUS; var_a2++) {
if ((D_80163DE8[var_a2].state == BOMB_STATE_EXPLODED) || (D_80163DE8[var_a2].state == BOMB_STATE_INACTIVE)) continue;
bombWaypoint = D_80163DE8[var_a2].wayPointIndex;
bombWaypoint = D_80163DE8[var_a2].waypointIndex;
waypointDiff = bombWaypoint - playerWaypoint;
if ((waypointDiff < -5) || (waypointDiff > 0x1E)) continue;
D_8018CA70[arg0].unk_74 = 1;
src/code_80057C60.h
+1 -1
View File
@@ -332,7 +332,7 @@ extern s32 D_8018D410;
extern s32 gMatrixHudCount;
extern s32 D_8018D170;
extern s32 D_8018D178;
extern s32 D_8018D188;
extern s32 gIsHUDVisible;
extern s32 D_8018D190;
extern s32 D_8018D1A0;
extern s32 D_8018D1B4;
src/code_8006E9C0.c
+2 -2
View File
@@ -758,7 +758,7 @@ extern s32 D_8018D178;
extern s16 D_8018D17C;
extern s32 D_8018D180;
extern s16 D_8018D184;
extern s32 D_8018D188;
extern s32 gIsHUDVisible;
extern s16 D_8018D18C;
extern s32 D_8018D190;
extern s32 D_8018D1A0;
@@ -809,7 +809,7 @@ void func_8006FA94(void) {
osSetTime(/* u64+0x0 */ 0, /* u64+0x4 */ 0);
D_8018D170 = 0;
D_8018D190 = 0;
D_8018D188 = 0;
gIsHUDVisible = 0;
D_8018D178 = 0;
D_8018D1CC = 0;
D_801657E2 = 0;
src/code_80071F00.c
+2 -2
View File
@@ -8066,7 +8066,7 @@ void func_800857C0(void) {
}
void func_80085878(s32 objectIndex, s32 arg1) {
struct TrackWayPoint *temp_v0;
TrackWaypoint *temp_v0;
Objects *temp_s0;
temp_s0 = &gObjectList[objectIndex];
@@ -8079,7 +8079,7 @@ void func_80085878(s32 objectIndex, s32 arg1) {
temp_s0->unk_084[8] = (arg1 * 0x12C) + 0x1F4;
func_8008B7D4(objectIndex, 0.0f, -15.0f, 0.0f);
temp_v0 = &D_80164490[(u16)temp_s0->unk_084[8]];
func_8008B80C(objectIndex, temp_v0->wayPointX, temp_v0->wayPointY, temp_v0->wayPointZ);
func_8008B80C(objectIndex, temp_v0->posX, temp_v0->posY, temp_v0->posZ);
func_8008B888(objectIndex, 0U, 0U, 0U);
temp_s0->unk_034 = 4.0f;
temp_s0->type = func_80004EAC(d_rainbow_road_unk3, 0);
src/code_8008C1D0.c
+18 -18
View File
@@ -1683,7 +1683,7 @@ void func_8008FF08(Player *player, s8 playerId) {
void func_80090178(Player *player, s8 playerId, Vec3f arg2, Vec3f arg3) {
u16 test;
struct TrackWayPoint *temp_v1;
TrackWaypoint *temp_v1;
f32 spF8[4] = { 0.0f, 0.0f, -700.0f, 700.0f };
f32 spE8[4] = { 700.0f, -700.0f, 0.0f, 0.0f };
f32 spD8[4] = { 0.0f, 0.0f, -650.0f, 650.0f };
@@ -1705,13 +1705,13 @@ void func_80090178(Player *player, s8 playerId, Vec3f arg2, Vec3f arg3) {
case COURSE_YOSHI_VALLEY:
test = player->nearestWaypointId;
temp_v1 = &D_80164550[D_80165310[playerId]][test];
arg2[0] = temp_v1->wayPointX;
arg2[1] = temp_v1->wayPointY;
arg2[2] = temp_v1->wayPointZ;
arg2[0] = temp_v1->posX;
arg2[1] = temp_v1->posY;
arg2[2] = temp_v1->posZ;
temp_v1 = &D_80164550[D_80165310[playerId]][(player->nearestWaypointId + 5) % (gWaypointCountByPathIndex[D_80165310[playerId]] + 1)];
arg3[0] = temp_v1->wayPointX;
arg3[1] = temp_v1->wayPointY;
arg3[2] = temp_v1->wayPointZ;
arg3[0] = temp_v1->posX;
arg3[1] = temp_v1->posY;
arg3[2] = temp_v1->posZ;
break;
case COURSE_BLOCK_FORT:
arg2[0] = spF8[playerId];
@@ -1748,13 +1748,13 @@ void func_80090178(Player *player, s8 playerId, Vec3f arg2, Vec3f arg3) {
default:
test = player->nearestWaypointId;
temp_v1 = &D_80164550[0][test];
arg2[0] = temp_v1->wayPointX;
arg2[1] = temp_v1->wayPointY;
arg2[2] = temp_v1->wayPointZ;
arg2[0] = temp_v1->posX;
arg2[1] = temp_v1->posY;
arg2[2] = temp_v1->posZ;
temp_v1 = &D_80164550[0][(player->nearestWaypointId + 5) % (gWaypointCountByPathIndex[0] + 1)];
arg3[0] = temp_v1->wayPointX;
arg3[1] = temp_v1->wayPointY;
arg3[2] = temp_v1->wayPointZ;
arg3[0] = temp_v1->posX;
arg3[1] = temp_v1->posY;
arg3[2] = temp_v1->posZ;
break;
}
}
@@ -1825,7 +1825,7 @@ void func_80090970(Player *player, s8 arg1, s8 arg2) {
s32 stackPadding1;
Vec3f sp44;
Vec3f sp38;
struct TrackWayPoint *wayPoint;
TrackWaypoint *waypoint;
s32 stackPadding2;
s32 stackPadding3;
@@ -1921,10 +1921,10 @@ void func_80090970(Player *player, s8 arg1, s8 arg2) {
player->pos[0] = player->pos[0] + sins(-player->unk_02C[1]) * -10.0f;
}
if (player->unk_0C8 == 0x00FC) {
wayPoint = D_80164550[0];
player->pos[0] = wayPoint->wayPointX;
player->pos[1] = wayPoint->wayPointY;
player->pos[2] = wayPoint->wayPointZ;
waypoint = D_80164550[0];
player->pos[0] = waypoint->posX;
player->pos[1] = waypoint->posY;
player->pos[2] = waypoint->posZ;
}
move_f32_towards(&player->pos[1], (player->unk_074 + player->boundingBoxSize) - 2.0f, 0.04f);
player->unk_0C8++;
src/code_80091750.c
+2 -2
View File
@@ -10679,7 +10679,7 @@ void func_800A7A4C(s32 arg0) {
case 0x5: /* switch 8 */
switch (var_s1->unk4) { /* switch 9; irregular */
case 0: /* switch 9 */
if (gControllerFive->button & 0x10) {
if (gControllerFive->button & R_TRIG) {
var_s1->unk4 = (s32) 1U;
play_sound2(0x4900801C);
} else {
@@ -13714,7 +13714,7 @@ void func_800ADF48(struct_8018D9E0_entry *arg0) {
return;
}
}
if (controller->buttonPressed & 0x9000) {
if (controller->buttonPressed & (START_BUTTON | A_BUTTON)) {
if (arg0->unk4 == D_800F0B50[gModeSelection]) {
arg0->unk4 = 0;
gIsGamePaused = 0;
src/ending/code_80280000.c
+1 -1
View File
@@ -125,7 +125,7 @@ void load_credits(void) {
gCurrentCourseId = gCreditsCourseId;
D_800DC5B4 = 1;
D_800DC518 = 1;
creditsRenderMode = 1;
func_802A4D18();
func_802A74BC();
camera->unk_B4 = 60.0f;
src/hud_renderer.c
+1 -1
View File
@@ -3234,7 +3234,7 @@ s32 func_80050644(u16 arg0, s32 *arg1, s32 *arg2) {
}
void func_800507D8(u16 bombIndex, s32 *arg1, s32 *arg2) {
s32 temp_v0 = D_80163DE8[bombIndex].wayPointIndex;
s32 temp_v0 = D_80163DE8[bombIndex].waypointIndex;
s32 var_v1 = 0;
if (temp_v0 != 0) {
src/main.c
+1 -1
View File
@@ -168,7 +168,7 @@ s32 gGamestate = 0xFFFF;
// D_800DC510 is externed as an s32 in other files. D_800DC514 is only used in main.c, likely a developer mistake.
u16 D_800DC510 = 0;
u16 D_800DC514 = 0;
u16 D_800DC518 = 0;
u16 creditsRenderMode = 0; // Renders the whole track. Displays red if used in normal race mode.
u16 gDemoMode = DEMO_MODE_INACTIVE;
u16 gEnableDebugMode = DEBUG_MODE;
s32 gGamestateNext = 7; // = COURSE_DATA_MENU?;
src/main.h
+2 -2
View File
@@ -39,7 +39,7 @@
#define MTX_EFFECT_POOL_SIZE_MAX MTX_EFFECT_POOL_SIZE + 100
#endif
#define GFX_POOL_SIZE 0x1D4C
#define GFX_POOL_SIZE 7500
struct GfxPool {
/* 0x00000 */ Mtx mtxScreen; // Matrix for skybox and startup logo
@@ -208,7 +208,7 @@ extern s32 gGamestate;
#ifndef STRANGE_MAIN_HEADER_H
extern s32 D_800DC510;
#endif
extern u16 D_800DC518;
extern u16 creditsRenderMode;
extern u16 gDemoMode;
extern u16 gEnableDebugMode;
extern s32 gGamestateNext;
src/menus.c
+2 -2
View File
@@ -1194,7 +1194,7 @@ void splash_menu_act(struct Controller *controller, u16 arg1) {
func_800CA330(0x19);
gDebugMenuSelection = DEBUG_MENU_EXITED;
if (controller->button & CONT_L) {
if (controller->button & L_TRIG) {
gDemoMode = DEMO_MODE_ACTIVE;
} else {
gDemoMode = DEMO_MODE_INACTIVE;
@@ -1214,7 +1214,7 @@ void splash_menu_act(struct Controller *controller, u16 arg1) {
gDebugMenuSelection = DEBUG_MENU_EXITED;
gDebugGotoScene = DEBUG_GOTO_CREDITS_SEQUENCE_CC_50;
play_sound2(SOUND_MENU_OK_CLICKED);
} else if (btnAndStick & CONT_R) {
} else if (btnAndStick & R_TRIG) {
gDebugMenuSelection = DEBUG_MENU_DISABLED;
play_sound2(SOUND_MENU_SELECT);
}
src/player_controller.c
+33 -41
View File
@@ -3261,61 +3261,61 @@ void func_80030C34(Player *player) {
}
void func_80030E00(Player *player) {
s32 var_v0;
s32 playerIndex;
if (player == gPlayerOne) {
var_v0 = 0;
playerIndex = 0;
}
if (player == gPlayerTwo) {
var_v0 = 1;
playerIndex = 1;
}
if (player == gPlayerThree) {
var_v0 = 2;
playerIndex = 2;
}
if (player == gPlayerFour) {
var_v0 = 3;
playerIndex = 3;
}
if (player == gPlayerFive) {
var_v0 = 4;
playerIndex = 4;
}
if (player == gPlayerSix) {
var_v0 = 5;
playerIndex = 5;
}
if (player == gPlayerSeven) {
var_v0 = 6;
playerIndex = 6;
}
if (player == gPlayerEight) {
var_v0 = 7;
playerIndex = 7;
}
if (gIsPlayerTripleAButtonCombo[var_v0] == FALSE) {
if (gPlayerIsThrottleActive[var_v0] == 0) {
if ((D_80165420[var_v0] < 2) || (D_80165420[var_v0] >= 9)) {
D_80165440[var_v0] = 0;
if (gIsPlayerTripleAButtonCombo[playerIndex] == FALSE) {
if (gPlayerIsThrottleActive[playerIndex] == 0) {
if ((D_80165420[playerIndex] < 2) || (D_80165420[playerIndex] >= 9)) {
D_80165440[playerIndex] = 0;
}
D_80165420[var_v0] = 0;
D_80165400[var_v0] = 0;
D_80165420[playerIndex] = 0;
D_80165400[playerIndex] = 0;
}
gPlayerIsThrottleActive[var_v0] = 1;
D_80165420[var_v0]++;
if (D_80165420[var_v0] >= 9) {
D_80165420[var_v0] = 9;
gPlayerIsThrottleActive[playerIndex] = 1;
D_80165420[playerIndex]++;
if (D_80165420[playerIndex] >= 9) {
D_80165420[playerIndex] = 9;
}
if ((D_80165420[var_v0] >= 2) && (D_80165420[var_v0] < 9)) {
if (D_80165400[var_v0] == 0) {
D_80165440[var_v0] += 1;
if ((D_80165420[playerIndex] >= 2) && (D_80165420[playerIndex] < 9)) {
if (D_80165400[playerIndex] == 0) {
D_80165440[playerIndex] += 1;
}
D_80165400[var_v0] = 1;
D_80165400[playerIndex] = 1;
}
if (D_80165440[var_v0] == 5) {
gIsPlayerTripleAButtonCombo[var_v0] = TRUE;
D_80165480[var_v0] = 0x00000078;
D_80165440[var_v0] = 0;
D_80165420[var_v0] = 0;
if (D_80165440[playerIndex] == 5) {
gIsPlayerTripleAButtonCombo[playerIndex] = TRUE;
D_80165480[playerIndex] = 0x00000078;
D_80165440[playerIndex] = 0;
D_80165420[playerIndex] = 0;
}
} else {
D_80165480[var_v0]--;
if (D_80165480[var_v0] <= 0) {
gIsPlayerTripleAButtonCombo[var_v0] = FALSE;
D_80165480[playerIndex]--;
if (D_80165480[playerIndex] <= 0) {
gIsPlayerTripleAButtonCombo[playerIndex] = FALSE;
}
}
}
@@ -3893,9 +3893,8 @@ void func_80033AE0(Player *player, struct Controller *controller, s8 arg2) {
UNUSED s32 pad3;
s32 var_a0;
f32 sp44[156] = {0.0, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.6, 0.6, 0.6, 0.6, 0.6, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.5, 0.5, 0.5, 0.5, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.6, 0.6, 0.6, 0.6, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8};
//f32 sp44[156] = {0.0, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.6, 0.6, 0.6, 0.6, 0.6, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.5, 0.5, 0.5, 0.5, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.6, 0.6, 0.6, 0.6, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8, 0.8};
if (((((player->effects & 2) != 2) && ((((player->unk_0C0 / 182) <= 6) && ((player->unk_0C0 / 182) >= (-6))) || ((controller->button & 0x0010) != 0x0010))) || (((player->unk_094 / 18.0f) * 216.0f) <= 20.0f)) || ((player->effects & 0x8000) == 0x8000))
if (((((player->effects & 2) != 2) && ((((player->unk_0C0 / 182) <= 6) && ((player->unk_0C0 / 182) >= (-6))) || ((controller->button & R_TRIG) != R_TRIG))) || (((player->unk_094 / 18.0f) * 216.0f) <= 20.0f)) || ((player->effects & 0x8000) == 0x8000))
{
func_80036CB4(player);
}
@@ -4251,9 +4250,6 @@ void func_80033AE0(Player *player, struct Controller *controller, s8 arg2) {
player->unk_078 *= 1.7;
}
}
//#else
//GLOBAL_ASM("asm/non_matchings/player_controller/func_80033AE0.s")
//#endif
void func_8003680C(Player *player, s16 arg1) {
s32 sp304 = 0;
@@ -4644,7 +4640,7 @@ void func_80037CFC(Player *player, struct Controller *controller, s8 arg2) {
((player->effects & 8) != 8) &&
((player->effects & 2) != 2) &&
((player->effects & 0x10) != 0x10) &&
(controller->buttonPressed & 0x10)) {
(controller->buttonPressed & R_TRIG)) {
func_8002AA50(player);
if (((player->type & 0x4000) == 0x4000) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) {
func_800C9060(arg2, 0x19008000);
@@ -4950,15 +4946,11 @@ void func_80038C6C(Player *player, UNUSED Camera *camera, s8 arg2, s8 arg3) {
f32 spEC;
f32 spE8;
f32 spE4;
//f32 spE0;
//f32 spD8;
f32 posX;
f32 posY;
f32 posZ;
f32 sqrt;
//f32 sp90;
//f32 sp8C;
f32 divOptimize;
UNUSED s32 pad2[10];
f32 spA4;
src/racing/actors.c
+6 -6
View File
@@ -513,9 +513,9 @@ void update_actor_kiwano_fruit(struct KiwanoFruit *fruit) {
fruit->velocity[0] = 80.0f;
case 1:
nearestWaypoint = gNearestWaypointByPlayerId[(u16)(player - gPlayerOne)];
temp_f2 = player->pos[0] - D_80164490[nearestWaypoint].wayPointX;
temp_f16 = player->pos[1] - D_80164490[nearestWaypoint].wayPointY;
temp_f14 = player->pos[2] - D_80164490[nearestWaypoint].wayPointZ;
temp_f2 = player->pos[0] - D_80164490[nearestWaypoint].posX;
temp_f16 = player->pos[1] - D_80164490[nearestWaypoint].posY;
temp_f14 = player->pos[2] - D_80164490[nearestWaypoint].posZ;
temp_f12 = fruit->velocity[0] / sqrtf((temp_f2 * temp_f2) + (temp_f16 * temp_f16) + (temp_f14 * temp_f14));
temp_f2 *= temp_f12;
temp_f16 *= temp_f12;
@@ -1605,10 +1605,10 @@ void func_8029B8E8(Camera *camera, struct TrainCar *actor) {
} else if (distance < 640000.0f) {
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1D670);
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1D160);
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1D160);
} else {
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1E910);
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1E480);
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1E910);
gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1E480);
}
if (1440000.0f < distance) { return; }
src/racing/actors_extended.c
+19 -19
View File
@@ -1175,8 +1175,8 @@ void update_actor_green_shell(struct ShellActor *shell) {
}
if ((player->type & 0x4000) != 0) {
controller = &gControllers[shell->playerId];
if ((controller->buttonDepressed & 0x2000) != 0) {
controller->buttonDepressed &= ~0x2000;
if ((controller->buttonDepressed & Z_TRIG) != 0) {
controller->buttonDepressed &= ~Z_TRIG;
if (controller->rawStickY < -0x2D) {
var_f2 = 8.0f;
if (player->unk_094 > 8.0f) {
@@ -1314,7 +1314,7 @@ void update_actor_green_shell(struct ShellActor *shell) {
void func_802B3B44(struct ShellActor *shell) {
u16 currentWaypoint;
u16 nextWayPoint;
u16 nextWaypoint;
f32 temp_f0;
f32 temp_f0_2;
f32 temp_f0_3;
@@ -1336,13 +1336,13 @@ void func_802B3B44(struct ShellActor *shell) {
Vec3f origPos;
currentWaypoint = shell->pathIndex;
temp_f2 = D_80164490[currentWaypoint].wayPointX;
temp_f12 = D_80164490[currentWaypoint].wayPointY;
temp_f28 = D_80164490[currentWaypoint].wayPointZ;
nextWayPoint = currentWaypoint + 1;
temp_f2 = D_80164490[currentWaypoint].posX;
temp_f12 = D_80164490[currentWaypoint].posY;
temp_f28 = D_80164490[currentWaypoint].posZ;
nextWaypoint = currentWaypoint + 1;
if (nextWayPoint >= D_80164430) {
nextWayPoint -= D_80164430;
if (nextWaypoint >= D_80164430) {
nextWaypoint -= D_80164430;
}
temp_f20 = temp_f2 - shell->pos[0];
@@ -1350,9 +1350,9 @@ void func_802B3B44(struct ShellActor *shell) {
temp_f24 = temp_f28 - shell->pos[2];
temp_f0 = (temp_f20 * temp_f20) + (temp_f22 * temp_f22) + (temp_f24 * temp_f24);
if (temp_f0 > 400.0f) {
temp_f18_3 = D_80164490[nextWayPoint].wayPointX;
temp_f16_3 = D_80164490[nextWayPoint].wayPointY;
temp_f26 = D_80164490[nextWayPoint].wayPointZ;
temp_f18_3 = D_80164490[nextWaypoint].posX;
temp_f16_3 = D_80164490[nextWaypoint].posY;
temp_f26 = D_80164490[nextWaypoint].posZ;
temp_f12_0 = temp_f18_3 - shell->pos[0];
temp_f12_1 = temp_f16_3 - shell->pos[1];
@@ -1360,7 +1360,7 @@ void func_802B3B44(struct ShellActor *shell) {
temp_f0_3 = (temp_f12_0 * temp_f12_0) + (temp_f12_1 * temp_f12_1) + (temp_f12_2 * temp_f12_2);
if (temp_f0_3 < temp_f0) {
shell->pathIndex = nextWayPoint;
shell->pathIndex = nextWaypoint;
} else {
temp_f0_2 = sqrtf(temp_f0) * 4.0f;
temp_f20 /= temp_f0_2;
@@ -1400,11 +1400,11 @@ void func_802B3B44(struct ShellActor *shell) {
shell->pos[0] = temp_f2;
shell->pos[1] = shell->boundingBoxSize + temp_f12;
shell->pos[2] = temp_f28;
shell->pathIndex = nextWayPoint;
shell->pathIndex = nextWaypoint;
} else {
temp_f18_3 = D_80164490[nextWayPoint].wayPointX;
temp_f16_3 = D_80164490[nextWayPoint].wayPointY;
temp_f26 = D_80164490[nextWayPoint].wayPointZ;
temp_f18_3 = D_80164490[nextWaypoint].posX;
temp_f16_3 = D_80164490[nextWaypoint].posY;
temp_f26 = D_80164490[nextWaypoint].posZ;
shell->pos[0] = (temp_f2 + temp_f18_3) * 0.5f;
shell->pos[1] = ((temp_f12 + temp_f16_3) * 0.5f) + shell->boundingBoxSize;
@@ -1564,8 +1564,8 @@ void update_actor_red_blue_shell(struct ShellActor *shell) {
controller = gControllerOne;
}
if ((controller->buttonDepressed & 0x2000) != 0) {
controller->buttonDepressed &= ~0x2000;
if ((controller->buttonDepressed & Z_TRIG) != 0) {
controller->buttonDepressed &= ~Z_TRIG;
shell->state = RELEASED_SHELL;
if (player->unk_0C0 > 0) {
shell->rotAngle = 0x78E3;
src/racing/collision.c
+1 -1
View File
@@ -1988,7 +1988,7 @@ void set_vertex_colours(uintptr_t addr, u32 vertexCount, UNUSED s32 vert3, s8 al
}
/**
* Recursive search for Veretices and set their colour values.
* Recursive search for vertices and set their colour values.
*/
void find_vtx_and_set_colours(uintptr_t displayList, s8 alpha, u8 red, u8 green, u8 blue) {
s32 segment = SEGMENT_NUMBER2(displayList);
src/racing/math_util.c
+16 -3
View File
@@ -40,7 +40,10 @@ UNUSED void func_802B4FF0() {
}
// set the position, rotation and mode of where to render the next object and check number of object already render
/**
* Inserts matrix into the rsp. Position, rotation and mode of where to render the next object and check number of object already render
* Note that gMatrixObjectCount gets reset at the beginning of the game loop. So no cleanup needs to be performed.
*/
s32 render_set_position(Mat4 arg0, s32 arg1) {
if (gMatrixObjectCount >= MTX_OBJECT_POOL_SIZE) {
return 0;
@@ -1092,8 +1095,18 @@ s32 is_visible_between_angle(u16 arg0, u16 arg1, u16 arg2) {
}
/**
* Returns distance or -1.0f if exceeds render distance.
*/
* Determines whether an object is within the render distance of a camera.
*
* @param cameraPos The position of the camera in 3D space.
* @param objectPos The position of the object in 3D space.
* @param orientationY The orientation angle of the object around the Y-axis.
* @param minDistance The minimum distance at which the object is considered within render distance.
* @param fov The field of view (FOV) of the camera.
* @param maxDistance The maximum render distance.
* @return The distance between the camera and the object if it's within render distance,
* or -1.0f if it exceeds the render distance.
*/
f32 is_within_render_distance(Vec3f cameraPos, Vec3f objectPos, u16 orientationY, f32 minDistance, f32 fov, f32 maxDistance) {
u16 angleObject;
UNUSED u16 pad;
src/racing/race_logic.c
+1 -1
View File
@@ -926,7 +926,7 @@ void func_8028FCBC(void) {
func_80002DAC();
D_800DC510 = 1;
D_80150118 = 3.0f;
D_800DC518 = 0;
creditsRenderMode = 0;
D_802BA032 = 0;
D_8015011E = 0;
gCourseTimer = 0.0f;
src/racing/render_courses.c
+26 -23
View File
@@ -68,9 +68,11 @@ void parse_course_displaylists(uintptr_t addr) {
}
}
extern u32 isFlycam;
void load_surface_map(uintptr_t addr, struct UnkStruct_800DC5EC *arg1) {
Player *temp_t1 = arg1->player;
Camera *temp_a2 = arg1->camera;
Player *player = arg1->player;
Camera *camera = arg1->camera;
u32 segment = SEGMENT_NUMBER2(addr);
u32 offset = SEGMENT_OFFSET(addr);
// todo: Should be Gfx*
@@ -79,32 +81,31 @@ void load_surface_map(uintptr_t addr, struct UnkStruct_800DC5EC *arg1) {
s16 temp_v1;
s16 sp1E;
s16 temp_v0_3;
u16 temp_v0;
u16 rot;
if (gIsMirrorMode) {
temp_v0 = (u16) temp_a2->rot[1];
if (temp_v0 < 0x2000) {
rot = (u16) camera->rot[1];
if (rot < 0x2000) {
var_a3 = 2;
} else if (temp_v0 < 0x6000) {
} else if (rot < 0x6000) {
var_a3 = 3;
} else if (temp_v0 < 0xA000) {
} else if (rot < 0xA000) {
var_a3 = 0;
} else if (temp_v0 < 0xE000) {
} else if (rot < 0xE000) {
var_a3 = 1;
} else {
var_a3 = 2;
}
} else {
temp_v0 = (u16) temp_a2->rot[1];
if (temp_v0 < 0x2000) {
rot = (u16) camera->rot[1];
if (rot < 0x2000) {
var_a3 = 2;
} else if (temp_v0 < 0x6000) {
} else if (rot < 0x6000) {
var_a3 = 1;
}
else if (temp_v0 < 0xA000) {
else if (rot < 0xA000) {
var_a3 = 0;
}
else if (temp_v0 < 0xE000) {
else if (rot < 0xE000) {
var_a3 = 3;
}
else {
@@ -113,20 +114,20 @@ void load_surface_map(uintptr_t addr, struct UnkStruct_800DC5EC *arg1) {
}
arg1->playerDirection = var_a3;
if (D_80152300[temp_a2 - camera1] == 1) {
sp1E = func_802ABD40(temp_a2->unk_54.unk3A);
temp_v0_3 = func_802ABD40(temp_t1->unk_110.unk3A);
if (D_80152300[camera - camera1] == 1) {
sp1E = func_802ABD40(camera->unk_54.unk3A);
temp_v0_3 = func_802ABD40(player->unk_110.unk3A);
temp_v1 = sp1E - temp_v0_3;
if ((temp_v1 < 2) && (temp_v1 >= -1)) {
if (sp1E == 255) {
if (temp_v0_3 == 255) {
temp_v1 = arg1->pathCounter;
} else if (temp_t1->unk_110.unk3C[2] > 30.0f) {
} else if (player->unk_110.unk3C[2] > 30.0f) {
temp_v1 = arg1->pathCounter;
} else {
temp_v1 = temp_v0_3;
}
} else if (temp_a2->unk_54.unk3C[2] > 30.0f) {
} else if (camera->unk_54.unk3C[2] > 30.0f) {
temp_v1 = arg1->pathCounter;
} else {
temp_v1 = sp1E;
@@ -159,7 +160,7 @@ void load_surface_map(uintptr_t addr, struct UnkStruct_800DC5EC *arg1) {
default:
if (temp_v0_3 == 255) {
temp_v1 = arg1->pathCounter;
} else if (temp_t1->unk_110.unk3C[2] > 30.0f) {
} else if (player->unk_110.unk3C[2] > 30.0f) {
temp_v1 = arg1->pathCounter;
} else {
temp_v1 = temp_v0_3;
@@ -168,15 +169,17 @@ void load_surface_map(uintptr_t addr, struct UnkStruct_800DC5EC *arg1) {
}
}
} else {
temp_v1 = func_802ABD40(temp_a2->unk_54.unk3A);
if (temp_a2->unk_54.unk3C[2] > 30.0f) {
temp_v1 = func_802ABD40(camera->unk_54.unk3A);
if (camera->unk_54.unk3C[2] > 30.0f) {
temp_v1 = arg1->pathCounter;
} else if (temp_v1 == 255) {
temp_v1 = arg1->pathCounter;
}
}
arg1->pathCounter = temp_v1;
temp_v1 = ((temp_v1 - 1) * 4) + var_a3;
gSPDisplayList(gDisplayListHead++, gfx[temp_v1]);
}
@@ -1257,7 +1260,7 @@ void func_8029569C(void) {
void func_80295A38(struct UnkStruct_800DC5EC *arg0) {
func_802B5D64((uintptr_t) D_800DC610, D_802B87D4, 0, 1);
if (D_800DC518 != 0) {
if (creditsRenderMode) {
func_8029569C();
return;
}
src/spawn_players.c
+3 -3
View File
@@ -728,9 +728,9 @@ void func_8003C0F0(void) {
case COURSE_WARIO_STADIUM:
case COURSE_DK_JUNGLE:
func_8000F2DC();
sp5E = (f32) D_80164550[0][0].wayPointX;
sp5C = (f32) D_80164550[0][0].wayPointZ;
sp5A = (f32) D_80164550[0][0].wayPointY;
sp5E = (f32) D_80164550[0][0].posX;
sp5C = (f32) D_80164550[0][0].posZ;
sp5A = (f32) D_80164550[0][0].posY;
if (gCurrentCourseId == COURSE_TOADS_TURNPIKE) {
sp5E = 0;
}