From 6e6f833b8e42564392d8bf243a40d7e95bccff61 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sat, 10 Aug 2024 20:30:45 -0400
Subject: [PATCH] housekeeping cli and py

---
 src/base/overworld.h      |  4 ++--
 src/cli/command_handler.h | 19 +------------------
 src/py/yaze_py.cc         |  4 ++--
 src/yaze.cc               |  6 +++---
 4 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/src/base/overworld.h b/src/base/overworld.h
index f7f8df2d..f6537a50 100644
--- a/src/base/overworld.h
+++ b/src/base/overworld.h
@@ -21,8 +21,8 @@ struct z3_overworld_map {
  * @brief Primitive of the overworld.
  */
 struct z3_overworld {
-  z3_overworld_map* maps; /**< Pointer to the overworld maps. */
-  void* impl;             // yaze::app::Overworld*
+  z3_overworld_map** maps; /**< Pointer to the overworld maps. */
+  void* impl;              // yaze::app::Overworld*
 };
 
 #ifdef __cplusplus
diff --git a/src/cli/command_handler.h b/src/cli/command_handler.h
index 883c7375..0fc95389 100644
--- a/src/cli/command_handler.h
+++ b/src/cli/command_handler.h
@@ -22,24 +22,7 @@
 #include "app/gui/canvas.h"
 #include "app/rom.h"
 #include "app/zelda3/overworld/overworld.h"
-#include "asar.h"
-
-extern "C" bool asar_patch(const char* patchloc, char* romdata, int buflen,
-                           int* romlen);
-
-// These structures are returned from various functions.
-struct errordata {
-  const char* fullerrdata;
-  const char* rawerrdata;
-  const char* block;
-  const char* filename;
-  int line;
-  const char* callerfilename;
-  int callerline;
-  int errid;
-};
-
-extern "C" const struct errordata* asar_geterrors(int* count);
+#include "asar-dll-bindings/c/asar.h"
 
 namespace yaze {
 namespace cli {
diff --git a/src/py/yaze_py.cc b/src/py/yaze_py.cc
index e022fa89..97e99052 100644
--- a/src/py/yaze_py.cc
+++ b/src/py/yaze_py.cc
@@ -24,8 +24,8 @@ BOOST_PYTHON_MODULE(yaze) {
       .def_readonly("colors", &snes_palette::colors);
 
   class_<z3_sprite_action>("z3_sprite_action")
-      .def_readonly("name", &sprite_action::name)
-      .def_readonly("id", &sprite_action::id);
+      .def_readonly("name", &z3_sprite_action::name)
+      .def_readonly("id", &z3_sprite_action::id);
 
   class_<z3_sprite>("sprite")
       .def_readonly("name", &z3_sprite::name)
diff --git a/src/yaze.cc b/src/yaze.cc
index 73c6fc8c..5f43380b 100644
--- a/src/yaze.cc
+++ b/src/yaze.cc
@@ -87,9 +87,9 @@ z3_overworld* yaze_load_overworld(const z3_rom* rom) {
 
   yaze::app::Rom* internal_rom = static_cast<yaze::app::Rom*>(rom->impl);
 
-  yaze::app::zelda3::Overworld* internal_overworld =
-      new yaze::app::zelda3::Overworld();
-  auto load_ow = internal_overworld->Load(internal_rom);
+  yaze::app::zelda3::overworld::Overworld* internal_overworld =
+      new yaze::app::zelda3::overworld::Overworld();
+  auto load_ow = internal_overworld->Load(*internal_rom);
   if (!load_ow.ok()) {
     return nullptr;
   }