mirror of
https://github.com/n64decomp/mk64
synced 2026-08-26 07:32:46 -04:00
Revert "Add ymls for Torch code generator (#497)"
This reverts commit 3da5a4f343.
This commit is contained in:
@@ -1964,7 +1964,7 @@ Gfx d_course_frappe_snowland_dl_33E0[] =
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
|
||||
TrackWaypoint d_course_frappe_snowland_unknown_waypoints[] = {
|
||||
TrackWaypoint d_course_frappe_unknown_waypoints[] = {
|
||||
{-4, 0, -259, 0},
|
||||
{-4, 0, -282, 0},
|
||||
{-10, 0, -526, 0},
|
||||
@@ -2040,7 +2040,7 @@ TrackWaypoint d_course_frappe_snowland_unknown_waypoints[] = {
|
||||
{-32768, 0, 0, 0},
|
||||
};
|
||||
|
||||
TrackWaypoint d_course_frappe_snowland_track_waypoints[] = {
|
||||
TrackWaypoint d_course_frappe_track_waypoints[] = {
|
||||
{-4, 0, -270, 1},
|
||||
{-4, 0, -290, 1},
|
||||
{-4, 0, -310, 2},
|
||||
|
||||
@@ -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_snowland_unknown_waypoints[];
|
||||
extern TrackWaypoint d_course_frappe_snowland_track_waypoints[];
|
||||
extern TrackWaypoint d_course_frappe_unknown_waypoints[];
|
||||
extern TrackWaypoint d_course_frappe_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[];
|
||||
|
||||
@@ -6766,7 +6766,7 @@ Gfx d_course_koopa_troopa_beach_dl_AD40[] =
|
||||
};
|
||||
|
||||
// 0xADE0 path
|
||||
TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints[] = {
|
||||
TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints0[] = {
|
||||
{-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_waypoints[] = {
|
||||
TrackWaypoint d_course_koopa_troopa_beach_track_waypoints0[] = {
|
||||
{-34, 1, 81, 1},
|
||||
{-34, 1, 61, 1},
|
||||
{-34, 1, 41, 1},
|
||||
@@ -7505,7 +7505,7 @@ TrackWaypoint d_course_koopa_troopa_beach_track_waypoints[] = {
|
||||
{-32768, -32768, -32768, 0},
|
||||
};
|
||||
|
||||
TrackWaypoint d_course_koopa_troopa_beach_track_waypoints_2[] = {
|
||||
TrackWaypoint d_course_koopa_troopa_beach_track_waypoints1[] = {
|
||||
{-29, 1, 88, 1},
|
||||
{-29, 1, 68, 1},
|
||||
{-29, 1, 48, 1},
|
||||
|
||||
@@ -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_waypoints[];
|
||||
extern TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints0[];
|
||||
extern TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints1[];
|
||||
extern TrackWaypoint d_course_koopa_troopa_beach_track_waypoints[];
|
||||
extern TrackWaypoint d_course_koopa_troopa_beach_track_waypoints_2[];
|
||||
extern TrackWaypoint d_course_koopa_troopa_beach_track_waypoints0[];
|
||||
extern TrackWaypoint d_course_koopa_troopa_beach_track_waypoints1[];
|
||||
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[];
|
||||
|
||||
@@ -3017,7 +3017,7 @@ Gfx d_course_sherbet_land_dl_4B20[] =
|
||||
};
|
||||
|
||||
// unk 0x4BF8
|
||||
TrackWaypoint d_course_sherbet_land_unknown_waypoints[] = {
|
||||
TrackWaypoint d_course_sherbet_land_uknown_waypoints[] = {
|
||||
{-10, 0, 10, 0},
|
||||
{-10, 0, -8, 0},
|
||||
{-18, 0, -213, 0},
|
||||
|
||||
@@ -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_unknown_waypoints[];
|
||||
extern TrackWaypoint d_course_sherbet_land_uknown_waypoints[];
|
||||
extern TrackWaypoint d_course_sherbet_land_track_waypoints[];
|
||||
extern Vtx d_course_sherbet_land_model1[];
|
||||
extern Vtx d_course_sherbet_land_model2[];
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <PR/ultratypes.h>
|
||||
#include <PR/mbi.h>
|
||||
#include <assets/common_data.h>
|
||||
#include "common_textures.h"
|
||||
#include "course_offsets.h"
|
||||
#include "course_data.h"
|
||||
|
||||
|
||||
@@ -3294,7 +3294,7 @@ TrackWaypoint d_course_wario_stadium_unknown_waypoints[] = {
|
||||
{-32768, 0, 0, 0},
|
||||
};
|
||||
|
||||
TrackWaypoint d_course_wario_stadium_track_waypoints[] = {
|
||||
TrackWaypoint d_course_wario_staduim_track_waypoints[] = {
|
||||
{13, 0, -9, 1},
|
||||
{11, 0, -28, 1},
|
||||
{11, 0, -48, 1},
|
||||
|
||||
@@ -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_stadium_track_waypoints[];
|
||||
extern TrackWaypoint d_course_wario_staduim_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[];
|
||||
|
||||
@@ -7407,7 +7407,7 @@ Gfx d_course_yoshi_valley_dl_D540[] =
|
||||
|
||||
|
||||
// 0xD780
|
||||
TrackWaypoint d_course_yoshi_valley_unknown_waypoints[] = {
|
||||
TrackWaypoint d_course_yoshi_valley_unknown_waypoints0[] = {
|
||||
{-3, 0, -4, 0},
|
||||
{-3, 0, -20, 0},
|
||||
{-3, 0, -261, 0},
|
||||
@@ -7483,7 +7483,7 @@ TrackWaypoint d_course_yoshi_valley_unknown_waypoints[] = {
|
||||
{-32768, 0, 0, 0},
|
||||
};
|
||||
|
||||
TrackWaypoint d_course_yoshi_valley_unknown_waypoints_2[] = {
|
||||
TrackWaypoint d_course_yoshi_valley_unknown_waypoints1[] = {
|
||||
{-6, 0, -5, 1},
|
||||
{-6, 0, -21, 1},
|
||||
{-5, 0, -434, 1},
|
||||
@@ -7560,7 +7560,7 @@ TrackWaypoint d_course_yoshi_valley_unknown_waypoints_2[] = {
|
||||
{-32768, 0, 0, 0},
|
||||
};
|
||||
|
||||
TrackWaypoint d_course_yoshi_valley_unknown_waypoints_3[] = {
|
||||
TrackWaypoint d_course_yoshi_valley_unknown_waypoints2[] = {
|
||||
{-3, 0, -3, 4},
|
||||
{-3, 0, -19, 4},
|
||||
{0, 0, -268, 4},
|
||||
@@ -7645,7 +7645,7 @@ TrackWaypoint d_course_yoshi_valley_unknown_waypoints_3[] = {
|
||||
{-32768, 0, 0, 0},
|
||||
};
|
||||
|
||||
TrackWaypoint d_course_yoshi_valley_unknown_waypoints_4[] = {
|
||||
TrackWaypoint d_course_yoshi_valley_unknown_waypoints3[] = {
|
||||
{-2, 0, -1, 7},
|
||||
{0, 0, -18, 7},
|
||||
{-2, 0, -268, 7},
|
||||
@@ -7733,7 +7733,7 @@ TrackWaypoint d_course_yoshi_valley_unknown_waypoints_4[] = {
|
||||
{-32768, 0, 0, 0},
|
||||
};
|
||||
|
||||
TrackWaypoint d_course_yoshi_valley_track_waypoints[] = {
|
||||
TrackWaypoint d_course_yoshi_valley_track_waypoints0[] = {
|
||||
{-3, 180, -12, 1},
|
||||
{-3, 180, -32, 2},
|
||||
{-3, 180, -52, 2},
|
||||
@@ -8414,7 +8414,7 @@ TrackWaypoint d_course_yoshi_valley_track_waypoints[] = {
|
||||
{-32768, -32768, -32768, 0},
|
||||
};
|
||||
|
||||
TrackWaypoint d_course_yoshi_valley_track_waypoints_2[] = {
|
||||
TrackWaypoint d_course_yoshi_valley_track_waypoints1[] = {
|
||||
{-6, 180, -13, 1},
|
||||
{-5, 180, -33, 2},
|
||||
{-5, 180, -53, 2},
|
||||
@@ -9084,7 +9084,7 @@ TrackWaypoint d_course_yoshi_valley_track_waypoints_2[] = {
|
||||
{-32768, -32768, -32768, 0},
|
||||
};
|
||||
|
||||
TrackWaypoint d_course_yoshi_valley_track_waypoints_3[] = {
|
||||
TrackWaypoint d_course_yoshi_valley_track_waypoints2[] = {
|
||||
{-3, 180, -11, 1},
|
||||
{-2, 180, -31, 2},
|
||||
{-2, 180, -51, 2},
|
||||
@@ -9766,7 +9766,7 @@ TrackWaypoint d_course_yoshi_valley_track_waypoints_3[] = {
|
||||
{-32768, -32768, -32768, 0},
|
||||
};
|
||||
|
||||
TrackWaypoint d_course_yoshi_valley_track_waypoints_4[] = {
|
||||
TrackWaypoint d_course_yoshi_valley_track_waypoints3[] = {
|
||||
{-1, 180, -9, 1},
|
||||
{0, 180, -29, 2},
|
||||
{0, 180, -49, 2},
|
||||
|
||||
@@ -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_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 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 Lights1 d_course_yoshi_valley_unknown_light1;
|
||||
extern Lights1 d_course_yoshi_valley_unknown_light2;
|
||||
extern Lights1 d_course_yoshi_valley_unknown_light3;
|
||||
|
||||
Reference in New Issue
Block a user