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

Matched

Browse Source
This commit is contained in:
Thar0
2022-06-25 23:09:57 +01:00
parent f8ae0409d4
commit 78eeb3ffe8
7 changed files with 2009 additions and 950 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" />
<Animation Name="object_death_Anim_0015B4" Offset="0x15B4" />
<Animation Name="object_death_Anim_001834" Offset="0x1834" />
<Animation Name="object_death_Anim_001F80" Offset="0x1F80" />
<Animation Name="object_death_Anim_002DE8" Offset="0x2DE8" />
<Animation Name="object_death_Anim_00352C" Offset="0x352C" />
<Animation Name="object_death_Anim_003CAC" Offset="0x3CAC" />
<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" />
<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="object_death_Limbs" Offset="0xAD08" />
<Animation Name="object_death_Anim_00B284" Offset="0xB284" />
<Animation Name="object_death_Anim_00B508" Offset="0xB508" />
<Animation Name="object_death_Anim_00CB2C" Offset="0xCB2C" />
<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>
spec
+2 -5
View File
@@ -1093,17 +1093,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
src/overlays/actors/ovl_En_Death/z_en_death.c
+1081 -778
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Death/z_en_death.h
+34 -34
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;
@@ -10,52 +12,50 @@ typedef void (*EnDeathActionFunc)(struct EnDeath*, GlobalContext*);
typedef struct EnDeath {
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ EnDeathActionFunc unk_188;
/* 0x188 */ EnDeathActionFunc actionFunc;
/* 0x18C */ u8 unk_18C;
/* 0x18D */ u8 unk_18D;
/* 0x18E */ u8 unk_18E;
/* 0x18F */ u8 unk_18F;
/* 0x190 */ s8 unk_190;
/* 0x191 */ u8 unk_191;
/* 0x18F */ u8 dmgEffect;
/* 0x190 */ s8 numScytheAfterImages;
/* 0x191 */ u8 unk_191; // animated material color step?
/* 0x192 */ u8 unk_192;
/* 0x193 */ char unk_193[0x16];
/* 0x193 */ u8 unk_193[GOMESS_LIMB_MAX];
/* 0x1A9 */ u8 unk_1A9[56];
/* 0x1E1 */ char unk_1E1[1]; // likely padding
/* 0x1E2 */ Vec3s unk_1E2[22];
/* 0x266 */ Vec3s unk_266[22];
/* 0x2EA */ s16 unk_2EA;
/* 0x1E2 */ Vec3s jointTable[GOMESS_LIMB_MAX];
/* 0x266 */ Vec3s morphTable[GOMESS_LIMB_MAX];
/* 0x2EA */ s16 floatTimer;
/* 0x2EC */ s16 unk_2EC;
/* 0x2EE */ s16 unk_2EE;
/* 0x2EE */ s16 actionTimer;
/* 0x2F0 */ char unk_2F0[0x2];
/* 0x2F2 */ s16 unk_2F2;
/* 0x2F4 */ s16 unk_2F4;
/* 0x2F6 */ s16 unk_2F6;
/* 0x2F6 */ s16 coreRotation;
/* 0x2F8 */ s16 unk_2F8;
/* 0x2FA */ s16 unk_2FA;
/* 0x2FA */ s16 camId;
/* 0x2FC */ s16 unk_2FC;
/* 0x2FE */ char unk_2FE[0x2];
/* 0x300 */ s32 unk_300; // effectIdx
/* 0x304 */ f32 unk_304;
/* 0x308 */ f32 unk_308;
/* 0x30C */ f32 unk_30C;
/* 0x310 */ f32 unk_310;
/* 0x314 */ f32 unk_314;
/* 0x318 */ f32 unk_318;
/* 0x31C */ f32 unk_31C;
/* 0x320 */ Vec3f unk_320;
/* 0x32C */ Vec3f unk_32C;
/* 0x338 */ Vec3f unk_338;
/* 0x344 */ Vec3f unk_344;
/* 0x350 */ Vec3f unk_350;
/* 0x35C */ Vec3f unk_35C[2]; // TODO size
/* 0x374 */ char unk_374[0x330];
/* 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 */ Actor* unk_6E4[20];
/* 0x734 */ AnimatedMaterial* unk_734;
/* 0x738 */ AnimatedMaterial* unk_738;
/* 0x73C */ ColliderCylinder unk_73C;
/* 0x788 */ ColliderQuad unk_788;
/* 0x808 */ ColliderSphere unk_808;
/* 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
src/overlays/actors/ovl_En_Minideath/z_en_minideath.c
+803 -81
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Minideath/z_en_minideath.h
+38 -1
View File
@@ -7,10 +7,47 @@ struct EnMinideath;
typedef void (*EnMinideathActionFunc)(struct EnMinideath*, GlobalContext*);
// "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 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ EnMinideathActionFunc actionFunc;
/* 0x0148 */ char unk_148[0x164];
/* 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
extern const ActorInit En_Minideath_InitVars;
tools/disasm/functions.txt
+2 -2
View File
@@ -6209,7 +6209,7 @@
0x808C96C8:("EnDeath_Draw",),
0x808CA0B0:("EnMinideath_Init",),
0x808CA23C:("EnMinideath_Destroy",),
0x808CA268:("func_808CA268",),
0x808CA268:("EnMinideath_DropCollectible",),
0x808CA308:("func_808CA308",),
0x808CA34C:("func_808CA34C",),
0x808CA458:("func_808CA458",),
@@ -6239,7 +6239,7 @@
0x808CB6D4:("func_808CB6D4",),
0x808CB7B8:("func_808CB7B8",),
0x808CB7CC:("func_808CB7CC",),
0x808CB810:("func_808CB810",),
0x808CB810:("EnMinideath_SetNextAction",),
0x808CB8F4:("func_808CB8F4",),
0x808CBB18:("EnMinideath_Update",),
0x808CC260:("EnVm_Init",),