mirror of https://github.com/zeldaret/mm.git
EnSGoro OK and documented (#895)
* EnSGoro OK and documented * Format fix attempt for EnSGoro * Requested format changes * EnSGoro additional cleanup * Fixed updated names * fork merge (wip - don't review) * Misc. formatting updates Also had to un-eat some changes made upstream in functions.txt and variables.txt. * A couple minor tweaks
This commit is contained in:
Blythe
GitHub
parent
d9a10948d3
commit
f66ef00aeb
3
spec
3
spec
|
|
@ -4363,8 +4363,7 @@ beginseg
|
|||
name "ovl_En_S_Goro"
|
||||
compress
|
||||
include "build/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.o"
|
||||
include "build/data/ovl_En_S_Goro/ovl_En_S_Goro.data.o"
|
||||
include "build/data/ovl_En_S_Goro/ovl_En_S_Goro.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_En_S_Goro/ovl_En_S_Goro_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ Actor* EnJg_GetShrineGoronToFocusOn(PlayState* play, u8 focusedShrineGoronParam)
|
|||
|
||||
while (actorIterator != NULL) {
|
||||
if ((actorIterator->id == ACTOR_EN_S_GORO) &&
|
||||
(EN_S_GORO_GET_PARAM_F(actorIterator) == focusedShrineGoronParam)) {
|
||||
(EN_S_GORO_GET_MAIN_TYPE(actorIterator) == focusedShrineGoronParam)) {
|
||||
return actorIterator;
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -2,20 +2,59 @@
|
|||
#define Z_EN_S_GORO_H
|
||||
|
||||
#include "global.h"
|
||||
#include "objects/object_oF1d_map/object_oF1d_map.h"
|
||||
|
||||
#define EN_S_GORO_GET_PARAM_F(thisx) ((thisx)->params & 0xF)
|
||||
#define EN_S_GORO_GET_MAIN_TYPE(thisx) ((thisx)->params & 0xF)
|
||||
#define EN_S_GORO_SCENEFLAG_INDEX(thisx) (((thisx)->params & 0x7F0) >> 4)
|
||||
|
||||
struct EnSGoro;
|
||||
|
||||
typedef void (*EnSGoroActionFunc)(struct EnSGoro*, PlayState*);
|
||||
|
||||
typedef struct EnSGoro {
|
||||
/* 0x000 */ Actor actor;
|
||||
/* 0x144 */ char unk_144[0x48];
|
||||
/* 0x18C */ EnSGoroActionFunc actionFunc;
|
||||
/* 0x190 */ char unk_190[0x180];
|
||||
} EnSGoro; // size = 0x310
|
||||
|
||||
extern const ActorInit En_S_Goro_InitVars;
|
||||
|
||||
typedef struct EnSGoro {
|
||||
/* 0x000 */ Actor actor;
|
||||
/* 0x144 */ Actor* otherGoron;
|
||||
/* 0x148 */ SkelAnime skelAnime;
|
||||
/* 0x18C */ EnSGoroActionFunc actionFunc;
|
||||
/* 0x190 */ ColliderCylinder collider;
|
||||
/* 0x1DC */ u16 actionFlags;
|
||||
/* 0x1DE */ u16 bombbuyFlags;
|
||||
/* 0x1E0 */ UNK_TYPE1 unk_1E0[0xC];
|
||||
/* 0x1EC */ s16 eyeTexIndex;
|
||||
/* 0x1EE */ s16 eyeTimer;
|
||||
/* 0x1F0 */ s16 loseAttentionTimer;
|
||||
/* 0x1F4 */ s32 loadedObjIndex;
|
||||
/* 0x1F8 */ Vec3s jointTable[GORON_LIMB_MAX];
|
||||
/* 0x264 */ Vec3s morphTable[GORON_LIMB_MAX];
|
||||
/* 0x2D0 */ f32 scaleFactor;
|
||||
/* 0x2D4 */ s16 headRotZ;
|
||||
/* 0x2D6 */ s16 headRotY;
|
||||
/* 0x2D8 */ s16 bodyRotZ;
|
||||
/* 0x2DA */ s16 bodyRotY;
|
||||
/* 0x2DC */ Vec3f headTranslate;
|
||||
/* 0x2E8 */ Vec3s headRotate;
|
||||
/* 0x2F0 */ Vec3f bodyTranslate;
|
||||
/* 0x2FC */ Vec3s bodyRotate;
|
||||
/* 0x302 */ UNK_TYPE1 unk_302[2];
|
||||
/* 0x304 */ u16 textId;
|
||||
/* 0x306 */ s16 snorePhase;
|
||||
/* 0x308 */ s32 animInfoIndex;
|
||||
/* 0x30C */ s16 powderKegPrice;
|
||||
} EnSGoro; // size = 0x310
|
||||
|
||||
typedef enum EnSGoroType {
|
||||
/* 0x0 */ EN_S_GORO_TYPE_SHRINE_WINTER_A,
|
||||
/* 0x1 */ EN_S_GORO_TYPE_SHRINE_WINTER_B,
|
||||
/* 0x2 */ EN_S_GORO_TYPE_SHRINE_WINTER_C,
|
||||
/* 0x3 */ EN_S_GORO_TYPE_SHRINE_SPRING_A,
|
||||
/* 0x4 */ EN_S_GORO_TYPE_SHRINE_SPRING_B,
|
||||
/* 0x5 */ EN_S_GORO_TYPE_SHRINE_SPRING_C,
|
||||
/* 0x6 */ EN_S_GORO_TYPE_SHRINE_SPRING_D,
|
||||
/* 0x7 */ EN_S_GORO_TYPE_SHRINE_SPRING_E,
|
||||
/* 0x8 */ EN_S_GORO_TYPE_SHRINE_SPRING_F,
|
||||
/* 0x9 */ EN_S_GORO_TYPE_BOMBSHOP
|
||||
} EnSGoroType;
|
||||
|
||||
#endif // Z_EN_S_GORO_H
|
||||
|
|
|
|||
|
|
@ -15414,42 +15414,42 @@
|
|||
0x80BBC4E4:("func_80BBC4E4",),
|
||||
0x80BBC500:("func_80BBC500",),
|
||||
0x80BBC540:("EnZos_Draw",),
|
||||
0x80BBCA80:("func_80BBCA80",),
|
||||
0x80BBD348:("func_80BBD348",),
|
||||
0x80BBD8F0:("func_80BBD8F0",),
|
||||
0x80BBD93C:("func_80BBD93C",),
|
||||
0x80BBD98C:("func_80BBD98C",),
|
||||
0x80BBDACC:("func_80BBDACC",),
|
||||
0x80BBDC34:("func_80BBDC34",),
|
||||
0x80BBDCFC:("func_80BBDCFC",),
|
||||
0x80BBDDF8:("func_80BBDDF8",),
|
||||
0x80BBDE78:("func_80BBDE78",),
|
||||
0x80BBDF28:("func_80BBDF28",),
|
||||
0x80BBDFA8:("func_80BBDFA8",),
|
||||
0x80BBE05C:("func_80BBE05C",),
|
||||
0x80BBE0E4:("func_80BBE0E4",),
|
||||
0x80BBE144:("func_80BBE144",),
|
||||
0x80BBE374:("func_80BBE374",),
|
||||
0x80BBE498:("func_80BBE498",),
|
||||
0x80BBE73C:("func_80BBE73C",),
|
||||
0x80BBE844:("func_80BBE844",),
|
||||
0x80BBE904:("func_80BBE904",),
|
||||
0x80BBE9F8:("func_80BBE9F8",),
|
||||
0x80BBEAD8:("func_80BBEAD8",),
|
||||
0x80BBEBF8:("func_80BBEBF8",),
|
||||
0x80BBECBC:("func_80BBECBC",),
|
||||
0x80BBEEB4:("func_80BBEEB4",),
|
||||
0x80BBEF34:("func_80BBEF34",),
|
||||
0x80BBEFA0:("func_80BBEFA0",),
|
||||
0x80BBF01C:("func_80BBF01C",),
|
||||
0x80BBCA80:("EnSGoro_ShrineGoron_NextTextId",),
|
||||
0x80BBD348:("EnSGoro_BombshopGoron_NextTextId",),
|
||||
0x80BBD8F0:("EnSGoro_FindGoronElder",),
|
||||
0x80BBD93C:("EnSGoro_FindGoronChild",),
|
||||
0x80BBD98C:("EnSGoro_UpdateSleeping",),
|
||||
0x80BBDACC:("EnSGoro_UpdateCheerAnimation",),
|
||||
0x80BBDC34:("EnSGoro_CheckLullaby",),
|
||||
0x80BBDCFC:("EnSGoro_CheckGKBehavior",),
|
||||
0x80BBDDF8:("EnSGoro_UpdateToHandtapAnimation",),
|
||||
0x80BBDE78:("EnSGoro_UpdateSleepyAnimation",),
|
||||
0x80BBDF28:("EnSGoro_UpdateToIdleAnimation",),
|
||||
0x80BBDFA8:("EnSGoro_UpdateCollider",),
|
||||
0x80BBE05C:("EnSGoro_UpdateEyes",),
|
||||
0x80BBE0E4:("EnSGoro_UpdateActorFocus",),
|
||||
0x80BBE144:("EnSGoro_UpdateRotationToPlayer",),
|
||||
0x80BBE374:("EnSGoro_UpdateAttentionTarget",),
|
||||
0x80BBE498:("EnSGoro_SetupAction",),
|
||||
0x80BBE73C:("EnSGoro_WinterShrineGoron_Idle",),
|
||||
0x80BBE844:("EnSGoro_WinterShrineGoron_Talk",),
|
||||
0x80BBE904:("EnSGoro_SpringShrineGoron_Idle",),
|
||||
0x80BBE9F8:("EnSGoro_SpringShrineGoron_Talk",),
|
||||
0x80BBEAD8:("EnSGoro_ShopGoron_Idle",),
|
||||
0x80BBEBF8:("EnSGoro_ShopGoron_FinishUnroll",),
|
||||
0x80BBECBC:("EnSGoro_ShopGoron_Talk",),
|
||||
0x80BBEEB4:("EnSGoro_ShopGoron_TakePayment",),
|
||||
0x80BBEF34:("EnSGoro_ShopGoron_FinishTransaction",),
|
||||
0x80BBEFA0:("EnSGoro_Sleep",),
|
||||
0x80BBF01C:("EnSGoro_SleepTalk",),
|
||||
0x80BBF09C:("EnSGoro_Init",),
|
||||
0x80BBF198:("EnSGoro_Destroy",),
|
||||
0x80BBF1C4:("EnSGoro_Update",),
|
||||
0x80BBF298:("func_80BBF298",),
|
||||
0x80BBF3D0:("func_80BBF3D0",),
|
||||
0x80BBF3EC:("func_80BBF3EC",),
|
||||
0x80BBF5F0:("func_80BBF5F0",),
|
||||
0x80BBF6BC:("func_80BBF6BC",),
|
||||
0x80BBF298:("EnSGoro_UpdateLimb",),
|
||||
0x80BBF3D0:("EnSGoro_OverrideLimbDraw",),
|
||||
0x80BBF3EC:("EnSGoro_TransformLimbDraw",),
|
||||
0x80BBF5F0:("EnSGoro_DrawUnrolled",),
|
||||
0x80BBF6BC:("EnSGoro_DrawRolledUp",),
|
||||
0x80BBF7BC:("EnSGoro_Draw",),
|
||||
0x80BBFDB0:("func_80BBFDB0",),
|
||||
0x80BBFE60:("func_80BBFE60",),
|
||||
|
|
|
|||
|
|
@ -15610,12 +15610,12 @@
|
|||
0x80BBC75C:("D_80BBC75C","UNK_TYPE1","",0x1),
|
||||
0x80BBC770:("D_80BBC770","f32","",0x4),
|
||||
0x80BBC774:("jtbl_80BBC774","UNK_PTR","",0x4),
|
||||
0x80BBF800:("En_S_Goro_InitVars","UNK_TYPE1","",0x1),
|
||||
0x80BBF820:("D_80BBF820","UNK_TYPE1","",0x1),
|
||||
0x80BBF84C:("D_80BBF84C","UNK_TYPE1","",0x1),
|
||||
0x80BBF858:("D_80BBF858","UNK_TYPE1","",0x1),
|
||||
0x80BBF878:("D_80BBF878","UNK_TYPE1","",0x1),
|
||||
0x80BBF978:("D_80BBF978","UNK_TYPE1","",0x1),
|
||||
0x80BBF800:("En_S_Goro_InitVars","ActorInit","",0x20),
|
||||
0x80BBF820:("sCylinderInit","ColliderCylinderInit","",0x2C),
|
||||
0x80BBF84C:("sColChkInfoInit","CollisionCheckInfoInit2","",0xC),
|
||||
0x80BBF858:("sDamageTable","DamageTable","",0x20),
|
||||
0x80BBF878:("sAnimationInfo","AnimationInfoS","[16]",0x100),
|
||||
0x80BBF978:("sEyeTextures","TexturePtr","[4]",0x18),
|
||||
0x80BBF990:("jtbl_80BBF990","UNK_PTR","",0x4),
|
||||
0x80BBF9B4:("jtbl_80BBF9B4","UNK_PTR","",0x4),
|
||||
0x80BBFA34:("D_80BBFA34","f32","",0x4),
|
||||
|
|
|
|||
Loading…
Reference in New Issue