From f43328a1aeab0b8c1b5c5c5a9c871554901a591d Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sat, 12 Apr 2025 11:29:45 -0400
Subject: [PATCH] Update overworld loading logic to use Rom pointers directly;
 adjust test cases for consistency.

---
 src/yaze.cc                   | 4 ++--
 test/CMakeLists.txt           | 2 +-
 test/zelda3/overworld_test.cc | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/yaze.cc b/src/yaze.cc
index 4bd1c2ef..04d96fb0 100644
--- a/src/yaze.cc
+++ b/src/yaze.cc
@@ -157,8 +157,8 @@ zelda3_overworld *yaze_load_overworld(const zelda3_rom *rom) {
   }
 
   yaze::Rom *internal_rom = static_cast<yaze::Rom *>(rom->impl);
-  auto internal_overworld = new yaze::zelda3::Overworld(*internal_rom);
-  if (!internal_overworld->Load(*internal_rom).ok()) {
+  auto internal_overworld = new yaze::zelda3::Overworld(internal_rom);
+  if (!internal_overworld->Load(internal_rom).ok()) {
     return nullptr;
   }
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7fd2bfb9..6c3568da 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -16,9 +16,9 @@ add_executable(
   yaze_test
   yaze_test.cc
   rom_test.cc
+  test_editor.cc
   gfx/compression_test.cc
   gfx/snes_palette_test.cc
-  integration/test_editor.cc
   zelda3/message_test.cc
   zelda3/overworld_test.cc
   zelda3/sprite_builder_test.cc
diff --git a/test/zelda3/overworld_test.cc b/test/zelda3/overworld_test.cc
index 8b432db6..9283b3f0 100644
--- a/test/zelda3/overworld_test.cc
+++ b/test/zelda3/overworld_test.cc
@@ -20,12 +20,12 @@ class OverworldTest : public ::testing::Test, public SharedRom {
   }
   void TearDown() override {}
 
-  zelda3::Overworld overworld_{*rom()};
+  zelda3::Overworld overworld_{rom()};
 };
 
 TEST_F(OverworldTest, OverworldLoadNoRomDataError) {
   Rom rom;
-  EXPECT_THAT(overworld_.Load(rom),
+  EXPECT_THAT(overworld_.Load(&rom),
               StatusIs(absl::StatusCode::kInvalidArgument));
 }