summaryrefslogtreecommitdiff
path: root/courses
diff options
context:
space:
mode:
authorcoco875 <59367621+coco875@users.noreply.github.com>2024-09-17 17:32:50 +0200
committerGitHub <noreply@github.com>2024-09-17 09:32:50 -0600
commit203090e5913f79df01ee273e40dea03b294f061e (patch)
tree2ee78c50742b20238c07610b8ba9f7f93c3a80e1 /courses
parentd36d7dcd604d0f85b6b547a85e9b7a4fe3e59b5c (diff)
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>
Diffstat (limited to 'courses')
-rw-r--r--courses/all_course_offsets.h22
-rw-r--r--courses/banshee_boardwalk/course_offsets.c5
-rw-r--r--courses/dks_jungle_parkway/course_offsets.c2
-rw-r--r--courses/frappe_snowland/course_offsets.c2
-rw-r--r--courses/koopa_troopa_beach/course_offsets.c2
-rw-r--r--courses/mario_raceway/course_offsets.c4
-rw-r--r--courses/toads_turnpike/course_offsets.c2
-rw-r--r--courses/yoshi_valley/course_offsets.c21
8 files changed, 50 insertions, 10 deletions
diff --git a/courses/all_course_offsets.h b/courses/all_course_offsets.h
index 8275ea2e3..3deb7e79a 100644
--- a/courses/all_course_offsets.h
+++ b/courses/all_course_offsets.h
@@ -3,11 +3,12 @@
#include "course_offsets.h"
+#ifndef TARGET_N64
extern const char* rainbow_road_dls[];
-extern const char* yoshi_valley_dls[];
-extern const char* toads_turnpike_dls[];
+extern const char* d_course_yoshi_valley_dl_list[];
+extern const char* d_course_toads_turnpike_dl_list[];
extern const char* banshee_boardwalk_dls[];
-extern const char* frappe_snowland_dls[];
+extern const char* d_course_frappe_snowland_dl_list[];
extern const char* bowsers_castle_dls[];
extern const char* choco_mountain_dls[];
extern const char* kalimari_desert_dls[];
@@ -18,7 +19,20 @@ extern const char* royal_raceway_dls[];
extern const char* sherbet_land_dls[];
extern const char* sherbet_land_dls_2[];
extern const char* wario_stadium_dls[];
-extern const char* dks_jungle_parkway_dls[];
+extern const char* d_course_dks_jungle_parkway_unknown_dl_list[];
+#else
+extern Gfx* banshee_boardwalk_dls[];
+extern Gfx* bowsers_castle_dls[];
+extern Gfx* choco_mountain_dls[];
+extern Gfx* kalimari_desert_dls[];
+extern Gfx* luigi_raceway_dls[];
+extern Gfx* mario_raceway_dls[];
+extern Gfx* moo_moo_farm_dls[];
+extern Gfx* royal_raceway_dls[];
+extern Gfx* sherbet_land_dls[];
+extern Gfx* sherbet_land_dls_2[];
+extern Gfx* wario_stadium_dls[];
+#endif
extern const course_texture banshee_boardwalk_textures[];
extern const course_texture big_donut_textures[];
diff --git a/courses/banshee_boardwalk/course_offsets.c b/courses/banshee_boardwalk/course_offsets.c
index bf9b395fd..3ddce786a 100644
--- a/courses/banshee_boardwalk/course_offsets.c
+++ b/courses/banshee_boardwalk/course_offsets.c
@@ -1,5 +1,10 @@
+#ifndef TARGET_N64
#include <libultra/types.h>
#include <libultra/gbi.h>
+#else
+#include <PR/ultratypes.h>
+#include <PR/gbi.h>
+#endif
#include "course_offsets.h"
#include <assets/banshee_boardwalk_data.h>
#include <libultra/gbi.h>
diff --git a/courses/dks_jungle_parkway/course_offsets.c b/courses/dks_jungle_parkway/course_offsets.c
index 06f9abcf9..347fe7277 100644
--- a/courses/dks_jungle_parkway/course_offsets.c
+++ b/courses/dks_jungle_parkway/course_offsets.c
@@ -30,7 +30,7 @@ const course_texture dks_jungle_parkway_textures[] = {
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
-const Gfx* dks_jungle_parkway_dls[] = {
+const Gfx* d_course_dks_jungle_parkway_unknown_dl_list[] = {
d_course_dks_jungle_parkway_dl_20, d_course_dks_jungle_parkway_dl_210, d_course_dks_jungle_parkway_dl_180,
d_course_dks_jungle_parkway_dl_310, d_course_dks_jungle_parkway_dl_400, d_course_dks_jungle_parkway_dl_628,
d_course_dks_jungle_parkway_dl_560, d_course_dks_jungle_parkway_dl_750, d_course_dks_jungle_parkway_dl_888,
diff --git a/courses/frappe_snowland/course_offsets.c b/courses/frappe_snowland/course_offsets.c
index a659fcb73..76f5b4458 100644
--- a/courses/frappe_snowland/course_offsets.c
+++ b/courses/frappe_snowland/course_offsets.c
@@ -10,7 +10,7 @@ const course_texture frappe_snowland_textures[] = {
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
-const Gfx* frappe_snowland_dls[] = {
+const Gfx* d_course_frappe_snowland_dl_list[] = {
d_course_frappe_snowland_dl_0, d_course_frappe_snowland_dl_1B8, d_course_frappe_snowland_dl_C8,
d_course_frappe_snowland_dl_298, d_course_frappe_snowland_dl_398, d_course_frappe_snowland_dl_540,
d_course_frappe_snowland_dl_458, d_course_frappe_snowland_dl_610, d_course_frappe_snowland_dl_728,
diff --git a/courses/koopa_troopa_beach/course_offsets.c b/courses/koopa_troopa_beach/course_offsets.c
index 245db06e0..45c5d010d 100644
--- a/courses/koopa_troopa_beach/course_offsets.c
+++ b/courses/koopa_troopa_beach/course_offsets.c
@@ -22,7 +22,7 @@ const course_texture koopa_troopa_beach_textures[] = {
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
-Gfx* koopa_troopa_beach_dls1[] = {
+Gfx* d_course_koopa_troopa_beach_dl_list1[] = {
d_course_koopa_troopa_beach_dl_90, d_course_koopa_troopa_beach_dl_278, d_course_koopa_troopa_beach_dl_188,
d_course_koopa_troopa_beach_dl_3C0, d_course_koopa_troopa_beach_dl_4B0, d_course_koopa_troopa_beach_dl_6E0,
d_course_koopa_troopa_beach_dl_5A0, d_course_koopa_troopa_beach_dl_828, d_course_koopa_troopa_beach_dl_960,
diff --git a/courses/mario_raceway/course_offsets.c b/courses/mario_raceway/course_offsets.c
index 9794e3031..2a2526ad8 100644
--- a/courses/mario_raceway/course_offsets.c
+++ b/courses/mario_raceway/course_offsets.c
@@ -36,7 +36,11 @@ const course_texture mario_raceway_textures[] = {
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
+#ifndef TARGET_N64
const char* mario_raceway_dls[] = {
+#else
+const Gfx* mario_raceway_dls[] = {
+#endif
d_course_mario_raceway_dl_0, d_course_mario_raceway_dl_1D0, d_course_mario_raceway_dl_E8,
d_course_mario_raceway_dl_2C8, d_course_mario_raceway_dl_3A8, d_course_mario_raceway_dl_568,
d_course_mario_raceway_dl_478, d_course_mario_raceway_dl_668, d_course_mario_raceway_dl_750,
diff --git a/courses/toads_turnpike/course_offsets.c b/courses/toads_turnpike/course_offsets.c
index db4cfeda8..b702ab56e 100644
--- a/courses/toads_turnpike/course_offsets.c
+++ b/courses/toads_turnpike/course_offsets.c
@@ -26,7 +26,7 @@ const course_texture toads_turnpike_textures[] = {
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
-Gfx* toads_turnpike_dls[] = {
+Gfx* d_course_toads_turnpike_dl_list[] = {
d_course_toads_turnpike_dl_80, d_course_toads_turnpike_dl_1F8, d_course_toads_turnpike_dl_158,
d_course_toads_turnpike_dl_2D0, d_course_toads_turnpike_dl_380, d_course_toads_turnpike_dl_4E8,
d_course_toads_turnpike_dl_438, d_course_toads_turnpike_dl_5B8, d_course_toads_turnpike_dl_668,
diff --git a/courses/yoshi_valley/course_offsets.c b/courses/yoshi_valley/course_offsets.c
index 3fccfb0e8..959c2dcc4 100644
--- a/courses/yoshi_valley/course_offsets.c
+++ b/courses/yoshi_valley/course_offsets.c
@@ -3,7 +3,24 @@
#include <assets/other_textures.h>
#include <assets/yoshi_valley_data.h>
-course_texture yoshi_valley_textures[] = {
+#ifdef TARGET_N64
+extern u8 gTexture66EBF0[];
+extern u8 gTextureWoodBridgeSlats[];
+extern u8 gTexture65E2EC[];
+extern u8 gTexture6846DC[];
+extern u8 gTextureFenceRope[];
+extern u8 gTexture685108[];
+extern u8 gTexture64CC20[];
+extern u8 gTextureGrass4[];
+extern u8 gTexture6775EC[];
+extern u8 gTexture68E2D0[];
+extern u8 gTextureCheckerboardBlackWhite[];
+extern u8 gTexture643B3C[];
+extern u8 gTextureSignWoodRedArrow[];
+extern u8 gTexture68DEC0[];
+#endif
+
+const course_texture yoshi_valley_textures[] = {
{ gTexture66EBF0, 0x0146, 0x0800, 0x0 },
{ gTextureWoodBridgeSlats, 0x0DAB, 0x1000, 0x0 },
{ gTexture65E2EC, 0x02B0, 0x0800, 0x0 },
@@ -21,7 +38,7 @@ course_texture yoshi_valley_textures[] = {
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
-Gfx* yoshi_valley_dls[] = {
+Gfx* d_course_yoshi_valley_dl_list[] = {
d_course_yoshi_valley_dl_40, d_course_yoshi_valley_dl_3F0, d_course_yoshi_valley_dl_290,
d_course_yoshi_valley_dl_4E8, d_course_yoshi_valley_dl_7A0, d_course_yoshi_valley_dl_BC0,
d_course_yoshi_valley_dl_9C8, d_course_yoshi_valley_dl_CC0, // <- No idea what this is supposed to be a pointer to