From e7e3437a894af4f3e7f9bc5437ea5fd680d2073b Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Tue, 28 May 2024 17:44:54 -0400
Subject: [PATCH] move LoadGfxGroups to rom.cc

---
 src/app/rom.cc | 38 ++++++++++++++++++++++++++++++++++++++
 src/app/rom.h  | 39 +--------------------------------------
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/src/app/rom.cc b/src/app/rom.cc
index d310f422..49df0d9c 100644
--- a/src/app/rom.cc
+++ b/src/app/rom.cc
@@ -340,6 +340,44 @@ absl::Status Rom::SaveAllPalettes() {
   return absl::OkStatus();
 }
 
+void Rom::LoadGfxGroups() {
+  main_blockset_ids.resize(37, std::vector<uint8_t>(8));
+  room_blockset_ids.resize(82, std::vector<uint8_t>(4));
+  spriteset_ids.resize(144, std::vector<uint8_t>(4));
+  paletteset_ids.resize(72, std::vector<uint8_t>(4));
+
+  int gfxPointer =
+      (rom_data_[kGfxGroupsPointer + 1] << 8) + rom_data_[kGfxGroupsPointer];
+  gfxPointer = core::SnesToPc(gfxPointer);
+
+  for (int i = 0; i < 37; i++) {
+    for (int j = 0; j < 8; j++) {
+      main_blockset_ids[i][j] = rom_data_[gfxPointer + (i * 8) + j];
+    }
+  }
+
+  for (int i = 0; i < 82; i++) {
+    for (int j = 0; j < 4; j++) {
+      room_blockset_ids[i][j] =
+          rom_data_[core::entrance_gfx_group + (i * 4) + j];
+    }
+  }
+
+  for (int i = 0; i < 144; i++) {
+    for (int j = 0; j < 4; j++) {
+      spriteset_ids[i][j] =
+          rom_data_[version_constants().kSpriteBlocksetPointer + (i * 4) + j];
+    }
+  }
+
+  for (int i = 0; i < 72; i++) {
+    for (int j = 0; j < 4; j++) {
+      paletteset_ids[i][j] =
+          rom_data_[version_constants().kDungeonPalettesGroups + (i * 4) + j];
+    }
+  }
+}
+
 void Rom::SaveGroupsToRom() {
   int gfxPointer =
       (rom_data_[kGfxGroupsPointer + 1] << 8) + rom_data_[kGfxGroupsPointer];
diff --git a/src/app/rom.h b/src/app/rom.h
index a2f1e8b8..daa6b5c8 100644
--- a/src/app/rom.h
+++ b/src/app/rom.h
@@ -532,44 +532,7 @@ class Rom : public core::ExperimentFlags {
   std::vector<std::vector<uint8_t>> spriteset_ids;
   std::vector<std::vector<uint8_t>> paletteset_ids;
 
-  void LoadGfxGroups() {
-    main_blockset_ids.resize(37, std::vector<uint8_t>(8));
-    room_blockset_ids.resize(82, std::vector<uint8_t>(4));
-    spriteset_ids.resize(144, std::vector<uint8_t>(4));
-    paletteset_ids.resize(72, std::vector<uint8_t>(4));
-
-    int gfxPointer =
-        (rom_data_[kGfxGroupsPointer + 1] << 8) + rom_data_[kGfxGroupsPointer];
-    gfxPointer = core::SnesToPc(gfxPointer);
-
-    for (int i = 0; i < 37; i++) {
-      for (int j = 0; j < 8; j++) {
-        main_blockset_ids[i][j] = rom_data_[gfxPointer + (i * 8) + j];
-      }
-    }
-
-    for (int i = 0; i < 82; i++) {
-      for (int j = 0; j < 4; j++) {
-        room_blockset_ids[i][j] =
-            rom_data_[core::entrance_gfx_group + (i * 4) + j];
-      }
-    }
-
-    for (int i = 0; i < 144; i++) {
-      for (int j = 0; j < 4; j++) {
-        spriteset_ids[i][j] =
-            rom_data_[version_constants().kSpriteBlocksetPointer + (i * 4) + j];
-      }
-    }
-
-    for (int i = 0; i < 72; i++) {
-      for (int j = 0; j < 4; j++) {
-        paletteset_ids[i][j] =
-            rom_data_[version_constants().kDungeonPalettesGroups + (i * 4) + j];
-      }
-    }
-  }
-
+  void LoadGfxGroups();
   void SaveGroupsToRom();
 
   auto resource_label() { return &resource_label_manager_; }