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

Boss_06 (2 non-matching) (#557)

Browse Source 
* Boss_06

* Format

* BSS

* Merge

* PR
This commit is contained in:
Maide
2022-01-30 17:25:38 -03:00
committed by GitHub
parent 0e6662aafd
commit ade2f678b8
7 changed files with 639 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_knight.xml
+3
View File
@@ -98,6 +98,9 @@
<DList Name="object_knight_DL_0189F0" Offset="0x189F0" />
<DList Name="object_knight_DL_018AF0" Offset="0x18AF0" />
<TextureAnimation Name="object_knight_Matanimheader_018BC4" Offset="0x18BC4" />
<Array Name="object_knight_Vtx_018BD0" Count="18" Offset="0x18BD0">
<Vtx/>
</Array>
<DList Name="object_knight_DL_018CF0" Offset="0x18CF0" />
<DList Name="object_knight_DL_018DE0" Offset="0x18DE0" />
<DList Name="object_knight_DL_018E50" Offset="0x18E50" />
include/variables.h
+10 -14
View File
@@ -3215,20 +3215,16 @@ extern u8 actorCutsceneNextCutscenes[16];
// extern UNK_TYPE1 D_801F4E20;
extern u8 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 UNK_TYPE1 D_801F4E4E;
// extern UNK_TYPE1 D_801F4E50;
// extern UNK_TYPE1 D_801F4E54;
// extern UNK_TYPE1 D_801F4E58;
// extern UNK_TYPE1 D_801F4E5C;
// extern UNK_TYPE1 D_801F4E60;
// extern UNK_TYPE1 D_801F4E64;
extern s8 D_801F4E32;
extern Vec3f D_801F4E38;
extern f32 D_801F4E44;
extern f32 D_801F4E48;
extern s16 D_801F4E4C;
extern s8 D_801F4E4E;
extern Vec3f D_801F4E50;
extern f32 D_801F4E5C;
extern f32 D_801F4E60;
extern s16 D_801F4E64;
// extern UNK_TYPE1 D_801F4E68;
extern f32 D_801F4E70;
// extern UNK_TYPE1 D_801F4E74;
spec
+4 -2
View File
@@ -2562,9 +2562,11 @@ beginseg
name "ovl_Boss_06"
compress
include "build/src/overlays/actors/ovl_Boss_06/z_boss_06.o"
include "build/data/ovl_Boss_06/ovl_Boss_06.data.o"
include "build/data/ovl_Boss_06/ovl_Boss_06.bss.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_Boss_06/ovl_Boss_06_reloc.o"
#else
include "build/data/ovl_Boss_06/ovl_Boss_06.reloc.o"
#endif
endseg
beginseg
src/overlays/actors/ovl_Boss_06/z_boss_06.c
+570 -26
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Boss_06/z_boss_06.h
+38 -2
View File
@@ -7,11 +7,47 @@ struct Boss06;
typedef void (*Boss06ActionFunc)(struct Boss06*, GlobalContext*);
#define ENBOSS06_GET_PARAMS(thisx) ((thisx)->params)
typedef struct Boss06 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x54];
/* 0x0144 */ u8 unk_144;
/* 0x0146 */ s16 unk_146;
/* 0x0148 */ s16 unk_148;
/* 0x014C */ ColliderCylinder collider;
/* 0x0198 */ Boss06ActionFunc actionFunc;
/* 0x019C */ char unk_19C[0x894];
/* 0x019C */ f32 unk_19C;
/* 0x01A0 */ f32 unk_1A0;
/* 0x01A4 */ f32 unk_1A4;
/* 0x01A8 */ f32 unk_1A8;
/* 0x01AC */ f32 unk_1AC;
/* 0x01B0 */ f32 unk_1B0;
/* 0x01B4 */ f32 unk_1B4;
/* 0x01B8 */ UNK_TYPE1 unk1B8[4];
/* 0x01BC */ f32 unk_1BC;
/* 0x01C0 */ f32 unk_1C0;
/* 0x01C4 */ UNK_TYPE1 unk1C4[4];
/* 0x01C8 */ u8 unk_1C8;
/* 0x01C9 */ u8 unk_1C9;
/* 0x01CA */ s16 unk_1CA;
/* 0x01CC */ f32 unk_1CC;
/* 0x01D0 */ f32 unk_1D0;
/* 0x01D4 */ f32 unk_1D4;
/* 0x01D8 */ f32 unk_1D8;
/* 0x01DC */ f32 unk_1DC;
/* 0x01E0 */ f32 unk_1E0;
/* 0x01E4 */ f32 unk_1E4;
/* 0x01E8 */ UNK_TYPE1 unk1E8[0x15];
/* 0x01FD */ u8 unk_1FD;
/* 0x01FE */ u8 unk_1FE;
/* 0x01FF */ u8 unk_1FF;
/* 0x0200 */ u8 unk_200[0x800];
/* 0x0A00 */ s16 unk_A00;
/* 0x0A04 */ Vec3f unk_A04;
/* 0x0A10 */ Vec3f unk_A10;
/* 0x0A1C */ Vec3f unk_A1C;
/* 0x0A28 */ f32 unk_A28;
/* 0x0A2C */ f32 unk_A2C;
} Boss06; // size = 0xA30
extern const ActorInit Boss_06_InitVars;
src/overlays/actors/ovl_En_Knight/z_en_knight.h
+14 -2
View File
@@ -9,9 +9,21 @@ typedef void (*EnKnightActionFunc)(struct EnKnight*, GlobalContext*);
typedef struct EnKnight {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x2DC];
/* 0x0144 */ s16 unk_144;
/* 0x0146 */ char unk_146[0x2];
/* 0x0148 */ s8 unk_148;
/* 0x0149 */ char pad149[8];
/* 0x0151 */ s8 unk_151;
/* 0x0152 */ char pad152[1];
/* 0x0153 */ u8 unk_153;
/* 0x0154 */ u8 unk_154;
/* 0x0155 */ char pad155[0x2CB];
/* 0x0420 */ EnKnightActionFunc actionFunc;
/* 0x0424 */ char unk_424[0x2B0];
/* 0x0424 */ char unk_424[0x25C];
/* 0x0680 */ u8 unk_680;
/* 0x0681 */ char pad681[9];
/* 0x068A */ s16 unk_68A;
/* 0x068C */ char pad68C[0x48];
} EnKnight; // size = 0x6D4
extern const ActorInit En_Knight_InitVars;
undefined_syms.txt
-1
View File
@@ -880,7 +880,6 @@ D_06018CF0 = 0x06018CF0;
D_06018DE0 = 0x06018DE0;
D_06019360 = 0x06019360;
D_060193B0 = 0x060193B0;
D_06019490 = 0x06019490;
// ovl_Boss_07