rel: Change enumerations to be scoped

Author: PistonMiner

ttyd-tools/rel/include/ttyd/dispdrv.h

@@ -4,28 +4,28 @@
 
 namespace ttyd::dispdrv {
 
-enum DisplayLayer
+enum class DisplayLayer : uint8_t
 {
-	DisplayLayer_Off = 0,
-	DisplayLayer_Off2,
-	DisplayLayer_Shadow,
-	DisplayLayer_Bg,
-	DisplayLayer_3d,
-	DisplayLayer_3deff_A,
-	DisplayLayer_3dimg,
-	DisplayLayer_3deff_B,
-	DisplayLayer_2d,
-	DisplayLayer_Fade,
-	DisplayLayer_Fade2,
-	DisplayLayer_Dbg,
-	DisplayLayer_Dbg3d,
+	kOffscreen = 0,
+	kOffscreen2,
+	kShadow,
+	kBackground,
+	k3d,
+	k3dEffectA,
+	k3dImage,
+	k3dEffectB,
+	k2d,
+	kFade,
+	kFade2,
+	kDebug,
+	kDebug3d,
 };
 
-typedef void (*PFN_dispCallback)(uint8_t layerId, void *user);
+typedef void (*PFN_dispCallback)(DisplayLayer layerId, void *user);
 
 struct DisplayWork
 {
-	uint8_t layer;
+	DisplayLayer layer;
 	uint8_t renderMode;
 	uint16_t padding_2;
 	float unk_4;
@@ -37,9 +37,9 @@ extern "C" {
 
 void dispInit();
 void dispReInit();
-void dispEntry(uint8_t layerId, uint8_t renderMode, PFN_dispCallback callback, void *user);
+void dispEntry(DisplayLayer layerId, uint8_t renderMode, PFN_dispCallback callback, void *user);
 void dispSort();
-void dispDraw(uint8_t layerId);
+void dispDraw(DisplayLayer layerId);
 // float dispCalcZ(void *vecUnk);
 DisplayWork *dispGetCurWork();
 

ttyd-tools/rel/include/ttyd/seqdrv.h

@@ -4,12 +4,24 @@
 
 namespace ttyd::seqdrv {
 
+enum class SeqIndex : uint32_t
+{
+	kLogo = 0,
+	kTitle,
+	kGame,
+	kMapChange,
+	kBattle,
+	kGameOver,
+	kLoad,
+	kE3,
+};
+
 struct SeqInfo
 {
-	uint32_t seq;
+	SeqIndex seq;
 	uint32_t state;
-	const char *map;
-	const char *bero;
+	const char *mapName;
+	const char *beroName;
 	uint32_t counter;
 	uint32_t unk_14;
 	uint32_t unk_18;
@@ -20,7 +32,7 @@ extern "C" {
 
 void seqInit_MARIOSTORY();
 void seqMain();
-void seqSetSeq(uint32_t seq, const char *mapName, const char *beroName);
+void seqSetSeq(SeqIndex seq, const char *mapName, const char *beroName);
 uint32_t seqGetSeq();
 uint32_t seqGetPrevSeq();
 uint32_t seqGetNextSeq();

ttyd-tools/rel/source/mod.cpp

@@ -42,14 +42,14 @@ void Mod::init()
 	// Skip the logo
 	patch::hookFunction(ttyd::seq_logo::seq_logoMain, [](ttyd::seqdrv::SeqInfo *)
 	{
-		ttyd::seqdrv::seqSetSeq(1, nullptr, nullptr);
+		ttyd::seqdrv::seqSetSeq(ttyd::seqdrv::SeqIndex::kTitle, nullptr, nullptr);
 	});
 }
 
 void Mod::updateEarly()
 {
 	// Check for font load
-	ttyd::dispdrv::dispEntry(ttyd::dispdrv::DisplayLayer_Dbg3d, 0, [](uint8_t layerId, void *user)
+	ttyd::dispdrv::dispEntry(ttyd::dispdrv::DisplayLayer::kDebug3d, 0, [](ttyd::dispdrv::DisplayLayer layerId, void *user)
 	{
 		reinterpret_cast<Mod *>(user)->draw();
 	}, this);