summaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/courses/BlockFort.cpp2
-rw-r--r--src/engine/courses/DoubleDeck.cpp2
-rw-r--r--src/engine/courses/Harbour.cpp2
-rw-r--r--src/engine/courses/LuigiRaceway.cpp2
-rw-r--r--src/engine/courses/MarioRaceway.cpp2
-rw-r--r--src/engine/courses/MooMooFarm.cpp2
-rw-r--r--src/engine/courses/RoyalRaceway.cpp2
-rw-r--r--src/engine/courses/TestCourse.cpp2
-rw-r--r--src/engine/courses/WarioStadium.cpp2
-rw-r--r--src/engine/courses/YoshiValley.cpp2
10 files changed, 10 insertions, 10 deletions
diff --git a/src/engine/courses/BlockFort.cpp b/src/engine/courses/BlockFort.cpp
index d2f96259e..ae1b9bfb9 100644
--- a/src/engine/courses/BlockFort.cpp
+++ b/src/engine/courses/BlockFort.cpp
@@ -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() {
diff --git a/src/engine/courses/DoubleDeck.cpp b/src/engine/courses/DoubleDeck.cpp
index f796c284f..5331d4bc6 100644
--- a/src/engine/courses/DoubleDeck.cpp
+++ b/src/engine/courses/DoubleDeck.cpp
@@ -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() {
diff --git a/src/engine/courses/Harbour.cpp b/src/engine/courses/Harbour.cpp
index 2a96f6d44..d1f455b93 100644
--- a/src/engine/courses/Harbour.cpp
+++ b/src/engine/courses/Harbour.cpp
@@ -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[] = {
diff --git a/src/engine/courses/LuigiRaceway.cpp b/src/engine/courses/LuigiRaceway.cpp
index c765656d9..39b17a81d 100644
--- a/src/engine/courses/LuigiRaceway.cpp
+++ b/src/engine/courses/LuigiRaceway.cpp
@@ -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);
}
diff --git a/src/engine/courses/MarioRaceway.cpp b/src/engine/courses/MarioRaceway.cpp
index 7a7edb214..867c2734a 100644
--- a/src/engine/courses/MarioRaceway.cpp
+++ b/src/engine/courses/MarioRaceway.cpp
@@ -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);
}
diff --git a/src/engine/courses/MooMooFarm.cpp b/src/engine/courses/MooMooFarm.cpp
index d4632663f..f3c4dc1bc 100644
--- a/src/engine/courses/MooMooFarm.cpp
+++ b/src/engine/courses/MooMooFarm.cpp
@@ -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);
}
diff --git a/src/engine/courses/RoyalRaceway.cpp b/src/engine/courses/RoyalRaceway.cpp
index 88f85273b..1473cbf4f 100644
--- a/src/engine/courses/RoyalRaceway.cpp
+++ b/src/engine/courses/RoyalRaceway.cpp
@@ -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++) {
diff --git a/src/engine/courses/TestCourse.cpp b/src/engine/courses/TestCourse.cpp
index 2eb66506d..cf9f25179 100644
--- a/src/engine/courses/TestCourse.cpp
+++ b/src/engine/courses/TestCourse.cpp
@@ -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() {
diff --git a/src/engine/courses/WarioStadium.cpp b/src/engine/courses/WarioStadium.cpp
index d692c725a..8046e6325 100644
--- a/src/engine/courses/WarioStadium.cpp
+++ b/src/engine/courses/WarioStadium.cpp
@@ -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);
}
diff --git a/src/engine/courses/YoshiValley.cpp b/src/engine/courses/YoshiValley.cpp
index 9a64ccc86..71d782440 100644
--- a/src/engine/courses/YoshiValley.cpp
+++ b/src/engine/courses/YoshiValley.cpp
@@ -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);
}