Remove dungeon.h and overworld.h headers; integrate their structures directly into zelda.h and update include paths in related source files.

incl/dungeon.h

@@ -1,78 +0,0 @@
-#ifndef YAZE_BASE_DUNGEON_H_
-#define YAZE_BASE_DUNGEON_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdbool.h>
-#include <stdint.h>
-
-typedef struct dungeon_sprite {
-  const char* name;
-  uint8_t id;
-  uint8_t subtype;
-} dungeon_sprite;
-
-typedef enum background2 {
-  Off,
-  Parallax,
-  Dark,
-  OnTop,
-  Translucent,
-  Addition,
-  Normal,
-  Transparent,
-  DarkRoom
-} background2;
-
-typedef struct object_door {
-  short id;
-  uint8_t x;
-  uint8_t y;
-  uint8_t size;
-  uint8_t type;
-  uint8_t layer;
-} object_door;
-
-typedef struct staircase {
-  uint8_t id;
-  uint8_t room;
-  const char* label;
-} staircase;
-
-typedef struct chest {
-  uint8_t x;
-  uint8_t y;
-  uint8_t item;
-  bool picker;
-  bool big_chest;
-} chest;
-
-typedef struct chest_data {
-  uint8_t id;
-  bool size;
-} chest_data;
-
-typedef struct destination {
-  uint8_t index;
-  uint8_t target;
-  uint8_t target_layer;
-} destination;
-
-typedef struct zelda3_dungeon_room {
-  background2 bg2;
-  dungeon_sprite* sprites;
-  object_door* doors;
-  staircase* staircases;
-  chest* chests;
-  chest_data* chests_in_room;
-  destination pits;
-  destination stairs[4];
-} zelda3_dungeon_room;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // YAZE_BASE_DUNGEON_H_

incl/overworld.h

@@ -1,40 +0,0 @@
-#ifndef YAZE_OVERWORLD_H
-#define YAZE_OVERWORLD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-/**
- * @brief Primitive of an overworld map.
- */
-typedef struct zelda3_overworld_map {
-  uint8_t id; /**< ID of the overworld map. */
-  uint8_t parent_id;
-  uint8_t quadrant_id;
-  uint8_t world_id;
-  uint8_t game_state;
-  uint8_t area_graphics;
-  uint8_t area_palette;
-
-  uint8_t sprite_graphics[3];
-  uint8_t sprite_palette[3];
-  uint8_t area_music[4];
-  uint8_t static_graphics[16];
-} zelda3_overworld_map;
-
-/**
- * @brief Primitive of the overworld.
- */
-typedef struct zelda3_overworld {
-  void *impl;                  // yaze::Overworld*
-  zelda3_overworld_map **maps; /**< Pointer to the overworld maps. */
-} zelda3_overworld;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // YAZE_OVERWORLD_H

incl/yaze.h

@@ -8,8 +8,6 @@ extern "C" {
 #include <stddef.h>
 #include <stdint.h>
 
-#include "dungeon.h"
-#include "overworld.h"
 #include "snes.h"
 #include "zelda.h"
 

incl/zelda.h

@@ -6,6 +6,7 @@ extern "C" {
 #endif
 
 #include <stdint.h>
+#include <stdbool.h>
 
 /**
  * @brief Different versions of the game supported by yaze.
@@ -94,6 +95,95 @@ zelda3_rom* yaze_load_rom(const char* filename);
 void yaze_unload_rom(zelda3_rom* rom);
 void yaze_save_rom(zelda3_rom* rom, const char* filename);
 
+/**
+ * @brief Primitive of an overworld map.
+ */
+typedef struct zelda3_overworld_map {
+  uint8_t id; /**< ID of the overworld map. */
+  uint8_t parent_id;
+  uint8_t quadrant_id;
+  uint8_t world_id;
+  uint8_t game_state;
+  uint8_t area_graphics;
+  uint8_t area_palette;
+
+  uint8_t sprite_graphics[3];
+  uint8_t sprite_palette[3];
+  uint8_t area_music[4];
+  uint8_t static_graphics[16];
+} zelda3_overworld_map;
+
+/**
+ * @brief Primitive of the overworld.
+ */
+typedef struct zelda3_overworld {
+  void *impl;                  // yaze::Overworld*
+  zelda3_overworld_map **maps; /**< Pointer to the overworld maps. */
+} zelda3_overworld;
+
+typedef struct dungeon_sprite {
+  const char* name;
+  uint8_t id;
+  uint8_t subtype;
+} dungeon_sprite;
+
+typedef enum background2 {
+  Off,
+  Parallax,
+  Dark,
+  OnTop,
+  Translucent,
+  Addition,
+  Normal,
+  Transparent,
+  DarkRoom
+} background2;
+
+typedef struct object_door {
+  short id;
+  uint8_t x;
+  uint8_t y;
+  uint8_t size;
+  uint8_t type;
+  uint8_t layer;
+} object_door;
+
+typedef struct staircase {
+  uint8_t id;
+  uint8_t room;
+  const char* label;
+} staircase;
+
+typedef struct chest {
+  uint8_t x;
+  uint8_t y;
+  uint8_t item;
+  bool picker;
+  bool big_chest;
+} chest;
+
+typedef struct chest_data {
+  uint8_t id;
+  bool size;
+} chest_data;
+
+typedef struct destination {
+  uint8_t index;
+  uint8_t target;
+  uint8_t target_layer;
+} destination;
+
+typedef struct zelda3_dungeon_room {
+  background2 bg2;
+  dungeon_sprite* sprites;
+  object_door* doors;
+  staircase* staircases;
+  chest* chests;
+  chest_data* chests_in_room;
+  destination pits;
+  destination stairs[4];
+} zelda3_dungeon_room;
+
 #ifdef __cplusplus
 }
 #endif

src/app/zelda3/dungeon/room.cc

@@ -1,6 +1,6 @@
 #include "room.h"
 
-#include <dungeon.h>
+#include <yaze.h>
 
 #include <cstdint>
 #include <vector>

src/app/zelda3/dungeon/room.h

@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_ZELDA3_DUNGEON_ROOM_H
 #define YAZE_APP_ZELDA3_DUNGEON_ROOM_H
 
-#include <dungeon.h>
+#include <yaze.h>
 
 #include <cstdint>
 #include <string_view>

src/yaze.cc

@@ -8,7 +8,6 @@
 #include "app/core/controller.h"
 #include "app/rom.h"
 #include "app/zelda3/overworld/overworld.h"
-#include "dungeon.h"
 #include "util/flag.h"
 #include "yaze_config.h"