Add resources folder for music and palette editor

src/app/editor/graphics_editor.cc

@@ -8,7 +8,7 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "app/core/pipeline.h"
-#include "app/editor/palette_editor.h"
+#include "app/editor/resources/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/compression.h"
 #include "app/gfx/scad_format.h"
@@ -164,7 +164,8 @@ absl::Status GraphicsEditor::DrawCgxImport() {
   core::ButtonPipe("Load CGX Data", [this]() {
     status_ = gfx::LoadCgx(current_bpp_, cgx_file_path_, cgx_data_,
                            decoded_cgx_, extra_cgx_data_);
-    cgx_bitmap_.Create(0x80, 0x200, 8, decoded_cgx_);
+    PRINT_IF_ERROR(
+        cgx_bitmap_.InitializeFromData(0x80, 0x200, 8, decoded_cgx_));
     if (col_file_) {
       cgx_bitmap_.ApplyPalette(decoded_col_);
       rom()->RenderBitmap(&cgx_bitmap_);
@@ -197,8 +198,8 @@ absl::Status GraphicsEditor::DrawScrImport() {
     decoded_scr_data_.resize(0x100 * 0x100);
     status_ = gfx::DrawScrWithCgx(current_bpp_, scr_data_, decoded_scr_data_,
                                   decoded_cgx_);
-
+    PRINT_IF_ERROR(
-    scr_bitmap_.Create(0x100, 0x100, 8, decoded_scr_data_);
+        scr_bitmap_.InitializeFromData(0x100, 0x100, 8, decoded_scr_data_));
     if (scr_loaded_) {
       scr_bitmap_.ApplyPalette(decoded_col_);
       rom()->RenderBitmap(&scr_bitmap_);

src/app/editor/graphics_editor.h

@@ -9,7 +9,7 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "app/core/pipeline.h"
-#include "app/editor/palette_editor.h"
+#include "app/editor/resources/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_tile.h"
 #include "app/gui/canvas.h"

src/app/editor/master_editor.cc

@@ -13,9 +13,9 @@
 #include "app/editor/dungeon_editor.h"
 #include "app/editor/graphics_editor.h"
 #include "app/editor/modules/assembly_editor.h"
-#include "app/editor/music_editor.h"
+#include "app/editor/resources/music_editor.h"
 #include "app/editor/overworld_editor.h"
-#include "app/editor/palette_editor.h"
+#include "app/editor/resources/palette_editor.h"
 #include "app/editor/screen_editor.h"
 #include "app/editor/sprite_editor.h"
 #include "app/emu/emulator.h"

src/app/editor/master_editor.h

@@ -14,9 +14,9 @@
 #include "app/editor/dungeon_editor.h"
 #include "app/editor/graphics_editor.h"
 #include "app/editor/modules/assembly_editor.h"
-#include "app/editor/music_editor.h"
+#include "app/editor/resources/music_editor.h"
 #include "app/editor/overworld_editor.h"
-#include "app/editor/palette_editor.h"
+#include "app/editor/resources/palette_editor.h"
 #include "app/editor/screen_editor.h"
 #include "app/editor/sprite_editor.h"
 #include "app/emu/emulator.h"

src/app/editor/modules/gfx_group_editor.cc

@@ -8,7 +8,7 @@
 #include "absl/status/statusor.h"
 #include "app/core/editor.h"
 #include "app/core/pipeline.h"
-#include "app/editor/palette_editor.h"
+#include "app/editor/resources/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"

src/app/editor/modules/gfx_group_editor.h

@@ -9,7 +9,7 @@
 #include "absl/status/statusor.h"
 #include "app/core/editor.h"
 #include "app/core/pipeline.h"
-#include "app/editor/palette_editor.h"
+#include "app/editor/resources/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"

src/app/editor/modules/tile16_editor.cc

@@ -8,7 +8,7 @@
 #include "absl/status/statusor.h"
 #include "app/core/editor.h"
 #include "app/core/pipeline.h"
-#include "app/editor/palette_editor.h"
+#include "app/editor/resources/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"

src/app/editor/modules/tile16_editor.h

@@ -9,7 +9,7 @@
 #include "absl/status/statusor.h"
 #include "app/core/editor.h"
 #include "app/core/pipeline.h"
-#include "app/editor/palette_editor.h"
+#include "app/editor/resources/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"

src/app/editor/overworld_editor.cc

@@ -10,7 +10,7 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "app/core/pipeline.h"
-#include "app/editor/palette_editor.h"
+#include "app/editor/resources/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"
@@ -32,8 +32,8 @@ absl::Status OverworldEditor::Update() {
   // Initialize overworld graphics, maps, and palettes
   if (rom()->isLoaded() && !all_gfx_loaded_) {
     RETURN_IF_ERROR(LoadGraphics())
-    tile16_editor_.InitBlockset(tile16_blockset_bmp_, tile16_individual_,
+    RETURN_IF_ERROR(tile16_editor_.InitBlockset(
-                                tile8_individual_);
+        tile16_blockset_bmp_, tile16_individual_, tile8_individual_));
     gfx_group_editor_.InitBlockset(tile16_blockset_bmp_);
     all_gfx_loaded_ = true;
   }

src/app/editor/overworld_editor.h

@@ -15,7 +15,7 @@
 #include "app/core/pipeline.h"
 #include "app/editor/modules/gfx_group_editor.h"
 #include "app/editor/modules/tile16_editor.h"
-#include "app/editor/palette_editor.h"
+#include "app/editor/resources/palette_editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"