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 /include/z64object.h | |
| 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 'include/z64object.h')
| -rw-r--r-- | include/z64object.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/z64object.h b/include/z64object.h index d547d4a9e..0de62d789 100644 --- a/include/z64object.h +++ b/include/z64object.h @@ -1,9 +1,11 @@ #ifndef Z64OBJECT_H #define Z64OBJECT_H +#include "libc/stdint.h" + #define DEFINE_OBJECT(_name, enumValue) enumValue, #define DEFINE_OBJECT_UNSET(enumValue) enumValue, -#define DEFINE_OBJECT_SIZE_ZERO(_name, enumValue) enumValue, +#define DEFINE_OBJECT_EMPTY(_name, enumValue) enumValue, typedef enum ObjectId { #include "tables/object_table.h" @@ -12,6 +14,9 @@ typedef enum ObjectId { #undef DEFINE_OBJECT #undef DEFINE_OBJECT_UNSET -#undef DEFINE_OBJECT_SIZE_ZERO +#undef DEFINE_OBJECT_EMPTY + +extern ObjectId gObjectTableSize; +extern RomFile gObjectTable[OBJECT_ID_MAX]; #endif |