mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Code Issues Projects Releases Wiki Activity

Reduce hardcoded sizes for a few data tables (#646)

Browse source 
Co-authored-by: Thar0 <maximilianc64@gmail.com>
This commit is contained in:
Tharo 2021-01-20 18:15:17 +00:00 committed by GitHub
parent 7c6b953f38
commit 3daeaf2446
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/variables.h
View file

@ -173,9 +173,9 @@ extern u8 D_80114930[];
//extern ? D_801159A8; //extern ? D_801159A8;
//extern ? D_801159A9; //extern ? D_801159A9;
//extern ? D_801159AA; //extern ? D_801159AA;
extern EffectSsOverlay gEffectSsOverlayTable[37]; extern EffectSsOverlay gEffectSsOverlayTable[EFFECT_SS_TYPE_MAX];
extern Gfx D_80116280[]; 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 s32 gMaxActorId; // original name: "MaxProfile"
//extern ? D_80119E2C; //extern ? D_80119E2C;
//extern ? D_80119E52; //extern ? D_80119E52;
@ -397,9 +397,9 @@ extern u8 gItemSlots[56];
extern void (*gSceneCmdHandlers[26])(GlobalContext*, SceneCmd*); extern void (*gSceneCmdHandlers[26])(GlobalContext*, SceneCmd*);
extern s16 gLinkObjectIds[2]; extern s16 gLinkObjectIds[2];
extern u32 gObjectTableSize; extern u32 gObjectTableSize;
extern RomFile gObjectTable[402]; extern RomFile gObjectTable[OBJECT_ID_MAX];
extern EntranceInfo gEntranceTable[1556]; extern EntranceInfo gEntranceTable[1556];
extern Scene gSceneTable[110]; extern Scene gSceneTable[SCENE_ID_MAX];
//extern ? D_8012A4A0; //extern ? D_8012A4A0;
extern u16 gSramSlotOffsets[2][3]; extern u16 gSramSlotOffsets[2][3];
//extern ? D_8012A690; //extern ? D_8012A690;

3
include/z64object.h
View file

@ -405,7 +405,8 @@ typedef enum {
/* 0x018E */ OBJECT_DOOR_KILLER, /* 0x018E */ OBJECT_DOOR_KILLER,
/* 0x018F */ OBJECT_OUKE_HAKA, /* 0x018F */ OBJECT_OUKE_HAKA,
/* 0x0190 */ OBJECT_TIMEBLOCK, /* 0x0190 */ OBJECT_TIMEBLOCK,
/* 0x0191 */ OBJECT_ZL4 /* 0x0191 */ OBJECT_ZL4,
/* 0x0192 */ OBJECT_ID_MAX
} ObjectID; } ObjectID;
#endif #endif

3
include/z64scene.h
View file

@ -413,7 +413,8 @@ typedef enum {
/* 0x6A */ SCENE_SUTARU, /* 0x6A */ SCENE_SUTARU,
/* 0x6B */ SCENE_HAIRAL_NIWA2, /* 0x6B */ SCENE_HAIRAL_NIWA2,
/* 0x6C */ SCENE_SASATEST, /* 0x6C */ SCENE_SASATEST,
/* 0x6D */ SCENE_TESTROOM /* 0x6D */ SCENE_TESTROOM,
/* 0x6E */ SCENE_ID_MAX
} SceneID; } SceneID;
#endif #endif

2
src/code/z_scene.c
View file

@ -527,7 +527,7 @@ RomFile sNaviMsgFiles[] = {
s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD }; s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD };
u32 gObjectTableSize = 402; u32 gObjectTableSize = ARRAY_COUNT(gObjectTable);
RomFile gObjectTable[] = { RomFile gObjectTable[] = {
ROM_FILE_UNSET, ROM_FILE_UNSET,