scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rom housekeeping

Browse Source
This commit is contained in:
scawful
2022-07-09 23:50:34 -04:00
parent 939b9d6d0d
commit 4911f0c551
2 changed files with 43 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/app/rom.cc
View File

@@ -20,7 +20,7 @@ namespace app {
void ROM::Close() { void ROM::Close() {
if (is_loaded_) { if (is_loaded_) {
delete[] current_rom_; // delete[] current_rom_;
for (auto &each : converted_graphic_sheets_) { for (auto &each : converted_graphic_sheets_) {
free(each); free(each);
} }
@@ -39,15 +39,14 @@ void ROM::LoadFromFile(const std::string &path) {
std::cout << "Error: Could not open ROM file " << path << std::endl; std::cout << "Error: Could not open ROM file " << path << std::endl;
return; return;
} }
current_rom_ = new unsigned char[size_]; current_rom_ = new uchar[size_];
for (unsigned int i = 0; i < size_; i++) { for (uint i = 0; i < size_; i++) {
char byte_read_ = ' '; char byte_read_ = ' ';
file.read(&byte_read_, sizeof(char)); file.read(&byte_read_, sizeof(char));
current_rom_[i] = byte_read_; current_rom_[i] = byte_read_;
} }
file.close(); file.close();
memcpy(title, current_rom_ + 32704, 21); memcpy(title, current_rom_ + 32704, 20);
version_ = current_rom_[27];
is_loaded_ = true; is_loaded_ = true;
} }
@@ -57,9 +56,9 @@ char *ROM::Decompress(int pos, int size, bool reversed) {
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
buffer[i] = 0; buffer[i] = 0;
} }
unsigned int bufferPos = 0; uint bufferPos = 0;
unsigned char cmd = 0; uchar cmd = 0;
unsigned int length = 0; uint length = 0;
uchar databyte = current_rom_[pos]; uchar databyte = current_rom_[pos];
while (true) { while (true) {
@@ -116,7 +115,7 @@ char *ROM::Decompress(int pos, int size, bool reversed) {
ushort s2 = ((current_rom_[pos] & 0xFF)); ushort s2 = ((current_rom_[pos] & 0xFF));
auto Addr = (ushort)(s1 | s2); auto Addr = (ushort)(s1 | s2);
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
buffer[bufferPos] = (unsigned char)buffer[Addr + i]; buffer[bufferPos] = (uchar)buffer[Addr + i];
bufferPos++; bufferPos++;
} }
pos += 2; // Advance 2 bytes in the ROM pos += 2; // Advance 2 bytes in the ROM
@@ -126,23 +125,10 @@ char *ROM::Decompress(int pos, int size, bool reversed) {
return buffer; return buffer;
} }
gfx::SNESPalette ROM::ExtractPalette(uint addr, int bpp) {
uint filePos = addr;
uint palette_size = pow(2, bpp);
auto *palette_data = (char *)malloc(sizeof(char) * (palette_size * 2));
memcpy(palette_data, current_rom_ + filePos, palette_size * 2);
for (int i = 0; i < palette_size; i++) std::cout << palette_data[i];
std::cout << std::endl;
gfx::SNESPalette pal(palette_data);
return pal;
}
// 128x32 // 128x32
uchar *ROM::SNES3bppTo8bppSheet(uchar *buffer_in, int sheet_id, int size) { uchar *ROM::SNES3bppTo8bppSheet(uchar *buffer_in, int sheet_id, int size) {
// 8bpp sheet out // 8bpp sheet out
const uchar bitmask[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
auto *sheet_buffer_out = (uchar *)malloc(size); auto *sheet_buffer_out = (uchar *)malloc(size);
converted_graphic_sheets_.push_back(sheet_buffer_out);
int xx = 0; // positions where we are at on the sheet int xx = 0; // positions where we are at on the sheet
int yy = 0; int yy = 0;
int pos = 0; int pos = 0;
@@ -159,9 +145,12 @@ uchar *ROM::SNES3bppTo8bppSheet(uchar *buffer_in, int sheet_id, int size) {
for (int y = 0; y < 8; y++) { for (int y = 0; y < 8; y++) {
//[0] + [1] + [16] //[0] + [1] + [16]
for (int x = 0; x < 8; x++) { for (int x = 0; x < 8; x++) {
auto b1 = (uchar)((buffer_in[(y * 2) + (24 * pos)] & (bitmask[x]))); auto b1 =
auto b2 = (uchar)(buffer_in[((y * 2) + (24 * pos)) + 1] & (bitmask[x])); (uchar)((buffer_in[(y * 2) + (24 * pos)] & (kGraphicsBitmap[x])));
auto b3 = (uchar)(buffer_in[(16 + y) + (24 * pos)] & (bitmask[x])); auto b2 = (uchar)(buffer_in[((y * 2) + (24 * pos)) + 1] &
(kGraphicsBitmap[x]));
auto b3 =
(uchar)(buffer_in[(16 + y) + (24 * pos)] & (kGraphicsBitmap[x]));
unsigned char b = 0; unsigned char b = 0;
if (b1 != 0) { if (b1 != 0) {
b |= 1; b |= 1;
@@ -187,6 +176,16 @@ uchar *ROM::SNES3bppTo8bppSheet(uchar *buffer_in, int sheet_id, int size) {
return sheet_buffer_out; return sheet_buffer_out;
} }
uint ROM::GetGraphicsAddress(uint8_t offset) const {
uint snes_address = 0;
uint pc_address = 0;
snes_address = (uint)((((current_rom_[0x4F80 + offset]) << 16) |
((current_rom_[0x505F + offset]) << 8) |
((current_rom_[0x513E + offset]))));
pc_address = core::SnesToPc(snes_address);
return pc_address;
}
SDL_Texture *ROM::DrawGraphicsSheet(int offset) { SDL_Texture *ROM::DrawGraphicsSheet(int offset) {
SDL_Surface *surface = SDL_Surface *surface =
SDL_CreateRGBSurfaceWithFormat(0, 128, 32, 8, SDL_PIXELFORMAT_INDEX8); SDL_CreateRGBSurfaceWithFormat(0, 128, 32, 8, SDL_PIXELFORMAT_INDEX8);
@@ -198,14 +197,9 @@ SDL_Texture *ROM::DrawGraphicsSheet(int offset) {
surface->format->palette->colors[i].b = i * 31; surface->format->palette->colors[i].b = i * 31;
} }
uint snesAddr = 0; uint graphics_address = GetGraphicsAddress(offset);
uint pcAddr = 0;
snesAddr = (uint)((((current_rom_[0x4F80 + offset]) << 16) |
((current_rom_[0x505F + offset]) << 8) |
((current_rom_[0x513E + offset]))));
pcAddr = core::SnesToPc(snesAddr);
std::cout << "Decompressing..." << std::endl; std::cout << "Decompressing..." << std::endl;
char *decomp = Decompress(pcAddr); char *decomp = Decompress(graphics_address);
std::cout << "Converting to 8bpp sheet..." << std::endl; std::cout << "Converting to 8bpp sheet..." << std::endl;
sheet_buffer = SNES3bppTo8bppSheet((uchar *)decomp); sheet_buffer = SNES3bppTo8bppSheet((uchar *)decomp);
std::cout << "Assigning pixel data..." << std::endl; std::cout << "Assigning pixel data..." << std::endl;
@@ -219,23 +213,12 @@ SDL_Texture *ROM::DrawGraphicsSheet(int offset) {
return sheet_texture; return sheet_texture;
} }
int ROM::GetPCGfxAddress(uint8_t id) { gfx::SNESPalette ROM::ExtractPalette(uint addr, int bpp) {
auto gfxPtr1 = uint filePos = addr;
core::SnesToPc((current_rom_[core::constants::gfx_1_pointer + 1] << 8) + uint palette_size = pow(2, bpp);
(current_rom_[core::constants::gfx_1_pointer])); auto *palette_data = (char *)malloc(sizeof(char) * (palette_size * 2));
auto gfxPtr2 = memcpy(palette_data, current_rom_ + filePos, palette_size * 2);
core::SnesToPc((current_rom_[core::constants::gfx_2_pointer + 1] << 8) + return gfx::SNESPalette(palette_data);
(current_rom_[core::constants::gfx_2_pointer]));
auto gfxPtr3 =
core::SnesToPc((current_rom_[core::constants::gfx_3_pointer + 1] << 8) +
(current_rom_[core::constants::gfx_3_pointer]));
uint8_t gfxGamePointer1 = current_rom_[gfxPtr1 + id];
uint8_t gfxGamePointer2 = current_rom_[gfxPtr2 + id];
uint8_t gfxGamePointer3 = current_rom_[gfxPtr3 + id];
return core::SnesToPc(core::AddressFromBytes(gfxGamePointer1, gfxGamePointer2,
gfxGamePointer3));
} }
// 0-112 -> compressed 3bpp bgr -> (decompressed each) 0x600 chars // 0-112 -> compressed 3bpp bgr -> (decompressed each) 0x600 chars
@@ -259,15 +242,15 @@ char *ROM::CreateAllGfxDataRaw() {
// uncompressed sheets // uncompressed sheets
if (i >= 115 && i <= 126) { if (i >= 115 && i <= 126) {
data = new char[core::constants::Uncompressed3BPPSize]; data = new char[core::constants::Uncompressed3BPPSize];
int startAddress = GetPCGfxAddress(i); int startAddress = GetGraphicsAddress(i);
for (int j = 0; j < core::constants::Uncompressed3BPPSize; j++) { for (int j = 0; j < core::constants::Uncompressed3BPPSize; j++) {
data[j] = current_rom_[j + startAddress]; data[j] = current_rom_[j + startAddress];
} }
} else { } else {
data = data = alttp_decompress_gfx((char *)current_rom_,
alttp_decompress_gfx((char *)current_rom_, GetPCGfxAddress((char)i), GetGraphicsAddress((char)i),
core::constants::UncompressedSheetSize, core::constants::UncompressedSheetSize,
&uncompressedSize, &compressedSize); &uncompressedSize, &compressedSize);
} }
for (int j = 0; j < sizeof(data); j++) { for (int j = 0; j < sizeof(data); j++) {

10
src/app/rom.h
View File

@@ -20,19 +20,22 @@
namespace yaze { namespace yaze {
namespace app { namespace app {
constexpr uchar kGraphicsBitmap[8] = {0x80, 0x40, 0x20, 0x10,
0x08, 0x04, 0x02, 0x01};
class ROM { class ROM {
public: public:
void Close(); void Close();
void SetupRenderer(std::shared_ptr<SDL_Renderer> renderer); void SetupRenderer(std::shared_ptr<SDL_Renderer> renderer);
void LoadFromFile(const std::string& path); void LoadFromFile(const std::string& path);
char* Decompress(int pos, int size = 0x800, bool reversed = false); char* Decompress(int pos, int size = 0x800, bool reversed = false);
gfx::SNESPalette ExtractPalette(uint addr, int bpp);
uchar* SNES3bppTo8bppSheet(uchar* buffer_in, int sheet_id = 0, uchar* SNES3bppTo8bppSheet(uchar* buffer_in, int sheet_id = 0,
int size = 0x1000); int size = 0x1000);
uint GetGraphicsAddress(uint8_t id) const;
SDL_Texture* DrawGraphicsSheet(int offset); SDL_Texture* DrawGraphicsSheet(int offset);
gfx::SNESPalette ExtractPalette(uint addr, int bpp);
int GetPCGfxAddress(uint8_t id);
char* CreateAllGfxDataRaw(); char* CreateAllGfxDataRaw();
uchar* data() { return current_rom_; } uchar* data() { return current_rom_; }
@@ -47,7 +50,6 @@ class ROM {
long size_; long size_;
uint compressed_size_; uint compressed_size_;
uchar* current_rom_; uchar* current_rom_;
uchar version_;
uchar title[21] = "ROM Not Loaded"; uchar title[21] = "ROM Not Loaded";
enum rom_type type_ = LoROM; enum rom_type type_ = LoROM;
bool isbpp3[core::constants::NumberOfSheets]; bool isbpp3[core::constants::NumberOfSheets];