mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-08-30 09:49:40 -04:00
update with the decomp (#97)
* Update menus.c (#634) * Update common_data.yml (#635) * Renames for screenId and other changes (#636) * screenId renames * Rename surface map to collision mesh (#637) * Rename some stack vars (#638) * Fix syntax error (#639) * Rename some stack vars * Update collision.c * Collision Documentation (#640) * Collision related renames * update doxygen (#649) * change bool (#644) Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * Update (#642) * Delete trig_tables_bss.c (#650) * fix typo audio (#656) * fix typo src actor (#657) Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * fix typo include (#658) Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * fix course (#659) Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * fix typo debug (#660) Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * fix typo data (#661) Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * replace number with const (#665) * fix typo buffers (#655) * fix typo buffers * tweak ld file * rename to sMemoryPool * add a warning --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * fix typo src (#654) * fix typo src * fix non matcing * Update code_80091750.c --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * fix typo racing (#653) * fix typo racing * get it match * replace G_LINE3D to G_QUAD --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * fix typo src (#652) Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * fix ending typo (#651) * Action more info when it doesn't match and fix first diff (#662) * Update linux-compile.yml * fix first-diff * Update first-diff.py --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * document texture of kart (#663) * document texture of kart * change screenPlayerId to screenId * some documentation around object * Revert "some documentation around object" This reverts commit cbb39078e036bf2a417bed67359e910213acab28. * more rename --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * Make evaluate_collision_players_palm_tree better (#667) This matches just the same as before, but using those two casts instead of shifts seems more likely to be accurate to the original source code Signed-off-by: Gabriel Ravier <gabravier@gmail.com> * add fedora instruciton (#666) Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * start documenting animation (#668) * start documenting animation * Update course_data.c * change comment * update libultra asm (#648) * update libultra asm * fix gcc __osThreadTail --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * Document Vehicles (#641) * start doc collision * fix merge * finish rename fonction related to vehicle * document around waypoint of vehicle * make some modification * make some change and rename one * copy_ to oldPos * doc smoke ferry and train * some rename * fix some renaming * precise index * rename a funciton * simplify waypoint_vehicles * change some name * change some name * rename move_to_point_direction * fix some conflict * Update code_80005FD0.c * Update code_80005FD0.h --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * Label a save info loop (#645) * save info * more gcc progress * fix a value and do a rename (#669) * update clang and add action (#664) * update clang and add action * try clang on course folder only * forget two file * Update course_displaylists.inc.c * forget few other file * Update course_vertices.inc.c * format all code while get it match * second pass * format other dir * disable clang format on bad ido code * fix some tabulation * revert format on tool dir * Update clang-format.yml * ignore gbi.h * add some read me instruction * fix error * format and fixing error * Update README.md --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * Update linkonly_generator.py (#670) * some rename for torch (#588) * rename gBombKartSpawns, and fix cup ID * Update doxygen_syms.md * rename for gCourseIndexInCup and his constant * rename to gCupSelectedCourseIndex * forget a change in constant * fix compilation issue * Update Dockerfile to latest Ubuntu LTS + fixed missing cmake (#674) * Fix color font matrix function (#676) * Fix label variables used in menus (#675) * Fix label variables used in menus * split D_800F2BDC and clang format menu.c --------- Co-authored-by: coco875 <pereira.jannin@gmail.com> * Fix some libultra struct types (#677) * Uintptr (#671) * Update render_courses.c * Update math_util.c * Update math_util.c * Update math_util.h * Update render_courses.c * Clang suggest (#678) * add clang suggestion * Update clang-format-suggest.yml * Update clang-format-suggest.yml * simplify * switch to ubuntu * Update clang-format-suggest.yml * update ubuntu --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * Clang pr (#679) * Create clang-pr.yml * Update clang-pr.yml * Update osCreateMesgQueue.c * Update osCreateMesgQueue.c * Update clang-pr.yml * Update clang-pr.yml * Update clang-format.yml * clang format (#680) Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com> * some rename in ceremony (#647) * rename ceremony * apply some suggestion * some rename --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * clang format (#681) Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com> * Rename Object Timing Related Code (#673) * start making models extraction with blender * finishing extract model * Update fast64 * extract course * Update fast64 * Update fast64 * simplify import of course_displaylists and course_textures and remplace adress with texture * Update fast64 * change data format and simplify the thread queue * move in a blender folder * remove fast64 * re add fast64 * add model_extract and fast64_blender in makefile * multithread with make file split the models into multiple json and add course segment * Update fast64 * remove old model_extract * remove the error when he don't find blender * start rename around course section * rename around object * update submodule fast64 * fix compilation issue and add some model to extract * Update fast64 * remove fast64 * re add fast64 * update submodule * fix compilation issue * add other collision gfx and prepare reorganise file * re arrange json * Create README.MD * Update README.MD * Update README.MD * update fast64 * rename to initiate_next_state * Revert "Merge branch '3d-objects' into general-object" This reverts commit f5347b38cc75af4d10ee3726dc1524c1c71d6849, reversing changes made to a353c4d954fb5b50c8b48fe3f9d67c95ccaab299. * revert the revert... * revert 3d-models PR * finish some revert * Update code_80005FD0.c * fix code_80091750.c * Update code_80091750.c * rename isTimerRunning to isTimerActive and set_object_timer_running to set_object_timer_state * rename to initialize_next_state * rename to object_next_state --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * extract models with blender (#577) * start making models extraction with blender * finishing extract model * Update fast64 * extract course * Update fast64 * Update fast64 * simplify import of course_displaylists and course_textures and remplace adress with texture * Update fast64 * change data format and simplify the thread queue * move in a blender folder * remove fast64 * re add fast64 * add model_extract and fast64_blender in makefile * multithread with make file split the models into multiple json and add course segment * Update fast64 * remove old model_extract * remove the error when he don't find blender * start rename around course section * update submodule fast64 * fix compilation issue and add some model to extract * Update fast64 * remove fast64 * re add fast64 * update submodule * fix compilation issue * add other collision gfx and prepare reorganise file * re arrange json * Create README.MD * Update README.MD * Update README.MD * update fast64 --------- Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> * other * fix some error of compilation * finish fix all error --------- Signed-off-by: Gabriel Ravier <gabravier@gmail.com> Co-authored-by: MegaMech <MegaMech@users.noreply.github.com> Co-authored-by: Gabriel Ravier <gabravier@gmail.com> Co-authored-by: MisterSheeple <27652712+MisterSheeple@users.noreply.github.com> Co-authored-by: AloXado320 <38191089+AloXado320@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
This commit is contained in:
coco875
+31
-31
@@ -2388,7 +2388,7 @@ s16 find_closest_waypoint_track_section(f32 posX, f32 posY, f32 posZ, u16 trackS
|
||||
/**
|
||||
* Tries to find the waypoint nearest to (posX, posY, posZ)
|
||||
* Only consider waypoints in the same segment as trackSectionId
|
||||
* Only considers waypoints within 500 units of (posX, posY, posZ)
|
||||
* Only considers waypoints within 500 units of(posX, posY, posZ)
|
||||
* Looks 3 waypoints behind and 6 waypoints ahead of waypointIndex
|
||||
**/
|
||||
s16 func_8000C884(f32 posX, f32 posY, f32 posZ, s16 waypointIndex, s32 pathIndex, u16 trackSectionId) {
|
||||
@@ -2931,24 +2931,24 @@ void set_bomb_kart_spawn_positions(void) {
|
||||
s32 var_s3;
|
||||
TrackWaypoint* temp_v0;
|
||||
UNUSED BombKart* var_s0;
|
||||
BombKartSpawn* temp_s1;
|
||||
BombKartSpawn* bombKartSpawn;
|
||||
|
||||
for (var_s3 = 0; var_s3 < NUM_BOMB_KARTS_VERSUS; var_s3++) {
|
||||
temp_s1 = &gBombKartSpawns[gCurrentCourseId][var_s3];
|
||||
bombKartSpawn = &gBombKartSpawns[gCurrentCourseId][var_s3];
|
||||
switch (gCurrentCourseId) {
|
||||
case COURSE_YOSHI_VALLEY:
|
||||
startingXPos = temp_s1->startingXPos;
|
||||
startingZPos = temp_s1->startingZPos;
|
||||
startingXPos = bombKartSpawn->startingXPos;
|
||||
startingZPos = bombKartSpawn->startingZPos;
|
||||
startingYPos = spawn_actor_on_surface(startingXPos, 2000.0f, startingZPos);
|
||||
break;
|
||||
case COURSE_AWARD_CEREMONY:
|
||||
temp_v0 = &D_80164550[3][temp_s1->waypointIndex];
|
||||
temp_v0 = &D_80164550[3][bombKartSpawn->waypointIndex];
|
||||
startingXPos = temp_v0->posX;
|
||||
startingYPos = temp_v0->posY;
|
||||
startingZPos = temp_v0->posZ;
|
||||
break;
|
||||
default:
|
||||
temp_v0 = &D_80164550[0][temp_s1->waypointIndex];
|
||||
temp_v0 = &D_80164550[0][bombKartSpawn->waypointIndex];
|
||||
startingXPos = temp_v0->posX;
|
||||
startingYPos = temp_v0->posY;
|
||||
startingZPos = temp_v0->posZ;
|
||||
@@ -2969,11 +2969,11 @@ void set_bomb_kart_spawn_positions(void) {
|
||||
gBombKarts[var_s3].wheel4Pos[0] = startingXPos;
|
||||
gBombKarts[var_s3].wheel4Pos[1] = startingYPos;
|
||||
gBombKarts[var_s3].wheel4Pos[2] = startingZPos;
|
||||
gBombKarts[var_s3].waypointIndex = temp_s1->waypointIndex;
|
||||
gBombKarts[var_s3].unk_3C = temp_s1->unk_04;
|
||||
gBombKarts[var_s3].waypointIndex = bombKartSpawn->waypointIndex;
|
||||
gBombKarts[var_s3].unk_3C = bombKartSpawn->unk_04;
|
||||
gBombKarts[var_s3].bounceTimer = 0;
|
||||
gBombKarts[var_s3].circleTimer = 0;
|
||||
gBombKarts[var_s3].state = temp_s1->startingState;
|
||||
gBombKarts[var_s3].state = bombKartSpawn->startingState;
|
||||
gBombKarts[var_s3].unk_4A = 0;
|
||||
gBombKarts[var_s3].unk_4C = 1;
|
||||
gBombKarts[var_s3].yPos = startingYPos;
|
||||
@@ -5423,26 +5423,26 @@ void func_80014D30(s32 cameraId, s32 pathIndex) {
|
||||
(f32) temp_v0->posZ);
|
||||
}
|
||||
|
||||
void func_80014DE4(s32 arg0) {
|
||||
void func_80014DE4(s32 cameraIndex) {
|
||||
s32 cameraId;
|
||||
|
||||
D_801646CC = 0;
|
||||
D_80164678[arg0] = D_80164670[arg0];
|
||||
if ((gModeSelection != 1) && ((gCupCourseSelection == 0) || (gDemoMode == (u16) 1))) {
|
||||
D_80164678[arg0] = 0;
|
||||
} else if ((D_80164678[arg0] != 0) && (D_80164678[arg0] != (s16) 1) && (D_80164678[arg0] != 2) &&
|
||||
(D_80164678[arg0] != 3)) {
|
||||
D_80164678[arg0] = 0;
|
||||
D_80164678[cameraIndex] = D_80164670[cameraIndex];
|
||||
if ((gModeSelection != 1) && ((gCourseIndexInCup == COURSE_ONE) || (gDemoMode == (u16) 1))) {
|
||||
D_80164678[cameraIndex] = 0;
|
||||
} else if ((D_80164678[cameraIndex] != 0) && (D_80164678[cameraIndex] != (s16) 1) &&
|
||||
(D_80164678[cameraIndex] != 2) && (D_80164678[cameraIndex] != 3)) {
|
||||
D_80164678[cameraIndex] = 0;
|
||||
}
|
||||
D_80164680[arg0] = -1;
|
||||
D_80164680[cameraIndex] = -1;
|
||||
D_80163238 = 0;
|
||||
D_801646C0[arg0] = 0;
|
||||
D_801646C0[cameraIndex] = 0;
|
||||
D_801646C8 = 0;
|
||||
D_801646D0[arg0].unk0 = 0;
|
||||
D_801646D0[arg0].unk2 = 0;
|
||||
D_801646D0[arg0].unk4 = 0;
|
||||
D_801646D0[cameraIndex].unk0 = 0;
|
||||
D_801646D0[cameraIndex].unk2 = 0;
|
||||
D_801646D0[cameraIndex].unk4 = 0;
|
||||
if ((gModeSelection == 1) && (D_8018EDFC == 0)) {
|
||||
D_80164678[arg0] = 0;
|
||||
D_80164678[cameraIndex] = 0;
|
||||
}
|
||||
|
||||
for (cameraId = 0; cameraId < 4; cameraId++) {
|
||||
@@ -5529,7 +5529,7 @@ f32 func_80014EE4(f32 arg0, s32 arg1) {
|
||||
return arg0;
|
||||
}
|
||||
|
||||
void func_800151A4(Camera* camera, s32 arg1) {
|
||||
void calculate_camera_up_vector(Camera* camera, s32 cameraIndex) {
|
||||
f32 xnorm;
|
||||
f32 ynorm;
|
||||
f32 znorm;
|
||||
@@ -5540,7 +5540,7 @@ void func_800151A4(Camera* camera, s32 arg1) {
|
||||
f32 sp28;
|
||||
u16 thing;
|
||||
|
||||
thing = D_801646C0[arg1];
|
||||
thing = D_801646C0[cameraIndex];
|
||||
if (thing == 0) {
|
||||
camera->up[0] = 0.0f;
|
||||
camera->up[2] = 0.0f;
|
||||
@@ -6662,10 +6662,10 @@ void func_80019890(s32 playerId, s32 cameraId) {
|
||||
}
|
||||
}
|
||||
|
||||
void func_80019B50(s32 arg0, u16 arg1) {
|
||||
void func_80019B50(s32 cameraIndex, u16 arg1) {
|
||||
u16 var_v0;
|
||||
|
||||
var_v0 = D_801646C0[arg0];
|
||||
var_v0 = D_801646C0[cameraIndex];
|
||||
if (var_v0 < arg1) {
|
||||
if ((arg1 - var_v0) < 0x8000) {
|
||||
var_v0 += 0x5A;
|
||||
@@ -6689,10 +6689,10 @@ void func_80019B50(s32 arg0, u16 arg1) {
|
||||
}
|
||||
} else if ((var_v0 - arg1) >= 0x8000) {
|
||||
var_v0 += 0x5A;
|
||||
if (!arg0) {} // wtf?
|
||||
if (!cameraIndex) {} // wtf?
|
||||
}
|
||||
}
|
||||
D_801646C0[arg0] = (s16) var_v0;
|
||||
D_801646C0[cameraIndex] = (s16) var_v0;
|
||||
}
|
||||
|
||||
void func_80019C50(s32 arg0) {
|
||||
@@ -6720,7 +6720,7 @@ void func_80019D2C(Camera* camera, Player* player, s32 arg2) {
|
||||
|
||||
playerId = camera->playerId;
|
||||
if ((D_80163378 != 0) && (gCurrentCourseId == 8)) {
|
||||
func_800151A4(camera, arg2);
|
||||
calculate_camera_up_vector(camera, arg2);
|
||||
nearestWaypoint = gNearestWaypointByPlayerId[playerId];
|
||||
if (((nearestWaypoint >= 0x65) && (nearestWaypoint < 0xFA)) ||
|
||||
((nearestWaypoint >= 0x1AF) && (nearestWaypoint < 0x226))) {
|
||||
@@ -6956,7 +6956,7 @@ void func_8001A588(UNUSED u16* localD_80152300, Camera* camera, Player* player,
|
||||
func_80019D2C(camera, player, cameraIndex);
|
||||
} else {
|
||||
D_801646C0[cameraIndex] = 0;
|
||||
func_800151A4(camera, cameraIndex);
|
||||
calculate_camera_up_vector(camera, cameraIndex);
|
||||
}
|
||||
switch ((u16) D_801646CC) {
|
||||
case 1:
|
||||
|
||||
Reference in New Issue
Block a user