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

Store converted binary graphics data in ScreenEditor and rename save functions for clarity

Browse Source
This commit is contained in:
scawful
2024-11-10 17:25:26 -05:00
parent 996c6c92ee
commit a70414d803
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/editor/graphics/screen_editor.cc
View File

@@ -503,6 +503,7 @@ void ScreenEditor::LoadBinaryGfx() {
std::vector<uint8_t> bin_data((std::istreambuf_iterator<char>(file)),
std::istreambuf_iterator<char>());
auto converted_bin = gfx::SnesTo8bppSheet(bin_data, 4, 4);
gfx_bin_data_ = converted_bin;
tile16_sheet_.clear();
if (LoadDungeonMapTile16(converted_bin, true).ok()) {
sheets_.clear();

1
src/app/editor/graphics/screen_editor.h
View File

@@ -90,6 +90,7 @@ class ScreenEditor : public SharedRom, public Editor {
std::vector<zelda3::screen::DungeonMap> dungeon_maps_;
std::vector<std::vector<std::array<std::string, 25>>> dungeon_map_labels_;
std::array<uint16_t, 4> current_tile16_data_;
std::vector<uint8_t> gfx_bin_data_;
absl::Status status_;

4
src/app/zelda3/overworld/overworld.cc
View File

@@ -527,9 +527,9 @@ absl::Status Overworld::LoadSpritesFromMap(int sprites_per_gamestate_ptr,
absl::Status Overworld::Save(Rom &rom) {
rom_ = rom;
if (expanded_tile16_) RETURN_IF_ERROR(SaveMap16TilesExpanded())
if (expanded_tile16_) RETURN_IF_ERROR(SaveMap16Expanded())
RETURN_IF_ERROR(SaveMap16Tiles())
if (expanded_tile32_) RETURN_IF_ERROR(SaveMap32TilesExpanded())
if (expanded_tile32_) RETURN_IF_ERROR(SaveMap32Expanded())
RETURN_IF_ERROR(SaveMap32Tiles())
RETURN_IF_ERROR(SaveOverworldMaps())
RETURN_IF_ERROR(SaveEntrances())