falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

En_Zog (#441) 

* En_Zog

* Removing padding

* PR

* PR

* undef

* fmt
This commit is contained in:
Maide 2021-12-27 02:08:35 +00:00 committed by GitHub
parent ae2ba19d7b
commit e7b326f5e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1042 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assets/xml/objects/object_zog.xml
View File

@ -74,7 +74,12 @@
<Texture Name="object_zog_Tex_024150" OutName="tex_024150" Format="rgba16" Width="16" Height="16" Offset="0x24150" />
<Texture Name="object_zog_Tex_024350" OutName="tex_024350" Format="ci8" Width="16" Height="32" Offset="0x24350" />
<Texture Name="object_zog_Tex_024550" OutName="tex_024550" Format="ci8" Width="16" Height="32" Offset="0x24550" />
<!-- <Blob Name="object_zog_Blob_024750" Size="0x2800" Offset="0x24750" /> -->
<Texture Name="object_zog_Tex_024750" OutName="tex_024750" Format="rgba16" Width="32" Height="32" Offset="0x24750" />
<Texture Name="object_zog_Tex_024F50" OutName="tex_024F50" Format="rgba16" Width="32" Height="32" Offset="0x24F50" />
<Texture Name="object_zog_Tex_025750" OutName="tex_025750" Format="rgba16" Width="32" Height="32" Offset="0x25750" />
<Texture Name="object_zog_Tex_025F50" OutName="tex_025F50" Format="rgba16" Width="32" Height="32" Offset="0x25F50" />
<Texture Name="object_zog_Tex_026750" OutName="tex_026750" Format="rgba16" Width="32" Height="32" Offset="0x26750" />
<Blob Name="object_zog_Blob_026F50" Size="0x1150" Offset="0x26F50" />
<DList Name="object_zog_DL_0280A0" Offset="0x280A0" />
<DList Name="object_zog_DL_0280A8" Offset="0x280A8" />
<Texture Name="object_zog_Tex_028610" OutName="tex_028610" Format="rgba16" Width="16" Height="16" Offset="0x28610" />

4
spec
View File

@ -4418,9 +4418,7 @@ beginseg
name "ovl_En_Zog"
compress
include "build/src/overlays/actors/ovl_En_Zog/z_en_zog.o"
include "build/data/ovl_En_Zog/ovl_En_Zog.data.o"
include "build/data/ovl_En_Zog/ovl_En_Zog.bss.o"
include "build/data/ovl_En_Zog/ovl_En_Zog.reloc.o"
include "build/src/overlays/actors/ovl_En_Zog/ovl_En_Zog_reloc.o"
endseg
beginseg

1045
src/overlays/actors/ovl_En_Zog/z_en_zog.c
View File

File diff suppressed because it is too large Load Diff

33
src/overlays/actors/ovl_En_Zog/z_en_zog.h
View File

@ -7,10 +7,37 @@ struct EnZog;
typedef void (*EnZogActionFunc)(struct EnZog*, GlobalContext*);
#define ENZOG_GET_F(thisx) ((thisx)->params & 0xF)
#define ENZOG_GET_FC00(thisx) (((thisx)->params & 0xFC00) >> 0xA)
#define ENZOG_F_2 2
#define ENZOG_FC00_63 63
typedef struct EnZog {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x1E4];
/* 0x0328 */ EnZogActionFunc actionFunc;
/* 0x000 */ Actor actor;
/* 0x144 */ ColliderCylinder collider;
/* 0x190 */ SkelAnime skelAnime;
/* 0x1D4 */ Vec3s jointTable[23];
/* 0x25E */ Vec3s morphTable[23];
/* 0x2E8 */ Path* unk_2E8;
/* 0x2EC */ s32 unk_2EC;
/* 0x2F0 */ Vec3f unk_2F0;
/* 0x2FC */ s16 unk_2FC;
/* 0x2FE */ s16 unk_2FE;
/* 0x300 */ s16 unk_300;
/* 0x302 */ s16 unk_302;
/* 0x304 */ s16 unk_304;
/* 0x306 */ s16 unk_306;
/* 0x308 */ s16 unk_308;
/* 0x30A */ u16 unk_30A;
/* 0x30C */ s16 unk_30C[7];
/* 0x31A */ s16 unk_31A;
/* 0x31C */ s16 unk_31C;
/* 0x31E */ s16 unk_31E;
/* 0x320 */ s16 unk_320;
/* 0x322 */ s16 unk_322;
/* 0x324 */ s16 unk_324;
/* 0x328 */ EnZogActionFunc actionFunc;
} EnZog; // size = 0x32C
extern const ActorInit En_Zog_InitVars;

6
undefined_syms.txt
View File

@ -4010,12 +4010,6 @@ D_06000D94 = 0x06000D94;
D_06007650 = 0x06007650;
D_0600D658 = 0x0600D658;
// ovl_En_Zog
D_0600FC0C = 0x0600FC0C;
D_060280A8 = 0x060280A8;
D_06029170 = 0x06029170;
// ovl_En_Zoraegg
D_060005D4 = 0x060005D4;