duplicate sequence (#506)

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
This commit is contained in:
coco875
2025-07-28 20:01:01 +00:00
committed by GitHub
parent 7c229e3ed0
commit 9ca2d04604
14 changed files with 103 additions and 18 deletions
+1 -1
View File
@@ -112,7 +112,7 @@ BlockFort::BlockFort() {
Props.Skybox.FloorBottomRight = { 0, 0, 0 };
Props.Skybox.FloorBottomLeft = { 0, 0, 0 };
Props.Skybox.FloorTopLeft = { 216, 232, 248 };
Props.Sequence = MusicSeq::MUSIC_SEQ_CHOCO_MOUNTAIN;
Props.Sequence = MusicSeq::MUSIC_SEQ_BLOCK_FORT;
}
void BlockFort::Load() {
+1 -1
View File
@@ -111,7 +111,7 @@ DoubleDeck::DoubleDeck() {
Props.Skybox.FloorBottomRight = {0, 0, 0};
Props.Skybox.FloorBottomLeft = {0, 0, 0};
Props.Skybox.FloorTopLeft = {255, 224, 240};
Props.Sequence = MusicSeq::MUSIC_SEQ_CHOCO_MOUNTAIN;
Props.Sequence = MusicSeq::MUSIC_SEQ_DOUBLE_DECK;
}
void DoubleDeck::Load() {
+1 -1
View File
@@ -588,7 +588,7 @@ Harbour::Harbour() {
Props.Skybox.FloorBottomRight = {0, 0, 0};
Props.Skybox.FloorBottomLeft = {0, 0, 0};
Props.Skybox.FloorTopLeft = {0, 0, 0};
Props.Sequence = MusicSeq::MUSIC_SEQ_RACEWAYS_WARIO_STADIUM;
Props.Sequence = MusicSeq::MUSIC_SEQ_WARIO_STADIUM;
}
TrackSections harbour_surfaces[] = {
+1 -1
View File
@@ -158,7 +158,7 @@ LuigiRaceway::LuigiRaceway() {
Props.Skybox.FloorBottomRight = { 0, 0, 0 };
Props.Skybox.FloorBottomLeft = { 0, 0, 0 };
Props.Skybox.FloorTopLeft = { 216, 232, 248 };
Props.Sequence = MusicSeq::MUSIC_SEQ_RACEWAYS_WARIO_STADIUM;
Props.Sequence = MusicSeq::MUSIC_SEQ_LUIGI_RACEWAY;
for (size_t i = 0; i < 120; i++) {
replace_segmented_textures_with_o2r_textures((Gfx*) luigi_raceway_dls[i], Props.textures);
}
+1 -1
View File
@@ -146,7 +146,7 @@ MarioRaceway::MarioRaceway() {
Props.Skybox.FloorBottomRight = {0, 0, 0};
Props.Skybox.FloorBottomLeft = {0, 0, 0};
Props.Skybox.FloorTopLeft = {0, 0, 0};
Props.Sequence = MusicSeq::MUSIC_SEQ_RACEWAYS_WARIO_STADIUM;
Props.Sequence = MusicSeq::MUSIC_SEQ_MARIO_RACEWAY;
for (size_t i = 0; i < 68; i++) {
replace_segmented_textures_with_o2r_textures((Gfx*) mario_raceway_dls[i], Props.textures);
}
+1 -1
View File
@@ -143,7 +143,7 @@ MooMooFarm::MooMooFarm() {
Props.Skybox.FloorBottomRight = {0, 0, 0};
Props.Skybox.FloorBottomLeft = {0, 0, 0};
Props.Skybox.FloorTopLeft = {255, 184, 99};
Props.Sequence = MusicSeq::MUSIC_SEQ_MOO_MOO_FARM_YOSHI_VALLEY;
Props.Sequence = MusicSeq::MUSIC_SEQ_MOO_MOO_FARM;
for (size_t i = 0; i < 92; i++) {
replace_segmented_textures_with_o2r_textures((Gfx*) moo_moo_farm_dls[i], Props.textures);
}
+1 -1
View File
@@ -155,7 +155,7 @@ RoyalRaceway::RoyalRaceway() {
Props.Skybox.FloorBottomRight = {0, 0, 0};
Props.Skybox.FloorBottomLeft = {0, 0, 0};
Props.Skybox.FloorTopLeft = {255, 224, 240};
Props.Sequence = MusicSeq::MUSIC_SEQ_RACEWAYS_WARIO_STADIUM;
Props.Sequence = MusicSeq::MUSIC_SEQ_ROYAL_RACEWAY;
Props.WaterLevel = -60.0f;
for (size_t i = 0; i < 132; i++) {
+1 -1
View File
@@ -132,7 +132,7 @@ TestCourse::TestCourse() {
Props.Skybox.FloorBottomRight = {0, 0, 0};
Props.Skybox.FloorBottomLeft = {0, 0, 0};
Props.Skybox.FloorTopLeft = {0, 0, 0};
Props.Sequence = MusicSeq::MUSIC_SEQ_RACEWAYS_WARIO_STADIUM;
Props.Sequence = MusicSeq::MUSIC_SEQ_WARIO_STADIUM;
}
void TestCourse::Load() {
+1 -1
View File
@@ -140,7 +140,7 @@ WarioStadium::WarioStadium() {
Props.Skybox.FloorBottomRight = { 0, 0, 0 };
Props.Skybox.FloorBottomLeft = { 0, 0, 0 };
Props.Skybox.FloorTopLeft = { 0, 0, 0 };
Props.Sequence = MusicSeq::MUSIC_SEQ_RACEWAYS_WARIO_STADIUM;
Props.Sequence = MusicSeq::MUSIC_SEQ_WARIO_STADIUM;
for (size_t i = 0; i < 108; i++) {
replace_segmented_textures_with_o2r_textures((Gfx*) wario_stadium_dls[i], Props.textures);
}
+1 -1
View File
@@ -127,7 +127,7 @@ YoshiValley::YoshiValley() {
Props.Skybox.FloorBottomRight = {0, 0, 0};
Props.Skybox.FloorBottomLeft = {0, 0, 0};
Props.Skybox.FloorTopLeft = {95, 40, 15};
Props.Sequence = MusicSeq::MUSIC_SEQ_MOO_MOO_FARM_YOSHI_VALLEY;
Props.Sequence = MusicSeq::MUSIC_SEQ_YOSHI_VALLEY;
for (size_t i = 0; i < 124; i++) {
replace_segmented_textures_with_o2r_textures((Gfx*) d_course_yoshi_valley_dl_list[i], Props.textures);
}