summaryrefslogtreecommitdiff
path: root/include/tables
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 /include/tables
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 'include/tables')
-rw-r--r--include/tables/dmatables/dmadata_table_jp.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/tables/dmatables/dmadata_table_jp.h b/include/tables/dmatables/dmadata_table_jp.h
index 733798b..b8df70f 100644
--- a/include/tables/dmatables/dmadata_table_jp.h
+++ b/include/tables/dmatables/dmadata_table_jp.h
@@ -116,8 +116,8 @@ DEFINE_DMA_ENTRY(ovl__00814FA0, "ovl__00814FA0")
DEFINE_DMA_ENTRY(ovl__00814FA0_reloc, "ovl__00814FA0_reloc")
DEFINE_DMA_ENTRY(ovl__00815B70, "ovl__00815B70")
DEFINE_DMA_ENTRY(ovl__00815B70_reloc, "ovl__00815B70_reloc")
-DEFINE_DMA_ENTRY(ovl__0081AA60, "ovl__0081AA60")
-DEFINE_DMA_ENTRY(ovl__0081AA60_reloc, "ovl__0081AA60_reloc")
+DEFINE_DMA_ENTRY(m_random_field_ovl, "m_random_field_ovl")
+DEFINE_DMA_ENTRY(m_random_field_ovl_reloc, "m_random_field_ovl_reloc")
DEFINE_DMA_ENTRY(ovl__0081D9D0, "ovl__0081D9D0")
DEFINE_DMA_ENTRY(ovl__0081D9D0_reloc, "ovl__0081D9D0_reloc")
DEFINE_DMA_ENTRY(ac_set_ovl_insect, "ac_set_ovl_insect")
@@ -2288,7 +2288,7 @@ DEFINE_DMA_ENTRY(segment_01148000, "segment_01148000")
DEFINE_DMA_ENTRY(segment_0114A000, "segment_0114A000")
DEFINE_DMA_ENTRY(segment_01188000, "segment_01188000")
DEFINE_DMA_ENTRY(segment_011AB000, "segment_011AB000")
-DEFINE_DMA_ENTRY(segment_011E2000, "segment_011E2000")
+DEFINE_DMA_ENTRY(data_combi, "data_combi")
DEFINE_DMA_ENTRY(segment_011E3000, "segment_011E3000")
DEFINE_DMA_ENTRY(segment_011E4000, "segment_011E4000")
DEFINE_DMA_ENTRY(segment_011E5000, "segment_011E5000")