Use nacp.h from libnx. Clear errortext in netloader_error().

This commit is contained in:
yellows8 2018-04-26 17:28:58 -04:00
parent 8506e1b316
commit 4563794505
3 changed files with 4 additions and 44 deletions

View File

@ -43,7 +43,6 @@ typedef union {
} color_t;
#include "font.h"
#include "nacp.h"
#include "menu.h"
#include "text.h"
#include "ui.h"
@ -52,9 +51,10 @@ typedef union {
#include "math.h"
#include "theme.h"
// when building for pc we need to include nro.h separately
// when building for pc we need to include these separately
#ifndef __SWITCH__
#include "switch/nro.h"
#include "switch/nacp.h"
#endif
void menuStartup();

View File

@ -1,41 +0,0 @@
#pragma once
typedef struct {
char name[0x200];
char author[0x100];
} NacpLanguageEntry;
typedef struct {
NacpLanguageEntry lang[12];
NacpLanguageEntry lang_unk[4];//?
u8 x3000_unk[0x24];////Normally all-zero?
u32 x3024_unk;
u32 x3028_unk;
u32 x302C_unk;
u32 x3030_unk;
u32 x3034_unk;
u64 titleid0;
u8 x3040_unk[0x20];
char version[0x10];
u64 titleid_dlcbase;
u64 titleid1;
u32 x3080_unk;
u32 x3084_unk;
u32 x3088_unk;
u8 x308C_unk[0x24];//zeros?
u64 titleid2;
u64 titleids[7];//"Array of application titleIDs, normally the same as the above app-titleIDs. Only set for game-updates?"
u32 x30F0_unk;
u32 x30F4_unk;
u64 titleid3;//"Application titleID. Only set for game-updates?"
char bcat_passphrase[0x40];
u8 x3140_unk[0xEC0];//Normally all-zero?
} NacpStruct;

View File

@ -54,6 +54,7 @@ static void netloader_error(const char *func, int err) {
//---------------------------------------------------------------------------------
char errortext[1024];
memset(errortext, 0, sizeof(errortext));
snprintf(errortext, sizeof(errortext)-1, "%s: err=%d\n %s\n", func, err, strerror(errno));
menuCreateMsgBox(780,300, errortext);