diff --git a/src/application/Data/rom.cc b/src/application/Data/rom.cc index 2f0c88c0..3c329c91 100644 --- a/src/application/Data/rom.cc +++ b/src/application/Data/rom.cc @@ -120,6 +120,7 @@ uint32_t ROM::GetRomPosition(int direct_addr, uint snes_addr) const { uchar* ROM::SNES3bppTo8bppSheet(uchar *sheet_buffer_in) // 128x32 { // 8bpp sheet out + const uchar bitmask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; uchar *sheet_buffer_out = (unsigned char *)malloc(0x1000); int xx = 0; // positions where we are at on the sheet int yy = 0; diff --git a/src/application/Data/rom.h b/src/application/Data/rom.h index a709d93e..d96eae65 100644 --- a/src/application/Data/rom.h +++ b/src/application/Data/rom.h @@ -24,7 +24,6 @@ int AddressFromBytes(uchar addr1, uchar addr2, uchar addr3); class ROM { public: - ROM() = default; ~ROM(); void LoadFromFile(const std::string& path); @@ -55,8 +54,6 @@ class ROM { std::shared_ptr rom_ptr_; std::unordered_map> decompressed_sheets; - - const uchar bitmmask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; }; } // namespace Data diff --git a/src/application/Editor/editor.cc b/src/application/Editor/editor.cc index 35032928..e1d12f38 100644 --- a/src/application/Editor/editor.cc +++ b/src/application/Editor/editor.cc @@ -113,7 +113,6 @@ void Editor::DrawYazeMenu() { std::string filePathName = ImGuiFileDialog::Instance()->GetFilePathName(); std::string filePath = ImGuiFileDialog::Instance()->GetCurrentPath(); rom_.LoadFromFile(filePathName); - overworld_editor_.SetRom(rom_); rom_data_ = (void *)rom_.GetRawData(); } ImGuiFileDialog::Instance()->Close(); diff --git a/src/application/Editor/overworld_editor.h b/src/application/Editor/overworld_editor.h index 2f81283d..cdf64193 100644 --- a/src/application/Editor/overworld_editor.h +++ b/src/application/Editor/overworld_editor.h @@ -19,8 +19,6 @@ class OverworldEditor { public: void Update(); - void SetRom(Data::ROM &rom) { rom_ = rom; } - private: void DrawToolset(); void DrawOverworldMapSettings();