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-17 23:55:38 -04:00
parent 192a05c041
commit 7ae0099e08
4 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/application/Data/rom.cc
View File

@@ -120,6 +120,7 @@ uint32_t ROM::GetRomPosition(int direct_addr, uint snes_addr) const {
uchar* ROM::SNES3bppTo8bppSheet(uchar *sheet_buffer_in) // 128x32 uchar* ROM::SNES3bppTo8bppSheet(uchar *sheet_buffer_in) // 128x32
{ {
// 8bpp sheet out // 8bpp sheet out
const uchar bitmask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
uchar *sheet_buffer_out = (unsigned char *)malloc(0x1000); uchar *sheet_buffer_out = (unsigned char *)malloc(0x1000);
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;

3
src/application/Data/rom.h
View File

@@ -24,7 +24,6 @@ int AddressFromBytes(uchar addr1, uchar addr2, uchar addr3);
class ROM { class ROM {
public: public:
ROM() = default;
~ROM(); ~ROM();
void LoadFromFile(const std::string& path); void LoadFromFile(const std::string& path);
@@ -55,8 +54,6 @@ class ROM {
std::shared_ptr<uchar> rom_ptr_; std::shared_ptr<uchar> rom_ptr_;
std::unordered_map<unsigned int, std::shared_ptr<uchar[2048]>> std::unordered_map<unsigned int, std::shared_ptr<uchar[2048]>>
decompressed_sheets; decompressed_sheets;
const uchar bitmmask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
}; };
} // namespace Data } // namespace Data

1
src/application/Editor/editor.cc
View File

@@ -113,7 +113,6 @@ void Editor::DrawYazeMenu() {
std::string filePathName = ImGuiFileDialog::Instance()->GetFilePathName(); std::string filePathName = ImGuiFileDialog::Instance()->GetFilePathName();
std::string filePath = ImGuiFileDialog::Instance()->GetCurrentPath(); std::string filePath = ImGuiFileDialog::Instance()->GetCurrentPath();
rom_.LoadFromFile(filePathName); rom_.LoadFromFile(filePathName);
overworld_editor_.SetRom(rom_);
rom_data_ = (void *)rom_.GetRawData(); rom_data_ = (void *)rom_.GetRawData();
} }
ImGuiFileDialog::Instance()->Close(); ImGuiFileDialog::Instance()->Close();

2
src/application/Editor/overworld_editor.h
View File

@@ -19,8 +19,6 @@ class OverworldEditor {
public: public:
void Update(); void Update();
void SetRom(Data::ROM &rom) { rom_ = rom; }
private: private:
void DrawToolset(); void DrawToolset();
void DrawOverworldMapSettings(); void DrawOverworldMapSettings();