Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2024-11-23 12:59:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

En_Bomjima (1 non-equiv) (#433)

Browse Source 
* En_Bomjima

* Damn caps

* PR

* PR

* undef

* PR
This commit is contained in:
Maide 2022-01-04 03:57:40 +00:00 committed by GitHub
parent 934c562471
commit 4ee7dc1da6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 1102 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/xml/objects/object_cs.xml
View File

@ -49,7 +49,7 @@
<Texture Name="object_cs_Tex_00B9A0" OutName="tex_00B9A0" Format="ci8" Width="8" Height="8" Offset="0xB9A0" />
<Texture Name="object_cs_Tex_00B9E0" OutName="tex_00B9E0" Format="ci8" Width="16" Height="16" Offset="0xB9E0" />
<Texture Name="object_cs_Tex_00BAE0" OutName="tex_00BAE0" Format="ci8" Width="16" Height="16" Offset="0xBAE0" />
<!-- <Blob Name="object_cs_Blob_00BBE0" Size="0x400" Offset="0xBBE0" /> -->
<Blob Name="object_cs_Blob_00BBE0" Size="0x400" Offset="0xBBE0" />
<Texture Name="object_cs_Tex_00BFE0" OutName="tex_00BFE0" Format="ci8" Width="8" Height="8" Offset="0xBFE0" />
<Texture Name="object_cs_Tex_00C020" OutName="tex_00C020" Format="ci8" Width="8" Height="8" Offset="0xC020" />
<Texture Name="object_cs_Tex_00C060" OutName="tex_00C060" Format="ci8" Width="8" Height="8" Offset="0xC060" />

6
assets/xml/overlays/ovl_En_Bomjima.xml Normal file
View File

@ -0,0 +1,6 @@
<Root>
<File Name="ovl_En_Bomjima" BaseAddress="0x80BFE170" RangeStart="0x2998" RangeEnd="0x29B8">
<DList Name="gEnBomjima_D_80C00B08" Offset="0x2998"/>
<DList Name="gEnBomjima_D_80C00B18" Offset="0x29A8"/>
</File>
</Root>

1
spec
View File

@ -5107,7 +5107,6 @@ beginseg
name "ovl_En_Bomjima"
compress
include "build/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.o"
include "build/data/ovl_En_Bomjima/ovl_En_Bomjima.data.o"
include "build/data/ovl_En_Bomjima/ovl_En_Bomjima.reloc.o"
endseg

7
src/overlays/actors/ovl_En_Bombal/z_en_bombal.h
View File

@ -10,7 +10,12 @@ typedef void (*EnBombalActionFunc)(struct EnBombal*, GlobalContext*);
typedef struct EnBombal {
/* 0x0000 */ Actor actor;
/* 0x0144 */ EnBombalActionFunc actionFunc;
/* 0x0148 */ char unk_148[0x28FC];
/* 0x0148 */ char unk148[0x4];
/* 0x014C */ s16 unk_14C;
/* 0x0150 */ f32 unk_150;
/* 0x0154 */ char unk154[0x150];
/* 0x02A4 */ Vec3f unk_2A4;
/* 0x02B0 */ char unk2B0[0x2794];
} EnBombal; // size = 0x2A44
extern const ActorInit En_Bombal_InitVars;

1083
src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c
View File

File diff suppressed because it is too large Load Diff

48
src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h
View File

@ -7,11 +7,53 @@ struct EnBomjima;
typedef void (*EnBomjimaActionFunc)(struct EnBomjima*, GlobalContext*);
#define ENBOMJIMA_GET_F0(thisx) (((thisx)->params >> 4) & 0xF)
#define ENBOMJIMA_GET_F(thisx) ((thisx)->params & 0xF)
typedef struct EnBomjima {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x140];
/* 0x0284 */ EnBomjimaActionFunc actionFunc;
/* 0x0288 */ char unk_288[0xBC];
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[21];
/* 0x206 */ Vec3s morphTable[21];
/* 0x284 */ EnBomjimaActionFunc actionFunc;
/* 0x288 */ s16 unk_288;
/* 0x28A */ s16 unk_28A;
/* 0x28C */ UNK_TYPE1 unk28C[2];
/* 0x28E */ s16 unk_28E;
/* 0x290 */ s16 unk_290;
/* 0x292 */ UNK_TYPE1 unk292[2];
/* 0x294 */ s16 unk_294;
/* 0x296 */ UNK_TYPE1 unk296[4];
/* 0x29A */ s16 unk_29A;
/* 0x29C */ UNK_TYPE1 unk29C[4];
/* 0x2A0 */ s16 unk_2A0;
/* 0x2A2 */ s16 unk_2A2;
/* 0x2A4 */ Vec3f unk_2A4;
/* 0x2B0 */ Vec3f unk_2B0;
/* 0x2BC */ s16 unk_2BC;
/* 0x2BE */ s16 unk_2BE;
/* 0x2C0 */ s16 unk_2C0;
/* 0x2C2 */ s16 unk_2C2;
/* 0x2C4 */ s16 unk_2C4;
/* 0x2C6 */ s16 unk_2C6;
/* 0x2C8 */ s16 unk_2C8;
/* 0x2CA */ s16 unk_2CA;
/* 0x2CC */ f32 unk_2CC;
/* 0x2D0 */ f32 unk_2D0;
/* 0x2D4 */ s16 unk_2D4[2];
/* 0x2D8 */ UNK_TYPE1 unk2D8[4]; // maybe a part of the above?
/* 0x2DC */ s16 unk_2DC;
/* 0x2DE */ s16 unk_2DE;
/* 0x2E0 */ s16 unk_2E0;
/* 0x2E2 */ s16 unk_2E2;
/* 0x2E4 */ s16 unk_2E4;
/* 0x2E6 */ s16 unk_2E6;
/* 0x2E8 */ s16 unk_2E8;
/* 0x2EA */ s16 unk_2EA;
/* 0x2EC */ s32 unk_2EC;
/* 0x2F0 */ EnBombal* unk_2F0;
/* 0x2F4 */ s16 unk_2F4;
/* 0x2F8 */ ColliderCylinder collider;
} EnBomjima; // size = 0x344
extern const ActorInit En_Bomjima_InitVars;

2
tools/disasm/functions.txt
View File

@ -16483,7 +16483,7 @@
0x80C00234:("func_80C00234",),
0x80C00284:("func_80C00284",),
0x80C00644:("EnBomjima_Update",),
0x80C007F4:("func_80C007F4",),
0x80C007F4:("EnBomjima_OverrideLimbDraw",),
0x80C008B4:("EnBomjima_Draw",),
0x80C00EA0:("EnBomjimb_Init",),
0x80C01110:("EnBomjimb_Destroy",),

2
undefined_syms.txt
View File

@ -1697,7 +1697,7 @@ D_06000340 = 0x06000340;
D_06000408 = 0x06000408;
D_06000530 = 0x06000530;
// ovl_En_Bomjima
// ovl_En_Bomjimb
D_060064B8 = 0x060064B8;
D_0600F82C = 0x0600F82C;