scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

housekeeping cli and py

Browse Source
This commit is contained in:
scawful
2024-08-10 20:30:45 -04:00
parent 23f00ce478
commit 6e6f833b8e
4 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/base/overworld.h
View File

@@ -21,8 +21,8 @@ struct z3_overworld_map {
* @brief Primitive of the overworld. * @brief Primitive of the overworld.
*/ */
struct z3_overworld { struct z3_overworld {
z3_overworld_map* maps; /**< Pointer to the overworld maps. */ z3_overworld_map** maps; /**< Pointer to the overworld maps. */
void* impl; // yaze::app::Overworld* void* impl; // yaze::app::Overworld*
}; };
#ifdef __cplusplus #ifdef __cplusplus

19
src/cli/command_handler.h
View File

@@ -22,24 +22,7 @@
#include "app/gui/canvas.h" #include "app/gui/canvas.h"
#include "app/rom.h" #include "app/rom.h"
#include "app/zelda3/overworld/overworld.h" #include "app/zelda3/overworld/overworld.h"
#include "asar.h" #include "asar-dll-bindings/c/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);
namespace yaze { namespace yaze {
namespace cli { namespace cli {

4
src/py/yaze_py.cc
View File

@@ -24,8 +24,8 @@ BOOST_PYTHON_MODULE(yaze) {
.def_readonly("colors", &snes_palette::colors); .def_readonly("colors", &snes_palette::colors);
class_<z3_sprite_action>("z3_sprite_action") class_<z3_sprite_action>("z3_sprite_action")
.def_readonly("name", &sprite_action::name) .def_readonly("name", &z3_sprite_action::name)
.def_readonly("id", &sprite_action::id); .def_readonly("id", &z3_sprite_action::id);
class_<z3_sprite>("sprite") class_<z3_sprite>("sprite")
.def_readonly("name", &z3_sprite::name) .def_readonly("name", &z3_sprite::name)

6
src/yaze.cc
View File

@@ -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::Rom* internal_rom = static_cast<yaze::app::Rom*>(rom->impl);
yaze::app::zelda3::Overworld* internal_overworld = yaze::app::zelda3::overworld::Overworld* internal_overworld =
new yaze::app::zelda3::Overworld(); new yaze::app::zelda3::overworld::Overworld();
auto load_ow = internal_overworld->Load(internal_rom); auto load_ow = internal_overworld->Load(*internal_rom);
if (!load_ow.ok()) { if (!load_ow.ok()) {
return nullptr; return nullptr;
} }