Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 13:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some tab/space indent mixing

Browse Source 
shame on you, @d0k3 /s
This commit is contained in:
aspargas2 2020-07-30 16:10:59 -04:00 committed by d0k3
parent 89c5107733
commit e7fdf993a7
2 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arm9/source/game/cmd.h
View File

@ -3,21 +3,21 @@
#include "common.h" #include "common.h"
#include "tmd.h" #include "tmd.h"
#define CMD_SIZE(cmd) (sizeof(CmdHeader) + \ #define CMD_SIZE(cmd) (sizeof(CmdHeader) + \
(((cmd)->n_entries) * sizeof(u32)) + \ (((cmd)->n_entries) * sizeof(u32)) + \
(((cmd)->n_cmacs) * sizeof(u32)) + \ (((cmd)->n_cmacs) * sizeof(u32)) + \
(((cmd)->unknown) ? (((cmd)->n_entries) * 0x10) : 0)) (((cmd)->unknown) ? (((cmd)->n_entries) * 0x10) : 0))
// from: http://3dbrew.org/wiki/Titles#Data_Structure // from: http://3dbrew.org/wiki/Titles#Data_Structure
typedef struct { typedef struct {
u32 cmd_id; // same as filename id, <cmd_id>.cmd u32 cmd_id; // same as filename id, <cmd_id>.cmd
u32 n_entries; // matches highest content index u32 n_entries; // matches highest content index
u32 n_cmacs; // number of cmacs in file (excluding the one @0x10) u32 n_cmacs; // number of cmacs in file (excluding the one @0x10)
u32 unknown; // usually 1 u32 unknown; // usually 1
u8 cmac[0x10]; // calculated from first 0x10 byte of data, no hashing u8 cmac[0x10]; // calculated from first 0x10 byte of data, no hashing
// followed by u32 list of content ids (sorted by index, 0xFFFFFFFF for unavailable) // followed by u32 list of content ids (sorted by index, 0xFFFFFFFF for unavailable)
// followed by u32 list of content ids (sorted by id?) // followed by u32 list of content ids (sorted by id?)
// followed by <n_entries> CMACs (may contain garbage) // followed by <n_entries> CMACs (may contain garbage)
} __attribute__((packed, aligned(4))) CmdHeader; } __attribute__((packed, aligned(4))) CmdHeader;
CmdHeader* BuildAllocCmdData(TitleMetaData* tmd); CmdHeader* BuildAllocCmdData(TitleMetaData* tmd);

124
arm9/source/game/tie.c
View File

@ -5,88 +5,88 @@
u32 BuildTitleInfoEntryTmd(TitleInfoEntry* tie, TitleMetaData* tmd, bool sd) { u32 BuildTitleInfoEntryTmd(TitleInfoEntry* tie, TitleMetaData* tmd, bool sd) {
u64 title_id = getbe64(tmd->title_id); u64 title_id = getbe64(tmd->title_id);
u32 has_id1 = false; u32 has_id1 = false;
// set basic values // set basic values
memset(tie, 0x00, sizeof(TitleInfoEntry)); memset(tie, 0x00, sizeof(TitleInfoEntry));
tie->title_type = 0x40; tie->title_type = 0x40;
// title version, product code, cmd id // title version, product code, cmd id
tie->title_version = getbe16(tmd->title_version); tie->title_version = getbe16(tmd->title_version);
tie->cmd_content_id = 0x01; tie->cmd_content_id = 0x01;
memcpy(tie->unknown, "GM9", 4); // GM9 install magic number memcpy(tie->unknown, "GM9", 4); // GM9 install magic number
// calculate base title size // calculate base title size
// align size: 0x4000 for TWL and CTRNAND, 0x8000 for SD // align size: 0x4000 for TWL and CTRNAND, 0x8000 for SD
u32 align_size = CMD_SIZE_ALIGN(sd); u32 align_size = CMD_SIZE_ALIGN(sd);
u32 content_count = getbe16(tmd->content_count); u32 content_count = getbe16(tmd->content_count);
TmdContentChunk* chunk = (TmdContentChunk*) (tmd + 1); TmdContentChunk* chunk = (TmdContentChunk*) (tmd + 1);
tie->title_size = tie->title_size =
(align_size * 3) + // base folder + 'content' + 'cmd' (align_size * 3) + // base folder + 'content' + 'cmd'
align(TMD_SIZE_N(content_count), align_size) + // TMD align(TMD_SIZE_N(content_count), align_size) + // TMD
align_size; // CMD, placeholder align_size; // CMD, placeholder
for (u32 i = 0; (i < content_count) && (i < TMD_MAX_CONTENTS); i++, chunk++) { for (u32 i = 0; (i < content_count) && (i < TMD_MAX_CONTENTS); i++, chunk++) {
if (getbe32(chunk->id) == 1) has_id1 = true; // will be useful later if (getbe32(chunk->id) == 1) has_id1 = true; // will be useful later
tie->title_size += align(getbe64(chunk->size), align_size); tie->title_size += align(getbe64(chunk->size), align_size);
} }
// manual? (we need to properly check this later) // manual? (we need to properly check this later)
if (has_id1 && (((title_id >> 32) == 0x00040000) || ((title_id >> 32) == 0x00040010))) { if (has_id1 && (((title_id >> 32) == 0x00040000) || ((title_id >> 32) == 0x00040010))) {
tie->flags_0[0] = 0x1; // this may have a manual tie->flags_0[0] = 0x1; // this may have a manual
} }
return 0; return 0;
} }
u32 BuildTitleInfoEntryTwl(TitleInfoEntry* tie, TitleMetaData* tmd, TwlHeader* twl) { u32 BuildTitleInfoEntryTwl(TitleInfoEntry* tie, TitleMetaData* tmd, TwlHeader* twl) {
u64 title_id = getbe64(tmd->title_id); u64 title_id = getbe64(tmd->title_id);
if (ValidateTwlHeader(twl) != 0) return 1; if (ValidateTwlHeader(twl) != 0) return 1;
if (BuildTitleInfoEntryTmd(tie, tmd, false) != 0) return 1; if (BuildTitleInfoEntryTmd(tie, tmd, false) != 0) return 1;
// product code // product code
memcpy(tie->product_code, twl->game_title, 12); memcpy(tie->product_code, twl->game_title, 12);
// specific flags // specific flags
// see: http://3dbrew.org/wiki/Titles // see: http://3dbrew.org/wiki/Titles
if ((title_id >> 32) == 0x00048004) { // TWL app / game if ((title_id >> 32) == 0x00048004) { // TWL app / game
tie->flags_2[0] = 0x01; tie->flags_2[0] = 0x01;
tie->flags_2[4] = 0x01; tie->flags_2[4] = 0x01;
tie->flags_2[5] = 0x01; tie->flags_2[5] = 0x01;
} }
return 0; return 0;
} }
u32 BuildTitleInfoEntryNcch(TitleInfoEntry* tie, TitleMetaData* tmd, NcchHeader* ncch, NcchExtHeader* exthdr, bool sd) { u32 BuildTitleInfoEntryNcch(TitleInfoEntry* tie, TitleMetaData* tmd, NcchHeader* ncch, NcchExtHeader* exthdr, bool sd) {
u64 title_id = getbe64(tmd->title_id); u64 title_id = getbe64(tmd->title_id);
if (ValidateNcchHeader(ncch) != 0) return 1; if (ValidateNcchHeader(ncch) != 0) return 1;
if (BuildTitleInfoEntryTmd(tie, tmd, sd) != 0) return 1; if (BuildTitleInfoEntryTmd(tie, tmd, sd) != 0) return 1;
// product code, extended title version // product code, extended title version
memcpy(tie->product_code, ncch->productcode, 0x10); memcpy(tie->product_code, ncch->productcode, 0x10);
tie->title_version |= (ncch->version << 16); tie->title_version |= (ncch->version << 16);
// specific flags // specific flags
// see: http://3dbrew.org/wiki/Titles // see: http://3dbrew.org/wiki/Titles
if (!((title_id >> 32) & 0x10)) // not a system title if (!((title_id >> 32) & 0x10)) // not a system title
tie->flags_2[4] = 0x01; tie->flags_2[4] = 0x01;
// stuff from extheader // stuff from extheader
if (exthdr) { if (exthdr) {
// add save data size to title size // add save data size to title size
if (exthdr->savedata_size) { if (exthdr->savedata_size) {
u32 align_size = CMD_SIZE_ALIGN(sd); u32 align_size = CMD_SIZE_ALIGN(sd);
tie->title_size += tie->title_size +=
align_size + // 'data' folder align_size + // 'data' folder
align(exthdr->savedata_size, align_size); // savegame align(exthdr->savedata_size, align_size); // savegame
tie->flags_1[0] = 0x01; // has SD save tie->flags_1[0] = 0x01; // has SD save
}; };
// extdata ID low (hacky) // extdata ID low (hacky)
tie->extdata_id_low = getle32(exthdr->aci_data + 0x30 - 0x0C + 0x04); tie->extdata_id_low = getle32(exthdr->aci_data + 0x30 - 0x0C + 0x04);
} else tie->flags_0[0] = 0x00; // no manual } else tie->flags_0[0] = 0x00; // no manual
return 0; return 0;
} }