Move *dat files to tables dir

2 months ago · 5937734b85
69 changed files with 111 additions and 109 deletions
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@ -21,7 +21,6 @@ set(libdevilutionx_SRCS
  loadsave.cpp
  menu.cpp
  minitext.cpp
-  misdat.cpp
  missiles.cpp
  movie.cpp
  msg.cpp
@ -31,9 +30,7 @@ set(libdevilutionx_SRCS
  portal.cpp
  restrict.cpp
  sync.cpp
-  textdat.cpp
  tmsg.cpp
-  townerdat.cpp
  towners.cpp
  track.cpp

@ -156,6 +153,11 @@ set(libdevilutionx_SRCS

  storm/storm_net.cpp
  storm/storm_svid.cpp
+
+  tables/misdat.cpp
+  tables/textdat.cpp
+  tables/townerdat.cpp
+
  utils/display.cpp
  utils/language.cpp
  utils/sdl_bilinear_scale.cpp
@ -486,7 +488,7 @@ target_link_dependencies(libdevilutionx_logged_fstream PUBLIC
 )

 add_devilutionx_object_library(libdevilutionx_items
-  itemdat.cpp
+  tables/itemdat.cpp
  items.cpp
 )
 target_link_dependencies(libdevilutionx_items PUBLIC
@ -523,7 +525,7 @@ target_link_libraries(libdevilutionx_log INTERFACE
 target_sources(libdevilutionx_log INTERFACE $<TARGET_OBJECTS:libdevilutionx_strings>)

 add_devilutionx_object_library(libdevilutionx_level_objects
-  objdat.cpp
+  tables/objdat.cpp
  objects.cpp
 )
 target_link_dependencies(libdevilutionx_level_objects PUBLIC
@ -540,7 +542,7 @@ target_link_dependencies(libdevilutionx_level_objects PUBLIC
 )

 add_devilutionx_object_library(libdevilutionx_monster
-  monstdat.cpp
+  tables/monstdat.cpp
  monster.cpp
 )
 target_link_dependencies(libdevilutionx_monster
@ -644,7 +646,7 @@ endif()

 add_devilutionx_object_library(libdevilutionx_player
  player.cpp
-  playerdat.cpp
+  tables/playerdat.cpp
 )
 target_link_dependencies(libdevilutionx_player
  PUBLIC
@ -676,7 +678,7 @@ add_devilutionx_object_library(libdevilutionx_quick_messages
 )

 add_devilutionx_object_library(libdevilutionx_spells
-  spelldat.cpp
+  tables/spelldat.cpp
  spells.cpp
 )
 target_link_dependencies(libdevilutionx_spells PUBLIC
--- a/Source/DiabloUI/diabloui.cpp
+++ b/Source/DiabloUI/diabloui.cpp
@ -50,8 +50,8 @@
 #include "init.hpp"
 #include "options.h"
 #include "player.h"
-#include "playerdat.hpp"
 #include "sound_effect_enums.h"
+#include "tables/playerdat.hpp"
 #include "utils/algorithm/container.hpp"
 #include "utils/display.h"
 #include "utils/enum_traits.h"
--- a/Source/DiabloUI/hero/selhero.cpp
+++ b/Source/DiabloUI/hero/selhero.cpp
@ -33,7 +33,7 @@
 #include "levels/gendung.h"
 #include "options.h"
 #include "pfile.h"
-#include "playerdat.hpp"
+#include "tables/playerdat.hpp"
 #include "utils/enum_traits.h"
 #include "utils/language.h"
 #include "utils/sdl_geometry.h"
--- a/Source/control/control.hpp
+++ b/Source/control/control.hpp
@ -28,8 +28,8 @@
 #include "engine/render/text_render.hpp"
 #include "engine/size.hpp"
 #include "panels/ui_panels.hpp"
-#include "spelldat.h"
 #include "spells.h"
+#include "tables/spelldat.h"
 #include "utils/attributes.h"
 #include "utils/string_or_view.hpp"
 #include "utils/ui_fwd.h"
--- a/Source/dead.cpp
+++ b/Source/dead.cpp
@ -11,8 +11,8 @@
 #include "headless_mode.hpp"
 #include "levels/gendung.h"
 #include "lighting.h"
-#include "misdat.h"
 #include "monster.h"
+#include "tables/misdat.h"

 namespace devilution {

--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@ -76,7 +76,6 @@
 #include "menu.h"
 #include "minitext.h"
 #include "missiles.h"
-#include "monstdat.h"
 #include "movie.h"
 #include "multi.h"
 #include "nthread.h"
@ -88,7 +87,6 @@
 #include "panels/spell_book.hpp"
 #include "panels/spell_list.hpp"
 #include "pfile.h"
-#include "playerdat.hpp"
 #include "plrmsg.h"
 #include "qol/chatlog.h"
 #include "qol/floatingnumbers.h"
@ -101,6 +99,8 @@
 #include "stores.h"
 #include "storm/storm_net.hpp"
 #include "storm/storm_svid.h"
+#include "tables/monstdat.h"
+#include "tables/playerdat.hpp"
 #include "towners.h"
 #include "track.h"
 #include "utils/console.h"
--- a/Source/diablo.h
+++ b/Source/diablo.h
@ -19,7 +19,7 @@
 #endif

 #ifdef _DEBUG
-#include "monstdat.h"
+#include "tables/monstdat.h"
 #endif
 #include "levels/gendung.h"
 #include "utils/attributes.h"
--- a/Source/discord/discord.cpp
+++ b/Source/discord/discord.cpp
@ -23,7 +23,7 @@
 #include "multi.h"
 #include "panels/charpanel.hpp"
 #include "player.h"
-#include "playerdat.hpp"
+#include "tables/playerdat.hpp"
 #include "utils/language.h"
 #include "utils/str_cat.hpp"

--- a/Source/items.cpp
+++ b/Source/items.cpp
@ -52,7 +52,6 @@
 #include "headless_mode.hpp"
 #include "inv.h"
 #include "inv_iterators.hpp"
-#include "itemdat.h"
 #include "items/validation.h"
 #include "levels/gendung.h"
 #include "levels/gendung_defs.hpp"
@ -60,25 +59,26 @@
 #include "levels/town.h"
 #include "lighting.h"
 #include "minitext.h"
-#include "monstdat.h"
 #include "monster.h"
 #include "msg.h"
 #include "multi.h"
-#include "objdat.h"
 #include "objects.h"
 #include "options.h"
 #include "pack.h"
 #include "panels/info_box.hpp"
 #include "panels/ui_panels.hpp"
 #include "player.h"
-#include "playerdat.hpp"
 #include "qol/stash.h"
 #include "quests.h"
 #include "sound_effect_enums.h"
-#include "spelldat.h"
 #include "spells.h"
 #include "stores.h"
-#include "textdat.h"
+#include "tables/itemdat.h"
+#include "tables/monstdat.h"
+#include "tables/objdat.h"
+#include "tables/playerdat.hpp"
+#include "tables/spelldat.h"
+#include "tables/textdat.h"
 #include "utils/enum_traits.h"
 #include "utils/format_int.hpp"
 #include "utils/is_of.hpp"
--- a/Source/items.h
+++ b/Source/items.h
@ -13,9 +13,9 @@
 #include "engine/animationinfo.h"
 #include "engine/point.hpp"
 #include "engine/surface.hpp"
-#include "itemdat.h"
 #include "levels/dun_tile.hpp"
 #include "monster.h"
+#include "tables/itemdat.h"
 #include "utils/is_of.hpp"
 #include "utils/string_or_view.hpp"

--- a/Source/items/validation.cpp
+++ b/Source/items/validation.cpp
@ -9,10 +9,10 @@
 #include <cstdint>

 #include "items.h"
-#include "monstdat.h"
 #include "msg.h"
 #include "player.h"
 #include "spells.h"
+#include "tables/monstdat.h"
 #include "utils/endian_swap.hpp"
 #include "utils/is_of.hpp"

--- a/Source/levels/drlg_l3.cpp
+++ b/Source/levels/drlg_l3.cpp
@ -10,10 +10,10 @@
 #include "levels/setmaps.h"
 #include "lighting.h"
 #include "monster.h"
-#include "objdat.h"
 #include "objects.h"
 #include "player.h"
 #include "quests.h"
+#include "tables/objdat.h"
 #include "utils/is_of.hpp"

 namespace devilution {
--- a/Source/levels/drlg_l4.cpp
+++ b/Source/levels/drlg_l4.cpp
@ -12,8 +12,8 @@
 #include "levels/gendung.h"
 #include "monster.h"
 #include "multi.h"
-#include "objdat.h"
 #include "player.h"
+#include "tables/objdat.h"
 #include "utils/is_of.hpp"

 namespace devilution {
--- a/Source/levels/setmaps.cpp
+++ b/Source/levels/setmaps.cpp
@ -14,9 +14,9 @@
 #include "levels/gendung.h"
 #include "levels/trigs.h"
 #include "msg.h"
-#include "objdat.h"
 #include "objects.h"
 #include "quests.h"
+#include "tables/objdat.h"
 #include "utils/language.h"

 namespace devilution {
--- a/Source/levels/themes.h
+++ b/Source/levels/themes.h
@ -8,7 +8,7 @@
 #include <cstdint>

 #include "levels/gendung.h"
-#include "objdat.h"
+#include "tables/objdat.h"

 namespace devilution {

--- a/Source/loadsave.cpp
+++ b/Source/loadsave.cpp
@ -33,10 +33,10 @@
 #include "monsters/validation.hpp"
 #include "mpq/mpq_common.hpp"
 #include "pfile.h"
-#include "playerdat.hpp"
 #include "plrmsg.h"
 #include "qol/stash.h"
 #include "stores.h"
+#include "tables/playerdat.hpp"
 #include "utils/algorithm/container.hpp"
 #include "utils/endian_read.hpp"
 #include "utils/endian_swap.hpp"
--- a/Source/lua/modules/dev/monsters.cpp
+++ b/Source/lua/modules/dev/monsters.cpp
@ -11,9 +11,9 @@
 #include "levels/tile_properties.hpp"
 #include "lighting.h"
 #include "lua/metadoc.hpp"
-#include "monstdat.h"
 #include "monster.h"
 #include "player.h"
+#include "tables/monstdat.h"
 #include "utils/str_case.hpp"
 #include "utils/str_cat.hpp"

--- a/Source/lua/modules/dev/player/spells.cpp
+++ b/Source/lua/modules/dev/player/spells.cpp
@ -8,8 +8,8 @@

 #include "lua/metadoc.hpp"
 #include "msg.h"
-#include "spelldat.h"
 #include "spells.h"
+#include "tables/spelldat.h"
 #include "utils/str_cat.hpp"

 namespace devilution {
--- a/Source/lua/modules/items.cpp
+++ b/Source/lua/modules/items.cpp
@ -6,10 +6,10 @@
 #include <sol/sol.hpp>

 #include "data/file.hpp"
-#include "itemdat.h"
 #include "items.h"
 #include "lua/metadoc.hpp"
 #include "player.h"
+#include "tables/itemdat.h"
 #include "utils/utf8.hpp"

 namespace devilution {
--- a/Source/lua/modules/monsters.cpp
+++ b/Source/lua/modules/monsters.cpp
@ -7,7 +7,7 @@

 #include "data/file.hpp"
 #include "lua/metadoc.hpp"
-#include "monstdat.h"
+#include "tables/monstdat.h"
 #include "utils/language.h"
 #include "utils/str_split.hpp"

--- a/Source/minitext.cpp
+++ b/Source/minitext.cpp
@ -17,8 +17,8 @@
 #include "engine/render/clx_render.hpp"
 #include "engine/render/primitive_render.hpp"
 #include "engine/render/text_render.hpp"
-#include "playerdat.hpp"
-#include "textdat.h"
+#include "tables/playerdat.hpp"
+#include "tables/textdat.h"
 #include "utils/language.h"
 #include "utils/timer.hpp"

--- a/Source/minitext.h
+++ b/Source/minitext.h
@ -6,7 +6,7 @@
 #pragma once

 #include "engine/surface.hpp"
-#include "textdat.h"
+#include "tables/textdat.h"

 namespace devilution {

--- a/Source/missiles.cpp
+++ b/Source/missiles.cpp
@ -37,19 +37,19 @@
 #include "engine/world_tile.hpp"
 #include "function_ref.hpp"
 #include "interfac.h"
-#include "itemdat.h"
 #include "items.h"
 #include "levels/gendung.h"
 #include "levels/gendung_defs.hpp"
-#include "misdat.h"
-#include "monstdat.h"
 #include "msg.h"
 #include "multi.h"
 #include "objects.h"
 #include "player.h"
-#include "playerdat.hpp"
 #include "sound_effect_enums.h"
-#include "spelldat.h"
+#include "tables/itemdat.h"
+#include "tables/misdat.h"
+#include "tables/monstdat.h"
+#include "tables/playerdat.hpp"
+#include "tables/spelldat.h"
 #include "utils/enum_traits.h"
 #ifdef _DEBUG
 #include "debug.h"
--- a/Source/missiles.h
+++ b/Source/missiles.h
@ -12,10 +12,10 @@
 #include "engine/displacement.hpp"
 #include "engine/point.hpp"
 #include "engine/world_tile.hpp"
-#include "misdat.h"
 #include "monster.h"
 #include "player.h"
-#include "spelldat.h"
+#include "tables/misdat.h"
+#include "tables/spelldat.h"
 #include "utils/is_of.hpp"

 namespace devilution {
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@ -59,7 +59,6 @@
 #include "game_mode.hpp"
 #include "headless_mode.hpp"
 #include "inv.h"
-#include "itemdat.h"
 #include "items.h"
 #include "levels/crypt.h"
 #include "levels/drlg_l4.h"
@ -71,23 +70,24 @@
 #include "levels/trigs.h"
 #include "lighting.h"
 #include "minitext.h"
-#include "misdat.h"
 #include "missiles.h"
-#include "monstdat.h"
 #include "movie.h"
 #include "msg.h"
 #include "multi.h"
-#include "objdat.h"
 #include "objects.h"
 #include "options.h"
 #include "player.h"
-#include "playerdat.hpp"
 #include "qol/floatingnumbers.h"
 #include "quests.h"
 #include "sound_effect_enums.h"
-#include "spelldat.h"
 #include "storm/storm_net.hpp"
-#include "textdat.h"
+#include "tables/itemdat.h"
+#include "tables/misdat.h"
+#include "tables/monstdat.h"
+#include "tables/objdat.h"
+#include "tables/playerdat.hpp"
+#include "tables/spelldat.h"
+#include "tables/textdat.h"
 #include "utils/algorithm/container.hpp"
 #include "utils/attributes.h"
 #include "utils/cl2_to_clx.hpp"
--- a/Source/monster.h
+++ b/Source/monster.h
@ -23,10 +23,10 @@
 #include "engine/world_tile.hpp"
 #include "game_mode.hpp"
 #include "levels/dun_tile.hpp"
-#include "misdat.h"
-#include "monstdat.h"
-#include "spelldat.h"
-#include "textdat.h"
+#include "tables/misdat.h"
+#include "tables/monstdat.h"
+#include "tables/spelldat.h"
+#include "tables/textdat.h"
 #include "utils/language.h"

 namespace devilution {
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@ -38,10 +38,10 @@
 #include "minitext.h"
 #include "missiles.h"
 #include "monster.h"
-#include "objdat.h"
 #include "options.h"
 #include "qol/stash.h"
 #include "stores.h"
+#include "tables/objdat.h"
 #include "towners.h"
 #include "track.h"
 #include "utils/algorithm/container.hpp"
--- a/Source/objects.h
+++ b/Source/objects.h
@ -16,11 +16,11 @@
 #include "engine/point.hpp"
 #include "engine/rectangle.hpp"
 #include "engine/world_tile.hpp"
-#include "itemdat.h"
 #include "levels/dun_tile.hpp"
 #include "monster.h"
-#include "objdat.h"
-#include "textdat.h"
+#include "tables/itemdat.h"
+#include "tables/objdat.h"
+#include "tables/textdat.h"
 #include "utils/attributes.h"
 #include "utils/is_of.hpp"
 #include "utils/string_or_view.hpp"
--- a/Source/pack.cpp
+++ b/Source/pack.cpp
@ -11,9 +11,9 @@
 #include "game_mode.hpp"
 #include "items/validation.h"
 #include "loadsave.h"
-#include "playerdat.hpp"
 #include "plrmsg.h"
 #include "stores.h"
+#include "tables/playerdat.hpp"
 #include "utils/endian_read.hpp"
 #include "utils/endian_swap.hpp"
 #include "utils/is_of.hpp"
--- a/Source/panels/charpanel.cpp
+++ b/Source/panels/charpanel.cpp
@ -15,7 +15,7 @@
 #include "engine/render/text_render.hpp"
 #include "panels/ui_panels.hpp"
 #include "player.h"
-#include "playerdat.hpp"
+#include "tables/playerdat.hpp"
 #include "utils/algorithm/container.hpp"
 #include "utils/display.h"
 #include "utils/enum_traits.h"
--- a/Source/panels/partypanel.cpp
+++ b/Source/panels/partypanel.cpp
@ -17,10 +17,10 @@
 #include "inv.h"
 #include "options.h"
 #include "pfile.h"
-#include "playerdat.hpp"
 #include "qol/monhealthbar.h"
 #include "qol/stash.h"
 #include "stores.h"
+#include "tables/playerdat.hpp"
 #include "utils/status_macros.hpp"
 #include "utils/surface_to_clx.hpp"

--- a/Source/panels/spell_book.cpp
+++ b/Source/panels/spell_book.cpp
@ -20,7 +20,7 @@
 #include "panels/spell_icons.hpp"
 #include "panels/ui_panels.hpp"
 #include "player.h"
-#include "spelldat.h"
+#include "tables/spelldat.h"
 #include "utils/language.h"
 #include "utils/status_macros.hpp"

--- a/Source/panels/spell_icons.hpp
+++ b/Source/panels/spell_icons.hpp
@ -8,7 +8,7 @@
 #include "engine/clx_sprite.hpp"
 #include "engine/point.hpp"
 #include "engine/surface.hpp"
-#include "spelldat.h"
+#include "tables/spelldat.h"

 #define SPLICONLENGTH 56

--- a/Source/panels/spell_list.hpp
+++ b/Source/panels/spell_list.hpp
@ -5,7 +5,7 @@

 #include "engine/point.hpp"
 #include "engine/surface.hpp"
-#include "spelldat.h"
+#include "tables/spelldat.h"

 namespace devilution {

--- a/Source/pfile.cpp
+++ b/Source/pfile.cpp
@ -27,8 +27,8 @@
 #include "menu.h"
 #include "mpq/mpq_common.hpp"
 #include "pack.h"
-#include "playerdat.hpp"
 #include "qol/stash.h"
+#include "tables/playerdat.hpp"
 #include "utils/endian_read.hpp"
 #include "utils/endian_swap.hpp"
 #include "utils/file_util.h"
--- a/Source/player.h
+++ b/Source/player.h
@ -26,8 +26,8 @@
 #include "levels/dun_tile.hpp"
 #include "levels/gendung.h"
 #include "multi.h"
-#include "playerdat.hpp"
-#include "spelldat.h"
+#include "tables/playerdat.hpp"
+#include "tables/spelldat.h"
 #include "utils/attributes.h"
 #include "utils/enum_traits.h"
 #include "utils/is_of.hpp"
--- a/Source/portal.cpp
+++ b/Source/portal.cpp
@ -6,10 +6,10 @@
 #include "portal.h"

 #include "lighting.h"
-#include "misdat.h"
 #include "missiles.h"
 #include "multi.h"
 #include "player.h"
+#include "tables/misdat.h"

 namespace devilution {

--- a/Source/qol/floatingnumbers.h
+++ b/Source/qol/floatingnumbers.h
@ -6,9 +6,9 @@
 #pragma once

 #include "engine/point.hpp"
-#include "misdat.h"
 #include "monster.h"
 #include "player.h"
+#include "tables/misdat.h"

 namespace devilution {

--- a/Source/qol/xpbar.cpp
+++ b/Source/qol/xpbar.cpp
@ -18,7 +18,7 @@
 #include "engine/render/primitive_render.hpp"
 #include "game_mode.hpp"
 #include "options.h"
-#include "playerdat.hpp"
+#include "tables/playerdat.hpp"
 #include "utils/format_int.hpp"
 #include "utils/language.h"

--- a/Source/quests.cpp
+++ b/Source/quests.cpp
@ -29,7 +29,7 @@
 #include "options.h"
 #include "panels/ui_panels.hpp"
 #include "stores.h"
-#include "townerdat.hpp"
+#include "tables/townerdat.hpp"
 #include "towners.h"
 #include "utils/endian_swap.hpp"
 #include "utils/is_of.hpp"
--- a/Source/quests.h
+++ b/Source/quests.h
@ -12,9 +12,9 @@
 #include "engine/surface.hpp"
 #include "levels/gendung.h"
 #include "monster.h"
-#include "objdat.h"
 #include "panels/info_box.hpp"
-#include "textdat.h"
+#include "tables/objdat.h"
+#include "tables/textdat.h"
 #include "utils/attributes.h"

 namespace devilution {
--- a/Source/quests/validation.cpp
+++ b/Source/quests/validation.cpp
@ -8,9 +8,9 @@

 #include <cstdint>

-#include "objdat.h"
 #include "quests.h"
-#include "textdat.h"
+#include "tables/objdat.h"
+#include "tables/textdat.h"
 #include "utils/is_of.hpp"

 namespace devilution {
--- a/Source/quests/validation.hpp
+++ b/Source/quests/validation.hpp
@ -7,8 +7,8 @@

 #include <cstdint>

-#include "objdat.h"
 #include "quests.h"
+#include "tables/objdat.h"

 namespace devilution {

--- a/Source/stores.cpp
+++ b/Source/stores.cpp
@ -26,7 +26,7 @@
 #include "options.h"
 #include "panels/info_box.hpp"
 #include "qol/stash.h"
-#include "townerdat.hpp"
+#include "tables/townerdat.hpp"
 #include "towners.h"
 #include "utils/format_int.hpp"
 #include "utils/language.h"
--- a/Source/tables/itemdat.cpp
+++ b/Source/tables/itemdat.cpp
@ -4,7 +4,7 @@
 * Implementation of all item data.
 */

-#include "itemdat.h"
+#include "tables/itemdat.h"

 #include <string_view>
 #include <vector>
@ -15,7 +15,7 @@
 #include "data/iterators.hpp"
 #include "data/record_reader.hpp"
 #include "lua/lua_global.hpp"
-#include "spelldat.h"
+#include "tables/spelldat.h"
 #include "utils/str_cat.hpp"

 namespace devilution {
--- a/Source/tables/itemdat.h
+++ b/Source/tables/itemdat.h
@ -13,8 +13,8 @@
 #include <expected.hpp>
 #include <magic_enum/magic_enum.hpp>

-#include "objdat.h"
-#include "spelldat.h"
+#include "tables/objdat.h"
+#include "tables/spelldat.h"

 namespace devilution {

--- a/Source/tables/misdat.cpp
+++ b/Source/tables/misdat.cpp
@ -3,7 +3,7 @@
 *
 * Implementation of data related to missiles.
 */
-#include "misdat.h"
+#include "tables/misdat.h"

 #include <array>
 #include <cassert>
@ -25,7 +25,7 @@
 #include "missiles.h"
 #include "mpq/mpq_common.hpp"
 #include "sound_effect_enums.h"
-#include "spelldat.h"
+#include "tables/spelldat.h"
 #include "utils/file_name_generator.hpp"
 #include "utils/status_macros.hpp"
 #include "utils/str_cat.hpp"
--- a/Source/tables/misdat.h
+++ b/Source/tables/misdat.h
@ -14,7 +14,7 @@

 #include "effects.h"
 #include "engine/clx_sprite.hpp"
-#include "spelldat.h"
+#include "tables/spelldat.h"
 #include "utils/enum_traits.h"

 namespace devilution {
--- a/Source/tables/monstdat.cpp
+++ b/Source/tables/monstdat.cpp
@ -3,7 +3,7 @@
 *
 * Implementation of all monster data.
 */
-#include "monstdat.h"
+#include "tables/monstdat.h"

 #include <algorithm>
 #include <cstddef>
@ -26,7 +26,7 @@
 #include "items.h"
 #include "lua/lua_global.hpp"
 #include "monster.h"
-#include "textdat.h"
+#include "tables/textdat.h"
 #include "utils/language.h"

 namespace devilution {
--- a/Source/tables/monstdat.h
+++ b/Source/tables/monstdat.h
@ -13,7 +13,7 @@
 #include <magic_enum/magic_enum.hpp>

 #include "cursor.h"
-#include "textdat.h"
+#include "tables/textdat.h"

 namespace devilution {

--- a/Source/tables/objdat.cpp
+++ b/Source/tables/objdat.cpp
@ -3,7 +3,7 @@
 *
 * Implementation of all object data.
 */
-#include "objdat.h"
+#include "tables/objdat.h"

 #include <string>
 #include <string_view>
--- a/Source/tables/objdat.h
+++ b/Source/tables/objdat.h
--- a/Source/tables/playerdat.cpp
+++ b/Source/tables/playerdat.cpp
@ -4,7 +4,7 @@
 * Implementation of all player data.
 */

-#include "playerdat.hpp"
+#include "tables/playerdat.hpp"

 #include <algorithm>
 #include <array>
@ -22,7 +22,7 @@
 #include "data/value_reader.hpp"
 #include "items.h"
 #include "player.h"
-#include "textdat.h"
+#include "tables/textdat.h"
 #include "utils/language.h"
 #include "utils/static_vector.hpp"
 #include "utils/str_cat.hpp"
--- a/Source/tables/playerdat.hpp
+++ b/Source/tables/playerdat.hpp
@ -9,8 +9,8 @@
 #include <cstdint>

 #include "effects.h"
-#include "itemdat.h"
-#include "spelldat.h"
+#include "tables/itemdat.h"
+#include "tables/spelldat.h"

 namespace devilution {

--- a/Source/tables/spelldat.cpp
+++ b/Source/tables/spelldat.cpp
@ -3,7 +3,7 @@
 *
 * Implementation of all spell data.
 */
-#include "spelldat.h"
+#include "tables/spelldat.h"

 #include <optional>
 #include <string_view>
--- a/Source/tables/spelldat.h
+++ b/Source/tables/spelldat.h
--- a/Source/tables/textdat.cpp
+++ b/Source/tables/textdat.cpp
@ -3,7 +3,7 @@
 *
 * Implementation of all dialog texts.
 */
-#include "textdat.h"
+#include "tables/textdat.h"

 #include <ankerl/unordered_dense.h>
 #include <fmt/core.h>
--- a/Source/tables/textdat.h
+++ b/Source/tables/textdat.h
--- a/Source/tables/townerdat.cpp
+++ b/Source/tables/townerdat.cpp
@ -3,7 +3,7 @@
 *
 * Implementation of towner data loading from TSV files.
 */
-#include "townerdat.hpp"
+#include "tables/townerdat.hpp"

 #include <charconv>
 #include <optional>
--- a/Source/tables/townerdat.hpp
+++ b/Source/tables/townerdat.hpp
@ -12,8 +12,8 @@

 #include "engine/direction.hpp"
 #include "levels/gendung.h"
-#include "objdat.h"
-#include "textdat.h"
+#include "tables/objdat.h"
+#include "tables/textdat.h"
 #include "towners.h"
 #include "utils/attributes.h"

--- a/Source/towners.cpp
+++ b/Source/towners.cpp
@ -13,8 +13,8 @@
 #include "inv.h"
 #include "minitext.h"
 #include "stores.h"
-#include "textdat.h"
-#include "townerdat.hpp"
+#include "tables/textdat.h"
+#include "tables/townerdat.hpp"
 #include "utils/is_of.hpp"
 #include "utils/language.h"
 #include "utils/str_case.hpp"
--- a/test/pack_test.cpp
+++ b/test/pack_test.cpp
@ -5,9 +5,9 @@
 #include "cursor.h"
 #include "engine/assets.hpp"
 #include "game_mode.hpp"
-#include "monstdat.h"
 #include "pack.h"
-#include "playerdat.hpp"
+#include "tables/monstdat.h"
+#include "tables/playerdat.hpp"
 #include "utils/endian_swap.hpp"
 #include "utils/is_of.hpp"
 #include "utils/paths.h"
--- a/test/player_test.cpp
+++ b/test/player_test.cpp
@ -5,7 +5,7 @@
 #include "cursor.h"
 #include "engine/assets.hpp"
 #include "init.hpp"
-#include "playerdat.hpp"
+#include "tables/playerdat.hpp"

 using namespace devilution;

--- a/test/quests_test.cpp
+++ b/test/quests_test.cpp
@ -3,7 +3,7 @@

 #include "quests.h"

-#include "objdat.h" // For quest IDs
+#include "tables/objdat.h" // For quest IDs

 namespace devilution {
 void ResetQuests()
--- a/test/tile_properties_test.cpp
+++ b/test/tile_properties_test.cpp
@ -5,8 +5,8 @@

 #include "levels/dun_tile.hpp"
 #include "levels/gendung.h"
-#include "objdat.h"
 #include "objects.h"
+#include "tables/objdat.h"

 namespace devilution {
 namespace {
--- a/test/timedemo_test.cpp
+++ b/test/timedemo_test.cpp
@ -14,10 +14,10 @@
 #include "headless_mode.hpp"
 #include "init.hpp"
 #include "lua/lua_global.hpp"
-#include "monstdat.h"
 #include "options.h"
 #include "pfile.h"
-#include "playerdat.hpp"
+#include "tables/monstdat.h"
+#include "tables/playerdat.hpp"
 #include "utils/display.h"
 #include "utils/paths.h"

--- a/test/townerdat_test.cpp
+++ b/test/townerdat_test.cpp
@ -7,7 +7,7 @@
 #endif

 #include "engine/assets.hpp"
-#include "townerdat.hpp"
+#include "tables/townerdat.hpp"
 #include "towners.h"
 #include "utils/paths.h"

--- a/test/vendor_test.cpp
+++ b/test/vendor_test.cpp
@ -3,8 +3,8 @@

 #include "items.h"
 #include "player.h"
-#include "playerdat.hpp"
 #include "stores.h"
+#include "tables/playerdat.hpp"

 #include "engine/assets.hpp"
 #include "engine/random.hpp"
--- a/test/writehero_test.cpp
+++ b/test/writehero_test.cpp
@ -14,7 +14,7 @@
 #include "loadsave.h"
 #include "pack.h"
 #include "pfile.h"
-#include "playerdat.hpp"
+#include "tables/playerdat.hpp"
 #include "utils/endian_swap.hpp"
 #include "utils/file_util.h"
 #include "utils/paths.h"