housekeeping and inventory menu

src/app/editor/master_editor.cc

@@ -138,7 +138,7 @@ void MasterEditor::DrawInfoPopup() {
   if (ImGui::BeginPopupModal("ROM Information", nullptr,
                              ImGuiWindowFlags_AlwaysAutoResize)) {
     ImGui::Text("Title: %s", rom_.GetTitle());
-    ImGui::Text("ROM Size: %ld", rom_.GetSize());
+    ImGui::Text("ROM Size: %ld", rom_.size());
 
     if (ImGui::Button("Close", ImVec2(200, 0))) {
       rom_info_ = false;
@@ -216,7 +216,7 @@ void MasterEditor::DrawViewMenu() {
 
   if (show_memory_editor) {
     static MemoryEditor mem_edit;
-    mem_edit.DrawWindow("Memory Editor", (void *)&rom_, rom_.GetSize());
+    mem_edit.DrawWindow("Memory Editor", (void *)&rom_, rom_.size());
   }
 
   if (show_imgui_demo) {

src/app/editor/overworld_editor.cc

@@ -107,7 +107,7 @@ absl::Status OverworldEditor::DrawToolset() {
     BUTTON_COLUMN(ICON_MD_ZOOM_OUT)             // Zoom Out
     BUTTON_COLUMN(ICON_MD_ZOOM_IN)              // Zoom In
     TEXT_COLUMN(ICON_MD_MORE_VERT)              // Separator
-    BUTTON_COLUMN(ICON_MD_DRAW);                // Draw Tile
+    BUTTON_COLUMN(ICON_MD_DRAW)                 // Draw Tile
     BUTTON_COLUMN(ICON_MD_DOOR_FRONT)           // Entrances
     BUTTON_COLUMN(ICON_MD_DOOR_BACK)            // Exits
     BUTTON_COLUMN(ICON_MD_GRASS)                // Items

src/app/editor/screen_editor.cc

@@ -17,6 +17,7 @@
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_tile.h"
 #include "gui/canvas.h"
+#include "gui/icons.h"
 #include "gui/input.h"
 
 namespace yaze {
@@ -63,37 +64,40 @@ void ScreenEditor::DrawInventoryMenuEditor() {
   TAB_ITEM("Inventory Menu")
 
   static bool create = false;
-  if (!create) {
-    PRINT_IF_ERROR(rom_.LoadAllGraphicsData())
-    all_gfx_ = rom_.GetGraphicsBuffer();
-    inventory_.Create(all_gfx_);
+  if (!create && rom_.isLoaded()) {
+    inventory_.Create();
+    palette_ =inventory_.Palette();
     create = true;
   }
 
-  if (ImGui::BeginTable("InventoryScreen", 2, ImGuiTableFlags_Resizable)) {
+  DrawInventoryToolset();
+
+  if (ImGui::BeginTable("InventoryScreen", 3, ImGuiTableFlags_Resizable)) {
     ImGui::TableSetupColumn("Canvas");
     ImGui::TableSetupColumn("Tiles");
+    ImGui::TableSetupColumn("Palette");
     ImGui::TableHeadersRow();
 
     ImGui::TableNextColumn();
     screen_canvas_.DrawBackground();
     screen_canvas_.DrawContextMenu();
     screen_canvas_.DrawBitmap(inventory_.Bitmap(), 2, create);
-    screen_canvas_.DrawGrid();
+    screen_canvas_.DrawGrid(32.0f);
     screen_canvas_.DrawOverlay();
 
     ImGui::TableNextColumn();
-    tilesheet_canvas_.DrawBackground(ImVec2(128 * 2 + 2, 192 * 2 + 2));
+    tilesheet_canvas_.DrawBackground(ImVec2(128 * 2 + 2, (192 * 2) + 4));
     tilesheet_canvas_.DrawContextMenu();
     tilesheet_canvas_.DrawBitmap(inventory_.Tilesheet(), 2, create);
     tilesheet_canvas_.DrawGrid(16.0f);
     tilesheet_canvas_.DrawOverlay();
 
+    ImGui::TableNextColumn();
+    gui::DisplayPalette(palette_, create);
+
     ImGui::EndTable();
   }
-
-  ImGui::SameLine();
-
+  ImGui::Separator();  
   END_TAB_ITEM()
 }
 
@@ -138,7 +142,7 @@ void ScreenEditor::DrawMosaicEditor() {
   gui::InputHex("Routine Location", &overworldCustomMosaicASM);
 
   if (ImGui::Button("Generate Mosaic Assembly")) {
-    auto mosaic = mosaic_script_.GenerateMosaicChangeAssembly(
+    auto mosaic = mosaic_script_.PatchOverworldMosaic(
         rom_, mosaic_tiles_, overworldCustomMosaicASM);
     if (!mosaic.ok()) {
       std::cout << mosaic;
@@ -168,6 +172,30 @@ void ScreenEditor::DrawToolset() {
   ImGui::Checkbox("Draw BG3", &drawing_bg3);
 }
 
+void ScreenEditor::DrawInventoryToolset() {
+  if (ImGui::BeginTable("InventoryToolset", 8, ImGuiTableFlags_SizingFixedFit, ImVec2(0, 0))) {
+    ImGui::TableSetupColumn("#drawTool");
+    ImGui::TableSetupColumn("#sep1");
+    ImGui::TableSetupColumn("#zoomOut");
+    ImGui::TableSetupColumn("#zoomIN");
+    ImGui::TableSetupColumn("#sep2");
+    ImGui::TableSetupColumn("#bg2Tool");
+    ImGui::TableSetupColumn("#bg3Tool");
+    ImGui::TableSetupColumn("#itemTool");
+
+    BUTTON_COLUMN(ICON_MD_UNDO)           
+    BUTTON_COLUMN(ICON_MD_REDO)  
+    TEXT_COLUMN(ICON_MD_MORE_VERT) 
+    BUTTON_COLUMN(ICON_MD_ZOOM_OUT)         
+    BUTTON_COLUMN(ICON_MD_ZOOM_IN)
+    TEXT_COLUMN(ICON_MD_MORE_VERT)    
+    BUTTON_COLUMN(ICON_MD_DRAW)
+    BUTTON_COLUMN(ICON_MD_BUILD)   
+
+    ImGui::EndTable();
+  }
+}
+
 }  // namespace editor
 }  // namespace app
 }  // namespace yaze

src/app/editor/screen_editor.h

@@ -9,9 +9,12 @@
 #include "app/core/constants.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_tile.h"
+#include "app/gfx/snes_palette.h"
 #include "app/rom.h"
 #include "app/zelda3/inventory.h"
 #include "gui/canvas.h"
+#include "gui/icons.h"
+#include "gui/color.h"
 
 namespace yaze {
 namespace app {
@@ -19,7 +22,6 @@ namespace editor {
 
 using MosaicArray = std::array<int, core::kNumOverworldMaps>;
 static int overworldCustomMosaicASM = 0x1301D0;
-static int overworldCustomMosaicArray = 0x1301F0;
 
 class ScreenEditor {
  public:
@@ -39,6 +41,7 @@ class ScreenEditor {
   void DrawInventoryMenuEditor();
 
   void DrawToolset();
+  void DrawInventoryToolset();
   void DrawWorldGrid(int world, int h = 8, int w = 8);
 
   char mosaic_tiles_[core::kNumOverworldMaps];
@@ -46,6 +49,7 @@ class ScreenEditor {
   ROM rom_;
   Bytes all_gfx_;
   zelda3::Inventory inventory_;
+  gfx::SNESPalette palette_;
   snes_asm::Script mosaic_script_;
   gui::Canvas screen_canvas_;
   gui::Canvas tilesheet_canvas_;