rel: Revise dispdrv declarations

Author: PistonMiner

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

@@ -4,7 +4,8 @@
 
 namespace ttyd::dispdrv {
 
-enum class DisplayLayer : uint8_t
+// May want to move this enum class to camdrv.h at some point
+enum class CameraId : uint8_t
 {
 	kOffscreen = 0,
 	kOffscreen2,
@@ -21,14 +22,14 @@ enum class DisplayLayer : uint8_t
 	kDebug3d,
 };
 
-typedef void (*PFN_dispCallback)(DisplayLayer layerId, void *user);
+typedef void (*PFN_dispCallback)(CameraId cameraId, void *user);
 
 struct DisplayWork
 {
-	DisplayLayer layer;
+	CameraId cameraId;
 	uint8_t renderMode;
 	uint16_t padding_2;
-	float unk_4;
+	float order;
 	PFN_dispCallback callback;
 	void *user;
 } __attribute__((__packed__));
@@ -37,9 +38,9 @@ extern "C" {
 
 void dispInit();
 void dispReInit();
-void dispEntry(DisplayLayer layerId, uint8_t renderMode, PFN_dispCallback callback, void *user);
+void dispEntry(CameraId cameraId, uint8_t renderMode, float order, PFN_dispCallback callback, void *user);
 void dispSort();
-void dispDraw(DisplayLayer layerId);
+void dispDraw(CameraId cameraId);
 // float dispCalcZ(void *vecUnk);
 DisplayWork *dispGetCurWork();
 

ttyd-tools/rel/source/draw.cpp

@@ -45,17 +45,17 @@ bool disableDPadOptionsDisplay(uint16_t unkVar)
 
 void drawFunctionOnDebugLayer(void (*func)())
 {
-	ttyd::dispdrv::dispEntry(ttyd::dispdrv::DisplayLayer::kDebug3d, 0, 
-		[](ttyd::dispdrv::DisplayLayer layerId, void *user)
+	ttyd::dispdrv::dispEntry(ttyd::dispdrv::CameraId::kDebug3d, 2, 0.f, 
+		[](ttyd::dispdrv::CameraId cameraId, void *user)
 	{
 		reinterpret_cast<void (*)()>(user)();
 	}, reinterpret_cast<void *>(func));
 }
 
 void drawFunctionOn2DLayer(void (*func)())
 {
-	ttyd::dispdrv::dispEntry(ttyd::dispdrv::DisplayLayer::k2d, 0, 
-		[](ttyd::dispdrv::DisplayLayer layerId, void *user)
+	ttyd::dispdrv::dispEntry(ttyd::dispdrv::CameraId::k2d, 2, 0.f, 
+		[](ttyd::dispdrv::CameraId cameraId, void *user)
 	{
 		reinterpret_cast<void (*)()>(user)();
 	}, reinterpret_cast<void *>(func));