mirror of https://github.com/zeldaret/mm.git
`EnFz` and `object_fz`: Freezard documented (#1828)
* Freezard: some docs * Freezard: more docs * Freezard: most function names * Freezard: last function named * Freeza: more docs * Freezard: oops wrong actor name * Fz: more docs * Fz: more docs * Fz: Object named * Fz: Object named * Fz: changed my mind, function names changed to reflect old OOT behavior not seen in this game, in case someone confuses them * Freezer: docs * Free: more docs * F: format * Fz: more docs * Fz: format * EnFz: more docs, format * Fz: More minor docs * Fz: more docs, format * Apply suggestions from code review Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * EnFz: More requested changes * Fz: updated function declarations * EnFz: one of the flags was still 0 * Fz: updated functions.txt for disasm * Apply suggestions from code review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> --------- Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
Isghj
GitHub
parent
7e800791a1
commit
64d2e009fb
|
|
@ -1,12 +1,13 @@
|
|||
<Root>
|
||||
<File Name="object_fz" Segment="6">
|
||||
<DList Name="object_fz_DL_001130" Offset="0x1130" />
|
||||
<DList Name="object_fz_DL_0021A0" Offset="0x21A0" />
|
||||
<DList Name="object_fz_DL_002CA0" Offset="0x2CA0" />
|
||||
<Texture Name="object_fz_Tex_002E70" OutName="tex_002E70" Format="i4" Width="32" Height="32" Offset="0x2E70" />
|
||||
<DList Name="object_fz_DL_0030A0" Offset="0x30A0" />
|
||||
<DList Name="object_fz_DL_003158" Offset="0x3158" />
|
||||
<DList Name="object_fz_DL_003260" Offset="0x3260" />
|
||||
<DList Name="object_fz_DL_0033F0" Offset="0x33F0" />
|
||||
<DList Name="gFreezardBodyIntactDL" Offset="0x1130" />
|
||||
<DList Name="gFreezardBodyHornBrokenDL" Offset="0x21A0" />
|
||||
<DList Name="gFreezardBodyHeadBrokenDL" Offset="0x2CA0" />
|
||||
<Texture Name="gFreezardSteamTex" OutName="steam" Format="i4" Width="32" Height="32" Offset="0x2E70" />
|
||||
<DList Name="gFreezardSteamStartDL" Offset="0x30A0" />
|
||||
<DList Name="gFreezardSteamDL" Offset="0x3158" />
|
||||
<!-- Unused, wasn't used in OOT either -->
|
||||
<DList Name="gFreezardIceSpikeDL" Offset="0x3260" />
|
||||
<DList Name="gFreezardIceChunkDL" Offset="0x33F0" />
|
||||
</File>
|
||||
</Root>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -8,66 +8,97 @@ struct EnFz;
|
|||
typedef void (*EnFzActionFunc)(struct EnFz*, PlayState*);
|
||||
typedef void (*EnFzUnkFunc)(struct EnFz*);
|
||||
|
||||
#define ENFZ_GET_F(thisx) ((thisx)->params & 0xF)
|
||||
#define ENFZ_GET_3000(thisx) (((thisx)->params & 0x3000) >> 0xC)
|
||||
#define ENFZ_GET_4000(thisx) ((thisx)->params & 0x4000)
|
||||
#define ENFZ_GET_8000(thisx) ((thisx)->params & 0x8000)
|
||||
#define ENFZ_GET_POWER(thisx) ((thisx)->params & 0xF)
|
||||
#define ENFZ_GET_ROTATION_LIMIT(thisx) (((thisx)->params & 0x3000) >> 0xC)
|
||||
// appears out of the ground imediately
|
||||
#define ENFZ_GET_APPEAR_TYPE(thisx) ((thisx)->params & 0x4000)
|
||||
// if ENFZ_GET_TRACK_TYPE and NOT ENFZ_GET_APPEAR_TYPE (0x8000)
|
||||
// appears from the ground if player approaches, skates after them
|
||||
#define ENFZ_GET_TRACK_TYPE(thisx) ((thisx)->params & 0x8000)
|
||||
// Track and Appear have a mixed behavior if both are enabled:
|
||||
// if ENFZ_GET_TRACK_TYPE AND ENFZ_GET_APPEAR_TYPE (0xC000)
|
||||
// appears from the ground immediately, stays still,
|
||||
// but follows player to aim, while ignoring rotation limit
|
||||
|
||||
typedef enum {
|
||||
/* 0 */ ENFZ_F_0,
|
||||
/* 1 */ ENFZ_F_1,
|
||||
/* 2 */ ENFZ_F_2,
|
||||
/* 3 */ ENFZ_F_3
|
||||
} EnFzParam;
|
||||
// Clock specifies where the internal clock starts, zero is random
|
||||
// used to force specific attack timing
|
||||
// used in Snowhead Temple: 0x3, 0x7, 0xD in room 02
|
||||
// causing them to breath at the bridge in series so the player has to time the jump
|
||||
// the value passed is 1/10 final value in frames
|
||||
#define ENFZ_GETZ_CLOCK(thisx) ((thisx)->shape.rot.z)
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ u8 unk_00;
|
||||
/* 0x01 */ u8 unk_01;
|
||||
/* 0x04 */ Vec3f unk_04;
|
||||
/* 0x10 */ Vec3f unk_10;
|
||||
/* 0x1C */ Vec3f unk_1C;
|
||||
/* 0x28 */ UNK_TYPE1 unk_28[0x4];
|
||||
/* 0x2C */ s16 unk_2C;
|
||||
/* 0x2E */ s16 unk_2E;
|
||||
/* 0x30 */ f32 unk_30;
|
||||
/* 0x34 */ f32 unk_34;
|
||||
/* 0x38 */ u8 unk_38;
|
||||
} EnFzStruct; // size = 0x3C
|
||||
// 0,1,2 are how powerful (distance) the attack is
|
||||
// F is treated like 0 (else case)
|
||||
typedef enum EnFzPower {
|
||||
/* 0 */ FZ_POWER_0, // + 0
|
||||
/* 1 */ FZ_POWER_1, // + 10
|
||||
/* 2 */ FZ_POWER_2, // + 20
|
||||
/* 3 */ FZ_POWER_PASSIVE, // unfinished empty actionfunc
|
||||
/* F */ FZ_POWER_F = 0xF // snowhead map room
|
||||
} EnFzPower;
|
||||
|
||||
typedef enum EnFzEffectType {
|
||||
/* 0 */ FZ_EFFECT_DISABLED,
|
||||
/* 1 */ FZ_EFFECT_MIST_AURA,
|
||||
/* 2 */ FZ_EFFECT_BREATH
|
||||
} EnFzEffectType;
|
||||
|
||||
typedef struct EnFzEffect {
|
||||
/* 0x00 */ u8 type;
|
||||
/* 0x01 */ u8 timer;
|
||||
/* 0x04 */ Vec3f pos;
|
||||
/* 0x10 */ Vec3f velocity;
|
||||
/* 0x1C */ Vec3f accel;
|
||||
/* 0x28 */ UNK_TYPE1 unk28[0x4];
|
||||
/* 0x2C */ s16 primAlpha;
|
||||
/* 0x2E */ s16 primAlphaState;
|
||||
/* 0x30 */ f32 xyScale;
|
||||
/* 0x34 */ f32 xyScaleTarget;
|
||||
/* 0x38 */ u8 damaging;
|
||||
} EnFzEffect; // size = 0x3C
|
||||
|
||||
// indexes the different mist functions
|
||||
typedef enum EnFzState {
|
||||
/* 0 */ FZ_STATE_HIDDEN, // OOT, waiting for player approach, ice cavern
|
||||
/* 1 */ FZ_STATE_FULLSIZE,
|
||||
/* 2 */ FZ_STATE_CHANGING, // OOT, growing and disappearing, ice cavern
|
||||
/* 3 */ FZ_STATE_MELTING, // fire arrows
|
||||
} EnFzState;
|
||||
|
||||
typedef struct EnFz {
|
||||
/* 0x000 */ Actor actor;
|
||||
/* 0x144 */ EnFzActionFunc actionFunc;
|
||||
/* 0x148 */ ColliderCylinder collider1;
|
||||
/* 0x194 */ ColliderCylinder collider2;
|
||||
/* 0x1E0 */ ColliderCylinder collider3;
|
||||
/* 0x22C */ Vec3f unk_22C;
|
||||
/* 0x238 */ f32 unk_238;
|
||||
/* 0x23C */ EnFzStruct unk_23C[40];
|
||||
/* 0x194 */ ColliderCylinder collider2; // might be hard protection ac
|
||||
/* 0x1E0 */ ColliderCylinder collider3; // at for breath
|
||||
/* 0x22C */ Vec3f wallHitPos;
|
||||
/* 0x238 */ f32 distToTargetSq;
|
||||
/* 0x23C */ EnFzEffect effects[40];
|
||||
/* 0xB9C */ f32 drawDmgEffAlpha;
|
||||
/* 0xBA0 */ f32 drawDmgEffScale;
|
||||
/* 0xBA4 */ s16 drawDmgEffTimer;
|
||||
/* 0xBA8 */ f32 unk_BA8;
|
||||
/* 0xBAC */ f32 unk_BAC;
|
||||
/* 0xBB0 */ f32 unk_BB0;
|
||||
/* 0xBB4 */ f32 unk_BB4;
|
||||
/* 0xBB8 */ f32 unk_BB8;
|
||||
/* 0xBBC */ f32 unk_BBC;
|
||||
/* 0xBC0 */ u32 unk_BC0;
|
||||
/* 0xBC4 */ s16 unk_BC4;
|
||||
/* 0xBC6 */ s16 unk_BC6;
|
||||
/* 0xBC8 */ s16 unk_BC8;
|
||||
/* 0xBCA */ s16 unk_BCA;
|
||||
/* 0xBCC */ u8 unk_BCC;
|
||||
/* 0xBCD */ u8 unk_BCD;
|
||||
/* 0xBCE */ u8 unk_BCE;
|
||||
/* 0xBCF */ u8 unk_BCF;
|
||||
/* 0xBD0 */ s16 unk_BD0;
|
||||
/* 0xBD2 */ s16 unk_BD2;
|
||||
/* 0xBA8 */ Vec3f originPos;
|
||||
/* 0xBB4 */ f32 originPosY;
|
||||
/* 0xBB8 */ f32 unkBB8; // set (135.0f), never read
|
||||
/* 0xBBC */ f32 speedXZ;
|
||||
/* 0xBC0 */ u32 envAlpha;
|
||||
// we set it, and read it, but never the same value
|
||||
// assumed unfinished shared variable with wizrobe
|
||||
/* 0xBC4 */ s16 wizrobeFlag;
|
||||
/* 0xBC6 */ s16 internalClock;
|
||||
/* 0xBC8 */ s16 unusedTimer; // set (0), never read
|
||||
/* 0xBCA */ s16 mainTimer;
|
||||
/* 0xBCC */ u8 isBgEnabled;
|
||||
/* 0xBCD */ u8 isMoving;
|
||||
/* 0xBCE */ u8 isColliderActive;
|
||||
/* 0xBCF */ u8 hitCounter; /// set, never read
|
||||
/* 0xBD0 */ s16 unkBD0; // set (0), never read
|
||||
/* 0xBD2 */ s16 unkBD2; // set (0,4000), never read
|
||||
/* 0xBD4 */ UNK_TYPE1 unkBD4[2];
|
||||
/* 0xBD6 */ u8 unk_BD6;
|
||||
/* 0xBD7 */ u8 unk_BD7;
|
||||
/* 0xBD8 */ u8 unk_BD8;
|
||||
/* 0xBD9 */ u8 unk_BD9;
|
||||
/* 0xBD6 */ u8 state;
|
||||
/* 0xBD7 */ u8 drawBody;
|
||||
/* 0xBD8 */ u8 isDying;
|
||||
/* 0xBD9 */ u8 attackTimer; // never set, always zero
|
||||
} EnFz; /* size = 0xBDC */
|
||||
|
||||
#endif // Z_EN_FZ_H
|
||||
|
|
|
|||
|
|
@ -7211,43 +7211,43 @@ ObjIcePoly_Update = 0x80932198; // type:func
|
|||
ObjIcePoly_Draw = 0x809321BC; // type:func
|
||||
EnFz_Init = 0x80932490; // type:func
|
||||
EnFz_Destroy = 0x809326F4; // type:func
|
||||
func_80932784 = 0x80932784; // type:func
|
||||
func_809328A4 = 0x809328A4; // type:func
|
||||
func_809328F4 = 0x809328F4; // type:func
|
||||
func_80932AE8 = 0x80932AE8; // type:func
|
||||
func_80932AF4 = 0x80932AF4; // type:func
|
||||
func_80932BD4 = 0x80932BD4; // type:func
|
||||
func_80932C98 = 0x80932C98; // type:func
|
||||
func_80933014 = 0x80933014; // type:func
|
||||
func_809330D4 = 0x809330D4; // type:func
|
||||
func_80933104 = 0x80933104; // type:func
|
||||
func_80933184 = 0x80933184; // type:func
|
||||
func_809331F8 = 0x809331F8; // type:func
|
||||
func_80933248 = 0x80933248; // type:func
|
||||
func_80933274 = 0x80933274; // type:func
|
||||
func_80933324 = 0x80933324; // type:func
|
||||
func_80933368 = 0x80933368; // type:func
|
||||
func_809333A4 = 0x809333A4; // type:func
|
||||
func_809333D8 = 0x809333D8; // type:func
|
||||
func_80933414 = 0x80933414; // type:func
|
||||
func_80933444 = 0x80933444; // type:func
|
||||
func_80933480 = 0x80933480; // type:func
|
||||
func_809334B8 = 0x809334B8; // type:func
|
||||
func_809336C0 = 0x809336C0; // type:func
|
||||
func_80933760 = 0x80933760; // type:func
|
||||
func_80933790 = 0x80933790; // type:func
|
||||
func_809337D4 = 0x809337D4; // type:func
|
||||
func_8093389C = 0x8093389C; // type:func
|
||||
func_809338E0 = 0x809338E0; // type:func
|
||||
func_80933AF4 = 0x80933AF4; // type:func
|
||||
func_80933B38 = 0x80933B38; // type:func
|
||||
func_80933B48 = 0x80933B48; // type:func
|
||||
EnFz_UpdateTargetPos = 0x80932784; // type:func
|
||||
EnFz_ReachedTarget = 0x809328A4; // type:func
|
||||
EnFz_Damaged = 0x809328F4; // type:func
|
||||
EnFz_SpawnMistHidden = 0x80932AE8; // type:func
|
||||
EnFz_SpawnMistChanging = 0x80932AF4; // type:func
|
||||
EnFz_SpawnMistFullSize = 0x80932BD4; // type:func
|
||||
EnFz_ApplyDamage = 0x80932C98; // type:func
|
||||
EnFz_SetYawTowardsPlayer = 0x80933014; // type:func
|
||||
EnFz_SetupDisappear = 0x809330D4; // type:func
|
||||
EnFz_Disappear = 0x80933104; // type:func
|
||||
EnFz_SetupWait = 0x80933184; // type:func
|
||||
EnFz_Wait = 0x809331F8; // type:func
|
||||
EnFz_SetupAppear = 0x80933248; // type:func
|
||||
EnFz_Appear = 0x80933274; // type:func
|
||||
EnFz_SetupAimForSkate = 0x80933324; // type:func
|
||||
EnFz_AimForSkate = 0x80933368; // type:func
|
||||
EnFz_SetupSkateTowardPlayer = 0x809333A4; // type:func
|
||||
EnFz_SkateTowardPlayer = 0x809333D8; // type:func
|
||||
EnFz_SetupSkatingAimFreeze = 0x80933414; // type:func
|
||||
EnFz_SkatingAimFreeze = 0x80933444; // type:func
|
||||
EnFz_SetupSkatingFreeze = 0x80933480; // type:func
|
||||
EnFz_SkatingFreeze = 0x809334B8; // type:func
|
||||
EnFz_SetupDie = 0x809336C0; // type:func
|
||||
EnFz_Die = 0x80933760; // type:func
|
||||
EnFz_SetupMelt = 0x80933790; // type:func
|
||||
EnFz_Melt = 0x809337D4; // type:func
|
||||
EnFz_SetupIdleStationary = 0x8093389C; // type:func
|
||||
EnFz_IdleStationary = 0x809338E0; // type:func
|
||||
EnFz_SetupPassive = 0x80933AF4; // type:func
|
||||
EnFz_Passive = 0x80933B38; // type:func
|
||||
EnFz_UpdateLightArrowEffects = 0x80933B48; // type:func
|
||||
EnFz_Update = 0x80933BFC; // type:func
|
||||
EnFz_Draw = 0x80933D98; // type:func
|
||||
func_80934018 = 0x80934018; // type:func
|
||||
func_809340BC = 0x809340BC; // type:func
|
||||
func_80934178 = 0x80934178; // type:func
|
||||
func_80934464 = 0x80934464; // type:func
|
||||
EnFz_SpawnMistAura = 0x80934018; // type:func
|
||||
EnFz_SpawnBreath = 0x809340BC; // type:func
|
||||
EnFz_UpdateEffects = 0x80934178; // type:func
|
||||
EnFz_DrawEffects = 0x80934464; // type:func
|
||||
EnKusa_ApplySway = 0x809349E0; // type:func
|
||||
EnKusa_Sway = 0x80934AB4; // type:func
|
||||
EnKusa_SnapToFloor = 0x80934F58; // type:func
|
||||
|
|
|
|||
Loading…
Reference in New Issue