summaryrefslogtreecommitdiff
path: root/courses
diff options
context:
space:
mode:
authorMegaMech <MegaMech@users.noreply.github.com>2024-04-09 21:29:57 -0600
committerGitHub <noreply@github.com>2024-04-09 21:29:57 -0600
commit3da5a4f343fa708abcc461d83337ef6df9863447 (patch)
tree2ff74ffb532a89e5af9666250c2c60e7f339f9c0 /courses
parent2b66867af1975759dc7acfb3bbc2c9063ffa4353 (diff)
Add ymls for Torch code generator (#497)
* Add torch * update jenkinsfile
Diffstat (limited to 'courses')
-rw-r--r--courses/frappe_snowland/course_data.c4
-rw-r--r--courses/frappe_snowland/course_data.h4
-rw-r--r--courses/koopa_troopa_beach/course_data.c6
-rw-r--r--courses/koopa_troopa_beach/course_data.h6
-rw-r--r--courses/sherbet_land/course_data.c2
-rw-r--r--courses/sherbet_land/course_data.h2
-rw-r--r--courses/toads_turnpike/course_offsets.c2
-rw-r--r--courses/wario_stadium/course_data.c2
-rw-r--r--courses/wario_stadium/course_data.h2
-rw-r--r--courses/yoshi_valley/course_data.c16
-rw-r--r--courses/yoshi_valley/course_data.h16
11 files changed, 31 insertions, 31 deletions
diff --git a/courses/frappe_snowland/course_data.c b/courses/frappe_snowland/course_data.c
index 08b5a7872..6e976ea92 100644
--- a/courses/frappe_snowland/course_data.c
+++ b/courses/frappe_snowland/course_data.c
@@ -1964,7 +1964,7 @@ Gfx d_course_frappe_snowland_dl_33E0[] =
gsSPEndDisplayList(),
};
-TrackWaypoint d_course_frappe_unknown_waypoints[] = {
+TrackWaypoint d_course_frappe_snowland_unknown_waypoints[] = {
{-4, 0, -259, 0},
{-4, 0, -282, 0},
{-10, 0, -526, 0},
@@ -2040,7 +2040,7 @@ TrackWaypoint d_course_frappe_unknown_waypoints[] = {
{-32768, 0, 0, 0},
};
-TrackWaypoint d_course_frappe_track_waypoints[] = {
+TrackWaypoint d_course_frappe_snowland_track_waypoints[] = {
{-4, 0, -270, 1},
{-4, 0, -290, 1},
{-4, 0, -310, 2},
diff --git a/courses/frappe_snowland/course_data.h b/courses/frappe_snowland/course_data.h
index 57a138013..0b84bc3a2 100644
--- a/courses/frappe_snowland/course_data.h
+++ b/courses/frappe_snowland/course_data.h
@@ -75,8 +75,8 @@ extern Gfx d_course_frappe_snowland_dl_3198[];
extern Gfx d_course_frappe_snowland_dl_3270[];
extern Gfx d_course_frappe_snowland_dl_3328[];
extern Gfx d_course_frappe_snowland_dl_33E0[];
-extern TrackWaypoint d_course_frappe_unknown_waypoints[];
-extern TrackWaypoint d_course_frappe_track_waypoints[];
+extern TrackWaypoint d_course_frappe_snowland_unknown_waypoints[];
+extern TrackWaypoint d_course_frappe_snowland_track_waypoints[];
extern u8 d_course_frappe_snowland_snowman_tlut[];
extern u8 d_course_frappe_snowland_snowman_head[];
extern u8 d_course_frappe_snowland_snowman_body[];
diff --git a/courses/koopa_troopa_beach/course_data.c b/courses/koopa_troopa_beach/course_data.c
index 25e28ce8b..18486f27b 100644
--- a/courses/koopa_troopa_beach/course_data.c
+++ b/courses/koopa_troopa_beach/course_data.c
@@ -6766,7 +6766,7 @@ Gfx d_course_koopa_troopa_beach_dl_AD40[] =
};
// 0xADE0 path
-TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints0[] = {
+TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints[] = {
{-34, 0, 103, 0},
{-34, 0, 60, 0},
{-38, 0, -184, 0},
@@ -6893,7 +6893,7 @@ TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints1[] = {
{-32768, 0, 0, 0},
};
-TrackWaypoint d_course_koopa_troopa_beach_track_waypoints0[] = {
+TrackWaypoint d_course_koopa_troopa_beach_track_waypoints[] = {
{-34, 1, 81, 1},
{-34, 1, 61, 1},
{-34, 1, 41, 1},
@@ -7505,7 +7505,7 @@ TrackWaypoint d_course_koopa_troopa_beach_track_waypoints0[] = {
{-32768, -32768, -32768, 0},
};
-TrackWaypoint d_course_koopa_troopa_beach_track_waypoints1[] = {
+TrackWaypoint d_course_koopa_troopa_beach_track_waypoints_2[] = {
{-29, 1, 88, 1},
{-29, 1, 68, 1},
{-29, 1, 48, 1},
diff --git a/courses/koopa_troopa_beach/course_data.h b/courses/koopa_troopa_beach/course_data.h
index 4a2a3b274..0ba1be885 100644
--- a/courses/koopa_troopa_beach/course_data.h
+++ b/courses/koopa_troopa_beach/course_data.h
@@ -306,10 +306,10 @@ extern Gfx d_course_koopa_troopa_beach_dl_AB88[];
extern Gfx d_course_koopa_troopa_beach_dl_AC10[];
extern Gfx d_course_koopa_troopa_beach_dl_AC68[];
extern Gfx d_course_koopa_troopa_beach_dl_AD40[];
-extern TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints0[];
+extern TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints[];
extern TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints1[];
-extern TrackWaypoint d_course_koopa_troopa_beach_track_waypoints0[];
-extern TrackWaypoint d_course_koopa_troopa_beach_track_waypoints1[];
+extern TrackWaypoint d_course_koopa_troopa_beach_track_waypoints[];
+extern TrackWaypoint d_course_koopa_troopa_beach_track_waypoints_2[];
extern u8 d_course_koopa_troopa_beach_crab_tlut[];
extern u8 d_course_koopa_troopa_beach_crab_frames[][4096];
extern u32 d_course_koopa_troopa_beach_unk_data1[];
diff --git a/courses/sherbet_land/course_data.c b/courses/sherbet_land/course_data.c
index 264e19aae..4eb7376ee 100644
--- a/courses/sherbet_land/course_data.c
+++ b/courses/sherbet_land/course_data.c
@@ -3017,7 +3017,7 @@ Gfx d_course_sherbet_land_dl_4B20[] =
};
// unk 0x4BF8
-TrackWaypoint d_course_sherbet_land_uknown_waypoints[] = {
+TrackWaypoint d_course_sherbet_land_unknown_waypoints[] = {
{-10, 0, 10, 0},
{-10, 0, -8, 0},
{-18, 0, -213, 0},
diff --git a/courses/sherbet_land/course_data.h b/courses/sherbet_land/course_data.h
index 010d86360..7479a228a 100644
--- a/courses/sherbet_land/course_data.h
+++ b/courses/sherbet_land/course_data.h
@@ -152,7 +152,7 @@ extern Gfx d_course_sherbet_land_dl_4930[];
extern Gfx d_course_sherbet_land_dl_4A20[];
extern Gfx d_course_sherbet_land_dl_4A98[];
extern Gfx d_course_sherbet_land_dl_4B20[];
-extern TrackWaypoint d_course_sherbet_land_uknown_waypoints[];
+extern TrackWaypoint d_course_sherbet_land_unknown_waypoints[];
extern TrackWaypoint d_course_sherbet_land_track_waypoints[];
extern Vtx d_course_sherbet_land_model1[];
extern Vtx d_course_sherbet_land_model2[];
diff --git a/courses/toads_turnpike/course_offsets.c b/courses/toads_turnpike/course_offsets.c
index d8136403f..4a2066ed4 100644
--- a/courses/toads_turnpike/course_offsets.c
+++ b/courses/toads_turnpike/course_offsets.c
@@ -1,6 +1,6 @@
#include <PR/ultratypes.h>
#include <PR/mbi.h>
-#include "common_textures.h"
+#include <assets/common_data.h>
#include "course_offsets.h"
#include "course_data.h"
diff --git a/courses/wario_stadium/course_data.c b/courses/wario_stadium/course_data.c
index 2854cfdad..6c75f57d5 100644
--- a/courses/wario_stadium/course_data.c
+++ b/courses/wario_stadium/course_data.c
@@ -3294,7 +3294,7 @@ TrackWaypoint d_course_wario_stadium_unknown_waypoints[] = {
{-32768, 0, 0, 0},
};
-TrackWaypoint d_course_wario_staduim_track_waypoints[] = {
+TrackWaypoint d_course_wario_stadium_track_waypoints[] = {
{13, 0, -9, 1},
{11, 0, -28, 1},
{11, 0, -48, 1},
diff --git a/courses/wario_stadium/course_data.h b/courses/wario_stadium/course_data.h
index 2db0889d9..1fc5d7515 100644
--- a/courses/wario_stadium/course_data.h
+++ b/courses/wario_stadium/course_data.h
@@ -116,7 +116,7 @@ extern Gfx d_course_wario_stadium_dl_5460[];
extern Gfx d_course_wario_stadium_dl_54E8[];
extern Gfx d_course_wario_stadium_dl_5588[];
extern TrackWaypoint d_course_wario_stadium_unknown_waypoints[];
-extern TrackWaypoint d_course_wario_staduim_track_waypoints[];
+extern TrackWaypoint d_course_wario_stadium_track_waypoints[];
extern Vtx d_course_wario_stadium_sign_head_model1[];
extern Vtx d_course_wario_stadium_sign_head_model2[];
extern Vtx d_course_wario_stadium_sign_head_model3[];
diff --git a/courses/yoshi_valley/course_data.c b/courses/yoshi_valley/course_data.c
index ddac83046..bc80ad2f0 100644
--- a/courses/yoshi_valley/course_data.c
+++ b/courses/yoshi_valley/course_data.c
@@ -7407,7 +7407,7 @@ Gfx d_course_yoshi_valley_dl_D540[] =
// 0xD780
-TrackWaypoint d_course_yoshi_valley_unknown_waypoints0[] = {
+TrackWaypoint d_course_yoshi_valley_unknown_waypoints[] = {
{-3, 0, -4, 0},
{-3, 0, -20, 0},
{-3, 0, -261, 0},
@@ -7483,7 +7483,7 @@ TrackWaypoint d_course_yoshi_valley_unknown_waypoints0[] = {
{-32768, 0, 0, 0},
};
-TrackWaypoint d_course_yoshi_valley_unknown_waypoints1[] = {
+TrackWaypoint d_course_yoshi_valley_unknown_waypoints_2[] = {
{-6, 0, -5, 1},
{-6, 0, -21, 1},
{-5, 0, -434, 1},
@@ -7560,7 +7560,7 @@ TrackWaypoint d_course_yoshi_valley_unknown_waypoints1[] = {
{-32768, 0, 0, 0},
};
-TrackWaypoint d_course_yoshi_valley_unknown_waypoints2[] = {
+TrackWaypoint d_course_yoshi_valley_unknown_waypoints_3[] = {
{-3, 0, -3, 4},
{-3, 0, -19, 4},
{0, 0, -268, 4},
@@ -7645,7 +7645,7 @@ TrackWaypoint d_course_yoshi_valley_unknown_waypoints2[] = {
{-32768, 0, 0, 0},
};
-TrackWaypoint d_course_yoshi_valley_unknown_waypoints3[] = {
+TrackWaypoint d_course_yoshi_valley_unknown_waypoints_4[] = {
{-2, 0, -1, 7},
{0, 0, -18, 7},
{-2, 0, -268, 7},
@@ -7733,7 +7733,7 @@ TrackWaypoint d_course_yoshi_valley_unknown_waypoints3[] = {
{-32768, 0, 0, 0},
};
-TrackWaypoint d_course_yoshi_valley_track_waypoints0[] = {
+TrackWaypoint d_course_yoshi_valley_track_waypoints[] = {
{-3, 180, -12, 1},
{-3, 180, -32, 2},
{-3, 180, -52, 2},
@@ -8414,7 +8414,7 @@ TrackWaypoint d_course_yoshi_valley_track_waypoints0[] = {
{-32768, -32768, -32768, 0},
};
-TrackWaypoint d_course_yoshi_valley_track_waypoints1[] = {
+TrackWaypoint d_course_yoshi_valley_track_waypoints_2[] = {
{-6, 180, -13, 1},
{-5, 180, -33, 2},
{-5, 180, -53, 2},
@@ -9084,7 +9084,7 @@ TrackWaypoint d_course_yoshi_valley_track_waypoints1[] = {
{-32768, -32768, -32768, 0},
};
-TrackWaypoint d_course_yoshi_valley_track_waypoints2[] = {
+TrackWaypoint d_course_yoshi_valley_track_waypoints_3[] = {
{-3, 180, -11, 1},
{-2, 180, -31, 2},
{-2, 180, -51, 2},
@@ -9766,7 +9766,7 @@ TrackWaypoint d_course_yoshi_valley_track_waypoints2[] = {
{-32768, -32768, -32768, 0},
};
-TrackWaypoint d_course_yoshi_valley_track_waypoints3[] = {
+TrackWaypoint d_course_yoshi_valley_track_waypoints_4[] = {
{-1, 180, -9, 1},
{0, 180, -29, 2},
{0, 180, -49, 2},
diff --git a/courses/yoshi_valley/course_data.h b/courses/yoshi_valley/course_data.h
index 6210ee380..7110a18a2 100644
--- a/courses/yoshi_valley/course_data.h
+++ b/courses/yoshi_valley/course_data.h
@@ -133,14 +133,14 @@ extern Gfx d_course_yoshi_valley_dl_D018[];
extern Gfx d_course_yoshi_valley_dl_D1E8[];
extern Gfx d_course_yoshi_valley_dl_D3D0[];
extern Gfx d_course_yoshi_valley_dl_D540[];
-extern TrackWaypoint d_course_yoshi_valley_unknown_waypoints0[];
-extern TrackWaypoint d_course_yoshi_valley_unknown_waypoints1[];
-extern TrackWaypoint d_course_yoshi_valley_unknown_waypoints2[];
-extern TrackWaypoint d_course_yoshi_valley_unknown_waypoints3[];
-extern TrackWaypoint d_course_yoshi_valley_track_waypoints0[];
-extern TrackWaypoint d_course_yoshi_valley_track_waypoints1[];
-extern TrackWaypoint d_course_yoshi_valley_track_waypoints2[];
-extern TrackWaypoint d_course_yoshi_valley_track_waypoints3[];
+extern TrackWaypoint d_course_yoshi_valley_unknown_waypoints[];
+extern TrackWaypoint d_course_yoshi_valley_unknown_waypoints_2[];
+extern TrackWaypoint d_course_yoshi_valley_unknown_waypoints_3[];
+extern TrackWaypoint d_course_yoshi_valley_unknown_waypoints_4[];
+extern TrackWaypoint d_course_yoshi_valley_track_waypoints[];
+extern TrackWaypoint d_course_yoshi_valley_track_waypoints_2[];
+extern TrackWaypoint d_course_yoshi_valley_track_waypoints_3[];
+extern TrackWaypoint d_course_yoshi_valley_track_waypoints_4[];
extern Lights1 d_course_yoshi_valley_unknown_light1;
extern Lights1 d_course_yoshi_valley_unknown_light2;
extern Lights1 d_course_yoshi_valley_unknown_light3;