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

Dm_Char05 (#583)

Browse Source 
* Dm_Char05

* Params

* Syms

* Earpstone

* Merge
This commit is contained in:
Maide
2022-02-13 23:58:41 +00:00
committed by GitHub
parent 5fe04d87e0
commit 9e9b84cb2c
7 changed files with 765 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_dmask.xml
+8 -4
View File
@@ -2,15 +2,18 @@
<File Name="object_dmask" Segment="6">
<Animation Name="object_dmask_Anim_00017C" Offset="0x17C" />
<Animation Name="object_dmask_Anim_0001A8" Offset="0x1A8" />
<!-- <Blob Name="object_dmask_Blob_0001B8" Size="0x28" Offset="0x1B8" /> -->
<Limb Name="object_dmask_Standardlimb_01C0" Type="Standard" Offset="0x1C0" />
<Skeleton Name="object_dmask_Skel_001D0" Type="Flex" LimbType="Standard" Offset="0x1D0" />
<DList Name="object_dmask_DL_000430" Offset="0x430" />
<Texture Name="object_dmask_Tex_000578" OutName="tex_000578" Format="i8" Width="64" Height="32" Offset="0x578" />
<Texture Name="object_dmask_Tex_000D78" OutName="tex_000D78" Format="i8" Width="32" Height="16" Offset="0xD78" />
<Animation Name="object_dmask_Anim_001090" Offset="0x1090" />
<!-- <Blob Name="object_dmask_Blob_0010A0" Size="0x20" Offset="0x10A0" /> -->
<Limb Name="object_dmask_Standardlimb_010A0" Type="Standard" Offset="0x10A0" />
<Skeleton Name="object_dmask_Skel_010B0" Type="Normal" LimbType="Standard" Offset="0x10B0" />
<Animation Name="object_dmask_Anim_0011A0" Offset="0x11A0" />
<Animation Name="object_dmask_Anim_0013A4" Offset="0x13A4" />
<!-- <Blob Name="object_dmask_Blob_0013B4" Size="0x2C" Offset="0x13B4" /> -->
<Limb Name="object_dmask_Standardlimb_013C0" Type="Standard" Offset="0x13C0" />
<Skeleton Name="object_dmask_Skel_013D0" Type="Normal" LimbType="Standard" Offset="0x13D0" />
<DList Name="object_dmask_DL_001E70" Offset="0x1E70" />
<Texture Name="object_dmask_Tex_002220" OutName="tex_002220" Format="rgba16" Width="32" Height="64" Offset="0x2220" />
<Texture Name="object_dmask_Tex_003220" OutName="tex_003220" Format="rgba16" Width="16" Height="16" Offset="0x3220" />
@@ -19,6 +22,7 @@
<Texture Name="object_dmask_Tex_003820" OutName="tex_003820" Format="rgba16" Width="16" Height="16" Offset="0x3820" />
<Texture Name="object_dmask_Tex_003A20" OutName="tex_003A20" Format="rgba16" Width="32" Height="32" Offset="0x3A20" />
<Animation Name="object_dmask_Anim_004288" Offset="0x4288" />
<!-- <Blob Name="object_dmask_Blob_004298" Size="0x28" Offset="0x4298" /> -->
<Limb Name="object_dmask_Standardlimb_042A0" Type="Standard" Offset="0x42A0" />
<Skeleton Name="object_dmask_Skel_042B0" Type="Normal" LimbType="Standard" Offset="0x42B0" />
</File>
</Root>
include/z64item.h
+14 -2
View File
@@ -349,7 +349,11 @@ typedef enum {
typedef enum {
/* 0x00 */ GID_BOTTLE,
/* 0x02 */ GID_02 = 0x02,
/* 0x03 */ GID_03,
/* 0x0A */ GID_COMPASS = 0x0A,
/* 0x0E */ GID_0E = 0x0E,
/* 0x0F */ GID_0F,
/* 0x10 */ GID_MASK_ALL_NIGHT = 0x10,
/* 0x11 */ GID_NUTS,
/* 0x17 */ GID_BOMB_BAG_20 = 0x17,
@@ -367,11 +371,19 @@ typedef enum {
/* 0x31 */ GID_POTION_RED,
/* 0x32 */ GID_POTION_BLUE,
/* 0x33 */ GID_SHIELD_MIRROR,
/* 0x3B */ GID_FAIRY = 0x3B,
/* 0x3A */ GID_3A = 0x3A,
/* 0x3B */ GID_FAIRY,
/* 0x3E */ GID_3E = 0x3E,
/* 0x44 */ GID_44 = 0x44,
/* 0x45 */ GID_45,
/* 0x55 */ GID_SWORD_KOKIRI = 0x55,
/* 0x66 */ GID_SWORD_RAZOR = 0x66,
/* 0x67 */ GID_SWORD_GILDED,
/* 0x68 */ GID_SWORD_GREAT_FAIRY
/* 0x68 */ GID_SWORD_GREAT_FAIRY,
/* 0x6A */ GID_6A = 0x6A,
/* 0x6B */ GID_6B,
/* 0x70 */ GID_70 = 0x70,
/* 0x71 */ GID_71,
} GetItemDrawID;
// TODO: fill
spec
+1 -2
View File
@@ -3305,8 +3305,7 @@ beginseg
name "ovl_Dm_Char05"
compress
include "build/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.o"
include "build/data/ovl_Dm_Char05/ovl_Dm_Char05.data.o"
include "build/data/ovl_Dm_Char05/ovl_Dm_Char05.reloc.o"
include "build/src/overlays/actors/ovl_Dm_Char05/ovl_Dm_Char05_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c
+710 -45
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h
+30 -2
View File
@@ -7,11 +7,39 @@ struct DmChar05;
typedef void (*DmChar05ActionFunc)(struct DmChar05*, GlobalContext*);
#define DMCHAR05_GET(thisx) ((thisx)->params)
enum {
/* 0 */ DMCHAR05_0,
/* 1 */ DMCHAR05_1,
/* 2 */ DMCHAR05_2,
/* 3 */ DMCHAR05_3,
/* 4 */ DMCHAR05_4,
/* 5 */ DMCHAR05_5,
/* 6 */ DMCHAR05_6,
/* 7 */ DMCHAR05_7,
/* 8 */ DMCHAR05_8,
/* 9 */ DMCHAR05_9,
/* 10 */ DMCHAR05_10,
/* 11 */ DMCHAR05_11,
/* 12 */ DMCHAR05_12,
};
typedef struct DmChar05 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ DmChar05ActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x2C];
/* 0x018C */ s16 unk_18C;
/* 0x018E */ u8 unk_18E;
/* 0x018F */ u8 unk_18F;
/* 0x0190 */ Vec3f unk_190;
/* 0x019C */ u32 unk_19C;
/* 0x01A0 */ u32 unk_1A0;
/* 0x01A4 */ u32 unk_1A4;
/* 0x01A8 */ s32 unk_1A8;
/* 0x01AC */ s32 unk_1AC;
/* 0x01B0 */ s32 unk_1B0;
/* 0x01B4 */ u8 unk_1B4;
} DmChar05; // size = 0x1B8
extern const ActorInit Dm_Char05_InitVars;
tools/disasm/functions.txt
+2 -2
View File
@@ -11605,8 +11605,8 @@
0x80AAD450:("func_80AAD450",),
0x80AAD4A8:("func_80AAD4A8",),
0x80AAD78C:("DmChar05_Update",),
0x80AAD964:("func_80AAD964",),
0x80AAD980:("func_80AAD980",),
0x80AAD964:("DmChar05_OverrideLimbDraw",),
0x80AAD980:("DmChar05_PostLimbDraw",),
0x80AAD998:("func_80AAD998",),
0x80AADA90:("func_80AADA90",),
0x80AADB4C:("func_80AADB4C",),
undefined_syms.txt
-8
View File
@@ -1034,14 +1034,6 @@ D_0600AD68 = 0x0600AD68;
D_06020550 = 0x06020550;
// ovl_Dm_Char05
D_060001D0 = 0x060001D0;
D_060010B0 = 0x060010B0;
D_060013D0 = 0x060013D0;
D_06001E70 = 0x06001E70;
D_060042B0 = 0x060042B0;
// ovl_Dm_Char06
D_060013A8 = 0x060013A8;