tobid7/bannertool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
Steveice10
2015-01-25 19:04:27 -08:00
parent 6f2f2201db
commit 102afb5bd9
17 changed files with 443 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/3ds/3ds.h
View File

@@ -4,6 +4,8 @@
#include "cbmd.h"
#include "cwav.h"
#include "smdh.h"
#include "data.h"
#include "lz11.h"
#include "util.h"

12
source/3ds/cbmd.cpp
View File

@@ -13,11 +13,11 @@ typedef struct {
u32 cwavOffset = 0;
} CBMDHeader;
u8* build_cbmd_data(CBMD cbmd, u32* size, bool bnr) {
u8* cbmd_build_data(CBMD cbmd, u32* size, bool bnr) {
u32 headerSize = sizeof(CBMDHeader);
CBMDHeader header;
u8* compressedCGFXs[14] = {0};
u8* compressedCGFXs[14] = {NULL};
u32 compressedCGFXSizes[14] = {0};
u32 offset = headerSize;
@@ -72,10 +72,10 @@ u8* build_cbmd_data(CBMD cbmd, u32* size, bool bnr) {
return output;
}
u8* build_cbmd(CBMD cbmd, u32* size) {
return build_cbmd_data(cbmd, size, false);
u8* cbmd_build(CBMD cbmd, u32* size) {
return cbmd_build_data(cbmd, size, false);
}
u8* build_bnr(CBMD cbmd, u32* size) {
return build_cbmd_data(cbmd, size, true);
u8* bnr_build(CBMD cbmd, u32* size) {
return cbmd_build_data(cbmd, size, true);
}

4
source/3ds/cbmd.h
View File

@@ -27,7 +27,7 @@ typedef struct {
u32 cwavSize = 0;
} CBMD;
u8* build_cbmd(CBMD cbmd, u32* size);
u8* build_bnr(CBMD cbmd, u32* size);
u8* cbmd_build(CBMD cbmd, u32* size);
u8* bnr_build(CBMD cbmd, u32* size);
#endif

87
source/3ds/cwav.cpp
View File

@@ -3,6 +3,12 @@
#include <stdlib.h>
#include <string.h>
typedef enum {
PCM8,
PCM16,
TODO
} CWAVType;
typedef struct {
char magic[4] = {'C', 'W', 'A', 'V'};
u16 endianess = 0xFEFF;
@@ -17,7 +23,7 @@ typedef struct {
u32 dataChunkOffset;
u32 dataChunkLength;
u8 reserved[0x14] = {0};
} Header;
} CWAVHeader;
typedef struct {
char magic[4] = {'I', 'N', 'F', 'O'};
@@ -28,12 +34,12 @@ typedef struct {
u32 totalSamples;
u32 unknown2 = 0;
u32 totalChannels;
} InfoHeader;
} CWAVInfoHeader;
typedef struct {
u32 flags = 0x7100;
u32 offset;
} ChannelDataPointer;
} CWAVChannelDataPointer;
typedef struct {
u32 flags = 0x1F00;
@@ -41,25 +47,25 @@ typedef struct {
u32 unknown3 = 0;
u32 unknown4 = 0;
u32 padding = 0;
} ChannelData;
} CWAVChannelData;
typedef struct {
char magic[4] = {'D', 'A', 'T', 'A'};
u32 length;
} DataHeader;
} CWAVDataHeader;
u8* build_cwav(WAV wav, u32* size) {
Header header;
u32 offset = sizeof(Header);
u8* cwav_build(CWAV cwav, u32* size) {
CWAVHeader header;
u32 offset = sizeof(CWAVHeader);
header.infoChunkOffset = offset;
header.infoChunkLength = sizeof(InfoHeader);
header.infoChunkLength = sizeof(CWAVInfoHeader);
offset += header.infoChunkLength;
offset += (sizeof(ChannelDataPointer) + sizeof(ChannelData)) * wav.format.numChannels;
offset += (sizeof(CWAVChannelDataPointer) + sizeof(CWAVChannelData)) * cwav.channels;
header.dataChunkOffset = offset;
header.dataChunkLength = (u32) sizeof(DataHeader) + wav.data.chunkSize;
header.dataChunkLength = (u32) sizeof(CWAVDataHeader) + cwav.dataSize;
offset += header.dataChunkLength;
header.fileSize = offset;
@@ -67,45 +73,46 @@ u8* build_cwav(WAV wav, u32* size) {
u8* output = (u8*) malloc(offset);
u32 pos = 0;
memcpy(output + pos, &header, sizeof(Header));
pos += sizeof(Header);
memcpy(output + pos, &header, sizeof(CWAVHeader));
pos += sizeof(CWAVHeader);
InfoHeader infoHeader;
infoHeader.type = wav.format.bitsPerSample == 16 ? 1 : 0;
infoHeader.sampleRate = wav.format.sampleRate;
infoHeader.totalSamples = wav.data.chunkSize / (wav.format.bitsPerSample / 8) / wav.format.numChannels;
infoHeader.totalChannels = wav.format.numChannels;
memcpy(output + pos, &infoHeader, sizeof(InfoHeader));
pos += sizeof(InfoHeader);
u32 bytesPerSample = (u32) cwav.bitsPerSample / 8;
for(int i = 0; i < wav.format.numChannels; i++) {
ChannelDataPointer pointer;
pointer.offset = 0x4 + (wav.format.numChannels * (u32) sizeof(ChannelDataPointer)) + (i * (u32) sizeof(ChannelData));
memcpy(output + pos, &pointer, sizeof(ChannelDataPointer));
pos += sizeof(ChannelDataPointer);
CWAVInfoHeader infoHeader;
infoHeader.type = cwav.bitsPerSample == 16 ? PCM16 : PCM8;
infoHeader.sampleRate = cwav.sampleRate;
infoHeader.totalSamples = cwav.dataSize / bytesPerSample / cwav.channels;
infoHeader.totalChannels = cwav.channels;
memcpy(output + pos, &infoHeader, sizeof(CWAVInfoHeader));
pos += sizeof(CWAVInfoHeader);
for(int i = 0; i < cwav.channels; i++) {
CWAVChannelDataPointer pointer;
pointer.offset = 0x4 + (cwav.channels * (u32) sizeof(CWAVChannelDataPointer)) + (i * (u32) sizeof(CWAVChannelData));
memcpy(output + pos, &pointer, sizeof(CWAVChannelDataPointer));
pos += sizeof(CWAVChannelDataPointer);
}
for(int i = 0; i < wav.format.numChannels; i++) {
ChannelData data;
data.offset = i * (wav.data.chunkSize / wav.format.numChannels);
memcpy(output + pos, &data, sizeof(ChannelData));
pos += sizeof(ChannelData);
u32 bytesPerChannel = cwav.dataSize / cwav.channels;
for(int i = 0; i < cwav.channels; i++) {
CWAVChannelData data;
data.offset = i * bytesPerChannel;
memcpy(output + pos, &data, sizeof(CWAVChannelData));
pos += sizeof(CWAVChannelData);
}
DataHeader dataHeader;
dataHeader.length = (u32) sizeof(DataHeader) + wav.data.chunkSize;
memcpy(output + pos, &dataHeader, sizeof(DataHeader));
pos += sizeof(DataHeader);
CWAVDataHeader dataHeader;
dataHeader.length = (u32) sizeof(CWAVDataHeader) + cwav.dataSize;
memcpy(output + pos, &dataHeader, sizeof(CWAVDataHeader));
pos += sizeof(CWAVDataHeader);
u32 bytesPerChannel = wav.data.chunkSize / wav.format.numChannels;
u32 bytesPerSample = (u32) wav.format.bitsPerSample / 8;
for(int i = 0; i < wav.data.chunkSize; i += wav.format.numChannels * bytesPerSample) {
for(int c = 0; c < wav.format.numChannels; c++) {
memcpy(output + pos + (bytesPerChannel * c) + (i / wav.format.numChannels), wav.dataBytes + i + (c * bytesPerSample), bytesPerSample);
for(int i = 0; i < cwav.dataSize; i += cwav.channels * bytesPerSample) {
for(int c = 0; c < cwav.channels; c++) {
memcpy(output + pos + (bytesPerChannel * c) + (i / cwav.channels), cwav.data + i + (c * bytesPerSample), bytesPerSample);
}
}
pos += wav.data.chunkSize;
pos += cwav.dataSize;
if(size != NULL) {
*size = pos;

11
source/3ds/cwav.h
View File

@@ -2,8 +2,15 @@
#define __CWAV_H__
#include "../types.h"
#include "../wav.h"
u8* build_cwav(WAV wav, u32* size);
typedef struct {
u32 channels;
u32 sampleRate;
u32 bitsPerSample;
u32 dataSize;
u8* data;
} CWAV;
u8* cwav_build(CWAV wav, u32* size);
#endif

9
source/3ds/data.h Normal file
View File

File diff suppressed because one or more lines are too long

14
source/3ds/smdh.h
View File

@@ -18,12 +18,6 @@ typedef enum {
TRADITIONAL_CHINESE
} SMDHTitleLanguage;
typedef struct {
u16 shortDescription[0x40] = {0};
u16 longDescription[0x80] = {0};
u16 publisher[0x40] = {0};
} SMDHTitle;
// TODO: Provide values to set ratings to.
typedef enum {
CERO = 0,
@@ -47,7 +41,7 @@ typedef enum {
TAIWAN = 0x40,
// Not a bitmask, but a value.
REGION_FREE = 0x7FFFFFFF
REGION_FREE = 0x7FFFFFFF
} SMDHRegionFlag;
typedef enum {
@@ -63,6 +57,12 @@ typedef enum {
DISABLE_SAVE_BACKUPS = 0x0400
} SMDHFlag;
typedef struct {
u16 shortDescription[0x40] = {0};
u16 longDescription[0x80] = {0};
u16 publisher[0x40] = {0};
} SMDHTitle;
typedef struct {
u8 gameRatings[0x10] = {0};
u32 regionLock = REGION_FREE;

2
source/3ds/util.cpp
View File

@@ -1,6 +1,6 @@
#include "util.h"
#include "../lodepng/lodepng.h"
#include "../pc/lodepng.h"
u8 TILE_ORDER[64] = { 0, 1, 8, 9, 2, 3, 10, 11, 16, 17, 24, 25, 18, 19, 26, 27,
4, 5, 12, 13, 6, 7, 14, 15, 20, 21, 28, 29, 22, 23, 30, 31,