mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-10 19:20:13 +00:00
Reduce hardcoded sizes for a few data tables (#646)
Co-authored-by: Thar0 <maximilianc64@gmail.com>
This commit is contained in:
parent
7c6b953f38
commit
3daeaf2446
4 changed files with 9 additions and 7 deletions
|
@ -173,9 +173,9 @@ extern u8 D_80114930[];
|
|||
//extern ? D_801159A8;
|
||||
//extern ? D_801159A9;
|
||||
//extern ? D_801159AA;
|
||||
extern EffectSsOverlay gEffectSsOverlayTable[37];
|
||||
extern EffectSsOverlay gEffectSsOverlayTable[EFFECT_SS_TYPE_MAX];
|
||||
extern Gfx D_80116280[];
|
||||
extern ActorOverlay gActorOverlayTable[471]; // original name: "actor_dlftbls" 801162A0
|
||||
extern ActorOverlay gActorOverlayTable[ACTOR_ID_MAX]; // original name: "actor_dlftbls" 801162A0
|
||||
extern s32 gMaxActorId; // original name: "MaxProfile"
|
||||
//extern ? D_80119E2C;
|
||||
//extern ? D_80119E52;
|
||||
|
@ -397,9 +397,9 @@ extern u8 gItemSlots[56];
|
|||
extern void (*gSceneCmdHandlers[26])(GlobalContext*, SceneCmd*);
|
||||
extern s16 gLinkObjectIds[2];
|
||||
extern u32 gObjectTableSize;
|
||||
extern RomFile gObjectTable[402];
|
||||
extern RomFile gObjectTable[OBJECT_ID_MAX];
|
||||
extern EntranceInfo gEntranceTable[1556];
|
||||
extern Scene gSceneTable[110];
|
||||
extern Scene gSceneTable[SCENE_ID_MAX];
|
||||
//extern ? D_8012A4A0;
|
||||
extern u16 gSramSlotOffsets[2][3];
|
||||
//extern ? D_8012A690;
|
||||
|
|
|
@ -405,7 +405,8 @@ typedef enum {
|
|||
/* 0x018E */ OBJECT_DOOR_KILLER,
|
||||
/* 0x018F */ OBJECT_OUKE_HAKA,
|
||||
/* 0x0190 */ OBJECT_TIMEBLOCK,
|
||||
/* 0x0191 */ OBJECT_ZL4
|
||||
/* 0x0191 */ OBJECT_ZL4,
|
||||
/* 0x0192 */ OBJECT_ID_MAX
|
||||
} ObjectID;
|
||||
|
||||
#endif
|
||||
|
|
|
@ -413,7 +413,8 @@ typedef enum {
|
|||
/* 0x6A */ SCENE_SUTARU,
|
||||
/* 0x6B */ SCENE_HAIRAL_NIWA2,
|
||||
/* 0x6C */ SCENE_SASATEST,
|
||||
/* 0x6D */ SCENE_TESTROOM
|
||||
/* 0x6D */ SCENE_TESTROOM,
|
||||
/* 0x6E */ SCENE_ID_MAX
|
||||
} SceneID;
|
||||
|
||||
#endif
|
||||
|
|
|
@ -527,7 +527,7 @@ RomFile sNaviMsgFiles[] = {
|
|||
|
||||
s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD };
|
||||
|
||||
u32 gObjectTableSize = 402;
|
||||
u32 gObjectTableSize = ARRAY_COUNT(gObjectTable);
|
||||
|
||||
RomFile gObjectTable[] = {
|
||||
ROM_FILE_UNSET,
|
||||
|
|
Loading…
Reference in a new issue