diff --git a/courses/banshee_boardwalk/course_data.c b/courses/banshee_boardwalk/course_data.c index 69de3a934..c8e92adc5 100644 --- a/courses/banshee_boardwalk/course_data.c +++ b/courses/banshee_boardwalk/course_data.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "course_displaylists.inc.h" Gfx d_course_banshee_boardwalk_dl_0[] = @@ -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 }, }; diff --git a/courses/bowsers_castle/course_data.c b/courses/bowsers_castle/course_data.c index 55360bb7f..db10fe3dd 100644 --- a/courses/bowsers_castle/course_data.c +++ b/courses/bowsers_castle/course_data.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "course_displaylists.inc.h" @@ -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 }, }; diff --git a/courses/choco_mountain/course_data.c b/courses/choco_mountain/course_data.c index 72e927c6e..75ea75ce5 100644 --- a/courses/choco_mountain/course_data.c +++ b/courses/choco_mountain/course_data.c @@ -4,6 +4,7 @@ #include #include #include +#include #include "course_displaylists.inc.h" @@ -3560,75 +3561,75 @@ struct ActorSpawnData d_course_choco_mountain_item_box_spawns[] = { }; TrackSections d_course_choco_mountain_addr[] = { - { d_course_choco_mountain_packed_dl_5A70, 255, 255, 0x8000 }, - { d_course_choco_mountain_packed_dl_8E0, 255, 255, 0x0000 }, - { d_course_choco_mountain_packed_dl_448, 255, 255, 0x8000 }, - { d_course_choco_mountain_packed_dl_49F0, 2, 1, 0x0000 }, - { d_course_choco_mountain_packed_dl_4AB0, 2, 2, 0x0000 }, - { d_course_choco_mountain_packed_dl_4B58, 2, 3, 0x0000 }, - { d_course_choco_mountain_packed_dl_4C08, 2, 4, 0x0000 }, - { d_course_choco_mountain_packed_dl_4CC8, 2, 5, 0x0000 }, - { d_course_choco_mountain_packed_dl_4970, 2, 6, 0x0000 }, - { d_course_choco_mountain_packed_dl_4618, 2, 7, 0x0000 }, - { d_course_choco_mountain_packed_dl_4690, 2, 8, 0x0000 }, - { d_course_choco_mountain_packed_dl_46F0, 2, 9, 0x0000 }, - { d_course_choco_mountain_packed_dl_4790, 2, 10, 0x0000 }, - { d_course_choco_mountain_packed_dl_4840, 2, 11, 0x0000 }, - { d_course_choco_mountain_packed_dl_48E8, 2, 12, 0x0000 }, - { d_course_choco_mountain_packed_dl_4D90, 2, 13, 0x0000 }, - { d_course_choco_mountain_packed_dl_51D8, 2, 14, 0x0000 }, - { d_course_choco_mountain_packed_dl_5258, 2, 15, 0x0000 }, - { d_course_choco_mountain_packed_dl_52C8, 2, 16, 0x0000 }, - { d_course_choco_mountain_packed_dl_5338, 2, 17, 0x0000 }, - { d_course_choco_mountain_packed_dl_53D8, 2, 18, 0x0000 }, - { d_course_choco_mountain_packed_dl_5148, 2, 19, 0x0000 }, - { d_course_choco_mountain_packed_dl_4E40, 2, 20, 0x0000 }, - { d_course_choco_mountain_packed_dl_4EB0, 2, 21, 0x0000 }, - { d_course_choco_mountain_packed_dl_4F30, 2, 22, 0x0000 }, - { d_course_choco_mountain_packed_dl_4FC0, 2, 23, 0x0000 }, - { d_course_choco_mountain_packed_dl_5070, 2, 24, 0x0000 }, - { d_course_choco_mountain_packed_dl_2530, 12, 1, 0x0000 }, - { d_course_choco_mountain_packed_dl_2458, 12, 2, 0x0000 }, - { d_course_choco_mountain_packed_dl_2380, 12, 2, 0x0000 }, - { d_course_choco_mountain_packed_dl_2278, 12, 3, 0x0000 }, - { d_course_choco_mountain_packed_dl_21D8, 12, 3, 0x0000 }, - { d_course_choco_mountain_packed_dl_2600, 12, 4, 0x0000 }, - { d_course_choco_mountain_packed_dl_29E8, 12, 4, 0x0000 }, - { d_course_choco_mountain_packed_dl_28B0, 12, 5, 0x0000 }, - { d_course_choco_mountain_packed_dl_27F0, 12, 5, 0x0000 }, - { d_course_choco_mountain_packed_dl_2760, 12, 6, 0x0000 }, - { d_course_choco_mountain_packed_dl_20F8, 12, 6, 0x0000 }, - { d_course_choco_mountain_packed_dl_1A48, 12, 7, 0x0000 }, - { d_course_choco_mountain_packed_dl_1988, 12, 7, 0x0000 }, - { d_course_choco_mountain_packed_dl_17E0, 12, 8, 0x0000 }, - { d_course_choco_mountain_packed_dl_1740, 12, 8, 0x0000 }, - { d_course_choco_mountain_packed_dl_1670, 12, 9, 0x0000 }, - { d_course_choco_mountain_packed_dl_1AC8, 12, 9, 0x0000 }, - { d_course_choco_mountain_packed_dl_1FE8, 12, 10, 0x0000 }, - { d_course_choco_mountain_packed_dl_1E90, 12, 10, 0x0000 }, - { d_course_choco_mountain_packed_dl_1DB8, 12, 11, 0x0000 }, - { d_course_choco_mountain_packed_dl_1C98, 12, 11, 0x0000 }, - { d_course_choco_mountain_packed_dl_1BE0, 12, 12, 0x0000 }, - { d_course_choco_mountain_packed_dl_2AE8, 12, 12, 0x0000 }, - { d_course_choco_mountain_packed_dl_38B8, 12, 13, 0x0000 }, - { d_course_choco_mountain_packed_dl_37B0, 12, 13, 0x0000 }, - { d_course_choco_mountain_packed_dl_3708, 12, 14, 0x0000 }, - { d_course_choco_mountain_packed_dl_3670, 12, 15, 0x0000 }, - { d_course_choco_mountain_packed_dl_35B0, 12, 16, 0x0000 }, - { d_course_choco_mountain_packed_dl_3998, 12, 16, 0x0000 }, - { d_course_choco_mountain_packed_dl_3EE8, 12, 17, 0x0000 }, - { d_course_choco_mountain_packed_dl_3DD8, 12, 17, 0x0000 }, - { d_course_choco_mountain_packed_dl_3CF0, 12, 18, 0x0000 }, - { d_course_choco_mountain_packed_dl_3B98, 12, 18, 0x0000 }, - { d_course_choco_mountain_packed_dl_3A80, 12, 19, 0x0000 }, - { d_course_choco_mountain_packed_dl_34E0, 12, 20, 0x0000 }, - { d_course_choco_mountain_packed_dl_2FE8, 12, 21, 0x0000 }, - { d_course_choco_mountain_packed_dl_2EE8, 12, 21, 0x0000 }, - { d_course_choco_mountain_packed_dl_2E38, 12, 22, 0x0000 }, - { d_course_choco_mountain_packed_dl_2D68, 12, 22, 0x0000 }, - { d_course_choco_mountain_packed_dl_2CA8, 12, 23, 0x0000 }, - { d_course_choco_mountain_packed_dl_2BD0, 12, 23, 0x0000 }, - { d_course_choco_mountain_packed_dl_30A8, 12, 24, 0x0000 }, - { d_course_choco_mountain_packed_dl_3410, 12, 24, 0x0000 }, + { d_course_choco_mountain_packed_dl_5A70, RAMP, 255, 0x8000 }, + { d_course_choco_mountain_packed_dl_8E0, RAMP, 255, 0x0000 }, + { d_course_choco_mountain_packed_dl_448, RAMP, 255, 0x8000 }, + { d_course_choco_mountain_packed_dl_49F0, DIRT, 1, 0x0000 }, + { d_course_choco_mountain_packed_dl_4AB0, DIRT, 2, 0x0000 }, + { d_course_choco_mountain_packed_dl_4B58, DIRT, 3, 0x0000 }, + { d_course_choco_mountain_packed_dl_4C08, DIRT, 4, 0x0000 }, + { d_course_choco_mountain_packed_dl_4CC8, DIRT, 5, 0x0000 }, + { d_course_choco_mountain_packed_dl_4970, DIRT, 6, 0x0000 }, + { d_course_choco_mountain_packed_dl_4618, DIRT, 7, 0x0000 }, + { d_course_choco_mountain_packed_dl_4690, DIRT, 8, 0x0000 }, + { d_course_choco_mountain_packed_dl_46F0, DIRT, 9, 0x0000 }, + { d_course_choco_mountain_packed_dl_4790, DIRT, 10, 0x0000 }, + { d_course_choco_mountain_packed_dl_4840, DIRT, 11, 0x0000 }, + { d_course_choco_mountain_packed_dl_48E8, DIRT, 12, 0x0000 }, + { d_course_choco_mountain_packed_dl_4D90, DIRT, 13, 0x0000 }, + { d_course_choco_mountain_packed_dl_51D8, DIRT, 14, 0x0000 }, + { d_course_choco_mountain_packed_dl_5258, DIRT, 15, 0x0000 }, + { d_course_choco_mountain_packed_dl_52C8, DIRT, 16, 0x0000 }, + { d_course_choco_mountain_packed_dl_5338, DIRT, 17, 0x0000 }, + { d_course_choco_mountain_packed_dl_53D8, DIRT, 18, 0x0000 }, + { d_course_choco_mountain_packed_dl_5148, DIRT, 19, 0x0000 }, + { d_course_choco_mountain_packed_dl_4E40, DIRT, 20, 0x0000 }, + { d_course_choco_mountain_packed_dl_4EB0, DIRT, 21, 0x0000 }, + { d_course_choco_mountain_packed_dl_4F30, DIRT, 22, 0x0000 }, + { d_course_choco_mountain_packed_dl_4FC0, DIRT, 23, 0x0000 }, + { d_course_choco_mountain_packed_dl_5070, DIRT, 24, 0x0000 }, + { d_course_choco_mountain_packed_dl_2530, CLIFF, 1, 0x0000 }, + { d_course_choco_mountain_packed_dl_2458, CLIFF, 2, 0x0000 }, + { d_course_choco_mountain_packed_dl_2380, CLIFF, 2, 0x0000 }, + { d_course_choco_mountain_packed_dl_2278, CLIFF, 3, 0x0000 }, + { d_course_choco_mountain_packed_dl_21D8, CLIFF, 3, 0x0000 }, + { d_course_choco_mountain_packed_dl_2600, CLIFF, 4, 0x0000 }, + { d_course_choco_mountain_packed_dl_29E8, CLIFF, 4, 0x0000 }, + { d_course_choco_mountain_packed_dl_28B0, CLIFF, 5, 0x0000 }, + { d_course_choco_mountain_packed_dl_27F0, CLIFF, 5, 0x0000 }, + { d_course_choco_mountain_packed_dl_2760, CLIFF, 6, 0x0000 }, + { d_course_choco_mountain_packed_dl_20F8, CLIFF, 6, 0x0000 }, + { d_course_choco_mountain_packed_dl_1A48, CLIFF, 7, 0x0000 }, + { d_course_choco_mountain_packed_dl_1988, CLIFF, 7, 0x0000 }, + { d_course_choco_mountain_packed_dl_17E0, CLIFF, 8, 0x0000 }, + { d_course_choco_mountain_packed_dl_1740, CLIFF, 8, 0x0000 }, + { d_course_choco_mountain_packed_dl_1670, CLIFF, 9, 0x0000 }, + { d_course_choco_mountain_packed_dl_1AC8, CLIFF, 9, 0x0000 }, + { d_course_choco_mountain_packed_dl_1FE8, CLIFF, 10, 0x0000 }, + { d_course_choco_mountain_packed_dl_1E90, CLIFF, 10, 0x0000 }, + { d_course_choco_mountain_packed_dl_1DB8, CLIFF, 11, 0x0000 }, + { d_course_choco_mountain_packed_dl_1C98, CLIFF, 11, 0x0000 }, + { d_course_choco_mountain_packed_dl_1BE0, CLIFF, 12, 0x0000 }, + { d_course_choco_mountain_packed_dl_2AE8, CLIFF, 12, 0x0000 }, + { d_course_choco_mountain_packed_dl_38B8, CLIFF, 13, 0x0000 }, + { d_course_choco_mountain_packed_dl_37B0, CLIFF, 13, 0x0000 }, + { d_course_choco_mountain_packed_dl_3708, CLIFF, 14, 0x0000 }, + { d_course_choco_mountain_packed_dl_3670, CLIFF, 15, 0x0000 }, + { d_course_choco_mountain_packed_dl_35B0, CLIFF, 16, 0x0000 }, + { d_course_choco_mountain_packed_dl_3998, CLIFF, 16, 0x0000 }, + { d_course_choco_mountain_packed_dl_3EE8, CLIFF, 17, 0x0000 }, + { d_course_choco_mountain_packed_dl_3DD8, CLIFF, 17, 0x0000 }, + { d_course_choco_mountain_packed_dl_3CF0, CLIFF, 18, 0x0000 }, + { d_course_choco_mountain_packed_dl_3B98, CLIFF, 18, 0x0000 }, + { d_course_choco_mountain_packed_dl_3A80, CLIFF, 19, 0x0000 }, + { d_course_choco_mountain_packed_dl_34E0, CLIFF, 20, 0x0000 }, + { d_course_choco_mountain_packed_dl_2FE8, CLIFF, 21, 0x0000 }, + { d_course_choco_mountain_packed_dl_2EE8, CLIFF, 21, 0x0000 }, + { d_course_choco_mountain_packed_dl_2E38, CLIFF, 22, 0x0000 }, + { d_course_choco_mountain_packed_dl_2D68, CLIFF, 22, 0x0000 }, + { d_course_choco_mountain_packed_dl_2CA8, CLIFF, 23, 0x0000 }, + { d_course_choco_mountain_packed_dl_2BD0, CLIFF, 23, 0x0000 }, + { d_course_choco_mountain_packed_dl_30A8, CLIFF, 24, 0x0000 }, + { d_course_choco_mountain_packed_dl_3410, CLIFF, 24, 0x0000 }, { 0x00000000, 0, 0, 0x0000 }, }; diff --git a/courses/dks_jungle_parkway/course_data.c b/courses/dks_jungle_parkway/course_data.c index c1398f59e..9e2ed33c3 100644 --- a/courses/dks_jungle_parkway/course_data.c +++ b/courses/dks_jungle_parkway/course_data.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "course_displaylists.inc.h" @@ -6231,119 +6232,119 @@ struct UnkActorSpawnData d_course_dks_jungle_parkway_tree_spawn[] = { // 0x14338 TrackSections d_course_dks_jungle_parkway_addr[] = { - { d_course_dks_jungle_parkway_packed_dl_7DA0, 2, 1, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_7E50, 2, 2, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_7F58, 2, 3, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_7FC8, 2, 4, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_80A0, 2, 5, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_7C78, 2, 6, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_7538, 2, 7, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_76A0, 2, 8, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_77E8, 2, 9, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_9988, 6, 9, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_98E0, 252, 9, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_9B98, 253, 9, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_7920, 2, 10, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_7A88, 2, 11, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_7B10, 2, 12, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_8140, 2, 13, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_89B0, 2, 14, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_8A40, 2, 15, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_8BA8, 2, 16, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_8C60, 2, 17, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_8E78, 2, 18, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_8800, 2, 19, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_8358, 2, 20, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_8458, 2, 21, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_3130, 16, 21, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_30C0, 16, 21, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_3058, 16, 22, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_85A0, 15, 23, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_8648, 15, 24, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_86B0, 15, 25, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_8760, 15, 26, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_5B50, 8, 1, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_5AB0, 8, 2, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_5A50, 8, 3, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_59E0, 8, 4, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_5BE0, 8, 5, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_5C68, 8, 6, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_5D68, 8, 7, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_5DF0, 8, 8, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_56B8, 8, 10, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_5648, 8, 11, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_55D8, 8, 12, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_5558, 8, 12, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_5768, 8, 13, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_5800, 8, 13, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_5890, 8, 14, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_58F8, 8, 15, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_5E70, 8, 15, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_64C0, 8, 16, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_6530, 8, 17, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_65A8, 8, 17, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_6620, 8, 17, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_66B0, 8, 17, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_6728, 8, 18, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_6798, 8, 19, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_6430, 8, 19, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_6008, 8, 20, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_5F80, 8, 20, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_5EF0, 8, 21, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_6098, 8, 21, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_6100, 8, 21, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_6240, 8, 1, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_6368, 8, 1, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_3FD0, 15, 23, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_4230, 15, 24, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_4300, 15, 25, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_4548, 15, 26, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_9250, 17, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_54D8, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_3AD0, 255, 255, 0x8000 }, - { d_course_dks_jungle_parkway_packed_dl_32A0, 16, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_2E28, 255, 255, 0x4000 }, - { d_course_dks_jungle_parkway_packed_dl_2DC8, 255, 255, 0x4000 }, - { d_course_dks_jungle_parkway_packed_dl_2D60, 255, 255, 0x4000 }, - { d_course_dks_jungle_parkway_packed_dl_2D00, 255, 255, 0x4000 }, - { d_course_dks_jungle_parkway_packed_dl_2510, 255, 255, 0x4000 }, - { d_course_dks_jungle_parkway_packed_dl_24B0, 255, 255, 0x4000 }, - { d_course_dks_jungle_parkway_packed_dl_2450, 255, 255, 0x4000 }, - { d_course_dks_jungle_parkway_packed_dl_23F0, 255, 255, 0x4000 }, - { d_course_dks_jungle_parkway_packed_dl_21C0, 255, 255, 0x4000 }, - { d_course_dks_jungle_parkway_packed_dl_2160, 255, 255, 0x4000 }, - { d_course_dks_jungle_parkway_packed_dl_2100, 255, 255, 0x4000 }, - { d_course_dks_jungle_parkway_packed_dl_20A0, 255, 255, 0x4000 }, - { d_course_dks_jungle_parkway_packed_dl_2040, 255, 255, 0x4000 }, - { d_course_dks_jungle_parkway_packed_dl_2B78, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_29F0, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_2890, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_2788, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_2570, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_2378, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_1EB8, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_1C98, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_1B38, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_1970, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_17D0, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_15B0, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_1430, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_12A8, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_1118, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_FD0, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_EC8, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_C90, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_B68, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_A40, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_918, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_7E0, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_6C8, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_520, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_398, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_200, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_0, 255, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_98F0, 6, 255, 0x0000 }, - { d_course_dks_jungle_parkway_packed_dl_37C0, 255, 255, 0x4000 }, - { d_course_dks_jungle_parkway_packed_dl_3758, 255, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_7DA0, DIRT, 1, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_7E50, DIRT, 2, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_7F58, DIRT, 3, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_7FC8, DIRT, 4, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_80A0, DIRT, 5, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_7C78, DIRT, 6, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_7538, DIRT, 7, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_76A0, DIRT, 8, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_77E8, DIRT, 9, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_9988, BRIDGE, 9, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_98E0, BOOST_RAMP_WOOD, 9, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_9B98, OUT_OF_BOUNDS, 9, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_7920, DIRT, 10, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_7A88, DIRT, 11, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_7B10, DIRT, 12, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_8140, DIRT, 13, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_89B0, DIRT, 14, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_8A40, DIRT, 15, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_8BA8, DIRT, 16, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_8C60, DIRT, 17, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_8E78, DIRT, 18, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_8800, DIRT, 19, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_8358, DIRT, 20, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_8458, DIRT, 21, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_3130, ROPE_BRIDGE, 21, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_30C0, ROPE_BRIDGE, 21, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_3058, ROPE_BRIDGE, 22, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_85A0, CAVE, 23, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_8648, CAVE, 24, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_86B0, CAVE, 25, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_8760, CAVE, 26, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_5B50, GRASS, 1, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_5AB0, GRASS, 2, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_5A50, GRASS, 3, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_59E0, GRASS, 4, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_5BE0, GRASS, 5, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_5C68, GRASS, 6, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_5D68, GRASS, 7, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_5DF0, GRASS, 8, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_56B8, GRASS, 10, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_5648, GRASS, 11, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_55D8, GRASS, 12, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_5558, GRASS, 12, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_5768, GRASS, 13, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_5800, GRASS, 13, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_5890, GRASS, 14, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_58F8, GRASS, 15, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_5E70, GRASS, 15, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_64C0, GRASS, 16, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_6530, GRASS, 17, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_65A8, GRASS, 17, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_6620, GRASS, 17, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_66B0, GRASS, 17, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_6728, GRASS, 18, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_6798, GRASS, 19, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_6430, GRASS, 19, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_6008, GRASS, 20, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_5F80, GRASS, 20, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_5EF0, GRASS, 21, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_6098, GRASS, 21, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_6100, GRASS, 21, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_6240, GRASS, 1, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_6368, GRASS, 1, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_3FD0, CAVE, 23, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_4230, CAVE, 24, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_4300, CAVE, 25, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_4548, CAVE, 26, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_9250, WOOD_BRIDGE, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_54D8, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_3AD0, RAMP, 255, 0x8000 }, + { d_course_dks_jungle_parkway_packed_dl_32A0, ROPE_BRIDGE, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_2E28, RAMP, 255, 0x4000 }, + { d_course_dks_jungle_parkway_packed_dl_2DC8, RAMP, 255, 0x4000 }, + { d_course_dks_jungle_parkway_packed_dl_2D60, RAMP, 255, 0x4000 }, + { d_course_dks_jungle_parkway_packed_dl_2D00, RAMP, 255, 0x4000 }, + { d_course_dks_jungle_parkway_packed_dl_2510, RAMP, 255, 0x4000 }, + { d_course_dks_jungle_parkway_packed_dl_24B0, RAMP, 255, 0x4000 }, + { d_course_dks_jungle_parkway_packed_dl_2450, RAMP, 255, 0x4000 }, + { d_course_dks_jungle_parkway_packed_dl_23F0, RAMP, 255, 0x4000 }, + { d_course_dks_jungle_parkway_packed_dl_21C0, RAMP, 255, 0x4000 }, + { d_course_dks_jungle_parkway_packed_dl_2160, RAMP, 255, 0x4000 }, + { d_course_dks_jungle_parkway_packed_dl_2100, RAMP, 255, 0x4000 }, + { d_course_dks_jungle_parkway_packed_dl_20A0, RAMP, 255, 0x4000 }, + { d_course_dks_jungle_parkway_packed_dl_2040, RAMP, 255, 0x4000 }, + { d_course_dks_jungle_parkway_packed_dl_2B78, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_29F0, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_2890, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_2788, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_2570, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_2378, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_1EB8, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_1C98, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_1B38, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_1970, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_17D0, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_15B0, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_1430, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_12A8, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_1118, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_FD0, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_EC8, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_C90, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_B68, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_A40, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_918, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_7E0, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_6C8, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_520, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_398, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_200, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_0, RAMP, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_98F0, BRIDGE, 255, 0x0000 }, + { d_course_dks_jungle_parkway_packed_dl_37C0, RAMP, 255, 0x4000 }, + { d_course_dks_jungle_parkway_packed_dl_3758, RAMP, 255, 0x0000 }, { 0x00000000, 0, 0, 0x0000 }, }; diff --git a/courses/frappe_snowland/course_data.c b/courses/frappe_snowland/course_data.c index 6e976ea92..91f5e2dec 100644 --- a/courses/frappe_snowland/course_data.c +++ b/courses/frappe_snowland/course_data.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "course_displaylists.inc.h" @@ -2860,52 +2861,52 @@ Gfx *d_course_frappe_snowland_dl_list[] = { }; TrackSections d_course_frappe_snowland_addr[] = { - { d_course_frappe_snowland_packed_dl_3B20, 255, 255, 0x0000 }, - { d_course_frappe_snowland_packed_dl_3118, 255, 255, 0x0000 }, - { d_course_frappe_snowland_packed_dl_2A90, 255, 255, 0x0000 }, - { d_course_frappe_snowland_packed_dl_3F80, 5, 1, 0x0000 }, - { d_course_frappe_snowland_packed_dl_3EF8, 5, 2, 0x0000 }, - { d_course_frappe_snowland_packed_dl_3E68, 5, 3, 0x0000 }, - { d_course_frappe_snowland_packed_dl_3DD8, 5, 4, 0x0000 }, - { d_course_frappe_snowland_packed_dl_3B48, 5, 5, 0x0000 }, - { d_course_frappe_snowland_packed_dl_3BD8, 5, 6, 0x0000 }, - { d_course_frappe_snowland_packed_dl_3CD8, 5, 7, 0x0000 }, - { d_course_frappe_snowland_packed_dl_3D58, 5, 8, 0x0000 }, - { d_course_frappe_snowland_packed_dl_4020, 5, 9, 0x0000 }, - { d_course_frappe_snowland_packed_dl_43E8, 5, 10, 0x0000 }, - { d_course_frappe_snowland_packed_dl_4378, 5, 11, 0x0000 }, - { d_course_frappe_snowland_packed_dl_4300, 5, 12, 0x0000 }, - { d_course_frappe_snowland_packed_dl_4288, 5, 13, 0x0000 }, - { d_course_frappe_snowland_packed_dl_40B0, 5, 14, 0x0000 }, - { d_course_frappe_snowland_packed_dl_4120, 5, 15, 0x0000 }, - { d_course_frappe_snowland_packed_dl_4188, 5, 16, 0x0000 }, - { d_course_frappe_snowland_packed_dl_4208, 17, 17, 0x0000 }, - { d_course_frappe_snowland_packed_dl_50D0, 11, 1, 0x0000 }, - { d_course_frappe_snowland_packed_dl_51C8, 11, 2, 0x0000 }, - { d_course_frappe_snowland_packed_dl_5330, 11, 3, 0x0000 }, - { d_course_frappe_snowland_packed_dl_54A0, 11, 4, 0x0000 }, - { d_course_frappe_snowland_packed_dl_55D0, 11, 5, 0x0000 }, - { d_course_frappe_snowland_packed_dl_5740, 11, 6, 0x0000 }, - { d_course_frappe_snowland_packed_dl_4FF8, 11, 7, 0x0000 }, - { d_course_frappe_snowland_packed_dl_48C0, 11, 8, 0x0000 }, - { d_course_frappe_snowland_packed_dl_49E0, 11, 9, 0x0000 }, - { d_course_frappe_snowland_packed_dl_4BA0, 11, 10, 0x0000 }, - { d_course_frappe_snowland_packed_dl_4D18, 11, 16, 0x0000 }, - { d_course_frappe_snowland_packed_dl_4E40, 11, 255, 0x0000 }, - { d_course_frappe_snowland_packed_dl_4F00, 11, 255, 0x0000 }, - { d_course_frappe_snowland_packed_dl_58C0, 11, 255, 0x0000 }, - { d_course_frappe_snowland_packed_dl_5E08, 11, 255, 0x0000 }, - { d_course_frappe_snowland_packed_dl_5EA8, 11, 14, 0x0000 }, - { d_course_frappe_snowland_packed_dl_5F90, 11, 13, 0x0000 }, - { d_course_frappe_snowland_packed_dl_6088, 11, 255, 0x0000 }, - { d_course_frappe_snowland_packed_dl_61A0, 11, 255, 0x0000 }, - { d_course_frappe_snowland_packed_dl_6268, 11, 255, 0x0000 }, - { d_course_frappe_snowland_packed_dl_5D90, 11, 255, 0x0000 }, - { d_course_frappe_snowland_packed_dl_5988, 11, 255, 0x0000 }, - { d_course_frappe_snowland_packed_dl_5A20, 11, 8, 0x0000 }, - { d_course_frappe_snowland_packed_dl_5AC0, 11, 9, 0x0000 }, - { d_course_frappe_snowland_packed_dl_5B58, 11, 10, 0x0000 }, - { d_course_frappe_snowland_packed_dl_5BE0, 11, 12, 0x0000 }, - { d_course_frappe_snowland_packed_dl_5C70, 11, 13, 0x0000 }, + { d_course_frappe_snowland_packed_dl_3B20, RAMP, 255, 0x0000 }, + { d_course_frappe_snowland_packed_dl_3118, RAMP, 255, 0x0000 }, + { d_course_frappe_snowland_packed_dl_2A90, RAMP, 255, 0x0000 }, + { d_course_frappe_snowland_packed_dl_3F80, SNOW, 1, 0x0000 }, + { d_course_frappe_snowland_packed_dl_3EF8, SNOW, 2, 0x0000 }, + { d_course_frappe_snowland_packed_dl_3E68, SNOW, 3, 0x0000 }, + { d_course_frappe_snowland_packed_dl_3DD8, SNOW, 4, 0x0000 }, + { d_course_frappe_snowland_packed_dl_3B48, SNOW, 5, 0x0000 }, + { d_course_frappe_snowland_packed_dl_3BD8, SNOW, 6, 0x0000 }, + { d_course_frappe_snowland_packed_dl_3CD8, SNOW, 7, 0x0000 }, + { d_course_frappe_snowland_packed_dl_3D58, SNOW, 8, 0x0000 }, + { d_course_frappe_snowland_packed_dl_4020, SNOW, 9, 0x0000 }, + { d_course_frappe_snowland_packed_dl_43E8, SNOW, 10, 0x0000 }, + { d_course_frappe_snowland_packed_dl_4378, SNOW, 11, 0x0000 }, + { d_course_frappe_snowland_packed_dl_4300, SNOW, 12, 0x0000 }, + { d_course_frappe_snowland_packed_dl_4288, SNOW, 13, 0x0000 }, + { d_course_frappe_snowland_packed_dl_40B0, SNOW, 14, 0x0000 }, + { d_course_frappe_snowland_packed_dl_4120, SNOW, 15, 0x0000 }, + { d_course_frappe_snowland_packed_dl_4188, SNOW, 16, 0x0000 }, + { d_course_frappe_snowland_packed_dl_4208, WOOD_BRIDGE, 17, 0x0000 }, + { d_course_frappe_snowland_packed_dl_50D0, SNOW_OFFROAD, 1, 0x0000 }, + { d_course_frappe_snowland_packed_dl_51C8, SNOW_OFFROAD, 2, 0x0000 }, + { d_course_frappe_snowland_packed_dl_5330, SNOW_OFFROAD, 3, 0x0000 }, + { d_course_frappe_snowland_packed_dl_54A0, SNOW_OFFROAD, 4, 0x0000 }, + { d_course_frappe_snowland_packed_dl_55D0, SNOW_OFFROAD, 5, 0x0000 }, + { d_course_frappe_snowland_packed_dl_5740, SNOW_OFFROAD, 6, 0x0000 }, + { d_course_frappe_snowland_packed_dl_4FF8, SNOW_OFFROAD, 7, 0x0000 }, + { d_course_frappe_snowland_packed_dl_48C0, SNOW_OFFROAD, 8, 0x0000 }, + { d_course_frappe_snowland_packed_dl_49E0, SNOW_OFFROAD, 9, 0x0000 }, + { d_course_frappe_snowland_packed_dl_4BA0, SNOW_OFFROAD, 10, 0x0000 }, + { d_course_frappe_snowland_packed_dl_4D18, SNOW_OFFROAD, 16, 0x0000 }, + { d_course_frappe_snowland_packed_dl_4E40, SNOW_OFFROAD, 255, 0x0000 }, + { d_course_frappe_snowland_packed_dl_4F00, SNOW_OFFROAD, 255, 0x0000 }, + { d_course_frappe_snowland_packed_dl_58C0, SNOW_OFFROAD, 255, 0x0000 }, + { d_course_frappe_snowland_packed_dl_5E08, SNOW_OFFROAD, 255, 0x0000 }, + { d_course_frappe_snowland_packed_dl_5EA8, SNOW_OFFROAD, 14, 0x0000 }, + { d_course_frappe_snowland_packed_dl_5F90, SNOW_OFFROAD, 13, 0x0000 }, + { d_course_frappe_snowland_packed_dl_6088, SNOW_OFFROAD, 255, 0x0000 }, + { d_course_frappe_snowland_packed_dl_61A0, SNOW_OFFROAD, 255, 0x0000 }, + { d_course_frappe_snowland_packed_dl_6268, SNOW_OFFROAD, 255, 0x0000 }, + { d_course_frappe_snowland_packed_dl_5D90, SNOW_OFFROAD, 255, 0x0000 }, + { d_course_frappe_snowland_packed_dl_5988, SNOW_OFFROAD, 255, 0x0000 }, + { d_course_frappe_snowland_packed_dl_5A20, SNOW_OFFROAD, 8, 0x0000 }, + { d_course_frappe_snowland_packed_dl_5AC0, SNOW_OFFROAD, 9, 0x0000 }, + { d_course_frappe_snowland_packed_dl_5B58, SNOW_OFFROAD, 10, 0x0000 }, + { d_course_frappe_snowland_packed_dl_5BE0, SNOW_OFFROAD, 12, 0x0000 }, + { d_course_frappe_snowland_packed_dl_5C70, SNOW_OFFROAD, 13, 0x0000 }, { 0x00000000, 0, 0, 0x0000 }, }; diff --git a/courses/kalimari_desert/course_data.c b/courses/kalimari_desert/course_data.c index ed591a654..cac04ce9c 100644 --- a/courses/kalimari_desert/course_data.c +++ b/courses/kalimari_desert/course_data.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "course_displaylists.inc.h" @@ -8395,106 +8396,106 @@ struct ActorSpawnData d_course_kalimari_desert_cactus_spawn[] = { }; TrackSections d_course_kalimari_desert_addr[] = { - { d_course_kalimari_desert_packed_dl_8690, 2, 1, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8728, 2, 2, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8798, 2, 3, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8808, 2, 4, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8610, 2, 5, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8398, 2, 6, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8418, 2, 7, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8490, 2, 8, 0x0000 }, - { d_course_kalimari_desert_packed_dl_85A0, 2, 9, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8C08, 2, 10, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8D20, 2, 11, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8D98, 2, 12, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8B60, 2, 13, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8990, 2, 14, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8AC8, 2, 15, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8A40, 2, 16, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8920, 2, 17, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8C98, 2, 18, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8888, 2, 19, 0x0000 }, - { d_course_kalimari_desert_packed_dl_8508, 2, 20, 0x0000 }, - { d_course_kalimari_desert_packed_dl_9C50, 13, 1, 0x0000 }, - { d_course_kalimari_desert_packed_dl_9BD8, 13, 2, 0x0000 }, - { d_course_kalimari_desert_packed_dl_9FE8, 13, 3, 0x0000 }, - { d_course_kalimari_desert_packed_dl_9EB0, 13, 4, 0x0000 }, - { d_course_kalimari_desert_packed_dl_9F20, 13, 5, 0x0000 }, - { d_course_kalimari_desert_packed_dl_9F88, 13, 6, 0x0000 }, - { d_course_kalimari_desert_packed_dl_9E38, 13, 7, 0x0000 }, - { d_course_kalimari_desert_packed_dl_9CC0, 13, 8, 0x0000 }, - { d_course_kalimari_desert_packed_dl_A050, 13, 9, 0x0000 }, - { d_course_kalimari_desert_packed_dl_A350, 13, 10, 0x0000 }, - { d_course_kalimari_desert_packed_dl_A458, 13, 11, 0x0000 }, - { d_course_kalimari_desert_packed_dl_A4D0, 13, 12, 0x0000 }, - { d_course_kalimari_desert_packed_dl_A0C0, 13, 13, 0x0000 }, - { d_course_kalimari_desert_packed_dl_A138, 13, 14, 0x0000 }, - { d_course_kalimari_desert_packed_dl_A228, 13, 15, 0x0000 }, - { d_course_kalimari_desert_packed_dl_A1A0, 13, 16, 0x0000 }, - { d_course_kalimari_desert_packed_dl_A2D0, 13, 17, 0x0000 }, - { d_course_kalimari_desert_packed_dl_A3D8, 13, 18, 0x0000 }, - { d_course_kalimari_desert_packed_dl_9DC0, 13, 19, 0x0000 }, - { d_course_kalimari_desert_packed_dl_9D48, 13, 20, 0x0000 }, - { d_course_kalimari_desert_packed_dl_5360, 13, 1, 0x0000 }, - { d_course_kalimari_desert_packed_dl_53D0, 13, 2, 0x0000 }, - { d_course_kalimari_desert_packed_dl_5DB0, 13, 3, 0x0000 }, - { d_course_kalimari_desert_packed_dl_5A60, 13, 4, 0x0000 }, - { d_course_kalimari_desert_packed_dl_5B00, 13, 5, 0x0000 }, - { d_course_kalimari_desert_packed_dl_5F28, 13, 6, 0x0000 }, - { d_course_kalimari_desert_packed_dl_5580, 13, 3, 0x0000 }, - { d_course_kalimari_desert_packed_dl_5E38, 13, 4, 0x0000 }, - { d_course_kalimari_desert_packed_dl_5EB0, 13, 5, 0x0000 }, - { d_course_kalimari_desert_packed_dl_59F0, 13, 6, 0x0000 }, - { d_course_kalimari_desert_packed_dl_5450, 13, 7, 0x0000 }, - { d_course_kalimari_desert_packed_dl_54C8, 13, 7, 0x0000 }, - { d_course_kalimari_desert_packed_dl_5878, 13, 8, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6B28, 13, 9, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6E38, 13, 10, 0x0000 }, - { d_course_kalimari_desert_packed_dl_57D0, 13, 8, 0x0000 }, - { d_course_kalimari_desert_packed_dl_69F8, 13, 9, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6CF0, 13, 11, 0x0000 }, - { d_course_kalimari_desert_packed_dl_61D8, 13, 12, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6820, 13, 12, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6EE8, 13, 11, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6050, 13, 10, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6130, 13, 13, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6310, 13, 13, 0x0000 }, - { d_course_kalimari_desert_packed_dl_65F0, 13, 14, 0x0000 }, - { d_course_kalimari_desert_packed_dl_63C0, 13, 14, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6490, 13, 15, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6530, 13, 15, 0x0000 }, - { d_course_kalimari_desert_packed_dl_55F0, 13, 8, 0x0000 }, - { d_course_kalimari_desert_packed_dl_66C8, 13, 16, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6290, 13, 17, 0x0000 }, - { d_course_kalimari_desert_packed_dl_60C8, 13, 17, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6C70, 13, 18, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6DA0, 13, 18, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6BC0, 13, 19, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6958, 13, 19, 0x0000 }, - { d_course_kalimari_desert_packed_dl_5728, 13, 20, 0x0000 }, - { d_course_kalimari_desert_packed_dl_56A0, 13, 20, 0x0000 }, - { d_course_kalimari_desert_packed_dl_5FB0, 13, 2, 0x0000 }, - { d_course_kalimari_desert_packed_dl_5C90, 13, 4, 0x0000 }, - { d_course_kalimari_desert_packed_dl_5B88, 13, 7, 0x0000 }, - { d_course_kalimari_desert_packed_dl_52E0, 13, 8, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6A78, 13, 12, 0x0000 }, - { d_course_kalimari_desert_packed_dl_6780, 13, 14, 0x0000 }, - { d_course_kalimari_desert_packed_dl_68E0, 13, 16, 0x0000 }, - { d_course_kalimari_desert_packed_dl_5948, 13, 19, 0x0000 }, - { d_course_kalimari_desert_packed_dl_76C0, 14, 20, 0x0000 }, - { d_course_kalimari_desert_packed_dl_77F8, 14, 2, 0x0000 }, - { d_course_kalimari_desert_packed_dl_79F8, 14, 7, 0x0000 }, - { d_course_kalimari_desert_packed_dl_7890, 14, 8, 0x0000 }, - { d_course_kalimari_desert_packed_dl_7728, 14, 9, 0x0000 }, - { d_course_kalimari_desert_packed_dl_75C0, 14, 11, 0x0000 }, - { d_course_kalimari_desert_packed_dl_81A0, 14, 12, 0x0000 }, - { d_course_kalimari_desert_packed_dl_7E18, 14, 14, 0x0000 }, - { d_course_kalimari_desert_packed_dl_7CC8, 14, 15, 0x0000 }, - { d_course_kalimari_desert_packed_dl_7F80, 14, 16, 0x0000 }, - { d_course_kalimari_desert_packed_dl_80B8, 14, 17, 0x0000 }, - { d_course_kalimari_desert_packed_dl_7BC8, 14, 18, 0x0000 }, - { d_course_kalimari_desert_packed_dl_9B10, 255, 255, 0x0000 }, - { d_course_kalimari_desert_packed_dl_1B18, 255, 255, 0x0000 }, - { d_course_kalimari_desert_packed_dl_998, 255, 255, 0x4000 }, - { 0x00000000, 0, 0, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8690, DIRT, 1, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8728, DIRT, 2, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8798, DIRT, 3, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8808, DIRT, 4, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8610, DIRT, 5, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8398, DIRT, 6, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8418, DIRT, 7, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8490, DIRT, 8, 0x0000 }, + { d_course_kalimari_desert_packed_dl_85A0, DIRT, 9, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8C08, DIRT, 10, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8D20, DIRT, 11, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8D98, DIRT, 12, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8B60, DIRT, 13, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8990, DIRT, 14, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8AC8, DIRT, 15, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8A40, DIRT, 16, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8920, DIRT, 17, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8C98, DIRT, 18, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8888, DIRT, 19, 0x0000 }, + { d_course_kalimari_desert_packed_dl_8508, DIRT, 20, 0x0000 }, + { d_course_kalimari_desert_packed_dl_9C50, DIRT_OFFROAD, 1, 0x0000 }, + { d_course_kalimari_desert_packed_dl_9BD8, DIRT_OFFROAD, 2, 0x0000 }, + { d_course_kalimari_desert_packed_dl_9FE8, DIRT_OFFROAD, 3, 0x0000 }, + { d_course_kalimari_desert_packed_dl_9EB0, DIRT_OFFROAD, 4, 0x0000 }, + { d_course_kalimari_desert_packed_dl_9F20, DIRT_OFFROAD, 5, 0x0000 }, + { d_course_kalimari_desert_packed_dl_9F88, DIRT_OFFROAD, 6, 0x0000 }, + { d_course_kalimari_desert_packed_dl_9E38, DIRT_OFFROAD, 7, 0x0000 }, + { d_course_kalimari_desert_packed_dl_9CC0, DIRT_OFFROAD, 8, 0x0000 }, + { d_course_kalimari_desert_packed_dl_A050, DIRT_OFFROAD, 9, 0x0000 }, + { d_course_kalimari_desert_packed_dl_A350, DIRT_OFFROAD, 10, 0x0000 }, + { d_course_kalimari_desert_packed_dl_A458, DIRT_OFFROAD, 11, 0x0000 }, + { d_course_kalimari_desert_packed_dl_A4D0, DIRT_OFFROAD, 12, 0x0000 }, + { d_course_kalimari_desert_packed_dl_A0C0, DIRT_OFFROAD, 13, 0x0000 }, + { d_course_kalimari_desert_packed_dl_A138, DIRT_OFFROAD, 14, 0x0000 }, + { d_course_kalimari_desert_packed_dl_A228, DIRT_OFFROAD, 15, 0x0000 }, + { d_course_kalimari_desert_packed_dl_A1A0, DIRT_OFFROAD, 16, 0x0000 }, + { d_course_kalimari_desert_packed_dl_A2D0, DIRT_OFFROAD, 17, 0x0000 }, + { d_course_kalimari_desert_packed_dl_A3D8, DIRT_OFFROAD, 18, 0x0000 }, + { d_course_kalimari_desert_packed_dl_9DC0, DIRT_OFFROAD, 19, 0x0000 }, + { d_course_kalimari_desert_packed_dl_9D48, DIRT_OFFROAD, 20, 0x0000 }, + { d_course_kalimari_desert_packed_dl_5360, DIRT_OFFROAD, 1, 0x0000 }, + { d_course_kalimari_desert_packed_dl_53D0, DIRT_OFFROAD, 2, 0x0000 }, + { d_course_kalimari_desert_packed_dl_5DB0, DIRT_OFFROAD, 3, 0x0000 }, + { d_course_kalimari_desert_packed_dl_5A60, DIRT_OFFROAD, 4, 0x0000 }, + { d_course_kalimari_desert_packed_dl_5B00, DIRT_OFFROAD, 5, 0x0000 }, + { d_course_kalimari_desert_packed_dl_5F28, DIRT_OFFROAD, 6, 0x0000 }, + { d_course_kalimari_desert_packed_dl_5580, DIRT_OFFROAD, 3, 0x0000 }, + { d_course_kalimari_desert_packed_dl_5E38, DIRT_OFFROAD, 4, 0x0000 }, + { d_course_kalimari_desert_packed_dl_5EB0, DIRT_OFFROAD, 5, 0x0000 }, + { d_course_kalimari_desert_packed_dl_59F0, DIRT_OFFROAD, 6, 0x0000 }, + { d_course_kalimari_desert_packed_dl_5450, DIRT_OFFROAD, 7, 0x0000 }, + { d_course_kalimari_desert_packed_dl_54C8, DIRT_OFFROAD, 7, 0x0000 }, + { d_course_kalimari_desert_packed_dl_5878, DIRT_OFFROAD, 8, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6B28, DIRT_OFFROAD, 9, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6E38, DIRT_OFFROAD, 10, 0x0000 }, + { d_course_kalimari_desert_packed_dl_57D0, DIRT_OFFROAD, 8, 0x0000 }, + { d_course_kalimari_desert_packed_dl_69F8, DIRT_OFFROAD, 9, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6CF0, DIRT_OFFROAD, 11, 0x0000 }, + { d_course_kalimari_desert_packed_dl_61D8, DIRT_OFFROAD, 12, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6820, DIRT_OFFROAD, 12, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6EE8, DIRT_OFFROAD, 11, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6050, DIRT_OFFROAD, 10, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6130, DIRT_OFFROAD, 13, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6310, DIRT_OFFROAD, 13, 0x0000 }, + { d_course_kalimari_desert_packed_dl_65F0, DIRT_OFFROAD, 14, 0x0000 }, + { d_course_kalimari_desert_packed_dl_63C0, DIRT_OFFROAD, 14, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6490, DIRT_OFFROAD, 15, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6530, DIRT_OFFROAD, 15, 0x0000 }, + { d_course_kalimari_desert_packed_dl_55F0, DIRT_OFFROAD, 8, 0x0000 }, + { d_course_kalimari_desert_packed_dl_66C8, DIRT_OFFROAD, 16, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6290, DIRT_OFFROAD, 17, 0x0000 }, + { d_course_kalimari_desert_packed_dl_60C8, DIRT_OFFROAD, 17, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6C70, DIRT_OFFROAD, 18, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6DA0, DIRT_OFFROAD, 18, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6BC0, DIRT_OFFROAD, 19, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6958, DIRT_OFFROAD, 19, 0x0000 }, + { d_course_kalimari_desert_packed_dl_5728, DIRT_OFFROAD, 20, 0x0000 }, + { d_course_kalimari_desert_packed_dl_56A0, DIRT_OFFROAD, 20, 0x0000 }, + { d_course_kalimari_desert_packed_dl_5FB0, DIRT_OFFROAD, 2, 0x0000 }, + { d_course_kalimari_desert_packed_dl_5C90, DIRT_OFFROAD, 4, 0x0000 }, + { d_course_kalimari_desert_packed_dl_5B88, DIRT_OFFROAD, 7, 0x0000 }, + { d_course_kalimari_desert_packed_dl_52E0, DIRT_OFFROAD, 8, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6A78, DIRT_OFFROAD, 12, 0x0000 }, + { d_course_kalimari_desert_packed_dl_6780, DIRT_OFFROAD, 14, 0x0000 }, + { d_course_kalimari_desert_packed_dl_68E0, DIRT_OFFROAD, 16, 0x0000 }, + { d_course_kalimari_desert_packed_dl_5948, DIRT_OFFROAD, 19, 0x0000 }, + { d_course_kalimari_desert_packed_dl_76C0, TRAIN_TRACK, 20, 0x0000 }, + { d_course_kalimari_desert_packed_dl_77F8, TRAIN_TRACK, 2, 0x0000 }, + { d_course_kalimari_desert_packed_dl_79F8, TRAIN_TRACK, 7, 0x0000 }, + { d_course_kalimari_desert_packed_dl_7890, TRAIN_TRACK, 8, 0x0000 }, + { d_course_kalimari_desert_packed_dl_7728, TRAIN_TRACK, 9, 0x0000 }, + { d_course_kalimari_desert_packed_dl_75C0, TRAIN_TRACK, 11, 0x0000 }, + { d_course_kalimari_desert_packed_dl_81A0, TRAIN_TRACK, 12, 0x0000 }, + { d_course_kalimari_desert_packed_dl_7E18, TRAIN_TRACK, 14, 0x0000 }, + { d_course_kalimari_desert_packed_dl_7CC8, TRAIN_TRACK, 15, 0x0000 }, + { d_course_kalimari_desert_packed_dl_7F80, TRAIN_TRACK, 16, 0x0000 }, + { d_course_kalimari_desert_packed_dl_80B8, TRAIN_TRACK, 17, 0x0000 }, + { d_course_kalimari_desert_packed_dl_7BC8, TRAIN_TRACK, 18, 0x0000 }, + { d_course_kalimari_desert_packed_dl_9B10, RAMP, 255, 0x0000 }, + { d_course_kalimari_desert_packed_dl_1B18, RAMP, 255, 0x0000 }, + { d_course_kalimari_desert_packed_dl_998, RAMP, 255, 0x4000 }, + { 0x00000000, 0, 0, 0x0000 }, }; diff --git a/courses/koopa_troopa_beach/course_data.c b/courses/koopa_troopa_beach/course_data.c index 880364eef..7567b0cd7 100644 --- a/courses/koopa_troopa_beach/course_data.c +++ b/courses/koopa_troopa_beach/course_data.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include "course_displaylists.inc.h" @@ -9120,112 +9121,112 @@ struct ActorSpawnData d_course_koopa_troopa_beach_tree_spawn[] = { // 0x18FD8 TrackSections d_course_koopa_troopa_beach_addr[] = { - { d_course_koopa_troopa_beach_packed_dl_9688, 255, 255, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_D70, 3, 1, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_CC0, 3, 2, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_BD8, 3, 3, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_AE0, 3, 4, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_E60, 3, 5, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_F38, 3, 6, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_1000, 3, 7, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_10B0, 3, 8, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_A00, 3, 9, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_610, 3, 10, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_518, 3, 11, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_440, 3, 12, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_390, 3, 13, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_6D8, 3, 14, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_778, 3, 15, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_858, 3, 16, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_928, 3, 17, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_1190, 3, 18, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_1C18, 3, 19, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_1B58, 3, 20, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_1A40, 3, 21, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_1940, 3, 22, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_1CC0, 3, 23, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_1DA8, 3, 24, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_1E90, 3, 25, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_1F78, 3, 26, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_1850, 3, 27, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_14D0, 3, 28, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_13D0, 3, 29, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_12D0, 3, 30, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_1210, 3, 31, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_1590, 3, 32, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_1668, 3, 33, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_16F0, 3, 34, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_1778, 3, 35, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_4490, 3, 36, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_3978, 10, 1, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_39E8, 10, 2, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_3AC8, 10, 3, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_3B40, 10, 4, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_3C38, 10, 5, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_3D00, 10, 8, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_3DE0, 10, 9, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_38B0, 10, 10, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_3470, 10, 11, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_3390, 10, 12, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_32B0, 10, 13, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_31D0, 10, 14, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_3550, 10, 15, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_3630, 10, 16, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_36F0, 10, 17, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_37B0, 10, 18, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_3ED8, 10, 20, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_4770, 10, 21, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_47E0, 10, 22, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_48B0, 10, 23, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_4920, 10, 24, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_4A08, 10, 25, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_4AF0, 10, 26, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_4BD0, 10, 27, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_46A8, 10, 28, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_4200, 10, 29, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_4120, 10, 30, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_4040, 10, 31, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_3F60, 10, 32, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_42E0, 10, 33, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_43C0, 10, 34, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_45C8, 10, 35, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_7F70, 12, 1, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8028, 12, 2, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_80F8, 12, 3, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8200, 12, 4, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_82D8, 12, 5, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8360, 12, 6, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8468, 12, 7, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_7EE0, 12, 11, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_78E0, 12, 12, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_7810, 12, 13, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_7740, 12, 14, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_76C0, 12, 15, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_7970, 12, 16, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_7A98, 12, 17, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_7DB0, 12, 19, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_7E48, 12, 21, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8510, 12, 22, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8C18, 12, 23, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8D08, 12, 24, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8DB0, 12, 25, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8E50, 12, 26, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8EE0, 12, 27, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8F58, 12, 28, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8FD0, 12, 29, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8A90, 12, 30, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_85C0, 12, 31, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_86B0, 12, 32, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8740, 12, 33, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_87E0, 12, 34, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8870, 12, 35, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_8980, 12, 30, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_7608, 1, 37, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_7538, 1, 37, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_7430, 1, 37, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_9B20, 12, 255, 0x0000 }, - { d_course_koopa_troopa_beach_packed_dl_9B78, 1, 255, 0x0000 }, - { 0x00000000, 0, 0, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_9688, RAMP, 255, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_D70, SAND, 1, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_CC0, SAND, 2, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_BD8, SAND, 3, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_AE0, SAND, 4, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_E60, SAND, 5, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_F38, SAND, 6, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_1000, SAND, 7, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_10B0, SAND, 8, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_A00, SAND, 9, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_610, SAND, 10, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_518, SAND, 11, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_440, SAND, 12, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_390, SAND, 13, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_6D8, SAND, 14, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_778, SAND, 15, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_858, SAND, 16, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_928, SAND, 17, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_1190, SAND, 18, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_1C18, SAND, 19, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_1B58, SAND, 20, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_1A40, SAND, 21, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_1940, SAND, 22, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_1CC0, SAND, 23, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_1DA8, SAND, 24, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_1E90, SAND, 25, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_1F78, SAND, 26, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_1850, SAND, 27, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_14D0, SAND, 28, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_13D0, SAND, 29, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_12D0, SAND, 30, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_1210, SAND, 31, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_1590, SAND, 32, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_1668, SAND, 33, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_16F0, SAND, 34, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_1778, SAND, 35, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_4490, SAND, 36, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_3978, WET_SAND, 1, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_39E8, WET_SAND, 2, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_3AC8, WET_SAND, 3, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_3B40, WET_SAND, 4, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_3C38, WET_SAND, 5, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_3D00, WET_SAND, 8, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_3DE0, WET_SAND, 9, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_38B0, WET_SAND, 10, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_3470, WET_SAND, 11, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_3390, WET_SAND, 12, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_32B0, WET_SAND, 13, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_31D0, WET_SAND, 14, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_3550, WET_SAND, 15, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_3630, WET_SAND, 16, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_36F0, WET_SAND, 17, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_37B0, WET_SAND, 18, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_3ED8, WET_SAND, 20, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_4770, WET_SAND, 21, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_47E0, WET_SAND, 22, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_48B0, WET_SAND, 23, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_4920, WET_SAND, 24, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_4A08, WET_SAND, 25, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_4AF0, WET_SAND, 26, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_4BD0, WET_SAND, 27, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_46A8, WET_SAND, 28, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_4200, WET_SAND, 29, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_4120, WET_SAND, 30, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_4040, WET_SAND, 31, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_3F60, WET_SAND, 32, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_42E0, WET_SAND, 33, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_43C0, WET_SAND, 34, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_45C8, WET_SAND, 35, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_7F70, CLIFF, 1, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8028, CLIFF, 2, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_80F8, CLIFF, 3, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8200, CLIFF, 4, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_82D8, CLIFF, 5, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8360, CLIFF, 6, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8468, CLIFF, 7, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_7EE0, CLIFF, 11, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_78E0, CLIFF, 12, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_7810, CLIFF, 13, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_7740, CLIFF, 14, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_76C0, CLIFF, 15, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_7970, CLIFF, 16, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_7A98, CLIFF, 17, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_7DB0, CLIFF, 19, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_7E48, CLIFF, 21, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8510, CLIFF, 22, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8C18, CLIFF, 23, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8D08, CLIFF, 24, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8DB0, CLIFF, 25, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8E50, CLIFF, 26, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8EE0, CLIFF, 27, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8F58, CLIFF, 28, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8FD0, CLIFF, 29, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8A90, CLIFF, 30, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_85C0, CLIFF, 31, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_86B0, CLIFF, 32, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8740, CLIFF, 33, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_87E0, CLIFF, 34, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8870, CLIFF, 35, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_8980, CLIFF, 30, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_7608, ASPHALT, 37, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_7538, ASPHALT, 37, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_7430, ASPHALT, 37, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_9B20, CLIFF, 255, 0x0000 }, + { d_course_koopa_troopa_beach_packed_dl_9B78, ASPHALT, 255, 0x0000 }, + { 0x00000000, 0, 0, 0x0000 }, }; Gfx *d_course_koopa_troopa_beach_dl_list1[] = { diff --git a/courses/luigi_raceway/course_data.c b/courses/luigi_raceway/course_data.c index a496c7848..39e4e1a72 100644 --- a/courses/luigi_raceway/course_data.c +++ b/courses/luigi_raceway/course_data.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "course_displaylists.inc.h" @@ -7075,117 +7076,117 @@ struct ActorSpawnData d_course_luigi_raceway_tree_spawn[] = { // 0xFF28 TrackSections d_course_luigi_raceway_addr[] = { - { d_course_luigi_raceway_packed_dl_6B00, 1, 1, 0x2000 }, - { d_course_luigi_raceway_packed_dl_6BF0, 1, 2, 0x2000 }, - { d_course_luigi_raceway_packed_dl_6CA8, 1, 3, 0x2000 }, - { d_course_luigi_raceway_packed_dl_6D60, 1, 4, 0x2000 }, - { d_course_luigi_raceway_packed_dl_6E18, 1, 5, 0x2000 }, - { d_course_luigi_raceway_packed_dl_6EF0, 1, 6, 0x2000 }, - { d_course_luigi_raceway_packed_dl_6FA8, 1, 7, 0x2000 }, - { d_course_luigi_raceway_packed_dl_6A58, 1, 8, 0x2000 }, - { d_course_luigi_raceway_packed_dl_65D8, 1, 9, 0x2000 }, - { d_course_luigi_raceway_packed_dl_6680, 1, 10, 0x2000 }, - { d_course_luigi_raceway_packed_dl_6728, 1, 11, 0x2000 }, - { d_course_luigi_raceway_packed_dl_67D0, 1, 12, 0x2000 }, - { d_course_luigi_raceway_packed_dl_6878, 1, 13, 0x2000 }, - { d_course_luigi_raceway_packed_dl_6920, 1, 14, 0x2000 }, - { d_course_luigi_raceway_packed_dl_69C0, 1, 15, 0x2000 }, - { d_course_luigi_raceway_packed_dl_7050, 1, 16, 0x2000 }, - { d_course_luigi_raceway_packed_dl_7650, 1, 17, 0x2000 }, - { d_course_luigi_raceway_packed_dl_76F8, 1, 18, 0x2000 }, - { d_course_luigi_raceway_packed_dl_77B0, 1, 19, 0x2000 }, - { d_course_luigi_raceway_packed_dl_7878, 1, 20, 0x2000 }, - { d_course_luigi_raceway_packed_dl_7940, 1, 21, 0x2000 }, - { d_course_luigi_raceway_packed_dl_79E8, 1, 22, 0x2000 }, - { d_course_luigi_raceway_packed_dl_75A8, 1, 23, 0x2000 }, - { d_course_luigi_raceway_packed_dl_70F8, 1, 24, 0x2000 }, - { d_course_luigi_raceway_packed_dl_71A0, 1, 25, 0x2000 }, - { d_course_luigi_raceway_packed_dl_7248, 1, 26, 0x2000 }, - { d_course_luigi_raceway_packed_dl_72F0, 1, 27, 0x2000 }, - { d_course_luigi_raceway_packed_dl_7398, 1, 28, 0x2000 }, - { d_course_luigi_raceway_packed_dl_7440, 1, 29, 0x2000 }, - { d_course_luigi_raceway_packed_dl_74F0, 1, 30, 0x2000 }, - { d_course_luigi_raceway_packed_dl_24E0, 8, 1, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2458, 8, 2, 0x0000 }, - { d_course_luigi_raceway_packed_dl_23E0, 8, 3, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2368, 8, 4, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2560, 8, 5, 0x0000 }, - { d_course_luigi_raceway_packed_dl_25E8, 8, 6, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2658, 8, 14, 0x0000 }, - { d_course_luigi_raceway_packed_dl_26B8, 8, 15, 0x0000 }, - { d_course_luigi_raceway_packed_dl_22F8, 8, 16, 0x0000 }, - { d_course_luigi_raceway_packed_dl_20C0, 8, 21, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2050, 8, 22, 0x0000 }, - { d_course_luigi_raceway_packed_dl_1FF0, 8, 23, 0x0000 }, - { d_course_luigi_raceway_packed_dl_1F90, 8, 29, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2130, 8, 30, 0x0000 }, - { d_course_luigi_raceway_packed_dl_21A8, 8, 5, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2210, 8, 6, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2280, 8, 7, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2720, 8, 8, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2D30, 8, 9, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2CB8, 8, 10, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2C40, 8, 11, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2BC8, 8, 12, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2DA8, 8, 13, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2E20, 8, 14, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2E90, 8, 15, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2EF8, 8, 16, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2B58, 8, 30, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2900, 8, 22, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2888, 8, 23, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2810, 8, 24, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2798, 8, 25, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2978, 8, 26, 0x0000 }, - { d_course_luigi_raceway_packed_dl_29F0, 8, 27, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2A68, 8, 28, 0x0000 }, - { d_course_luigi_raceway_packed_dl_2AE0, 8, 29, 0x0000 }, - { d_course_luigi_raceway_packed_dl_33C8, 7, 1, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3448, 7, 2, 0x0000 }, - { d_course_luigi_raceway_packed_dl_34C8, 7, 3, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3548, 7, 4, 0x0000 }, - { d_course_luigi_raceway_packed_dl_35D0, 7, 5, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3678, 7, 6, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3350, 7, 7, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3080, 7, 8, 0x0000 }, - { d_course_luigi_raceway_packed_dl_30F8, 7, 9, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3170, 7, 10, 0x0000 }, - { d_course_luigi_raceway_packed_dl_31E8, 7, 11, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3260, 7, 12, 0x0000 }, - { d_course_luigi_raceway_packed_dl_32D8, 7, 13, 0x0000 }, - { d_course_luigi_raceway_packed_dl_36F8, 7, 14, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3AD0, 7, 15, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3B38, 7, 16, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3BD0, 7, 17, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3C40, 7, 21, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3CF0, 7, 22, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3D60, 7, 23, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3A58, 7, 24, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3768, 7, 25, 0x0000 }, - { d_course_luigi_raceway_packed_dl_37E0, 7, 26, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3858, 7, 27, 0x0000 }, - { d_course_luigi_raceway_packed_dl_38D0, 7, 28, 0x0000 }, - { d_course_luigi_raceway_packed_dl_3948, 7, 29, 0x0000 }, - { d_course_luigi_raceway_packed_dl_39C8, 7, 30, 0x0000 }, - { d_course_luigi_raceway_packed_dl_1AC8, 8, 14, 0x0000 }, - { d_course_luigi_raceway_packed_dl_1A28, 8, 15, 0x0000 }, - { d_course_luigi_raceway_packed_dl_1988, 8, 16, 0x0000 }, - { d_course_luigi_raceway_packed_dl_1920, 8, 255, 0x0000 }, - { d_course_luigi_raceway_packed_dl_1D68, 8, 16, 0x0000 }, - { d_course_luigi_raceway_packed_dl_17E0, 8, 255, 0x0000 }, - { d_course_luigi_raceway_packed_dl_1B28, 8, 21, 0x0000 }, - { d_course_luigi_raceway_packed_dl_1BD8, 8, 21, 0x0000 }, - { d_course_luigi_raceway_packed_dl_1E70, 8, 22, 0x0000 }, - { d_course_luigi_raceway_packed_dl_1E10, 8, 23, 0x0000 }, - { d_course_luigi_raceway_packed_dl_1D00, 8, 255, 0x0000 }, - { d_course_luigi_raceway_packed_dl_1C90, 8, 255, 0x0000 }, - { d_course_luigi_raceway_packed_dl_7EB8, 0xFF, 0xFF, 0x0000 }, - { d_course_luigi_raceway_packed_dl_6558, 0xFF, 0xFF, 0x0000 }, - { d_course_luigi_raceway_packed_dl_4518, 0xFF, 0xFF, 0x0000 }, - { d_course_luigi_raceway_packed_dl_A98, 0xFF, 0xFF, 0x0000 }, - { d_course_luigi_raceway_packed_dl_1730, 0xFF, 0xFF, 0x0000 }, - { d_course_luigi_raceway_packed_dl_4860, 0xFF, 0xFF, 0x0000 }, - { d_course_luigi_raceway_packed_dl_8200, 0xFF, 0xFF, 0x0000 }, - { d_course_luigi_raceway_packed_dl_4EE8, 0xFF, 0xFF, 0x0000 }, - { 0x00000000, 0, 0, 0x0000 }, + { d_course_luigi_raceway_packed_dl_6B00, ASPHALT, 1, 0x2000 }, + { d_course_luigi_raceway_packed_dl_6BF0, ASPHALT, 2, 0x2000 }, + { d_course_luigi_raceway_packed_dl_6CA8, ASPHALT, 3, 0x2000 }, + { d_course_luigi_raceway_packed_dl_6D60, ASPHALT, 4, 0x2000 }, + { d_course_luigi_raceway_packed_dl_6E18, ASPHALT, 5, 0x2000 }, + { d_course_luigi_raceway_packed_dl_6EF0, ASPHALT, 6, 0x2000 }, + { d_course_luigi_raceway_packed_dl_6FA8, ASPHALT, 7, 0x2000 }, + { d_course_luigi_raceway_packed_dl_6A58, ASPHALT, 8, 0x2000 }, + { d_course_luigi_raceway_packed_dl_65D8, ASPHALT, 9, 0x2000 }, + { d_course_luigi_raceway_packed_dl_6680, ASPHALT, 10, 0x2000 }, + { d_course_luigi_raceway_packed_dl_6728, ASPHALT, 11, 0x2000 }, + { d_course_luigi_raceway_packed_dl_67D0, ASPHALT, 12, 0x2000 }, + { d_course_luigi_raceway_packed_dl_6878, ASPHALT, 13, 0x2000 }, + { d_course_luigi_raceway_packed_dl_6920, ASPHALT, 14, 0x2000 }, + { d_course_luigi_raceway_packed_dl_69C0, ASPHALT, 15, 0x2000 }, + { d_course_luigi_raceway_packed_dl_7050, ASPHALT, 16, 0x2000 }, + { d_course_luigi_raceway_packed_dl_7650, ASPHALT, 17, 0x2000 }, + { d_course_luigi_raceway_packed_dl_76F8, ASPHALT, 18, 0x2000 }, + { d_course_luigi_raceway_packed_dl_77B0, ASPHALT, 19, 0x2000 }, + { d_course_luigi_raceway_packed_dl_7878, ASPHALT, 20, 0x2000 }, + { d_course_luigi_raceway_packed_dl_7940, ASPHALT, 21, 0x2000 }, + { d_course_luigi_raceway_packed_dl_79E8, ASPHALT, 22, 0x2000 }, + { d_course_luigi_raceway_packed_dl_75A8, ASPHALT, 23, 0x2000 }, + { d_course_luigi_raceway_packed_dl_70F8, ASPHALT, 24, 0x2000 }, + { d_course_luigi_raceway_packed_dl_71A0, ASPHALT, 25, 0x2000 }, + { d_course_luigi_raceway_packed_dl_7248, ASPHALT, 26, 0x2000 }, + { d_course_luigi_raceway_packed_dl_72F0, ASPHALT, 27, 0x2000 }, + { d_course_luigi_raceway_packed_dl_7398, ASPHALT, 28, 0x2000 }, + { d_course_luigi_raceway_packed_dl_7440, ASPHALT, 29, 0x2000 }, + { d_course_luigi_raceway_packed_dl_74F0, ASPHALT, 30, 0x2000 }, + { d_course_luigi_raceway_packed_dl_24E0, GRASS, 1, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2458, GRASS, 2, 0x0000 }, + { d_course_luigi_raceway_packed_dl_23E0, GRASS, 3, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2368, GRASS, 4, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2560, GRASS, 5, 0x0000 }, + { d_course_luigi_raceway_packed_dl_25E8, GRASS, 6, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2658, GRASS, 14, 0x0000 }, + { d_course_luigi_raceway_packed_dl_26B8, GRASS, 15, 0x0000 }, + { d_course_luigi_raceway_packed_dl_22F8, GRASS, 16, 0x0000 }, + { d_course_luigi_raceway_packed_dl_20C0, GRASS, 21, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2050, GRASS, 22, 0x0000 }, + { d_course_luigi_raceway_packed_dl_1FF0, GRASS, 23, 0x0000 }, + { d_course_luigi_raceway_packed_dl_1F90, GRASS, 29, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2130, GRASS, 30, 0x0000 }, + { d_course_luigi_raceway_packed_dl_21A8, GRASS, 5, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2210, GRASS, 6, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2280, GRASS, 7, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2720, GRASS, 8, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2D30, GRASS, 9, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2CB8, GRASS, 10, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2C40, GRASS, 11, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2BC8, GRASS, 12, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2DA8, GRASS, 13, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2E20, GRASS, 14, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2E90, GRASS, 15, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2EF8, GRASS, 16, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2B58, GRASS, 30, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2900, GRASS, 22, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2888, GRASS, 23, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2810, GRASS, 24, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2798, GRASS, 25, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2978, GRASS, 26, 0x0000 }, + { d_course_luigi_raceway_packed_dl_29F0, GRASS, 27, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2A68, GRASS, 28, 0x0000 }, + { d_course_luigi_raceway_packed_dl_2AE0, GRASS, 29, 0x0000 }, + { d_course_luigi_raceway_packed_dl_33C8, SAND_OFFROAD, 1, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3448, SAND_OFFROAD, 2, 0x0000 }, + { d_course_luigi_raceway_packed_dl_34C8, SAND_OFFROAD, 3, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3548, SAND_OFFROAD, 4, 0x0000 }, + { d_course_luigi_raceway_packed_dl_35D0, SAND_OFFROAD, 5, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3678, SAND_OFFROAD, 6, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3350, SAND_OFFROAD, 7, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3080, SAND_OFFROAD, 8, 0x0000 }, + { d_course_luigi_raceway_packed_dl_30F8, SAND_OFFROAD, 9, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3170, SAND_OFFROAD, 10, 0x0000 }, + { d_course_luigi_raceway_packed_dl_31E8, SAND_OFFROAD, 11, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3260, SAND_OFFROAD, 12, 0x0000 }, + { d_course_luigi_raceway_packed_dl_32D8, SAND_OFFROAD, 13, 0x0000 }, + { d_course_luigi_raceway_packed_dl_36F8, SAND_OFFROAD, 14, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3AD0, SAND_OFFROAD, 15, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3B38, SAND_OFFROAD, 16, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3BD0, SAND_OFFROAD, 17, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3C40, SAND_OFFROAD, 21, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3CF0, SAND_OFFROAD, 22, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3D60, SAND_OFFROAD, 23, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3A58, SAND_OFFROAD, 24, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3768, SAND_OFFROAD, 25, 0x0000 }, + { d_course_luigi_raceway_packed_dl_37E0, SAND_OFFROAD, 26, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3858, SAND_OFFROAD, 27, 0x0000 }, + { d_course_luigi_raceway_packed_dl_38D0, SAND_OFFROAD, 28, 0x0000 }, + { d_course_luigi_raceway_packed_dl_3948, SAND_OFFROAD, 29, 0x0000 }, + { d_course_luigi_raceway_packed_dl_39C8, SAND_OFFROAD, 30, 0x0000 }, + { d_course_luigi_raceway_packed_dl_1AC8, GRASS, 14, 0x0000 }, + { d_course_luigi_raceway_packed_dl_1A28, GRASS, 15, 0x0000 }, + { d_course_luigi_raceway_packed_dl_1988, GRASS, 16, 0x0000 }, + { d_course_luigi_raceway_packed_dl_1920, GRASS, 255, 0x0000 }, + { d_course_luigi_raceway_packed_dl_1D68, GRASS, 16, 0x0000 }, + { d_course_luigi_raceway_packed_dl_17E0, GRASS, 255, 0x0000 }, + { d_course_luigi_raceway_packed_dl_1B28, GRASS, 21, 0x0000 }, + { d_course_luigi_raceway_packed_dl_1BD8, GRASS, 21, 0x0000 }, + { d_course_luigi_raceway_packed_dl_1E70, GRASS, 22, 0x0000 }, + { d_course_luigi_raceway_packed_dl_1E10, GRASS, 23, 0x0000 }, + { d_course_luigi_raceway_packed_dl_1D00, GRASS, 255, 0x0000 }, + { d_course_luigi_raceway_packed_dl_1C90, GRASS, 255, 0x0000 }, + { d_course_luigi_raceway_packed_dl_7EB8, RAMP, 255, 0x0000 }, + { d_course_luigi_raceway_packed_dl_6558, RAMP, 255, 0x0000 }, + { d_course_luigi_raceway_packed_dl_4518, RAMP, 255, 0x0000 }, + { d_course_luigi_raceway_packed_dl_A98, RAMP, 255, 0x0000 }, + { d_course_luigi_raceway_packed_dl_1730, RAMP, 255, 0x0000 }, + { d_course_luigi_raceway_packed_dl_4860, RAMP, 255, 0x0000 }, + { d_course_luigi_raceway_packed_dl_8200, RAMP, 255, 0x0000 }, + { d_course_luigi_raceway_packed_dl_4EE8, RAMP, 255, 0x0000 }, + { 0x00000000, 0, 0, 0x0000 }, }; diff --git a/courses/mario_raceway/course_data.c b/courses/mario_raceway/course_data.c index 1e4901a6e..25df2dc77 100644 --- a/courses/mario_raceway/course_data.c +++ b/courses/mario_raceway/course_data.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "course_displaylists.inc.h" @@ -4003,57 +4004,57 @@ struct ActorSpawnData d_course_mario_raceway_tree_spawns[] = { }; TrackSections d_course_mario_raceway_addr[] = { - { d_course_mario_raceway_packed_dl_17D8, 1, 1, 0x0000 }, - { d_course_mario_raceway_packed_dl_1770, 1, 2, 0x0000 }, - { d_course_mario_raceway_packed_dl_16D8, 1, 3, 0x0000 }, - { d_course_mario_raceway_packed_dl_1668, 1, 4, 0x0000 }, - { d_course_mario_raceway_packed_dl_14C8, 1, 5, 0x0000 }, - { d_course_mario_raceway_packed_dl_1500, 1, 6, 0x0000 }, - { d_course_mario_raceway_packed_dl_1550, 1, 7, 0x0000 }, - { d_course_mario_raceway_packed_dl_1600, 1, 8, 0x0000 }, - { d_course_mario_raceway_packed_dl_1850, 1, 9, 0x0000 }, - { d_course_mario_raceway_packed_dl_1AF8, 1, 10, 0x0000 }, - { d_course_mario_raceway_packed_dl_1A80, 1, 11, 0x0000 }, - { d_course_mario_raceway_packed_dl_1A08, 1, 12, 0x0000 }, - { d_course_mario_raceway_packed_dl_1988, 1, 13, 0x0000 }, - { d_course_mario_raceway_packed_dl_1890, 1, 14, 0x0000 }, - { d_course_mario_raceway_packed_dl_18B8, 1, 15, 0x0000 }, - { d_course_mario_raceway_packed_dl_18E0, 1, 16, 0x0000 }, - { d_course_mario_raceway_packed_dl_1950, 1, 17, 0x0000 }, - { d_course_mario_raceway_packed_dl_1188, 255, 255, 0x0000 }, - { d_course_mario_raceway_packed_dl_2A28, 255, 255, 0x0000 }, - { d_course_mario_raceway_packed_dl_E0, 255, 255, 0x0000 }, - { d_course_mario_raceway_packed_dl_5218, 8, 1, 0x0000 }, - { d_course_mario_raceway_packed_dl_50E8, 8, 2, 0x0000 }, - { d_course_mario_raceway_packed_dl_4F90, 8, 3, 0x0000 }, - { d_course_mario_raceway_packed_dl_4EE8, 8, 4, 0x0000 }, - { d_course_mario_raceway_packed_dl_4E20, 8, 5, 0x0000 }, - { d_course_mario_raceway_packed_dl_52B8, 8, 4, 0x0000 }, - { d_course_mario_raceway_packed_dl_5608, 8, 4, 0x0000 }, - { d_course_mario_raceway_packed_dl_5550, 8, 5, 0x0000 }, - { d_course_mario_raceway_packed_dl_54B0, 8, 6, 0x0000 }, - { d_course_mario_raceway_packed_dl_5408, 8, 5, 0x0000 }, - { d_course_mario_raceway_packed_dl_5368, 8, 6, 0x0000 }, - { d_course_mario_raceway_packed_dl_4D48, 8, 7, 0x0000 }, - { d_course_mario_raceway_packed_dl_49E8, 8, 7, 0x0000 }, - { d_course_mario_raceway_packed_dl_4950, 8, 8, 0x0000 }, - { d_course_mario_raceway_packed_dl_4870, 8, 7, 0x0000 }, - { d_course_mario_raceway_packed_dl_4780, 8, 7, 0x0000 }, - { d_course_mario_raceway_packed_dl_46A0, 8, 9, 0x0000 }, - { d_course_mario_raceway_packed_dl_4AD8, 8, 7, 0x0000 }, - { d_course_mario_raceway_packed_dl_6198, 8, 10, 0x0000 }, - { d_course_mario_raceway_packed_dl_60F0, 8, 11, 0x0000 }, - { d_course_mario_raceway_packed_dl_63B0, 8, 12, 0x0000 }, - { d_course_mario_raceway_packed_dl_5AE0, 8, 13, 0x0000 }, - { d_course_mario_raceway_packed_dl_5A48, 8, 14, 0x0000 }, - { d_course_mario_raceway_packed_dl_5970, 8, 15, 0x0000 }, - { d_course_mario_raceway_packed_dl_5870, 8, 15, 0x0000 }, - { d_course_mario_raceway_packed_dl_5768, 8, 16, 0x0000 }, - { d_course_mario_raceway_packed_dl_5BC8, 8, 17, 0x0000 }, - { d_course_mario_raceway_packed_dl_5ED0, 7, 13, 0x0000 }, - { d_course_mario_raceway_packed_dl_5F88, 7, 11, 0x0000 }, - { d_course_mario_raceway_packed_dl_6068, 7, 10, 0x0000 }, - { d_course_mario_raceway_packed_dl_6308, 7, 12, 0x0000 }, - { d_course_mario_raceway_packed_dl_6490, 7, 11, 0x0000 }, - { 0x00000000, 0, 0, 0x00000 }, + { d_course_mario_raceway_packed_dl_17D8, ASPHALT, 1, 0x0000 }, + { d_course_mario_raceway_packed_dl_1770, ASPHALT, 2, 0x0000 }, + { d_course_mario_raceway_packed_dl_16D8, ASPHALT, 3, 0x0000 }, + { d_course_mario_raceway_packed_dl_1668, ASPHALT, 4, 0x0000 }, + { d_course_mario_raceway_packed_dl_14C8, ASPHALT, 5, 0x0000 }, + { d_course_mario_raceway_packed_dl_1500, ASPHALT, 6, 0x0000 }, + { d_course_mario_raceway_packed_dl_1550, ASPHALT, 7, 0x0000 }, + { d_course_mario_raceway_packed_dl_1600, ASPHALT, 8, 0x0000 }, + { d_course_mario_raceway_packed_dl_1850, ASPHALT, 9, 0x0000 }, + { d_course_mario_raceway_packed_dl_1AF8, ASPHALT, 10, 0x0000 }, + { d_course_mario_raceway_packed_dl_1A80, ASPHALT, 11, 0x0000 }, + { d_course_mario_raceway_packed_dl_1A08, ASPHALT, 12, 0x0000 }, + { d_course_mario_raceway_packed_dl_1988, ASPHALT, 13, 0x0000 }, + { d_course_mario_raceway_packed_dl_1890, ASPHALT, 14, 0x0000 }, + { d_course_mario_raceway_packed_dl_18B8, ASPHALT, 15, 0x0000 }, + { d_course_mario_raceway_packed_dl_18E0, ASPHALT, 16, 0x0000 }, + { d_course_mario_raceway_packed_dl_1950, ASPHALT, 17, 0x0000 }, + { d_course_mario_raceway_packed_dl_1188, RAMP, 255, 0x0000 }, + { d_course_mario_raceway_packed_dl_2A28, RAMP, 255, 0x0000 }, + { d_course_mario_raceway_packed_dl_E0, RAMP, 255, 0x0000 }, + { d_course_mario_raceway_packed_dl_5218, GRASS, 1, 0x0000 }, + { d_course_mario_raceway_packed_dl_50E8, GRASS, 2, 0x0000 }, + { d_course_mario_raceway_packed_dl_4F90, GRASS, 3, 0x0000 }, + { d_course_mario_raceway_packed_dl_4EE8, GRASS, 4, 0x0000 }, + { d_course_mario_raceway_packed_dl_4E20, GRASS, 5, 0x0000 }, + { d_course_mario_raceway_packed_dl_52B8, GRASS, 4, 0x0000 }, + { d_course_mario_raceway_packed_dl_5608, GRASS, 4, 0x0000 }, + { d_course_mario_raceway_packed_dl_5550, GRASS, 5, 0x0000 }, + { d_course_mario_raceway_packed_dl_54B0, GRASS, 6, 0x0000 }, + { d_course_mario_raceway_packed_dl_5408, GRASS, 5, 0x0000 }, + { d_course_mario_raceway_packed_dl_5368, GRASS, 6, 0x0000 }, + { d_course_mario_raceway_packed_dl_4D48, GRASS, 7, 0x0000 }, + { d_course_mario_raceway_packed_dl_49E8, GRASS, 7, 0x0000 }, + { d_course_mario_raceway_packed_dl_4950, GRASS, 8, 0x0000 }, + { d_course_mario_raceway_packed_dl_4870, GRASS, 7, 0x0000 }, + { d_course_mario_raceway_packed_dl_4780, GRASS, 7, 0x0000 }, + { d_course_mario_raceway_packed_dl_46A0, GRASS, 9, 0x0000 }, + { d_course_mario_raceway_packed_dl_4AD8, GRASS, 7, 0x0000 }, + { d_course_mario_raceway_packed_dl_6198, GRASS, 10, 0x0000 }, + { d_course_mario_raceway_packed_dl_60F0, GRASS, 11, 0x0000 }, + { d_course_mario_raceway_packed_dl_63B0, GRASS, 12, 0x0000 }, + { d_course_mario_raceway_packed_dl_5AE0, GRASS, 13, 0x0000 }, + { d_course_mario_raceway_packed_dl_5A48, GRASS, 14, 0x0000 }, + { d_course_mario_raceway_packed_dl_5970, GRASS, 15, 0x0000 }, + { d_course_mario_raceway_packed_dl_5870, GRASS, 15, 0x0000 }, + { d_course_mario_raceway_packed_dl_5768, GRASS, 16, 0x0000 }, + { d_course_mario_raceway_packed_dl_5BC8, GRASS, 17, 0x0000 }, + { d_course_mario_raceway_packed_dl_5ED0, SAND_OFFROAD, 13, 0x0000 }, + { d_course_mario_raceway_packed_dl_5F88, SAND_OFFROAD, 11, 0x0000 }, + { d_course_mario_raceway_packed_dl_6068, SAND_OFFROAD, 10, 0x0000 }, + { d_course_mario_raceway_packed_dl_6308, SAND_OFFROAD, 12, 0x0000 }, + { d_course_mario_raceway_packed_dl_6490, SAND_OFFROAD, 11, 0x0000 }, + { 0x00000000, 0, 0, 0x00000 }, }; diff --git a/courses/moo_moo_farm/course_data.c b/courses/moo_moo_farm/course_data.c index 74936e9c5..1784d0f8e 100644 --- a/courses/moo_moo_farm/course_data.c +++ b/courses/moo_moo_farm/course_data.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "course_displaylists.inc.h" @@ -8874,82 +8875,81 @@ struct ActorSpawnData d_course_moo_moo_farm_item_box_spawns[] = { // 0x144B8 TrackSections d_course_moo_moo_farm_addr[] = { - { d_course_moo_moo_farm_packed_dl_39F8, 2, 1, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_3B88, 2, 2, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_3C48, 2, 3, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_3D50, 2, 4, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_3E50, 2, 5, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_3918, 2, 6, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_34B8, 2, 7, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_3590, 2, 8, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_3668, 2, 9, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_3748, 2, 10, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_3828, 2, 11, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_3F30, 2, 12, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_46E8, 2, 13, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_47C8, 2, 14, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_48B8, 2, 15, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_49A8, 2, 16, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_4A88, 2, 17, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_45D0, 2, 18, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_40A8, 2, 19, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_41B0, 2, 20, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_42B8, 2, 21, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_43A0, 2, 22, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_4480, 2, 23, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_1BA0, 8, 1, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_1C40, 8, 2, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_1C98, 8, 3, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_1D00, 8, 4, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_1D60, 8, 5, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_1DD0, 8, 6, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_1E58, 8, 7, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_1B38, 8, 8, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_18E0, 8, 9, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_1940, 8, 10, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_19A0, 8, 11, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_1A00, 8, 12, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_1A60, 8, 13, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_1AA0, 8, 14, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_1AD0, 8, 15, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_1ED0, 8, 16, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_20F8, 8, 17, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2160, 8, 18, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_21D8, 8, 19, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2240, 8, 20, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_22B0, 8, 21, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2338, 8, 22, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_23C0, 8, 23, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2C68, 8, 1, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2CD8, 8, 2, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2D30, 8, 3, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2D90, 8, 4, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2DF0, 8, 5, 0x0000 }, - - { d_course_moo_moo_farm_packed_dl_2E60, 8, 6, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2EA0, 8, 7, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2C10, 8, 8, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2998, 8, 9, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_29F0, 8, 10, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2A50, 8, 11, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2AB8, 8, 12, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2AF0, 8, 13, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2B50, 8, 14, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2BA8, 8, 15, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_2F10, 8, 16, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_3210, 8, 17, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_3268, 8, 18, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_32A0, 8, 19, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_3310, 8, 20, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_3350, 8, 21, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_3380, 8, 22, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_31C8, 8, 23, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_5290, 255, 255, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_5018, 255, 255, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_A80, 255, 255, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_4D0, 255, 255, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_4DF8, 255, 255, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_CB0, 255, 255, 0x0000 }, - { d_course_moo_moo_farm_packed_dl_F20, 255, 255, 0x0000 }, - { 0x00000000, 0, 0, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_39F8, DIRT, 1, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_3B88, DIRT, 2, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_3C48, DIRT, 3, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_3D50, DIRT, 4, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_3E50, DIRT, 5, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_3918, DIRT, 6, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_34B8, DIRT, 7, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_3590, DIRT, 8, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_3668, DIRT, 9, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_3748, DIRT, 10, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_3828, DIRT, 11, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_3F30, DIRT, 12, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_46E8, DIRT, 13, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_47C8, DIRT, 14, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_48B8, DIRT, 15, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_49A8, DIRT, 16, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_4A88, DIRT, 17, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_45D0, DIRT, 18, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_40A8, DIRT, 19, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_41B0, DIRT, 20, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_42B8, DIRT, 21, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_43A0, DIRT, 22, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_4480, DIRT, 23, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_1BA0, GRASS, 1, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_1C40, GRASS, 2, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_1C98, GRASS, 3, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_1D00, GRASS, 4, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_1D60, GRASS, 5, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_1DD0, GRASS, 6, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_1E58, GRASS, 7, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_1B38, GRASS, 8, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_18E0, GRASS, 9, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_1940, GRASS, 10, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_19A0, GRASS, 11, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_1A00, GRASS, 12, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_1A60, GRASS, 13, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_1AA0, GRASS, 14, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_1AD0, GRASS, 15, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_1ED0, GRASS, 16, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_20F8, GRASS, 17, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2160, GRASS, 18, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_21D8, GRASS, 19, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2240, GRASS, 20, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_22B0, GRASS, 21, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2338, GRASS, 22, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_23C0, GRASS, 23, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2C68, GRASS, 1, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2CD8, GRASS, 2, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2D30, GRASS, 3, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2D90, GRASS, 4, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2DF0, GRASS, 5, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2E60, GRASS, 6, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2EA0, GRASS, 7, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2C10, GRASS, 8, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2998, GRASS, 9, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_29F0, GRASS, 10, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2A50, GRASS, 11, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2AB8, GRASS, 12, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2AF0, GRASS, 13, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2B50, GRASS, 14, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2BA8, GRASS, 15, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_2F10, GRASS, 16, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_3210, GRASS, 17, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_3268, GRASS, 18, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_32A0, GRASS, 19, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_3310, GRASS, 20, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_3350, GRASS, 21, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_3380, GRASS, 22, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_31C8, GRASS, 23, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_5290, RAMP, 255, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_5018, RAMP, 255, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_A80, RAMP, 255, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_4D0, RAMP, 255, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_4DF8, RAMP, 255, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_CB0, RAMP, 255, 0x0000 }, + { d_course_moo_moo_farm_packed_dl_F20, RAMP, 255, 0x0000 }, + { 0x00000000, 0, 0, 0x0000 }, }; diff --git a/courses/rainbow_road/course_data.c b/courses/rainbow_road/course_data.c index b19967c07..ba72090c5 100644 --- a/courses/rainbow_road/course_data.c +++ b/courses/rainbow_road/course_data.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "course_displaylists.inc.h" @@ -3696,21 +3697,21 @@ struct ActorSpawnData d_course_rainbow_road_item_box_spawns[] = { }; TrackSections d_course_rainbow_road_addr[] = { - { d_course_rainbow_road_packed_dl_20C0, 1, 255, 0x0000 }, - { d_course_rainbow_road_packed_dl_1850, 1, 1, 0x0000 }, - { d_course_rainbow_road_packed_dl_1758, 1, 2, 0x0000 }, - { d_course_rainbow_road_packed_dl_1698, 1, 3, 0x0000 }, - { d_course_rainbow_road_packed_dl_15F8, 1, 4, 0x0000 }, - { d_course_rainbow_road_packed_dl_1528, 1, 5, 0x0000 }, - { d_course_rainbow_road_packed_dl_13A0, 1, 6, 0x0000 }, - { d_course_rainbow_road_packed_dl_1978, 1, 7, 0x0000 }, - { d_course_rainbow_road_packed_dl_1D30, 1, 8, 0x0000 }, - { d_course_rainbow_road_packed_dl_1C70, 1, 9, 0x0000 }, - { d_course_rainbow_road_packed_dl_1BC0, 1, 10, 0x0000 }, - { d_course_rainbow_road_packed_dl_1B28, 1, 11, 0x0000 }, - { d_course_rainbow_road_packed_dl_1A20, 1, 12, 0x0000 }, - { d_course_rainbow_road_packed_dl_1318, 255, 255, 0x0000 }, - { 0x00000000, 0, 0, 0x0000 }, + { d_course_rainbow_road_packed_dl_20C0, ASPHALT, 255, 0x0000 }, + { d_course_rainbow_road_packed_dl_1850, ASPHALT, 1, 0x0000 }, + { d_course_rainbow_road_packed_dl_1758, ASPHALT, 2, 0x0000 }, + { d_course_rainbow_road_packed_dl_1698, ASPHALT, 3, 0x0000 }, + { d_course_rainbow_road_packed_dl_15F8, ASPHALT, 4, 0x0000 }, + { d_course_rainbow_road_packed_dl_1528, ASPHALT, 5, 0x0000 }, + { d_course_rainbow_road_packed_dl_13A0, ASPHALT, 6, 0x0000 }, + { d_course_rainbow_road_packed_dl_1978, ASPHALT, 7, 0x0000 }, + { d_course_rainbow_road_packed_dl_1D30, ASPHALT, 8, 0x0000 }, + { d_course_rainbow_road_packed_dl_1C70, ASPHALT, 9, 0x0000 }, + { d_course_rainbow_road_packed_dl_1BC0, ASPHALT, 10, 0x0000 }, + { d_course_rainbow_road_packed_dl_1B28, ASPHALT, 11, 0x0000 }, + { d_course_rainbow_road_packed_dl_1A20, ASPHALT, 12, 0x0000 }, + { d_course_rainbow_road_packed_dl_1318, RAMP, 255, 0x0000 }, + { 0x00000000, 0, 0, 0x0000 }, }; Gfx *d_course_rainbow_road_dl_list[] = { diff --git a/courses/royal_raceway/course_data.c b/courses/royal_raceway/course_data.c index 4e7e1a7b8..cfc0c34be 100644 --- a/courses/royal_raceway/course_data.c +++ b/courses/royal_raceway/course_data.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "course_displaylists.inc.h" @@ -7540,123 +7541,123 @@ struct ActorSpawnData d_course_royal_raceway_item_box_spawns[] = { // 0xDC28 TrackSections d_course_royal_raceway_addr[] = { - { d_course_royal_raceway_packed_dl_650, 255, 255, 0x0000 }, - { d_course_royal_raceway_packed_dl_1FE8, 1, 1, 0x0000 }, - { d_course_royal_raceway_packed_dl_20A0, 1, 2, 0x0000 }, - { d_course_royal_raceway_packed_dl_2110, 1, 3, 0x0000 }, - { d_course_royal_raceway_packed_dl_21B8, 1, 4, 0x0000 }, - { d_course_royal_raceway_packed_dl_2230, 1, 5, 0x0000 }, - { d_course_royal_raceway_packed_dl_22C0, 1, 6, 0x0000 }, - { d_course_royal_raceway_packed_dl_1F58, 1, 7, 0x0000 }, - { d_course_royal_raceway_packed_dl_1B98, 1, 8, 0x0000 }, - { d_course_royal_raceway_packed_dl_1C48, 1, 9, 0x0000 }, - { d_course_royal_raceway_packed_dl_1CF0, 1, 10, 0x0000 }, - { d_course_royal_raceway_packed_dl_1D68, 1, 11, 0x0000 }, - { d_course_royal_raceway_packed_dl_1DF0, 1, 12, 0x0000 }, - { d_course_royal_raceway_packed_dl_1E60, 1, 13, 0x0000 }, - { d_course_royal_raceway_packed_dl_1EF0, 1, 14, 0x0000 }, - { d_course_royal_raceway_packed_dl_2370, 1, 15, 0x0000 }, - { d_course_royal_raceway_packed_dl_28D8, 1, 16, 0x0000 }, - { d_course_royal_raceway_packed_dl_2950, 1, 17, 0x0000 }, - { d_course_royal_raceway_packed_dl_2A10, 1, 18, 0x0000 }, - { d_course_royal_raceway_packed_dl_2AC8, 1, 19, 0x0000 }, - { d_course_royal_raceway_packed_dl_2B38, 1, 20, 0x0000 }, + { d_course_royal_raceway_packed_dl_650, RAMP, 255, 0x0000 }, + { d_course_royal_raceway_packed_dl_1FE8, ASPHALT, 1, 0x0000 }, + { d_course_royal_raceway_packed_dl_20A0, ASPHALT, 2, 0x0000 }, + { d_course_royal_raceway_packed_dl_2110, ASPHALT, 3, 0x0000 }, + { d_course_royal_raceway_packed_dl_21B8, ASPHALT, 4, 0x0000 }, + { d_course_royal_raceway_packed_dl_2230, ASPHALT, 5, 0x0000 }, + { d_course_royal_raceway_packed_dl_22C0, ASPHALT, 6, 0x0000 }, + { d_course_royal_raceway_packed_dl_1F58, ASPHALT, 7, 0x0000 }, + { d_course_royal_raceway_packed_dl_1B98, ASPHALT, 8, 0x0000 }, + { d_course_royal_raceway_packed_dl_1C48, ASPHALT, 9, 0x0000 }, + { d_course_royal_raceway_packed_dl_1CF0, ASPHALT, 10, 0x0000 }, + { d_course_royal_raceway_packed_dl_1D68, ASPHALT, 11, 0x0000 }, + { d_course_royal_raceway_packed_dl_1DF0, ASPHALT, 12, 0x0000 }, + { d_course_royal_raceway_packed_dl_1E60, ASPHALT, 13, 0x0000 }, + { d_course_royal_raceway_packed_dl_1EF0, ASPHALT, 14, 0x0000 }, + { d_course_royal_raceway_packed_dl_2370, ASPHALT, 15, 0x0000 }, + { d_course_royal_raceway_packed_dl_28D8, ASPHALT, 16, 0x0000 }, + { d_course_royal_raceway_packed_dl_2950, ASPHALT, 17, 0x0000 }, + { d_course_royal_raceway_packed_dl_2A10, ASPHALT, 18, 0x0000 }, + { d_course_royal_raceway_packed_dl_2AC8, ASPHALT, 19, 0x0000 }, + { d_course_royal_raceway_packed_dl_2B38, ASPHALT, 20, 0x0000 }, { d_course_royal_raceway_packed_dl_A648, 254, 20, 0x0000 }, - { d_course_royal_raceway_packed_dl_2BA0, 1, 21, 0x0000 }, + { d_course_royal_raceway_packed_dl_2BA0, ASPHALT, 21, 0x0000 }, { d_course_royal_raceway_packed_dl_A6A8, 254, 21, 0x0000 }, - { d_course_royal_raceway_packed_dl_2870, 1, 22, 0x0000 }, - { d_course_royal_raceway_packed_dl_23F8, 1, 23, 0x0000 }, - { d_course_royal_raceway_packed_dl_2478, 1, 24, 0x0000 }, - { d_course_royal_raceway_packed_dl_2530, 1, 25, 0x0000 }, - { d_course_royal_raceway_packed_dl_25E0, 1, 26, 0x0000 }, - { d_course_royal_raceway_packed_dl_26B0, 1, 27, 0x0000 }, - { d_course_royal_raceway_packed_dl_2758, 1, 28, 0x0000 }, - { d_course_royal_raceway_packed_dl_27E0, 1, 29, 0x0000 }, - { d_course_royal_raceway_packed_dl_5400, 8, 20, 0x0000 }, - { d_course_royal_raceway_packed_dl_54A8, 8, 19, 0x0000 }, - { d_course_royal_raceway_packed_dl_5520, 8, 18, 0x0000 }, - { d_course_royal_raceway_packed_dl_51E8, 8, 17, 0x0000 }, - { d_course_royal_raceway_packed_dl_4E90, 8, 16, 0x0000 }, - { d_course_royal_raceway_packed_dl_4F20, 8, 15, 0x0000 }, - { d_course_royal_raceway_packed_dl_4F98, 8, 14, 0x0000 }, - { d_course_royal_raceway_packed_dl_5018, 8, 13, 0x0000 }, - { d_course_royal_raceway_packed_dl_50B0, 8, 12, 0x0000 }, - { d_course_royal_raceway_packed_dl_5138, 8, 11, 0x0000 }, - { d_course_royal_raceway_packed_dl_5B50, 8, 22, 0x0000 }, - { d_course_royal_raceway_packed_dl_5C00, 8, 23, 0x0000 }, - { d_course_royal_raceway_packed_dl_5D18, 8, 22, 0x0000 }, - { d_course_royal_raceway_packed_dl_5DC8, 8, 23, 0x0000 }, - { d_course_royal_raceway_packed_dl_5EF8, 8, 25, 0x0000 }, - { d_course_royal_raceway_packed_dl_5AA8, 8, 26, 0x0000 }, - { d_course_royal_raceway_packed_dl_56A0, 8, 27, 0x0000 }, - { d_course_royal_raceway_packed_dl_5740, 8, 255, 0x0000 }, - { d_course_royal_raceway_packed_dl_57F0, 8, 24, 0x0000 }, - { d_course_royal_raceway_packed_dl_58E8, 8, 24, 0x0000 }, - { d_course_royal_raceway_packed_dl_5990, 8, 26, 0x0000 }, - { d_course_royal_raceway_packed_dl_5A10, 8, 28, 0x0000 }, - { d_course_royal_raceway_packed_dl_4078, 8, 1, 0x0000 }, - { d_course_royal_raceway_packed_dl_4118, 8, 2, 0x0000 }, - { d_course_royal_raceway_packed_dl_41A8, 8, 3, 0x0000 }, - { d_course_royal_raceway_packed_dl_4298, 8, 4, 0x0000 }, - { d_course_royal_raceway_packed_dl_4350, 8, 5, 0x0000 }, - { d_course_royal_raceway_packed_dl_3FA8, 8, 6, 0x0000 }, - { d_course_royal_raceway_packed_dl_3B70, 8, 7, 0x0000 }, - { d_course_royal_raceway_packed_dl_3C18, 8, 8, 0x0000 }, - { d_course_royal_raceway_packed_dl_3CF0, 8, 9, 0x0000 }, - { d_course_royal_raceway_packed_dl_3DC0, 8, 10, 0x0000 }, - { d_course_royal_raceway_packed_dl_3E50, 8, 11, 0x0000 }, - { d_course_royal_raceway_packed_dl_3F18, 8, 12, 0x0000 }, - { d_course_royal_raceway_packed_dl_4400, 8, 13, 0x0000 }, - { d_course_royal_raceway_packed_dl_4A08, 8, 14, 0x0000 }, - { d_course_royal_raceway_packed_dl_4A80, 8, 15, 0x0000 }, - { d_course_royal_raceway_packed_dl_4B30, 8, 16, 0x0000 }, - { d_course_royal_raceway_packed_dl_4BC8, 8, 17, 0x0000 }, - { d_course_royal_raceway_packed_dl_4CC8, 8, 18, 0x0000 }, - { d_course_royal_raceway_packed_dl_4968, 8, 19, 0x0000 }, - { d_course_royal_raceway_packed_dl_44B0, 8, 20, 0x0000 }, - { d_course_royal_raceway_packed_dl_4538, 8, 25, 0x0000 }, - { d_course_royal_raceway_packed_dl_45E0, 8, 26, 0x0000 }, - { d_course_royal_raceway_packed_dl_46E0, 8, 27, 0x0000 }, - { d_course_royal_raceway_packed_dl_47C0, 8, 28, 0x0000 }, - { d_course_royal_raceway_packed_dl_4890, 8, 29, 0x0000 }, - { d_course_royal_raceway_packed_dl_1720, 2, 1, 0x0000 }, - { d_course_royal_raceway_packed_dl_16B8, 2, 2, 0x0000 }, - { d_course_royal_raceway_packed_dl_1640, 2, 3, 0x0000 }, - { d_course_royal_raceway_packed_dl_15D8, 2, 4, 0x0000 }, - { d_course_royal_raceway_packed_dl_1548, 2, 5, 0x0000 }, - { d_course_royal_raceway_packed_dl_14C8, 2, 8, 0x0000 }, - { d_course_royal_raceway_packed_dl_1450, 2, 9, 0x0000 }, - { d_course_royal_raceway_packed_dl_1788, 2, 10, 0x0000 }, - { d_course_royal_raceway_packed_dl_1AA0, 2, 255, 0x0000 }, - { d_course_royal_raceway_packed_dl_1A30, 2, 255, 0x0000 }, - { d_course_royal_raceway_packed_dl_19B0, 2, 22, 0x0000 }, - { d_course_royal_raceway_packed_dl_1940, 2, 22, 0x0000 }, - { d_course_royal_raceway_packed_dl_18D8, 2, 27, 0x0000 }, - { d_course_royal_raceway_packed_dl_1860, 2, 27, 0x0000 }, - { d_course_royal_raceway_packed_dl_17F8, 2, 28, 0x0000 }, - { d_course_royal_raceway_packed_dl_3218, 255, 255, 0x0000 }, - { d_course_royal_raceway_packed_dl_A870, 8, 30, 0x0000 }, - { d_course_royal_raceway_packed_dl_AA10, 8, 30, 0x0000 }, - { d_course_royal_raceway_packed_dl_AA90, 8, 30, 0x0000 }, - { d_course_royal_raceway_packed_dl_ACE0, 3, 30, 0x0000 }, - { d_course_royal_raceway_packed_dl_AE00, 3, 30, 0x0000 }, - { d_course_royal_raceway_packed_dl_AD78, 3, 31, 0x0000 }, - { d_course_royal_raceway_packed_dl_E88, 6, 31, 0x0000 }, - { d_course_royal_raceway_packed_dl_AB28, 8, 31, 0x0000 }, - { d_course_royal_raceway_packed_dl_67E8, 4, 31, 0x0000 }, - { d_course_royal_raceway_packed_dl_AC60, 3, 32, 0x0000 }, - { d_course_royal_raceway_packed_dl_A998, 8, 32, 0x0000 }, - { d_course_royal_raceway_packed_dl_A7D8, 8, 32, 0x0000 }, - { d_course_royal_raceway_packed_dl_AE70, 3, 33, 0x0000 }, - { d_course_royal_raceway_packed_dl_CE0, 6, 33, 0x0000 }, - { d_course_royal_raceway_packed_dl_ABA8, 8, 33, 0x0000 }, - { d_course_royal_raceway_packed_dl_55D0, 8, 33, 0x0000 }, - { d_course_royal_raceway_packed_dl_A8F8, 8, 33, 0x0000 }, - { d_course_royal_raceway_packed_dl_A7D8, 8, 28, 0x0000 }, - { d_course_royal_raceway_packed_dl_3B50, 255, 255, 0x0000 }, - { d_course_royal_raceway_packed_dl_1A8, 255, 255, 0x4000 }, - { d_course_royal_raceway_packed_dl_840, 255, 255, 0x0000 }, - { d_course_royal_raceway_packed_dl_C38, 255, 255, 0x0000 }, - { d_course_royal_raceway_packed_dl_A618, 255, 255, 0x0000 }, - { 0x00000000, 0, 0, 0x0000 }, + { d_course_royal_raceway_packed_dl_2870, ASPHALT, 22, 0x0000 }, + { d_course_royal_raceway_packed_dl_23F8, ASPHALT, 23, 0x0000 }, + { d_course_royal_raceway_packed_dl_2478, ASPHALT, 24, 0x0000 }, + { d_course_royal_raceway_packed_dl_2530, ASPHALT, 25, 0x0000 }, + { d_course_royal_raceway_packed_dl_25E0, ASPHALT, 26, 0x0000 }, + { d_course_royal_raceway_packed_dl_26B0, ASPHALT, 27, 0x0000 }, + { d_course_royal_raceway_packed_dl_2758, ASPHALT, 28, 0x0000 }, + { d_course_royal_raceway_packed_dl_27E0, ASPHALT, 29, 0x0000 }, + { d_course_royal_raceway_packed_dl_5400, GRASS, 20, 0x0000 }, + { d_course_royal_raceway_packed_dl_54A8, GRASS, 19, 0x0000 }, + { d_course_royal_raceway_packed_dl_5520, GRASS, 18, 0x0000 }, + { d_course_royal_raceway_packed_dl_51E8, GRASS, 17, 0x0000 }, + { d_course_royal_raceway_packed_dl_4E90, GRASS, 16, 0x0000 }, + { d_course_royal_raceway_packed_dl_4F20, GRASS, 15, 0x0000 }, + { d_course_royal_raceway_packed_dl_4F98, GRASS, 14, 0x0000 }, + { d_course_royal_raceway_packed_dl_5018, GRASS, 13, 0x0000 }, + { d_course_royal_raceway_packed_dl_50B0, GRASS, 12, 0x0000 }, + { d_course_royal_raceway_packed_dl_5138, GRASS, 11, 0x0000 }, + { d_course_royal_raceway_packed_dl_5B50, GRASS, 22, 0x0000 }, + { d_course_royal_raceway_packed_dl_5C00, GRASS, 23, 0x0000 }, + { d_course_royal_raceway_packed_dl_5D18, GRASS, 22, 0x0000 }, + { d_course_royal_raceway_packed_dl_5DC8, GRASS, 23, 0x0000 }, + { d_course_royal_raceway_packed_dl_5EF8, GRASS, 25, 0x0000 }, + { d_course_royal_raceway_packed_dl_5AA8, GRASS, 26, 0x0000 }, + { d_course_royal_raceway_packed_dl_56A0, GRASS, 27, 0x0000 }, + { d_course_royal_raceway_packed_dl_5740, GRASS, 255, 0x0000 }, + { d_course_royal_raceway_packed_dl_57F0, GRASS, 24, 0x0000 }, + { d_course_royal_raceway_packed_dl_58E8, GRASS, 24, 0x0000 }, + { d_course_royal_raceway_packed_dl_5990, GRASS, 26, 0x0000 }, + { d_course_royal_raceway_packed_dl_5A10, GRASS, 28, 0x0000 }, + { d_course_royal_raceway_packed_dl_4078, GRASS, 1, 0x0000 }, + { d_course_royal_raceway_packed_dl_4118, GRASS, 2, 0x0000 }, + { d_course_royal_raceway_packed_dl_41A8, GRASS, 3, 0x0000 }, + { d_course_royal_raceway_packed_dl_4298, GRASS, 4, 0x0000 }, + { d_course_royal_raceway_packed_dl_4350, GRASS, 5, 0x0000 }, + { d_course_royal_raceway_packed_dl_3FA8, GRASS, 6, 0x0000 }, + { d_course_royal_raceway_packed_dl_3B70, GRASS, 7, 0x0000 }, + { d_course_royal_raceway_packed_dl_3C18, GRASS, 8, 0x0000 }, + { d_course_royal_raceway_packed_dl_3CF0, GRASS, 9, 0x0000 }, + { d_course_royal_raceway_packed_dl_3DC0, GRASS, 10, 0x0000 }, + { d_course_royal_raceway_packed_dl_3E50, GRASS, 11, 0x0000 }, + { d_course_royal_raceway_packed_dl_3F18, GRASS, 12, 0x0000 }, + { d_course_royal_raceway_packed_dl_4400, GRASS, 13, 0x0000 }, + { d_course_royal_raceway_packed_dl_4A08, GRASS, 14, 0x0000 }, + { d_course_royal_raceway_packed_dl_4A80, GRASS, 15, 0x0000 }, + { d_course_royal_raceway_packed_dl_4B30, GRASS, 16, 0x0000 }, + { d_course_royal_raceway_packed_dl_4BC8, GRASS, 17, 0x0000 }, + { d_course_royal_raceway_packed_dl_4CC8, GRASS, 18, 0x0000 }, + { d_course_royal_raceway_packed_dl_4968, GRASS, 19, 0x0000 }, + { d_course_royal_raceway_packed_dl_44B0, GRASS, 20, 0x0000 }, + { d_course_royal_raceway_packed_dl_4538, GRASS, 25, 0x0000 }, + { d_course_royal_raceway_packed_dl_45E0, GRASS, 26, 0x0000 }, + { d_course_royal_raceway_packed_dl_46E0, GRASS, 27, 0x0000 }, + { d_course_royal_raceway_packed_dl_47C0, GRASS, 28, 0x0000 }, + { d_course_royal_raceway_packed_dl_4890, GRASS, 29, 0x0000 }, + { d_course_royal_raceway_packed_dl_1720, DIRT, 1, 0x0000 }, + { d_course_royal_raceway_packed_dl_16B8, DIRT, 2, 0x0000 }, + { d_course_royal_raceway_packed_dl_1640, DIRT, 3, 0x0000 }, + { d_course_royal_raceway_packed_dl_15D8, DIRT, 4, 0x0000 }, + { d_course_royal_raceway_packed_dl_1548, DIRT, 5, 0x0000 }, + { d_course_royal_raceway_packed_dl_14C8, DIRT, 8, 0x0000 }, + { d_course_royal_raceway_packed_dl_1450, DIRT, 9, 0x0000 }, + { d_course_royal_raceway_packed_dl_1788, DIRT, 10, 0x0000 }, + { d_course_royal_raceway_packed_dl_1AA0, DIRT, 255, 0x0000 }, + { d_course_royal_raceway_packed_dl_1A30, DIRT, 255, 0x0000 }, + { d_course_royal_raceway_packed_dl_19B0, DIRT, 22, 0x0000 }, + { d_course_royal_raceway_packed_dl_1940, DIRT, 22, 0x0000 }, + { d_course_royal_raceway_packed_dl_18D8, DIRT, 27, 0x0000 }, + { d_course_royal_raceway_packed_dl_1860, DIRT, 27, 0x0000 }, + { d_course_royal_raceway_packed_dl_17F8, DIRT, 28, 0x0000 }, + { d_course_royal_raceway_packed_dl_3218, RAMP, 255, 0x0000 }, + { d_course_royal_raceway_packed_dl_A870, GRASS, 30, 0x0000 }, + { d_course_royal_raceway_packed_dl_AA10, GRASS, 30, 0x0000 }, + { d_course_royal_raceway_packed_dl_AA90, GRASS, 30, 0x0000 }, + { d_course_royal_raceway_packed_dl_ACE0, SAND, 30, 0x0000 }, + { d_course_royal_raceway_packed_dl_AE00, SAND, 30, 0x0000 }, + { d_course_royal_raceway_packed_dl_AD78, SAND, 31, 0x0000 }, + { d_course_royal_raceway_packed_dl_E88, BRIDGE, 31, 0x0000 }, + { d_course_royal_raceway_packed_dl_AB28, GRASS, 31, 0x0000 }, + { d_course_royal_raceway_packed_dl_67E8, STONE, 31, 0x0000 }, + { d_course_royal_raceway_packed_dl_AC60, SAND, 32, 0x0000 }, + { d_course_royal_raceway_packed_dl_A998, GRASS, 32, 0x0000 }, + { d_course_royal_raceway_packed_dl_A7D8, GRASS, 32, 0x0000 }, + { d_course_royal_raceway_packed_dl_AE70, SAND, 33, 0x0000 }, + { d_course_royal_raceway_packed_dl_CE0, BRIDGE, 33, 0x0000 }, + { d_course_royal_raceway_packed_dl_ABA8, GRASS, 33, 0x0000 }, + { d_course_royal_raceway_packed_dl_55D0, GRASS, 33, 0x0000 }, + { d_course_royal_raceway_packed_dl_A8F8, GRASS, 33, 0x0000 }, + { d_course_royal_raceway_packed_dl_A7D8, GRASS, 28, 0x0000 }, + { d_course_royal_raceway_packed_dl_3B50, RAMP, 255, 0x0000 }, + { d_course_royal_raceway_packed_dl_1A8, RAMP, 255, 0x4000 }, + { d_course_royal_raceway_packed_dl_840, RAMP, 255, 0x0000 }, + { d_course_royal_raceway_packed_dl_C38, RAMP, 255, 0x0000 }, + { d_course_royal_raceway_packed_dl_A618, RAMP, 255, 0x0000 }, + { 0x00000000, 0, 0, 0x0000 }, }; diff --git a/courses/sherbet_land/course_data.c b/courses/sherbet_land/course_data.c index 4eb7376ee..c759e2cc0 100644 --- a/courses/sherbet_land/course_data.c +++ b/courses/sherbet_land/course_data.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include "course_displaylists.inc.h" @@ -5266,28 +5267,28 @@ struct ActorSpawnData d_course_sherbet_land_item_box_spawns[] = { // 0x9C20 TrackSections d_course_sherbet_land_addr[] = { - { d_course_sherbet_land_packed_dl_1B20, 9, 1, 0x0000 }, - { d_course_sherbet_land_packed_dl_1A98, 9, 2, 0x0000 }, - { d_course_sherbet_land_packed_dl_1A18, 9, 3, 0x0000 }, - { d_course_sherbet_land_packed_dl_1998, 9, 4, 0x0000 }, - { d_course_sherbet_land_packed_dl_1C50, 9, 5, 0x0000 }, - { d_course_sherbet_land_packed_dl_1E40, 9, 6, 0x0000 }, - { d_course_sherbet_land_packed_dl_1DC0, 9, 7, 0x0000 }, - { d_course_sherbet_land_packed_dl_730, 5, 8, 0x0000 }, - { d_course_sherbet_land_packed_dl_5D0, 5, 9, 0x0000 }, - { d_course_sherbet_land_packed_dl_470, 5, 10, 0x0000 }, - { d_course_sherbet_land_packed_dl_348, 5, 11, 0x0000 }, - { d_course_sherbet_land_packed_dl_858, 5, 12, 0x0000 }, - { d_course_sherbet_land_packed_dl_9A0, 5, 13, 0x0000 }, - { d_course_sherbet_land_packed_dl_B00, 5, 14, 0x0000 }, - { d_course_sherbet_land_packed_dl_C30, 5, 15, 0x0000 }, - { d_course_sherbet_land_packed_dl_1D48, 9, 16, 0x0000 }, - { d_course_sherbet_land_packed_dl_1CD8, 9, 17, 0x0000 }, - { d_course_sherbet_land_packed_dl_1BE0, 9, 18, 0x0000 }, - { d_course_sherbet_land_packed_dl_1940, 255, 255, 0x0000 }, - { d_course_sherbet_land_packed_dl_EA0, 255, 255, 0x0000 }, - { d_course_sherbet_land_packed_dl_1450, 255, 255, 0x0000 }, - { d_course_sherbet_land_packed_dl_2738, 255, 255, 0x0000 }, - { d_course_sherbet_land_packed_dl_2798, 255, 255, 0x0000 }, - { 0x00000000, 0, 0, 0x0000 }, + { d_course_sherbet_land_packed_dl_1B20, ICE, 1, 0x0000 }, + { d_course_sherbet_land_packed_dl_1A98, ICE, 2, 0x0000 }, + { d_course_sherbet_land_packed_dl_1A18, ICE, 3, 0x0000 }, + { d_course_sherbet_land_packed_dl_1998, ICE, 4, 0x0000 }, + { d_course_sherbet_land_packed_dl_1C50, ICE, 5, 0x0000 }, + { d_course_sherbet_land_packed_dl_1E40, ICE, 6, 0x0000 }, + { d_course_sherbet_land_packed_dl_1DC0, ICE, 7, 0x0000 }, + { d_course_sherbet_land_packed_dl_730, SNOW, 8, 0x0000 }, + { d_course_sherbet_land_packed_dl_5D0, SNOW, 9, 0x0000 }, + { d_course_sherbet_land_packed_dl_470, SNOW, 10, 0x0000 }, + { d_course_sherbet_land_packed_dl_348, SNOW, 11, 0x0000 }, + { d_course_sherbet_land_packed_dl_858, SNOW, 12, 0x0000 }, + { d_course_sherbet_land_packed_dl_9A0, SNOW, 13, 0x0000 }, + { d_course_sherbet_land_packed_dl_B00, SNOW, 14, 0x0000 }, + { d_course_sherbet_land_packed_dl_C30, SNOW, 15, 0x0000 }, + { d_course_sherbet_land_packed_dl_1D48, ICE, 16, 0x0000 }, + { d_course_sherbet_land_packed_dl_1CD8, ICE, 17, 0x0000 }, + { d_course_sherbet_land_packed_dl_1BE0, ICE, 18, 0x0000 }, + { d_course_sherbet_land_packed_dl_1940, RAMP, 255, 0x0000 }, + { d_course_sherbet_land_packed_dl_EA0, RAMP, 255, 0x0000 }, + { d_course_sherbet_land_packed_dl_1450, RAMP, 255, 0x0000 }, + { d_course_sherbet_land_packed_dl_2738, RAMP, 255, 0x0000 }, + { d_course_sherbet_land_packed_dl_2798, RAMP, 255, 0x0000 }, + { 0x00000000, 0, 0, 0x0000 }, }; diff --git a/courses/toads_turnpike/course_data.c b/courses/toads_turnpike/course_data.c index 709ddf1ac..f6ee9c4c1 100644 --- a/courses/toads_turnpike/course_data.c +++ b/courses/toads_turnpike/course_data.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "course_displaylists.inc.h" @@ -8408,28 +8409,28 @@ struct ActorSpawnData d_course_toads_turnpike_item_box_spawns[] = { // 0x23B68 TrackSections d_course_toads_turnpike_addr[] = { - { d_course_toads_turnpike_packed_dl_32A0, 1, 1, 0x0000 }, - { d_course_toads_turnpike_packed_dl_33A8, 1, 2, 0x0000 }, - { d_course_toads_turnpike_packed_dl_3478, 1, 3, 0x0000 }, - { d_course_toads_turnpike_packed_dl_3548, 1, 4, 0x0000 }, - { d_course_toads_turnpike_packed_dl_31E8, 1, 5, 0x0000 }, - { d_course_toads_turnpike_packed_dl_2E40, 1, 6, 0x0000 }, - { d_course_toads_turnpike_packed_dl_2EE0, 1, 7, 0x0000 }, - { d_course_toads_turnpike_packed_dl_2FA0, 1, 8, 0x0000 }, - { d_course_toads_turnpike_packed_dl_3060, 1, 9, 0x0000 }, - { d_course_toads_turnpike_packed_dl_3118, 1, 10, 0x0000 }, - { d_course_toads_turnpike_packed_dl_3638, 1, 11, 0x0000 }, - { d_course_toads_turnpike_packed_dl_3AD0, 1, 12, 0x0000 }, - { d_course_toads_turnpike_packed_dl_3B58, 1, 13, 0x0000 }, - { d_course_toads_turnpike_packed_dl_3C28, 1, 14, 0x0000 }, - { d_course_toads_turnpike_packed_dl_3D00, 1, 15, 0x0000 }, - { d_course_toads_turnpike_packed_dl_39A8, 1, 16, 0x0000 }, - { d_course_toads_turnpike_packed_dl_36C0, 1, 17, 0x0000 }, - { d_course_toads_turnpike_packed_dl_3780, 1, 18, 0x0000 }, - { d_course_toads_turnpike_packed_dl_3850, 1, 19, 0x0000 }, - { d_course_toads_turnpike_packed_dl_38E8, 1, 20, 0x0000 }, - { d_course_toads_turnpike_packed_dl_FA8, 255, 255, 0x0000 }, - { d_course_toads_turnpike_packed_dl_51C8, 255, 255, 0x0000 }, - { 0x00000000, 0, 0, 0x0000 }, + { d_course_toads_turnpike_packed_dl_32A0, ASPHALT, 1, 0x0000 }, + { d_course_toads_turnpike_packed_dl_33A8, ASPHALT, 2, 0x0000 }, + { d_course_toads_turnpike_packed_dl_3478, ASPHALT, 3, 0x0000 }, + { d_course_toads_turnpike_packed_dl_3548, ASPHALT, 4, 0x0000 }, + { d_course_toads_turnpike_packed_dl_31E8, ASPHALT, 5, 0x0000 }, + { d_course_toads_turnpike_packed_dl_2E40, ASPHALT, 6, 0x0000 }, + { d_course_toads_turnpike_packed_dl_2EE0, ASPHALT, 7, 0x0000 }, + { d_course_toads_turnpike_packed_dl_2FA0, ASPHALT, 8, 0x0000 }, + { d_course_toads_turnpike_packed_dl_3060, ASPHALT, 9, 0x0000 }, + { d_course_toads_turnpike_packed_dl_3118, ASPHALT, 10, 0x0000 }, + { d_course_toads_turnpike_packed_dl_3638, ASPHALT, 11, 0x0000 }, + { d_course_toads_turnpike_packed_dl_3AD0, ASPHALT, 12, 0x0000 }, + { d_course_toads_turnpike_packed_dl_3B58, ASPHALT, 13, 0x0000 }, + { d_course_toads_turnpike_packed_dl_3C28, ASPHALT, 14, 0x0000 }, + { d_course_toads_turnpike_packed_dl_3D00, ASPHALT, 15, 0x0000 }, + { d_course_toads_turnpike_packed_dl_39A8, ASPHALT, 16, 0x0000 }, + { d_course_toads_turnpike_packed_dl_36C0, ASPHALT, 17, 0x0000 }, + { d_course_toads_turnpike_packed_dl_3780, ASPHALT, 18, 0x0000 }, + { d_course_toads_turnpike_packed_dl_3850, ASPHALT, 19, 0x0000 }, + { d_course_toads_turnpike_packed_dl_38E8, ASPHALT, 20, 0x0000 }, + { d_course_toads_turnpike_packed_dl_FA8, RAMP, 255, 0x0000 }, + { d_course_toads_turnpike_packed_dl_51C8, RAMP, 255, 0x0000 }, + { 0x00000000, 0, 0, 0x0000 }, }; diff --git a/courses/wario_stadium/course_data.c b/courses/wario_stadium/course_data.c index 6c75f57d5..5c2475c11 100644 --- a/courses/wario_stadium/course_data.c +++ b/courses/wario_stadium/course_data.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "course_displaylists.inc.h" @@ -4933,36 +4934,36 @@ struct ActorSpawnData d_course_wario_stadium_item_box_spawns[] = { // 0xCC38 TrackSections d_course_wario_stadium_addr[] = { - { d_course_wario_stadium_packed_dl_8D28, 2, 1, 0x0000 }, - { d_course_wario_stadium_packed_dl_8DE8, 2, 2, 0x0000 }, - { d_course_wario_stadium_packed_dl_8EF0, 2, 3, 0x0000 }, - { d_course_wario_stadium_packed_dl_8FC8, 2, 4, 0x0000 }, - { d_course_wario_stadium_packed_dl_9090, 2, 5, 0x0000 }, - { d_course_wario_stadium_packed_dl_9120, 2, 6, 0x0000 }, - { d_course_wario_stadium_packed_dl_8C28, 2, 7, 0x0000 }, - { d_course_wario_stadium_packed_dl_85F0, 2, 8, 0x0000 }, - { d_course_wario_stadium_packed_dl_8678, 2, 9, 0x0000 }, - { d_course_wario_stadium_packed_dl_8708, 2, 10, 0x0000 }, - { d_course_wario_stadium_packed_dl_8798, 2, 11, 0x0000 }, - { d_course_wario_stadium_packed_dl_88A0, 2, 12, 0x0000 }, - { d_course_wario_stadium_packed_dl_8A68, 2, 13, 0x0000 }, - { d_course_wario_stadium_packed_dl_91E8, 2, 14, 0x0000 }, - { d_course_wario_stadium_packed_dl_98A0, 2, 15, 0x0000 }, - { d_course_wario_stadium_packed_dl_9998, 2, 16, 0x0000 }, - { d_course_wario_stadium_packed_dl_9AD8, 2, 17, 0x0000 }, - { d_course_wario_stadium_packed_dl_9C80, 2, 18, 0x0000 }, - { d_course_wario_stadium_packed_dl_9D00, 2, 19, 0x0000 }, - { d_course_wario_stadium_packed_dl_9D78, 2, 20, 0x0000 }, - { d_course_wario_stadium_packed_dl_9820, 2, 21, 0x0000 }, - { d_course_wario_stadium_packed_dl_9328, 2, 22, 0x0000 }, - { d_course_wario_stadium_packed_dl_93B0, 2, 23, 0x0000 }, - { d_course_wario_stadium_packed_dl_9430, 2, 24, 0x0000 }, - { d_course_wario_stadium_packed_dl_9590, 2, 25, 0x0000 }, - { d_course_wario_stadium_packed_dl_9668, 2, 26, 0x0000 }, - { d_course_wario_stadium_packed_dl_9760, 2, 27, 0x0000 }, - { d_course_wario_stadium_packed_dl_6D20, 255, 255, 0x0000 }, - { d_course_wario_stadium_packed_dl_8510, 255, 255, 0x0000 }, - { d_course_wario_stadium_packed_dl_5D90, 255, 255, 0x0000 }, - { d_course_wario_stadium_packed_dl_9F18, 255, 255, 0x0000 }, - { 0x00000000, 0, 0, 0x0000 }, + { d_course_wario_stadium_packed_dl_8D28, DIRT, 1, 0x0000 }, + { d_course_wario_stadium_packed_dl_8DE8, DIRT, 2, 0x0000 }, + { d_course_wario_stadium_packed_dl_8EF0, DIRT, 3, 0x0000 }, + { d_course_wario_stadium_packed_dl_8FC8, DIRT, 4, 0x0000 }, + { d_course_wario_stadium_packed_dl_9090, DIRT, 5, 0x0000 }, + { d_course_wario_stadium_packed_dl_9120, DIRT, 6, 0x0000 }, + { d_course_wario_stadium_packed_dl_8C28, DIRT, 7, 0x0000 }, + { d_course_wario_stadium_packed_dl_85F0, DIRT, 8, 0x0000 }, + { d_course_wario_stadium_packed_dl_8678, DIRT, 9, 0x0000 }, + { d_course_wario_stadium_packed_dl_8708, DIRT, 10, 0x0000 }, + { d_course_wario_stadium_packed_dl_8798, DIRT, 11, 0x0000 }, + { d_course_wario_stadium_packed_dl_88A0, DIRT, 12, 0x0000 }, + { d_course_wario_stadium_packed_dl_8A68, DIRT, 13, 0x0000 }, + { d_course_wario_stadium_packed_dl_91E8, DIRT, 14, 0x0000 }, + { d_course_wario_stadium_packed_dl_98A0, DIRT, 15, 0x0000 }, + { d_course_wario_stadium_packed_dl_9998, DIRT, 16, 0x0000 }, + { d_course_wario_stadium_packed_dl_9AD8, DIRT, 17, 0x0000 }, + { d_course_wario_stadium_packed_dl_9C80, DIRT, 18, 0x0000 }, + { d_course_wario_stadium_packed_dl_9D00, DIRT, 19, 0x0000 }, + { d_course_wario_stadium_packed_dl_9D78, DIRT, 20, 0x0000 }, + { d_course_wario_stadium_packed_dl_9820, DIRT, 21, 0x0000 }, + { d_course_wario_stadium_packed_dl_9328, DIRT, 22, 0x0000 }, + { d_course_wario_stadium_packed_dl_93B0, DIRT, 23, 0x0000 }, + { d_course_wario_stadium_packed_dl_9430, DIRT, 24, 0x0000 }, + { d_course_wario_stadium_packed_dl_9590, DIRT, 25, 0x0000 }, + { d_course_wario_stadium_packed_dl_9668, DIRT, 26, 0x0000 }, + { d_course_wario_stadium_packed_dl_9760, DIRT, 27, 0x0000 }, + { d_course_wario_stadium_packed_dl_6D20, RAMP, 255, 0x0000 }, + { d_course_wario_stadium_packed_dl_8510, RAMP, 255, 0x0000 }, + { d_course_wario_stadium_packed_dl_5D90, RAMP, 255, 0x0000 }, + { d_course_wario_stadium_packed_dl_9F18, RAMP, 255, 0x0000 }, + { 0x00000000, 0, 0, 0x0000 }, }; diff --git a/courses/yoshi_valley/course_data.c b/courses/yoshi_valley/course_data.c index 2053ea389..4569c1c61 100644 --- a/courses/yoshi_valley/course_data.c +++ b/courses/yoshi_valley/course_data.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "course_displaylists.inc.h" @@ -11379,60 +11380,60 @@ struct ActorSpawnData d_course_yoshi_valley_item_box_spawns[] = { // 0x18240 TrackSections d_course_yoshi_valley_addr[] = { - {d_course_yoshi_valley_packed_dl_44C8, 2, 1, 0x0000}, - {d_course_yoshi_valley_packed_dl_4588, 2, 2, 0x0000}, - {d_course_yoshi_valley_packed_dl_45F0, 2, 3, 0x0000}, - {d_course_yoshi_valley_packed_dl_4670, 2, 4, 0x0000}, - {d_course_yoshi_valley_packed_dl_46E0, 2, 5, 0x0000}, - {d_course_yoshi_valley_packed_dl_4810, 2, 6, 0x0000}, - {d_course_yoshi_valley_packed_dl_4428, 2, 7, 0x0000}, - {d_course_yoshi_valley_packed_dl_3E08, 2, 8, 0x0000}, - {d_course_yoshi_valley_packed_dl_3F10, 2, 9, 0x0000}, - {d_course_yoshi_valley_packed_dl_3FF0, 2, 10, 0x0000}, - {d_course_yoshi_valley_packed_dl_4108, 2, 11, 0x0000}, - {d_course_yoshi_valley_packed_dl_41B0, 2, 12, 0x0000}, - {d_course_yoshi_valley_packed_dl_4258, 2, 13, 0x0000}, - {d_course_yoshi_valley_packed_dl_4358, 2, 14, 0x0000}, - {d_course_yoshi_valley_packed_dl_4918, 2, 15, 0x0000}, - {d_course_yoshi_valley_packed_dl_4FD0, 2, 16, 0x0000}, - {d_course_yoshi_valley_packed_dl_5058, 2, 17, 0x0000}, - {d_course_yoshi_valley_packed_dl_1418, 17, 18, 0x0000}, - {d_course_yoshi_valley_packed_dl_50E0, 2, 19, 0x0000}, - {d_course_yoshi_valley_packed_dl_5158, 2, 20, 0x0000}, - {d_course_yoshi_valley_packed_dl_51D8, 2, 21, 0x0000}, - {d_course_yoshi_valley_packed_dl_52D8, 2, 22, 0x0000}, - {d_course_yoshi_valley_packed_dl_4F48, 2, 23, 0x0000}, - {d_course_yoshi_valley_packed_dl_49C0, 2, 24, 0x0000}, - {d_course_yoshi_valley_packed_dl_4A58, 2, 25, 0x0000}, - {d_course_yoshi_valley_packed_dl_4B20, 2, 26, 0x0000}, - {d_course_yoshi_valley_packed_dl_4C18, 2, 27, 0x0000}, - {d_course_yoshi_valley_packed_dl_4CB0, 2, 28, 0x0000}, - {d_course_yoshi_valley_packed_dl_1580, 17, 29, 0x0000}, - {d_course_yoshi_valley_packed_dl_4D68, 2, 30, 0x0000}, - {d_course_yoshi_valley_packed_dl_4E88, 2, 31, 0x0000}, - {d_course_yoshi_valley_packed_dl_5788, 8, 1, 0x0000}, - {d_course_yoshi_valley_packed_dl_5800, 8, 1, 0x0000}, - {d_course_yoshi_valley_packed_dl_5880, 8, 2, 0x0000}, - {d_course_yoshi_valley_packed_dl_58F8, 8, 2, 0x0000}, - {d_course_yoshi_valley_packed_dl_5710, 8, 3, 0x0000}, - {d_course_yoshi_valley_packed_dl_54B0, 8, 3, 0x0000}, - {d_course_yoshi_valley_packed_dl_5548, 8, 4, 0x0000}, - {d_course_yoshi_valley_packed_dl_55C0, 8, 4, 0x0000}, - {d_course_yoshi_valley_packed_dl_5628, 8, 4, 0x0000}, - {d_course_yoshi_valley_packed_dl_56A0, 8, 19, 0x0000}, - {d_course_yoshi_valley_packed_dl_5970, 8, 19, 0x0000}, - {d_course_yoshi_valley_packed_dl_5C80, 8, 20, 0x0000}, - {d_course_yoshi_valley_packed_dl_5D00, 8, 20, 0x0000}, - {d_course_yoshi_valley_packed_dl_5D90, 8, 19, 0x0000}, - {d_course_yoshi_valley_packed_dl_5DF8, 8, 20, 0x0000}, - {d_course_yoshi_valley_packed_dl_5C18, 8, 1, 0x0000}, - {d_course_yoshi_valley_packed_dl_59F0, 8, 3, 0x0000}, - {d_course_yoshi_valley_packed_dl_75D0, 255, 255, 0x0000}, - {d_course_yoshi_valley_packed_dl_3010, 255, 255, 0x0000}, - {d_course_yoshi_valley_packed_dl_8050, 255, 255, 0x0000}, - {d_course_yoshi_valley_packed_dl_13D8, 255, 255, 0x8000}, - {d_course_yoshi_valley_packed_dl_D20, 255, 255, 0x8000}, - { 0x00000000, 0, 0, 0x0000 }, + {d_course_yoshi_valley_packed_dl_44C8, DIRT, 1, 0x0000}, + {d_course_yoshi_valley_packed_dl_4588, DIRT, 2, 0x0000}, + {d_course_yoshi_valley_packed_dl_45F0, DIRT, 3, 0x0000}, + {d_course_yoshi_valley_packed_dl_4670, DIRT, 4, 0x0000}, + {d_course_yoshi_valley_packed_dl_46E0, DIRT, 5, 0x0000}, + {d_course_yoshi_valley_packed_dl_4810, DIRT, 6, 0x0000}, + {d_course_yoshi_valley_packed_dl_4428, DIRT, 7, 0x0000}, + {d_course_yoshi_valley_packed_dl_3E08, DIRT, 8, 0x0000}, + {d_course_yoshi_valley_packed_dl_3F10, DIRT, 9, 0x0000}, + {d_course_yoshi_valley_packed_dl_3FF0, DIRT, 10, 0x0000}, + {d_course_yoshi_valley_packed_dl_4108, DIRT, 11, 0x0000}, + {d_course_yoshi_valley_packed_dl_41B0, DIRT, 12, 0x0000}, + {d_course_yoshi_valley_packed_dl_4258, DIRT, 13, 0x0000}, + {d_course_yoshi_valley_packed_dl_4358, DIRT, 14, 0x0000}, + {d_course_yoshi_valley_packed_dl_4918, DIRT, 15, 0x0000}, + {d_course_yoshi_valley_packed_dl_4FD0, DIRT, 16, 0x0000}, + {d_course_yoshi_valley_packed_dl_5058, DIRT, 17, 0x0000}, + {d_course_yoshi_valley_packed_dl_1418, WOOD_BRIDGE, 18, 0x0000}, + {d_course_yoshi_valley_packed_dl_50E0, DIRT, 19, 0x0000}, + {d_course_yoshi_valley_packed_dl_5158, DIRT, 20, 0x0000}, + {d_course_yoshi_valley_packed_dl_51D8, DIRT, 21, 0x0000}, + {d_course_yoshi_valley_packed_dl_52D8, DIRT, 22, 0x0000}, + {d_course_yoshi_valley_packed_dl_4F48, DIRT, 23, 0x0000}, + {d_course_yoshi_valley_packed_dl_49C0, DIRT, 24, 0x0000}, + {d_course_yoshi_valley_packed_dl_4A58, DIRT, 25, 0x0000}, + {d_course_yoshi_valley_packed_dl_4B20, DIRT, 26, 0x0000}, + {d_course_yoshi_valley_packed_dl_4C18, DIRT, 27, 0x0000}, + {d_course_yoshi_valley_packed_dl_4CB0, DIRT, 28, 0x0000}, + {d_course_yoshi_valley_packed_dl_1580, WOOD_BRIDGE, 29, 0x0000}, + {d_course_yoshi_valley_packed_dl_4D68, DIRT, 30, 0x0000}, + {d_course_yoshi_valley_packed_dl_4E88, DIRT, 31, 0x0000}, + {d_course_yoshi_valley_packed_dl_5788, GRASS, 1, 0x0000}, + {d_course_yoshi_valley_packed_dl_5800, GRASS, 1, 0x0000}, + {d_course_yoshi_valley_packed_dl_5880, GRASS, 2, 0x0000}, + {d_course_yoshi_valley_packed_dl_58F8, GRASS, 2, 0x0000}, + {d_course_yoshi_valley_packed_dl_5710, GRASS, 3, 0x0000}, + {d_course_yoshi_valley_packed_dl_54B0, GRASS, 3, 0x0000}, + {d_course_yoshi_valley_packed_dl_5548, GRASS, 4, 0x0000}, + {d_course_yoshi_valley_packed_dl_55C0, GRASS, 4, 0x0000}, + {d_course_yoshi_valley_packed_dl_5628, GRASS, 4, 0x0000}, + {d_course_yoshi_valley_packed_dl_56A0, GRASS, 19, 0x0000}, + {d_course_yoshi_valley_packed_dl_5970, GRASS, 19, 0x0000}, + {d_course_yoshi_valley_packed_dl_5C80, GRASS, 20, 0x0000}, + {d_course_yoshi_valley_packed_dl_5D00, GRASS, 20, 0x0000}, + {d_course_yoshi_valley_packed_dl_5D90, GRASS, 19, 0x0000}, + {d_course_yoshi_valley_packed_dl_5DF8, GRASS, 20, 0x0000}, + {d_course_yoshi_valley_packed_dl_5C18, GRASS, 1, 0x0000}, + {d_course_yoshi_valley_packed_dl_59F0, GRASS, 3, 0x0000}, + {d_course_yoshi_valley_packed_dl_75D0, RAMP, 255, 0x0000}, + {d_course_yoshi_valley_packed_dl_3010, RAMP, 255, 0x0000}, + {d_course_yoshi_valley_packed_dl_8050, RAMP, 255, 0x0000}, + {d_course_yoshi_valley_packed_dl_13D8, RAMP, 255, 0x8000}, + {d_course_yoshi_valley_packed_dl_D20, RAMP, 255, 0x8000}, + { 0x00000000, 0, 0, 0x0000 }, }; Gfx *d_course_yoshi_valley_dl_list[] = {