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_Zoraegg (#630)

Browse Source 
* En_Zoraegg

* Revert bgCheckFlags

* roomInf

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
This commit is contained in:
Maide
2022-02-19 21:36:16 +00:00
committed by GitHub
co-authored by Anghelo Carvajal
parent fed9dc991d
commit 3f15c0017a
7 changed files with 870 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_zoraegg.xml
+3 -2
View File
@@ -11,10 +11,11 @@
<Texture Name="object_zoraegg_TLUT_002DF0" OutName="tlut_002DF0" Format="rgba16" Width="16" Height="16" Offset="0x2DF0" />
<Texture Name="object_zoraegg_Tex_002FF0" OutName="tex_002FF0" Format="ci8" Width="32" Height="32" Offset="0x2FF0" />
<Texture Name="object_zoraegg_Tex_0033F0" OutName="tex_0033F0" Format="ci8" Width="8" Height="8" Offset="0x33F0" />
<!-- <Blob Name="object_zoraegg_Blob_003430" Size="0x400" Offset="0x3430" /> -->
<Texture Name="object_zoraegg_Tex_003430" OutName="tex_003430" Format="ci8" Width="32" Height="32" Offset="0x3430" />
<Texture Name="object_zoraegg_Tex_003830" OutName="tex_003830" Format="ci8" Width="32" Height="64" Offset="0x3830" />
<Texture Name="object_zoraegg_Tex_004030" OutName="tex_004030" Format="ci8" Width="32" Height="32" Offset="0x4030" />
<!-- <Blob Name="object_zoraegg_Blob_004430" Size="0x800" Offset="0x4430" /> -->
<Texture Name="object_zoraegg_Tex_004430" OutName="tex_004430" Format="ci8" Width="32" Height="32" Offset="0x4430" />
<Texture Name="object_zoraegg_Tex_004830" OutName="tex_004830" Format="ci8" Width="32" Height="32" Offset="0x4830" />
<Limb Name="object_zoraegg_Standardlimb_004C30" Type="Standard" Offset="0x4C30" />
<Limb Name="object_zoraegg_Standardlimb_004C3C" Type="Standard" Offset="0x4C3C" />
<Limb Name="object_zoraegg_Standardlimb_004C48" Type="Standard" Offset="0x4C48" />
include/functions.h
+1 -1
View File
@@ -2023,7 +2023,7 @@ void func_801229A0(GlobalContext* globalCtx, Player* player);
void func_80122F28(Player* player, GlobalContext* globalCtx, Actor* actor);
s32 func_80122F9C(GlobalContext* globalCtx);
s32 func_80122FCC(GlobalContext* globalCtx);
// void func_8012300C(void);
void func_8012300C(GlobalContext* globalCtx, s32 arg1);
void func_8012301C(s32 iParm1, GlobalContext* globalCtx);
void func_80123140(GlobalContext* globalCtx, Player* param_2);
u32 func_80123358(GlobalContext* globalCtx, Player* player);
spec
+1 -2
View File
@@ -4015,8 +4015,7 @@ beginseg
name "ovl_En_Zoraegg"
compress
include "build/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.o"
include "build/data/ovl_En_Zoraegg/ovl_En_Zoraegg.data.o"
include "build/data/ovl_En_Zoraegg/ovl_En_Zoraegg.reloc.o"
include "build/src/overlays/actors/ovl_En_Zoraegg/ovl_En_Zoraegg_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c
+816 -46
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h
+47 -1
View File
@@ -7,9 +7,55 @@ struct EnZoraegg;
typedef void (*EnZoraeggActionFunc)(struct EnZoraegg*, GlobalContext*);
#define ENZORAEGG_GET_1F(thisx) ((thisx)->params & 0x1F)
#define ENZORAEGG_GET_FE00(thisx) (((thisx)->params & 0xFE00) >> 9)
enum {
/* 0 */ ENZORAEGG_1F_0,
/* 1 */ ENZORAEGG_1F_1,
/* 2 */ ENZORAEGG_1F_2,
/* 3 */ ENZORAEGG_1F_3,
/* 4 */ ENZORAEGG_1F_4,
/* 5 */ ENZORAEGG_1F_5,
/* 6 */ ENZORAEGG_1F_6,
/* 7 */ ENZORAEGG_1F_7,
/* 8 */ ENZORAEGG_1F_8,
/* 9 */ ENZORAEGG_1F_9,
/* 10 */ ENZORAEGG_1F_10,
/* 11 */ ENZORAEGG_1F_11,
/* 12 */ ENZORAEGG_1F_12,
/* 13 */ ENZORAEGG_1F_13,
/* 14 */ ENZORAEGG_1F_14,
/* 15 */ ENZORAEGG_1F_15,
/* 16 */ ENZORAEGG_1F_16,
/* 17 */ ENZORAEGG_1F_17,
/* 18 */ ENZORAEGG_1F_18,
/* 19 */ ENZORAEGG_1F_19,
/* 20 */ ENZORAEGG_1F_20,
/* 21 */ ENZORAEGG_1F_21,
/* 22 */ ENZORAEGG_1F_22,
/* 23 */ ENZORAEGG_1F_23,
/* 24 */ ENZORAEGG_1F_24,
/* 25 */ ENZORAEGG_1F_25,
};
typedef struct EnZoraegg {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0xB4];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ Vec3s jointTable[7];
/* 0x01B2 */ Vec3s morphTable[7];
/* 0x01DC */ Actor* unk_1DC;
/* 0x01E0 */ f32 unk_1E0;
/* 0x01E4 */ f32 unk_1E4;
/* 0x01E8 */ s16 unk_1E8;
/* 0x01EA */ u16 unk_1EA;
/* 0x01EC */ u8 unk_1EC;
/* 0x01ED */ u8 unk_1ED;
/* 0x01EE */ u8 unk_1EE;
/* 0x01EF */ u8 unk_1EF;
/* 0x01F0 */ u16 unk_1F0;
/* 0x01F2 */ s16 unk_1F2;
/* 0x01F4 */ s16 unk_1F4;
/* 0x01F8 */ EnZoraeggActionFunc actionFunc;
} EnZoraegg; // size = 0x1FC
tools/disasm/functions.txt
+2 -2
View File
@@ -13484,9 +13484,9 @@
0x80B32E74:("EnZoraegg_Update",),
0x80B32F04:("func_80B32F04",),
0x80B331C8:("func_80B331C8",),
0x80B3336C:("func_80B3336C",),
0x80B3336C:("EnZoraegg_OverrideLimbDraw",),
0x80B333DC:("func_80B333DC",),
0x80B33480:("func_80B33480",),
0x80B33480:("EnZoraegg_PostLimbDraw",),
0x80B33818:("func_80B33818",),
0x80B338C0:("EnZoraegg_Draw",),
0x80B33D30:("EnKbt_Init",),
undefined_syms.txt
-11
View File
@@ -1981,17 +1981,6 @@ D_06000D94 = 0x06000D94;
D_06007650 = 0x06007650;
D_0600D658 = 0x0600D658;
// ovl_En_Zoraegg
D_060005D4 = 0x060005D4;
D_06001E08 = 0x06001E08;
D_06004C90 = 0x06004C90;
D_06004D20 = 0x06004D20;
D_06004E04 = 0x06004E04;
D_06004FE4 = 0x06004FE4;
D_06005098 = 0x06005098;
D_06005250 = 0x06005250;
// ovl_Mir_Ray
D_06000168 = 0x06000168;