mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-04-07 23:26:57 +00:00
Code Issues Projects Releases Wiki Activity

Move object table from z_scene.c to new file object_table.c (#1416)

Browse source 
* Move object table from z_scene to new file z_scene_dlftbls ("inspired by z_actor_dlftbls.c")

* -> `object_table.c`
This commit is contained in:
Dragorn421 2022-10-29 23:25:28 +02:00 • committed by GitHub
parent 7453709cc1
commit 451e855dbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
spec
View file

@ -353,6 +353,7 @@ beginseg
include "build/src/code/z_sample.o" include "build/src/code/z_sample.o"
include "build/src/code/code_80097A00.o" include "build/src/code/code_80097A00.o"
include "build/src/code/z_scene.o" include "build/src/code/z_scene.o"
include "build/src/code/object_table.o"
include "build/src/code/z_scene_table.o" include "build/src/code/z_scene_table.o"
include "build/src/code/z_skelanime.o" include "build/src/code/z_skelanime.o"
include "build/src/code/z_skin.o" include "build/src/code/z_skin.o"

29
src/code/object_table.c Normal file
View file

@ -0,0 +1,29 @@
#include "global.h"
s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD };
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_UNSET(_0)
#include "tables/object_table.h"
#undef DEFINE_OBJECT
#undef DEFINE_OBJECT_NULL
#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 },
RomFile gObjectTable[] = {
#include "tables/object_table.h"
};
#undef DEFINE_OBJECT
#undef DEFINE_OBJECT_NULL
#undef DEFINE_OBJECT_UNSET

29
src/code/z_scene.c
View file

@ -500,33 +500,4 @@ void (*gSceneCmdHandlers[SCENE_CMD_ID_MAX])(PlayState*, SceneCmd*) = {
RomFile sNaviQuestHintFiles[] = { RomFile sNaviQuestHintFiles[] = {
ROM_FILE(elf_message_field), ROM_FILE(elf_message_field),
ROM_FILE(elf_message_ydan), ROM_FILE(elf_message_ydan),
ROM_FILE_UNSET,
}; };
s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD };
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_UNSET(_0)
#include "tables/object_table.h"
#undef DEFINE_OBJECT
#undef DEFINE_OBJECT_NULL
#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 },
RomFile gObjectTable[] = {
#include "tables/object_table.h"
};
#undef DEFINE_OBJECT
#undef DEFINE_OBJECT_NULL
#undef DEFINE_OBJECT_UNSET