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

5 nonmatchings

Browse Source
This commit is contained in:
petrie911
2021-10-05 00:40:57 -05:00
parent 19177cb8c9
commit 080366a84b
8 changed files with 2955 additions and 1255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+2 -2
View File
@@ -653,7 +653,7 @@ void EffectSsSibuki_SpawnBurst(GlobalContext* globalCtx, Vec3f* pos);
void EffectSsHitMark_SpawnFixedScale(GlobalContext* globalCtx, s32 type, Vec3f* pos);
// void EffectSsHitMark_SpawnCustomScale(void);
// void EffectSsFhgFlash_SpawnShock(UNK_TYPE4 uParm1, UNK_TYPE4 uParm2, Vec3f* pzParm3, UNK_TYPE2 uParm4, UNK_TYPE1 param_5);
// void EffectSsKFire_Spawn(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE2 param_5, UNK_TYPE1 param_6);
void EffectSsKFire_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scaleMax, u8 type);
void EffectSsSolderSrchBall_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 unused,
s16* linkDetected, s16 drawFlag);
void EffectSsKakera_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* arg3, s16 gravity, s16 arg5,
@@ -3858,7 +3858,7 @@ void func_8019F540(u8 arg0);
void func_8019F88C(Vec3f* arg0, u16 sfxId, UNK_TYPE arg2);
// void func_8019F900(void);
// void func_8019FA18(void);
void func_8019FAD8(Vec3f* param_1, u16 param_2, f32 param_3);
void func_8019FAD8(Vec3f* param_1, u16 sfxId, f32 param_3);
// void func_8019FB0C(void);
// void func_8019FC20(void);
// void func_8019FCB8(void);
include/z64.h
+1 -16
View File
@@ -1518,21 +1518,6 @@ 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;
@@ -1597,7 +1582,7 @@ struct GlobalContext {
/* 0x18864 */ Path* setupPathList;
/* 0x18868 */ void* unk_18868;
/* 0x1886C */ AnimatedMaterial* sceneMaterialAnims;
/* 0x18870 */ Boss07Effect* specialEffects;
/* 0x18870 */ void* specialEffects;
/* 0x18874 */ u8 skyboxId;
/* 0x18875 */ s8 sceneLoadFlag; // "fade_direction"
/* 0x18876 */ s16 unk_18876;
spec
-2
View File
@@ -2604,8 +2604,6 @@ beginseg
name "ovl_Boss_07"
compress
include "build/src/overlays/actors/ovl_Boss_07/z_boss_07.o"
include "build/data/ovl_Boss_07/ovl_Boss_07.data.o"
include "build/data/ovl_Boss_07/ovl_Boss_07.bss.o"
include "build/data/ovl_Boss_07/ovl_Boss_07.reloc.o"
endseg
src/boot_O2_g3/idle.c
+1
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "prevent_bss_reordering.h"
u8 D_80096B20 = 1;
vu8 gViConfigUseDefault = 1;
src/overlays/actors/ovl_Boss_07/z_boss_07.c
+2876 -1142
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Boss_07/z_boss_07.h
+36 -52
View File
@@ -8,23 +8,23 @@ 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];
Vec3f base;
Vec3f pos[10];
Vec3f rot[10];
Vec3f pull[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];
f32 unk_72C[50];
Vec3s baseRot;
f32 gravity;
f32 stiffness;
f32 drag;
f32 tension;
Vec3f basePos;
Vec3f pos[50];
Vec3f rot[50];
Vec3f pull[50];
f32 unk_72C[50]; // unused, probably a stretch factor
} Boss07Whip; // size = 0x7F4
typedef struct Boss07 {
@@ -54,14 +54,14 @@ typedef struct Boss07 {
/* 0x0184 */ f32 unk_184;
/* 0x0188 */ f32 unk_188;
/* 0x018C */ f32 unk_18C;
/* 0x0190 */ SkelAnime skelAnime1;
/* 0x0190 */ SkelAnime skelAnime;
/* 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];
/* 0x0334 */ Vec3f bodyPartsPos[15];
/* 0x03E8 */ ColliderJntSph sph1;
/* 0x0408 */ ColliderJntSphElement sphElems1[11];
/* 0x06C8 */ ColliderJntSph sph2;
@@ -69,39 +69,21 @@ typedef struct Boss07 {
/* 0x0728 */ ColliderCylinder cyl1;
/* 0x0774 */ u8 unk_774;
/* 0x0778 */ s32 unk_778;
/* 0x077C */ f32 unk_77C;
/* 0x077C */ f32 whipScale;
/* 0x0780 */ s32 unk_780;
/* 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];
/* 0x0788 */ Boss07Whip rightWhip;
/* 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];
/* 0x0F94 */ Boss07Whip leftWhip;
/* 0x1788 */ Vec3f unk_1788[2];
/* 0x17A0 */ Vec3f unk_17A0;
/* 0x17AC */ Vec3f unk_17AC;
/* 0x17B8 */ f32 unk_17B8[4];
/* 0x17C8 */ char unk17C8[0x10];
/* 0x17C8 */ f32 unk_17C8[4];
/* 0x17D8 */ s16 unk_17D8;
/* 0x17DA */ s16 unk_17DA;
/* 0x17DA */ s16 unk_17DC;
@@ -144,32 +126,34 @@ typedef struct Boss07 {
/* 0x18D4 */ s16 unk_18D4;
/* 0x18D6 */ s16 unk_18D6;
/* 0x18D8 */ s16 unk_18D8;
/* 0x18DA */ u8 unk_18DA;
/* 0x18DB */ u8 unk_18DB;
/* 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];
/* 0x19F0 */ Boss07Tentacle tentacles[25];
/* 0x3E44 */ char unk3E44[0x6CFC]; // size suggests 100 element tentacle array
/* 0xAB40 */ s16 unk_AB40;
/* 0xAB44 */ f32 unk_AB44;
/* 0xAB48 */ u8 unk_AB48;
/* 0xAB4C */ f32 unk_AB4C;
/* 0xAB50 */ f32 unk_AB50[30];
/* 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 */ f32 unk_AC04;
/* 0xAC08 */ f32 unk_AC08;
/* 0xAC0C */ f32 unk_AC0C;
/* 0xAC10 */ char unkAC10[4];
/* 0xAC14 */ f32 unk_AC14;
/* 0xAC18 */ char unkAC18[8];
/* 0xABD0 */ s16 csState;
/* 0xABD2 */ s16 csCamIndex;
/* 0xABD4 */ Vec3f csCamEye;
/* 0xABE0 */ Vec3f csCamAt;
/* 0xABEC */ Vec3f csCamNextEye;
/* 0xABF8 */ Vec3f csCamNextAt;
/* 0xAC04 */ f32 csCamRotY;
/* 0xAC08 */ f32 csCamRotVel;
/* 0xAC0C */ f32 csCamSpeedMod;
/* 0xAC10 */ Vec3f csCamEyeMod;
/* 0xAC1C */ char unkAC1C[4];
} Boss07; // size = 0xAC20
extern const ActorInit Boss_07_InitVars;
tools/disasm/variables.txt
+36 -41
View File
@@ -10714,39 +10714,37 @@
0x809F4974:("D_809F4974","UNK_TYPE4","",0x4),
0x809F4978:("D_809F4978","UNK_TYPE4","",0x4),
0x809F497C:("D_809F497C","UNK_TYPE4","",0x4),
0x80A07950:("D_80A07950","UNK_TYPE2","",0x2),
0x80A07952:("D_80A07952","UNK_TYPE2","",0x2),
0x80A07954:("D_80A07954","UNK_TYPE2","",0x2),
0x80A07950:("D_80A07950","UNK_TYPE2","[12]",0x2),
0x80A07968:("D_80A07968","UNK_TYPE1","",0x1),
0x80A07980:("D_80A07980","UNK_TYPE1","",0x1),
0x80A079A0:("D_80A079A0","UNK_TYPE1","",0x1),
0x80A079C0:("D_80A079C0","UNK_TYPE1","",0x1),
0x80A079E0:("D_80A079E0","UNK_TYPE1","",0x1),
0x80A07A00:("D_80A07A00","UNK_TYPE1","",0x1),
0x80A07980:("sMaskDmgTable","UNK_TYPE1","",0x1),
0x80A079A0:("sIncarnationDmgTable","UNK_TYPE1","",0x1),
0x80A079C0:("sWrathDmgTable","UNK_TYPE1","",0x1),
0x80A079E0:("sRemainsDmgTable","UNK_TYPE1","",0x1),
0x80A07A00:("sTopDmgTable","UNK_TYPE1","",0x1),
0x80A07A20:("Boss_07_InitVars","UNK_TYPE1","",0x1),
0x80A07A40:("D_80A07A40","UNK_TYPE1","",0x1),
0x80A07A8C:("D_80A07A8C","UNK_TYPE2","",0x2),
0x80A07A90:("D_80A07A90","UNK_TYPE2","",0x2),
0x80A07BCC:("D_80A07BCC","UNK_TYPE1","",0x1),
0x80A07BDC:("D_80A07BDC","UNK_TYPE1","",0x1),
0x80A07BCC:("sWrathJntSphInit1","UNK_TYPE1","",0x1),
0x80A07BDC:("sWrathCylInit","UNK_TYPE1","",0x1),
0x80A07C08:("D_80A07C08","UNK_TYPE1","",0x1),
0x80A07C2C:("D_80A07C2C","UNK_TYPE1","",0x1),
0x80A07C3C:("D_80A07C3C","UNK_TYPE1","",0x1),
0x80A07C8C:("D_80A07C8C","UNK_TYPE1","",0x1),
0x80A07C2C:("sWrathJntSphInit2","UNK_TYPE1","",0x1),
0x80A07C3C:("sMaskQuadInit1","UNK_TYPE1","",0x1),
0x80A07C8C:("sMaskQuadInit2","UNK_TYPE1","",0x1),
0x80A07CDC:("D_80A07CDC","UNK_TYPE1","",0x1),
0x80A07E68:("D_80A07E68","UNK_TYPE1","",0x1),
0x80A07E78:("D_80A07E78","UNK_TYPE1","",0x1),
0x80A07EA4:("D_80A07EA4","UNK_TYPE1","",0x1),
0x80A07ED0:("D_80A07ED0","UNK_TYPE1","",0x1),
0x80A07EFC:("D_80A07EFC","UNK_TYPE1","",0x1),
0x80A07F00:("D_80A07F00","UNK_TYPE1","",0x1),
0x80A07F04:("D_80A07F04","UNK_TYPE1","",0x1),
0x80A07F08:("D_80A07F08","UNK_TYPE1","",0x1),
0x80A07F0C:("D_80A07F0C","UNK_TYPE1","",0x1),
0x80A07F3C:("D_80A07F3C","UNK_TYPE1","",0x1),
0x80A07F54:("D_80A07F54","UNK_TYPE2","",0x2),
0x80A07F5C:("D_80A07F5C","EffTireMarkInit","",0x8),
0x80A07F64:("D_80A07F64","EffTireMarkInit","",0x8),
0x80A07E68:("sIncarnationJntSphInit1","UNK_TYPE1","",0x1),
0x80A07E78:("sShotCylInit","UNK_TYPE1","",0x1),
0x80A07EA4:("sRemainsCylInit","UNK_TYPE1","",0x1),
0x80A07ED0:("sTopCylInit","UNK_TYPE1","",0x1),
0x80A07EFC:("sDarkOrange1","UNK_TYPE1","",0x1),
0x80A07F00:("sDarkRed1","UNK_TYPE1","",0x1),
0x80A07F04:("sDarkOrange2","UNK_TYPE1","",0x1),
0x80A07F08:("sDarkRed2","UNK_TYPE1","",0x1),
0x80A07F0C:("sRemainsStart","UNK_TYPE1","",0x1),
0x80A07F3C:("sRemainsEnd","UNK_TYPE1","",0x1),
0x80A07F54:("sRemainsParams","UNK_TYPE2","",0x2),
0x80A07F5C:("sTopTireMarkInit","EffTireMarkInit","",0x8),
0x80A07F64:("sMaskTireMarkInit","EffTireMarkInit","",0x8),
0x80A07F6C:("D_80A07F6C","UNK_TYPE4","",0x4),
0x80A07FA8:("D_80A07FA8","UNK_TYPE4","",0x4),
0x80A07FB4:("D_80A07FB4","UNK_TYPE4","",0x4),
@@ -10962,22 +10960,19 @@
0x80A08794:("D_80A08794","f32","",0x4),
0x80A08798:("D_80A08798","f32","",0x4),
0x80A09740:("D_80A09740","UNK_TYPE1","",0x1),
0x80A09A40:("D_80A09A40","UNK_TYPE1","",0x1),
0x80A09A4C:("D_80A09A4C","UNK_TYPE1","",0x1),
0x80A09A50:("D_80A09A50","UNK_TYPE4","",0x4),
0x80A09A54:("D_80A09A54","UNK_TYPE4","",0x4),
0x80A09A58:("D_80A09A58","UNK_TYPE4","",0x4),
0x80A09A5C:("D_80A09A5C","UNK_TYPE4","",0x4),
0x80A09A60:("D_80A09A60","UNK_TYPE4","",0x4),
0x80A09A64:("D_80A09A64","UNK_TYPE4","",0x4),
0x80A09A68:("D_80A09A68","UNK_TYPE4","",0x4),
0x80A09A6C:("D_80A09A6C","UNK_TYPE4","",0x4),
0x80A09A40:("sSfxPoint","UNK_TYPE1","",0x1),
0x80A09A4C:("sHeartbeatTimer","UNK_TYPE1","",0x1),
0x80A09A50:("sWhipSegCount","UNK_TYPE4","",0x4),
0x80A09A54:("sMajorasWrath","UNK_TYPE4","",0x4),
0x80A09A58:("sMajoraStatic","UNK_TYPE4","",0x4),
0x80A09A5C:("sMajorasMask","UNK_TYPE4","",0x4),
0x80A09A60:("sBossRemains","UNK_TYPE4","[4]",0x4),
0x80A09A70:("D_80A09A70","UNK_TYPE1","",0x1),
0x80A09A71:("D_80A09A71","UNK_TYPE1","",0x1),
0x80A09A78:("D_80A09A78","UNK_TYPE1","",0x1),
0x80A0A888:("D_80A0A888","UNK_TYPE4","",0x4),
0x80A0A88C:("D_80A0A88C","UNK_TYPE4","",0x4),
0x80A0A890:("D_80A0A890","UNK_TYPE4","",0x4),
0x80A09A71:("sMusicStartTimer","UNK_TYPE1","",0x1),
0x80A09A78:("sEffects","UNK_TYPE1","",0x1),
0x80A0A888:("sSeed0","UNK_TYPE4","",0x4),
0x80A0A88C:("sSeed1","UNK_TYPE4","",0x4),
0x80A0A890:("sSeed2","UNK_TYPE4","",0x4),
0x80A0C4A0:("Bg_Dy_Yoseizo_InitVars","UNK_TYPE1","",0x1),
0x80A0C4C0:("D_80A0C4C0","UNK_TYPE4","",0x4),
0x80A0C4C4:("D_80A0C4C4","UNK_TYPE4","",0x4),
undefined_syms.txt
+3
View File
@@ -1080,6 +1080,8 @@ D_06009EA8 = 0x06009EA8;
D_0600A194 = 0x0600A194;
D_0600A400 = 0x0600A400;
D_0600A6AC = 0x0600A6AC;
D_0600AB04 = 0x0600AB04;
D_0600AD84 = 0x0600AD84;
D_0600AE40 = 0x0600AE40;
D_0600AFB0 = 0x0600AFB0;
D_0600B020 = 0x0600B020;
@@ -1132,6 +1134,7 @@ D_06040B30 = 0x06040B30;
D_06041B30 = 0x06041B30;
D_06042330 = 0x06042330;
D_06043330 = 0x06043330;
D_06045B30 = 0x06045B30;
// ovl_Boss_Hakugin