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

En_Bomjimb (#461)

Browse Source 
* En_Bomjimb

* PR

* PR
This commit is contained in:
Maide
2021-12-27 02:14:19 +00:00
committed by GitHub
parent e7b326f5e4
commit 5b7fb5bfde
7 changed files with 915 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_cs.xml
+10 -3
View File
@@ -56,11 +56,18 @@
<Texture Name="object_cs_Tex_00C0A0" OutName="tex_00C0A0" Format="ci8" Width="8" Height="16" Offset="0xC0A0" />
<Texture Name="object_cs_Tex_00C120" OutName="tex_00C120" Format="i8" Width="16" Height="16" Offset="0xC120" />
<Texture Name="object_cs_Tex_00C220" OutName="tex_00C220" Format="ci8" Width="16" Height="16" Offset="0xC220" />
<!-- <Blob Name="object_cs_Blob_00C320" Size="0x1E00" Offset="0xC320" /> -->
<Blob Name="object_cs_Blob_00C320" Size="0x200" Offset="0xC320" />
<Texture Name="object_cs_Tex_00C520" OutName="tex_00C520" Format="rgba16" Width="32" Height="32" Offset="0xC520" />
<Texture Name="object_cs_Tex_00CD20" OutName="tex_00CD20" Format="rgba16" Width="32" Height="32" Offset="0xCD20" />
<Texture Name="object_cs_Tex_00D520" OutName="tex_00D520" Format="rgba16" Width="32" Height="32" Offset="0xD520" />
<Texture Name="object_cs_Tex_00DD20" OutName="tex_00DD20" Format="i8" Width="32" Height="32" Offset="0xDD20" />
<Texture Name="object_cs_Tex_00E120" OutName="tex_00E120" Format="i8" Width="16" Height="16" Offset="0xE120" />
<!-- <Blob Name="object_cs_Blob_00E220" Size="0x1400" Offset="0xE220" /> -->
<Blob Name="object_cs_Blob_00E220" Size="0x400" Offset="0xE220" />
<Texture Name="object_cs_Tex_00E620" OutName="tex_00E620" Format="i8" Width="32" Height="32" Offset="0xE620" />
<Texture Name="object_cs_Tex_00EA20" OutName="tex_00EA20" Format="i8" Width="32" Height="32" Offset="0xEA20" />
<Texture Name="object_cs_Tex_00EE20" OutName="tex_00EE20" Format="i8" Width="32" Height="32" Offset="0xEE20" />
<Texture Name="object_cs_Tex_00F220" OutName="tex_00F220" Format="i8" Width="32" Height="32" Offset="0xF220" />
<Texture Name="object_cs_Tex_00F620" OutName="tex_00F620" Format="i8" Width="8" Height="8" Offset="0xF620" />
<!-- <Blob Name="object_cs_Blob_00E220" Size="0x1400" Offset="0xE220" /> -->
<TextureAnimation Name="object_cs_Matanimheader_00F6E4" Offset="0xF6E4" />
<Limb Name="object_cs_Standardlimb_00F6EC" Type="Standard" Offset="0xF6EC" />
<Limb Name="object_cs_Standardlimb_00F6F8" Type="Standard" Offset="0xF6F8" />
assets/xml/overlays/ovl_En_Bomjimb.xml
+6
View File
@@ -0,0 +1,6 @@
<Root>
<File Name="ovl_En_Bomjimb" BaseAddress="0x80C00EA0" RangeStart="0x23A0" RangeEnd="0x23C0">
<DList Name="gEnBomjimb_D_80C03240" Offset="0x23A0"/>
<DList Name="gEnBomjimb_D_80C03250" Offset="0x23B0"/>
</File>
</Root>
spec
+1 -2
View File
@@ -5130,8 +5130,7 @@ beginseg
name "ovl_En_Bomjimb"
compress
include "build/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.o"
include "build/data/ovl_En_Bomjimb/ovl_En_Bomjimb.data.o"
include "build/data/ovl_En_Bomjimb/ovl_En_Bomjimb.reloc.o"
include "build/src/overlays/actors/ovl_En_Bomjimb/ovl_En_Bomjimb_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c
+846 -40
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h
+51 -4
View File
@@ -7,11 +7,58 @@ struct EnBomjimb;
typedef void (*EnBomjimbActionFunc)(struct EnBomjimb*, GlobalContext*);
#define ENBOMJIMB_GET_F(thisx) ((thisx)->params & 0xF)
#define ENBOMJIMB_GET_F0(thisx) (((thisx)->params >> 4) & 0xF)
#define ENBOMJIMB_GET_FF00(thisx) (((thisx)->params >> 8) & 0xFF)
enum {
/* 0 */ ENBOMJIMB_F_0,
/* 1 */ ENBOMJIMB_F_1,
/* 2 */ ENBOMJIMB_F_2,
/* 3 */ ENBOMJIMB_F_3,
/* 4 */ ENBOMJIMB_F_4,
};
enum {
/* 0 */ ENBOMJIMB_F0_0,
/* 1 */ ENBOMJIMB_F0_1,
/* 2 */ ENBOMJIMB_F0_2,
};
typedef struct EnBomjimb {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x140];
/* 0x0284 */ EnBomjimbActionFunc actionFunc;
/* 0x0288 */ char unk_288[0xAC];
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[21];
/* 0x206 */ Vec3s morphTable[21];
/* 0x284 */ EnBomjimbActionFunc actionFunc;
/* 0x288 */ s16 unk_288;
/* 0x28A */ s16 unk_28A;
/* 0x28C */ UNK_TYPE1 unk28C[4];
/* 0x290 */ s16 unk_290;
/* 0x294 */ Vec3f unk_294;
/* 0x2A0 */ Vec3f unk_2A0;
/* 0x2AC */ s16 unk_2AC;
/* 0x2AE */ s16 unk_2AE;
/* 0x2B0 */ s16 unk_2B0;
/* 0x2B2 */ s16 unk_2B2;
/* 0x2B4 */ f32 unk_2B4;
/* 0x2B8 */ f32 unk_2B8;
/* 0x2BC */ UNK_TYPE1 unk2BC[4];
/* 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 */ s16 unk_2CC;
/* 0x2D0 */ s32 unk_2D0;
/* 0x2D4 */ s16 unk_2D4;
/* 0x2D6 */ s16 unk_2D6;
/* 0x2D8 */ UNK_TYPE1 unk2D8[4];
/* 0x2DC */ s32 unk_2DC;
/* 0x2E0 */ u8 unk_2E0;
/* 0x2E4 */ Actor* unk_2E4;
/* 0x2E8 */ ColliderCylinder collider;
} EnBomjimb; // size = 0x334
extern const ActorInit En_Bomjimb_InitVars;
tools/disasm/functions.txt
+1 -1
View File
@@ -16515,7 +16515,7 @@
0x80C02CA4:("func_80C02CA4",),
0x80C02DAC:("func_80C02DAC",),
0x80C02DC4:("EnBomjimb_Update",),
0x80C02FA8:("func_80C02FA8",),
0x80C02FA8:("EnBomjimb_OverrideLimbDraw",),
0x80C03034:("EnBomjimb_Draw",),
0x80C03530:("EnBombers_Init",),
0x80C037F8:("EnBombers_Destroy",),
undefined_syms.txt
-5
View File
@@ -1742,11 +1742,6 @@ D_06000530 = 0x06000530;
D_060064B8 = 0x060064B8;
D_0600F82C = 0x0600F82C;
// ovl_En_Bomjimb
D_060064B8 = 0x060064B8;
D_0600F82C = 0x0600F82C;
// ovl_En_Bom_Bowl_Man
D_060064B8 = 0x060064B8;