From 200659e5d9afd53bcecca77aac74a58fcdca6079 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Thu, 8 Aug 2024 21:18:22 -0400
Subject: [PATCH] rename rom to z3_rom

---
 src/py/yaze_py.cc | 10 +++++-----
 src/yaze.cc       | 29 ++++++++++++++---------------
 src/yaze.h        | 15 ++++++++++-----
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/py/yaze_py.cc b/src/py/yaze_py.cc
index 24aa1744..36c1b1bf 100644
--- a/src/py/yaze_py.cc
+++ b/src/py/yaze_py.cc
@@ -7,11 +7,11 @@
 BOOST_PYTHON_MODULE(yaze) {
   using namespace boost::python;
 
-  class_<rom>("rom")
-      .def_readonly("filename", &rom::filename)
-      .def_readonly("data", &rom::data)
-      .def_readonly("size", &rom::size)
-      .def_readonly("impl", &rom::impl);
+  class_<z3_rom>("rom")
+      .def_readonly("filename", &z3_rom::filename)
+      .def_readonly("data", &z3_rom::data)
+      .def_readonly("size", &z3_rom::size)
+      .def_readonly("impl", &z3_rom::impl);
 
   class_<snes_color>("snes_color")
       .def_readonly("red", &snes_color::red)
diff --git a/src/yaze.cc b/src/yaze.cc
index afd1afdd..4c666ac2 100644
--- a/src/yaze.cc
+++ b/src/yaze.cc
@@ -8,30 +8,29 @@ void yaze_initialize(void) {}
 // TODO: Implement yaze_cleanup
 void yaze_cleanup(void) {}
 
-rom load_rom(const char* filename) {
+z3_rom* yaze_load_rom(const char* filename) {
   yaze::app::Rom* internal_rom;
   internal_rom = new yaze::app::Rom();
   if (!internal_rom->LoadFromFile(filename).ok()) {
     delete internal_rom;
-    rom rom;
-    rom.impl = nullptr;
-    rom.filename = filename;
-    rom.data = nullptr;
-    rom.size = 0;
-    return rom;
+    return nullptr;
   }
 
-  rom rom;
-  rom.impl = internal_rom;
-  rom.filename = filename;
-  rom.data = internal_rom->data();
-  rom.size = internal_rom->size();
+  z3_rom* rom = new z3_rom();
+  rom->filename = filename;
+  rom->impl = internal_rom;
+  rom->data = internal_rom->data();
+  rom->size = internal_rom->size();
   return rom;
 }
 
-void unload_rom(rom rom) {
-  if (rom.impl) {
-    delete static_cast<yaze::app::Rom*>(rom.impl);
+void yaze_unload_rom(z3_rom* rom) {
+  if (rom->impl) {
+    delete static_cast<yaze::app::Rom*>(rom->impl);
+  }
+
+  if (rom) {
+    delete rom;
   }
 }
 
diff --git a/src/yaze.h b/src/yaze.h
index 8485709e..c42a191b 100644
--- a/src/yaze.h
+++ b/src/yaze.h
@@ -15,17 +15,22 @@ void yaze_initialize(void);
 
 void yaze_cleanup(void);
 
-typedef struct rom rom;
-
-struct rom {
+typedef struct z3_rom z3_rom;
+struct z3_rom {
   const char* filename;
   const uint8_t* data;
   size_t size;
   void* impl;  // yaze::app::Rom*
 };
 
-rom load_rom(const char* filename);
-void unload_rom(rom rom);
+struct yaze_flags {
+  int debug;
+  const char* rom_filename;
+  z3_rom* rom;
+};
+
+z3_rom* yaze_load_rom(const char* filename);
+void yaze_unload_rom(z3_rom* rom);
 
 snes_color get_color_from_paletteset(const rom* rom, int palette_set,
                                      int palette, int color);