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

housekeeping

Browse Source
This commit is contained in:
Justin Scofield
2022-06-13 21:39:59 -04:00
parent 29f99fc15c
commit 855152f19b
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Application/Core/constants.h
View File

@@ -16,15 +16,15 @@
ImGui::EndMenuBar(); \ ImGui::EndMenuBar(); \
} }
using ushort = unsigned short;
using uint = unsigned int;
using uchar = unsigned char;
namespace yaze { namespace yaze {
namespace Application { namespace Application {
namespace Core { namespace Core {
namespace Constants { namespace Constants {
using ushort = unsigned short;
//=========================================================================================== //===========================================================================================
// 65816 LanguageDefinition // 65816 LanguageDefinition
//=========================================================================================== //===========================================================================================
@@ -50,7 +50,7 @@ static const char *const kIdentifiers[] = {
"puts", "rand", "remove", "rename", "sinh", "sqrt", "puts", "rand", "remove", "rename", "sinh", "sqrt",
"srand", "strcat", "strcmp", "strerror", "time", "tolower", "srand", "strcat", "strcmp", "strerror", "time", "tolower",
"toupper"}; "toupper"};
//=========================================================================================== //===========================================================================================
// Magic numbers // Magic numbers
//=========================================================================================== //===========================================================================================

8
src/Application/Graphics/bitmap.cc
View File

@@ -9,7 +9,7 @@ namespace Application {
namespace Graphics { namespace Graphics {
int GetPCGfxAddress(char *romData, char id) { int GetPCGfxAddress(char *romData, char id) {
char **info1, **info2, **info3, **info4; char **info1 = new char *[255];
int gfxPointer1 = int gfxPointer1 =
lorom_snes_to_pc((romData[Core::Constants::gfx_1_pointer + 1] << 8) + lorom_snes_to_pc((romData[Core::Constants::gfx_1_pointer + 1] << 8) +
(romData[Core::Constants::gfx_1_pointer]), (romData[Core::Constants::gfx_1_pointer]),
@@ -17,11 +17,11 @@ int GetPCGfxAddress(char *romData, char id) {
int gfxPointer2 = int gfxPointer2 =
lorom_snes_to_pc((romData[Core::Constants::gfx_2_pointer + 1] << 8) + lorom_snes_to_pc((romData[Core::Constants::gfx_2_pointer + 1] << 8) +
(romData[Core::Constants::gfx_2_pointer]), (romData[Core::Constants::gfx_2_pointer]),
info2); info1);
int gfxPointer3 = int gfxPointer3 =
lorom_snes_to_pc((romData[Core::Constants::gfx_3_pointer + 1] << 8) + lorom_snes_to_pc((romData[Core::Constants::gfx_3_pointer + 1] << 8) +
(romData[Core::Constants::gfx_3_pointer]), (romData[Core::Constants::gfx_3_pointer]),
info3); info1);
char gfxGamePointer1 = romData[gfxPointer1 + id]; char gfxGamePointer1 = romData[gfxPointer1 + id];
char gfxGamePointer2 = romData[gfxPointer2 + id]; char gfxGamePointer2 = romData[gfxPointer2 + id];
@@ -29,7 +29,7 @@ int GetPCGfxAddress(char *romData, char id) {
return lorom_snes_to_pc( return lorom_snes_to_pc(
Data::AddressFromBytes(gfxGamePointer1, gfxGamePointer2, gfxGamePointer3), Data::AddressFromBytes(gfxGamePointer1, gfxGamePointer2, gfxGamePointer3),
info4); info1);
} }
char *CreateAllGfxDataRaw(char *romData) { char *CreateAllGfxDataRaw(char *romData) {

4
src/Application/Graphics/tile.cc
View File

@@ -96,7 +96,7 @@ std::vector<std::vector<tile8> > TilesPattern::transform(
uint posTile = transform_vector_[j][i] + number_of_tiles_ * repeat; uint posTile = transform_vector_[j][i] + number_of_tiles_ * repeat;
uint posX = i + repeatOffsetX; uint posX = i + repeatOffsetX;
uint posY = j + repeatOffsetY; uint posY = j + repeatOffsetY;
printf("X: %d - Y: %d - posTile : %d", posX, posY, posTile); printf("X: %d - Y: %d - posTile : %d \n", posX, posY, posTile);
toret.at(posY).at(posX) = tiles[posTile]; toret.at(posY).at(posX) = tiles[posTile];
} }
} }
@@ -107,7 +107,7 @@ std::vector<std::vector<tile8> > TilesPattern::transform(
repeatOffsetX += tVectWidth; repeatOffsetX += tVectWidth;
repeat++; repeat++;
} }
std::cout << "End of transform"; std::cout << "End of transform" << std::endl;
return toret; return toret;
} }

28
tests/rom_test.cc
View File

@@ -74,22 +74,22 @@ TEST_F(DecompressionTest, test_compress_decompress) {
return; return;
} }
/// // ///
for (unsigned int i = 0; i < size_; i++) { // for (unsigned int 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_;
data_[i] = byte_read_; // data_[i] = byte_read_;
} // }
file.close(); // file.close();
read(fd, buffer, 32); // read(fd, buffer, 32);
/// // ///
char *comdata = std_nintendo_compress(buffer, 0, 32, &compress_size); // char *comdata = std_nintendo_compress(buffer, 0, 32, &compress_size);
CuAssertDataEquals_Msg( // CuAssertDataEquals_Msg(
tc, "Compressing/Uncompress testtilebpp4.tl", buffer, 32, // tc, "Compressing/Uncompress testtilebpp4.tl", buffer, 32,
std_nintendo_decompress(comdata, 0, 0, &compress_size, &c_size)); // std_nintendo_decompress(comdata, 0, 0, &compress_size, &c_size));
} }
TEST_F(DecompressionTest, basic_test) { TEST_F(DecompressionTest, basic_test) {