diff --git a/include/sounds.h b/include/sounds.h index 2b3535f6f..e4524b538 100644 --- a/include/sounds.h +++ b/include/sounds.h @@ -120,8 +120,8 @@ enum MusicSeq { MUSIC_SEQ_00, MUSIC_SEQ_TITLE_SCREEN, MUSIC_SEQ_MAIN_MENU, - MUSIC_SEQ_RACEWAYS_WARIO_STADIUM, - MUSIC_SEQ_MOO_MOO_FARM_YOSHI_VALLEY, + MUSIC_SEQ_WARIO_STADIUM, + MUSIC_SEQ_MOO_MOO_FARM, MUSIC_SEQ_CHOCO_MOUNTAIN, MUSIC_SEQ_KOOPA_TROOPA_BEACH, MUSIC_SEQ_BANSHEE_BOARDWALK, @@ -147,6 +147,12 @@ enum MusicSeq { MUSIC_SEQ_AWARD_CEREMONY_1ST_3RD, MUSIC_SEQ_STAFF_ROLL, MUSIC_SEQ_AWARD_CEREMONY_4TH_8TH, + MUSIC_SEQ_LUIGI_RACEWAY, + MUSIC_SEQ_MARIO_RACEWAY, + MUSIC_SEQ_ROYAL_RACEWAY, + MUSIC_SEQ_YOSHI_VALLEY, + MUSIC_SEQ_BLOCK_FORT, + MUSIC_SEQ_DOUBLE_DECK, MUSIC_SEQ_MAX }; 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); } diff --git a/src/port/ui/TrackProperties.cpp b/src/port/ui/TrackProperties.cpp index fac44789b..6a30bed5f 100644 --- a/src/port/ui/TrackProperties.cpp +++ b/src/port/ui/TrackProperties.cpp @@ -169,12 +169,13 @@ namespace Editor { void TrackPropertiesWindow::DrawMusic() { const char* items[] = { - "None", "Title Screen", "Main Menu", "Raceways Wario Stadium", "Moo Moo Farm / Yoshi Valley", + "None", "Title Screen", "Main Menu", "Wario Stadium", "Moo Moo Farm", "Choco Mountain", "Koopa Troopa Beach", "Banshee Boardwalk", "Frappe Snowland", "Bowser's Castle", "Kalimari Desert", "Start Grid GP/VS", "Final Lap Fanfare", "Finish 1st Place", "Finish 2nd-4th Place", "Finish 5th-8th Place", "16", "Star Jingle", "Rainbow Road", "DK Jungle", "Game Over", "Toad's Turnpike", "Start Grid Time Attack", "VS Battle Results", "Losing Results", "Battle Arenas", "Award Ceremony Buildup", - "Award Ceremony 1st-3rd", "Staff Roll", "Award Ceremony 4th-8th" + "Award Ceremony 1st-3rd", "Staff Roll", "Award Ceremony 4th-8th", "Luigi Raceway", "Mario Raceway", + "Royal Raceway", "Yoshi Valley", "Block Fort", "Double Deck" }; const char* currentItem = MusicSeqToString(gWorldInstance.CurrentCourse->Props.Sequence); // Get the current selected value's string @@ -204,8 +205,8 @@ namespace Editor { case MUSIC_SEQ_00: return "None"; case MUSIC_SEQ_TITLE_SCREEN: return "Title Screen"; case MUSIC_SEQ_MAIN_MENU: return "Main Menu"; - case MUSIC_SEQ_RACEWAYS_WARIO_STADIUM: return "Raceways Wario Stadium"; - case MUSIC_SEQ_MOO_MOO_FARM_YOSHI_VALLEY: return "Moo Moo Farm / Yoshi Valley"; + case MUSIC_SEQ_WARIO_STADIUM: return "Wario Stadium"; + case MUSIC_SEQ_MOO_MOO_FARM: return "Moo Moo Farm"; case MUSIC_SEQ_CHOCO_MOUNTAIN: return "Choco Mountain"; case MUSIC_SEQ_KOOPA_TROOPA_BEACH: return "Koopa Troopa Beach"; case MUSIC_SEQ_BANSHEE_BOARDWALK: return "Banshee Boardwalk"; @@ -231,6 +232,12 @@ namespace Editor { case MUSIC_SEQ_AWARD_CEREMONY_1ST_3RD: return "Award Ceremony 1st-3rd"; case MUSIC_SEQ_STAFF_ROLL: return "Staff Roll"; case MUSIC_SEQ_AWARD_CEREMONY_4TH_8TH: return "Award Ceremony 4th-8th"; + case MUSIC_SEQ_LUIGI_RACEWAY: return "Luigi Raceway"; + case MUSIC_SEQ_MARIO_RACEWAY: return "Mario Raceway"; + case MUSIC_SEQ_ROYAL_RACEWAY: return "Royal Raceway"; + case MUSIC_SEQ_YOSHI_VALLEY: return "Yoshi Valley"; + case MUSIC_SEQ_BLOCK_FORT: return "Block Fort"; + case MUSIC_SEQ_DOUBLE_DECK: return "Double Deck"; default: return "None"; } } diff --git a/yamls/us/sound/banks.yml b/yamls/us/sound/banks.yml index a5e619d47..98af8e2a4 100644 --- a/yamls/us/sound/banks.yml +++ b/yamls/us/sound/banks.yml @@ -19,14 +19,38 @@ bank_3: type: NAUDIO:V0:BANK id: 3 +bank_30: + type: NAUDIO:V0:BANK + id: 30 + +bank_31: + type: NAUDIO:V0:BANK + id: 31 + +bank_32: + type: NAUDIO:V0:BANK + id: 32 + bank_4: type: NAUDIO:V0:BANK id: 4 +bank_33: + type: NAUDIO:V0:BANK + id: 33 + bank_5: type: NAUDIO:V0:BANK id: 5 +bank_34: + type: NAUDIO:V0:BANK + id: 34 + +bank_35: + type: NAUDIO:V0:BANK + id: 35 + bank_6: type: NAUDIO:V0:BANK id: 6 diff --git a/yamls/us/sound/sequences.yml b/yamls/us/sound/sequences.yml index f57a42051..09270037e 100644 --- a/yamls/us/sound/sequences.yml +++ b/yamls/us/sound/sequences.yml @@ -22,7 +22,7 @@ main_menu: banks: - sound/banks/bank_2 -raceways_wario_stadium: +wario_stadium: type: NAUDIO:V0:SEQUENCE id: 3 size: 0x1A10 @@ -30,7 +30,31 @@ raceways_wario_stadium: banks: - sound/banks/bank_3 -moo_moo_farm_yoshi_valley: +luigi_raceway: + type: NAUDIO:V0:SEQUENCE + id: 30 + size: 0x1A10 + offset: 0xBCB120 + banks: + - sound/banks/bank_30 + +mario_raceway: + type: NAUDIO:V0:SEQUENCE + id: 31 + size: 0x1A10 + offset: 0xBCB120 + banks: + - sound/banks/bank_31 + +royal_raceway: + type: NAUDIO:V0:SEQUENCE + id: 32 + size: 0x1A10 + offset: 0xBCB120 + banks: + - sound/banks/bank_32 + +moo_moo_farm: type: NAUDIO:V0:SEQUENCE id: 4 size: 0x1CA0 @@ -38,6 +62,14 @@ moo_moo_farm_yoshi_valley: banks: - sound/banks/bank_4 +yoshi_valley: + type: NAUDIO:V0:SEQUENCE + id: 33 + size: 0x1CA0 + offset: 0xBCCB30 + banks: + - sound/banks/bank_33 + choco_mountain: type: NAUDIO:V0:SEQUENCE id: 5 @@ -46,6 +78,22 @@ choco_mountain: banks: - sound/banks/bank_5 +block_fort: + type: NAUDIO:V0:SEQUENCE + id: 34 + size: 0x1F70 + offset: 0xBCE7D0 + banks: + - sound/banks/bank_34 + +double_deck: + type: NAUDIO:V0:SEQUENCE + id: 35 + size: 0x1F70 + offset: 0xBCE7D0 + banks: + - sound/banks/bank_35 + koopa_troopa_beach: type: NAUDIO:V0:SEQUENCE id: 6