diff --git a/src/app/editor/modules/tile16_editor.cc b/src/app/editor/modules/tile16_editor.cc index 13e720ef..c5b67e99 100644 --- a/src/app/editor/modules/tile16_editor.cc +++ b/src/app/editor/modules/tile16_editor.cc @@ -233,18 +233,6 @@ void Tile16Editor::DrawTileEditControls() { ImGui::Checkbox("Priority Tile", &priority_tile); } -absl::Status Tile16Editor::InitBlockset( - const gfx::Bitmap& tile16_blockset_bmp, gfx::Bitmap current_gfx_bmp, - const std::vector& tile16_individual, - uint8_t all_tiles_types[0x200]) { - all_tiles_types_ = all_tiles_types; - tile16_blockset_bmp_ = tile16_blockset_bmp; - tile16_individual_ = tile16_individual; - current_gfx_bmp_ = current_gfx_bmp; - tile8_gfx_data_ = current_gfx_bmp_.vector(); - return absl::OkStatus(); -} - absl::Status Tile16Editor::LoadTile8() { ASSIGN_OR_RETURN(auto ow_main_pal_group, rom()->palette_group("ow_main")); diff --git a/src/app/editor/modules/tile16_editor.h b/src/app/editor/modules/tile16_editor.h index 1fb72bfd..70c304c1 100644 --- a/src/app/editor/modules/tile16_editor.h +++ b/src/app/editor/modules/tile16_editor.h @@ -38,10 +38,16 @@ class Tile16Editor : public GfxContext, public SharedROM { absl::Status UpdateTransferTileCanvas(); - absl::Status InitBlockset(const gfx::Bitmap& tile16_blockset_bmp, - gfx::Bitmap current_gfx_bmp, - const std::vector& tile16_individual, - uint8_t all_tiles_types[0x200]); + void InitBlockset(const gfx::Bitmap& tile16_blockset_bmp, + gfx::Bitmap current_gfx_bmp, + const std::vector& tile16_individual, + uint8_t all_tiles_types[0x200]) { + all_tiles_types_ = all_tiles_types; + tile16_blockset_bmp_ = tile16_blockset_bmp; + tile16_individual_ = tile16_individual; + current_gfx_bmp_ = current_gfx_bmp; + tile8_gfx_data_ = current_gfx_bmp_.vector(); + } absl::Status LoadTile8();