Added a display for showing the total amount of evts currently active

Author: Zephiles

ttyd-tools/rel/include/codes.h

@@ -38,6 +38,7 @@ void displayBridgeSkipDetails();
 void displayBlimpTicketSkipDetails();
 void displayActionCommandsTiming();
 void displayEffsActive();
+void displayEvtsActive();
 
 int32_t warpToMap(uint32_t value);
 int32_t warpToMapByEvent(int32_t index);

ttyd-tools/rel/include/draw.h

@@ -125,6 +125,7 @@ void drawBridgeSkipDetails();
 void drawBlimpTicketSkipDetails();
 void drawActionCommandsTiming();
 void drawEffsActive();
+void drawEvtsActive();
 void drawSettingsCurrentWork();
 
 void drawHeapArrayErrors();

ttyd-tools/rel/include/global.h

@@ -350,6 +350,7 @@ enum DISPLAYS_OPTIONS
 	ART_ATTACK_HITBOXES,
 	MEMORY_USAGE,
 	EFFS_ACTIVE,
+	EVTS_ACTIVE,
 	YOSHI_SKIP,
 	PALACE_SKIP,
 	BRIDGE_SKIP,
@@ -921,7 +922,7 @@ struct NpcNameToPtrErrorStruct
 extern MenuVars MenuVar;
 extern Menus Menu[32];
 extern Cheats Cheat[25];
-extern bool Displays[16];
+extern bool Displays[17];
 extern char DisplayBuffer[256];
 extern MemoryWatchStruct MemoryWatch[60];
 

ttyd-tools/rel/source/codes.cpp

@@ -1537,6 +1537,16 @@ void displayEffsActive()
 	drawFunctionOnDebugLayerWithOrder(drawEffsActive, 1.f);
 }
 
+void displayEvtsActive()
+{
+	if (!Displays[EVTS_ACTIVE])
+	{
+		return;
+	}
+	
+	drawFunctionOnDebugLayerWithOrder(drawEvtsActive, 1.f);
+}
+
 int32_t warpToMap(uint32_t value)
 {
 	// Make sure the player is currently in the game

ttyd-tools/rel/source/draw.cpp

@@ -32,6 +32,7 @@
 #include <ttyd/itemdrv.h>
 #include <ttyd/battle_ac.h>
 #include <ttyd/effdrv.h>
+#include <ttyd/evtmgr.h>
 #include <ttyd/battle_unit.h>
 #include <ttyd/battle_disp.h>
 #include <ttyd/pmario_sound.h>
@@ -4660,6 +4661,39 @@ void drawEffsActive()
 	drawText(tempDisplayBuffer, PosX, PosY, Alpha, Color, Scale);
 }
 
+void drawEvtsActive()
+{
+	uint32_t Color 	= 0xFFFFFFFF;
+	uint8_t Alpha 	= 0xFF;
+	int32_t PosX 	= -232;
+	int32_t PosY 	= 40;
+	float Scale 	= 0.65;
+	
+	// Get the total amount of evts active
+	ttyd::evtmgr::EvtWork *EvtWrk = ttyd::evtmgr::evtGetWork();
+	int32_t MaxEntries = EvtWrk->entryCount;
+	int32_t CurrentCount = 0;
+	
+	ttyd::evtmgr::EvtEntry *EvtEntry = &EvtWrk->entries[0];
+	for (int32_t i = 0; i < MaxEntries; i++)
+	{
+		if (EvtEntry->flags & (1 << 0)) // Check if 0 bit is active
+		{
+			CurrentCount++;
+		}
+		EvtEntry++;
+	}
+	
+	// Draw the total amount of evts active out of the max
+	char *tempDisplayBuffer = DisplayBuffer;
+	sprintf(tempDisplayBuffer,
+		"Evts Active: %" PRId32 "/%" PRId32,
+		CurrentCount,
+		MaxEntries);
+	
+	drawText(tempDisplayBuffer, PosX, PosY, Alpha, Color, Scale);
+}
+
 void drawSettingsCurrentWork()
 {
 	const char *String;
@@ -4740,7 +4774,7 @@ void drawMemoryUsage()
 	uint32_t Color 	= 0xFFFFFFFF;
 	uint8_t Alpha 	= 0xFF;
 	int32_t PosX 	= -232;
-	int32_t PosY 	= 40;
+	int32_t PosY 	= 20;
 	float Scale 	= 0.6;
 
 	char **tempMemoryUsageBuffer = HeapInfo.MemoryUsageBuffer;

ttyd-tools/rel/source/global.cpp

@@ -3,7 +3,7 @@
 
 namespace mod {
 
-const char *VersionNumber = "v3.0.46";
+const char *VersionNumber = "v3.0.47d";
 
 const char *RootLines[] = 
 {
@@ -1520,6 +1520,7 @@ const char *DisplaysLines[] =
 	"Art Attack Hitboxes",
 	"Memory Usage",
 	"Effs Active",
+	"Evts Active",
 	"Yoshi Skip",
 	"Palace Skip",
 	"Bridge Skip",
@@ -1853,12 +1854,13 @@ uint8_t DisplaysOrder[] =
 	BRIDGE_SKIP,
 	EFFS_ACTIVE,
 	MEMORY_USAGE,
+	EVTS_ACTIVE,
 };
 
 struct MenuVars MenuVar;
 struct Menus Menu[32];
 struct Cheats Cheat[25];
-bool Displays[16];
+bool Displays[17];
 char DisplayBuffer[256];
 struct MemoryWatchStruct MemoryWatch[60];
 

ttyd-tools/rel/source/main.cpp

@@ -981,6 +981,7 @@ void Mod::run()
 		displaySequenceInPauseMenu();
 		displayActionCommandsTiming();
 		displayEffsActive();
+		displayEvtsActive();
 
 		// Check the heaps
 		checkHeaps();