drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 5 Pull Requests Actions Releases 7 Activity

Cleanup format of GbaImageData

Browse Source
This commit is contained in:
Gary Talent 2017-05-07 21:41:52 -05:00
parent c4da8394d2
commit 8a2ba6c171
4 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_rom.sh
View File

@ -4,8 +4,8 @@ set -e
echo NOSTALGIA_MEDIA_HEADER_________ > media_header.txt echo NOSTALGIA_MEDIA_HEADER_________ > media_header.txt
oxfs format 32 1m nostalgia_media.oxfs ./build/current/deps/ox/src/ox/fs/oxfs format 32 1k nostalgia_media.oxfs
./build/current/src/tools/nost-pack -fs nostalgia_media.oxfs -img charset.png -inode 101 -tiles 40 -bpp 4 -c ./build/current/src/tools/nost-pack -fs nostalgia_media.oxfs -img charset.png -inode 101 -tiles 40 -c
${DEVKITARM}/bin/padbin 32 build/gba-release/src/player/nostalgia.bin ${DEVKITARM}/bin/padbin 32 build/gba-release/src/player/nostalgia.bin
cat build/gba-release/src/player/nostalgia.bin media_header.txt nostalgia_media.oxfs > nostalgia.gba cat build/gba-release/src/player/nostalgia.bin media_header.txt nostalgia_media.oxfs > nostalgia.gba

12
src/core/gba/gba.hpp
View File

@ -17,14 +17,18 @@ typedef struct { uint32_t data[8]; } __attribute__((aligned(4))) Tile, Tile4;
// d-tile: double-sized tile (8bpp) // d-tile: double-sized tile (8bpp)
typedef struct { uint32_t data[16]; } __attribute__((aligned(4))) Tile8; typedef struct { uint32_t data[16]; } __attribute__((aligned(4))) Tile8;
// tile block: 32x16 tiles, 16x16 d-tiles // tile block: 32x16 tiles, 16x16 d-tiles
typedef uint16_t Pallete[256]; typedef uint16_t Palette[256];
typedef Tile CharBlock[512]; typedef Tile CharBlock[512];
typedef Tile8 CharBlock8[256]; typedef Tile8 CharBlock8[256];
struct __attribute__((packed)) GbaImageData { struct __attribute__((packed)) GbaImageDataHeader {
Pallete pal;
uint16_t tileCount;
uint8_t bpp; uint8_t bpp;
uint16_t tileCount;
};
struct __attribute__((packed)) GbaImageData {
GbaImageDataHeader header;
Palette __attribute__((packed)) pal;
uint8_t tiles[1]; uint8_t tiles[1];
}; };

23
src/core/gba/gfx.cpp
View File

@ -130,18 +130,23 @@ ox::Error initGfx() {
void initConsole() { void initConsole() {
auto fs = (FileStore32*) findMedia(); auto fs = (FileStore32*) findMedia();
GbaImageData imgData; GbaImageDataHeader imgData;
fs->read(101, __builtin_offsetof(GbaImageData, tileCount), fs->read(101, 0, sizeof(imgData), &imgData, nullptr);
sizeof(imgData.tileCount) + sizeof(imgData.bpp),
&imgData.tileCount, nullptr);
REG_BG0CNT = (28 << 8) | 1; REG_BG0CNT = (28 << 8) | 1;
if (imgData.bpp == 8) {
REG_BG0CNT |= (1 << 7); // set to use 8 bits per pixel
}
if (fs) { if (fs) {
fs->read(101, __builtin_offsetof(GbaImageData, tiles), 64 * 38, &TILE8_ADDR[0][1], nullptr); // load palette
fs->read(101, __builtin_offsetof(GbaImageData, pal), 512, &MEM_PALLETE_BG[0], nullptr); fs->read(101, sizeof(GbaImageDataHeader),
512, (uint16_t*) &MEM_PALLETE_BG[0], nullptr);
if (imgData.bpp == 4) {
fs->read(101, __builtin_offsetof(GbaImageData, tiles),
sizeof(Tile) * imgData.tileCount, (uint16_t*) &TILE_ADDR[0][1], nullptr);
} else {
REG_BG0CNT |= (1 << 7); // set to use 8 bits per pixel
fs->read(101, __builtin_offsetof(GbaImageData, tiles),
sizeof(Tile8) * imgData.tileCount, (uint16_t*) &TILE8_ADDR[0][1], nullptr);
}
} }
} }

4
src/tools/pack.cpp
View File

@ -81,8 +81,8 @@ int run(ClArgs args) {
uint8_t imgDataBuff[imgDataBuffSize]; uint8_t imgDataBuff[imgDataBuffSize];
memset(&imgDataBuff, 0, imgDataBuffSize); memset(&imgDataBuff, 0, imgDataBuffSize);
GbaImageData *id = (GbaImageData*) imgDataBuff; GbaImageData *id = (GbaImageData*) imgDataBuff;
id->bpp = argBpp; id->header.bpp = argBpp;
id->tileCount = argTiles; id->header.tileCount = argTiles;
int colorId = 0; int colorId = 0;
// copy pixels as color ids // copy pixels as color ids