Removed typedefs from structs and applied static_asserts for struct sizes from the game

Author: Zephiles

ttyd-tools/rel/include/gc/OSAlloc.h

@@ -18,6 +18,9 @@ struct HeapInfo
 	ChunkInfo *firstUsed;
 } __attribute__((__packed__));
 
+static_assert(sizeof(ChunkInfo) == 0xC);
+static_assert(sizeof(HeapInfo) == 0xC);
+
 extern "C" {
 
 // DLInsert

ttyd-tools/rel/include/gc/OSModule.h

@@ -16,6 +16,8 @@ struct OSModuleInfo
 	uint32_t version;
 } __attribute__((__packed__));
 
+static_assert(sizeof(OSModuleInfo) == 0x20);
+
 extern "C" {
 
 // OSNotifyLink

ttyd-tools/rel/include/gc/card.h

@@ -28,16 +28,16 @@ namespace gc::card {
 #define CARD_RESULT_CANCELED 		-14		// Card operation canceled
 #define CARD_RESULT_FATAL_ERROR 	-128	// Fatal error, non-recoverable
 
-typedef struct CARDFileInfo {
+struct CARDFileInfo {
 	int32_t 	channel;
 	int32_t 	fileNum;
 	int32_t 	offset;
 	int32_t 	length;
 	uint16_t 	iBlock;
 	uint16_t 	padding;
-} __attribute__((__packed__)) CARDFileInfo;
+} __attribute__((__packed__));
 
-typedef struct CARDStat {
+struct CARDStat {
 	char 		fileName[CARD_FILENAME_MAX];
 	uint32_t	length;
 	uint32_t	time;
@@ -54,10 +54,13 @@ typedef struct CARDStat {
 	uint32_t 	offsetIcon[CARD_MAX_ICONS];
 	uint32_t 	offsetIconTlut;
 	uint32_t 	offsetData;
-} __attribute__((__packed__)) CARDStat;
+} __attribute__((__packed__));
 
 typedef void (*CARDCallback)(int32_t channel, int32_t result);
 
+static_assert(sizeof(CARDFileInfo) == 0x14);
+static_assert(sizeof(CARDStat) == 0x6C);
+
 extern "C" {
 
 int32_t CARDGetResultCode(int32_t channel);

ttyd-tools/rel/include/gc/ppc.h

@@ -4,7 +4,7 @@
 
 namespace gc::ppc {
 
-typedef union WriteGatherPipe
+union WriteGatherPipe
 {
 	int8_t 		s8;
 	int16_t 	s16;
@@ -16,7 +16,7 @@ typedef union WriteGatherPipe
 	uint64_t 	u64;
 	float 		f32;
 	double 		f64;
-} WriteGatherPipe;
+};
 
 extern "C" {
 

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

@@ -143,6 +143,8 @@ struct AttackParams
 	uint8_t unk_0xbf;
 } __attribute__((__packed__));
 
+static_assert(sizeof(AttackParams) == 0xC0);
+
 extern "C" {
 
 // BtlUnit_CheckShadowGuard

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

@@ -10,6 +10,8 @@ struct DatabaseDefinition
 	int32_t id;
 } __attribute__((__packed__));
 
+static_assert(sizeof(DatabaseDefinition) == 0x8);
+
 extern "C" {
 
 void setupDataLoad(const char *mapName);

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

@@ -34,6 +34,8 @@ struct DisplayWork
 	void *user;
 } __attribute__((__packed__));
 
+static_assert(sizeof(DisplayWork) == 0x10);
+
 extern "C" {
 
 void dispInit();

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

@@ -33,6 +33,14 @@ struct EventStageDescription
 	int32_t eventCount;
 } __attribute__((__packed__));
 
+#ifdef TTYD_JP
+static_assert(sizeof(EventStageEventDescription) == 0x1C);
+static_assert(sizeof(EventStageDescription) == 0xC);
+#else
+static_assert(sizeof(EventStageEventDescription) == 0x20);
+static_assert(sizeof(EventStageDescription) == 0x10);
+#endif
+
 extern "C" {
 
 int32_t eventStgNum();

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

@@ -85,7 +85,7 @@ EVT_DECLARE_USER_FUNC(evt_map_get_flush_color, 5)
 EVT_DECLARE_USER_FUNC(check, 1)
 
 // check2(int &is_not_riding)
-// Checks if the player is not riding the mapobj with the nammed passed in LW(1).
+// Checks if the player is not riding the mapobj with the name passed in LW(1).
 EVT_DECLARE_USER_FUNC(check2, 1)
 
 // evt_map_entry_airport_harbor(int mode, char *mapobj_name, int w_unknown)

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

@@ -66,8 +66,6 @@ struct EvtEntry
 	int32_t unk_1ac;
 } __attribute__((__packed__));
 
-static_assert(sizeof(EvtEntry) == 0x1B0);
-
 struct EvtWork
 {
 	int32_t entryCount;
@@ -78,6 +76,7 @@ struct EvtWork
 	int64_t currentEvtTime;
 } __attribute__((__packed__));
 
+static_assert(sizeof(EvtEntry) == 0x1B0);
 static_assert(sizeof(EvtWork) == 0xA0);
 
 extern "C" {