mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-08-30 17:59:53 -04:00
Documented sequences and move them into the Course system
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
#include "objects.h"
|
||||
#include "path_spawn_metadata.h"
|
||||
#include "waypoints.h"
|
||||
#include "sounds.h"
|
||||
|
||||
typedef struct {
|
||||
RGB8 TopRight;
|
||||
@@ -44,6 +45,7 @@ typedef struct {
|
||||
s32 MinimapFinishlineX;
|
||||
s32 MinimapFinishlineY;
|
||||
SkyboxColours Skybox;
|
||||
enum MusicSeq Sequence;
|
||||
} CProperties;
|
||||
|
||||
#endif // __ENGINE_H__
|
||||
@@ -66,6 +66,7 @@ class World {
|
||||
int32_t MinimapFinishlineX;
|
||||
int32_t MinimapFinishlineY;
|
||||
SkyboxColours Skybox;
|
||||
MusicSeq Sequence;
|
||||
} Properties;
|
||||
|
||||
typedef struct {
|
||||
|
||||
@@ -101,6 +101,7 @@ BansheeBoardwalk::BansheeBoardwalk() {
|
||||
Props.Skybox.FloorBottomRight = {0, 0, 0};
|
||||
Props.Skybox.FloorBottomLeft = {0, 0, 0};
|
||||
Props.Skybox.FloorTopLeft = {0, 0, 0};
|
||||
Props.Sequence = MusicSeq::MUSIC_SEQ_BANSHEE_BOARDWALK;
|
||||
}
|
||||
|
||||
void BansheeBoardwalk::Load() {
|
||||
|
||||
@@ -96,6 +96,7 @@ BigDonut::BigDonut() {
|
||||
Props.Skybox.FloorBottomRight = {0, 0, 0};
|
||||
Props.Skybox.FloorBottomLeft = {0, 0, 0};
|
||||
Props.Skybox.FloorTopLeft = {0, 0, 0};
|
||||
Props.Sequence = MusicSeq::MUSIC_SEQ_BATTLE_ARENAS;
|
||||
}
|
||||
|
||||
void BigDonut::Load() {
|
||||
|
||||
@@ -99,6 +99,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;
|
||||
}
|
||||
|
||||
void BlockFort::Load() {
|
||||
|
||||
@@ -101,6 +101,7 @@ BowsersCastle::BowsersCastle() {
|
||||
Props.Skybox.FloorBottomRight = {0, 0, 0};
|
||||
Props.Skybox.FloorBottomLeft = {0, 0, 0};
|
||||
Props.Skybox.FloorTopLeft = {0, 0, 0};
|
||||
Props.Sequence = MusicSeq::MUSIC_SEQ_BOWSERS_CASTLE;
|
||||
}
|
||||
|
||||
void BowsersCastle::Load() {
|
||||
|
||||
@@ -101,6 +101,7 @@ ChocoMountain::ChocoMountain() {
|
||||
Props.Skybox.FloorBottomRight = {255, 255, 255};
|
||||
Props.Skybox.FloorBottomLeft = {255, 255, 255};
|
||||
Props.Skybox.FloorTopLeft = {255, 255, 255};
|
||||
Props.Sequence = MusicSeq::MUSIC_SEQ_CHOCO_MOUNTAIN;
|
||||
}
|
||||
|
||||
void ChocoMountain::Load() {
|
||||
|
||||
@@ -73,6 +73,7 @@ Course::Course() {
|
||||
Props.CloudList = NULL;
|
||||
Props.MinimapFinishlineX = 0;
|
||||
Props.MinimapFinishlineY = 0;
|
||||
Props.Sequence = MusicSeq::MUSIC_SEQ_UNKNOWN;
|
||||
}
|
||||
|
||||
void Course::Load(Vtx* vtx, Gfx* gfx) {
|
||||
|
||||
@@ -75,6 +75,7 @@ public:
|
||||
int32_t MinimapFinishlineX;
|
||||
int32_t MinimapFinishlineY;
|
||||
SkyboxColours Skybox;
|
||||
MusicSeq Sequence;
|
||||
} Properties;
|
||||
|
||||
Properties Props;
|
||||
|
||||
@@ -104,6 +104,7 @@ DKJungle::DKJungle() {
|
||||
Props.Skybox.FloorBottomRight = {0, 0, 0};
|
||||
Props.Skybox.FloorBottomLeft = {0, 0, 0};
|
||||
Props.Skybox.FloorTopLeft = {22, 145, 22};
|
||||
Props.Sequence = MusicSeq::MUSIC_SEQ_DK_JUNGLE;
|
||||
}
|
||||
|
||||
void DKJungle::Load() {
|
||||
|
||||
@@ -99,6 +99,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;
|
||||
}
|
||||
|
||||
void DoubleDeck::Load() {
|
||||
|
||||
@@ -102,6 +102,7 @@ FrappeSnowland::FrappeSnowland() {
|
||||
Props.Skybox.FloorBottomRight = {0, 0, 0};
|
||||
Props.Skybox.FloorBottomLeft = {0, 0, 0};
|
||||
Props.Skybox.FloorTopLeft = {0, 99, 164};
|
||||
Props.Sequence = MusicSeq::MUSIC_SEQ_FRAPPE_SNOWLAND;
|
||||
}
|
||||
|
||||
void FrappeSnowland::Load() {
|
||||
|
||||
@@ -102,6 +102,7 @@ KalimariDesert::KalimariDesert() {
|
||||
Props.Skybox.FloorBottomRight = {0, 0, 0};
|
||||
Props.Skybox.FloorBottomLeft = {0, 0, 0};
|
||||
Props.Skybox.FloorTopLeft = {255, 192, 0};
|
||||
Props.Sequence = MusicSeq::MUSIC_SEQ_KALIMARI_DESERT;
|
||||
}
|
||||
|
||||
void KalimariDesert::Load() {
|
||||
|
||||
@@ -102,6 +102,7 @@ KoopaTroopaBeach::KoopaTroopaBeach() {
|
||||
Props.Skybox.FloorBottomRight = {0, 0, 0};
|
||||
Props.Skybox.FloorBottomLeft = {0, 0, 0};
|
||||
Props.Skybox.FloorTopLeft = {48, 152, 120};
|
||||
Props.Sequence = MusicSeq::MUSIC_SEQ_KOOPA_TROOPA_BEACH;
|
||||
}
|
||||
|
||||
void KoopaTroopaBeach::Load() {
|
||||
|
||||
@@ -105,6 +105,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;
|
||||
}
|
||||
|
||||
void LuigiRaceway::Load() {
|
||||
|
||||
@@ -102,6 +102,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;
|
||||
}
|
||||
|
||||
void MarioRaceway::Load() {
|
||||
|
||||
@@ -102,6 +102,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;
|
||||
}
|
||||
|
||||
void MooMooFarm::Load() {
|
||||
|
||||
@@ -96,6 +96,7 @@ PodiumCeremony::PodiumCeremony() {
|
||||
Props.Skybox.FloorBottomRight = {0, 0, 0};
|
||||
Props.Skybox.FloorBottomLeft = {0, 0, 0};
|
||||
Props.Skybox.FloorTopLeft = {255, 224, 240};
|
||||
Props.Sequence = MusicSeq::MUSIC_SEQ_UNKNOWN;
|
||||
}
|
||||
|
||||
void PodiumCeremony::Load() {
|
||||
|
||||
@@ -99,6 +99,7 @@ RainbowRoad::RainbowRoad() {
|
||||
Props.Skybox.FloorBottomRight = {0, 0, 0};
|
||||
Props.Skybox.FloorBottomLeft = {0, 0, 0};
|
||||
Props.Skybox.FloorTopLeft = {0, 0, 0};
|
||||
Props.Sequence = MusicSeq::MUSIC_SEQ_RAINBOW_ROAD;
|
||||
}
|
||||
|
||||
void RainbowRoad::Load() {
|
||||
|
||||
@@ -100,6 +100,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;
|
||||
}
|
||||
|
||||
void RoyalRaceway::Load() {
|
||||
|
||||
@@ -100,6 +100,7 @@ SherbetLand::SherbetLand() {
|
||||
Props.Skybox.FloorBottomRight = {128, 184, 248};
|
||||
Props.Skybox.FloorBottomLeft = {128, 184, 248};
|
||||
Props.Skybox.FloorTopLeft = {216, 232, 248};
|
||||
Props.Sequence = MusicSeq::MUSIC_SEQ_FRAPPE_SNOWLAND;
|
||||
}
|
||||
|
||||
void SherbetLand::Load() {
|
||||
|
||||
@@ -99,6 +99,7 @@ Skyscraper::Skyscraper() {
|
||||
Props.Skybox.FloorBottomRight = {0, 0, 0};
|
||||
Props.Skybox.FloorBottomLeft = {0, 0, 0};
|
||||
Props.Skybox.FloorTopLeft = {0, 0, 0};
|
||||
Props.Sequence = MusicSeq::MUSIC_SEQ_BATTLE_ARENAS;
|
||||
}
|
||||
|
||||
void Skyscraper::Load() {
|
||||
|
||||
@@ -112,6 +112,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;
|
||||
}
|
||||
|
||||
void TestCourse::Load() {
|
||||
|
||||
@@ -104,6 +104,7 @@ ToadsTurnpike::ToadsTurnpike() {
|
||||
Props.Skybox.FloorBottomRight = {0, 0, 0};
|
||||
Props.Skybox.FloorBottomLeft = {0, 0, 0};
|
||||
Props.Skybox.FloorTopLeft = {209, 65, 23};
|
||||
Props.Sequence = MusicSeq::MUSIC_SEQ_TOADS_TURNPIKE;
|
||||
}
|
||||
|
||||
void ToadsTurnpike::Load() {
|
||||
|
||||
@@ -103,6 +103,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;
|
||||
}
|
||||
|
||||
void WarioStadium::Load() {
|
||||
|
||||
@@ -100,6 +100,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;
|
||||
}
|
||||
|
||||
void YoshiValley::Load() {
|
||||
|
||||
Reference in New Issue
Block a user