Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Label Course Data Surface Material Types #665

Merged
merged 1 commit into from
Aug 16, 2024
Merged

Label Course Data Surface Material Types #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 49 additions & 48 deletions courses/banshee_boardwalk/course_data.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <actor_types.h>
#include <waypoints.h>
#include <course.h>
#include <mk64.h>

#include "course_displaylists.inc.h"
Gfx d_course_banshee_boardwalk_dl_0[] =
Expand Down Expand Up @@ -4121,53 +4122,53 @@ struct ActorSpawnData d_course_banshee_boardwalk_item_box_spawns[] = {

// 0xB458
TrackSections d_course_banshee_boardwalk_track_sections[] = {
{ d_course_banshee_boardwalk_packed_dl_1DA0, 4, 255, 0x0000 },
{ d_course_banshee_boardwalk_packed_dl_5498, 4, 255, 0x0000 },
{ d_course_banshee_boardwalk_packed_dl_27D0, 6, 1, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_28D0, 6, 2, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_29A0, 6, 3, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2A70, 6, 4, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_26E8, 6, 5, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_22C8, 6, 6, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2398, 6, 7, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2440, 6, 8, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2520, 6, 9, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2608, 6, 10, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2B78, 6, 11, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_3240, 6, 12, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_3310, 6, 13, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_33C8, 6, 14, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_34A0, 6, 15, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_1830, 6, 16, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_18E0, 6, 17, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_1968, 6, 18, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_1A00, 6, 19, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_30F0, 6, 20, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2C20, 6, 21, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2D40, 6, 22, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2E40, 6, 23, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2F38, 6, 24, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_3020, 6, 25, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_3930, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3AA0, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3BA0, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3C40, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3830, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3638, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_36C8, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3740, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_37C0, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3D08, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_40D0, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_4070, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_4008, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3F78, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3D90, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3E10, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3E88, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3F00, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_60, 255, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_1CF8, 4, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_1748, 6, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_1DA0, STONE, 255, 0x0000 },
{ d_course_banshee_boardwalk_packed_dl_5498, STONE, 255, 0x0000 },
{ d_course_banshee_boardwalk_packed_dl_27D0, BRIDGE, 1, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_28D0, BRIDGE, 2, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_29A0, BRIDGE, 3, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2A70, BRIDGE, 4, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_26E8, BRIDGE, 5, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_22C8, BRIDGE, 6, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2398, BRIDGE, 7, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2440, BRIDGE, 8, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2520, BRIDGE, 9, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2608, BRIDGE, 10, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2B78, BRIDGE, 11, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_3240, BRIDGE, 12, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_3310, BRIDGE, 13, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_33C8, BRIDGE, 14, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_34A0, BRIDGE, 15, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_1830, BRIDGE, 16, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_18E0, BRIDGE, 17, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_1968, BRIDGE, 18, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_1A00, BRIDGE, 19, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_30F0, BRIDGE, 20, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2C20, BRIDGE, 21, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2D40, BRIDGE, 22, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2E40, BRIDGE, 23, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_2F38, BRIDGE, 24, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_3020, BRIDGE, 25, 0x2000 },
{ d_course_banshee_boardwalk_packed_dl_3930, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3AA0, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3BA0, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3C40, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3830, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3638, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_36C8, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3740, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_37C0, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3D08, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_40D0, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_4070, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_4008, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3F78, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3D90, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3E10, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3E88, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_3F00, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_60, RAMP, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_1CF8, STONE, 255, 0x8000 },
{ d_course_banshee_boardwalk_packed_dl_1748, BRIDGE, 255, 0x8000 },
{ 0x00000000, 0, 0, 0x0000 },
};
75 changes: 38 additions & 37 deletions courses/bowsers_castle/course_data.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <actor_types.h>
#include <waypoints.h>
#include <course.h>
#include <mk64.h>

#include "course_displaylists.inc.h"

Expand Down Expand Up @@ -4073,41 +4074,41 @@ struct ActorSpawnData d_course_bowsers_castle_item_box_spawns[] = {

// 0x93D8
TrackSections d_course_bowsers_castle_addr[] = {
{ d_course_bowsers_castle_packed_dl_5448, 4, 1, 0x0000 },
{ d_course_bowsers_castle_packed_dl_53E0, 4, 2, 0x0000 },
{ d_course_bowsers_castle_packed_dl_93A0, 17, 3, 0x0000 },
{ d_course_bowsers_castle_packed_dl_9290, 17, 4, 0x0000 },
{ d_course_bowsers_castle_packed_dl_30C8, 4, 5, 0x0000 },
{ d_course_bowsers_castle_packed_dl_1FA0, 8, 5, 0x0000 },
{ d_course_bowsers_castle_packed_dl_3578, 4, 6, 0x0000 },
{ d_course_bowsers_castle_packed_dl_3930, 4, 7, 0x0000 },
{ d_course_bowsers_castle_packed_dl_3C80, 4, 8, 0x0000 },
{ d_course_bowsers_castle_packed_dl_D38, 4, 9, 0x0000 },
{ d_course_bowsers_castle_packed_dl_41A8, 4, 10, 0x0000 },
{ d_course_bowsers_castle_packed_dl_B80, 4, 11, 0x0000 },
{ d_course_bowsers_castle_packed_dl_280, 16, 12, 0x0000 },
{ d_course_bowsers_castle_packed_dl_2A48, 4, 12, 0x0000 },
{ d_course_bowsers_castle_packed_dl_A20, 4, 13, 0x0000 },
{ d_course_bowsers_castle_packed_dl_470, 4, 14, 0x0000 },
{ d_course_bowsers_castle_packed_dl_3308, 4, 15, 0x0000 },
{ d_course_bowsers_castle_packed_dl_1EA8, 8, 15, 0x0000 },
{ d_course_bowsers_castle_packed_dl_9328, 17, 16, 0x0000 },
{ d_course_bowsers_castle_packed_dl_9438, 17, 17, 0x0000 },
{ d_course_bowsers_castle_packed_dl_5378, 4, 18, 0x0000 },
{ d_course_bowsers_castle_packed_dl_5300, 4, 19, 0x0000 },
{ d_course_bowsers_castle_packed_dl_5270, 4, 20, 0x0000 },
{ d_course_bowsers_castle_packed_dl_51E8, 4, 21, 0x0000 },
{ d_course_bowsers_castle_packed_dl_54E8, 4, 22, 0x0000 },
{ d_course_bowsers_castle_packed_dl_5778, 4, 23, 0x0000 },
{ d_course_bowsers_castle_packed_dl_56F0, 4, 24, 0x0000 },
{ d_course_bowsers_castle_packed_dl_5678, 4, 25, 0x0000 },
{ d_course_bowsers_castle_packed_dl_55E8, 4, 26, 0x0000 },
{ d_course_bowsers_castle_packed_dl_5560, 4, 27, 0x0000 },
{ d_course_bowsers_castle_packed_dl_8E40, 4, 255, 0x0000 },
{ d_course_bowsers_castle_packed_dl_2BB8, 4, 255, 0x0000 },
{ d_course_bowsers_castle_packed_dl_75E8, 255, 255, 0x0000 },
{ d_course_bowsers_castle_packed_dl_9278, 255, 255, 0x0000 },
{ d_course_bowsers_castle_packed_dl_3B0, 255, 255, 0x0000 },
{ d_course_bowsers_castle_packed_dl_83B0, 255, 255, 0x0000 },
{ 0x00000000, 0, 0, 0x0000 },
{ d_course_bowsers_castle_packed_dl_5448, STONE, 1, 0x0000 },
{ d_course_bowsers_castle_packed_dl_53E0, STONE, 2, 0x0000 },
{ d_course_bowsers_castle_packed_dl_93A0, WOOD_BRIDGE, 3, 0x0000 },
{ d_course_bowsers_castle_packed_dl_9290, WOOD_BRIDGE, 4, 0x0000 },
{ d_course_bowsers_castle_packed_dl_30C8, STONE, 5, 0x0000 },
{ d_course_bowsers_castle_packed_dl_1FA0, GRASS, 5, 0x0000 },
{ d_course_bowsers_castle_packed_dl_3578, STONE, 6, 0x0000 },
{ d_course_bowsers_castle_packed_dl_3930, STONE, 7, 0x0000 },
{ d_course_bowsers_castle_packed_dl_3C80, STONE, 8, 0x0000 },
{ d_course_bowsers_castle_packed_dl_D38, STONE, 9, 0x0000 },
{ d_course_bowsers_castle_packed_dl_41A8, STONE, 10, 0x0000 },
{ d_course_bowsers_castle_packed_dl_B80, STONE, 11, 0x0000 },
{ d_course_bowsers_castle_packed_dl_280, ROPE_BRIDGE, 12, 0x0000 },
{ d_course_bowsers_castle_packed_dl_2A48, STONE, 12, 0x0000 },
{ d_course_bowsers_castle_packed_dl_A20, STONE, 13, 0x0000 },
{ d_course_bowsers_castle_packed_dl_470, STONE, 14, 0x0000 },
{ d_course_bowsers_castle_packed_dl_3308, STONE, 15, 0x0000 },
{ d_course_bowsers_castle_packed_dl_1EA8, GRASS, 15, 0x0000 },
{ d_course_bowsers_castle_packed_dl_9328, WOOD_BRIDGE, 16, 0x0000 },
{ d_course_bowsers_castle_packed_dl_9438, WOOD_BRIDGE, 17, 0x0000 },
{ d_course_bowsers_castle_packed_dl_5378, STONE, 18, 0x0000 },
{ d_course_bowsers_castle_packed_dl_5300, STONE, 19, 0x0000 },
{ d_course_bowsers_castle_packed_dl_5270, STONE, 20, 0x0000 },
{ d_course_bowsers_castle_packed_dl_51E8, STONE, 21, 0x0000 },
{ d_course_bowsers_castle_packed_dl_54E8, STONE, 22, 0x0000 },
{ d_course_bowsers_castle_packed_dl_5778, STONE, 23, 0x0000 },
{ d_course_bowsers_castle_packed_dl_56F0, STONE, 24, 0x0000 },
{ d_course_bowsers_castle_packed_dl_5678, STONE, 25, 0x0000 },
{ d_course_bowsers_castle_packed_dl_55E8, STONE, 26, 0x0000 },
{ d_course_bowsers_castle_packed_dl_5560, STONE, 27, 0x0000 },
{ d_course_bowsers_castle_packed_dl_8E40, STONE, 255, 0x0000 },
{ d_course_bowsers_castle_packed_dl_2BB8, STONE, 255, 0x0000 },
{ d_course_bowsers_castle_packed_dl_75E8, RAMP, 255, 0x0000 },
{ d_course_bowsers_castle_packed_dl_9278, RAMP, 255, 0x0000 },
{ d_course_bowsers_castle_packed_dl_3B0, RAMP, 255, 0x0000 },
{ d_course_bowsers_castle_packed_dl_83B0, RAMP, 255, 0x0000 },
{ 0x00000000, 0, 0, 0x0000 },
};
Loading
Loading