housekeeping cli and py

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

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 {

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)

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;
   }