mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
EnBigokuta OK and documented + object_bigokuta documented (#563)
* EnBigokuta like half matched * match all but 2 functions * match all the functions * import data * name object stuff * use new object symbols, do some documenting * fix name of headUndersideTex * name some struct members * finish documenting * Address comments spacing, unkFunc comments, temp names, remove parens, reorder pads, data formatting, limb enum * address comments * move empty line * change the ARRAY_COUNT
This commit is contained in:
LtPeriwinkle
@@ -1,58 +1,58 @@
|
||||
<Root>
|
||||
<File Name="object_bigokuta" Segment="6">
|
||||
<Animation Name="object_bigokuta_Anim_000444" Offset="0x444" />
|
||||
<Animation Name="object_bigokuta_Anim_000A74" Offset="0xA74" />
|
||||
<Animation Name="object_bigokuta_Anim_000D1C" Offset="0xD1C" />
|
||||
<Animation Name="object_bigokuta_Anim_0014B8" Offset="0x14B8" />
|
||||
<Animation Name="object_bigokuta_Anim_001CA4" Offset="0x1CA4" />
|
||||
<DList Name="object_bigokuta_DL_004090" Offset="0x4090" />
|
||||
<DList Name="object_bigokuta_DL_004158" Offset="0x4158" />
|
||||
<DList Name="object_bigokuta_DL_0042A8" Offset="0x42A8" />
|
||||
<DList Name="object_bigokuta_DL_0043D0" Offset="0x43D0" />
|
||||
<DList Name="object_bigokuta_DL_0044F8" Offset="0x44F8" />
|
||||
<DList Name="object_bigokuta_DL_004AB8" Offset="0x4AB8" />
|
||||
<DList Name="object_bigokuta_DL_004CA0" Offset="0x4CA0" />
|
||||
<DList Name="object_bigokuta_DL_004E10" Offset="0x4E10" />
|
||||
<DList Name="object_bigokuta_DL_004EB8" Offset="0x4EB8" />
|
||||
<DList Name="object_bigokuta_DL_004F90" Offset="0x4F90" />
|
||||
<DList Name="object_bigokuta_DL_005038" Offset="0x5038" />
|
||||
<DList Name="object_bigokuta_DL_005110" Offset="0x5110" />
|
||||
<DList Name="object_bigokuta_DL_0051D0" Offset="0x51D0" />
|
||||
<DList Name="object_bigokuta_DL_0053B0" Offset="0x53B0" />
|
||||
<DList Name="object_bigokuta_DL_005470" Offset="0x5470" />
|
||||
<DList Name="object_bigokuta_DL_005650" Offset="0x5650" />
|
||||
<DList Name="object_bigokuta_DL_005710" Offset="0x5710" />
|
||||
<DList Name="object_bigokuta_DL_0058F0" Offset="0x58F0" />
|
||||
<DList Name="object_bigokuta_DL_0059B0" Offset="0x59B0" />
|
||||
<Texture Name="object_bigokuta_Tex_005B90" OutName="tex_005B90" Format="rgba16" Width="16" Height="16" Offset="0x5B90" />
|
||||
<Texture Name="object_bigokuta_Tex_005D90" OutName="tex_005D90" Format="rgba16" Width="8" Height="16" Offset="0x5D90" />
|
||||
<Texture Name="object_bigokuta_Tex_005E90" OutName="tex_005E90" Format="rgba16" Width="16" Height="16" Offset="0x5E90" />
|
||||
<Texture Name="object_bigokuta_Tex_006090" OutName="tex_006090" Format="rgba16" Width="16" Height="16" Offset="0x6090" />
|
||||
<Texture Name="object_bigokuta_Tex_006290" OutName="tex_006290" Format="rgba16" Width="8" Height="8" Offset="0x6290" />
|
||||
<Texture Name="object_bigokuta_Tex_006310" OutName="tex_006310" Format="rgba16" Width="8" Height="8" Offset="0x6310" />
|
||||
<Texture Name="object_bigokuta_Tex_006390" OutName="tex_006390" Format="rgba16" Width="16" Height="16" Offset="0x6390" />
|
||||
<Texture Name="object_bigokuta_Tex_006590" OutName="tex_006590" Format="rgba16" Width="16" Height="16" Offset="0x6590" />
|
||||
<Texture Name="object_bigokuta_Tex_006790" OutName="tex_006790" Format="rgba16" Width="8" Height="16" Offset="0x6790" />
|
||||
<Texture Name="object_bigokuta_Tex_006890" OutName="tex_006890" Format="rgba16" Width="16" Height="16" Offset="0x6890" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006A90" Type="Standard" Offset="0x6A90" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006A9C" Type="Standard" Offset="0x6A9C" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006AA8" Type="Standard" Offset="0x6AA8" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006AB4" Type="Standard" Offset="0x6AB4" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006AC0" Type="Standard" Offset="0x6AC0" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006ACC" Type="Standard" Offset="0x6ACC" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006AD8" Type="Standard" Offset="0x6AD8" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006AE4" Type="Standard" Offset="0x6AE4" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006AF0" Type="Standard" Offset="0x6AF0" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006AFC" Type="Standard" Offset="0x6AFC" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006B08" Type="Standard" Offset="0x6B08" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006B14" Type="Standard" Offset="0x6B14" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006B20" Type="Standard" Offset="0x6B20" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006B2C" Type="Standard" Offset="0x6B2C" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006B38" Type="Standard" Offset="0x6B38" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006B44" Type="Standard" Offset="0x6B44" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006B50" Type="Standard" Offset="0x6B50" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006B5C" Type="Standard" Offset="0x6B5C" />
|
||||
<Limb Name="object_bigokuta_Standardlimb_006B68" Type="Standard" Offset="0x6B68" />
|
||||
<Skeleton Name="object_bigokuta_Skel_006BC0" Type="Flex" LimbType="Standard" Offset="0x6BC0" />
|
||||
<Animation Name="gBigOctoRiseOutOfWaterAnim" Offset="0x444" />
|
||||
<Animation Name="gBigOctoDeathAnim" Offset="0xA74" />
|
||||
<Animation Name="gBigOctoHitAnim" Offset="0xD1C" />
|
||||
<Animation Name="gBigOctoIdleAnim" Offset="0x14B8" />
|
||||
<Animation Name="gBigOctoWalkAnim" Offset="0x1CA4" />
|
||||
<DList Name="gBigOctoBodyDL" Offset="0x4090" />
|
||||
<DList Name="gBigOctoCenterSnoutDL" Offset="0x4158" />
|
||||
<DList Name="gBigOctoLeftSnoutDL" Offset="0x42A8" />
|
||||
<DList Name="gBigOctoRightSnoutDL" Offset="0x43D0" />
|
||||
<DList Name="gBigOctoHeadShellDL" Offset="0x44F8" />
|
||||
<DList Name="gBigOctoRightWeakPointDL" Offset="0x4AB8" />
|
||||
<DList Name="gBigOctoLeftWeakPointDL" Offset="0x4CA0" />
|
||||
<DList Name="gBigOctoRightTentacleBaseDL" Offset="0x4E10" />
|
||||
<DList Name="gBigOctoRightTentacleTipDL" Offset="0x4EB8" />
|
||||
<DList Name="gBigOctoLeftTentacleBaseDL" Offset="0x4F90" />
|
||||
<DList Name="gBigOctoLeftTentacleTipDL" Offset="0x5038" />
|
||||
<DList Name="gBigOctoBackRightArmBaseDL" Offset="0x5110" />
|
||||
<DList Name="gBigOctoBackRightArmEndDL" Offset="0x51D0" />
|
||||
<DList Name="gBigOctoBackLeftArmBaseDL" Offset="0x53B0" />
|
||||
<DList Name="gBigOctoBackLeftArmEndDL" Offset="0x5470" />
|
||||
<DList Name="gBigOctoFrontLeftArmBaseDL" Offset="0x5650" />
|
||||
<DList Name="gBigOctoFrontLeftArmEndDL" Offset="0x5710" />
|
||||
<DList Name="gBigOctoFrontRightArmBaseDL" Offset="0x58F0" />
|
||||
<DList Name="gBigOctoFrontRightArmEndDL" Offset="0x59B0" />
|
||||
<Texture Name="gBigOctoArmTopTex" OutName="big_octo_arm_top" Format="rgba16" Width="16" Height="16" Offset="0x5B90" />
|
||||
<Texture Name="gBigOctoWeakPointCoverTex" OutName="big_octo_weak_point_cover" Format="rgba16" Width="8" Height="16" Offset="0x5D90" />
|
||||
<Texture Name="gBigOctoEyeTex" OutName="big_octo_eye" Format="rgba16" Width="16" Height="16" Offset="0x5E90" />
|
||||
<Texture Name="gBigOctoShellTex" OutName="big_octo_shell" Format="rgba16" Width="16" Height="16" Offset="0x6090" />
|
||||
<Texture Name="gBigOctoHeadBaseTex" OutName="big_octo_head_base" Format="rgba16" Width="8" Height="8" Offset="0x6290" />
|
||||
<Texture Name="gBigOctoBetweenEyesTex" OutName="big_octo_between_eyes" Format="rgba16" Width="8" Height="8" Offset="0x6310" />
|
||||
<Texture Name="gBigOctoHeadUndersideTex" OutName="big_octo_head_underside" Format="rgba16" Width="16" Height="16" Offset="0x6390" />
|
||||
<Texture Name="gBigOctoEyeShellTex" OutName="big_octo_eye_shell" Format="rgba16" Width="16" Height="16" Offset="0x6590" />
|
||||
<Texture Name="gBigOctoSnoutEdgeTex" OutName="big_octo_snout_edge" Format="rgba16" Width="8" Height="16" Offset="0x6790" />
|
||||
<Texture Name="gBigOctoArmBottomTex" OutName="big_octo_arm_bottom" Format="rgba16" Width="16" Height="16" Offset="0x6890" />
|
||||
<Limb Name="gBigOctoBodyLimb" Type="Standard" Offset="0x6A90" />
|
||||
<Limb Name="gBigOctoFrontRightArmBaseLimb" Type="Standard" Offset="0x6A9C" />
|
||||
<Limb Name="gBigOctoFrontRightArmEndLimb" Type="Standard" Offset="0x6AA8" />
|
||||
<Limb Name="gBigOctoFrontLeftArmBaseLimb" Type="Standard" Offset="0x6AB4" />
|
||||
<Limb Name="gBigOctoFrontLeftArmEndLimb" Type="Standard" Offset="0x6AC0" />
|
||||
<Limb Name="gBigOctoBackLeftArmBaseLimb" Type="Standard" Offset="0x6ACC" />
|
||||
<Limb Name="gBigOctoBackLeftArmEndLimb" Type="Standard" Offset="0x6AD8" />
|
||||
<Limb Name="gBigOctoBackRightArmBaseLimb" Type="Standard" Offset="0x6AE4" />
|
||||
<Limb Name="gBigOctoBackRightArmEndLimb" Type="Standard" Offset="0x6AF0" />
|
||||
<Limb Name="gBigOctoHeadShellLimb" Type="Standard" Offset="0x6AFC" />
|
||||
<Limb Name="gBigOctoLeftTentacleBaseLimb" Type="Standard" Offset="0x6B08" />
|
||||
<Limb Name="gBigOctoLeftTentacleTipLimb" Type="Standard" Offset="0x6B14" />
|
||||
<Limb Name="gBigOctoRightTentacleBaseLimb" Type="Standard" Offset="0x6B20" />
|
||||
<Limb Name="gBigOctoRightTentacleTipLimb" Type="Standard" Offset="0x6B2C" />
|
||||
<Limb Name="gBigOctoLeftWeakPointLimb" Type="Standard" Offset="0x6B38" />
|
||||
<Limb Name="gBigOctoRightWeakPointLimb" Type="Standard" Offset="0x6B44" />
|
||||
<Limb Name="gBigOctoCenterSnoutLimb" Type="Standard" Offset="0x6B50" />
|
||||
<Limb Name="gBigOctoRightSnoutLimb" Type="Standard" Offset="0x6B5C" />
|
||||
<Limb Name="gBigOctoLeftSnoutLimb" Type="Standard" Offset="0x6B68" />
|
||||
<Skeleton Name="gBigOctoSkel" Type="Flex" LimbType="Standard" Offset="0x6BC0" />
|
||||
</File>
|
||||
</Root>
|
||||
|
||||
@@ -3431,8 +3431,7 @@ beginseg
|
||||
name "ovl_En_Bigokuta"
|
||||
compress
|
||||
include "build/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.o"
|
||||
include "build/data/ovl_En_Bigokuta/ovl_En_Bigokuta.data.o"
|
||||
include "build/data/ovl_En_Bigokuta/ovl_En_Bigokuta.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_En_Bigokuta/ovl_En_Bigokuta_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -6,12 +6,53 @@
|
||||
struct EnBigokuta;
|
||||
|
||||
typedef void (*EnBigokutaActionFunc)(struct EnBigokuta*, GlobalContext*);
|
||||
typedef void (*EnBigokutaUnkFunc)(GlobalContext*, struct EnBigokuta*);
|
||||
|
||||
typedef enum {
|
||||
/* 00 */ BIGOKUTA_LIMB_NONE,
|
||||
/* 01 */ BIGOKUTA_LIMB_BODY,
|
||||
/* 02 */ BIGOKUTA_LIMB_ARM_BASE_RIGHT_FRONT,
|
||||
/* 03 */ BIGOKUTA_LIMB_ARM_END_RIGHT_FRONT,
|
||||
/* 04 */ BIGOKUTA_LIMB_ARM_BASE_LEFT_FRONT,
|
||||
/* 05 */ BIGOKUTA_LIMB_ARM_END_LEFT_FRONT,
|
||||
/* 06 */ BIGOKUTA_LIMB_ARM_BASE_RIGHT_BACK,
|
||||
/* 07 */ BIGOKUTA_LIMB_ARM_END_RIGHT_BACK,
|
||||
/* 08 */ BIGOKUTA_LIMB_ARM_BASE_LEFT_BACK,
|
||||
/* 09 */ BIGOKUTA_LIMB_ARM_END_LEFT_BACK,
|
||||
/* 10 */ BIGOKUTA_LIMB_HEAD,
|
||||
/* 11 */ BIGOKUTA_LIMB_TENTACLE_BASE_LEFT,
|
||||
/* 12 */ BIGOKUTA_LIMB_TENTACLE_TIP_LEFT,
|
||||
/* 13 */ BIGOKUTA_LIMB_TENTACLE_BASE_RIGHT,
|
||||
/* 14 */ BIGOKUTA_LIMB_TENTACLE_TIP_RIGHT,
|
||||
/* 15 */ BIGOKUTA_LIMB_WEAK_POINT_LEFT,
|
||||
/* 16 */ BIGOKUTA_LIMB_WEAK_POINT_RIGHT,
|
||||
/* 17 */ BIGOKUTA_LIMB_SNOUT_CENTER,
|
||||
/* 18 */ BIGOKUTA_LIMB_SNOUT_RIGHT,
|
||||
/* 19 */ BIGOKUTA_LIMB_SNOUT_LEFT,
|
||||
/* 20 */ BIGOKUTA_LIMB_MAX
|
||||
} ObjectBigokutaLimbs;
|
||||
|
||||
typedef struct EnBigokuta {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x0144 */ char unk_144[0x48];
|
||||
/* 0x0144 */ EnBigokutaUnkFunc unkFunc; // possibly something to do with photographing
|
||||
/* 0x0148 */ SkelAnime skelAnime;
|
||||
/* 0x018C */ EnBigokutaActionFunc actionFunc;
|
||||
/* 0x0190 */ char unk_190[0x268];
|
||||
/* 0x0190 */ u8 drawEffect;
|
||||
/* 0x0192 */ s16 timer;
|
||||
/* 0x0194 */ s16 camId;
|
||||
/* 0x0196 */ s16 cutscene;
|
||||
/* 0x0198 */ Vec3s jointTable[BIGOKUTA_LIMB_MAX];
|
||||
/* 0x0210 */ Vec3s morphTable[BIGOKUTA_LIMB_MAX];
|
||||
/* 0x0288 */ f32 drawEffectAlpha;
|
||||
/* 0x028C */ f32 drawEffectScale;
|
||||
/* 0x0290 */ f32 drawEffectSteamScale; // only affects DRAWEFFECT_ICE
|
||||
/* 0x0294 */ Vec3f playerPos;
|
||||
/* 0x02A0 */ Vec3f playerHoldPos;
|
||||
/* 0x02AC */ Vec3f camAt;
|
||||
/* 0x02B8 */ Vec3f camEye;
|
||||
/* 0x02C4 */ Vec3f limbPos[13];
|
||||
/* 0x0360 */ ColliderCylinder shellCollider;
|
||||
/* 0x03AC */ ColliderCylinder bodyCollider;
|
||||
} EnBigokuta; // size = 0x3F8
|
||||
|
||||
extern const ActorInit En_Bigokuta_InitVars;
|
||||
|
||||
+25
-25
@@ -11912,33 +11912,33 @@
|
||||
0x80AC24A8:("func_80AC24A8",),
|
||||
0x80AC26F0:("EnBigokuta_Init",),
|
||||
0x80AC2874:("EnBigokuta_Destroy",),
|
||||
0x80AC28B4:("func_80AC28B4",),
|
||||
0x80AC299C:("func_80AC299C",),
|
||||
0x80AC2A1C:("func_80AC2A1C",),
|
||||
0x80AC2A7C:("func_80AC2A7C",),
|
||||
0x80AC28B4:("EnBigokuta_SetupCutsceneCamera",),
|
||||
0x80AC299C:("EnBigokuta_MoveCamera",),
|
||||
0x80AC2A1C:("EnBigokuta_ResetCamera",),
|
||||
0x80AC2A7C:("EnBigokuta_ShootPlayer",),
|
||||
0x80AC2B4C:("func_80AC2B4C",),
|
||||
0x80AC2B98:("func_80AC2B98",),
|
||||
0x80AC2C30:("func_80AC2C30",),
|
||||
0x80AC2C84:("func_80AC2C84",),
|
||||
0x80AC2CE8:("func_80AC2CE8",),
|
||||
0x80AC2DAC:("func_80AC2DAC",),
|
||||
0x80AC2EBC:("func_80AC2EBC",),
|
||||
0x80AC2F20:("func_80AC2F20",),
|
||||
0x80AC2F64:("func_80AC2F64",),
|
||||
0x80AC3054:("func_80AC3054",),
|
||||
0x80AC30EC:("func_80AC30EC",),
|
||||
0x80AC31EC:("func_80AC31EC",),
|
||||
0x80AC33A4:("func_80AC33A4",),
|
||||
0x80AC33C0:("func_80AC33C0",),
|
||||
0x80AC3460:("func_80AC3460",),
|
||||
0x80AC34A8:("func_80AC34A8",),
|
||||
0x80AC35E8:("func_80AC35E8",),
|
||||
0x80AC3650:("func_80AC3650",),
|
||||
0x80AC3930:("func_80AC3930",),
|
||||
0x80AC39A0:("func_80AC39A0",),
|
||||
0x80AC2B98:("EnBigokuta_IsInWater",),
|
||||
0x80AC2C30:("EnBigokuta_SpawnRipple",),
|
||||
0x80AC2C84:("EnBigokuta_SetupIdle",),
|
||||
0x80AC2CE8:("EnBigokuta_Idle",),
|
||||
0x80AC2DAC:("EnBigokuta_SetupRise",),
|
||||
0x80AC2EBC:("EnBigokuta_RiseOutOfWater",),
|
||||
0x80AC2F20:("EnBigokuta_SetupIdleAboveWater",),
|
||||
0x80AC2F64:("EnBigokuta_IdleAboveWater",),
|
||||
0x80AC3054:("EnBigokuta_UpdateOrSetupCam",),
|
||||
0x80AC30EC:("EnBigokuta_SetupSuckInPlayer",),
|
||||
0x80AC31EC:("EnBigokuta_SuckInPlayer",),
|
||||
0x80AC33A4:("EnBigokuta_SetupHoldPlayer",),
|
||||
0x80AC33C0:("EnBigokuta_HoldPlayer",),
|
||||
0x80AC3460:("EnBigokuta_SetupDeathCutscene",),
|
||||
0x80AC34A8:("EnBigokuta_PlayDeathCutscene",),
|
||||
0x80AC35E8:("EnBigokuta_SetupDeathEffects",),
|
||||
0x80AC3650:("EnBigokuta_PlayDeathEffects",),
|
||||
0x80AC3930:("EnBigokuta_IsNearSwampBoat",),
|
||||
0x80AC39A0:("EnBigokuta_CheckOneHitKill",),
|
||||
0x80AC3B2C:("EnBigokuta_Update",),
|
||||
0x80AC3D48:("func_80AC3D48",),
|
||||
0x80AC4204:("func_80AC4204",),
|
||||
0x80AC3D48:("EnBigokuta_OverrideLimbDraw",),
|
||||
0x80AC4204:("EnBigokuta_PostLimbDraw",),
|
||||
0x80AC42F8:("EnBigokuta_Draw",),
|
||||
0x80AC48F0:("BgIcefloe_Init",),
|
||||
0x80AC4A04:("BgIcefloe_Destroy",),
|
||||
|
||||
@@ -1253,13 +1253,6 @@ D_06001398 = 0x06001398;
|
||||
D_06000074 = 0x06000074;
|
||||
D_06001E60 = 0x06001E60;
|
||||
|
||||
// ovl_En_Bigokuta
|
||||
|
||||
D_06000444 = 0x06000444;
|
||||
D_06000A74 = 0x06000A74;
|
||||
D_060014B8 = 0x060014B8;
|
||||
D_06006BC0 = 0x06006BC0;
|
||||
|
||||
// ovl_En_Bigpamet
|
||||
|
||||
D_06000440 = 0x06000440;
|
||||
|
||||
Reference in New Issue
Block a user