izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zret' of github.com:HarbourMasters/mm into zret

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti
2023-10-31 04:39:52 -03:00
parent 9b4be44660 3ca1b5cbdc
commit c01424aef6
26 changed files with 11742 additions and 1025 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_death.xml
+49 -49
View File
@@ -1,12 +1,12 @@
<Root>
<File Name="object_death" Segment="6">
<Animation Name="object_death_Anim_000E64" Offset="0xE64" /> <!-- Original name is "d13_atack" -->
<Animation Name="object_death_Anim_0015B4" Offset="0x15B4" /> <!-- Original name is "d13_callenemy" -->
<Animation Name="object_death_Anim_001834" Offset="0x1834" /> <!-- Original name is "d13_callingenemy" -->
<Animation Name="object_death_Anim_001F80" Offset="0x1F80" /> <!-- Original name is "d13_damage" -->
<Animation Name="object_death_Anim_002DE8" Offset="0x2DE8" /> <!-- Original name is "d13_deadhit" -->
<Animation Name="object_death_Anim_00352C" Offset="0x352C" /> <!-- Original name is "d13_deadwait" -->
<Animation Name="object_death_Anim_003CAC" Offset="0x3CAC" /> <!-- Original name is "d13_fly" -->
<Animation Name="gGomessScytheSwingAnim" Offset="0xE64" />
<Animation Name="object_death_Anim_0015B4" Offset="0x15B4" /> <!-- Start bats attack -->
<Animation Name="object_death_Anim_001834" Offset="0x1834" /> <!-- Continue bats attack -->
<Animation Name="gGomessDamagedAnim" Offset="0x1F80" />
<Animation Name="gGomessBeginDeathAnim" Offset="0x2DE8" />
<Animation Name="gGomessDeathAnim" Offset="0x352C" />
<Animation Name="gGomessFloatAnim" Offset="0x3CAC" />
<DList Name="object_death_DL_006B80" Offset="0x6B80" />
<DList Name="object_death_DL_006D18" Offset="0x6D18" />
<DList Name="object_death_DL_006E08" Offset="0x6E08" />
@@ -39,47 +39,47 @@
<Texture Name="object_death_Tex_0095C8" OutName="tex_0095C8" Format="rgba16" Width="16" Height="16" Offset="0x95C8" />
<Texture Name="object_death_Tex_0097C8" OutName="tex_0097C8" Format="rgba16" Width="4" Height="8" Offset="0x97C8" />
<Texture Name="object_death_Tex_009808" OutName="tex_009808" Format="i4" Width="16" Height="16" Offset="0x9808" />
<DList Name="object_death_DL_009988" Offset="0x9988" />
<Texture Name="object_death_Tex_009AA0" OutName="tex_009AA0" Format="i4" Width="16" Height="16" Offset="0x9AA0" />
<DList Name="object_death_DL_009BA0" Offset="0x9BA0" /> <!-- Original name is "d13_cover_model" -->
<Texture Name="object_death_Tex_009C40" OutName="tex_009C40" Format="rgba16" Width="16" Height="16" Offset="0x9C40" />
<DList Name="object_death_DL_009F10" Offset="0x9F10" />
<DList Name="object_death_DL_009F88" Offset="0x9F88" />
<DList Name="object_death_DL_00A088" Offset="0xA088" />
<DList Name="object_death_DL_00A188" Offset="0xA188" />
<DList Name="object_death_DL_00A288" Offset="0xA288" />
<DList Name="object_death_DL_00A388" Offset="0xA388" />
<DList Name="object_death_DL_00A488" Offset="0xA488" />
<DList Name="object_death_DL_00A588" Offset="0xA588" />
<DList Name="object_death_DL_00A688" Offset="0xA688" />
<DList Name="object_death_DL_00A788" Offset="0xA788" />
<Texture Name="object_death_Tex_00A7B8" OutName="tex_00A7B8" Format="rgba16" Width="32" Height="16" Offset="0xA7B8" />
<Limb Name="object_death_Standardlimb_00ABB8" Type="Standard" EnumName="OBJECT_DEATH_LIMB_01" Offset="0xABB8" />
<Limb Name="object_death_Standardlimb_00ABC4" Type="Standard" EnumName="OBJECT_DEATH_LIMB_02" Offset="0xABC4" />
<Limb Name="object_death_Standardlimb_00ABD0" Type="Standard" EnumName="OBJECT_DEATH_LIMB_03" Offset="0xABD0" />
<Limb Name="object_death_Standardlimb_00ABDC" Type="Standard" EnumName="OBJECT_DEATH_LIMB_04" Offset="0xABDC" />
<Limb Name="object_death_Standardlimb_00ABE8" Type="Standard" EnumName="OBJECT_DEATH_LIMB_05" Offset="0xABE8" />
<Limb Name="object_death_Standardlimb_00ABF4" Type="Standard" EnumName="OBJECT_DEATH_LIMB_06" Offset="0xABF4" />
<Limb Name="object_death_Standardlimb_00AC00" Type="Standard" EnumName="OBJECT_DEATH_LIMB_07" Offset="0xAC00" />
<Limb Name="object_death_Standardlimb_00AC0C" Type="Standard" EnumName="OBJECT_DEATH_LIMB_08" Offset="0xAC0C" />
<Limb Name="object_death_Standardlimb_00AC18" Type="Standard" EnumName="OBJECT_DEATH_LIMB_09" Offset="0xAC18" />
<Limb Name="object_death_Standardlimb_00AC24" Type="Standard" EnumName="OBJECT_DEATH_LIMB_0A" Offset="0xAC24" />
<Limb Name="object_death_Standardlimb_00AC30" Type="Standard" EnumName="OBJECT_DEATH_LIMB_0B" Offset="0xAC30" />
<Limb Name="object_death_Standardlimb_00AC3C" Type="Standard" EnumName="OBJECT_DEATH_LIMB_0C" Offset="0xAC3C" />
<Limb Name="object_death_Standardlimb_00AC48" Type="Standard" EnumName="OBJECT_DEATH_LIMB_0D" Offset="0xAC48" />
<Limb Name="object_death_Standardlimb_00AC54" Type="Standard" EnumName="OBJECT_DEATH_LIMB_0E" Offset="0xAC54" />
<Limb Name="object_death_Standardlimb_00AC60" Type="Standard" EnumName="OBJECT_DEATH_LIMB_0F" Offset="0xAC60" />
<Limb Name="object_death_Standardlimb_00AC6C" Type="Standard" EnumName="OBJECT_DEATH_LIMB_10" Offset="0xAC6C" />
<Limb Name="object_death_Standardlimb_00AC78" Type="Standard" EnumName="OBJECT_DEATH_LIMB_11" Offset="0xAC78" />
<Limb Name="object_death_Standardlimb_00AC84" Type="Standard" EnumName="OBJECT_DEATH_LIMB_12" Offset="0xAC84" />
<Limb Name="object_death_Standardlimb_00AC90" Type="Standard" EnumName="OBJECT_DEATH_LIMB_13" Offset="0xAC90" />
<Limb Name="object_death_Standardlimb_00AC9C" Type="Standard" EnumName="OBJECT_DEATH_LIMB_14" Offset="0xAC9C" />
<Limb Name="object_death_Standardlimb_00ACA8" Type="Standard" EnumName="OBJECT_DEATH_LIMB_15" Offset="0xACA8" />
<Skeleton Name="object_death_Skel_00AD08" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DEATH_LIMB_NONE" LimbMax="OBJECT_DEATH_LIMB_MAX" EnumName="ObjectDeathLimb" Offset="0xAD08" />
<Animation Name="object_death_Anim_00B284" Offset="0xB284" /> <!-- Original name is "d13_gahaha" -->
<Animation Name="object_death_Anim_00B508" Offset="0xB508" /> <!-- Original name is "d13_guard" -->
<Animation Name="object_death_Anim_00CB2C" Offset="0xCB2C" /> <!-- Original name is "d13_jakin" -->
<TextureAnimation Name="object_death_Matanimheader_00CB84" Offset="0xCB84" />
<TextureAnimation Name="object_death_Matanimheader_00CBC0" Offset="0xCBC0" />
<DList Name="gGomessCoreDL" Offset="0x9988" />
<Texture Name="gGomessCoreTex" OutName="gomess_core" Format="i4" Width="16" Height="16" Offset="0x9AA0" />
<DList Name="gGomessBatsGuardingCoreDL" Offset="0x9BA0" />
<Texture Name="gGomessBatsGuardingCoreTex" OutName="gomess_bats_guarding_core" Format="rgba16" Width="16" Height="16" Offset="0x9C40" />
<DList Name="gGomessBatMaterialDL" Offset="0x9F10" />
<DList Name="gGomessBatFrame1DL" Offset="0x9F88" />
<DList Name="gGomessBatFrame2DL" Offset="0xA088" />
<DList Name="gGomessBatFrame3DL" Offset="0xA188" />
<DList Name="gGomessBatFrame4DL" Offset="0xA288" />
<DList Name="gGomessBatFrame5DL" Offset="0xA388" />
<DList Name="gGomessBatFrame6DL" Offset="0xA488" />
<DList Name="gGomessBatFrame7DL" Offset="0xA588" />
<DList Name="gGomessBatFrame8DL" Offset="0xA688" />
<DList Name="gGomessBatFrame9DL" Offset="0xA788" />
<Texture Name="gGomessBatTex" OutName="gomess_bat" Format="rgba16" Width="32" Height="16" Offset="0xA7B8" />
<Limb Name="object_death_Standardlimb_00ABB8" Type="Standard" EnumName="GOMESS_LIMB_1" Offset="0xABB8" />
<Limb Name="object_death_Standardlimb_00ABC4" Type="Standard" EnumName="GOMESS_LIMB_CORE_POS" Offset="0xABC4" />
<Limb Name="object_death_Standardlimb_00ABD0" Type="Standard" EnumName="GOMESS_LIMB_LOWER_BODY" Offset="0xABD0" />
<Limb Name="object_death_Standardlimb_00ABDC" Type="Standard" EnumName="GOMESS_LIMB_TORSO" Offset="0xABDC" />
<Limb Name="object_death_Standardlimb_00ABE8" Type="Standard" EnumName="GOMESS_LIMB_COLLAR" Offset="0xABE8" />
<Limb Name="object_death_Standardlimb_00ABF4" Type="Standard" EnumName="GOMESS_LIMB_HEAD_LOWER" Offset="0xABF4" />
<Limb Name="object_death_Standardlimb_00AC00" Type="Standard" EnumName="GOMESS_LIMB_HEAD_UPPER" Offset="0xAC00" />
<Limb Name="object_death_Standardlimb_00AC0C" Type="Standard" EnumName="GOMESS_LIMB_8" Offset="0xAC0C" /> <!-- Antenna thing, 4 parts -->
<Limb Name="object_death_Standardlimb_00AC18" Type="Standard" EnumName="GOMESS_LIMB_9" Offset="0xAC18" />
<Limb Name="object_death_Standardlimb_00AC24" Type="Standard" EnumName="GOMESS_LIMB_10" Offset="0xAC24" />
<Limb Name="object_death_Standardlimb_00AC30" Type="Standard" EnumName="GOMESS_LIMB_11" Offset="0xAC30" />
<Limb Name="object_death_Standardlimb_00AC3C" Type="Standard" EnumName="GOMESS_LIMB_CLOAK_UPPER" Offset="0xAC3C" />
<Limb Name="object_death_Standardlimb_00AC48" Type="Standard" EnumName="GOMESS_LIMB_CLOAK_LOWER" Offset="0xAC48" />
<Limb Name="object_death_Standardlimb_00AC54" Type="Standard" EnumName="GOMESS_LIMB_UPPER_ARM_LEFT" Offset="0xAC54" />
<Limb Name="object_death_Standardlimb_00AC60" Type="Standard" EnumName="GOMESS_LIMB_FOREARM_LEFT" Offset="0xAC60" />
<Limb Name="object_death_Standardlimb_00AC6C" Type="Standard" EnumName="GOMESS_LIMB_HAND_LEFT" Offset="0xAC6C" />
<Limb Name="object_death_Standardlimb_00AC78" Type="Standard" EnumName="GOMESS_LIMB_UPPER_ARM_RIGHT" Offset="0xAC78" />
<Limb Name="object_death_Standardlimb_00AC84" Type="Standard" EnumName="GOMESS_LIMB_FOREARM_RIGHT" Offset="0xAC84" />
<Limb Name="object_death_Standardlimb_00AC90" Type="Standard" EnumName="GOMESS_LIMB_HAND_RIGHT" Offset="0xAC90" />
<Limb Name="object_death_Standardlimb_00AC9C" Type="Standard" EnumName="GOMESS_LIMB_SCYTHE_HANDLE" Offset="0xAC9C" />
<Limb Name="object_death_Standardlimb_00ACA8" Type="Standard" EnumName="GOMESS_LIMB_SCYTHE_BLADE" Offset="0xACA8" />
<Skeleton Name="gGomessSkel" Type="Flex" LimbType="Standard" LimbNone="GOMESS_LIMB_NONE" LimbMax="GOMESS_LIMB_MAX" EnumName="GomessSkelLimbs" Offset="0xAD08" />
<Animation Name="object_death_Anim_00B284" Offset="0xB284" /> <!-- Intro anim 1 -->
<Animation Name="gGomessScytheSpinAnim" Offset="0xB508" />
<Animation Name="object_death_Anim_00CB2C" Offset="0xCB2C" /> <!-- Intro anim 2 -->
<TextureAnimation Name="gGomessCoreMatAnim" Offset="0xCB84" />
<TextureAnimation Name="gGomessBodyMatAnim" Offset="0xCBC0" />
</File>
</Root>
assets/xml/overlays/ovl_Boss_05.xml
+5
View File
@@ -0,0 +1,5 @@
<Root>
<File Name="ovl_Boss_05" BaseAddress="0x809EE4E0" RangeStart="0x3540" RangeEnd="0x364C">
<Collision Name="sBioBabaLilypadCol" Offset="0x3620" />
</File>
</Root>
include/functions.h
+64 -2
View File
@@ -216,6 +216,10 @@ void EffectSsFhgFlash_SpawnShock(PlayState* play, Actor* actor, Vec3f* pos, s16
void EffectSsKFire_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scaleMax, u8 type);
void EffectSsSolderSrchBall_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16* playerDetected, s16 flags);
void EffectSsKakera_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* arg3, s16 gravity, s16 arg5, s16 arg6, s16 arg7, s16 arg8, s16 scale, s16 arg10, s16 arg11, s32 life, s16 colorIdx, s16 objectId, Gfx* dList);
// void EffectSsFhgFlash_SpawnShock(UNK_TYPE4 uParm1, UNK_TYPE4 uParm2, Vec3f* pzParm3, UNK_TYPE2 uParm4, UNK_TYPE1 param_5);
void EffectSsKFire_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scaleMax, u8 type);
void EffectSsSolderSrchBall_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 unused, s16* linkDetected, s16 drawFlag);
void EffectSsKakera_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* arg3, s16 gravity, s16 arg5, s16 arg6, s16 arg7, s16 arg8, s16 scale, s16 arg10, s16 arg11, s32 life, s16 colorIdx, s16 objId, Gfx* dList);
// void EffectSsIcePiece_Spawn(UNK_TYPE4 uParm1, Vec3f* pzParm2, UNK_TYPE4 uParm3, Vec3f* pzParm4, Vec3f* param_5, UNK_TYPE4 param_6);
void EffectSsIcePiece_SpawnBurst(PlayState* play, Vec3f* refPos, f32 scale);
void func_800B2B44(PlayState* play, Actor* actor, Vec3f* pos, f32 scale);
@@ -962,8 +966,6 @@ void Play_GetFloorSurface(PlayState* this, MtxF* mtx, Vec3f* pos);
void* Play_LoadFile(PlayState* this, RomFile* entry);
void Play_InitEnvironment(PlayState* this, s16 skyboxId);
void Play_GetScreenPos(PlayState* this, Vec3f* worldPos, Vec3f* screenPos);
s16 Play_CreateSubCamera(PlayState* this);
s16 Play_GetActiveCamId(PlayState* this);
s32 Play_ChangeCameraStatus(PlayState* this, s16 camId, s16 status);
void Play_ClearCamera(PlayState* this, s16 camId);
Camera* Play_GetCamera(PlayState* this, s16 camId);
@@ -988,6 +990,66 @@ s32 Play_CamIsNotFixed(GameState* thisx);
s32 FrameAdvance_IsEnabled(GameState* thisx);
s32 func_8016A02C(GameState* thisx, Actor* actor, s16* yaw);
s32 Play_IsUnderwater(PlayState* this, Vec3f* pos);
// void func_80165460(void);
// void func_80165608(void);
// void func_80165630(void);
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);
// void func_80165DF0(void);
// void func_80165E1C(void);
// void func_80165E7C(void);
// void func_80165EC0(void);
// void func_80166060(void);
Gfx* func_801660B8(PlayState* play, Gfx* gfx);
void Play_Fini(GameState* thisx);
// void func_801663C4(void);
// void func_80166644(void);
// void func_801668B4(void);
void func_80166968(PlayState* play, Camera* camera);
void func_80166B30(PlayState* play);
void func_80167814(PlayState* play);
void func_80167DE4(PlayState* play);
// void func_80167F0C(void);
void Play_Draw(PlayState* play);
void func_80168DAC(PlayState* play);
void Play_Update(PlayState* play);
s32 Play_InCsMode(PlayState* play);
f32 func_80169100(PlayState* play, MtxF* mtx, CollisionPoly** arg2, s32* arg3, Vec3f* feetPosPtr);
// void func_801691F0(void);
void* Play_LoadScene(PlayState* play, RomFile* entry);
void func_8016927C(PlayState* play, s16 sParm2);
// void func_801692C4(PlayState* play, UNK_TYPE1 uParm2);
// void Play_SceneInit(PlayState* play, s32 sceneIndex, UNK_TYPE1 param_3);
UNK_RET func_80169474(PlayState* play, Vec3f* v1, Vec3f* v2);
s16 Play_CreateSubCamera(PlayState* play);
s16 Play_GetActiveCamId(PlayState* play);
void Play_CameraChangeStatus(PlayState* play, s16 camId, s16 status);
void Play_ClearCamera(PlayState* play, s16 camId);
Camera* Play_GetCamera(PlayState* play, s16 index);
s32 Play_CameraSetAtEye(PlayState* play, s16 camId, Vec3f* at, Vec3f* eye);
void Play_CameraSetAtEyeUp(PlayState* play, s16 camId, Vec3f* at, Vec3f* eye, Vec3f* up);
s32 Play_CameraSetFov(PlayState* play, s16 camId, f32 fov);
void Play_CameraSetRoll(PlayState* play, s16 camId, s16 roll);
void Play_CopyCamera(PlayState* play, s16 dstCamId, s16 srcCamId);
// void func_80169A50(void);
void Play_CameraChangeSetting(PlayState* play, s16 camId, s16 setting);
void func_80169AFC(PlayState* play, s16 camId, s16 arg2);
s16 Play_GetCsCamDataSetting(PlayState* play, s32 camId);
Vec3s* Play_GetCsCamDataVec3s(PlayState* play, s32 camId);
s16 Play_GetOriginalSceneNumber(s16 sceneNum);
void Play_SaveCycleSceneFlags(GameState* gameState);
void Play_SetRespawnData(GameState* gameState, s32 respawnNumber, u16 sceneSetup, s32 roomIndex, s32 playerParams, Vec3f* pos, s16 yaw);
void Play_SetupRespawnPoint(GameState* gameState, s32 respawnNumber, s32 playerParams);
void func_80169EFC(GameState* gameState);
void func_80169F78(GameState* gameState);
void func_80169FDC(GameState* gameState);
s32 func_80169FFC(GameState* gameState);
s32 FrameAdvance_IsEnabled(GameState* gameState);
s32 func_8016A02C(GameState* gameState, Actor* actor, s16* yaw);
s32 Play_IsUnderwater(PlayState* play, Vec3f* pos);
s32 Play_IsDebugCamEnabled(void);
void Play_AssignPlayerCsIdsFromScene(GameState* thisx, s32 spawnCsId);
void Play_FillScreen(GameState* thisx, s16 fillScreenOn, u8 red, u8 green, u8 blue, u8 alpha);
include/z64subs.h
+1 -1
View File
@@ -133,7 +133,7 @@ s32 SubS_CopyPointFromPathCheckBounds(Path* path, s32 pointIndex, Vec3f* dst);
s32 SubS_Offer(Actor* actor, struct PlayState* play, f32 xzRange, f32 yRange, s32 itemId, SubSOfferMode mode);
void SubS_FillShadowTex(s32 startCol, s32 startRow, u8* tex, s32 size);
void SubS_GenShadowTex(Vec3f bodyPartsPos[], Vec3f* worldPos, u8* tex, f32 tween, u8 bodyPartsNum, u8 sizes[], s8 parentBodyParts[]);
void SubS_GenShadowTex(Vec3f bodyPartsPos[], Vec3f* worldPos, u8* tex, f32 weight, u8 bodyPartsNum, u8 sizes[], s8 parentBodyParts[]);
void SubS_DrawShadowTex(Actor* actor, struct GameState* gameState, u8* tex);
s16 SubS_ComputeTrackPointRot(s16* rot, s16 rotMax, s16 target, f32 slowness, f32 stepMin, f32 stepMax);
spec
+4 -13
View File
@@ -1029,17 +1029,14 @@ beginseg
name "ovl_En_Death"
compress
include "build/src/overlays/actors/ovl_En_Death/z_en_death.o"
include "build/data/ovl_En_Death/ovl_En_Death.data.o"
include "build/data/ovl_En_Death/ovl_En_Death.reloc.o"
include "build/src/overlays/actors/ovl_En_Death/ovl_En_Death_reloc.o"
endseg
beginseg
name "ovl_En_Minideath"
compress
include "build/src/overlays/actors/ovl_En_Minideath/z_en_minideath.o"
include "build/data/ovl_En_Minideath/ovl_En_Minideath.data.o"
include "build/data/ovl_En_Minideath/ovl_En_Minideath.bss.o"
include "build/data/ovl_En_Minideath/ovl_En_Minideath.reloc.o"
include "build/src/overlays/actors/ovl_En_Minideath/ovl_En_Minideath_reloc.o"
endseg
beginseg
@@ -2176,9 +2173,7 @@ beginseg
name "ovl_En_Knight"
compress
include "build/src/overlays/actors/ovl_En_Knight/z_en_knight.o"
include "build/data/ovl_En_Knight/ovl_En_Knight.data.o"
include "build/data/ovl_En_Knight/ovl_En_Knight.bss.o"
include "build/data/ovl_En_Knight/ovl_En_Knight.reloc.o"
include "build/src/overlays/actors/ovl_En_Knight/ovl_En_Knight_reloc.o"
endseg
beginseg
@@ -2325,8 +2320,6 @@ beginseg
name "ovl_Boss_05"
compress
include "build/src/overlays/actors/ovl_Boss_05/z_boss_05.o"
include "build/data/ovl_Boss_05/ovl_Boss_05.data.o"
include "build/data/ovl_Boss_05/ovl_Boss_05.bss.o"
include "build/data/ovl_Boss_05/ovl_Boss_05.reloc.o"
endseg
@@ -3419,7 +3412,6 @@ beginseg
name "ovl_En_Wdhand"
compress
include "build/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.o"
include "build/data/ovl_En_Wdhand/ovl_En_Wdhand.data.o"
include "build/data/ovl_En_Wdhand/ovl_En_Wdhand.reloc.o"
endseg
@@ -3505,8 +3497,7 @@ beginseg
name "ovl_Boss_Hakugin"
compress
include "build/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.o"
include "build/data/ovl_Boss_Hakugin/ovl_Boss_Hakugin.data.o"
include "build/data/ovl_Boss_Hakugin/ovl_Boss_Hakugin.reloc.o"
include "build/src/overlays/actors/ovl_Boss_Hakugin/ovl_Boss_Hakugin_reloc.o"
endseg
beginseg
src/code/z_sub_s.c
+4 -4
View File
@@ -963,7 +963,7 @@ void SubS_FillShadowTex(s32 startCol, s32 startRow, u8* tex, s32 size) {
}
}
void SubS_GenShadowTex(Vec3f bodyPartsPos[], Vec3f* worldPos, u8* tex, f32 tween, u8 bodyPartsNum, u8 sizes[],
void SubS_GenShadowTex(Vec3f bodyPartsPos[], Vec3f* worldPos, u8* tex, f32 weight, u8 bodyPartsNum, u8 sizes[],
s8 parentBodyParts[]) {
Vec3f pos;
Vec3f startVec;
@@ -978,9 +978,9 @@ void SubS_GenShadowTex(Vec3f bodyPartsPos[], Vec3f* worldPos, u8* tex, f32 tween
parentBodyPart = parentBodyParts[i];
bodyPartPos = &bodyPartsPos[i];
pos.x = (bodyPartsPos[parentBodyPart].x - bodyPartPos->x) * tween + (bodyPartPos->x - worldPos->x);
pos.y = (bodyPartsPos[parentBodyPart].y - bodyPartPos->y) * tween + (bodyPartPos->y - worldPos->y);
pos.z = (bodyPartsPos[parentBodyPart].z - bodyPartPos->z) * tween + (bodyPartPos->z - worldPos->z);
pos.x = (bodyPartsPos[parentBodyPart].x - bodyPartPos->x) * weight + (bodyPartPos->x - worldPos->x);
pos.y = (bodyPartsPos[parentBodyPart].y - bodyPartPos->y) * weight + (bodyPartPos->y - worldPos->y);
pos.z = (bodyPartsPos[parentBodyPart].z - bodyPartPos->z) * weight + (bodyPartPos->z - worldPos->z);
} else {
bodyPartPos = &bodyPartsPos[i];
src/overlays/actors/ovl_Boss_05/z_boss_05.c
+1281 -79
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Boss_05/z_boss_05.h
+52 -3
View File
@@ -7,11 +7,60 @@ struct Boss05;
typedef void (*Boss05ActionFunc)(struct Boss05*, PlayState*);
typedef enum {
/* 0 */ BIO_DEKU_BABA_TYPE_0,
/* 0 */ BIO_DEKU_BABA_TYPE_1,
/* 0 */ BIO_DEKU_BABA_TYPE_2,
/* 0 */ BIO_DEKU_BABA_TYPE_3,
/* 0 */ BIO_DEKU_BABA_TYPE_4,
/* 0 */ BIO_DEKU_BABA_TYPE_10 = 10, // Fragments?
} BioDekuBabaType;
typedef struct Boss05 {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x2C];
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ u8 unk15C; /* inferred */
/* 0x15E */ s16 unk15E; /* inferred */
/* 0x160 */ s16 unk160; /* inferred */
/* 0x162 */ s16 unk162[3]; // timers
/* 0x168 */ s16 unk168; // timer
/* 0x16A */ s16 unk16A; // timer
/* 0x16C */ s16 unk16C; // timer
/* 0x170 */ Boss05ActionFunc actionFunc;
/* 0x174 */ char unk_174[0x394];
/* 0x174 */ u8 unk174;
/* 0x176 */ s16 unk176;
/* 0x178 */ s16 unk178;
/* 0x17A */ s16 unk17A; // timer
/* 0x17C */ f32 drawDmgEffScale;
/* 0x180 */ f32 dmgEffFrozenSteamScale;
/* 0x184 */ f32 drawDmgEffAlpha;
/* 0x188 */ u8 drawDmgEffState; // A bit more than just type, possibly we should name it as an internal type?
/* 0x189 */ u8 drawDmgEffType;
/* 0x18C */ Vec3f limbPos[1];
/* 0x198 */ f32 unk198;
/* 0x19C */ s16 unk19C;
/* 0x19E */ Vec3s unk19E[7];
/* 0x1C8 */ ColliderJntSph collider2;
/* 0x1E8 */ ColliderJntSphElement colliderElements2[2];
/* 0x268 */ SkelAnime skelAnime10;
/* 0x2AC */ Vec3s jointTable10[10];
/* 0x2E8 */ Vec3s morphTable10[10];
/* 0x324 */ Vec3f unk324; // pos used for spawning and drawing
/* 0x330 */ Vec3s unk330; // rotation used for spawning and drawing
/* 0x338 */ f32 unk338;
/* 0x33C */ Vec3f unk33C;
/* 0x348 */ s16 unk348;
/* 0x34C */ Vec3f unk34C;
/* 0x35C */ f32 unk358;
/* 0x35C */ f32 unk35C;
/* 0x360 */ f32 unk360;
/* 0x364 */ f32 unk364;
/* 0x368 */ ColliderJntSph collider1;
/* 0x388 */ ColliderJntSphElement colliderElements1[1];
/* 0x3C8 */ SkelAnime skelAnime20;
/* 0x40C */ Vec3s jointTable20[20];
/* 0x484 */ Vec3s morphTable20[20];
/* 0x4FC */ f32 lastAnimFrame;
/* 0x500 */ Vec3s unk500;
} Boss05; // size = 0x508
#endif // Z_BOSS_05_H
src/overlays/actors/ovl_Boss_06/z_boss_06.c
+1 -1
View File
@@ -267,7 +267,7 @@ void func_809F24C8(Boss06* this, PlayState* play) {
this->subCamAt.z = 2860.0f;
if (this->unk_1CA == 75) {
D_809F4970->unk_148 = 1;
D_809F4970->unk148 = 1;
}
sp4E = 17;
break;
src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c
+3067 -248
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h
+96 -9
View File
@@ -2,9 +2,14 @@
#define Z_BOSS_HAKUGIN_H
#include "global.h"
#include "objects/object_boss_hakugin/object_boss_hakugin.h"
struct BossHakugin;
#define GOHT_SHADOW_TEX_WIDTH 64
#define GOHT_SHADOW_TEX_HEIGHT 64
#define GOHT_SHADOW_TEX_SIZE ((s32)sizeof(u8[GOHT_SHADOW_TEX_HEIGHT][GOHT_SHADOW_TEX_WIDTH]))
typedef void (*BossHakuginActionFunc)(struct BossHakugin*, PlayState*);
typedef struct BossHakuginEffect {
@@ -18,22 +23,104 @@ typedef struct BossHakuginEffect {
#define BOSS_HAKUGIN_EFFECT_COUNT 180
typedef struct BossHakuginUnkStruct_2618 {
/* 0x00 */ Vec3f unk_00;
/* 0x0C */ s16 unk_0C;
/* 0x0E */ Vec3s unk_0E;
/* 0x14 */ ColliderTris unk_14;
/* 0x34 */ ColliderTrisElement unk_34;
} BossHakuginUnkStruct_2618; // size = 0x90
typedef struct BossHakuginFhgFlashUnkStruct {
/* 0x00 */ Vec3f unk_00;
/* 0x0C */ char unk_0C[0x8];
/* 0x0C */ f32 unk_0C;
/* 0x10 */ s16 unk_10;
/* 0x12 */ s16 unk_12;
} BossHakuginFhgFlashUnkStruct; // size = 0x14
typedef enum GohtBodyPart {
/* 0 */ GOHT_BODYPART_PELVIS,
/* 1 */ GOHT_BODYPART_THORAX,
/* 2 */ GOHT_BODYPART_HEAD,
/* 3 */ GOHT_BODYPART_FRONT_RIGHT_UPPER_LEG,
/* 4 */ GOHT_BODYPART_FRONT_RIGHT_LOWER_LEG,
/* 5 */ GOHT_BODYPART_FRONT_RIGHT_HOOF,
/* 6 */ GOHT_BODYPART_FRONT_LEFT_UPPER_LEG,
/* 7 */ GOHT_BODYPART_FRONT_LEFT_LOWER_LEG,
/* 8 */ GOHT_BODYPART_FRONT_LEFT_HOOF,
/* 9 */ GOHT_BODYPART_BACK_RIGHT_THIGH,
/* 10 */ GOHT_BODYPART_BACK_RIGHT_SHIN,
/* 11 */ GOHT_BODYPART_BACK_RIGHT_HOOF,
/* 12 */ GOHT_BODYPART_BACK_LEFT_THIGH,
/* 13 */ GOHT_BODYPART_BACK_LEFT_SHIN,
/* 14 */ GOHT_BODYPART_BACK_LEFT_HOOF,
/* 15 */ GOHT_BODYPART_MAX
} GohtBodyPart;
typedef struct BossHakugin {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_0144[0x44];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ BossHakuginActionFunc actionFunc;
/* 0x018C */ char unk_018C[0x5];
/* 0x0191 */ u8 unk_191;
/* 0x018C */ char unk_0192[0x866];
/* 0x09F8 */ BossHakuginEffect unk_9F8[BOSS_HAKUGIN_EFFECT_COUNT];
/* 0x2618 */ char unk_2618[0x8E8];
/* 0x2F00 */ BossHakuginFhgFlashUnkStruct unk_2F00[7][15];
/* 0x3734 */ char unk_3734[0xDC];
/* 0x018C */ u8 unk_018C;
/* 0x018D */ u8 unk_018D;
/* 0x018E */ u8 unk_018E;
/* 0x018F */ u8 unk_018F;
/* 0x0190 */ u8 unk_0190; // boolean?
/* 0x0191 */ u8 unk_0191;
/* 0x0192 */ u8 unk_0192;
/* 0x0193 */ u8 unk_0193;
/* 0x0194 */ u8 unk_0194;
/* 0x0194 */ u8 unk_0195;
/* 0x0196 */ u8 unk_0196;
/* 0x0198 */ s16 unk_0198;
/* 0x019A */ s16 unk_019A;
/* 0x019C */ s16 unk_019C;
/* 0x019E */ s16 unk_019E;
/* 0x01A0 */ s16 unk_01A0;
/* 0x01A2 */ s16 unk_01A2;
/* 0x01A4 */ s16 unk_01A4;
/* 0x01A6 */ s16 unk_01A6;
/* 0x01A8 */ s16 unk_01A8; // Counter of some kind?
/* 0x01AA */ s16 unk_01AA;
/* 0x01AC */ s16 unk_01AC;
/* 0x01AE */ s16 unk_01AE;
/* 0x01B0 */ u32 unk_01B0;
/* 0x01B4 */ s32 unk_01B4;
/* 0x01B8 */ f32 unk_01B8;
/* 0x01BC */ f32 unk_01BC;
/* 0x01C0 */ f32 unk_01C0;
/* 0x01C4 */ f32 unk_01C4;
/* 0x01C8 */ f32 unk_01C8;
/* 0x01CC */ f32 unk_01CC;
/* 0x01D0 */ f32 unk_01D0;
/* 0x01D4 */ f32 unk_01D4;
/* 0x01D8 */ char unk_01D8[0x4]; // probably unused float
/* 0x01DC */ f32 unk_01DC;
/* 0x01E0 */ f32 unk_01E0;
/* 0x01E4 */ f32 unk_01E4;
/* 0x01E8 */ Vec3s jointTable[GOHT_LIMB_MAX];
/* 0x02AE */ Vec3s morphTable[GOHT_LIMB_MAX];
/* 0x0374 */ Vec3s unk_0374;
/* 0x037A */ Vec3s unk_037A;
/* 0x0380 */ Vec3f unk_0380;
/* 0x038C */ Vec3f unk_038C;
/* 0x0398 */ Vec3f bodyPartsPos[GOHT_BODYPART_MAX];
/* 0x044C */ Vec3f unk_044C;
/* 0x0458 */ Vec3f unk_0458;
/* 0x0464 */ Vec3f unk_0464;
/* 0x0470 */ LightNode* lightNode;
/* 0x0474 */ LightInfo lightInfo;
/* 0x0484 */ ColliderJntSph unk_0484;
/* 0x04A4 */ ColliderJntSphElement unk_04A4[19];
/* 0x0964 */ ColliderCylinder unk_0964;
/* 0x09B0 */ Actor* unk_09B0[8];
/* 0x09D0 */ Actor* unk_09D0[10];
/* 0x09F8 */ BossHakuginEffect unk_09F8[BOSS_HAKUGIN_EFFECT_COUNT];
/* 0x2618 */ BossHakuginUnkStruct_2618 unk_2618[20];
/* 0x3158 */ BossHakuginFhgFlashUnkStruct unk_3158[5][15];
/* 0x3734 */ Vec3f unk_3734[10];
/* 0x37AC */ Vec3f unk_37AC;
/* 0x37B8 */ ColliderSphere unk_37B8;
} BossHakugin; // size = 0x3810
#endif // Z_BOSS_HAKUGIN_H
src/overlays/actors/ovl_En_Death/z_en_death.c
+1636 -153
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Death/z_en_death.h
+48 -2
View File
@@ -2,6 +2,8 @@
#define Z_EN_DEATH_H
#include "global.h"
#include "overlays/actors/ovl_En_Minideath/z_en_minideath.h"
#include "objects/object_death/object_death.h"
struct EnDeath;
@@ -9,9 +11,53 @@ typedef void (*EnDeathActionFunc)(struct EnDeath*, PlayState*);
typedef struct EnDeath {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x44];
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ EnDeathActionFunc actionFunc;
/* 0x18C */ char unk_18C[0x7AC];
/* 0x18C */ u8 unk_18C;
/* 0x18D */ u8 unk_18D;
/* 0x18E */ u8 unk_18E;
/* 0x18F */ u8 dmgEffect;
/* 0x190 */ s8 numScytheAfterImages;
/* 0x191 */ u8 unk_191; // animated material color step?
/* 0x192 */ u8 unk_192;
/* 0x193 */ u8 unk_193[GOMESS_LIMB_MAX];
/* 0x1A9 */ u8 unk_1A9[56];
/* 0x1E2 */ Vec3s jointTable[GOMESS_LIMB_MAX];
/* 0x266 */ Vec3s morphTable[GOMESS_LIMB_MAX];
/* 0x2EA */ s16 floatTimer;
/* 0x2EC */ s16 unk_2EC;
/* 0x2EE */ s16 actionTimer;
/* 0x2F0 */ char unk_2F0[0x2];
/* 0x2F2 */ s16 unk_2F2;
/* 0x2F4 */ s16 unk_2F4;
/* 0x2F6 */ s16 coreRotation;
/* 0x2F8 */ s16 unk_2F8;
/* 0x2FA */ s16 camId;
/* 0x2FC */ s16 unk_2FC;
/* 0x300 */ s32 effectIndex;
/* 0x304 */ f32 scytheScale;
/* 0x308 */ f32 coreVelocity;
/* 0x30C */ f32 camEyeSpeed;
/* 0x310 */ f32 camAtSpeed;
/* 0x314 */ f32 dmgEffectScale;
/* 0x318 */ f32 dmgEffectSteamScale;
/* 0x31C */ f32 dmgEffectAlpha;
/* 0x320 */ Vec3f corePos;
/* 0x32C */ Vec3f scytheWorldPos;
/* 0x338 */ Vec3f scytheScreenPos;
/* 0x344 */ Vec3f camEyeTarget;
/* 0x350 */ Vec3f camAtTarget;
/* 0x35C */ Vec3f dmgEffectPositions[14];
/* 0x404 */ Vec3f unk_404[56];
/* 0x6A4 */ MtxF unk_6A4;
/* 0x6E4 */ EnMinideath* miniDeaths[20];
/* 0x734 */ AnimatedMaterial* bodyMatAnim;
/* 0x738 */ AnimatedMaterial* coreMatAnim;
/* 0x73C */ ColliderCylinder bodyCollider;
/* 0x788 */ ColliderQuad unk_788; // weapon?
/* 0x808 */ ColliderSphere coreCollider;
/* 0x860 */ ColliderTris unk_860;
/* 0x880 */ ColliderTrisElement unk_880[2];
} EnDeath; // size = 0x938
#endif // Z_EN_DEATH_H
src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c
+2 -2
View File
@@ -93,8 +93,8 @@ void EnHakurock_Destroy(Actor* thisx, PlayState* play) {
void func_80B21BE0(BossHakugin* parent, Vec3f* arg1, s32 arg2) {
s32 i;
for (i = 0; i < ARRAY_COUNT(parent->unk_9F8); i++) {
BossHakuginEffect* gohtEffect = &parent->unk_9F8[i];
for (i = 0; i < ARRAY_COUNT(parent->unk_09F8); i++) {
BossHakuginEffect* gohtEffect = &parent->unk_09F8[i];
if (gohtEffect->unk_18 < 0) {
s16 sp2E;
s16 sp2C;
src/overlays/actors/ovl_En_Knight/z_en_knight.c
+3815 -266
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Knight/z_en_knight.h
+95 -10
View File
@@ -9,21 +9,106 @@ typedef void (*EnKnightActionFunc)(struct EnKnight*, PlayState*);
typedef struct EnKnight {
/* 0x000 */ Actor actor;
/* 0x144 */ s16 unk_144;
/* 0x146 */ char unk_146[0x2];
/* 0x148 */ s8 unk_148;
/* 0x149 */ char unk_149[0x8];
/* 0x151 */ s8 unk_151;
/* 0x152 */ char unk_152[0x1];
/* 0x144 */ u16 unk_144;
/* 0x146 */ s16 unk146;
/* 0x148 */ u8 unk148;
/* 0x14A */ s16 unk14A[3];
/* 0x150 */ char pad150[1];
/* 0x151 */ u8 unk_151;
/* 0x152 */ u8 unk152;
/* 0x153 */ u8 unk_153;
/* 0x154 */ u8 unk_154;
/* 0x155 */ char unk_155[0x2CB];
/* 0x156 */ s16 unk156;
/* 0x158 */ s16 unk158;
/* 0x15A */ s16 unk15A;
/* 0x15C */ s16 unk15C;
/* 0x15E */ s16 unk15E;
/* 0x160 */ s16 unk160;
/* 0x162 */ u8 unk162;
/* 0x164 */ Vec3f unk164;
/* 0x170 */ s16 unk170;
/* 0x172 */ s16 unk172;
/* 0x174 */ s16 unk174;
/* 0x176 */ s16 unk176;
/* 0x178 */ s16 unk178;
/* 0x17A */ s16 unk17A;
/* 0x17C */ f32 unk17C;
/* 0x180 */ f32 unk180;
/* 0x184 */ s16 unk184;
/* 0x186 */ s16 unk186;
/* 0x188 */ s16 unk188;
/* 0x18A */ s16 unk18A;
/* 0x18C */ s16 unk18C;
/* 0x18E */ s16 unk18E;
/* 0x190 */ u8 unk190;
/* 0x191 */ u8 unk191;
/* 0x192 */ u8 unk192;
/* 0x193 */ u8 unk193;
/* 0x194 */ SkelAnime unk194;
/* 0x1D8 */ f32 unk1D8;
/* 0x1DC */ Vec3f unk1DC[15];
/* 0x290 */ u8 unk290;
/* 0x291 */ u8 unk291;
/* 0x292 */ u8 unk292;
/* 0x294 */ f32 unk294;
/* 0x298 */ f32 unk298;
/* 0x29C */ f32 unk29C;
/* 0x2A0 */ u8 unk2A0;
/* 0x2A1 */ u8 unk2A1;
/* 0x2A2 */ s16 unk2A2;
/* 0x2A4 */ f32 unk2A4;
/* 0x2A8 */ f32 unk2A8;
/* 0x2AC */ Vec3f unk2AC[2];
/* 0x2C4 */ Vec3s unk2C4[29];
/* 0x372 */ Vec3s unk372[29];
/* 0x420 */ EnKnightActionFunc actionFunc;
/* 0x424 */ char unk_424[0x25C];
/* 0x424 */ EnKnightActionFunc unk424;
/* 0x428 */ s16 unk428;
/* 0x42C */ f32 unk42C;
/* 0x430 */ f32 unk430;
/* 0x434 */ Vec3f unk434;
/* 0x440 */ Vec3f unk440;
/* 0x44C */ u8 unk44C;
/* 0x450 */ f32 unk450;
/* 0x454 */ f32 unk454;
/* 0x458 */ f32 unk458;
/* 0x45C */ f32 unk45C;
/* 0x460 */ f32 unk460;
/* 0x464 */ f32 unk464;
/* 0x468 */ f32 unk468;
/* 0x46C */ f32 unk46C;
/* 0x470 */ f32 unk470;
/* 0x474 */ f32 unk474;
/* 0x478 */ s16 unk478;
/* 0x47C */ Vec3f unk47C;
/* 0x488 */ ColliderCylinder unk488;
/* 0x4D4 */ ColliderJntSph unk4D4;
/* 0x4F4 */ ColliderJntSphElement unk4F4[1];
/* 0x534 */ ColliderJntSph unk534;
/* 0x554 */ ColliderJntSphElement unk554[1];
/* 0x594 */ ColliderJntSph unk594;
/* 0x5B4 */ ColliderJntSphElement unk5B4[2];
/* 0x634 */ ColliderCylinder unk634;
/* 0x680 */ u8 unk_680;
/* 0x681 */ char unk_681[0x9];
/* 0x684 */ u32 unk684;
/* 0x688 */ s16 unk688;
/* 0x68A */ s16 unk_68A;
/* 0x68C */ char pad68C[0x48];
/* 0x68C */ Vec3f unk68C;
/* 0x698 */ Vec3f unk698;
/* 0x6A4 */ f32 unk6A4;
/* 0x6A8 */ char pad6A8[4];
/* 0x6AC */ s16 unk6AC;
/* 0x6B0 */ f32 unk6B0;
/* 0x6B4 */ u16 unk6B4;
/* 0x6B6 */ u16 unk6B6;
/* 0x6B8 */ u16 unk6B8;
/* 0x6BA */ char pad6BA[2];
/* 0x6BC */ u16 unk6BC;
/* 0x6BE */ u16 unk6BE;
/* 0x6C0 */ u16 unk6C0;
/* 0x6C2 */ u16 unk6C2;
/* 0x6C4 */ u8 unk6C4;
/* 0x6C8 */ Vec3f unk6C8;
} EnKnight; // size = 0x6D4
#endif // Z_EN_KNIGHT_H
src/overlays/actors/ovl_En_Minideath/z_en_minideath.c
+813 -91
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Minideath/z_en_minideath.h
+40 -3
View File
@@ -7,10 +7,47 @@ struct EnMinideath;
typedef void (*EnMinideathActionFunc)(struct EnMinideath*, PlayState*);
// "animation" length
#define MINIDEATH_ANIM_LENGTH 9
typedef enum {
MINIDEATH_ACTION_CONTINUE, // continue with current action until it is changed
MINIDEATH_ACTION_1, // scatter after light arrows?
MINIDEATH_ACTION_2, // gomess damaged
MINIDEATH_ACTION_3,
MINIDEATH_ACTION_4, // chase player?
MINIDEATH_ACTION_DIE, // dead?
MINIDEATH_ACTION_6,
MINIDEATH_ACTION_7,
MINIDEATH_ACTION_8,
MINIDEATH_ACTION_9
} MinideathAction;
typedef struct {
/* 0x00 */ u8 animFrame;
/* 0x01 */ u8 unk_1;
/* 0x04 */ Vec3f unk_4;
/* 0x10 */ Vec3f unk_10;
/* 0x1C */ s16 unk_1C;
/* 0x1E */ s16 unk_1E;
/* 0x20 */ char unk_20[0x2];
/* 0x22 */ s16 unk_22;
} MiniDeathStruct; // size = 0x24
typedef struct EnMinideath {
/* 0x000 */ Actor actor;
/* 0x144 */ EnMinideathActionFunc actionFunc;
/* 0x148 */ char unk_148[0x164];
/* 0x0000 */ Actor actor;
/* 0x0144 */ EnMinideathActionFunc actionFunc;
/* 0x0148 */ u8 number;
/* 0x0149 */ u8 unk_149;
/* 0x014A */ s16 timer;
/* 0x014C */ s16 spawnShapeRot;
/* 0x014E */ s16 attackTimer;
/* 0x0150 */ Vec3s unk_150; // move direction?
/* 0x0158 */ f32 unk_158;
/* 0x015C */ Actor* unk_15C;
/* 0x0160 */ MiniDeathStruct unk_160[3];
/* 0x01CC */ ColliderJntSph collider;
/* 0x01EC */ ColliderJntSphElement colliderElements[3];
} EnMinideath; // size = 0x2AC
#endif // Z_EN_MINIDEATH_H
src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c
+632 -38
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h
+10 -2
View File
@@ -9,9 +9,17 @@ typedef void (*EnWdhandActionFunc)(struct EnWdhand*, PlayState*);
typedef struct EnWdhand {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0xA4];
/* 0x144 */ SkelAnime unk144;
/* 0x188 */ Vec3s unk188[8];
/* 0x1B8 */ Vec3s unk1B8[8];
/* 0x1E8 */ EnWdhandActionFunc actionFunc;
/* 0x1EC */ char unk_1EC[0x268];
/* 0x1EC */ Vec3s unk1EC[5];
/* 0x20C */ f32 unk20C;
/* 0x20C */ f32 unk210[3];
/* 0x21C */ MtxF unk21C;
/* 0x25C */ Vec3f unk25C[2];
/* 0x274 */ ColliderJntSph unk274;
/* 0x294 */ ColliderJntSphElement unk294[7];
} EnWdhand; // size = 0x454
#endif // Z_EN_WDHAND_H

Some files were not shown because too many files have changed in this diff Show More