mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-29 02:40:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

En_Talk_Gibud (Gibdos in the well) OK and somewhat documented (#486)

Browse Source 
* Good start

* More progress

* More progress, need to try importing data now

* Import data to C

* Match a tricky item function

* Matched another item function

* Improve definition of EnTalkGibudUnkStruct

* func_80AFFD3C OK

* Draw functions done

* EnTalkGibud_Init OK

* EnTalkGibud OK

* Document item and switch flag stuff

* Name all static variables

* Enum for animations

* Document type

* Document limb stuff

* Tons of documentation

* Document effect stuff

* Document most unknown struct vars

* Name most functions

* Name final function + document text IDs

* Organize forward declarations

* Name stack variables

* Document damage effects

* Document limbs

* One final pass

* Respond to Anghelo's review

* Respond to Anghelo's second review

* Add space to force Jenkins to rerun (testing PR dashboard, please ignore)

* Removing previously added space

* Fix limb enum to add LIMB_NONE

* Run ./format.sh, whoops

* Respond to hensldm review + small cleanup

* Respond to engineer's review

* Fix item enum

* This is a legacy PR, so using autogenned object symbols

* Fix merge conflict

* Move Talk_Gibud specific enums to .c
This commit is contained in:
Tom Overton
2021-12-27 18:15:32 -08:00
committed by GitHub
parent 527c54b66e
commit 44ccdbe0d5
6 changed files with 1190 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c
+1066 -101
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h
+75 -4
View File
@@ -3,15 +3,86 @@
#include "global.h"
#define EN_TALK_GIBUD_REQUESTED_ITEM_INDEX(thisx) ((thisx)->params & 0xF)
#define EN_TALK_GIBUD_SWITCH_FLAG(thisx) (((thisx)->params & 0xFF0) >> 4)
typedef enum {
/* 0 */ EN_TALK_GIBUD_TYPE_GIBDO,
/* 1 */ EN_TALK_GIBUD_TYPE_REDEAD,
} EnTalkGibudType;
typedef enum {
/* 0 */ EN_TALK_GIBUD_GRAB_START,
/* 1 */ EN_TALK_GIBUD_GRAB_ATTACK,
/* 2 */ EN_TALK_GIBUD_GRAB_RELEASE,
} EnTalkGibudGrabState;
typedef enum {
/* 0 */ EN_TALK_GIBUD_LIMB_NONE,
/* 1 */ EN_TALK_GIBUD_LIMB_ROOT, // Root of Left Leg Root, Right Leg Root, Upper Body Root, and Pelvis
/* 2 */ EN_TALK_GIBUD_LIMB_LEFT_LEG_ROOT,
/* 3 */ EN_TALK_GIBUD_LIMB_LEFT_THIGH,
/* 4 */ EN_TALK_GIBUD_LIMB_LEFT_LOWER_LEG,
/* 5 */ EN_TALK_GIBUD_LIMB_LEFT_FOOT_ROOT,
/* 6 */ EN_TALK_GIBUD_LIMB_LEFT_FOOT,
/* 7 */ EN_TALK_GIBUD_LIMB_RIGHT_LEG_ROOT,
/* 8 */ EN_TALK_GIBUD_LIMB_RIGHT_THIGH,
/* 9 */ EN_TALK_GIBUD_LIMB_RIGHT_LOWER_LEG,
/* 10 */ EN_TALK_GIBUD_LIMB_RIGHT_FOOT_ROOT,
/* 11 */ EN_TALK_GIBUD_LIMB_RIGHT_FOOT,
/* 12 */ EN_TALK_GIBUD_LIMB_UPPER_BODY_ROOT,
/* 13 */ EN_TALK_GIBUD_LIMB_UPPER_BODY, // Root of Torso
/* 14 */ EN_TALK_GIBUD_LIMB_TORSO, // Root of Left Arm Root, Right Arm Root, and Head Root
/* 15 */ EN_TALK_GIBUD_LIMB_LEFT_ARM_ROOT,
/* 16 */ EN_TALK_GIBUD_LIMB_LEFT_SHOULDER_AND_UPPER_ARM,
/* 17 */ EN_TALK_GIBUD_LIMB_LEFT_FOREARM,
/* 18 */ EN_TALK_GIBUD_LIMB_LEFT_HAND,
/* 19 */ EN_TALK_GIBUD_LIMB_RIGHT_ARM_ROOT,
/* 20 */ EN_TALK_GIBUD_LIMB_RIGHT_SHOULDER_AND_UPPER_ARM,
/* 21 */ EN_TALK_GIBUD_LIMB_RIGHT_FOREARM,
/* 22 */ EN_TALK_GIBUD_LIMB_RIGHT_HAND,
/* 23 */ EN_TALK_GIBUD_LIMB_HEAD_ROOT,
/* 24 */ EN_TALK_GIBUD_LIMB_HEAD,
/* 25 */ EN_TALK_GIBUD_LIMB_PELVIS,
/* 26 */ EN_TALK_GIBUD_LIMB_MAX,
} EnTalkGibudLimbs;
struct EnTalkGibud;
typedef void (*EnTalkGibudActionFunc)(struct EnTalkGibud*, GlobalContext*);
typedef struct EnTalkGibud {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x90];
/* 0x01D4 */ EnTalkGibudActionFunc actionFunc;
/* 0x01D8 */ char unk_1D8[0x220];
/* 0x000 */ Actor actor;
/* 0x144 */ ColliderCylinder collider;
/* 0x190 */ SkelAnime skelAnime;
/* 0x1D4 */ EnTalkGibudActionFunc actionFunc;
/* 0x1D8 */ Vec3f limbPos[15];
/* 0x28C */ s32 limbIndex;
/* 0x290 */ s32 requestedItemIndex;
/* 0x294 */ s32 itemActionParam;
/* 0x298 */ s32 switchFlag;
/* 0x29C */ f32 effectAlpha;
/* 0x2A0 */ f32 effectScale;
/* 0x2A4 */ Vec3s jointTable[EN_TALK_GIBUD_LIMB_MAX];
/* 0x340 */ Vec3s morphTable[EN_TALK_GIBUD_LIMB_MAX];
/* 0x3DC */ s16 textId;
/* 0x3DE */ Vec3s headRotation;
/* 0x3E4 */ Vec3s upperBodyRotation;
/* 0x3EA */ union {
s16 playerStunWaitTimer; // Cannot stun the player if this is non-zero
s16 grabDamageTimer;
s16 headShakeTimer;
s16 stunTimer;
s16 deathTimer;
s16 disappearanceTimer;
};
/* 0x3EC */ s16 grabState;
/* 0x3EE */ s16 grabWaitTimer; // Cannot grab the player if this is non-zero
/* 0x3F0 */ s16 effectTimer;
/* 0x3F2 */ s16 type;
/* 0x3F4 */ s16 isTalking;
/* 0x3F6 */ u8 effectType;
/* 0x3F7 */ s8 unk_3F7; // related to player->unk_ADD
} EnTalkGibud; // size = 0x3F8
extern const ActorInit En_Talk_Gibud_InitVars;