summaryrefslogtreecommitdiff
path: root/src/combi
diff options
context:
space:
mode:
authorkuchenmitsahne <25233413+kuchenmitsahne@users.noreply.github.com>2025-06-04 19:38:23 -0400
committerGitHub <noreply@github.com>2025-06-04 16:38:23 -0700
commita4d5910cdb9bed05fa5aea4476a3cf4ef178be06 (patch)
tree017ad9a1547e3206190c216d8a7ddd2e95ff327c /src/combi
parent8c6ae625aef6d07741cd8925f422f43ae24b198c (diff)
m_random_field OK (#241)
* 25 functions OK * 10 functions OK * Add block type and block kind enums/defines * Formatting/style pass * Move `FieldMakeBlockType` to `m_field_make` * Remove unused/duplicate defines * Split data out for `m_quest` and `m_random_field`; rename data symbols * Generate `m_random_field.c` and rename function symbols. * mRF_BlockTypeDirect2GateType, mRF_BlockTypeDirect2GateData OK * mRF_Type2BlockInfo, mRF_Info2BlockType, mRF_GateType2GateCount, mRF_SearchPond, mRF_Attr2BeastRoadAttr, mRF_CheckBeastRoad OK * mFI_GetUnitCol OK; mRF_PrintDebug and mRF_BlockInf2CheckBeastRoad OK (pending data import). * Fix `m_random_field` code split; all newly included functions OK * Fix mRF_Malloc return type; formatting pass * Name m_random_field_ovl * Rename data symbols (m_random_field_ovl). * Rename symbols (all functions named) * Import data * Declare overlay segment; rename symbols * mRF_MakeRandomField OK (all functions matching). * Extract asset `data_combi_table` * Clean up mRF_MakeRandomField; document m_field_make.h * Rename mCoBG_unkStruct->unk6 as unitAttribute * Misc cleanup and formatting. * Rename additional data symbols (m_random_field_ovl). * Formatting pass * Improve documentation of BackgroundAttribute enum. * Formatting pass; add omitted attribute.
Diffstat (limited to 'src/combi')
-rw-r--r--src/combi/data_combi.c6
-rw-r--r--src/combi/data_combi.h8
2 files changed, 14 insertions, 0 deletions
diff --git a/src/combi/data_combi.c b/src/combi/data_combi.c
new file mode 100644
index 0000000..7fc9b46
--- /dev/null
+++ b/src/combi/data_combi.c
@@ -0,0 +1,6 @@
+#include "data_combi.h"
+
+#include "assets/jp/combi/data_combi_table.inc.c"
+// TODO: // Determine whether define is needed at all; it is not included in this segment,
+// but present in DnM+ as `data_combi_table_number`.
+#define DATA_COMBI_TABLE_NUMBER = ARRAY_COUNT(data_combi_table);
diff --git a/src/combi/data_combi.h b/src/combi/data_combi.h
new file mode 100644
index 0000000..08523d5
--- /dev/null
+++ b/src/combi/data_combi.h
@@ -0,0 +1,8 @@
+#ifndef OBJECT_DATA_COMBI_H
+#define OBJECT_DATA_COMBI_H
+
+#include "m_field_make.h"
+
+extern FieldMakeComboInfo data_combi_table[];
+
+#endif