mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
En_Knight matching
This commit is contained in:
Thar0
+2
-2
@@ -556,7 +556,7 @@ void EffectSsStone1_Spawn(PlayState* play, Vec3f* pos, s32 reg0);
|
||||
void EffectSsHitmark_SpawnFixedScale(PlayState* play, s32 type, Vec3f* pos);
|
||||
void EffectSsHitmark_SpawnCustomScale(PlayState* play, s32 type, s16 scale, Vec3f* pos);
|
||||
// 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(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scaleMax, u8 type);
|
||||
void EffectSsSolderSrchBall_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 unused, s16* linkDetected, s16 drawFlag);
|
||||
void EffectSsKakera_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* arg3, s16 gravity, s16 arg5, s16 arg6, s16 arg7, s16 arg8, s16 scale, s16 arg10, s16 arg11, s32 life, s16 colorIdx, s16 objId, Gfx* dList);
|
||||
// void EffectSsIcePiece_Spawn(UNK_TYPE4 uParm1, Vec3f* pzParm2, UNK_TYPE4 uParm3, Vec3f* pzParm4, Vec3f* param_5, UNK_TYPE4 param_6);
|
||||
@@ -2626,7 +2626,7 @@ void Play_ClearCamera(PlayState* play, s16 camId);
|
||||
Camera* Play_GetCamera(PlayState* play, s16 index);
|
||||
s32 Play_CameraSetAtEye(PlayState* play, s16 camId, Vec3f* at, Vec3f* eye);
|
||||
void Play_CameraSetAtEyeUp(PlayState* play, s16 camId, Vec3f* at, Vec3f* eye, Vec3f* up);
|
||||
void Play_CameraSetFov(PlayState* play, s16 camId, f32 fov);
|
||||
s32 Play_CameraSetFov(PlayState* play, s16 camId, f32 fov);
|
||||
void Play_CameraSetRoll(PlayState* play, s16 camId, s16 roll);
|
||||
void Play_CopyCamera(PlayState* play, s16 dstCamId, s16 srcCamId);
|
||||
// void func_80169A50(void);
|
||||
|
||||
@@ -2284,9 +2284,7 @@ beginseg
|
||||
name "ovl_En_Knight"
|
||||
compress
|
||||
include "build/src/overlays/actors/ovl_En_Knight/z_en_knight.o"
|
||||
include "build/data/ovl_En_Knight/ovl_En_Knight.data.o"
|
||||
include "build/data/ovl_En_Knight/ovl_En_Knight.bss.o"
|
||||
include "build/data/ovl_En_Knight/ovl_En_Knight.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_En_Knight/ovl_En_Knight_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,21 +9,107 @@ typedef void (*EnKnightActionFunc)(struct EnKnight*, PlayState*);
|
||||
|
||||
typedef struct EnKnight {
|
||||
/* 0x000 */ Actor actor;
|
||||
/* 0x144 */ s16 unk_144;
|
||||
/* 0x146 */ char unk_146[0x2];
|
||||
/* 0x148 */ s8 unk_148;
|
||||
/* 0x149 */ char pad149[8];
|
||||
/* 0x151 */ s8 unk_151;
|
||||
/* 0x152 */ char pad152[1];
|
||||
/* 0x144 */ u16 unk_144;
|
||||
/* 0x146 */ s16 unk146;
|
||||
/* 0x148 */ u8 unk148;
|
||||
/* 0x14A */ s16 unk14A[3];
|
||||
/* 0x150 */ char pad150[1];
|
||||
/* 0x151 */ u8 unk_151;
|
||||
/* 0x152 */ u8 unk152;
|
||||
/* 0x153 */ u8 unk_153;
|
||||
/* 0x154 */ u8 unk_154;
|
||||
/* 0x155 */ char pad155[0x2CB];
|
||||
/* 0x155 */ char pad155[1];
|
||||
/* 0x156 */ s16 unk156;
|
||||
/* 0x158 */ s16 unk158;
|
||||
/* 0x15A */ s16 unk15A;
|
||||
/* 0x15C */ s16 unk15C;
|
||||
/* 0x15E */ s16 unk15E;
|
||||
/* 0x160 */ s16 unk160;
|
||||
/* 0x162 */ u8 unk162;
|
||||
/* 0x164 */ Vec3f unk164;
|
||||
/* 0x170 */ s16 unk170;
|
||||
/* 0x172 */ s16 unk172;
|
||||
/* 0x174 */ s16 unk174;
|
||||
/* 0x176 */ s16 unk176;
|
||||
/* 0x178 */ s16 unk178;
|
||||
/* 0x17A */ s16 unk17A;
|
||||
/* 0x17C */ f32 unk17C;
|
||||
/* 0x180 */ f32 unk180;
|
||||
/* 0x184 */ s16 unk184;
|
||||
/* 0x186 */ s16 unk186;
|
||||
/* 0x188 */ s16 unk188;
|
||||
/* 0x18A */ s16 unk18A;
|
||||
/* 0x18C */ s16 unk18C;
|
||||
/* 0x18E */ s16 unk18E;
|
||||
/* 0x190 */ u8 unk190;
|
||||
/* 0x191 */ u8 unk191;
|
||||
/* 0x192 */ u8 unk192;
|
||||
/* 0x193 */ u8 unk193;
|
||||
/* 0x194 */ SkelAnime unk194;
|
||||
/* 0x1D8 */ f32 unk1D8;
|
||||
/* 0x1DC */ Vec3f unk1DC[15];
|
||||
/* 0x290 */ u8 unk290;
|
||||
/* 0x291 */ u8 unk291;
|
||||
/* 0x292 */ u8 unk292;
|
||||
/* 0x294 */ f32 unk294;
|
||||
/* 0x298 */ f32 unk298;
|
||||
/* 0x29C */ f32 unk29C;
|
||||
/* 0x2A0 */ u8 unk2A0;
|
||||
/* 0x2A1 */ u8 unk2A1;
|
||||
/* 0x2A2 */ s16 unk2A2;
|
||||
/* 0x2A4 */ f32 unk2A4;
|
||||
/* 0x2A8 */ f32 unk2A8;
|
||||
/* 0x2AC */ Vec3f unk2AC[2];
|
||||
/* 0x2C4 */ Vec3s unk2C4[29];
|
||||
/* 0x372 */ Vec3s unk372[29];
|
||||
/* 0x420 */ EnKnightActionFunc actionFunc;
|
||||
/* 0x424 */ char unk_424[0x25C];
|
||||
/* 0x424 */ EnKnightActionFunc unk424;
|
||||
/* 0x428 */ s16 unk428;
|
||||
/* 0x42C */ f32 unk42C;
|
||||
/* 0x430 */ f32 unk430;
|
||||
/* 0x434 */ Vec3f unk434;
|
||||
/* 0x440 */ Vec3f unk440;
|
||||
/* 0x44C */ u8 unk44C;
|
||||
/* 0x450 */ f32 unk450;
|
||||
/* 0x454 */ f32 unk454;
|
||||
/* 0x458 */ f32 unk458;
|
||||
/* 0x45C */ f32 unk45C;
|
||||
/* 0x460 */ f32 unk460;
|
||||
/* 0x464 */ f32 unk464;
|
||||
/* 0x468 */ f32 unk468;
|
||||
/* 0x46C */ f32 unk46C;
|
||||
/* 0x470 */ f32 unk470;
|
||||
/* 0x474 */ f32 unk474;
|
||||
/* 0x478 */ s16 unk478;
|
||||
/* 0x47C */ Vec3f unk47C;
|
||||
/* 0x488 */ ColliderCylinder unk488;
|
||||
/* 0x4D4 */ ColliderJntSph unk4D4;
|
||||
/* 0x4F4 */ ColliderJntSphElement unk4F4[1];
|
||||
/* 0x534 */ ColliderJntSph unk534;
|
||||
/* 0x554 */ ColliderJntSphElement unk554[1];
|
||||
/* 0x594 */ ColliderJntSph unk594;
|
||||
/* 0x5B4 */ ColliderJntSphElement unk5B4[2];
|
||||
/* 0x634 */ ColliderCylinder unk634;
|
||||
/* 0x680 */ u8 unk_680;
|
||||
/* 0x681 */ char pad681[9];
|
||||
/* 0x684 */ u32 unk684;
|
||||
/* 0x688 */ s16 unk688;
|
||||
/* 0x68A */ s16 unk_68A;
|
||||
/* 0x68C */ char pad68C[0x48];
|
||||
/* 0x68C */ Vec3f unk68C;
|
||||
/* 0x698 */ Vec3f unk698;
|
||||
/* 0x6A4 */ f32 unk6A4;
|
||||
/* 0x6A8 */ char pad6A8[4];
|
||||
/* 0x6AC */ s16 unk6AC;
|
||||
/* 0x6B0 */ f32 unk6B0;
|
||||
/* 0x6B4 */ u16 unk6B4;
|
||||
/* 0x6B6 */ u16 unk6B6;
|
||||
/* 0x6B8 */ u16 unk6B8;
|
||||
/* 0x6BA */ char pad6BA[2];
|
||||
/* 0x6BC */ u16 unk6BC;
|
||||
/* 0x6BE */ u16 unk6BE;
|
||||
/* 0x6C0 */ u16 unk6C0;
|
||||
/* 0x6C2 */ u16 unk6C2;
|
||||
/* 0x6C4 */ u8 unk6C4;
|
||||
/* 0x6C8 */ Vec3f unk6C8;
|
||||
} EnKnight; // size = 0x6D4
|
||||
|
||||
extern const ActorInit En_Knight_InitVars;
|
||||
|
||||
+1
-1
@@ -65,7 +65,7 @@ def get_c_file(directory):
|
||||
def import_c_file(in_file):
|
||||
in_file = os.path.relpath(in_file, root_dir)
|
||||
cpp_command = ["gcc", "-E", "-P", "-Iinclude", "-Iassets", "-Isrc", "-undef", "-D__sgi", "-D_LANGUAGE_C",
|
||||
"-DNON_MATCHING", "-D_Static_assert(x, y)=", "-D__attribute__(x)=", in_file]
|
||||
"-DNON_MATCHING", "-DM2CTX", "-D_Static_assert(x, y)=", "-D__attribute__(x)=", in_file]
|
||||
try:
|
||||
return subprocess.check_output(cpp_command, cwd=root_dir, encoding="utf-8")
|
||||
except subprocess.CalledProcessError:
|
||||
|
||||
@@ -51,6 +51,8 @@ def lookup_sfx(idnum, repo):
|
||||
else:
|
||||
id = idnum
|
||||
idfix,sfxFlag = fix_sfx_flag(id)
|
||||
if idfix is None:
|
||||
return id
|
||||
with open(repo + os.sep + 'include' + os.sep + 'sfx.h','r') as sfxfile:
|
||||
for line in sfxfile:
|
||||
if(line.count(idfix)):
|
||||
@@ -63,6 +65,10 @@ def fix_sfx_flag(id):
|
||||
return splitdata[0].strip(), ' -' + splitdata[1]
|
||||
if id.endswith("U"):
|
||||
id = id[:-1]
|
||||
try:
|
||||
id_hex = int(id, 16)
|
||||
except ValueError:
|
||||
return None,None
|
||||
if not(int(id, 16) & 0x800):
|
||||
newid = '0x' + format(int(id,16) + 0x800,'X')
|
||||
sfxFlag = ' - SFX_FLAG'
|
||||
|
||||
Reference in New Issue
Block a user