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

Zephiles · Zephiles · commit cd7f843ffbf8 · 2020-03-01T10:47:56.000-06:00
diff --git a/ttyd-tools/rel/include/codes.h b/ttyd-tools/rel/include/codes.h
@@ -37,6 +37,7 @@ void displayPalaceSkipDetails();
 void displayBridgeSkipDetails();
 void displayBlimpTicketSkipDetails();
 void displayActionCommandsTiming();
+void displayEffsActive();
 
 int32_t warpToMap(uint32_t value);
 int32_t warpToMapByEvent(int32_t index);
diff --git a/ttyd-tools/rel/include/draw.h b/ttyd-tools/rel/include/draw.h
@@ -122,6 +122,7 @@ void drawPalaceSkipDetails();
 void drawBridgeSkipDetails();
 void drawBlimpTicketSkipDetails();
 void drawActionCommandsTiming();
+void drawEffsActive();
 void drawSettingsCurrentWork();
 
 void drawHeapArrayErrors();
diff --git a/ttyd-tools/rel/include/global.h b/ttyd-tools/rel/include/global.h
@@ -346,6 +346,7 @@ enum DISPLAYS_OPTIONS
 	DPAD_OPTIONS_DISPLAY,
 	GUARD_SUPERGUARD_TIMINGS,
 	ART_ATTACK_HITBOXES,
+	EFFS_ACTIVE,
 	YOSHI_SKIP,
 	PALACE_SKIP,
 	BRIDGE_SKIP,
@@ -864,7 +865,7 @@ struct NpcNameToPtrErrorStruct
 extern MenuVars MenuVar;
 extern Menus Menu[31];
 extern Cheats Cheat[25];
-extern bool Displays[14];
+extern bool Displays[15];
 extern char DisplayBuffer[256];
 extern char HeapBuffer[512];
 extern MemoryWatchStruct MemoryWatch[60];
diff --git a/ttyd-tools/rel/include/ttyd.eu.lst b/ttyd-tools/rel/include/ttyd.eu.lst
@@ -722,6 +722,29 @@
 8005E1E8:marioGetColor
 8005E1F8:marioGetPtr
 
+// effdrv.o
+// text
+// 8005E200:effDrawMayaPoly
+// 8005E3C0:effCalcMayaAnim
+// 8005E514:effPlayMayaAnim
+// 8005E5A0:effDeleteMayaAnim
+// 8005E5C8:effMayaAnimAlloc
+// 8005E62C:effCalcMayaAnimMatrix
+// 8005E9D8:effGetSet
+// 8005EA60:effNameToPtr
+// 8005EAF8:effSoftDelete
+// 8005EB68:effDelete
+// 8005EBB4:effMain
+// 8005ED24:effSetName
+// 8005EDA0:effEntry
+// 8005EE08:effAutoRelease
+// 8005EE90:effGetTexObj
+// 8005EF44:effTexSetup
+// 8005F058:effInit
+// 8005F0E0:_callback_tpl
+// data
+80422720:effWorkPointer
+
 // mariost.o
 // text
 // unused:gcResetDone
diff --git a/ttyd-tools/rel/include/ttyd.jp.lst b/ttyd-tools/rel/include/ttyd.jp.lst
@@ -719,6 +719,29 @@
 8005D204:marioGetColor
 8005D214:marioGetPtr
 
+// effdrv.o
+// text
+// 8005D21C:effDrawMayaPoly
+// 8005D3DC:effCalcMayaAnim
+// 8005D530:effPlayMayaAnim
+// 8005D5BC:effDeleteMayaAnim
+// 8005D5E4:effMayaAnimAlloc
+// 8005D648:effCalcMayaAnimMatrix
+// 8005D9F4:effGetSet
+// 8005DA7C:effNameToPtr
+// 8005DB14:effSoftDelete
+// 8005DB84:effDelete
+// 8005DBD0:effMain
+// 8005DD40:effSetName
+// 8005DDBC:effEntry
+// 8005DE24:effAutoRelease
+// 8005DEAC:effGetTexObj
+// 8005DF60:effTexSetup
+// 8005E058:effInit
+// 8005E0E0:_callback_tpl
+// data
+80410220:effWorkPointer
+
 // mariost.o
 // text
 // unused:gcResetDone
diff --git a/ttyd-tools/rel/include/ttyd.us.lst b/ttyd-tools/rel/include/ttyd.us.lst
@@ -721,6 +721,29 @@
 8005E0B0:marioGetColor
 8005E0C0:marioGetPtr
 
+// effdrv.o
+// text
+// 8005E0C8:effDrawMayaPoly
+// 8005E288:effCalcMayaAnim
+// 8005E3DC:effPlayMayaAnim
+// 8005E468:effDeleteMayaAnim
+// 8005E490:effMayaAnimAlloc
+// 8005E4F4:effCalcMayaAnimMatrix
+// 8005E8A0:effGetSet
+// 8005E928:effNameToPtr
+// 8005E9C0:effSoftDelete
+// 8005EA30:effDelete
+// 8005EA7C:effMain
+// 8005EBEC:effSetName
+// 8005EC68:effEntry
+// 8005ECD0:effAutoRelease
+// 8005ED58:effGetTexObj
+// 8005EE0C:effTexSetup
+// 8005EF20:effInit
+// 8005EFA8:_callback_tpl
+// data
+80415EE0:effWorkPointer
+
 // mariost.o
 // text
 // unused:gcResetDone
diff --git a/ttyd-tools/rel/include/ttyd/effdrv.h b/ttyd-tools/rel/include/ttyd/effdrv.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include <cstdint>
+
+namespace ttyd::effdrv {
+
+struct EffEntry
+{
+	uint32_t wFlags;
+	uint32_t wbBattle;
+	uint32_t field_8;
+	void *pEffAllocation;
+	void *pfnMainFunc;
+	char *typeName;
+	char wName[16];
+} __attribute__((__packed__));
+
+static_assert(sizeof(EffEntry) == 0x28);
+
+struct EffWork
+{
+	uint32_t effCount;
+	EffEntry *entries;
+	uint8_t unk_8[16];
+} __attribute__((__packed__));
+
+static_assert(sizeof(EffWork) == 0x18);
+
+extern "C" {
+
+// effDrawMayaPoly
+// effCalcMayaAnim
+// effPlayMayaAnim
+// effDeleteMayaAnim
+// effMayaAnimAlloc
+// effCalcMayaAnimMatrix
+// effGetSet
+// effNameToPtr
+// effSoftDelete
+// effDelete
+// effMain
+// effSetName
+// effEntry
+// effAutoRelease
+// effGetTexObj
+// effTexSetup
+// effInit
+// _callback_tpl
+
+extern EffWork *effWorkPointer;
+
+}
+
+}
diff --git a/ttyd-tools/rel/source/codes.cpp b/ttyd-tools/rel/source/codes.cpp
@@ -1528,6 +1528,16 @@ void displayActionCommandsTiming()
 	}
 }
 
+void displayEffsActive()
+{
+	if (!Displays[EFFS_ACTIVE])
+	{
+		return;
+	}
+	
+	drawFunctionOnDebugLayerWithOrder(drawEffsActive, 1.f);
+}
+
 int32_t warpToMap(uint32_t value)
 {
 	// Make sure the player is currently in the game
diff --git a/ttyd-tools/rel/source/draw.cpp b/ttyd-tools/rel/source/draw.cpp
@@ -30,6 +30,7 @@
 #include <ttyd/npcdrv.h>
 #include <ttyd/itemdrv.h>
 #include <ttyd/battle_ac.h>
+#include <ttyd/effdrv.h>
 #include <ttyd/battle_unit.h>
 #include <ttyd/battle_disp.h>
 #include <ttyd/pmario_sound.h>
@@ -4553,6 +4554,37 @@ void drawActionCommandsTiming()
 	DisplayActionCommands.DisplayTimer--;
 }
 
+void drawEffsActive()
+{
+	uint32_t Color 				= 0xFFFFFFFF;
+	uint8_t Alpha 				= 0xFF;
+	int32_t PosX 				= -232;
+	int32_t PosY 				= 60;
+	float Scale 				= 0.75;
+	
+	// Get the total amount of effs active
+	ttyd::effdrv::EffWork *EffWrk = ttyd::effdrv::effWorkPointer;
+	uint32_t MaxCount = EffWrk->effCount;
+	uint32_t CurrentCount = 0;
+	
+	for (uint32_t i = 0; i < MaxCount; i++)
+	{
+		if (EffWrk->entries[i].wFlags)
+		{
+			CurrentCount++;
+		}
+	}
+	
+	// Draw the total amount of effs active out of the max
+	char *tempDisplayBuffer = DisplayBuffer;
+	sprintf(tempDisplayBuffer,
+		"Effs Active: %" PRIu32 "/%" PRIu32,
+		CurrentCount,
+		MaxCount);
+	
+	drawText(tempDisplayBuffer, PosX, PosY, Alpha, Color, Scale);
+}
+
 void drawSettingsCurrentWork()
 {
 	const char *String;
diff --git a/ttyd-tools/rel/source/global.cpp b/ttyd-tools/rel/source/global.cpp
@@ -1518,6 +1518,7 @@ const char *DisplaysLines[] =
 	"D-Pad Options",
 	"Guard/Superguard Timings",
 	"Art Attack Hitboxes",
+	"Effs Active",
 	"Yoshi Skip",
 	"Palace Skip",
 	"Bridge Skip",
@@ -1849,12 +1850,13 @@ uint8_t DisplaysOrder[] =
 	BLIMP_TICKET_SKIP,
 	ONSCREEN_TIMER_FRAME_COUNTER,
 	BRIDGE_SKIP,
+	EFFS_ACTIVE,
 };
 
 struct MenuVars MenuVar;
 struct Menus Menu[31];
 struct Cheats Cheat[25];
-bool Displays[14];
+bool Displays[15];
 char DisplayBuffer[256];
 char HeapBuffer[512];
 struct MemoryWatchStruct MemoryWatch[60];
diff --git a/ttyd-tools/rel/source/main.cpp b/ttyd-tools/rel/source/main.cpp
@@ -865,6 +865,7 @@ void Mod::run()
 		spawnItem(); // Needs to always run due to the adjustable value menu sometimes being displayed
 		displaySequenceInPauseMenu();
 		displayActionCommandsTiming();
+		displayEffsActive();
 		
 		// Check the heaps
 		checkHeaps();

Original file line number	Diff line number	Diff line change
`@@ -1528,6 +1528,16 @@ void displayActionCommandsTiming()`
`1528`	`1528`	`}`
`1529`	`1529`	`}`
`1530`	`1530`
	`1531`	`+void displayEffsActive()`
	`1532`	`+{`
	`1533`	`+ if (!Displays[EFFS_ACTIVE])`
	`1534`	`+ {`
	`1535`	`+ return;`
	`1536`	`+ }`
	`1537`	`+`
	`1538`	`+ drawFunctionOnDebugLayerWithOrder(drawEffsActive, 1.f);`
	`1539`	`+}`
	`1540`	`+`
`1531`	`1541`	`int32_t warpToMap(uint32_t value)`
`1532`	`1542`	`{`
`1533`	`1543`	`// Make sure the player is currently in the game`