diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-02-29 05:15:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-29 14:15:04 +0100 |
| commit | 1b60dcf6dd198fe8b29e33053ecefc62c5233c42 (patch) | |
| tree | 38e51f128933e363a22feff1ecc83d904f8134c1 /src/code/object_table.c | |
| parent | 7a2c46d4eb4f3f0d12cae4f41df0e55342a42fd3 (diff) | |
Use Romfile in place of vromStart and vromEnd in structs (#1742)
* KaleidoMgrOverlay
* GameStateOverlay
* ActorOverlay
* EffectSsOverlay
* MapMarkDataOverlay
* Missed DEFINE_ACTOR_UNSET
* ROM_FILE_UNSET
* DEFINE_OBJECT_EMPTY
* DmaEntry
* ACTOR_UNSET
* romfile.h
* newline
* Format
Diffstat (limited to 'src/code/object_table.c')
| -rw-r--r-- | src/code/object_table.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/object_table.c b/src/code/object_table.c index dc32b4435..d0f9e936d 100644 --- a/src/code/object_table.c +++ b/src/code/object_table.c @@ -6,24 +6,24 @@ u32 gObjectTableSize = ARRAY_COUNT(gObjectTable); // Object linker symbol declarations (used in the table below) #define DEFINE_OBJECT(name, _1) DECLARE_ROM_SEGMENT(name) -#define DEFINE_OBJECT_NULL(_0, _1) +#define DEFINE_OBJECT_EMPTY(_0, _1) #define DEFINE_OBJECT_UNSET(_0) #include "tables/object_table.h" #undef DEFINE_OBJECT -#undef DEFINE_OBJECT_NULL +#undef DEFINE_OBJECT_EMPTY #undef DEFINE_OBJECT_UNSET // Object Table definition #define DEFINE_OBJECT(name, _1) ROM_FILE(name), -#define DEFINE_OBJECT_NULL(name, _1) ROM_FILE_EMPTY(name), -#define DEFINE_OBJECT_UNSET(_0) { 0 }, +#define DEFINE_OBJECT_EMPTY(name, _1) ROM_FILE_EMPTY(name), +#define DEFINE_OBJECT_UNSET(_0) ROM_FILE_UNSET, RomFile gObjectTable[] = { #include "tables/object_table.h" }; #undef DEFINE_OBJECT -#undef DEFINE_OBJECT_NULL +#undef DEFINE_OBJECT_EMPTY #undef DEFINE_OBJECT_UNSET |