diff options
Diffstat (limited to 'include')
24 files changed, 928 insertions, 149 deletions
diff --git a/include/assets/banshee_boardwalk_data.h b/include/assets/banshee_boardwalk_data.h index 4938c28c9..55716f809 100644 --- a/include/assets/banshee_boardwalk_data.h +++ b/include/assets/banshee_boardwalk_data.h @@ -6,14 +6,20 @@ static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_0[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_0"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_0[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_0"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_8[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_8"; static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_38[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_38"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_38[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_38"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_40[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_40"; static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_68[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_68"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_68[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_68"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_A0[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_A0"; static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_160[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_160"; @@ -242,14 +248,24 @@ static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_cheep_cheep10[] = "_ static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_fish_eyes[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_fish_eyes"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_7650[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_7650"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_7650[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_7650"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_78C0[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_78C0"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_78C0[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_78C0"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_7978[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_7978"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_7978[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_7978"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_7B38[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_7B38"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_7B38[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_7B38"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_7B78[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_7B78"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_7B78[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_7B78"; static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_cheep_cheep[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_cheep_cheep"; @@ -281,10 +297,18 @@ static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_texture[] = "__OTR__ static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_A850[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_A850"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_A850[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_A850"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_A900[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_A900"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_A900[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_A900"; + +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_A9B0[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_A9B0"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_A9B0[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_A9B0"; +static const ALIGN_ASSET(2) char banshee_boardwalk_data_seg6_gfx_A9C8[] = "__OTR__banshee_boardwalk_data/banshee_boardwalk_data_seg6_gfx_A9C8"; + static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_A9C8[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_A9C8"; static const ALIGN_ASSET(2) char d_course_banshee_boardwalk_dl_trash_bin[] = "__OTR__banshee_boardwalk_data/d_course_banshee_boardwalk_dl_trash_bin"; diff --git a/include/assets/bowsers_castle_data.h b/include/assets/bowsers_castle_data.h index 9c237d629..9768f72e0 100644 --- a/include/assets/bowsers_castle_data.h +++ b/include/assets/bowsers_castle_data.h @@ -257,10 +257,14 @@ static const ALIGN_ASSET(2) char d_course_bowsers_castle_thwomp_model3[] = "__OT static const ALIGN_ASSET(2) char d_course_bowsers_castle_thwomp_model4[] = "__OTR__bowsers_castle_data/d_course_bowsers_castle_thwomp_model4"; +static const ALIGN_ASSET(2) char bowsers_castle_data_seg6_gfx_8F38[] = "__OTR__bowsers_castle_data/bowsers_castle_data_seg6_gfx_8F38"; + static const ALIGN_ASSET(2) char d_course_bowsers_castle_dl_8F38[] = "__OTR__bowsers_castle_data/d_course_bowsers_castle_dl_8F38"; static const ALIGN_ASSET(2) char d_course_bowsers_castle_dl_9078[] = "__OTR__bowsers_castle_data/d_course_bowsers_castle_dl_9078"; +static const ALIGN_ASSET(2) char bowsers_castle_data_seg6_gfx_9078[] = "__OTR__bowsers_castle_data/bowsers_castle_data_seg6_gfx_9078"; + static const ALIGN_ASSET(2) char d_course_bowsers_castle_dl_thwomp[] = "__OTR__bowsers_castle_data/d_course_bowsers_castle_dl_thwomp"; static const ALIGN_ASSET(2) char d_course_bowsers_castle_unknown_model[] = "__OTR__bowsers_castle_data/d_course_bowsers_castle_unknown_model"; diff --git a/include/assets/ceremony_data.h b/include/assets/ceremony_data.h index 8af6d7cec..928f3f423 100644 --- a/include/assets/ceremony_data.h +++ b/include/assets/ceremony_data.h @@ -25,16 +25,28 @@ static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_E50[] = "__OTR__ceremon static const ALIGN_ASSET(2) char silver_trophy_dl[] = "__OTR__ceremony_data/silver_trophy_dl"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_FE0[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_FE0"; + static const ALIGN_ASSET(2) char silver_trophy_dl2[] = "__OTR__ceremony_data/silver_trophy_dl2"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_10B8[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_10B8"; + static const ALIGN_ASSET(2) char silver_trophy_dl3[] = "__OTR__ceremony_data/silver_trophy_dl3"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_1188[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_1188"; + static const ALIGN_ASSET(2) char silver_trophy_dl4[] = "__OTR__ceremony_data/silver_trophy_dl4"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_1260[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_1260"; + +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_1418[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_1418"; + static const ALIGN_ASSET(2) char silver_trophy_dl5[] = "__OTR__ceremony_data/silver_trophy_dl5"; static const ALIGN_ASSET(2) char silver_trophy_dl6[] = "__OTR__ceremony_data/silver_trophy_dl6"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_14D0[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_14D0"; + static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_1580[] = "__OTR__ceremony_data/ceremony_data_seg11_vtx_1580"; static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_16E0[] = "__OTR__ceremony_data/ceremony_data_seg11_vtx_16E0"; @@ -81,22 +93,40 @@ static const ALIGN_ASSET(2) char reflection_map_silver[] = "__OTR__ceremony_data static const ALIGN_ASSET(2) char ceremony_reflection_map_gold[] = "__OTR__ceremony_data/reflection_map_gold"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_5E70[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_5E70"; + static const ALIGN_ASSET(2) char gold_trophy_dl[] = "__OTR__ceremony_data/gold_trophy_dl"; static const ALIGN_ASSET(2) char gold_trophy_dl2[] = "__OTR__ceremony_data/gold_trophy_dl2"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_5F20[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_5F20"; + static const ALIGN_ASSET(2) char gold_trophy_dl3[] = "__OTR__ceremony_data/gold_trophy_dl3"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_5FD0[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_5FD0"; + static const ALIGN_ASSET(2) char gold_trophy_dl4[] = "__OTR__ceremony_data/gold_trophy_dl4"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_6218[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_6218"; + static const ALIGN_ASSET(2) char gold_trophy_dl5[] = "__OTR__ceremony_data/gold_trophy_dl5"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_62C8[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_62C8"; + +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_6518[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_6518"; + static const ALIGN_ASSET(2) char gold_trophy_dl6[] = "__OTR__ceremony_data/gold_trophy_dl6"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_6720[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_6720"; + static const ALIGN_ASSET(2) char gold_trophy_dl7[] = "__OTR__ceremony_data/gold_trophy_dl7"; static const ALIGN_ASSET(2) char gold_trophy_dl8[] = "__OTR__ceremony_data/gold_trophy_dl8"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_6880[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_6880"; + +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_6948[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_6948"; + static const ALIGN_ASSET(2) char gold_trophy_dl9[] = "__OTR__ceremony_data/gold_trophy_dl9"; static const ALIGN_ASSET(2) char gold_trophy_dl10[] = "__OTR__ceremony_data/gold_trophy_dl10"; @@ -111,6 +141,8 @@ static const ALIGN_ASSET(2) char gold_trophy_dl14[] = "__OTR__ceremony_data/gold static const ALIGN_ASSET(2) char gold_trophy_dl15[] = "__OTR__ceremony_data/gold_trophy_dl15"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_lights_6BB8[] = "__OTR__ceremony_data/ceremony_data_seg11_lights_6BB8"; + static const ALIGN_ASSET(2) char light1[] = "__OTR__ceremony_data/light1"; static const ALIGN_ASSET(2) char gTexturePodium1[] = "__OTR__ceremony_data/texture_podium1"; @@ -121,8 +153,12 @@ static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_74D0[] = "__OTR__ceremo static const ALIGN_ASSET(2) char podium_dl[] = "__OTR__ceremony_data/podium_dl"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_7510[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_7510"; + static const ALIGN_ASSET(2) char podium_dl2[] = "__OTR__ceremony_data/podium_dl2"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_75E0[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_75E0"; + static const ALIGN_ASSET(2) char podium_dl3[] = "__OTR__ceremony_data/podium_dl3"; static const ALIGN_ASSET(2) char podium_dl4[] = "__OTR__ceremony_data/podium_dl4"; @@ -131,12 +167,18 @@ static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_7608[] = "__OTR__ceremo static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_7708[] = "__OTR__ceremony_data/ceremony_data_seg11_vtx_7708"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_lights_7748[] = "__OTR__ceremony_data/ceremony_data_seg11_lights_7748"; + static const ALIGN_ASSET(2) char light2[] = "__OTR__ceremony_data/light2"; static const ALIGN_ASSET(2) char gTexturePodium2[] = "__OTR__ceremony_data/texture_podium2"; static const ALIGN_ASSET(2) char podium2_dl[] = "__OTR__ceremony_data/podium2_dl"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_7F60[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_7F60"; + +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_8030[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_8030"; + static const ALIGN_ASSET(2) char podium2_dl2[] = "__OTR__ceremony_data/podium2_dl2"; static const ALIGN_ASSET(2) char podium2_dl3[] = "__OTR__ceremony_data/podium2_dl3"; @@ -145,14 +187,20 @@ static const ALIGN_ASSET(2) char podium2_dl4[] = "__OTR__ceremony_data/podium2_d static const ALIGN_ASSET(2) char light3[] = "__OTR__ceremony_data/light3"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_lights_8058[] = "__OTR__ceremony_data/ceremony_data_seg11_lights_8058"; + static const ALIGN_ASSET(2) char gTexturePodium3[] = "__OTR__ceremony_data/texture_podium3"; static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_8870[] = "__OTR__ceremony_data/ceremony_data_seg11_vtx_8870"; static const ALIGN_ASSET(2) char ceremony_data_seg11_vtx_8970[] = "__OTR__ceremony_data/ceremony_data_seg11_vtx_8970"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_89B0[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_89B0"; + static const ALIGN_ASSET(2) char podium3_dl[] = "__OTR__ceremony_data/podium3_dl"; +static const ALIGN_ASSET(2) char ceremony_data_seg11_gfx_8A80[] = "__OTR__ceremony_data/ceremony_data_seg11_gfx_8A80"; + static const ALIGN_ASSET(2) char podium3_dl2[] = "__OTR__ceremony_data/podium3_dl2"; static const ALIGN_ASSET(2) char podium3_dl3[] = "__OTR__ceremony_data/podium3_dl3"; diff --git a/include/assets/choco_mountain_data.h b/include/assets/choco_mountain_data.h index d78b83689..86be88fdd 100644 --- a/include/assets/choco_mountain_data.h +++ b/include/assets/choco_mountain_data.h @@ -200,6 +200,8 @@ static const ALIGN_ASSET(2) char d_course_choco_mountain_unknown_waypoints[] = " static const ALIGN_ASSET(2) char d_course_choco_mountain_track_waypoints[] = "__OTR__choco_mountain_data/d_course_choco_mountain_track_waypoints"; +static const ALIGN_ASSET(2) char choco_mountain_data_seg6_lights_5AE0[] = "__OTR__choco_mountain_data/choco_mountain_data_seg6_lights_5AE0"; + static const ALIGN_ASSET(2) char d_course_choco_mountain_light[] = "__OTR__choco_mountain_data/d_course_choco_mountain_light"; static const ALIGN_ASSET(2) char d_course_choco_mountain_6005AF8[] = "__OTR__choco_mountain_data/d_course_choco_mountain_6005AF8"; diff --git a/include/assets/common_data.h b/include/assets/common_data.h index 32cab69bc..5dc159476 100644 --- a/include/assets/common_data.h +++ b/include/assets/common_data.h @@ -53,10 +53,16 @@ static const ALIGN_ASSET(2) char D_0D001828[] = "__OTR__common_data/D_0D001828"; static const ALIGN_ASSET(2) char D_0D001840[] = "__OTR__common_data/D_0D001840"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_1840[] = "__OTR__common_data/common_data_seg13_gfx_1840"; + static const ALIGN_ASSET(2) char common_model_finish_post[] = "__OTR__common_data/common_model_finish_post"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_1AB8[] = "__OTR__common_data/common_data_seg13_gfx_1AB8"; + static const ALIGN_ASSET(2) char D_0D001B68[] = "__OTR__common_data/D_0D001B68"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_1B68[] = "__OTR__common_data/common_data_seg13_gfx_1B68"; + static const ALIGN_ASSET(2) char D_0D001B90[] = "__OTR__common_data/D_0D001B90"; static const ALIGN_ASSET(2) char D_0D001BD8[] = "__OTR__common_data/D_0D001BD8"; @@ -79,6 +85,8 @@ static const ALIGN_ASSET(2) char itemBoxQuestionMarkModel[] = "__OTR__common_dat static const ALIGN_ASSET(2) char D_0D003090[] = "__OTR__common_data/D_0D003090"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_3090[] = "__OTR__common_data/common_data_seg13_gfx_3090"; + static const ALIGN_ASSET(2) char D_0D0030F8[] = "__OTR__common_data/D_0D0030F8"; static const ALIGN_ASSET(2) char D_0D003128[] = "__OTR__common_data/D_0D003128"; @@ -95,6 +103,8 @@ static const ALIGN_ASSET(2) char D_0D003218[] = "__OTR__common_data/D_0D003218"; static const ALIGN_ASSET(2) char D_0D003248[] = "__OTR__common_data/D_0D003248"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_3278[] = "__OTR__common_data/common_data_seg13_gfx_3278"; + static const ALIGN_ASSET(2) char D_0D003278[] = "__OTR__common_data/D_0D003278"; static const ALIGN_ASSET(2) char D_0D003288[] = "__OTR__common_data/D_0D003288"; @@ -125,6 +135,8 @@ static const ALIGN_ASSET(2) char D_0D0052B8[] = "__OTR__common_data/D_0D0052B8"; static const ALIGN_ASSET(2) char D_0D005308[] = "__OTR__common_data/D_0D005308"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_5308[] = "__OTR__common_data/common_data_seg13_gfx_5308"; + static const ALIGN_ASSET(2) char D_0D005338[] = "__OTR__common_data/D_0D005338"; static const ALIGN_ASSET(2) char D_0D005368[] = "__OTR__common_data/D_0D005368"; @@ -201,14 +213,20 @@ static const ALIGN_ASSET(2) char D_0D006930[] = "__OTR__common_data/D_0D006930"; static const ALIGN_ASSET(2) char common_rectangle_display[] = "__OTR__common_data/common_rectangle_display"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_6940[] = "__OTR__common_data/common_data_seg13_gfx_6940"; + static const ALIGN_ASSET(2) char D_0D006950[] = "__OTR__common_data/D_0D006950"; static const ALIGN_ASSET(2) char D_0D006968[] = "__OTR__common_data/D_0D006968"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_6980[] = "__OTR__common_data/common_data_seg13_gfx_6980"; + static const ALIGN_ASSET(2) char D_0D006980[] = "__OTR__common_data/D_0D006980"; static const ALIGN_ASSET(2) char D_0D006998[] = "__OTR__common_data/D_0D006998"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_69B0[] = "__OTR__common_data/common_data_seg13_gfx_69B0"; + static const ALIGN_ASSET(2) char D_0D0069B0[] = "__OTR__common_data/D_0D0069B0"; static const ALIGN_ASSET(2) char D_0D0069C8[] = "__OTR__common_data/D_0D0069C8"; @@ -219,6 +237,8 @@ static const ALIGN_ASSET(2) char D_0D0069F8[] = "__OTR__common_data/D_0D0069F8"; static const ALIGN_ASSET(2) char D_0D006A10[] = "__OTR__common_data/D_0D006A10"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_6A10[] = "__OTR__common_data/common_data_seg13_gfx_6A10"; + static const ALIGN_ASSET(2) char D_0D006A28[] = "__OTR__common_data/D_0D006A28"; static const ALIGN_ASSET(2) char D_0D006A40[] = "__OTR__common_data/D_0D006A40"; @@ -233,6 +253,8 @@ static const ALIGN_ASSET(2) char common_texture_debug_font[] = "__OTR__common_da static const ALIGN_ASSET(2) char D_0D0076F8[] = "__OTR__common_data/D_0D0076F8"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_7780[] = "__OTR__common_data/common_data_seg13_gfx_7780"; + static const ALIGN_ASSET(2) char D_0D007780[] = "__OTR__common_data/D_0D007780"; static const ALIGN_ASSET(2) char D_0D0077A0[] = "__OTR__common_data/D_0D0077A0"; @@ -253,6 +275,8 @@ static const ALIGN_ASSET(2) char D_0D0078D0[] = "__OTR__common_data/D_0D0078D0"; static const ALIGN_ASSET(2) char D_0D0078F8[] = "__OTR__common_data/D_0D0078F8"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_78F8[] = "__OTR__common_data/common_data_seg13_gfx_78F8"; + static const ALIGN_ASSET(2) char D_0D007928[] = "__OTR__common_data/D_0D007928"; static const ALIGN_ASSET(2) char D_0D007948[] = "__OTR__common_data/D_0D007948"; @@ -269,6 +293,8 @@ static const ALIGN_ASSET(2) char D_0D0079E8[] = "__OTR__common_data/D_0D0079E8"; static const ALIGN_ASSET(2) char D_0D007A08[] = "__OTR__common_data/D_0D007A08"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_7A08[] = "__OTR__common_data/common_data_seg13_gfx_7A08"; + static const ALIGN_ASSET(2) char D_0D007A40[] = "__OTR__common_data/D_0D007A40"; static const ALIGN_ASSET(2) char D_0D007A60[] = "__OTR__common_data/D_0D007A60"; @@ -289,6 +315,8 @@ static const ALIGN_ASSET(2) char D_0D007B98[] = "__OTR__common_data/D_0D007B98"; static const ALIGN_ASSET(2) char D_0D007C10[] = "__OTR__common_data/D_0D007C10"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_7C88[] = "__OTR__common_data/common_data_seg13_gfx_7C88"; + static const ALIGN_ASSET(2) char D_0D007C88[] = "__OTR__common_data/D_0D007C88"; static const ALIGN_ASSET(2) char D_0D007CB8[] = "__OTR__common_data/D_0D007CB8"; @@ -327,6 +355,10 @@ static const ALIGN_ASSET(2) char D_0D007EB8[] = "__OTR__common_data/D_0D007EB8"; static const ALIGN_ASSET(2) char D_0D007ED8[] = "__OTR__common_data/D_0D007ED8"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_7ED8[] = "__OTR__common_data/common_data_seg13_gfx_7ED8"; + +static const ALIGN_ASSET(2) char common_data_seg13_gfx_7EF8[] = "__OTR__common_data/common_data_seg13_gfx_7EF8"; + static const ALIGN_ASSET(2) char D_0D007EF8[] = "__OTR__common_data/D_0D007EF8"; static const ALIGN_ASSET(2) char D_0D007F18[] = "__OTR__common_data/D_0D007F18"; @@ -341,12 +373,16 @@ static const ALIGN_ASSET(2) char D_0D007F98[] = "__OTR__common_data/D_0D007F98"; static const ALIGN_ASSET(2) char D_0D007FB8[] = "__OTR__common_data/D_0D007FB8"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_7FB8[] = "__OTR__common_data/common_data_seg13_gfx_7FB8"; + static const ALIGN_ASSET(2) char D_0D007FE0[] = "__OTR__common_data/D_0D007FE0"; static const ALIGN_ASSET(2) char D_0D008000[] = "__OTR__common_data/D_0D008000"; static const ALIGN_ASSET(2) char D_0D008020[] = "__OTR__common_data/D_0D008020"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_8020[] = "__OTR__common_data/common_data_seg13_gfx_8020"; + static const ALIGN_ASSET(2) char D_0D008040[] = "__OTR__common_data/D_0D008040"; static const ALIGN_ASSET(2) char D_0D008060[] = "__OTR__common_data/D_0D008060"; @@ -369,6 +405,8 @@ static const ALIGN_ASSET(2) char D_0D008C38[] = "__OTR__common_data/D_0D008C38"; static const ALIGN_ASSET(2) char common_square_plain_render[] = "__OTR__common_data/common_square_plain_render"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_8C78[] = "__OTR__common_data/common_data_seg13_gfx_8C78"; + static const ALIGN_ASSET(2) char D_0D008C90[] = "__OTR__common_data/D_0D008C90"; static const ALIGN_ASSET(2) char common_setting_render_character[] = "__OTR__common_data/common_setting_render_character"; @@ -379,6 +417,8 @@ static const ALIGN_ASSET(2) char D_0D008D58[] = "__OTR__common_data/D_0D008D58"; static const ALIGN_ASSET(2) char D_0D008DA0[] = "__OTR__common_data/D_0D008DA0"; +static const ALIGN_ASSET(2) char common_data_seg13_gfx_8DA0[] = "__OTR__common_data/common_data_seg13_gfx_8DA0"; + static const ALIGN_ASSET(2) char D_0D008DB8[] = "__OTR__common_data/D_0D008DB8"; static const ALIGN_ASSET(2) char D_0D008DF8[] = "__OTR__common_data/D_0D008DF8"; @@ -806,5 +846,21 @@ static const char* common_texture_minimap_kart_character[] = { common_texture_minimap_kart_bowser, }; +static const ALIGN_ASSET(2) char common_texture_minimap_bowser[] = "__OTR__common_data/common_texture_minimap_bowser"; + static const ALIGN_ASSET(2) char common_texture_minimap_progress_dot[] = "__OTR__common_data/common_texture_minimap_progress_dot"; +static const ALIGN_ASSET(2) char common_texture_minimap_mario[] = "__OTR__common_data/common_texture_minimap_mario"; + +static const ALIGN_ASSET(2) char common_texture_minimap_luigi[] = "__OTR__common_data/common_texture_minimap_luigi"; + +static const ALIGN_ASSET(2) char common_texture_minimap_yoshi[] = "__OTR__common_data/common_texture_minimap_yoshi"; + +static const ALIGN_ASSET(2) char common_texture_minimap_toad[] = "__OTR__common_data/common_texture_minimap_toad"; + +static const ALIGN_ASSET(2) char common_texture_minimap_dk[] = "__OTR__common_data/common_texture_minimap_dk"; + +static const ALIGN_ASSET(2) char common_texture_minimap_wario[] = "__OTR__common_data/common_texture_minimap_wario"; + +static const ALIGN_ASSET(2) char common_texture_minimap_peach[] = "__OTR__common_data/common_texture_minimap_peach"; + diff --git a/include/assets/data_800E8700.h b/include/assets/data_800E8700.h index 3a7b1a1ec..a8c93fba1 100644 --- a/include/assets/data_800E8700.h +++ b/include/assets/data_800E8700.h @@ -47,10 +47,6 @@ static const ALIGN_ASSET(2) char D_800E8C00[] = "__OTR__data_800E8700/D_800E8C00 static const ALIGN_ASSET(2) char D_800E8C40[] = "__OTR__data_800E8700/D_800E8C40"; -static const ALIGN_ASSET(2) char data_800E8700_vtx_800E8C40[] = "__OTR__data_800E8700/data_800E8700_vtx_800E8C40"; - -static const ALIGN_ASSET(2) char data_800E8700_vtx_800E8CC0[] = "__OTR__data_800E8700/data_800E8700_vtx_800E8CC0"; - static const ALIGN_ASSET(2) char D_800E8CC0[] = "__OTR__data_800E8700/D_800E8CC0"; static const ALIGN_ASSET(2) char D_800E8D40[] = "__OTR__data_800E8700/D_800E8D40"; diff --git a/include/assets/dks_jungle_parkway_data.h b/include/assets/dks_jungle_parkway_data.h index 8ad06c510..b2de0ca16 100644 --- a/include/assets/dks_jungle_parkway_data.h +++ b/include/assets/dks_jungle_parkway_data.h @@ -4,6 +4,8 @@ #include <libultra/gbi.h> #include <align_asset_macro.h> +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_0[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_0"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_0[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_0"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_20[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_20"; @@ -252,10 +254,18 @@ static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_paddle_boat_model15 static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_unknown_light1[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_unknown_light1"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_lights_9DE8[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_lights_9DE8"; + +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_lights_9E00[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_lights_9E00"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_unknown_light2[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_unknown_light2"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_lights_9E18[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_lights_9E18"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_unknown_light3[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_unknown_light3"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_lights_9E30[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_lights_9E30"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_unknown_light4[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_unknown_light4"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_mario_sign[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_mario_sign"; @@ -270,40 +280,74 @@ static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_boat_railing[] = "_ static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_DE48[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_DE48"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_DE48[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_DE48"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_DF30[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_DF30"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_DF30[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_DF30"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E030[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E030"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E030[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E030"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E048[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E048"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E048[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E048"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_railings_dl[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_railings_dl"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E068[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E068"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E068[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E068"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E150[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E150"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E150[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E150"; + +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E238[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E238"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E238[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E238"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E250[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E250"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E250[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E250"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E310[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E310"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E310[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E310"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E320[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E320"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E320[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E320"; + +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E578[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E578"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E578[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E578"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E588[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E588"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E588[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E588"; + +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E618[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E618"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E618[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E618"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E628[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E628"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E628[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E628"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E688[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E688"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E688[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E688"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E6E8[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E6E8"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E6E8[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E6E8"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_E700[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_E700"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_E700[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_E700"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_boat_dl[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_boat_dl"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_paddle_boat_paddle_model1[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_paddle_boat_paddle_model1"; @@ -318,10 +362,16 @@ static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_boat_paddle2[] = "_ static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_FAE0[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_FAE0"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_FAE0[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_FAE0"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_FC08[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_FC08"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_FC08[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_FC08"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_FC18[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_FC18"; +static const ALIGN_ASSET(2) char dks_jungle_parkway_data_seg6_gfx_FC18[] = "__OTR__dks_jungle_parkway_data/dks_jungle_parkway_data_seg6_gfx_FC18"; + static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_paddle_wheel_dl[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_paddle_wheel_dl"; static const ALIGN_ASSET(2) char d_course_dks_jungle_parkway_dl_FC38[] = "__OTR__dks_jungle_parkway_data/d_course_dks_jungle_parkway_dl_FC38"; diff --git a/include/assets/kalimari_desert_data.h b/include/assets/kalimari_desert_data.h index afd550927..2e6eb5951 100644 --- a/include/assets/kalimari_desert_data.h +++ b/include/assets/kalimari_desert_data.h @@ -298,28 +298,50 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod2_locomotiv static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1B7C0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1B7C0"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1B7C0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1B7C0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1B850[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1B850"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1B850[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1B850"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1B950[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1B950"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1B950[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1B950"; + +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1B968[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1B968"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1B968[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1B968"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1B978[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1B978"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1B990[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1B990"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1B990[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1B990"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1BD18[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1BD18"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1BD18[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1BD18"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1BD58[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1BD58"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1BD58[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1BD58"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1BEF8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1BEF8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1BEF8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1BEF8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1BF90[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1BF90"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1BF90[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1BF90"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1C0B0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1C0B0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1C0B0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1C0B0"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1C0E0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1C0E0"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1C0E0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1C0E0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1C0F0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1C0F0"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_locomotive_model_lod1[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_locomotive_model_lod1"; @@ -352,30 +374,52 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod1_locomotiv static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod1_locomotive_model14[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_unknown_lod1_locomotive_model14"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1CFA8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1CFA8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1CFA8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1CFA8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D038[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D038"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D038[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D038"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D138[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D138"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D138[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D138"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D150[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D150"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D150[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D150"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D160[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D160"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D178[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D178"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D178[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D178"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D418[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D418"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D418[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D418"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D450[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D450"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D450[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D450"; + +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D540[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D540"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D540[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D540"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D598[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D598"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D598[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D598"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D630[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D630"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D630[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D630"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D660[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D660"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1D660[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1D660"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1D670[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1D670"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_locomotive_model_lod0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_locomotive_model_lod0"; @@ -406,30 +450,52 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod0_locomotiv static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod0_locomotive_model13[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_unknown_lod0_locomotive_model13"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E2C8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E2C8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E2C8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E2C8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E358[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E358"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E358[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E358"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E458[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E458"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E458[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E458"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E470[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E470"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E470[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E470"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E480[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E480"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E498[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E498"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E498[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E498"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E6D8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E6D8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E6D8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E6D8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E710[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E710"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E710[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E710"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E800[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E800"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E800[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E800"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E858[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E858"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E858[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E858"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E8D0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E8D0"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E8D0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E8D0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E900[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E900"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1E900[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1E900"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1E910[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1E910"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_tender_model_lod2[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_tender_model_lod2"; @@ -442,16 +508,26 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod2_tender_mo static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod2_tender_model4[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_unknown_lod2_tender_model4"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1EFD8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1EFD8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1EFD8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1EFD8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F050[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F050"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F050[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F050"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F0D8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F0D8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F0D8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F0D8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F1F8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F1F8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F1F8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F1F8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F218[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F218"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F218[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F218"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F228[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F228"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_tender_model_lod1[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_tender_model_lod1"; @@ -460,14 +536,22 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod1_tender_mo static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod1_tender_model2[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_unknown_lod1_tender_model2"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F570[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F570"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F570[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F570"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F5E0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F5E0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F5E0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F5E0"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F6E0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F6E0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F6E0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F6E0"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F6F8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F6F8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F6F8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F6F8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F708[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F708"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F720[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F720"; @@ -478,14 +562,22 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod0_tender_mo static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod0_tender_model2[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_unknown_lod0_tender_model2"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F988[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F988"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F988[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F988"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1F9D8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1F9D8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1F9D8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1F9D8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1FAD0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1FAD0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1FAD0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1FAD0"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1FAE8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1FAE8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_1FAE8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_1FAE8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1FAF8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1FAF8"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_1FB10[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_1FB10"; @@ -512,24 +604,44 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod2_carriage_ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod2_carriage_chassis_model10[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_unknown_lod2_carriage_chassis_model10"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_20578[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_20578"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20578[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20578"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20610[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20610"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_20610[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_20610"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20620[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20620"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_20620[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_20620"; + +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_20630[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_20630"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20630[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20630"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_20688[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_20688"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20688[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20688"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_208A0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_208A0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_208A0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_208A0"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_20928[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_20928"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20928[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20928"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_20980[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_20980"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20980[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20980"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_209C8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_209C8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_209C8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_209C8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_209F8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_209F8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_209F8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_209F8"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_20A08[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_20A08"; @@ -556,24 +668,42 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod1_carriage_ static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21178[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21178"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21178[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21178"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21200[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21200"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21200[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21200"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21210[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21210"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21210[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21210"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21220[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21220"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21238[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21238"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21238[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21238"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21288[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21288"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21288[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21288"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21480[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21480"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21480[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21480"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_214D0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_214D0"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_214D0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_214D0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21518[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21518"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21518[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21518"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21540[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21540"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21540[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21540"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21550[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21550"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_carriage_model_lod0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_carriage_model_lod0"; @@ -588,24 +718,42 @@ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod0_carriage_ static const ALIGN_ASSET(2) char d_course_kalimari_desert_unknown_lod0_carriage_model5[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_unknown_lod0_carriage_model5"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_219D8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_219D8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_219D8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_219D8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21A60[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21A60"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21A60[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21A60"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21A70[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21A70"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21A70[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21A70"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21A80[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21A80"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21A98[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21A98"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21A98[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21A98"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21AE8[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21AE8"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21AE8[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21AE8"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21BC0[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21BC0"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21BC0[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21BC0"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21C10[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21C10"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21C10[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21C10"; + +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21C58[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21C58"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21C58[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21C58"; +static const ALIGN_ASSET(2) char kalimari_desert_data_seg6_gfx_21C80[] = "__OTR__kalimari_desert_data/kalimari_desert_data_seg6_gfx_21C80"; + static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21C80[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21C80"; static const ALIGN_ASSET(2) char d_course_kalimari_desert_dl_21C90[] = "__OTR__kalimari_desert_data/d_course_kalimari_desert_dl_21C90"; diff --git a/include/assets/koopa_troopa_beach_data.h b/include/assets/koopa_troopa_beach_data.h index 5a2d791d3..871da13f6 100644 --- a/include/assets/koopa_troopa_beach_data.h +++ b/include/assets/koopa_troopa_beach_data.h @@ -6,8 +6,12 @@ static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_0[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_0"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_0[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_0"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_48[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_48"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_48[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_48"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_90[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_90"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_118[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_118"; @@ -634,6 +638,8 @@ static const char* d_course_koopa_troopa_beach_crab_frames[] = { gTextureCrab7, }; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_lights_14BE8[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_lights_14BE8"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_light1[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_light1"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_bird_wing[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_bird_wing"; @@ -664,6 +670,8 @@ static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_bird_wing_3_model[] static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_16990[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_16990"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_lights_16B78[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_lights_16B78"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_light2[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_light2"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_tree_model[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_tree_model"; @@ -676,12 +684,20 @@ static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_palm_trunk[] = "__O static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18520[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18520"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18520[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18520"; + +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_185E8[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_185E8"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_185E8[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_185E8"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_tree_top1[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_tree_top1"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18608[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18608"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18608[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18608"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_186A8[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_186A8"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_186A8[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_186A8"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_tree_trunk1[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_tree_trunk1"; @@ -692,14 +708,24 @@ static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_unknown_model5[] = static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_light3[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_light3"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_lights_18858[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_lights_18858"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18870[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18870"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18870[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18870"; + +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18938[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18938"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18938[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18938"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_tree_top2[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_tree_top2"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18958[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18958"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18958[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18958"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_189F8[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_189F8"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_189F8[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_189F8"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_tree_trunk2[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_tree_trunk2"; @@ -708,16 +734,26 @@ static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_tree_3_model[] = "_ static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_unknown_model6[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_unknown_model6"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_lights_18BA8[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_lights_18BA8"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_light4[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_light4"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18BC0[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18BC0"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18BC0[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18BC0"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18C88[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18C88"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18C88[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18C88"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_tree_top3[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_tree_top3"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18CA8[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18CA8"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18CA8[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18CA8"; +static const ALIGN_ASSET(2) char koopa_troopa_beach_data_seg6_gfx_18D48[] = "__OTR__koopa_troopa_beach_data/koopa_troopa_beach_data_seg6_gfx_18D48"; + static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_18D48[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_18D48"; static const ALIGN_ASSET(2) char d_course_koopa_troopa_beach_dl_tree_trunk3[] = "__OTR__koopa_troopa_beach_data/d_course_koopa_troopa_beach_dl_tree_trunk3"; diff --git a/include/assets/luigi_raceway_data.h b/include/assets/luigi_raceway_data.h index b836e01ad..dfab48ddf 100644 --- a/include/assets/luigi_raceway_data.h +++ b/include/assets/luigi_raceway_data.h @@ -260,6 +260,8 @@ static const ALIGN_ASSET(2) char d_course_luigi_raceway_unknown_model4[] = "__OT static const ALIGN_ASSET(2) char d_course_luigi_raceway_unknown_model5[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_unknown_model5"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_lights_C3A0[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_lights_C3A0"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_light1[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_light1"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_basket_model_lod1[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_basket_model_lod1"; @@ -278,44 +280,76 @@ static const ALIGN_ASSET(2) char d_course_luigi_raceway_balloon_basket[] = "__OT static const ALIGN_ASSET(2) char d_course_luigi_raceway_balloon_rope[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_balloon_rope"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F588[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F588"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F588[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F588"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F630[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F630"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F630[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F630"; + +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F640[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F640"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F640[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F640"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F650[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F650"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F660[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F660"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F660[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F660"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F718[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F718"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F718[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F718"; + +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F728[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F728"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F728[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F728"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F938[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F938"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F938[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F938"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F948[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F948"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F948[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F948"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F960[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F960"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_F970[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_F970"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_F970[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_F970"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FA00[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FA00"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_FA00[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_FA00"; + +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_FA10[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_FA10"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FA10[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FA10"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FA20[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FA20"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_FA30[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_FA30"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FA30[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FA30"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_FB10[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_FB10"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FB10[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FB10"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_FB20[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_FB20"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FB20[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FB20"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_FBB8[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_FBB8"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FBB8[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FBB8"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FBC8[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FBC8"; +static const ALIGN_ASSET(2) char luigi_raceway_data_seg6_gfx_FBC8[] = "__OTR__luigi_raceway_data/luigi_raceway_data_seg6_gfx_FBC8"; + static const ALIGN_ASSET(2) char d_course_luigi_raceway_dl_FBE0[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_dl_FBE0"; static const ALIGN_ASSET(2) char d_course_luigi_raceway_tree_model[] = "__OTR__luigi_raceway_data/d_course_luigi_raceway_tree_model"; diff --git a/include/assets/mario_raceway_data.h b/include/assets/mario_raceway_data.h index b8e8cf921..e21a221d2 100644 --- a/include/assets/mario_raceway_data.h +++ b/include/assets/mario_raceway_data.h @@ -176,14 +176,26 @@ static const ALIGN_ASSET(2) char d_course_mario_sign_right[] = "__OTR__mario_rac static const ALIGN_ASSET(2) char d_course_mario_raceway_dl_9068[] = "__OTR__mario_raceway_data/d_course_mario_raceway_dl_9068"; +static const ALIGN_ASSET(2) char mario_raceway_data_seg6_gfx_9068[] = "__OTR__mario_raceway_data/mario_raceway_data_seg6_gfx_9068"; + +static const ALIGN_ASSET(2) char mario_raceway_data_seg6_gfx_90B0[] = "__OTR__mario_raceway_data/mario_raceway_data_seg6_gfx_90B0"; + static const ALIGN_ASSET(2) char d_course_mario_raceway_dl_90B0[] = "__OTR__mario_raceway_data/d_course_mario_raceway_dl_90B0"; +static const ALIGN_ASSET(2) char mario_raceway_data_seg6_gfx_90C0[] = "__OTR__mario_raceway_data/mario_raceway_data_seg6_gfx_90C0"; + static const ALIGN_ASSET(2) char d_course_mario_raceway_dl_90C0[] = "__OTR__mario_raceway_data/d_course_mario_raceway_dl_90C0"; +static const ALIGN_ASSET(2) char mario_raceway_data_seg6_gfx_9190[] = "__OTR__mario_raceway_data/mario_raceway_data_seg6_gfx_9190"; + static const ALIGN_ASSET(2) char d_course_mario_raceway_dl_9190[] = "__OTR__mario_raceway_data/d_course_mario_raceway_dl_9190"; +static const ALIGN_ASSET(2) char mario_raceway_data_seg6_gfx_9250[] = "__OTR__mario_raceway_data/mario_raceway_data_seg6_gfx_9250"; + static const ALIGN_ASSET(2) char d_course_mario_raceway_dl_9250[] = "__OTR__mario_raceway_data/d_course_mario_raceway_dl_9250"; +static const ALIGN_ASSET(2) char mario_raceway_data_seg6_gfx_9310[] = "__OTR__mario_raceway_data/mario_raceway_data_seg6_gfx_9310"; + static const ALIGN_ASSET(2) char d_course_mario_raceway_dl_9310[] = "__OTR__mario_raceway_data/d_course_mario_raceway_dl_9310"; static const ALIGN_ASSET(2) char d_course_mario_raceway_dl_sign[] = "__OTR__mario_raceway_data/d_course_mario_raceway_dl_sign"; diff --git a/include/assets/moo_moo_farm_data.h b/include/assets/moo_moo_farm_data.h index bc6b9f9fb..cf98fff63 100644 --- a/include/assets/moo_moo_farm_data.h +++ b/include/assets/moo_moo_farm_data.h @@ -6,12 +6,20 @@ static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_0[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_0"; +static const ALIGN_ASSET(2) char moo_moo_farm_data_seg6_gfx_0[] = "__OTR__moo_moo_farm_data/moo_moo_farm_data_seg6_gfx_0"; + static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_30[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_30"; +static const ALIGN_ASSET(2) char moo_moo_farm_data_seg6_gfx_30[] = "__OTR__moo_moo_farm_data/moo_moo_farm_data_seg6_gfx_30"; + +static const ALIGN_ASSET(2) char moo_moo_farm_data_seg6_gfx_48[] = "__OTR__moo_moo_farm_data/moo_moo_farm_data_seg6_gfx_48"; + static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_48[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_48"; static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_60[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_60"; +static const ALIGN_ASSET(2) char moo_moo_farm_data_seg6_gfx_60[] = "__OTR__moo_moo_farm_data/moo_moo_farm_data_seg6_gfx_60"; + static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_78[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_78"; static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_88[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_88"; @@ -241,6 +249,8 @@ static const ALIGN_ASSET(2) char d_course_moo_moo_farm_unknown_model2[] = "__OTR static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_13B88[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_13B88"; +static const ALIGN_ASSET(2) char moo_moo_farm_data_seg6_gfx_13B88[] = "__OTR__moo_moo_farm_data/moo_moo_farm_data_seg6_gfx_13B88"; + static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_cow1[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_cow1"; static const ALIGN_ASSET(2) char d_course_moo_moo_farm_dl_cow2[] = "__OTR__moo_moo_farm_data/d_course_moo_moo_farm_dl_cow2"; diff --git a/include/assets/other_textures.h b/include/assets/other_textures.h index 563f0445c..43467811b 100644 --- a/include/assets/other_textures.h +++ b/include/assets/other_textures.h @@ -573,37 +573,53 @@ static const ALIGN_ASSET(2) char gTexture68DEC0[] = "__OTR__other_textures/textu static const ALIGN_ASSET(2) char gTexture68E2D0[] = "__OTR__other_textures/texture_68E2D0"; -static const ALIGN_ASSET(2) char gTextureGreenShell0[] = "__OTR__other_textures/gTextureGreenShell0"; +static const ALIGN_ASSET(2) char texture_red_shell_0[] = "__OTR__other_textures/texture_red_shell_0"; -static const ALIGN_ASSET(2) char gTextureGreenShell1[] = "__OTR__other_textures/gTextureGreenShell1"; +static const ALIGN_ASSET(2) char texture_green_shell_0[] = "__OTR__other_textures/texture_green_shell_0"; -static const ALIGN_ASSET(2) char gTextureGreenShell2[] = "__OTR__other_textures/gTextureGreenShell2"; +static const ALIGN_ASSET(2) char texture_green_shell_1[] = "__OTR__other_textures/texture_green_shell_1"; -static const ALIGN_ASSET(2) char gTextureGreenShell3[] = "__OTR__other_textures/gTextureGreenShell3"; +static const ALIGN_ASSET(2) char texture_red_shell_1[] = "__OTR__other_textures/texture_red_shell_1"; -static const ALIGN_ASSET(2) char gTextureGreenShell4[] = "__OTR__other_textures/gTextureGreenShell4"; +static const ALIGN_ASSET(2) char texture_green_shell_2[] = "__OTR__other_textures/texture_green_shell_2"; -static const ALIGN_ASSET(2) char gTextureGreenShell5[] = "__OTR__other_textures/gTextureGreenShell5"; +static const ALIGN_ASSET(2) char texture_red_shell_2[] = "__OTR__other_textures/texture_red_shell_2"; -static const ALIGN_ASSET(2) char gTextureGreenShell6[] = "__OTR__other_textures/gTextureGreenShell6"; +static const ALIGN_ASSET(2) char texture_green_shell_3[] = "__OTR__other_textures/texture_green_shell_3"; -static const ALIGN_ASSET(2) char gTextureGreenShell7[] = "__OTR__other_textures/gTextureGreenShell7"; +static const ALIGN_ASSET(2) char texture_red_shell_3[] = "__OTR__other_textures/texture_red_shell_3"; -static const ALIGN_ASSET(2) char gTextureBlueShell0[] = "__OTR__other_textures/gTextureBlueShell0"; +static const ALIGN_ASSET(2) char texture_red_shell_4[] = "__OTR__other_textures/texture_red_shell_4"; -static const ALIGN_ASSET(2) char gTextureBlueShell1[] = "__OTR__other_textures/gTextureBlueShell1"; +static const ALIGN_ASSET(2) char texture_green_shell_4[] = "__OTR__other_textures/texture_green_shell_4"; -static const ALIGN_ASSET(2) char gTextureBlueShell2[] = "__OTR__other_textures/gTextureBlueShell2"; +static const ALIGN_ASSET(2) char texture_green_shell_5[] = "__OTR__other_textures/texture_green_shell_5"; -static const ALIGN_ASSET(2) char gTextureBlueShell3[] = "__OTR__other_textures/gTextureBlueShell3"; +static const ALIGN_ASSET(2) char texture_red_shell_5[] = "__OTR__other_textures/texture_red_shell_5"; -static const ALIGN_ASSET(2) char gTextureBlueShell4[] = "__OTR__other_textures/gTextureBlueShell4"; +static const ALIGN_ASSET(2) char texture_green_shell_6[] = "__OTR__other_textures/texture_green_shell_6"; -static const ALIGN_ASSET(2) char gTextureBlueShell5[] = "__OTR__other_textures/gTextureBlueShell5"; +static const ALIGN_ASSET(2) char texture_red_shell_6[] = "__OTR__other_textures/texture_red_shell_6"; -static const ALIGN_ASSET(2) char gTextureBlueShell6[] = "__OTR__other_textures/gTextureBlueShell6"; +static const ALIGN_ASSET(2) char texture_green_shell_7[] = "__OTR__other_textures/texture_green_shell_7"; -static const ALIGN_ASSET(2) char gTextureBlueShell7[] = "__OTR__other_textures/gTextureBlueShell7"; +static const ALIGN_ASSET(2) char texture_red_shell_7[] = "__OTR__other_textures/texture_red_shell_7"; + +static const ALIGN_ASSET(2) char texture_blue_shell_0[] = "__OTR__other_textures/texture_blue_shell_0"; + +static const ALIGN_ASSET(2) char texture_blue_shell_1[] = "__OTR__other_textures/texture_blue_shell_1"; + +static const ALIGN_ASSET(2) char texture_blue_shell_2[] = "__OTR__other_textures/texture_blue_shell_2"; + +static const ALIGN_ASSET(2) char texture_blue_shell_3[] = "__OTR__other_textures/texture_blue_shell_3"; + +static const ALIGN_ASSET(2) char texture_blue_shell_4[] = "__OTR__other_textures/texture_blue_shell_4"; + +static const ALIGN_ASSET(2) char texture_blue_shell_5[] = "__OTR__other_textures/texture_blue_shell_5"; + +static const ALIGN_ASSET(2) char texture_blue_shell_6[] = "__OTR__other_textures/texture_blue_shell_6"; + +static const ALIGN_ASSET(2) char texture_blue_shell_7[] = "__OTR__other_textures/texture_blue_shell_7"; static const ALIGN_ASSET(2) char gTextureQuestionMarkYellow[] = "__OTR__other_textures/question_mark_yellow"; @@ -709,11 +725,11 @@ static const ALIGN_ASSET(2) char gTexture69B03C[] = "__OTR__other_textures/textu static const ALIGN_ASSET(2) char gTexture69B140[] = "__OTR__other_textures/texture_69B140"; -static const ALIGN_ASSET(2) char gTexture69B378[] = "__OTR__other_textures/texture_69B378"; +static const ALIGN_ASSET(2) char gGrassParticle[] = "__OTR__other_textures/gGrassParticle"; -static const ALIGN_ASSET(2) char gTexture69B960[] = "__OTR__other_textures/texture_69B960"; +static const ALIGN_ASSET(2) char gTextureMusicNote[] = "__OTR__other_textures/texture_69B960"; -static const ALIGN_ASSET(2) char gTexture69BA28[] = "__OTR__other_textures/texture_69BA28"; +static const ALIGN_ASSET(2) char gTextureSpeechBubble[] = "__OTR__other_textures/texture_69BA28"; static const ALIGN_ASSET(2) char gTextureBoingExclamation[] = "__OTR__other_textures/boing_exclamation"; @@ -725,9 +741,9 @@ static const ALIGN_ASSET(2) char gTexture69C090[] = "__OTR__other_textures/textu static const ALIGN_ASSET(2) char gTexture69C1E8[] = "__OTR__other_textures/texture_69C1E8"; -static const ALIGN_ASSET(2) char gTexture69C354[] = "__OTR__other_textures/texture_69C354"; +static const ALIGN_ASSET(2) char gTextureSmokePuff[] = "__OTR__other_textures/texture_69C354"; -static const ALIGN_ASSET(2) char gTexture69C4E4[] = "__OTR__other_textures/texture_69C4E4"; +static const ALIGN_ASSET(2) char gGroundDust[] = "__OTR__other_textures/gGroundDust"; static const ALIGN_ASSET(2) char gTexture69C80C[] = "__OTR__other_textures/texture_69C80C"; @@ -1027,45 +1043,45 @@ static const ALIGN_ASSET(2) char gTextureExhaust4[] = "__OTR__other_textures/exh static const ALIGN_ASSET(2) char gTextureExhaust5[] = "__OTR__other_textures/exhaust_5"; -static const ALIGN_ASSET(2) char gTextureLogoMarioKart64[] = "__OTR__other_textures/logo_mario_kart_64"; +static const ALIGN_ASSET(2) char logo_mario_kart_64[] = "__OTR__other_textures/logo_mario_kart_64"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineMarioRaceway[] = "__OTR__other_textures/gTextureCourseOutlineMarioRaceway"; +static const ALIGN_ASSET(2) char minimap_mario_raceway[] = "__OTR__other_textures/minimap_mario_raceway"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineChocoMountain[] = "__OTR__other_textures/gTextureCourseOutlineChocoMountain"; +static const ALIGN_ASSET(2) char minimap_choco_mountain[] = "__OTR__other_textures/minimap_choco_mountain"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineBowsersCastle[] = "__OTR__other_textures/gTextureCourseOutlineBowsersCastle"; +static const ALIGN_ASSET(2) char minimap_bowsers_castle[] = "__OTR__other_textures/minimap_bowsers_castle"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineBansheeBoardwalk[] = "__OTR__other_textures/gTextureCourseOutlineBansheeBoardwalk"; +static const ALIGN_ASSET(2) char minimap_banshee_boardwalk[] = "__OTR__other_textures/minimap_banshee_boardwalk"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineYoshiValley[] = "__OTR__other_textures/gTextureCourseOutlineYoshiValley"; +static const ALIGN_ASSET(2) char minimap_yoshi_valley[] = "__OTR__other_textures/minimap_yoshi_valley"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineFrappeSnowland[] = "__OTR__other_textures/gTextureCourseOutlineFrappeSnowland"; +static const ALIGN_ASSET(2) char minimap_frappe_snowland[] = "__OTR__other_textures/minimap_frappe_snowland"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineKoopaTroopaBeach[] = "__OTR__other_textures/gTextureCourseOutlineKoopaTroopaBeach"; +static const ALIGN_ASSET(2) char minimap_koopa_troopa_beach[] = "__OTR__other_textures/minimap_koopa_troopa_beach"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineRoyalRaceway[] = "__OTR__other_textures/gTextureCourseOutlineRoyalRaceway"; +static const ALIGN_ASSET(2) char minimap_royal_raceway[] = "__OTR__other_textures/minimap_royal_raceway"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineLuigiRaceway[] = "__OTR__other_textures/gTextureCourseOutlineLuigiRaceway"; +static const ALIGN_ASSET(2) char minimap_luigi_raceway[] = "__OTR__other_textures/minimap_luigi_raceway"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineMooMooFarm[] = "__OTR__other_textures/gTextureCourseOutlineMooMooFarm"; +static const ALIGN_ASSET(2) char minimap_moo_moo_farm[] = "__OTR__other_textures/minimap_moo_moo_farm"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineToadsTurnpike[] = "__OTR__other_textures/gTextureCourseOutlineToadsTurnpike"; +static const ALIGN_ASSET(2) char minimap_toads_turnpike[] = "__OTR__other_textures/minimap_toads_turnpike"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineKalimariDesert[] = "__OTR__other_textures/gTextureCourseOutlineKalimariDesert"; +static const ALIGN_ASSET(2) char minimap_kalimari_desert[] = "__OTR__other_textures/minimap_kalimari_desert"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineSherbetLand[] = "__OTR__other_textures/gTextureCourseOutlineSherbetLand"; +static const ALIGN_ASSET(2) char minimap_sherbet_land[] = "__OTR__other_textures/minimap_sherbet_land"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineRainbowRoad[] = "__OTR__other_textures/gTextureCourseOutlineRainbowRoad"; +static const ALIGN_ASSET(2) char minimap_rainbow_road[] = "__OTR__other_textures/minimap_rainbow_road"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineWarioStadium[] = "__OTR__other_textures/gTextureCourseOutlineWarioStadium"; +static const ALIGN_ASSET(2) char minimap_wario_stadium[] = "__OTR__other_textures/minimap_wario_stadium"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineBlockFort[] = "__OTR__other_textures/gTextureCourseOutlineBlockFort"; +static const ALIGN_ASSET(2) char minimap_block_fort[] = "__OTR__other_textures/minimap_block_fort"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineSkyscraper[] = "__OTR__other_textures/gTextureCourseOutlineSkyscraper"; +static const ALIGN_ASSET(2) char minimap_skyscraper[] = "__OTR__other_textures/minimap_skyscraper"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineDoubleDeck[] = "__OTR__other_textures/gTextureCourseOutlineDoubleDeck"; +static const ALIGN_ASSET(2) char minimap_double_deck[] = "__OTR__other_textures/minimap_double_deck"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineDksJungleParkway[] = "__OTR__other_textures/gTextureCourseOutlineDksJungleParkway"; +static const ALIGN_ASSET(2) char minimap_dks_jungle_parkway[] = "__OTR__other_textures/minimap_dks_jungle_parkway"; -static const ALIGN_ASSET(2) char gTextureCourseOutlineBigDonut[] = "__OTR__other_textures/gTextureCourseOutlineBigDonut"; +static const ALIGN_ASSET(2) char minimap_big_donut[] = "__OTR__other_textures/minimap_big_donut"; diff --git a/include/assets/player_selection.h b/include/assets/player_selection.h index 483b341ff..940c55c1a 100644 --- a/include/assets/player_selection.h +++ b/include/assets/player_selection.h @@ -328,9 +328,9 @@ static const ALIGN_ASSET(2) char gTextureCupSilver[] = "__OTR__player_selection/ static const ALIGN_ASSET(2) char gTextureCupBronze[] = "__OTR__player_selection/cup_bronze"; -static const ALIGN_ASSET(2) char gTexturePushStartButton[] = "__OTR__player_selection/push_start_button"; +static const ALIGN_ASSET(2) char push_start_button[] = "__OTR__player_selection/push_start_button"; -static const ALIGN_ASSET(2) char gTextureCopyright1996[] = "__OTR__player_selection/copyright_1996"; +static const ALIGN_ASSET(2) char copyright_1996[] = "__OTR__player_selection/copyright_1996"; static const ALIGN_ASSET(2) char gTextureP1BorderBlue[] = "__OTR__player_selection/p1_border_blue"; @@ -340,7 +340,7 @@ static const ALIGN_ASSET(2) char gTextureP3BorderOrange[] = "__OTR__player_selec static const ALIGN_ASSET(2) char gTextureP4BorderGreen[] = "__OTR__player_selection/p4_border_green"; -static const ALIGN_ASSET(2) char gTextureSmallGreenTriangle[] = "__OTR__player_selection/small_green_triangle"; +static const ALIGN_ASSET(2) char texture_small_green_triangle[] = "__OTR__player_selection/texture_small_green_triangle"; static const ALIGN_ASSET(2) char gTexture7E56E4[] = "__OTR__player_selection/texture_7E56E4"; diff --git a/include/assets/rainbow_road_data.h b/include/assets/rainbow_road_data.h index 001d0774c..830110eb3 100644 --- a/include/assets/rainbow_road_data.h +++ b/include/assets/rainbow_road_data.h @@ -6,8 +6,12 @@ static const ALIGN_ASSET(2) char d_course_rainbow_road_dl_0[] = "__OTR__rainbow_road_data/d_course_rainbow_road_dl_0"; +static const ALIGN_ASSET(2) char rainbow_road_data_seg6_gfx_0[] = "__OTR__rainbow_road_data/rainbow_road_data_seg6_gfx_0"; + static const ALIGN_ASSET(2) char d_course_rainbow_road_dl_80[] = "__OTR__rainbow_road_data/d_course_rainbow_road_dl_80"; +static const ALIGN_ASSET(2) char rainbow_road_data_seg6_gfx_80[] = "__OTR__rainbow_road_data/rainbow_road_data_seg6_gfx_80"; + static const ALIGN_ASSET(2) char d_course_rainbow_road_dl_D8[] = "__OTR__rainbow_road_data/d_course_rainbow_road_dl_D8"; static const ALIGN_ASSET(2) char d_course_rainbow_road_dl_178[] = "__OTR__rainbow_road_data/d_course_rainbow_road_dl_178"; @@ -218,6 +222,8 @@ static const char* d_course_rainbow_road_static_textures[] = { static const ALIGN_ASSET(2) char d_course_rainbow_road_light1[] = "__OTR__rainbow_road_data/d_course_rainbow_road_light1"; +static const ALIGN_ASSET(2) char rainbow_road_data_seg6_lights_12010[] = "__OTR__rainbow_road_data/rainbow_road_data_seg6_lights_12010"; + static const ALIGN_ASSET(2) char d_course_rainbow_road_sphere[] = "__OTR__rainbow_road_data/d_course_rainbow_road_sphere"; static const ALIGN_ASSET(2) char d_course_rainbow_road_reflection_map_metal[] = "__OTR__rainbow_road_data/d_course_rainbow_road_reflection_map_metal"; diff --git a/include/assets/sherbet_land_data.h b/include/assets/sherbet_land_data.h index 1d93b5a3d..a9329036a 100644 --- a/include/assets/sherbet_land_data.h +++ b/include/assets/sherbet_land_data.h @@ -308,24 +308,40 @@ static const ALIGN_ASSET(2) char d_course_sherbet_land_ice[] = "__OTR__sherbet_l static const ALIGN_ASSET(2) char d_course_sherbet_land_dl_70E8[] = "__OTR__sherbet_land_data/d_course_sherbet_land_dl_70E8"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_gfx_70E8[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_gfx_70E8"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_dl_7208[] = "__OTR__sherbet_land_data/d_course_sherbet_land_dl_7208"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_gfx_7208[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_gfx_7208"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_dl_ice_block[] = "__OTR__sherbet_land_data/d_course_sherbet_land_dl_ice_block"; static const ALIGN_ASSET(2) char d_course_sherbet_land_dl_7228[] = "__OTR__sherbet_land_data/d_course_sherbet_land_dl_7228"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_lights_7240[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_lights_7240"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_light1[] = "__OTR__sherbet_land_data/d_course_sherbet_land_light1"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_lights_7258[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_lights_7258"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_light2[] = "__OTR__sherbet_land_data/d_course_sherbet_land_light2"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_lights_7270[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_lights_7270"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_light3[] = "__OTR__sherbet_land_data/d_course_sherbet_land_light3"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_lights_7288[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_lights_7288"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_light4[] = "__OTR__sherbet_land_data/d_course_sherbet_land_light4"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_lights_72A0[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_lights_72A0"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_light5[] = "__OTR__sherbet_land_data/d_course_sherbet_land_light5"; static const ALIGN_ASSET(2) char d_course_sherbet_land_light6[] = "__OTR__sherbet_land_data/d_course_sherbet_land_light6"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_lights_72D0[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_lights_72D0"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_light7[] = "__OTR__sherbet_land_data/d_course_sherbet_land_light7"; static const ALIGN_ASSET(2) char d_course_sherbet_land_penguin_beak[] = "__OTR__sherbet_land_data/d_course_sherbet_land_penguin_beak"; @@ -334,16 +350,22 @@ static const ALIGN_ASSET(2) char d_course_sherbet_land_penguin_eye[] = "__OTR__s static const ALIGN_ASSET(2) char d_course_sherbet_land_penguin_eyes_model[] = "__OTR__sherbet_land_data/d_course_sherbet_land_penguin_eyes_model"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_gfx_8368[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_gfx_8368"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_dl_8368[] = "__OTR__sherbet_land_data/d_course_sherbet_land_dl_8368"; static const ALIGN_ASSET(2) char d_course_sherbet_land_penguin_nose_model[] = "__OTR__sherbet_land_data/d_course_sherbet_land_penguin_nose_model"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_gfx_83D8[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_gfx_83D8"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_dl_83D8[] = "__OTR__sherbet_land_data/d_course_sherbet_land_dl_83D8"; static const ALIGN_ASSET(2) char d_course_sherbet_land_penguin_head_model1[] = "__OTR__sherbet_land_data/d_course_sherbet_land_penguin_head_model1"; static const ALIGN_ASSET(2) char d_course_sherbet_land_penguin_head_model2[] = "__OTR__sherbet_land_data/d_course_sherbet_land_penguin_head_model2"; +static const ALIGN_ASSET(2) char sherbet_land_data_seg6_gfx_85B0[] = "__OTR__sherbet_land_data/sherbet_land_data_seg6_gfx_85B0"; + static const ALIGN_ASSET(2) char d_course_sherbet_land_dl_85B0[] = "__OTR__sherbet_land_data/d_course_sherbet_land_dl_85B0"; static const ALIGN_ASSET(2) char d_course_sherbet_land_penguin_arms_model[] = "__OTR__sherbet_land_data/d_course_sherbet_land_penguin_arms_model"; diff --git a/include/assets/startup_logo.h b/include/assets/startup_logo.h index 9c13fb61b..bebe0478f 100644 --- a/include/assets/startup_logo.h +++ b/include/assets/startup_logo.h @@ -54,22 +54,38 @@ static const ALIGN_ASSET(2) char startup_logo_seg6_vtx_2740[] = "__OTR__startup_ static const ALIGN_ASSET(2) char startup_logo_seg6_vtx_2940[] = "__OTR__startup_logo/startup_logo_seg6_vtx_2940"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_2B00[] = "__OTR__startup_logo/startup_logo_seg6_gfx_2B00"; + static const ALIGN_ASSET(2) char startup_logo_dl[] = "__OTR__startup_logo/dl1"; static const ALIGN_ASSET(2) char startup_logo_dl2[] = "__OTR__startup_logo/dl2"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_2C88[] = "__OTR__startup_logo/startup_logo_seg6_gfx_2C88"; + +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_2D58[] = "__OTR__startup_logo/startup_logo_seg6_gfx_2D58"; + static const ALIGN_ASSET(2) char startup_logo_dl3[] = "__OTR__startup_logo/dl3"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_2F20[] = "__OTR__startup_logo/startup_logo_seg6_gfx_2F20"; + static const ALIGN_ASSET(2) char startup_logo_dl4[] = "__OTR__startup_logo/dl4"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_2FF0[] = "__OTR__startup_logo/startup_logo_seg6_gfx_2FF0"; + static const ALIGN_ASSET(2) char startup_logo_dl5[] = "__OTR__startup_logo/dl5"; static const ALIGN_ASSET(2) char startup_logo_dl6[] = "__OTR__startup_logo/dl6"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_3180[] = "__OTR__startup_logo/startup_logo_seg6_gfx_3180"; + static const ALIGN_ASSET(2) char startup_logo_dl7[] = "__OTR__startup_logo/dl7"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_3308[] = "__OTR__startup_logo/startup_logo_seg6_gfx_3308"; + static const ALIGN_ASSET(2) char startup_logo_dl8[] = "__OTR__startup_logo/dl8"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_33D8[] = "__OTR__startup_logo/startup_logo_seg6_gfx_33D8"; + static const ALIGN_ASSET(2) char startup_logo_seg6_vtx_3538[] = "__OTR__startup_logo/startup_logo_seg6_vtx_3538"; static const ALIGN_ASSET(2) char startup_logo_seg6_vtx_3738[] = "__OTR__startup_logo/startup_logo_seg6_vtx_3738"; @@ -148,38 +164,66 @@ static const ALIGN_ASSET(2) char startup_logo_seg6_vtx_75A8[] = "__OTR__startup_ static const ALIGN_ASSET(2) char startup_logo_seg6_vtx_77A8[] = "__OTR__startup_logo/startup_logo_seg6_vtx_77A8"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_7988[] = "__OTR__startup_logo/startup_logo_seg6_gfx_7988"; + static const ALIGN_ASSET(2) char startup_logo_dl9[] = "__OTR__startup_logo/dl9"; static const ALIGN_ASSET(2) char startup_logo_dl10[] = "__OTR__startup_logo/dl10"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_7C18[] = "__OTR__startup_logo/startup_logo_seg6_gfx_7C18"; + +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_7CE8[] = "__OTR__startup_logo/startup_logo_seg6_gfx_7CE8"; + static const ALIGN_ASSET(2) char startup_logo_dl11[] = "__OTR__startup_logo/dl11"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_7E50[] = "__OTR__startup_logo/startup_logo_seg6_gfx_7E50"; + static const ALIGN_ASSET(2) char startup_logo_dl12[] = "__OTR__startup_logo/dl12"; static const ALIGN_ASSET(2) char startup_logo_dl13[] = "__OTR__startup_logo/dl13"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_7E90[] = "__OTR__startup_logo/startup_logo_seg6_gfx_7E90"; + static const ALIGN_ASSET(2) char startup_logo_dl14[] = "__OTR__startup_logo/dl14"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_7ED0[] = "__OTR__startup_logo/startup_logo_seg6_gfx_7ED0"; + +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_7F88[] = "__OTR__startup_logo/startup_logo_seg6_gfx_7F88"; + static const ALIGN_ASSET(2) char startup_logo_dl15[] = "__OTR__startup_logo/dl15"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_80F0[] = "__OTR__startup_logo/startup_logo_seg6_gfx_80F0"; + static const ALIGN_ASSET(2) char startup_logo_dl16[] = "__OTR__startup_logo/dl16"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_8250[] = "__OTR__startup_logo/startup_logo_seg6_gfx_8250"; + static const ALIGN_ASSET(2) char startup_logo_dl17[] = "__OTR__startup_logo/dl17"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_83C8[] = "__OTR__startup_logo/startup_logo_seg6_gfx_83C8"; + static const ALIGN_ASSET(2) char startup_logo_dl18[] = "__OTR__startup_logo/dl18"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_8548[] = "__OTR__startup_logo/startup_logo_seg6_gfx_8548"; + static const ALIGN_ASSET(2) char startup_logo_dl19[] = "__OTR__startup_logo/dl19"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_87A0[] = "__OTR__startup_logo/startup_logo_seg6_gfx_87A0"; + static const ALIGN_ASSET(2) char startup_logo_dl20[] = "__OTR__startup_logo/dl20"; static const ALIGN_ASSET(2) char startup_reflection_map_gold[] = "__OTR__startup_logo/reflection_map_gold"; static const ALIGN_ASSET(2) char startup_texture_dl1[] = "__OTR__startup_logo/startup_texture_dl1"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_9248[] = "__OTR__startup_logo/startup_logo_seg6_gfx_9248"; + static const ALIGN_ASSET(2) char lights[] = "__OTR__startup_logo/lights"; static const ALIGN_ASSET(2) char startup_texture_dl2[] = "__OTR__startup_logo/startup_texture_dl2"; +static const ALIGN_ASSET(2) char startup_logo_seg6_gfx_9320[] = "__OTR__startup_logo/startup_logo_seg6_gfx_9320"; + static const ALIGN_ASSET(2) char startup_texture_dl3[] = "__OTR__startup_logo/startup_texture_dl3"; static const ALIGN_ASSET(2) char startup_texture_dl4[] = "__OTR__startup_logo/startup_texture_dl4"; diff --git a/include/assets/texture_data_2.h b/include/assets/texture_data_2.h index 1b61df8bc..17acda24f 100644 --- a/include/assets/texture_data_2.h +++ b/include/assets/texture_data_2.h @@ -149,7 +149,7 @@ static const ALIGN_ASSET(2) char gTexture7EEB18[] = "__OTR__texture_data_2/textu static const ALIGN_ASSET(2) char gTextureTinyFontMinus[] = "__OTR__texture_data_2/tiny_font_minus"; -static const ALIGN_ASSET(2) char gTextureTinyFontComma[] = "__OTR__texture_data_2/tiny_font_comma"; +static const ALIGN_ASSET(2) char gTextureTinyFontComma[] = "__OTR__texture_data_2/tiny_font_dot"; static const ALIGN_ASSET(2) char gTextureTinyFontForwardSlash[] = "__OTR__texture_data_2/tiny_font_forward_slash"; @@ -327,95 +327,95 @@ static const ALIGN_ASSET(2) char gTexture7F1038[] = "__OTR__texture_data_2/textu static const ALIGN_ASSET(2) char gTexture7F109C[] = "__OTR__texture_data_2/texture_7F109C"; -static const ALIGN_ASSET(2) char gTexture7F1124[] = "__OTR__texture_data_2/7F1124"; +static const ALIGN_ASSET(2) char font_four_dote[] = "__OTR__texture_data_2/font_four_dote"; -static const ALIGN_ASSET(2) char gTexture7F11F4[] = "__OTR__texture_data_2/7F11F4"; +static const ALIGN_ASSET(2) char font_cc[] = "__OTR__texture_data_2/font_cc"; -static const ALIGN_ASSET(2) char gTexture7F12C4[] = "__OTR__texture_data_2/7F12C4"; +static const ALIGN_ASSET(2) char font_double_quote[] = "__OTR__texture_data_2/font_double_quote"; -static const ALIGN_ASSET(2) char gTexture7F1394[] = "__OTR__texture_data_2/7F1394"; +static const ALIGN_ASSET(2) char font_exclamation_mark[] = "__OTR__texture_data_2/font_exclamation_mark"; -static const ALIGN_ASSET(2) char gTexture7F1464[] = "__OTR__texture_data_2/7F1464"; +static const ALIGN_ASSET(2) char font_minus[] = "__OTR__texture_data_2/font_minus"; -static const ALIGN_ASSET(2) char gTexture7F1534[] = "__OTR__texture_data_2/7F1534"; +static const ALIGN_ASSET(2) char font_dot[] = "__OTR__texture_data_2/7F1534"; -static const ALIGN_ASSET(2) char gTexture7F1604[] = "__OTR__texture_data_2/7F1604"; +static const ALIGN_ASSET(2) char font_plus[] = "__OTR__texture_data_2/font_plus"; -static const ALIGN_ASSET(2) char gTexture7F16D4[] = "__OTR__texture_data_2/7F16D4"; +static const ALIGN_ASSET(2) char font_interogation_mark[] = "__OTR__texture_data_2/7F16D4"; -static const ALIGN_ASSET(2) char gTexture7F17A4[] = "__OTR__texture_data_2/7F17A4"; +static const ALIGN_ASSET(2) char font_simple_quote[] = "__OTR__texture_data_2/7F17A4"; -static const ALIGN_ASSET(2) char gTexture7F1874[] = "__OTR__texture_data_2/7F1874"; +static const ALIGN_ASSET(2) char font_number_zero[] = "__OTR__texture_data_2/font_number_zero"; -static const ALIGN_ASSET(2) char gTexture7F1944[] = "__OTR__texture_data_2/7F1944"; +static const ALIGN_ASSET(2) char font_number_one[] = "__OTR__texture_data_2/font_number_one"; -static const ALIGN_ASSET(2) char gTexture7F1A14[] = "__OTR__texture_data_2/7F1A14"; +static const ALIGN_ASSET(2) char font_number_two[] = "__OTR__texture_data_2/font_number_two"; -static const ALIGN_ASSET(2) char gTexture7F1AE4[] = "__OTR__texture_data_2/7F1AE4"; +static const ALIGN_ASSET(2) char font_number_three[] = "__OTR__texture_data_2/font_number_three"; -static const ALIGN_ASSET(2) char gTexture7F1BB4[] = "__OTR__texture_data_2/7F1BB4"; +static const ALIGN_ASSET(2) char font_number_four[] = "__OTR__texture_data_2/font_number_four"; -static const ALIGN_ASSET(2) char gTexture7F1C84[] = "__OTR__texture_data_2/7F1C84"; +static const ALIGN_ASSET(2) char font_number_five[] = "__OTR__texture_data_2/font_number_five"; -static const ALIGN_ASSET(2) char gTexture7F1D54[] = "__OTR__texture_data_2/7F1D54"; +static const ALIGN_ASSET(2) char font_number_six[] = "__OTR__texture_data_2/font_number_six"; -static const ALIGN_ASSET(2) char gTexture7F1E24[] = "__OTR__texture_data_2/7F1E24"; +static const ALIGN_ASSET(2) char font_number_seven[] = "__OTR__texture_data_2/font_number_seven"; -static const ALIGN_ASSET(2) char gTexture7F1EF4[] = "__OTR__texture_data_2/7F1EF4"; +static const ALIGN_ASSET(2) char font_number_eight[] = "__OTR__texture_data_2/font_number_eight"; -static const ALIGN_ASSET(2) char gTexture7F1FC4[] = "__OTR__texture_data_2/7F1FC4"; +static const ALIGN_ASSET(2) char font_number_nine[] = "__OTR__texture_data_2/font_number_nine"; -static const ALIGN_ASSET(2) char gTexture7F2094[] = "__OTR__texture_data_2/7F2094"; +static const ALIGN_ASSET(2) char font_letter_A[] = "__OTR__texture_data_2/font_letter_A"; -static const ALIGN_ASSET(2) char gTexture7F2164[] = "__OTR__texture_data_2/7F2164"; +static const ALIGN_ASSET(2) char font_letter_B[] = "__OTR__texture_data_2/font_letter_B"; -static const ALIGN_ASSET(2) char gTexture7F2234[] = "__OTR__texture_data_2/7F2234"; +static const ALIGN_ASSET(2) char font_letter_C[] = "__OTR__texture_data_2/font_letter_C"; -static const ALIGN_ASSET(2) char gTexture7F2304[] = "__OTR__texture_data_2/7F2304"; +static const ALIGN_ASSET(2) char font_letter_D[] = "__OTR__texture_data_2/font_letter_D"; -static const ALIGN_ASSET(2) char gTexture7F23D4[] = "__OTR__texture_data_2/7F23D4"; +static const ALIGN_ASSET(2) char font_letter_E[] = "__OTR__texture_data_2/font_letter_E"; -static const ALIGN_ASSET(2) char gTexture7F24A4[] = "__OTR__texture_data_2/7F24A4"; +static const ALIGN_ASSET(2) char font_letter_F[] = "__OTR__texture_data_2/font_letter_F"; -static const ALIGN_ASSET(2) char gTexture7F2574[] = "__OTR__texture_data_2/7F2574"; +static const ALIGN_ASSET(2) char font_letter_G[] = "__OTR__texture_data_2/font_letter_G"; -static const ALIGN_ASSET(2) char gTexture7F2644[] = "__OTR__texture_data_2/7F2644"; +static const ALIGN_ASSET(2) char font_letter_H[] = "__OTR__texture_data_2/font_letter_H"; -static const ALIGN_ASSET(2) char gTexture7F2714[] = "__OTR__texture_data_2/7F2714"; +static const ALIGN_ASSET(2) char font_letter_I[] = "__OTR__texture_data_2/font_letter_I"; -static const ALIGN_ASSET(2) char gTexture7F27E4[] = "__OTR__texture_data_2/7F27E4"; +static const ALIGN_ASSET(2) char font_letter_J[] = "__OTR__texture_data_2/font_letter_J"; -static const ALIGN_ASSET(2) char gTexture7F28B4[] = "__OTR__texture_data_2/7F28B4"; +static const ALIGN_ASSET(2) char font_letter_K[] = "__OTR__texture_data_2/font_letter_K"; -static const ALIGN_ASSET(2) char gTexture7F2984[] = "__OTR__texture_data_2/7F2984"; +static const ALIGN_ASSET(2) char font_letter_L[] = "__OTR__texture_data_2/font_letter_L"; -static const ALIGN_ASSET(2) char gTexture7F2A54[] = "__OTR__texture_data_2/7F2A54"; +static const ALIGN_ASSET(2) char font_letter_M[] = "__OTR__texture_data_2/font_letter_M"; -static const ALIGN_ASSET(2) char gTexture7F2B24[] = "__OTR__texture_data_2/7F2B24"; +static const ALIGN_ASSET(2) char font_letter_N[] = "__OTR__texture_data_2/font_letter_N"; -static const ALIGN_ASSET(2) char gTexture7F2BF4[] = "__OTR__texture_data_2/7F2BF4"; +static const ALIGN_ASSET(2) char font_letter_O[] = "__OTR__texture_data_2/font_letter_O"; -static const ALIGN_ASSET(2) char gTexture7F2CC4[] = "__OTR__texture_data_2/7F2CC4"; +static const ALIGN_ASSET(2) char font_letter_P[] = "__OTR__texture_data_2/font_letter_P"; -static const ALIGN_ASSET(2) char gTexture7F2D94[] = "__OTR__texture_data_2/7F2D94"; +static const ALIGN_ASSET(2) char font_letter_Q[] = "__OTR__texture_data_2/font_letter_Q"; -static const ALIGN_ASSET(2) char gTexture7F2E64[] = "__OTR__texture_data_2/7F2E64"; +static const ALIGN_ASSET(2) char font_letter_R[] = "__OTR__texture_data_2/font_letter_R"; -static const ALIGN_ASSET(2) char gTexture7F2F34[] = "__OTR__texture_data_2/7F2F34"; +static const ALIGN_ASSET(2) char font_letter_S[] = "__OTR__texture_data_2/font_letter_S"; -static const ALIGN_ASSET(2) char gTexture7F3004[] = "__OTR__texture_data_2/7F3004"; +static const ALIGN_ASSET(2) char font_letter_T[] = "__OTR__texture_data_2/font_letter_T"; -static const ALIGN_ASSET(2) char gTexture7F30D4[] = "__OTR__texture_data_2/7F30D4"; +static const ALIGN_ASSET(2) char font_letter_U[] = "__OTR__texture_data_2/font_letter_U"; -static const ALIGN_ASSET(2) char gTexture7F31A4[] = "__OTR__texture_data_2/7F31A4"; +static const ALIGN_ASSET(2) char font_letter_V[] = "__OTR__texture_data_2/font_letter_V"; -static const ALIGN_ASSET(2) char gTexture7F3274[] = "__OTR__texture_data_2/7F3274"; +static const ALIGN_ASSET(2) char font_letter_W[] = "__OTR__texture_data_2/font_letter_W"; -static const ALIGN_ASSET(2) char gTexture7F3344[] = "__OTR__texture_data_2/7F3344"; +static const ALIGN_ASSET(2) char font_letter_X[] = "__OTR__texture_data_2/font_letter_X"; -static const ALIGN_ASSET(2) char gTexture7F3414[] = "__OTR__texture_data_2/7F3414"; +static const ALIGN_ASSET(2) char font_letter_Y[] = "__OTR__texture_data_2/font_letter_Y"; -static const ALIGN_ASSET(2) char gTexture7F34E4[] = "__OTR__texture_data_2/7F34E4"; +static const ALIGN_ASSET(2) char font_letter_Z[] = "__OTR__texture_data_2/font_letter_Z"; static const ALIGN_ASSET(2) char gTexture7F35B4[] = "__OTR__texture_data_2/7F35B4"; @@ -787,7 +787,7 @@ static const ALIGN_ASSET(2) char gTexture7F9F44[] = "__OTR__texture_data_2/7F9F4 static const ALIGN_ASSET(2) char gTexture7F9FC4[] = "__OTR__texture_data_2/7F9FC4"; -static const ALIGN_ASSET(2) char gTexture7FA044[] = "__OTR__texture_data_2/7FA044"; +static const ALIGN_ASSET(2) char font_apostrophe[] = "__OTR__texture_data_2/font_apostrophe"; static const ALIGN_ASSET(2) char gTexture7FA0C4[] = "__OTR__texture_data_2/7FA0C4"; @@ -795,5 +795,5 @@ static const ALIGN_ASSET(2) char gTexture7FA194[] = "__OTR__texture_data_2/7FA19 static const ALIGN_ASSET(2) char gTexture7FA264[] = "__OTR__texture_data_2/7FA264"; -static const ALIGN_ASSET(2) char gTexture7FA334[] = "__OTR__texture_data_2/7FA334"; +static const ALIGN_ASSET(2) char font_comma[] = "__OTR__texture_data_2/7FA334"; diff --git a/include/assets/texture_tkmk00.h b/include/assets/texture_tkmk00.h index 05a10d772..b18a748f5 100644 --- a/include/assets/texture_tkmk00.h +++ b/include/assets/texture_tkmk00.h @@ -3,25 +3,25 @@ #include <libultraship.h> #include <align_asset_macro.h> -static const ALIGN_ASSET(2) char gTexturePlayerSelect[] = "__OTR__texture_tkmk00/gTexturePlayerSelect"; +static const ALIGN_ASSET(2) char texture_player_select[] = "__OTR__texture_tkmk00/texture_player_select"; -static const ALIGN_ASSET(2) char gTextureOption[] = "__OTR__texture_tkmk00/gTextureOption"; +static const ALIGN_ASSET(2) char texture_option[] = "__OTR__texture_tkmk00/texture_option"; -static const ALIGN_ASSET(2) char gTextureNameDK[] = "__OTR__texture_tkmk00/gTextureNameDK"; +static const ALIGN_ASSET(2) char texture_name_dk[] = "__OTR__texture_tkmk00/texture_name_dk"; -static const ALIGN_ASSET(2) char gTextureNameToad[] = "__OTR__texture_tkmk00/gTextureNameToad"; +static const ALIGN_ASSET(2) char texture_name_toad[] = "__OTR__texture_tkmk00/texture_name_toad"; -static const ALIGN_ASSET(2) char gTextureNameBowser[] = "__OTR__texture_tkmk00/gTextureNameBowser"; +static const ALIGN_ASSET(2) char texture_name_bowser[] = "__OTR__texture_tkmk00/texture_name_bowser"; -static const ALIGN_ASSET(2) char gTextureNameLuigi[] = "__OTR__texture_tkmk00/gTextureNameLuigi"; +static const ALIGN_ASSET(2) char texture_name_luigi[] = "__OTR__texture_tkmk00/texture_name_luigi"; -static const ALIGN_ASSET(2) char gTextureNameMario[] = "__OTR__texture_tkmk00/gTextureNameMario"; +static const ALIGN_ASSET(2) char texture_name_mario[] = "__OTR__texture_tkmk00/texture_name_mario"; -static const ALIGN_ASSET(2) char gTextureNamePeach[] = "__OTR__texture_tkmk00/gTextureNamePeach"; +static const ALIGN_ASSET(2) char texture_name_peach[] = "__OTR__texture_tkmk00/texture_name_peach"; -static const ALIGN_ASSET(2) char gTextureNameWario[] = "__OTR__texture_tkmk00/gTextureNameWario"; +static const ALIGN_ASSET(2) char texture_name_wario[] = "__OTR__texture_tkmk00/texture_name_wario"; -static const ALIGN_ASSET(2) char gTextureNameYoshi[] = "__OTR__texture_tkmk00/gTextureNameYoshi"; +static const ALIGN_ASSET(2) char texture_name_yoshi[] = "__OTR__texture_tkmk00/texture_name_yoshi"; static const ALIGN_ASSET(2) char gTextureTitleMarioRaceway[] = "__OTR__texture_tkmk00/gTextureTitleMarioRaceway"; @@ -73,51 +73,51 @@ static const ALIGN_ASSET(2) char gTextureMenuStarCup[] = "__OTR__texture_tkmk00/ static const ALIGN_ASSET(2) char gTextureMenuSpecialCup[] = "__OTR__texture_tkmk00/gTextureMenuSpecialCup"; -static const ALIGN_ASSET(2) char gTextureGameSelect[] = "__OTR__texture_tkmk00/gTextureGameSelect"; +static const ALIGN_ASSET(2) char texture_game_select[] = "__OTR__texture_tkmk00/texture_game_select"; -static const ALIGN_ASSET(2) char gTextureMenu1PGame[] = "__OTR__texture_tkmk00/gTextureMenu1PGame"; +static const ALIGN_ASSET(2) char texture_menu_1p_game[] = "__OTR__texture_tkmk00/texture_menu_1p_game"; -static const ALIGN_ASSET(2) char gTextureMenu2PGame[] = "__OTR__texture_tkmk00/gTextureMenu2PGame"; +static const ALIGN_ASSET(2) char texture_menu_2p_game[] = "__OTR__texture_tkmk00/texture_menu_2p_game"; -static const ALIGN_ASSET(2) char gTextureMenu3PGame[] = "__OTR__texture_tkmk00/gTextureMenu3PGame"; +static const ALIGN_ASSET(2) char texture_menu_3p_game[] = "__OTR__texture_tkmk00/texture_menu_3p_game"; -static const ALIGN_ASSET(2) char gTextureMenu4PGame[] = "__OTR__texture_tkmk00/gTextureMenu4PGame"; +static const ALIGN_ASSET(2) char texture_menu_4p_game[] = "__OTR__texture_tkmk00/texture_menu_4p_game"; -static const ALIGN_ASSET(2) char gTextureMenuModeBattle[] = "__OTR__texture_tkmk00/gTextureMenuModeBattle"; +static const ALIGN_ASSET(2) char texture_mode_battle[] = "__OTR__texture_tkmk00/texture_mode_battle"; -static const ALIGN_ASSET(2) char gTextureMenuModeTimeTrials[] = "__OTR__texture_tkmk00/gTextureMenuModeTimeTrials"; +static const ALIGN_ASSET(2) char texture_mode_time_trials[] = "__OTR__texture_tkmk00/texture_mode_time_trials"; -static const ALIGN_ASSET(2) char gTextureMenuModeMarioGP[] = "__OTR__texture_tkmk00/gTextureMenuModeMarioGP"; +static const ALIGN_ASSET(2) char texture_mode_mario_gp[] = "__OTR__texture_tkmk00/texture_mode_mario_gp"; -static const ALIGN_ASSET(2) char gTextureMenuModeVS[] = "__OTR__texture_tkmk00/gTextureMenuModeVS"; +static const ALIGN_ASSET(2) char texture_mode_vs[] = "__OTR__texture_tkmk00/texture_mode_vs"; -static const ALIGN_ASSET(2) char gTextureMenuLOption[] = "__OTR__texture_tkmk00/gTextureMenuLOption"; +static const ALIGN_ASSET(2) char texture_l_option[] = "__OTR__texture_tkmk00/texture_l_option"; -static const ALIGN_ASSET(2) char gTextureMenuRData[] = "__OTR__texture_tkmk00/gTextureMenuRData"; +static const ALIGN_ASSET(2) char texture_r_data[] = "__OTR__texture_tkmk00/texture_r_data"; -static const ALIGN_ASSET(2) char gTextureMenu50cc[] = "__OTR__texture_tkmk00/gTextureMenu50cc"; +static const ALIGN_ASSET(2) char texture_50cc[] = "__OTR__texture_tkmk00/texture_50cc"; -static const ALIGN_ASSET(2) char gTextureMenu100cc[] = "__OTR__texture_tkmk00/gTextureMenu100cc"; +static const ALIGN_ASSET(2) char texture_100cc[] = "__OTR__texture_tkmk00/texture_100cc"; -static const ALIGN_ASSET(2) char gTextureMenu150cc[] = "__OTR__texture_tkmk00/gTextureMenu150cc"; +static const ALIGN_ASSET(2) char texture_150cc[] = "__OTR__texture_tkmk00/texture_150cc"; -static const ALIGN_ASSET(2) char gTextureMenuExtra[] = "__OTR__texture_tkmk00/gTextureMenuExtra"; +static const ALIGN_ASSET(2) char texture_extra[] = "__OTR__texture_tkmk00/texture_extra"; static const ALIGN_ASSET(2) char gTextureMenuWithoutItem[] = "__OTR__texture_tkmk00/gTextureMenuWithoutItem"; static const ALIGN_ASSET(2) char gTextureMenuWithItem[] = "__OTR__texture_tkmk00/gTextureMenuWithItem"; -static const ALIGN_ASSET(2) char gTextureMenuBegin[] = "__OTR__texture_tkmk00/gTextureMenuBegin"; +static const ALIGN_ASSET(2) char texture_begin[] = "__OTR__texture_tkmk00/texture_begin"; -static const ALIGN_ASSET(2) char gTextureMenuGhost[] = "__OTR__texture_tkmk00/gTextureMenuGhost"; +static const ALIGN_ASSET(2) char texture_menu_ghost[] = "__OTR__texture_tkmk00/texture_menu_ghost"; -static const ALIGN_ASSET(2) char gTextureMenuData[] = "__OTR__texture_tkmk00/gTextureMenuData"; +static const ALIGN_ASSET(2) char texture_data[] = "__OTR__texture_tkmk00/texture_data"; -static const ALIGN_ASSET(2) char gTextureMenuOK[] = "__OTR__texture_tkmk00/gTextureMenuOK"; +static const ALIGN_ASSET(2) char texture_ok[] = "__OTR__texture_tkmk00/texture_ok"; -static const ALIGN_ASSET(2) char gTextureBackgroundBlueSky[] = "__OTR__texture_tkmk00/gTextureBackgroundBlueSky"; +static const ALIGN_ASSET(2) char background_blue_sky[] = "__OTR__texture_tkmk00/background_blue_sky"; -static const ALIGN_ASSET(2) char gTextureBackgroundSunset[] = "__OTR__texture_tkmk00/gTextureBackgroundSunset"; +static const ALIGN_ASSET(2) char background_sunset[] = "__OTR__texture_tkmk00/background_sunset"; static const ALIGN_ASSET(2) char gTextureGreenGoldStripe[] = "__OTR__texture_tkmk00/gTextureGreenGoldStripe"; diff --git a/include/assets/toads_turnpike_data.h b/include/assets/toads_turnpike_data.h index 27bd6b989..6557ebdd3 100644 --- a/include/assets/toads_turnpike_data.h +++ b/include/assets/toads_turnpike_data.h @@ -6,8 +6,12 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_60[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_60"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_60[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_60"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_80[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_80"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_158[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_158"; @@ -270,30 +274,54 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_truck_unknown_model13[] static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_18DB8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_18DB8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_18DB8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_18DB8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_18E38[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_18E38"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_18E38[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_18E38"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_18EB8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_18EB8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_18EB8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_18EB8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_18F58[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_18F58"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_18F58[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_18F58"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_18FF8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_18FF8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_18FF8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_18FF8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19020[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19020"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19030[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19030"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19030[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19030"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_190E8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_190E8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_190E8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_190E8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19168[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19168"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19168[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19168"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_192B0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_192B0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_192B0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_192B0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19390[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19390"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19390[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19390"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19450[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19450"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19450[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19450"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_194E0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_194E0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_194E0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_194E0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19518[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19518"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_truck_model_lod1[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_truck_model_lod1"; @@ -312,24 +340,40 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_truck_unknown_model19[] static const ALIGN_ASSET(2) char d_course_toads_turnpike_truck_unknown_model20[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_truck_unknown_model20"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19CF8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19CF8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19CF8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19CF8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19D68[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19D68"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19D68[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19D68"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19DD8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19DD8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19DD8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19DD8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19DF0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19DF0"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19E00[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19E00"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19E00[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19E00"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19E38[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19E38"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19E38[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19E38"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19EA0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19EA0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19EA0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19EA0"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_19F08[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_19F08"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_19F08[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_19F08"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A040[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A040"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1A040[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1A040"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A068[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A068"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_truck_model_lod2[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_truck_model_lod2"; @@ -344,18 +388,30 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_truck_unknown_model24[] static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A4B8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A4B8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1A4B8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1A4B8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A528[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A528"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1A528[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1A528"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A5E0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A5E0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1A5E0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1A5E0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A5F8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A5F8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A608[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A608"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1A608[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1A608"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A640[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A640"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1A640[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1A640"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A6B0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A6B0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1A6B0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1A6B0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1A6C8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1A6C8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_model_lod0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_bus_model_lod0"; @@ -390,28 +446,48 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_unknown_model14[] = static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_unknown_model15[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_bus_unknown_model15"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1B5C8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1B5C8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B5C8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B5C8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B658[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B658"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1B658[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1B658"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B6D8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B6D8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1B6D8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1B6D8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B758[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B758"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1B758[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1B758"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B778[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B778"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1B788[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1B788"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B788[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B788"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B810[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B810"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1B810[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1B810"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1B8A0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1B8A0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1B8A0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1B8A0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1BC78[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1BC78"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1BC78[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1BC78"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1BD48[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1BD48"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1BD48[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1BD48"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1BE18[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1BE18"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1BE18[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1BE18"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1BE48[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1BE48"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_model_lod1[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_bus_model_lod1"; @@ -438,20 +514,34 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_unknown_model25[] = static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1C628[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1C628"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1C628[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1C628"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1C688[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1C688"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1C688[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1C688"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1C6E8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1C6E8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1C6E8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1C6E8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1C700[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1C700"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1C710[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1C710"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1C710[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1C710"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1C770[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1C770"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1C770[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1C770"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1C7D0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1C7D0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1C7D0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1C7D0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1CA88[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1CA88"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1CA88[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1CA88"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1CAA8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1CAA8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_model_lod2[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_bus_model_lod2"; @@ -468,18 +558,28 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_unknown_model30[] = static const ALIGN_ASSET(2) char d_course_toads_turnpike_bus_unknown_model31[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_bus_unknown_model31"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1CD98[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1CD98"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1CD98[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1CD98"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1CDF8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1CDF8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1CDF8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1CDF8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1CE58[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1CE58"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1CE58[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1CE58"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1CE70[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1CE70"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1CE80[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1CE80"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1CE80[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1CE80"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1D008[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1D008"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1D008[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1D008"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1D018[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1D018"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_model_lod0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_tanker_truck_model_lod0"; @@ -512,30 +612,52 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_unknown_mo static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_unknown_model14[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_tanker_truck_unknown_model14"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E288[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E288"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E288[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E288"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E318[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E318"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E318[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E318"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E3A8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E3A8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E3A8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E3A8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E438[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E438"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E438[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E438"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E458[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E458"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E468[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E468"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E468[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E468"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E508[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E508"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E508[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E508"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E810[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E810"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E810[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E810"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E8A0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E8A0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E8A0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E8A0"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1E970[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1E970"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1E970[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1E970"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1EA40[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1EA40"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1EA40[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1EA40"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1EB10[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1EB10"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1EB10[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1EB10"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1EB48[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1EB48"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_model_lod1[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_tanker_truck_model_lod1"; @@ -572,34 +694,60 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_unknown_mo static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_unknown_model30[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_tanker_truck_unknown_model30"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1F7D8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1F7D8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1F7D8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1F7D8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1F850[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1F850"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1F850[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1F850"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1F8C0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1F8C0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1F8C0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1F8C0"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1F938[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1F938"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1F938[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1F938"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1F9A8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1F9A8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1F9A8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1F9A8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1F9D0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1F9D0"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1F9E0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1F9E0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1F9E0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1F9E0"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1FCD8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1FCD8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1FCD8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1FCD8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1FD58[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1FD58"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1FD58[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1FD58"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1FDD0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1FDD0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1FDD0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1FDD0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1FE50[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1FE50"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1FE50[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1FE50"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1FEC8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1FEC8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1FEC8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1FEC8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1FF50[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1FF50"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1FF50[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1FF50"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_1FFC8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_1FFC8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_1FFC8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_1FFC8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_20008[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_20008"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_model_lod2[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_tanker_truck_model_lod2"; @@ -610,18 +758,28 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_unknown_mo static const ALIGN_ASSET(2) char d_course_toads_turnpike_tanker_truck_unknown_model33[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_tanker_truck_unknown_model33"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_20348[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_20348"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_20348[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_20348"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_20450[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_20450"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_20450[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_20450"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_204F8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_204F8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_204F8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_204F8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_20510[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_20510"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_20520[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_20520"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_20520[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_20520"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_20598[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_20598"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_20598[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_20598"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_205A8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_205A8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_car_model_lod0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_car_model_lod0"; @@ -658,30 +816,56 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_car_unknown_model15[] = static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21648[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21648"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21648[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21648"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_216D8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_216D8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_216D8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_216D8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21768[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21768"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21768[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21768"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21780[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21780"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21790[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21790"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21790[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21790"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21820[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21820"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21820[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21820"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_218B0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_218B0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_218B0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_218B0"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21950[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21950"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21950[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21950"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21A28[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21A28"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21A28[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21A28"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21C78[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21C78"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21C78[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21C78"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21CD0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21CD0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21CD0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21CD0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21D28[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21D28"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21D28[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21D28"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21D80[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21D80"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21D80[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21D80"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_21DD8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_21DD8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21DD8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21DD8"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_21E28[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_21E28"; @@ -712,24 +896,44 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_car_unknown_model26[] = static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22A68[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22A68"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22A68[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22A68"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22AF8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22AF8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22AF8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22AF8"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22B88[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22B88"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22B88[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22B88"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22BA0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22BA0"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22BB0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22BB0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22BB0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22BB0"; + +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22C50[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22C50"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22C50[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22C50"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22C88[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22C88"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22C88[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22C88"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22CC0[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22CC0"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22CC0[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22CC0"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22D60[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22D60"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22D60[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22D60"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_22E38[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_22E38"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_22E38[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_22E38"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_23040[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_23040"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23040[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23040"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23078[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23078"; @@ -748,20 +952,32 @@ static const ALIGN_ASSET(2) char d_course_toads_turnpike_car_unknown_model31[] = static const ALIGN_ASSET(2) char d_course_toads_turnpike_car_unknown_model32[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_car_unknown_model32"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_23538[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_23538"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23538[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23538"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23600[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23600"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_23600[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_23600"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23678[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23678"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_23678[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_23678"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_237D8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_237D8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_237D8[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_237D8"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_237F8[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_237F8"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_23808[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_23808"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23808[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23808"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23838[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23838"; +static const ALIGN_ASSET(2) char toads_turnpike_data_seg6_gfx_23838[] = "__OTR__toads_turnpike_data/toads_turnpike_data_seg6_gfx_23838"; + static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23848[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23848"; static const ALIGN_ASSET(2) char d_course_toads_turnpike_dl_23858[] = "__OTR__toads_turnpike_data/d_course_toads_turnpike_dl_23858"; diff --git a/include/assets/wario_stadium_data.h b/include/assets/wario_stadium_data.h index 88a2b1d7a..ac8cc029c 100644 --- a/include/assets/wario_stadium_data.h +++ b/include/assets/wario_stadium_data.h @@ -240,8 +240,12 @@ static const ALIGN_ASSET(2) char d_course_wario_stadium_sign_top_right[] = "__OT static const ALIGN_ASSET(2) char d_course_wario_stadium_sign_bottom_right[] = "__OTR__wario_stadium_data/d_course_wario_stadium_sign_bottom_right"; +static const ALIGN_ASSET(2) char wario_stadium_data_seg6_gfx_C890[] = "__OTR__wario_stadium_data/wario_stadium_data_seg6_gfx_C890"; + static const ALIGN_ASSET(2) char d_course_wario_stadium_dl_C890[] = "__OTR__wario_stadium_data/d_course_wario_stadium_dl_C890"; +static const ALIGN_ASSET(2) char wario_stadium_data_seg6_gfx_CA50[] = "__OTR__wario_stadium_data/wario_stadium_data_seg6_gfx_CA50"; + static const ALIGN_ASSET(2) char d_course_wario_stadium_dl_CA50[] = "__OTR__wario_stadium_data/d_course_wario_stadium_dl_CA50"; static const ALIGN_ASSET(2) char d_course_wario_stadium_dl_sign[] = "__OTR__wario_stadium_data/d_course_wario_stadium_dl_sign"; diff --git a/include/assets/yoshi_valley_data.h b/include/assets/yoshi_valley_data.h index 9dfa8b745..b93a478a4 100644 --- a/include/assets/yoshi_valley_data.h +++ b/include/assets/yoshi_valley_data.h @@ -6,8 +6,12 @@ static const ALIGN_ASSET(2) char d_course_yoshi_valley_dl_0[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_dl_0"; +static const ALIGN_ASSET(2) char yoshi_valley_data_seg6_gfx_0[] = "__OTR__yoshi_valley_data/yoshi_valley_data_seg6_gfx_0"; + static const ALIGN_ASSET(2) char d_course_yoshi_valley_dl_20[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_dl_20"; +static const ALIGN_ASSET(2) char yoshi_valley_data_seg6_gfx_20[] = "__OTR__yoshi_valley_data/yoshi_valley_data_seg6_gfx_20"; + static const ALIGN_ASSET(2) char d_course_yoshi_valley_dl_40[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_dl_40"; static const ALIGN_ASSET(2) char d_course_yoshi_valley_dl_290[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_dl_290"; @@ -282,8 +286,12 @@ static const ALIGN_ASSET(2) char d_course_yoshi_valley_yoshi_flag[] = "__OTR__yo static const ALIGN_ASSET(2) char d_course_yoshi_valley_unknown_light4[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_unknown_light4"; +static const ALIGN_ASSET(2) char yoshi_valley_data_seg6_lights_141A0[] = "__OTR__yoshi_valley_data/yoshi_valley_data_seg6_lights_141A0"; + static const ALIGN_ASSET(2) char d_course_yoshi_valley_unknown_light5[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_unknown_light5"; +static const ALIGN_ASSET(2) char yoshi_valley_data_seg6_lights_141B8[] = "__OTR__yoshi_valley_data/yoshi_valley_data_seg6_lights_141B8"; + static const ALIGN_ASSET(2) char d_course_yoshi_valley_flag_pole_model1[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_flag_pole_model1"; static const ALIGN_ASSET(2) char d_course_yoshi_valley_flag_pole_model2[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_flag_pole_model2"; @@ -330,6 +338,8 @@ static const ALIGN_ASSET(2) char d_course_yoshi_valley_egg_model4[] = "__OTR__yo static const ALIGN_ASSET(2) char d_course_yoshi_valley_egg_model5[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_egg_model5"; +static const ALIGN_ASSET(2) char yoshi_valley_data_seg6_lights_16558[] = "__OTR__yoshi_valley_data/yoshi_valley_data_seg6_lights_16558"; + static const ALIGN_ASSET(2) char d_course_yoshi_valley_lights4[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_lights4"; static const ALIGN_ASSET(2) char d_course_yoshi_valley_egg_spot[] = "__OTR__yoshi_valley_data/d_course_yoshi_valley_egg_spot"; diff --git a/include/common_structs.h b/include/common_structs.h index 11bc9d23c..4450d0e6c 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -160,13 +160,13 @@ typedef struct { } Collision; typedef struct { - /* 0x00 */ Vec3f unk_000; - /* 0x0C */ f32 unk_00C; + /* 0x00 */ Vec3f pos; + /* 0x0C */ f32 scale; /* 0x10 */ u16 unk_010; - /* 0x12 */ u16 unk_012; - /* 0x14 */ f32 unk_014; + /* 0x12 */ u16 type; + /* 0x14 */ f32 surfaceType; /* 0x18 */ f32 unk_018; - /* 0x1C */ s16 unk_01C; + /* 0x1C */ s16 isAlive; /* 0x1E */ s16 unk_01E; /* 0x20 */ s16 unk_020; /* 0x22 */ s16 unk_022; @@ -178,10 +178,10 @@ typedef struct { /* 0x32 */ s16 unk_032; /* 0x34 */ s16 unk_034; /* 0x36 */ s16 unk_036; - /* 0x38 */ s16 unk_038; - /* 0x3A */ s16 unk_03A; - /* 0x3C */ s16 unk_03C; - /* 0x3E */ s16 unk_03E; + /* 0x38 */ s16 red; + /* 0x3A */ s16 green; + /* 0x3C */ s16 blue; + /* 0x3E */ s16 alpha; /* 0x40 */ s16 unk_040; /* 0x42 */ s16 unk_042; /* 0x44 */ s16 unk_044; @@ -343,7 +343,7 @@ typedef struct { /* 0x01F8 */ f32 unk_1F8; /* 0x01FC */ f32 unk_1FC; /* 0x0200 */ u32 unk_200; // May be s32. but less casting required if u32 - /* 0x0204 */ s16 unk_204; + /* 0x0204 */ s16 driftDuration; /* 0x0206 */ s16 unk_206; /* 0x0208 */ f32 unk_208; /* 0x020C */ f32 unk_20C; @@ -355,7 +355,7 @@ typedef struct { /* 0x0222 */ s16 unk_222; /* 0x0224 */ f32 size; /* 0x0228 */ s16 unk_228; - /* 0x022A */ s16 unk_22A; + /* 0x022A */ s16 driftState; /* 0x022C */ f32 previousSpeed; /* 0x0230 */ f32 unk_230; /* 0x0234 */ s16 unk_234; @@ -368,7 +368,10 @@ typedef struct { /* 0x024C */ u16 animGroupSelector[4]; // Based on screen /* 0x0254 */ u16 characterId; /* 0x0256 */ u16 unk_256; - /* 0x0258 */ UnkPlayerStruct258 unk_258[40]; + /* 0x0258 */ UnkPlayerStruct258 particlePool0[10]; + /* 0x06D8 */ UnkPlayerStruct258 particlePool1[10]; + /* 0x0C98 */ UnkPlayerStruct258 particlePool2[10]; + /* 0x1278 */ UnkPlayerStruct258 particlePool3[10]; /* 0x0D98 */ s16 unk_D98; /* 0x0D9A */ s16 unk_D9A; /* 0x0D9C */ f32 unk_D9C; @@ -397,6 +400,19 @@ typedef struct { u32 nHasAuthority; } Player; // size = 0xDD8 +enum POOL_1_PARTICLE_TYPES { + NO_PARTICLE, + DRIFT_PARTICLE, + GROUND_PARTICLE, + GRASS_PARTICLE, + POOL_1_PARTICLE_TYPE_4, + POOL_1_PARTICLE_TYPE_5, + POOL_1_PARTICLE_TYPE_6, + POOL_1_PARTICLE_TYPE_7, + POOL_1_PARTICLE_TYPE_8, + POOL_1_PARTICLE_TYPE_9 +}; + typedef struct { // Something related to time trial ghost data? /* 0x00 */ s32 unk_00; diff --git a/include/defines.h b/include/defines.h index 4b292776f..1c176c9bf 100644 --- a/include/defines.h +++ b/include/defines.h @@ -344,15 +344,40 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE }; * @brief effect of player's * for effects */ -#define BOOST_RAMP_WOOD_EFFECT 0x4 // being boosted by a ramp -#define STAR_EFFECT 0x200 // being a star -#define BOOST_EFFECT 0x2000 // being boosted by trigger a mushroom -#define BOOST_RAMP_ASPHALT_EFFECT 0x100000 // being boosted by a boost pad -#define REVERSE_EFFECT 0x400000 // being in reverse of the course -#define HIT_BY_ITEM_EFFECT 0x2000000 // being hit by an item -#define HIT_EFFECT 0x4000000 // hitting an object -#define LIGHTNING_EFFECT 0x40000000 // being hit by lightning -#define BOO_EFFECT 0x80000000 // being a boo +#define UNKNOWN_EFFECT_0x1 0x1 // +#define BOOST_RAMP_WOOD_EFFECT 0x4 // being boosted by a ramp +#define DRIFTING_EFFECT 0x10 // drifting +#define UNKNOWN_EFFECT_0x40 0x40 // +#define UNKNOWN_EFFECT_0x80 0x80 // +#define UNKNOWN_EFFECT_0xC 0xC // +#define UNKNOWN_EFFECT_0x10 0x10 // +#define UNKNOWN_EFFECT_0x100 0x100 // +#define UNKNOWN_EFFECT_0x1000 0x1000 // +#define STAR_EFFECT 0x200 // being a star +#define BOOST_EFFECT 0x2000 // being boosted by trigger a mushroom +#define UNKNOWN_EFFECT_0x10000 0x10000 // +#define BOOST_RAMP_ASPHALT_EFFECT 0x100000 // being boosted by a boost pad +#define UNKNOWN_EFFECT_0x200000 0x200000 // +#define REVERSE_EFFECT 0x400000 // being in reverse of the course +#define UNKNOWN_EFFECT_0x1000000 0x1000000 // +#define HIT_BY_ITEM_EFFECT 0x2000000 // being hit by an item +#define HIT_EFFECT 0x4000000 // hitting an object +#define UNKNOWN_EFFECT_0x10000000 0x10000000 // +#define LIGHTNING_EFFECT 0x40000000 // being hit by lightning +#define BOO_EFFECT 0x80000000 // being a boo + +/** + * @brief durations of effects + */ +#define STAR_EFFECT_DURATION 0xA +#define BOO_EFFECT_DURATION 0x7 + +/** + * @brief alpha relates values + */ +#define ALPHA_MAX 0xFF +#define ALPHA_MIN 0x0 +#define ALPHA_BOO_EFFECT 0x60 /** * @brief shell state |