falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

low hanging fruits on variables.h

This commit is contained in:
angie 2024-02-08 14:07:13 -03:00
parent 7e716e120f
commit c09aa16447
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/variables.h
View File

@ -9,13 +9,6 @@
extern ActorOverlay gActorOverlayTable[ACTOR_ID_MAX]; extern ActorOverlay gActorOverlayTable[ACTOR_ID_MAX];
extern ActorId gMaxActorId; extern ActorId gMaxActorId;
extern FlexSkeletonHeader* gPlayerSkeletons[PLAYER_FORM_MAX];
extern PlayerModelIndices gPlayerModelTypes[];
extern struct_80124618 D_801C03A0[];
extern struct_80124618 D_801C0490[];
extern Gfx gCullBackDList[];
extern Gfx gCullFrontDList[];
extern u32 gBitFlags[32]; extern u32 gBitFlags[32];
extern u16 gEquipMasks[]; extern u16 gEquipMasks[];
extern u16 gEquipNegMasks[]; extern u16 gEquipNegMasks[];
@ -32,12 +25,6 @@ extern s16 gItemPrices[];
extern u16 gSceneIdsPerRegion[11][27]; extern u16 gSceneIdsPerRegion[11][27];
extern u8 gPlayerFormItemRestrictions[PLAYER_FORM_MAX][114]; extern u8 gPlayerFormItemRestrictions[PLAYER_FORM_MAX][114];
extern s16 gPlayerFormObjectIds[PLAYER_FORM_MAX];
extern ObjectId gObjectTableSize;
extern RomFile gObjectTable[OBJECT_ID_MAX];
extern SceneTableEntry gSceneTable[SCENE_MAX];
extern KaleidoMgrOverlay gKaleidoMgrOverlayTable[2]; extern KaleidoMgrOverlay gKaleidoMgrOverlayTable[2];
extern KaleidoMgrOverlay* gKaleidoMgrCurOvl; extern KaleidoMgrOverlay* gKaleidoMgrCurOvl;

3
include/z64object.h
View File

@ -14,4 +14,7 @@ typedef enum ObjectId {
#undef DEFINE_OBJECT_UNSET #undef DEFINE_OBJECT_UNSET
#undef DEFINE_OBJECT_SIZE_ZERO #undef DEFINE_OBJECT_SIZE_ZERO
extern ObjectId gObjectTableSize;
extern RomFile gObjectTable[OBJECT_ID_MAX];
#endif #endif

10
include/z64player.h
View File

@ -1423,4 +1423,14 @@ s32 func_80128640(struct PlayState* play, Player* player, Gfx* dList);
void Player_SetFeetPos(struct PlayState* play, Player* player, s32 limbIndex); void Player_SetFeetPos(struct PlayState* play, Player* player, s32 limbIndex);
void Player_PostLimbDrawGameplay(struct PlayState* play, s32 limbIndex, Gfx** dList1, Gfx** dList2, Vec3s* rot, Actor* actor); void Player_PostLimbDrawGameplay(struct PlayState* play, s32 limbIndex, Gfx** dList1, Gfx** dList2, Vec3s* rot, Actor* actor);
extern FlexSkeletonHeader* gPlayerSkeletons[PLAYER_FORM_MAX];
extern PlayerModelIndices gPlayerModelTypes[];
extern struct_80124618 D_801C03A0[];
extern struct_80124618 D_801C0490[];
extern Gfx gCullBackDList[];
extern Gfx gCullFrontDList[];
// object_table.c
extern s16 gPlayerFormObjectIds[PLAYER_FORM_MAX];
#endif #endif

2
include/z64scene.h
View File

@ -975,4 +975,6 @@ s32 Entrance_GetSceneIdAbsolute(u16 entrance);
s32 Entrance_GetSpawnNum(u16 entrance); s32 Entrance_GetSpawnNum(u16 entrance);
s32 Entrance_GetTransitionFlags(u16 entrance); s32 Entrance_GetTransitionFlags(u16 entrance);
extern SceneTableEntry gSceneTable[SCENE_MAX];
#endif #endif