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

more matches

Browse Source
This commit is contained in:
petrie911
2021-09-27 20:58:01 -05:00
parent 01a6dea813
commit 62ddc37c0e
7 changed files with 2824 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+7 -7
View File
@@ -547,8 +547,8 @@ void func_800AE5A0(GlobalContext* globalCtx);
// void func_800AE5E4(void);
void func_800AE778(GlobalContext* globalCtx, Color_RGBA8* color, s16 param_3, s16 param_4);
void func_800AE8EC(GlobalContext* globalCtx);
void func_800AE930(CollisionContext* colCtx, s32 param_2, float* param_3, f32 param_4, s16 param_5, CollisionPoly* param_6, s32 param_7);
// void func_800AEF44(void);
void func_800AE930(CollisionContext* colCtx, s32 param_2, Vec3f* param_3, f32 param_4, s16 param_5, CollisionPoly* param_6, s32 param_7);
void func_800AEF44(EffTireMarkParams* arg0);
void EffectTireMark_InitParticle(EffTireMarkParticle* particle);
void EffectTireMark_Init(EffTireMarkParams* params, EffTireMarkInit* init);
void EffectTireMark_Destroy(EffTireMarkParams* params);
@@ -729,7 +729,7 @@ void Actor_TitleCardDraw(GlobalContext* globalCtx, TitleCardContext* titleCardCt
void func_800B6468(GlobalContext* globalCtx);
void func_800B6474(GlobalContext* globalCtx);
// UNK_TYPE4 func_800B648C(GlobalContext* globalCtx, UNK_TYPE1 param_2, UNK_TYPE1 param_3, f32 param_4, Vec3f* param_5);
f32 func_800B64FC(GlobalContext* globalCtx, f32 fParm2, Vec3f* pzParm3, u32* puParm4);
f32 func_800B64FC(GlobalContext* globalCtx, f32 fParm2, Vec3f* pzParm3, s32* puParm4);
void* func_800B6584(GlobalContext* globalCtx, s16 sParm2, void* pvParm3, u32 uParm4);
// UNK_TYPE4 func_800B6608(s32 iParm1, s16 sParm2);
// void func_800B6680(void);
@@ -2243,7 +2243,7 @@ void func_80123E90(GlobalContext* globalCtx, Actor* actor);
// void func_80124020(void);
u8 Player_GetMask(GlobalContext* globalCtx);
void Player_RemoveMask(GlobalContext* globalCtx);
// void func_8012405C(void);
s32 func_8012405C(GlobalContext* globalCtx); // Player_HoldsMirrorShield
// void func_80124088(void);
s32 func_801240C8(Player* player);
// void func_801240DC(void);
@@ -3000,8 +3000,8 @@ void func_80165438(UNK_PTR param_1);
// void func_80165608(void);
// void func_80165630(void);
// void func_80165658(void);
// void func_8016566C(void);
// void func_80165690(void);
void func_8016566C(s16);
void func_80165690(void);
// void func_801656A4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8);
// void func_80165DCC(void);
// void func_80165DF0(void);
@@ -3992,7 +3992,7 @@ UNK_TYPE func_801A51F0(UNK_TYPE arg0);
void func_801A5BD0(s32 param_1);
// void func_801A5C28(void);
// void func_801A5C8C(void);
// void func_801A5CFC(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
void func_801A5CFC(u16 arg0, Vec3f* arg1, s32 arg2, f32* arg3, f32* arg4, s8* arg5);
// void func_801A5DDC(void);
// void func_801A5F7C(void);
// void func_801A6430(void);
include/variables.h
+9 -10
View File
@@ -1876,8 +1876,8 @@ extern UNK_PTR D_801DB478[7];
// extern UNK_TYPE1 D_801DB49C;
// extern UNK_TYPE2 D_801DB4A0;
extern UNK_TYPE D_801DB4A4;
// extern UNK_TYPE1 D_801DB4B0;
// extern UNK_TYPE1 D_801DB4B8;
extern f32 D_801DB4B0;
extern s8 D_801DB4B8;
// extern UNK_TYPE1 D_801DB4C0;
// extern UNK_TYPE1 D_801DB4C4;
// extern UNK_TYPE1 D_801DB4C8;
@@ -3294,13 +3294,11 @@ extern u8 actorCutsceneNextCutscenes[16];
// extern UNK_TYPE1 D_801F4E20;
// extern UNK_TYPE1 D_801F4E30;
// extern UNK_TYPE1 D_801F4E31;
// extern UNK_TYPE1 D_801F4E32;
// extern UNK_TYPE1 D_801F4E38;
// extern UNK_TYPE1 D_801F4E3C;
// extern UNK_TYPE1 D_801F4E40;
// extern UNK_TYPE1 D_801F4E44;
// extern UNK_TYPE1 D_801F4E48;
// extern UNK_TYPE1 D_801F4E4C;
extern s8 D_801F4E32;
extern Vec3f D_801F4E38;
extern f32 D_801F4E44;
extern f32 D_801F4E48;
extern s16 D_801F4E4C;
// extern UNK_TYPE1 D_801F4E4E;
// extern UNK_TYPE1 D_801F4E50;
// extern UNK_TYPE1 D_801F4E54;
@@ -3974,7 +3972,8 @@ extern UNK_TYPE D_04023100;
extern UNK_TYPE D_04023130;
extern Gfx D_04023210[];
extern UNK_TYPE D_04023288;
extern UNK_TYPE D_04023348;
extern Gfx D_04023348[];
extern Gfx D_04023428[];
extern UNK_TYPE D_04025850;
extern UNK_TYPE D_04025DD0;
extern UNK_TYPE D_040281DC;
include/z64.h
+16 -1
View File
@@ -1517,6 +1517,21 @@ typedef struct {
/* 0x00 */ u16 state;
} GameOverContext; // size = 0x02
typedef struct {
/* 0x00 */ u8 unk_0;
/* 0x02 */ s16 unk_2;
/* 0x04 */ Vec3f unk_4;
/* 0x10 */ Vec3f unk_10;
/* 0x1C */ Vec3f unk_1C;
/* 0x28 */ char unk28[4];
/* 0x2C */ s16 unk_2C;
/* 0x2E */ char unk2E[2];
/* 0x30 */ s16 unk_30;
/* 0x32 */ char unk32[2];
/* 0x34 */ f32 unk_34;
/* 0x38 */ char unk38[0x10];
} Boss07Effect;
struct GlobalContext {
/* 0x00000 */ GameState state;
/* 0x000A4 */ s16 sceneNum;
@@ -1581,7 +1596,7 @@ struct GlobalContext {
/* 0x18864 */ Path* setupPathList;
/* 0x18868 */ void* unk_18868;
/* 0x1886C */ AnimatedMaterial* sceneMaterialAnims;
/* 0x18870 */ void* specialEffects;
/* 0x18870 */ Boss07Effect* specialEffects;
/* 0x18874 */ u8 skyboxId;
/* 0x18875 */ s8 sceneLoadFlag; // "fade_direction"
/* 0x18876 */ s16 unk_18876;
src/overlays/actors/ovl_Boss_07/z_boss_07.c
+2618 -93
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Boss_07/z_boss_07.h
+156 -1
View File
@@ -7,10 +7,165 @@ struct Boss07;
typedef void (*Boss07ActionFunc)(struct Boss07*, GlobalContext*);
typedef struct {
Vec3f unk_0;
Vec3f unk_C[10];
Vec3f unk_84[10];
Vec3f unk_FC[10];
} Boss07Tentacle; // size = 0x174
typedef struct {
Vec3s unk_0;
f32 unk_8;
f32 unk_C;
f32 unk_10;
f32 unk_14;
Vec3f unk_18;
Vec3f unk_24[50];
Vec3f unk_27C[50];
Vec3f unk_4D4[50];
char unk_72C[0xC8];
} Boss07Whip; // size = 0x7F4
typedef struct Boss07 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ Boss07ActionFunc actionFunc;
/* 0x0148 */ char unk_144[0xAAD8];
/* 0x0148 */ u8 unk_148;
/* 0x0149 */ u8 unk_149;
/* 0x014A */ u8 unk_14A;
/* 0x014B */ u8 unk_14B;
/* 0x014C */ s16 unk_14C;
/* 0x014E */ u8 unk_14E;
/* 0x014F */ u8 unk_14F;
/* 0x0150 */ s16 timers[3];
/* 0x0156 */ s16 unk_156;
/* 0x0158 */ s16 unk_158;
/* 0x015A */ s16 unk_15A;
/* 0x015C */ s16 unk_15C;
/* 0x015E */ s16 unk_15E;
/* 0x0160 */ s16 unk_160;
/* 0x0162 */ s16 unk_162;
/* 0x0164 */ Vec3f unk_164;
/* 0x0170 */ f32 unk_170;
/* 0x0174 */ u8 unk_174;
/* 0x0178 */ f32 unk_178;
/* 0x017C */ f32 unk_17C;
/* 0x0180 */ s16 unk_180;
/* 0x0184 */ f32 unk_184;
/* 0x0188 */ f32 unk_188;
/* 0x018C */ f32 unk_18C;
/* 0x0190 */ SkelAnime skelAnime1;
/* 0x01D4 */ f32 unk_1D4;
/* 0x01D8 */ s32 unk_1D8;
/* 0x01DC */ Vec3s jointTable1[28];
/* 0x0284 */ Vec3s morphTable1[28];
/* 0x032C */ f32 unk_32C;
/* 0x0330 */ f32 unk_330;
/* 0x0334 */ Vec3f unk_334[15];
/* 0x03E8 */ ColliderJntSph sph1;
/* 0x0408 */ ColliderJntSphElement sphElems1[11];
/* 0x06C8 */ ColliderJntSph sph2;
/* 0x06E8 */ ColliderJntSphElement sphElems2[1];
/* 0x0728 */ ColliderCylinder cyl1;
/* 0x0774 */ u8 unk_774;
/* 0x0778 */ s32 unk_778;
/* 0x077C */ f32 unk_77C;
/* 0x0780 */ char unk_780[4];
/* 0x0784 */ s32 unk_784;
/* 0x0788 */ Vec3s unk_788;
/* 0x0790 */ f32 unk_790;
/* 0x0794 */ f32 unk_794;
/* 0x0798 */ f32 unk_798;
/* 0x079C */ f32 unk_79C;
/* 0x07A0 */ Vec3f unk_7A0;
/* 0x07A0 */ Vec3f unk_7AC[50];
/* 0x0A04 */ Vec3f unk_A04[50];
/* 0x0C5C */ Vec3f unk_C5C[50];
/* 0x0EB4 */ char unkEB4[0xC8];
/* 0x0F7C */ s16 unk_F7C;
/* 0x0F7E */ s16 unk_F7E;
/* 0x0F80 */ Vec3f unk_F80;
/* 0x0F8C */ f32 unk_F8C;
/* 0x0F90 */ f32 unk_F90;
/* 0x0F94 */ Vec3s unk_F94;
/* 0x0F9C */ f32 unk_F9C;
/* 0x0FA0 */ f32 unk_FA0;
/* 0x0FA4 */ f32 unk_FA4;
/* 0x0FA8 */ f32 unk_FA8;
/* 0x0FAC */ Vec3f unk_FAC;
/* 0x0FB8 */ Vec3f unk_FB8[50];
/* 0x1210 */ Vec3f unk_1210[50];
/* 0x1468 */ Vec3f unk_1468[50];
/* 0x16C0 */ char unk16C0[0xC8];
/* 0x1788 */ Vec3f unk_1788[2];
/* 0x17A0 */ Vec3f unk_17A0;
/* 0x17AC */ Vec3f unk_17AC;
/* 0x17B8 */ f32 unk_17B8[4];
/* 0x17C8 */ char unk17C8[0x10];
/* 0x17D8 */ s16 unk_17D8;
/* 0x17DA */ s16 unk_17DA;
/* 0x17DA */ char unk17DC[4];
/* 0x17E0 */ f32 unk_17E0;
/* 0x17E4 */ f32 unk_17E4;
/* 0x17E8 */ f32 unk_17E8;
/* 0x17E8 */ f32 unk_17EC;
/* 0x17F0 */ f32 unk_17F0;
/* 0x17F4 */ f32 unk_17F4;
/* 0x17F8 */ f32 unk_17F8;
/* 0x17FC */ f32 unk_17FC;
/* 0x1800 */ f32 unk_1800;
/* 0x1804 */ u8 unk_1804;
/* 0x1805 */ u8 unk_1805;
/* 0x1806 */ s16 unk_1806;
/* 0x1808 */ u8 unk_1808;
/* 0x180c */ f32 unk_180C;
/* 0x1810 */ Vec3f unk_1810;
/* 0x181C */ s16 unk_181C;
/* 0x1820 */ ColliderCylinder cyl2;
/* 0x186C */ s16 unk_186C;
/* 0x1870 */ f32 unk_1870;
/* 0x1874 */ u8 unk_1874;
/* 0x1878 */ Vec3f unk_1878;
/* 0x1884 */ s32 unk_1884;
/* 0x1888 */ u8 unk_1888;
/* 0x188C */ f32 unk_188C;
/* 0x1890 */ f32 unk_1890;
/* 0x1894 */ f32 unk_1894;
/* 0x1898 */ f32 unk_1898;
/* 0x189C */ Vec3f unk_189C;
/* 0x18A8 */ Vec3f unk_18A8;
/* 0x18B4 */ Vec3f unk_18B4;
/* 0x18C0 */ f32 unk_18C0;
/* 0x18C4 */ s16 unk_18C4;
/* 0x18C6 */ s16 unk_18C6;
/* 0x18C8 */ s16 unk_18C8;
/* 0x18CC */ f32 unk_18CC;
/* 0x18D0 */ f32 unk_18D0;
/* 0x18D4 */ s16 unk_18D4;
/* 0x18D6 */ s16 unk_18D6;
/* 0x18D8 */ s16 unk_18D8;
/* 0x18DC */ s32 effectIndex;
/* 0x18E0 */ Vec3f unk_18E0;
/* 0x18EC */ u8 unk_18EC;
/* 0x18ED */ u8 unk_18ED;
/* 0x18F0 */ ColliderQuad quad1;
/* 0x1970 */ ColliderQuad quad2;
/* 0x19F0 */ Boss07Tentacle unk_19F0[25];
/* 0x3E44 */ char unk3E44[0x6D00];
/* 0xAB44 */ f32 unk_AB44;
/* 0xAB48 */ u8 unk_AB48;
/* 0xAB48 */ char unkAB49[0x7F];
/* 0xABC8 */ u32 unk_ABC8;
/* 0xABCC */ s32 unk_ABCC;
/* 0xABD0 */ s16 unk_ABD0;
/* 0xABD2 */ s16 unk_ABD2;
/* 0xABD4 */ Vec3f unk_ABD4;
/* 0xABE0 */ Vec3f unk_ABE0;
/* 0xABEC */ Vec3f unk_ABEC;
/* 0xABF8 */ Vec3f unk_ABF8;
/* 0xAC04 */ char unkAC04[8];
/* 0xAC0C */ f32 unk_AC0C;
/* 0xAC10 */ char unkAC10[0x10];
} Boss07; // size = 0xAC20
extern const ActorInit Boss_07_InitVars;
src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
+2 -1
View File
@@ -10,7 +10,8 @@ typedef void (*ObjTsuboActionFunc)(struct ObjTsubo*, GlobalContext*);
typedef struct ObjTsubo {
/* 0x0000 */ Actor actor;
/* 0x0144 */ ObjTsuboActionFunc actionFunc;
/* 0x0148 */ char unk_144[0x54];
/* 0x0148 */ char unk_144[0x53];
/* 0x019B */ u8 unk19B;
} ObjTsubo; // size = 0x19C
extern const ActorInit Obj_Tsubo_InitVars;
tools/disasm/functions.txt
+16 -16
View File
@@ -9488,7 +9488,7 @@
0x809F99C4:("func_809F99C4",),
0x809F9CEC:("func_809F9CEC",),
0x809F9E94:("func_809F9E94",),
0x809FA1B4:("Boss07_Update",),
0x809FA1B4:("Boss07_Wrath_Update",),
0x809FAA44:("func_809FAA44",),
0x809FB114:("func_809FB114",),
0x809FB504:("func_809FB504",),
@@ -9497,7 +9497,7 @@
0x809FB7D4:("func_809FB7D4",),
0x809FBB9C:("func_809FBB9C",),
0x809FBF94:("func_809FBF94",),
0x809FC1C8:("Boss07_Draw",),
0x809FC1C8:("Boss07_Wrath_Draw",),
0x809FC4C0:("func_809FC4C0",),
0x809FC8B0:("func_809FC8B0",),
0x809FC960:("func_809FC960",),
@@ -9523,13 +9523,13 @@
0x809FE6B0:("func_809FE6B0",),
0x809FE734:("func_809FE734",),
0x809FEE70:("func_809FEE70",),
0x809FF0E4:("func_809FF0E4",),
0x809FF12C:("func_809FF12C",),
0x809FF5CC:("func_809FF5CC",),
0x809FF0E4:("Boss07_Afterimage_Update",),
0x809FF12C:("Boss07_Incarnation_Update",),
0x809FF5CC:("Boss07_Afterimage_Draw",),
0x809FF678:("func_809FF678",),
0x809FF6B0:("func_809FF6B0",),
0x809FF810:("func_809FF810",),
0x809FF900:("func_809FF900",),
0x809FF900:("Boss07_Incarnation_Draw",),
0x809FFA04:("func_809FFA04",),
0x809FFA80:("func_809FFA80",),
0x809FFE64:("func_809FFE64",),
@@ -9546,14 +9546,14 @@
0x80A025AC:("func_80A025AC",),
0x80A0264C:("func_80A0264C",),
0x80A02B30:("func_80A02B30",),
0x80A02C54:("func_80A02C54",),
0x80A02C54:("Boss07_Mask_Update",),
0x80A03238:("func_80A03238",),
0x80A036C4:("func_80A036C4",),
0x80A03868:("func_80A03868",),
0x80A03F18:("func_80A03F18",),
0x80A03F5C:("func_80A03F5C",),
0x80A0434C:("func_80A0434C",),
0x80A045A8:("func_80A045A8",),
0x80A03F5C:("Boss07_Mask_Draw",),
0x80A0434C:("Boss07_Projectile_Update",),
0x80A045A8:("Boss07_Projectile_Draw",),
0x80A04768:("func_80A04768",),
0x80A04878:("func_80A04878",),
0x80A04890:("func_80A04890",),
@@ -9561,18 +9561,18 @@
0x80A04E5C:("func_80A04E5C",),
0x80A055E0:("func_80A055E0",),
0x80A05608:("func_80A05608",),
0x80A05694:("func_80A05694",),
0x80A057A0:("func_80A057A0",),
0x80A05694:("Boss07_Remains_Update",),
0x80A057A0:("Boss07_Remains_Draw",),
0x80A05AF8:("func_80A05AF8",),
0x80A05B50:("func_80A05B50",),
0x80A05C88:("func_80A05C88",),
0x80A05DDC:("func_80A05DDC",),
0x80A06500:("func_80A06500",),
0x80A06990:("func_80A06990",),
0x80A06C64:("func_80A06C64",),
0x80A06E24:("func_80A06E24",),
0x80A06F48:("func_80A06F48",),
0x80A07604:("func_80A07604",),
0x80A06C64:("Boss07_Top_Update",),
0x80A06E24:("Boss07_Top_Draw",),
0x80A06F48:("Boss07_Effects_Update",),
0x80A07604:("Boss07_Effects_Draw",),
0x80A07638:("func_80A07638",),
0x80A07740:("func_80A07740",),
0x80A0A8A0:("BgDyYoseizo_Init",),