Remove deprecated BitmapManager and experiment flag

src/app/editor/dungeon/dungeon_editor.h

@@ -124,7 +124,6 @@ class DungeonEditor : public Editor,
   std::vector<gfx::Bitmap*> room_gfx_sheets_;
   std::vector<zelda3::dungeon::Room> rooms_;
   std::vector<zelda3::dungeon::RoomEntrance> entrances_;
-  std::vector<gfx::BitmapManager> room_graphics_;
   zelda3::dungeon::DungeonObjectRenderer object_renderer_;
 
   absl::flat_hash_map<uint16_t, int> spriteset_usage_;

src/app/editor/graphics/gfx_group_editor.cc

@@ -1,7 +1,5 @@
 #include "gfx_group_editor.h"
 
-#include "imgui/imgui.h"
-
 #include <cmath>
 
 #include "absl/status/status.h"
@@ -17,6 +15,7 @@
 #include "app/gui/input.h"
 #include "app/rom.h"
 #include "app/zelda3/overworld/overworld.h"
+#include "imgui/imgui.h"
 
 namespace yaze {
 namespace app {
@@ -123,7 +122,7 @@ void GfxGroupEditor::DrawBlocksetViewer(bool sheet_only) {
       BeginGroup();
       for (int i = 0; i < 8; i++) {
         int sheet_id = rom()->main_blockset_ids[selected_blockset_][i];
-        auto sheet = rom()->bitmap_manager()[sheet_id];
+        auto sheet = rom()->gfx_sheets().at(sheet_id);
         gui::BitmapCanvasPipeline(blockset_canvas_, sheet, 256, 0x10 * 0x04,
                                   0x20, true, false, 22);
       }
@@ -176,7 +175,7 @@ void GfxGroupEditor::DrawRoomsetViewer() {
       BeginGroup();
       for (int i = 0; i < 4; i++) {
         int sheet_id = rom()->room_blockset_ids[selected_roomset_][i];
-        auto sheet = rom()->bitmap_manager()[sheet_id];
+        auto sheet = rom()->gfx_sheets().at(sheet_id);
         gui::BitmapCanvasPipeline(roomset_canvas_, sheet, 256, 0x10 * 0x04,
                                   0x20, true, false, 23);
       }
@@ -214,7 +213,7 @@ void GfxGroupEditor::DrawSpritesetViewer(bool sheet_only) {
       BeginGroup();
       for (int i = 0; i < 4; i++) {
         int sheet_id = rom()->spriteset_ids[selected_spriteset_][i];
-        auto sheet = rom()->bitmap_manager()[115 + sheet_id];
+        auto sheet = rom()->gfx_sheets().at(115 + sheet_id);
         gui::BitmapCanvasPipeline(spriteset_canvas_, sheet, 256, 0x10 * 0x04,
                                   0x20, true, false, 24);
       }

src/app/editor/message/message_editor.cc

@@ -305,9 +305,7 @@ void MessageEditor::ReadAllTextData() {
       current_message_parsed.clear();
 
       continue;
-    }
-
-    if (current_byte == 0xFF) {
+    } else if (current_byte == 0xFF) {
       break;
     }
 
@@ -381,7 +379,7 @@ void MessageEditor::ReadAllTextData() {
 
 TextElement MessageEditor::FindMatchingCommand(uint8_t b) {
   TextElement empty_element;
-  for (const auto text_element : TextCommands) {
+  for (const auto& text_element : TextCommands) {
     if (text_element.ID == b) {
       return text_element;
     }

src/app/editor/overworld/overworld_editor.cc

@@ -695,7 +695,8 @@ void OverworldEditor::DrawTile8Selector() {
   graphics_bin_canvas_.DrawBackground();
   graphics_bin_canvas_.DrawContextMenu();
   if (all_gfx_loaded_) {
-    for (auto &[key, value] : rom()->bitmap_manager()) {
+    int key = 0;
+    for (auto &value : rom()->gfx_sheets()) {
       int offset = 0x40 * (key + 1);
       int top_left_y = graphics_bin_canvas_.zero_point().y + 2;
       if (key >= 1) {
@@ -707,6 +708,7 @@ void OverworldEditor::DrawTile8Selector() {
           ImVec2(graphics_bin_canvas_.zero_point().x + 2, top_left_y),
           ImVec2(graphics_bin_canvas_.zero_point().x + 0x100,
                  graphics_bin_canvas_.zero_point().y + offset));
+      key++;
     }
   }
   graphics_bin_canvas_.DrawGrid();

src/app/editor/sprite/sprite_editor.cc

@@ -175,7 +175,7 @@ void SpriteEditor::DrawCurrentSheets() {
     graphics_sheet_canvas_.DrawTileSelector(32);
     for (int i = 0; i < 8; i++) {
       graphics_sheet_canvas_.DrawBitmap(
-          rom()->bitmap_manager()[current_sheets_[i]], 1, (i * 0x40) + 1, 2);
+          rom()->gfx_sheets().at(current_sheets_[i]), 1, (i * 0x40) + 1, 2);
     }
     graphics_sheet_canvas_.DrawGrid();
     graphics_sheet_canvas_.DrawOverlay();

src/app/editor/utils/flags.h

@@ -52,7 +52,6 @@ struct FlagsMenu : public core::ExperimentFlags {
     Checkbox("Enable Console Logging", &mutable_flags()->kLogToConsole);
     Checkbox("Enable Texture Streaming",
              &mutable_flags()->kLoadTexturesAsStreaming);
-    Checkbox("Use Bitmap Manager", &mutable_flags()->kUseBitmapManager);
     Checkbox("Log Instructions to Debugger",
              &mutable_flags()->kLogInstructions);
     Checkbox("Save All Palettes", &mutable_flags()->kSaveAllPalettes);