From 8427e0776ccd70596b471fb7627ed6d986eab387 Mon Sep 17 00:00:00 2001 From: luigoalma Date: Thu, 22 Apr 2021 01:33:11 +0100 Subject: [PATCH] Adjusting ticket.h Just because there's a more neat to look at definition on types.h for packed and aligned --- arm9/source/game/ticket.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arm9/source/game/ticket.h b/arm9/source/game/ticket.h index 34a4b01..956023d 100644 --- a/arm9/source/game/ticket.h +++ b/arm9/source/game/ticket.h @@ -50,18 +50,18 @@ typedef struct { TICKETBASE; u8 content_index[]; -} __attribute__((packed, aligned(4))) Ticket; +} PACKED_STRUCT Ticket; typedef struct { TICKETBASE; u8 content_index[0xAC]; -} __attribute__((packed, aligned(4))) TicketCommon; +} PACKED_STRUCT TicketCommon; // minimum allowed content_index is 0x14 typedef struct { TICKETBASE; u8 content_index[0x14]; -} __attribute__((packed, aligned(4))) TicketMinimum; +} PACKED_STRUCT TicketMinimum; typedef struct { u8 unk1[2]; @@ -71,7 +71,7 @@ typedef struct { u8 unk3[2]; u8 unk4[2]; u8 unk5[4]; -} __attribute__((packed)) TicketContentIndexMainHeader; +} PACKED_ALIGN(1) TicketContentIndexMainHeader; typedef struct { u8 data_relative_offset[4]; // relative to content index start @@ -80,14 +80,14 @@ typedef struct { u8 total_size_used[4]; // also no effect u8 data_type[2]; // perhaps, does have effect and change with different data like on 0004000D tickets u8 unknown[2]; // or padding -} __attribute__((packed)) TicketContentIndexDataHeader; +} PACKED_ALIGN(1) TicketContentIndexDataHeader; // data type == 3 typedef struct { u8 unk[2]; // seemly has no meaning u8 indexoffset[2]; u8 rightsbitfield[0x80]; -} __attribute__((packed)) TicketRightsField; +} PACKED_ALIGN(1) TicketRightsField; typedef struct { size_t count;