Move Overworld constants to Overworld

src/app/editor/overworld_editor.cc

@@ -347,7 +347,7 @@ absl::Status OverworldEditor::LoadGraphics() {
   }
 
   // Render the overworld maps loaded from the ROM.
-  for (int i = 0; i < core::kNumOverworldMaps; ++i) {
+  for (int i = 0; i < zelda3::kNumOverworldMaps; ++i) {
     overworld_.SetCurrentMap(i);
     auto palette = overworld_.AreaPalette();
     core::BuildAndRenderBitmapPipeline(0x200, 0x200, 0x200,

src/app/editor/screen_editor.cc

@@ -32,33 +32,9 @@ void ScreenEditor::Update() {
   DrawNamingScreenEditor();
   DrawOverworldMapEditor();
   DrawDungeonMapsEditor();
-  DrawMosaicEditor();
   END_TAB_BAR()
 }
 
-void ScreenEditor::DrawWorldGrid(int world, int h, int w) {
-  const float time = (float)ImGui::GetTime();
-
-  int i = 0;
-  if (world == 1) {
-    i = 64;
-  } else if (world == 2) {
-    i = 128;
-  }
-  for (int y = 0; y < h; y++)
-    for (int x = 0; x < w; x++) {
-      if (x > 0) ImGui::SameLine();
-      ImGui::PushID(y * 4 + x);
-      std::string label = absl::StrCat(" #", absl::StrFormat("%x", i));
-      if (ImGui::Selectable(label.c_str(), mosaic_tiles_[i] != 0, 0,
-                            ImVec2(35, 25))) {
-        mosaic_tiles_[i] ^= 1;
-      }
-      ImGui::PopID();
-      i++;
-    }
-}
-
 void ScreenEditor::DrawInventoryMenuEditor() {
   TAB_ITEM("Inventory Menu")
 
@@ -117,30 +93,6 @@ void ScreenEditor::DrawDungeonMapsEditor() {
   END_TAB_ITEM()
 }
 
-void ScreenEditor::DrawMosaicEditor() {
-  TAB_ITEM("Mosaic Transitions")
-
-  if (ImGui::BeginTable("Worlds", 3, ImGuiTableFlags_Borders)) {
-    ImGui::TableSetupColumn("Light World");
-    ImGui::TableSetupColumn("Dark World");
-    ImGui::TableSetupColumn("Special World");
-    ImGui::TableHeadersRow();
-
-    ImGui::TableNextColumn();
-    DrawWorldGrid(0);
-
-    ImGui::TableNextColumn();
-    DrawWorldGrid(1);
-
-    ImGui::TableNextColumn();
-    DrawWorldGrid(2, 4);
-
-    ImGui::EndTable();
-  }
-
-  END_TAB_ITEM()
-}
-
 void ScreenEditor::DrawToolset() {
   static bool show_bg1 = true;
   static bool show_bg2 = true;

src/app/editor/screen_editor.h

@@ -19,15 +19,12 @@ namespace yaze {
 namespace app {
 namespace editor {
 
-using MosaicArray = std::array<int, core::kNumOverworldMaps>;
-
 class ScreenEditor : public SharedROM {
  public:
   ScreenEditor();
   void Update();
 
  private:
-  void DrawMosaicEditor();
   void DrawTitleScreenEditor();
   void DrawNamingScreenEditor();
   void DrawOverworldMapEditor();
@@ -36,9 +33,6 @@ class ScreenEditor : public SharedROM {
 
   void DrawToolset();
   void DrawInventoryToolset();
-  void DrawWorldGrid(int world, int h = 8, int w = 8);
-
-  char mosaic_tiles_[core::kNumOverworldMaps];
 
   Bytes all_gfx_;
   zelda3::Inventory inventory_;