mirror of
https://github.com/zeldaret/mm.git
synced 2026-07-11 14:18:39 -04:00
Merge branch 'master' into tokeidai
This commit is contained in:
tom-overton
+33
-32
@@ -603,7 +603,8 @@ void EffectSsGSpk_SpawnSmall(GlobalContext* globalCtx, Actor* actor, Vec3f* pos,
|
||||
void EffectSsKiraKira_SpawnDispersed(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s32 life);
|
||||
// void EffectSsKiraKira_SpawnFocused(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7, UNK_TYPE4 param_8);
|
||||
// void EffectSsBomb2_SpawnFade(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4);
|
||||
// void EffectSsBomb2_SpawnLayered(UNK_TYPE4 param_1, Vec3f* param_2, Vec3f* param_3, Vec3f* param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6);
|
||||
void EffectSsBomb2_SpawnLayered(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale,
|
||||
s16 scaleStep);
|
||||
// void EffectSsBlast_Spawn(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, Color_RGBA8* param_5, Color_RGBA8* param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10);
|
||||
// void EffectSsBlast_SpawnWhiteCustomScale(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7);
|
||||
// void EffectSsBlast_SpawnShockwave(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7);
|
||||
@@ -875,7 +876,7 @@ s32 func_800BC5EC(GlobalContext* globalCtx, Actor* actor);
|
||||
void func_800BC620(Vec3f* arg0, Vec3f* arg1, u8 arg2, GlobalContext* globalCtx);
|
||||
// void func_800BC770(void);
|
||||
// void func_800BC7D8(void);
|
||||
// void func_800BC848(void);
|
||||
void func_800BC848(Actor* actor, GlobalContext* globalCtx, s16 arg2, s16 arg3);
|
||||
// void func_800BC8B8(void);
|
||||
// void func_800BCB50(void);
|
||||
void func_800BCB70(Actor* actor, u16 arg1, u16 arg2, s16 arg3, s16 arg4);
|
||||
@@ -1584,21 +1585,21 @@ void func_800F048C(GlobalContext* globalCtx, Vec3f* param_2, u8 param_3, u16 par
|
||||
void Audio_PlaySoundAtPosition(GlobalContext* globalCtx, Vec3f* position, s32 param_3, u16 sfxId);
|
||||
void func_800F0590(GlobalContext* globalCtx, Vec3f* arg1, s32 arg2, s32 arg3);
|
||||
u16 ElfMessage_GetFirstCycleHint(GlobalContext* globalCtx);
|
||||
// void func_800F07C0(void);
|
||||
// void func_800F0888(void);
|
||||
// void func_800F0944(void);
|
||||
// void func_800F09B4(void);
|
||||
// void func_800F0A20(void);
|
||||
// void func_800F0A94(void);
|
||||
// void func_800F0BB4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5);
|
||||
// void func_800F0CE4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE4 param_6);
|
||||
// void func_800F0DD4(void);
|
||||
// void func_800F0E94(void);
|
||||
// void func_800F0EEC(void);
|
||||
// void func_800F0F28(void);
|
||||
// void func_800F0FF0(void);
|
||||
// void func_800F10AC(void);
|
||||
// void func_800F112C(void);
|
||||
s32 EnHy_ChangeAnim(SkelAnime* skelAnime, s16 animIndex);
|
||||
Actor* EnHy_FindNearestDoor(Actor* actor, GlobalContext* globalCtx);
|
||||
void EnHy_ChangeObjectAndAnim(EnHy* enHy, GlobalContext* globalCtx, s16 animIndex);
|
||||
s32 EnHy_UpdateSkelAnime(EnHy* enHy, GlobalContext* globalCtx);
|
||||
void EnHy_Blink(EnHy* enHy, s32 arg1);
|
||||
s32 EnHy_Init(EnHy* enHy, GlobalContext* globalCtx, FlexSkeletonHeader* skeletonHeaderSeg, s16 animIndex);
|
||||
void func_800F0BB4(EnHy* enHy, GlobalContext* globalCtx, Actor* arg2, s16 arg3, s16 arg4);
|
||||
s32 func_800F0CE4(EnHy* enHy, GlobalContext* globalCtx, ActorFunc draw, s16 arg3, s16 arg4, f32 arg5);
|
||||
s32 func_800F0DD4(EnHy* enHy, GlobalContext* globalCtx, s16 arg2, s16 arg3);
|
||||
s32 EnHy_SetPointFowards(EnHy* enHy, GlobalContext* globalCtx, f32 gravity, s16 animIndex);
|
||||
s32 EnHy_SetPointBackwards(EnHy* enHy, GlobalContext* globalCtx, s16 animIndex);
|
||||
s32 EnHy_MoveForwards(EnHy* enHy, f32 arg1);
|
||||
s32 EnHy_MoveBackwards(EnHy* enHy, f32 arg1);
|
||||
void EnHy_UpdateCollider(EnHy* enHy, GlobalContext* globalCtx);
|
||||
s32 EnHy_PlayWalkingSound(EnHy* enHy, GlobalContext* globalCtx, f32 arg2);
|
||||
u16 Text_GetFaceReaction(GlobalContext* globalCtx, u32 reactionSet);
|
||||
void EnvFlags_UnsetAll(GlobalContext* globalCtx);
|
||||
void EnvFlags_Set(GlobalContext* globalCtx, s16 flag);
|
||||
@@ -2129,8 +2130,8 @@ void func_80121FC4(GlobalContext* globalCtx);
|
||||
Path* Path_GetByIndex(GlobalContext* globalCtx, s16 index, s16 max);
|
||||
f32 Path_OrientAndGetDistSq(Actor* actor, Path* path, s16 waypoint, s16* yaw);
|
||||
void Path_CopyLastPoint(Path* path, Vec3f* dest);
|
||||
// void func_80122660(void);
|
||||
// UNK_TYPE4 func_80122670(s32* param_1, Input* input);
|
||||
void FrameAdvance_Init(FrameAdvanceContext* frameAdvCtx);
|
||||
s32 FrameAdvance_Update(FrameAdvanceContext* frameAdvCtx, Input* input);
|
||||
// void func_801226E0(void);
|
||||
void func_80122744(GlobalContext* globalCtx, UNK_PTR arg1, u32 arg2, Vec3s* arg3);
|
||||
s32 func_80122760(GlobalContext* globalCtx, UNK_PTR arg1, f32 arg2);
|
||||
@@ -2161,7 +2162,7 @@ s32 func_80123590(GlobalContext* globalCtx, Actor* actor);
|
||||
s32 func_80123810(GlobalContext* globalCtx);
|
||||
// void func_80123960(void);
|
||||
// void func_801239AC(void);
|
||||
// void func_80123AA4(void);
|
||||
void func_80123AA4(Player* player, s32 arg1);
|
||||
// void func_80123BD4(void);
|
||||
// void func_80123C58(void);
|
||||
// void func_80123C90(void);
|
||||
@@ -2667,7 +2668,7 @@ s8 func_8013D8DC(s8 arg0, GlobalContext* globalCtx);
|
||||
s8 func_8013D924(s16 arg0, GlobalContext* globalCtx);
|
||||
Actor* func_ActorCategoryIterateById(GlobalContext* globalCtx, Actor* actorListStart, u8 actorCategory, s16 actorId);
|
||||
s32 func_8013D9C8(GlobalContext* globalCtx, s16* arg1, s16* arg2, s32 arg3);
|
||||
u8 func_8013DB90(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2);
|
||||
s32 func_8013DB90(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2);
|
||||
s32 func_8013DC40(Path* arg0, s32 arg1, s32 arg2, Vec3f* arg3);
|
||||
void func_8013DCE0(GlobalContext* globalCtx, Vec3f* arg1, Actor* arg2, struct_8013DF3C_arg1* arg3, Path* arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, u8 arg9);
|
||||
s32 func_8013DE04(GlobalContext* globalCtx, struct_8013DF3C_arg1* arg1, struct_8013DF3C_arg1_unk_func1 arg2, struct_8013DF3C_arg1_unk_func2 arg3, struct_8013DF3C_arg1_unk_func2 arg4, struct_8013DF3C_arg1_unk_func2 arg5);
|
||||
@@ -2758,11 +2759,11 @@ s32 func_80142440(SkyboxContext* skyboxCtx, Vtx* vtx, s32 arg2, s32 arg3, s32 ar
|
||||
void func_80143148(SkyboxContext* skyboxCtx, s32 arg1);
|
||||
void func_801431E8(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyType);
|
||||
void func_80143324(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skyType);
|
||||
void func_801434E4(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyType);
|
||||
// void func_801435A0(void);
|
||||
// void func_80143624(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE1 param_5, UNK_TYPE1 param_6, UNK_TYPE1 param_7);
|
||||
// void func_80143668(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7);
|
||||
// void func_80143A04(void);
|
||||
void func_801434E4(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyType);
|
||||
Mtx* SkyboxDraw_UpdateMatrix(SkyboxContext* skyboxCtx, f32 x, f32 y, f32 z);
|
||||
void SkyboxDraw_SetColors(SkyboxContext* skyboxCtx, u8 primR, u8 primG, u8 primB, u8 envR, u8 envG, u8 envB);
|
||||
void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId, s16 blend, f32 x, f32 y, f32 z);
|
||||
void SkyboxDraw_Noop(SkyboxContext* skyboxCtx);
|
||||
void func_80143A10(u8 owlId);
|
||||
// void func_80143A54(void);
|
||||
void func_80143AC4(void);
|
||||
@@ -2950,8 +2951,8 @@ void func_80165438(UNK_PTR param_1);
|
||||
// void func_80165460(void);
|
||||
// void func_80165608(void);
|
||||
// void func_80165630(void);
|
||||
// void func_80165658(void);
|
||||
void func_8016566C(s32 arg0);
|
||||
void func_80165658(u32 arg0);
|
||||
void func_8016566C(u32 arg0);
|
||||
void func_80165690(void);
|
||||
// void func_801656A4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8);
|
||||
// void func_80165DCC(void);
|
||||
@@ -2970,7 +2971,7 @@ void func_80166B30(GlobalContext* globalCtx);
|
||||
void func_80167814(GlobalContext* globalCtx);
|
||||
void func_80167DE4(GlobalContext* globalCtx);
|
||||
// void func_80167F0C(void);
|
||||
void func_80168090(GlobalContext* globalCtx);
|
||||
void Play_Draw(GlobalContext* globalCtx);
|
||||
void func_80168DAC(GlobalContext* globalCtx);
|
||||
void Play_Update(GlobalContext* globalCtx);
|
||||
s32 func_801690CC(GlobalContext* globalCtx);
|
||||
@@ -3011,7 +3012,7 @@ s32 FrameAdvance_IsEnabled(GlobalContext* globalCtx);
|
||||
// void func_8016A0AC(void);
|
||||
s32 func_8016A168(void);
|
||||
// void func_8016A178(void);
|
||||
// void func_8016A268(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE1 param_5, UNK_TYPE1 param_6);
|
||||
void func_8016A268(GlobalContext* globalCtx, s32 param_2, s32 param_3, s32 param_4, s32 param_5, s32 param_6);
|
||||
void Play_Init(GameState* gameState);
|
||||
// void func_8016AC10(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE4 param_9, UNK_TYPE4 param_10);
|
||||
// void func_8016AE1C(void);
|
||||
@@ -3371,7 +3372,7 @@ void Matrix_InsertRotationAroundUnitVector_f(f32 rotation, Vec3f* vector, s32 ap
|
||||
void Matrix_InsertRotationAroundUnitVector_s(s16 rotation, Vec3f* vector, s32 appendToState);
|
||||
|
||||
u64* SysUcode_GetUCodeBoot(void);
|
||||
u32 SysUcode_GetUCodeBootSize(void);
|
||||
size_t SysUcode_GetUCodeBootSize(void);
|
||||
u64* SysUcode_GetUCode(void);
|
||||
u64* SysUcode_GetUCodeData(void);
|
||||
|
||||
@@ -3962,7 +3963,7 @@ void func_801A5CFC(u16 sfxId, Vec3f* param_2, u8 param_3, f32* param_4, f32* par
|
||||
void func_801A72CC(Vec3f* uParm1);
|
||||
void func_801A7328(Vec3f* pos, u16 sfxId);
|
||||
// void func_801A7484(void);
|
||||
// void func_801A75E8(void);
|
||||
void func_801A75E8(u16 sfxId);
|
||||
// void func_801A7720(void);
|
||||
void func_801A7794(u32 param_1, u32 param_2, u32 param_3);
|
||||
// void func_801A7828(void);
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#define _SPTASK_H_
|
||||
|
||||
#include "PR/ultratypes.h"
|
||||
#include "libc/stddef.h"
|
||||
|
||||
/* Task Types */
|
||||
#define M_NULTASK 0
|
||||
@@ -80,7 +81,7 @@ typedef struct {
|
||||
/* 0x04 */ u32 flags;
|
||||
|
||||
/* 0x08 */ u64* ucodeBoot;
|
||||
/* 0x0C */ u32 ucodeBootSize;
|
||||
/* 0x0C */ u32 ucodeBootSize; // ucode will load these sizes with lw, so need to be 32-bit
|
||||
|
||||
/* 0x10 */ u64* ucode;
|
||||
/* 0x14 */ u32 ucodeSize;
|
||||
@@ -101,8 +102,7 @@ typedef struct {
|
||||
/* 0x3C */ u32 yieldDataSize;
|
||||
} OSTask_t; // size = 0x40
|
||||
|
||||
typedef union
|
||||
{
|
||||
typedef union {
|
||||
OSTask_t t;
|
||||
long long int force_structure_alignment;
|
||||
} OSTask;
|
||||
|
||||
+9
-10
@@ -18,7 +18,7 @@ extern u16 gFramebuffer1[SCREEN_HEIGHT][SCREEN_WIDTH]; // at 0x80000500
|
||||
extern u8 D_80025D00[];
|
||||
|
||||
// data
|
||||
extern UNK_TYPE1 D_800969C0;
|
||||
extern u64 rspbootTextStart[];
|
||||
extern u8 D_80096B20;
|
||||
extern vu8 gViConfigUseDefault;
|
||||
extern u8 gViConfigAdditionalScanLines;
|
||||
@@ -889,7 +889,6 @@ extern s801BB170 D_801BB170[118];
|
||||
// extern UNK_TYPE1 D_801BC210;
|
||||
extern Gfx D_801BC240[9];
|
||||
extern Gfx D_801BC288[3];
|
||||
// extern UNK_TYPE1 D_801BC2A0;
|
||||
// extern UNK_TYPE1 D_801BC3F0;
|
||||
// extern UNK_TYPE1 D_801BC400;
|
||||
// extern UNK_TYPE1 D_801BC410;
|
||||
@@ -1636,8 +1635,8 @@ extern Vec3f D_801D15B0;
|
||||
extern Vec3s D_801D15BC;
|
||||
extern Mtx D_801D1DE0;
|
||||
extern MtxF D_801D1E20;
|
||||
extern UNK_PTR D_801D1E60;
|
||||
extern UNK_PTR D_801D1E64;
|
||||
// extern u64* initialgspUcodeText;
|
||||
// extern u64* initialgspUcodeData;
|
||||
// extern UNK_TYPE1 D_801D1E70;
|
||||
// extern UNK_TYPE1 D_801D2E80;
|
||||
// extern UNK_TYPE1 D_801D2F80;
|
||||
@@ -3090,8 +3089,8 @@ extern f32 D_801E0E24;
|
||||
extern f64 D_801E0EB0;
|
||||
// extern UNK_TYPE4 D_801E1068;
|
||||
extern UNK_PTR D_801E10B0;
|
||||
// extern UNK_TYPE2 D_801E1102;
|
||||
// extern UNK_TYPE4 D_801E1104;
|
||||
extern const s16 gAudioTatumInit[];
|
||||
extern const AudioContextInitSizes gAudioContextInitSizes;
|
||||
// extern UNK_TYPE4 D_801E1108;
|
||||
// extern UNK_TYPE4 D_801E110C;
|
||||
// extern UNK_TYPE2 D_801E1180;
|
||||
@@ -3099,8 +3098,8 @@ extern UNK_PTR D_801E10B0;
|
||||
// extern UNK_TYPE2 D_801E1630;
|
||||
// extern UNK_TYPE1 D_801E1E40;
|
||||
// extern UNK_TYPE1 D_801E1E80;
|
||||
// extern UNK_TYPE1 D_801E2160;
|
||||
// extern UNK_TYPE1 D_801E3790;
|
||||
extern u64 gspF3DEX2_NoN_fifoTextStart[];
|
||||
extern u64 gspF3DEX2_NoN_fifoDataStart[];
|
||||
extern u64 gJpegUCodeData[];
|
||||
// extern UNK_TYPE1 D_801E3FA0;
|
||||
|
||||
@@ -3317,7 +3316,7 @@ extern Arena sZeldaArena;
|
||||
// extern UNK_TYPE1 D_801F6AD4;
|
||||
// extern UNK_TYPE1 D_801F6AD5;
|
||||
// extern UNK_TYPE1 D_801F6ADA;
|
||||
// extern UNK_TYPE1 D_801F6AE0;
|
||||
// extern UNK_TYPE1 sSkyboxDrawMatrix;
|
||||
// extern UNK_TYPE1 D_801F6AF0;
|
||||
// extern UNK_TYPE1 D_801F6AF2;
|
||||
// extern UNK_TYPE4 D_801F6B00;
|
||||
@@ -3413,7 +3412,7 @@ extern OSViMode* D_801FBB88;
|
||||
extern u16* gZBufferPtr;
|
||||
extern void* D_801FBB90;
|
||||
extern u64* gGfxSPTaskOutputBufferPtr;
|
||||
extern u32 gGfxSPTaskOutputBufferSize;
|
||||
extern size_t gGfxSPTaskOutputBufferSize;
|
||||
// extern UNK_TYPE1 D_801FBB9C;
|
||||
// extern UNK_TYPE1 D_801FBBA0;
|
||||
extern u16 (*gZBuffer)[SCREEN_WIDTH * SCREEN_HEIGHT];
|
||||
|
||||
+33
-6
@@ -766,11 +766,10 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
/* 0x00000 */ View view;
|
||||
/* 0x00168 */ void* skyboxStaticSegment[2];
|
||||
/* 0x00170 */ char unk170[8]; // more static segments?
|
||||
/* 0x00168 */ void* skyboxStaticSegment[4];
|
||||
/* 0x00178 */ void* skyboxPaletteStaticSegment;
|
||||
/* 0x0017C */ Gfx* unk17C;
|
||||
/* 0x00180 */ Gfx* unk180;
|
||||
/* 0x0017C */ Gfx* dListBuf;
|
||||
/* 0x00180 */ Gfx* roomDL;
|
||||
/* 0x00184 */ Vtx* roomVtx;
|
||||
/* 0x00188 */ DmaRequest unk188;
|
||||
/* 0x001A8 */ DmaRequest unk1A8;
|
||||
@@ -791,6 +790,10 @@ typedef struct {
|
||||
/* 0x00227 */ u8 envB;
|
||||
} SkyboxContext; // size = 0x228
|
||||
|
||||
typedef enum {
|
||||
/* 0x05 */ SKYBOX_CUTSCENE_MAP = 5
|
||||
} SkyboxId;
|
||||
|
||||
typedef struct ListAlloc {
|
||||
/* 0x00 */ struct ListAlloc* prev;
|
||||
/* 0x04 */ struct ListAlloc* next;
|
||||
@@ -1398,9 +1401,9 @@ struct GlobalContext {
|
||||
/* 0x18794 */ void* unk_18794; //! @TODO: Determine function prototype
|
||||
/* 0x18798 */ s32 (*setPlayerTalkAnim)(struct GlobalContext* globalCtx, void* talkAnim, s32 arg2);
|
||||
/* 0x1879C */ s16 unk_1879C[10];
|
||||
/* 0x187B0 */ MtxF projectionMatrix;
|
||||
/* 0x187B0 */ MtxF viewProjectionMtxF;
|
||||
/* 0x187F0 */ Vec3f unk_187F0;
|
||||
/* 0x187FC */ MtxF mf_187FC;
|
||||
/* 0x187FC */ MtxF billboardMtxF;
|
||||
/* 0x1883C */ Mtx* unk_1883C;
|
||||
/* 0x18840 */ u32 gameplayFrames;
|
||||
/* 0x18844 */ u8 unk_18844;
|
||||
@@ -1459,6 +1462,30 @@ typedef struct {
|
||||
/* 0x24 */ s16 unk_24;
|
||||
} struct_800BD888_arg1; // size = 0x28
|
||||
|
||||
typedef struct EnHy {
|
||||
/* 0x000 */ Actor actor;
|
||||
/* 0x144 */ UNK_TYPE1 unk_144[0x8];
|
||||
/* 0x14C */ SkelAnime skelAnime;
|
||||
/* 0x190 */ s8 unk190;
|
||||
/* 0x191 */ s8 unk191;
|
||||
/* 0x192 */ s8 unk192;
|
||||
/* 0x193 */ s8 animObjIndex;
|
||||
/* 0x194 */ ColliderCylinder collider;
|
||||
/* 0x1E0 */ UNK_TYPE1 unk_1E0[0x4];
|
||||
/* 0x1E4 */ Path* path;
|
||||
/* 0x1E8 */ s16 curPoint;
|
||||
/* 0x1EA */ UNK_TYPE1 unk_1EA[0x2];
|
||||
/* 0x1EC */ Vec3f leftFootPos;
|
||||
/* 0x1F8 */ Vec3f rightFootPos;
|
||||
/* 0x204 */ u8 isLeftFootOnGround;
|
||||
/* 0x205 */ u8 isRightFootOnGround;
|
||||
/* 0x206 */ Vec3s jointTable[16];
|
||||
/* 0x266 */ Vec3s morphTable[16];
|
||||
/* 0x2C6 */ UNK_TYPE1 unk_2C6[0x120];
|
||||
/* 0x3E6 */ s16 eyeTexIndex;
|
||||
/* 0x3E8 */ s16 blinkTimer;
|
||||
} EnHy;
|
||||
|
||||
typedef struct {
|
||||
/* 0x0 */ u8 unk0;
|
||||
/* 0x4 */ s32 unk4;
|
||||
|
||||
@@ -49,6 +49,14 @@ typedef struct {
|
||||
/* 0x08 */ Gfx* dLists[2]; // Near and far
|
||||
} LodLimb; // size = 0x10
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ Vec3s jointPos; // Root is position in model space, children are relative to parent
|
||||
/* 0x06 */ u8 child;
|
||||
/* 0x07 */ u8 sibling;
|
||||
/* 0x08 */ s32 unk_8; // Type of data contained in segment
|
||||
/* 0x0C */ void* segment; // Segment address of data. Currently unclear what.
|
||||
} SkinLimb; // size = 0x10
|
||||
|
||||
// Model has limbs with only rigid meshes
|
||||
typedef struct {
|
||||
/* 0x00 */ void** segment;
|
||||
@@ -271,6 +279,43 @@ typedef s32 (*OverrideCurveLimbDraw)(struct GlobalContext* globalCtx, SkelAnimeC
|
||||
typedef void (*PostCurveLimbDraw)(struct GlobalContext* globalCtx, SkelAnimeCurve* skelCuve, s32 limbIndex,
|
||||
struct Actor* actor);
|
||||
|
||||
// TODO the name of this struct is imported from OoT and cannot change until the ZAPD name also changes
|
||||
typedef struct {
|
||||
/* 0x000 */ u16 unk_0;
|
||||
/* 0x002 */ s16 unk_2;
|
||||
/* 0x004 */ s16 unk_4;
|
||||
/* 0x006 */ s8 unk_6;
|
||||
/* 0x007 */ s8 unk_7;
|
||||
/* 0x008 */ s8 unk_8;
|
||||
/* 0x009 */ u8 unk_9;
|
||||
} Struct_800A57C0; // size = 0xA
|
||||
|
||||
// TODO the name of this struct is imported from OoT and cannot change until the ZAPD name also changes
|
||||
typedef struct {
|
||||
/* 0x000 */ u8 unk_0;
|
||||
/* 0x002 */ s16 x;
|
||||
/* 0x004 */ s16 y;
|
||||
/* 0x006 */ s16 z;
|
||||
/* 0x008 */ u8 unk_8;
|
||||
} Struct_800A598C_2; // size = 0xA
|
||||
|
||||
// TODO the name of this struct is imported from OoT and cannot change until the ZAPD name also changes
|
||||
typedef struct {
|
||||
/* 0x000 */ u16 unk_0;
|
||||
/* 0x002 */ u16 unk_2;
|
||||
/* 0x004 */ u16 unk_4;
|
||||
/* 0x008 */ Struct_800A57C0* unk_8;
|
||||
/* 0x00C */ Struct_800A598C_2* unk_C;
|
||||
} Struct_800A598C; // size = 0x10
|
||||
|
||||
// TODO the name of this struct is imported from OoT and cannot change until the ZAPD name also changes
|
||||
typedef struct {
|
||||
/* 0x000 */ u16 unk_0;
|
||||
/* 0x002 */ u16 unk_2;
|
||||
/* 0x004 */ Struct_800A598C* unk_4;
|
||||
/* 0x008 */ Gfx* unk_8;
|
||||
} Struct_800A5E28; // size = 0xC
|
||||
|
||||
typedef struct struct_80B8E1A8 {
|
||||
/* 0x00 */ AnimationHeader* animationSeg;
|
||||
/* 0x04 */ f32 playbackSpeed;
|
||||
|
||||
+7
-6
@@ -57,7 +57,7 @@ typedef enum {
|
||||
/* 0x07 */ SLOT_BOMBCHU,
|
||||
/* 0x08 */ SLOT_STICK,
|
||||
/* 0x09 */ SLOT_NUT,
|
||||
/* 0x0A */ SLOT_BEAN,
|
||||
/* 0x0A */ SLOT_MAGIC_BEANS,
|
||||
/* 0x0B */ SLOT_TRADE_KEY_MAMA,
|
||||
/* 0x0C */ SLOT_POWDER_KEG,
|
||||
/* 0x0D */ SLOT_PICTO_BOX,
|
||||
@@ -85,7 +85,7 @@ typedef enum {
|
||||
/* 0x23 */ SLOT_MASK_GORON,
|
||||
/* 0x24 */ SLOT_MASK_ROMANI,
|
||||
/* 0x25 */ SLOT_MASK_CIRCUS_LEADER,
|
||||
/* 0x26 */ SLOT_MASK_KAFEI,
|
||||
/* 0x26 */ SLOT_MASK_KAFEIS_MASK,
|
||||
/* 0x27 */ SLOT_MASK_COUPLE,
|
||||
/* 0x28 */ SLOT_MASK_TRUTH,
|
||||
/* 0x29 */ SLOT_MASK_ZORA,
|
||||
@@ -109,7 +109,7 @@ typedef enum {
|
||||
/* 0x07 */ ITEM_BOMBCHU,
|
||||
/* 0x08 */ ITEM_STICK,
|
||||
/* 0x09 */ ITEM_NUT,
|
||||
/* 0x0A */ ITEM_BEAN,
|
||||
/* 0x0A */ ITEM_MAGIC_BEANS,
|
||||
/* 0x0B */ ITEM_SLINGSHOT,
|
||||
/* 0x0C */ ITEM_POWDER_KEG,
|
||||
/* 0x0D */ ITEM_PICTO_BOX,
|
||||
@@ -146,7 +146,7 @@ typedef enum {
|
||||
/* 0x2C */ ITEM_DEED_OCEAN,
|
||||
/* 0x2D */ ITEM_ROOM_KEY,
|
||||
/* 0x2E */ ITEM_LETTER_MAMA,
|
||||
/* 0x2F */ ITEM_LETTER_KAFEI,
|
||||
/* 0x2F */ ITEM_LETTER_TO_KAFEI,
|
||||
/* 0x30 */ ITEM_PENDANT_MEMORIES,
|
||||
/* 0x31 */ ITEM_TINGLE_MAP,
|
||||
/* 0x32 */ ITEM_MASK_DEKU,
|
||||
@@ -154,7 +154,7 @@ typedef enum {
|
||||
/* 0x34 */ ITEM_MASK_ZORA,
|
||||
/* 0x35 */ ITEM_MASK_FIERCE_DEITY,
|
||||
/* 0x36 */ ITEM_MASK_TRUTH,
|
||||
/* 0x37 */ ITEM_MASK_KAFEI,
|
||||
/* 0x37 */ ITEM_MASK_KAFEIS_MASK,
|
||||
/* 0x38 */ ITEM_MASK_ALL_NIGHT,
|
||||
/* 0x39 */ ITEM_MASK_BUNNY,
|
||||
/* 0x3A */ ITEM_MASK_KEATON,
|
||||
@@ -294,6 +294,7 @@ typedef enum {
|
||||
/* 0x2A */ GI_NUTS_10 = 0x2A,
|
||||
/* 0x32 */ GI_SHIELD_HERO = 0x32,
|
||||
/* 0x33 */ GI_SHIELD_MIRROR,
|
||||
/* 0x35 */ GI_MAGIC_BEANS = 0x35,
|
||||
/* 0x3C */ GI_KEY_SMALL = 0x3C,
|
||||
/* 0x3E */ GI_MAP = 0x3E,
|
||||
/* 0x3F */ GI_COMPASS,
|
||||
@@ -308,7 +309,7 @@ typedef enum {
|
||||
/* 0x7A */ GI_MASK_ZORA,
|
||||
/* 0x7B */ GI_MASK_FIERCE_DEITY,
|
||||
/* 0x7C */ GI_MASK_TRUTH,
|
||||
/* 0x7D */ GI_MASK_KAFEI,
|
||||
/* 0x7D */ GI_MASK_KAFEIS_MASK,
|
||||
/* 0x7E */ GI_MASK_ALL_NIGHT,
|
||||
/* 0x7F */ GI_MASK_BUNNY,
|
||||
/* 0x80 */ GI_MASK_KEATON,
|
||||
|
||||
+1
-1
@@ -207,7 +207,7 @@ typedef enum {
|
||||
/* 0x0C3 */ OBJECT_GI_SHIELD_3,
|
||||
/* 0x0C4 */ OBJECT_UNSET_C4,
|
||||
/* 0x0C5 */ OBJECT_UNSET_C5,
|
||||
/* 0x0C6 */ OBJECT_GI_BEAN,
|
||||
/* 0x0C6 */ OBJECT_GI_MAGIC_BEANS,
|
||||
/* 0x0C7 */ OBJECT_GI_FISH,
|
||||
/* 0x0C8 */ OBJECT_UNSET_C8,
|
||||
/* 0x0C9 */ OBJECT_UNSET_C9,
|
||||
|
||||
+4
-4
@@ -36,7 +36,7 @@ typedef enum {
|
||||
typedef enum {
|
||||
/* 0x00 */ PLAYER_MASK_NONE,
|
||||
/* 0x01 */ PLAYER_MASK_TRUTH,
|
||||
/* 0x02 */ PLAYER_MASK_KAFEI,
|
||||
/* 0x02 */ PLAYER_MASK_KAFEIS_MASK,
|
||||
/* 0x03 */ PLAYER_MASK_ALL_NIGHT,
|
||||
/* 0x04 */ PLAYER_MASK_BUNNY,
|
||||
/* 0x05 */ PLAYER_MASK_KEATON,
|
||||
@@ -106,15 +106,15 @@ typedef enum {
|
||||
/* 0x2A */ PLAYER_AP_MOON_TEAR,
|
||||
/* 0x2B */ PLAYER_AP_DEED_LAND,
|
||||
/* 0x2C */ PLAYER_AP_ROOM_KEY,
|
||||
/* 0x2D */ PLAYER_AP_LETTER_KAFEI,
|
||||
/* 0x2E */ PLAYER_AP_BEAN,
|
||||
/* 0x2D */ PLAYER_AP_LETTER_TO_KAFEI,
|
||||
/* 0x2E */ PLAYER_AP_MAGIC_BEANS,
|
||||
/* 0x2F */ PLAYER_AP_DEED_SWAMP,
|
||||
/* 0x30 */ PLAYER_AP_DEED_MOUNTAIN,
|
||||
/* 0x31 */ PLAYER_AP_DEED_OCEAN,
|
||||
/* 0x33 */ PLAYER_AP_LETTER_MAMA = 0x33,
|
||||
/* 0x36 */ PLAYER_AP_PENDANT_MEMORIES = 0x36,
|
||||
/* 0x3A */ PLAYER_AP_MASK_TRUTH = 0x3A,
|
||||
/* 0x3B */ PLAYER_AP_MASK_KAFEI,
|
||||
/* 0x3B */ PLAYER_AP_MASK_KAFEIS_MASK,
|
||||
/* 0x3C */ PLAYER_AP_MASK_ALL_NIGHT,
|
||||
/* 0x3D */ PLAYER_AP_MASK_BUNNY,
|
||||
/* 0x3E */ PLAYER_AP_MASK_KEATON,
|
||||
|
||||
Reference in New Issue
Block a user