diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2024-04-25 21:16:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-25 18:16:47 -0700 |
| commit | 666cb6ad4a673a7d40db270f5a0a3755553314e9 (patch) | |
| tree | 0bf1b7582cdffd586be678ed8942ae954ca22225 /src/code/object_table.c | |
| parent | 654fc4fd749a0a5b169634e9d20b887991ad6247 (diff) | |
More header cleanup (#1604)
* low hanging fruits on variables.h
* z_actor functions
* Move RomFile to z64object.h
* Revert "z_actor functions"
This reverts commit aa99967d165070d651901e459368c4f5418ef0ab.
* yeet
* z64actor_dlftbls.h
* Move object segment declarations to object_table.c
* Move Camera functions
* z64nmi_buff.h
* fix merge
* su_mtx.h, sys_cmpdma.h and sys_initial_check.h
* sys_ucode.h
* sys_flashrom.h
* Remove unnecessary includes
* z64kanfont.h
* flg_set.h
* z64DLF.h
* z64lifemeter.h
* z64path.h
* format
* ObjectOverlay
* bss
* Yeet ObjectOverlay
* review
* review
* format
* bss
* z64font.h
Diffstat (limited to 'src/code/object_table.c')
| -rw-r--r-- | src/code/object_table.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/code/object_table.c b/src/code/object_table.c index 87c4069fe..4ecdfa293 100644 --- a/src/code/object_table.c +++ b/src/code/object_table.c @@ -10,10 +10,21 @@ s16 gPlayerFormObjectIds[PLAYER_FORM_MAX] = { ObjectId gObjectTableSize = OBJECT_ID_MAX; +// Segment declarations (also used in the table below) +#define DEFINE_OBJECT(name, _enumValue) DECLARE_ROM_SEGMENT(name) +#define DEFINE_OBJECT_UNSET(_enumValue) +#define DEFINE_OBJECT_EMPTY(_name, _enumValue) + +#include "tables/object_table.h" + +#undef DEFINE_OBJECT +#undef DEFINE_OBJECT_UNSET +#undef DEFINE_OBJECT_EMPTY + // Object Table definition -#define DEFINE_OBJECT(name, _enumValue) { SEGMENT_ROM_START(name), SEGMENT_ROM_END(name) }, -#define DEFINE_OBJECT_UNSET(_enumValue) { 0, 0 }, -#define DEFINE_OBJECT_SIZE_ZERO(name, _enumValue) { SEGMENT_ROM_START(name), SEGMENT_ROM_START(name) }, +#define DEFINE_OBJECT(name, _enumValue) ROM_FILE(name), +#define DEFINE_OBJECT_UNSET(_enumValue) ROM_FILE_UNSET, +#define DEFINE_OBJECT_EMPTY(name, _enumValue) ROM_FILE_EMPTY(name), RomFile gObjectTable[] = { #include "tables/object_table.h" @@ -21,4 +32,4 @@ RomFile gObjectTable[] = { #undef DEFINE_OBJECT #undef DEFINE_OBJECT_UNSET -#undef DEFINE_OBJECT_SIZE_ZERO +#undef DEFINE_OBJECT_EMPTY |