From 00a7c5dd3dfe7abac69a57bb0b8eafcec0a305b2 Mon Sep 17 00:00:00 2001 From: Kuruyia Date: Wed, 19 Mar 2025 17:12:08 +0100 Subject: [PATCH] Move some map-related constant files to the field sub-directory This moves the files holding constants for the BDHC, map matrix and map prop subsystems to the `include/constants/field` directory. Signed-off-by: Kuruyia --- include/constants/bdhc.h | 8 -------- include/constants/field/bdhc.h | 8 ++++++++ include/constants/{ => field}/map_matrix.h | 6 +++--- include/constants/{ => field}/map_prop.h | 6 +++--- include/map_matrix.h | 2 +- src/map_matrix.c | 2 +- src/overlay005/bdhc.c | 2 +- src/overlay005/honey_tree.c | 2 +- src/overlay005/loaded_map_buffers.c | 2 +- src/overlay005/ov5_021D431C.c | 2 +- src/overlay006/ov6_02242AF0.c | 2 +- src/overlay006/ov6_02246C24.c | 2 +- src/overlay006/ov6_02246F00.c | 2 +- src/overlay006/ov6_02247078.c | 2 +- src/overlay006/ov6_02247D30.c | 2 +- src/overlay008/ov8_02249960.c | 2 +- src/unk_0206C784.c | 2 +- src/unk_0207160C.c | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 include/constants/bdhc.h create mode 100644 include/constants/field/bdhc.h rename include/constants/{ => field}/map_matrix.h (54%) rename include/constants/{ => field}/map_prop.h (95%) diff --git a/include/constants/bdhc.h b/include/constants/bdhc.h deleted file mode 100644 index b8699abeb0..0000000000 --- a/include/constants/bdhc.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef POKEPLATINUM_CONSTANTS_BDHC_H -#define POKEPLATINUM_CONSTANTS_BDHC_H - -#define BDHC_BUFFER_SIZE 0x9000 - -#define BDHC_MAGIC_LENGTH 4 - -#endif // POKEPLATINUM_CONSTANTS_BDHC_H diff --git a/include/constants/field/bdhc.h b/include/constants/field/bdhc.h new file mode 100644 index 0000000000..0f920a203c --- /dev/null +++ b/include/constants/field/bdhc.h @@ -0,0 +1,8 @@ +#ifndef POKEPLATINUM_CONSTANTS_FIELD_BDHC_H +#define POKEPLATINUM_CONSTANTS_FIELD_BDHC_H + +#define BDHC_BUFFER_SIZE 0x9000 + +#define BDHC_MAGIC_LENGTH 4 + +#endif // POKEPLATINUM_CONSTANTS_FIELD_BDHC_H diff --git a/include/constants/map_matrix.h b/include/constants/field/map_matrix.h similarity index 54% rename from include/constants/map_matrix.h rename to include/constants/field/map_matrix.h index f54a87751f..2f61891f40 100644 --- a/include/constants/map_matrix.h +++ b/include/constants/field/map_matrix.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_CONSTANTS_MAP_MATRIX_H -#define POKEPLATINUM_CONSTANTS_MAP_MATRIX_H +#ifndef POKEPLATINUM_CONSTANTS_FIELD_MAP_MATRIX_H +#define POKEPLATINUM_CONSTANTS_FIELD_MAP_MATRIX_H #define MAP_MATRIX_MAX_WIDTH 30 #define MAP_MATRIX_MAX_HEIGHT 30 @@ -7,4 +7,4 @@ #define MAP_MATRIX_MAX_NAME_LENGTH 16 -#endif // POKEPLATINUM_CONSTANTS_MAP_MATRIX_H +#endif // POKEPLATINUM_CONSTANTS_FIELD_MAP_MATRIX_H diff --git a/include/constants/map_prop.h b/include/constants/field/map_prop.h similarity index 95% rename from include/constants/map_prop.h rename to include/constants/field/map_prop.h index 43d057d320..4993ddeb4b 100644 --- a/include/constants/map_prop.h +++ b/include/constants/field/map_prop.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_CONSTANTS_MAP_PROP_H -#define POKEPLATINUM_CONSTANTS_MAP_PROP_H +#ifndef POKEPLATINUM_CONSTANTS_FIELD_MAP_PROP_H +#define POKEPLATINUM_CONSTANTS_FIELD_MAP_PROP_H enum MapPropModelId { // Model name: treeeff @@ -78,4 +78,4 @@ enum MapPropModelId { MAP_PROP_MODEL_HOTEL_GRAND_LAKE_DOOR = 527, }; -#endif // POKEPLATINUM_CONSTANTS_MAP_PROP_H +#endif // POKEPLATINUM_CONSTANTS_FIELD_MAP_PROP_H diff --git a/include/map_matrix.h b/include/map_matrix.h index 2086c84244..3e78e4466f 100644 --- a/include/map_matrix.h +++ b/include/map_matrix.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_MAP_MATRIX_H #define POKEPLATINUM_MAP_MATRIX_H -#include "constants/map_matrix.h" +#include "constants/field/map_matrix.h" typedef struct MapMatrixData { u8 height; diff --git a/src/map_matrix.c b/src/map_matrix.c index c80d9a2550..68a3a2e3aa 100644 --- a/src/map_matrix.c +++ b/src/map_matrix.c @@ -3,8 +3,8 @@ #include #include +#include "constants/field/map_matrix.h" #include "constants/heap.h" -#include "constants/map_matrix.h" #include "heap.h" #include "map_header.h" diff --git a/src/overlay005/bdhc.c b/src/overlay005/bdhc.c index 36a75e442c..1716eb388c 100644 --- a/src/overlay005/bdhc.c +++ b/src/overlay005/bdhc.c @@ -3,7 +3,7 @@ #include #include -#include "constants/bdhc.h" +#include "constants/field/bdhc.h" #include "constants/heap.h" #include "fx_util.h" diff --git a/src/overlay005/honey_tree.c b/src/overlay005/honey_tree.c index ac6c9abd32..0976dab37b 100644 --- a/src/overlay005/honey_tree.c +++ b/src/overlay005/honey_tree.c @@ -3,8 +3,8 @@ #include #include +#include "constants/field/map_prop.h" #include "constants/map_object.h" -#include "constants/map_prop.h" #include "generated/map_headers.h" #include "struct_defs/struct_02055130.h" diff --git a/src/overlay005/loaded_map_buffers.c b/src/overlay005/loaded_map_buffers.c index 5276e5be2a..4d06f99a71 100644 --- a/src/overlay005/loaded_map_buffers.c +++ b/src/overlay005/loaded_map_buffers.c @@ -3,7 +3,7 @@ #include #include -#include "constants/bdhc.h" +#include "constants/field/bdhc.h" #include "constants/heap.h" #include "heap.h" diff --git a/src/overlay005/ov5_021D431C.c b/src/overlay005/ov5_021D431C.c index a72ff8ce38..6377b9730b 100644 --- a/src/overlay005/ov5_021D431C.c +++ b/src/overlay005/ov5_021D431C.c @@ -3,7 +3,7 @@ #include #include -#include "constants/map_prop.h" +#include "constants/field/map_prop.h" #include "struct_decls/struct_02061AB4_decl.h" #include "struct_defs/struct_02055130.h" diff --git a/src/overlay006/ov6_02242AF0.c b/src/overlay006/ov6_02242AF0.c index 32964e8f42..2809631a7d 100644 --- a/src/overlay006/ov6_02242AF0.c +++ b/src/overlay006/ov6_02242AF0.c @@ -3,7 +3,7 @@ #include #include -#include "constants/map_prop.h" +#include "constants/field/map_prop.h" #include "struct_decls/struct_02027860_decl.h" #include "struct_decls/struct_02061AB4_decl.h" diff --git a/src/overlay006/ov6_02246C24.c b/src/overlay006/ov6_02246C24.c index fa9093ef5e..aa4cfdc45a 100644 --- a/src/overlay006/ov6_02246C24.c +++ b/src/overlay006/ov6_02246C24.c @@ -3,7 +3,7 @@ #include #include -#include "constants/map_prop.h" +#include "constants/field/map_prop.h" #include "field/field_system.h" #include "overlay005/area_data.h" diff --git a/src/overlay006/ov6_02246F00.c b/src/overlay006/ov6_02246F00.c index 9d0b80d351..a25e982e3a 100644 --- a/src/overlay006/ov6_02246F00.c +++ b/src/overlay006/ov6_02246F00.c @@ -3,7 +3,7 @@ #include #include -#include "constants/map_prop.h" +#include "constants/field/map_prop.h" #include "field/field_system.h" #include "overlay005/area_data.h" diff --git a/src/overlay006/ov6_02247078.c b/src/overlay006/ov6_02247078.c index 25bacbb779..c248b116ed 100644 --- a/src/overlay006/ov6_02247078.c +++ b/src/overlay006/ov6_02247078.c @@ -3,7 +3,7 @@ #include #include -#include "constants/map_prop.h" +#include "constants/field/map_prop.h" #include "struct_defs/struct_02055130.h" diff --git a/src/overlay006/ov6_02247D30.c b/src/overlay006/ov6_02247D30.c index 3d26fbc3e6..bd41c7eced 100644 --- a/src/overlay006/ov6_02247D30.c +++ b/src/overlay006/ov6_02247D30.c @@ -3,7 +3,7 @@ #include #include -#include "constants/map_prop.h" +#include "constants/field/map_prop.h" #include "field/field_system.h" #include "overlay005/area_data.h" diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index 5b34238369..aec54ce804 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -3,7 +3,7 @@ #include #include -#include "constants/map_prop.h" +#include "constants/field/map_prop.h" #include "struct_decls/struct_02027860_decl.h" #include "struct_decls/struct_0205E884_decl.h" diff --git a/src/unk_0206C784.c b/src/unk_0206C784.c index 9ccf56405d..3a16deeb30 100644 --- a/src/unk_0206C784.c +++ b/src/unk_0206C784.c @@ -3,7 +3,7 @@ #include #include -#include "constants/map_prop.h" +#include "constants/field/map_prop.h" #include "struct_defs/struct_02055130.h" #include "struct_defs/struct_0206C8D4.h" diff --git a/src/unk_0207160C.c b/src/unk_0207160C.c index faf092ef9c..427eb8fe7a 100644 --- a/src/unk_0207160C.c +++ b/src/unk_0207160C.c @@ -3,7 +3,7 @@ #include #include -#include "constants/map_prop.h" +#include "constants/field/map_prop.h" #include "struct_decls/struct_02027860_decl.h"