Game-Decompilation/2ship2harkinian
1
0
Fork 0
mirror of https://github.com/HarbourMasters/2ship2harkinian.git synced 2024-11-30 17:50:50 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

En_Aob_01 (#440)

Browse Source 
* En_Aob_01

* PR

* Object

* Fix weird capitalisation

* undef
This commit is contained in:
Maide 2021-12-27 02:01:37 +00:00 committed by GitHub
parent ddb3405219
commit ae2ba19d7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 1017 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/xml/objects/object_aob.xml
View File

@ -23,9 +23,9 @@
<Texture Name="object_aob_Tex_0004D8" OutName="tex_0004D8" Format="ci8" Width="16" Height="16" Offset="0x4D8" />
<Texture Name="object_aob_Tex_0005D8" OutName="tex_0005D8" Format="ci8" Width="8" Height="8" Offset="0x5D8" />
<Texture Name="object_aob_Tex_000618" OutName="tex_000618" Format="ci8" Width="8" Height="8" Offset="0x618" />
<Texture Name="object_aob_TEx_000658" OutName="tex_000658" Format="rgba16" Width="32" Height="32" Offset="0x658" />
<Texture Name="object_aob_TEx_000E58" OutName="tex_000E58" Format="rgba16" Width="32" Height="32" Offset="0xE58" />
<Texture Name="object_aob_TEx_001658" OutName="tex_001658" Format="rgba16" Width="32" Height="32" Offset="0x1658" />
<Texture Name="object_aob_Tex_000658" OutName="tex_000658" Format="rgba16" Width="32" Height="32" Offset="0x658" />
<Texture Name="object_aob_Tex_000E58" OutName="tex_000E58" Format="rgba16" Width="32" Height="32" Offset="0xE58" />
<Texture Name="object_aob_Tex_001658" OutName="tex_001658" Format="rgba16" Width="32" Height="32" Offset="0x1658" />
<Texture Name="object_aob_Tex_001E58" OutName="tex_001E58" Format="ci8" Width="16" Height="16" Offset="0x1E58" />
<Texture Name="object_aob_Tex_001F58" OutName="tex_001F58" Format="ci8" Width="8" Height="8" Offset="0x1F58" />
<Texture Name="object_aob_Tex_001F98" OutName="tex_001F98" Format="ci8" Width="8" Height="8" Offset="0x1F98" />

2
include/functions.h
View File

@ -1625,7 +1625,7 @@ ActorCutscene* ActorCutscene_GetCutscene(s16 index);
s16 ActorCutscene_GetAdditionalCutscene(s16 index);
s16 ActorCutscene_GetLength(s16 index);
// void func_800F2138(void);
// void func_800F2178(void);
s32 func_800F2178(s16 arg0);
s16 ActorCutscene_GetCurrentCamera(s16 index);
// void func_800F21CC(void);
s32 func_800F22C4(s16 param_1, Actor* actor);

3
spec
View File

@ -2419,8 +2419,7 @@ beginseg
name "ovl_En_Aob_01"
compress
include "build/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.o"
include "build/data/ovl_En_Aob_01/ovl_En_Aob_01.data.o"
include "build/data/ovl_En_Aob_01/ovl_En_Aob_01.reloc.o"
include "build/src/overlays/actors/ovl_En_Aob_01/ovl_En_Aob_01_reloc.o"
endseg
beginseg

1017
src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
View File

File diff suppressed because it is too large Load Diff

34
src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h
View File

@ -7,10 +7,38 @@ struct EnAob01;
typedef void (*EnAob01ActionFunc)(struct EnAob01*, GlobalContext*);
#define ENAOB01_GET_7E00_1(thisx) ((thisx)->params & 0x7E00)
#define ENAOB01_GET_7E00_2(thisx) (((thisx)->params & 0x7E00) >> 9)
typedef struct EnAob01 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ EnAob01ActionFunc actionFunc;
/* 0x0148 */ char unk_148[0x2FC];
/* 0x000 */ Actor actor;
/* 0x144 */ EnAob01ActionFunc actionFunc;
/* 0x148 */ SkelAnime skelAnime;
/* 0x18C */ ColliderCylinder collider;
/* 0x1D8 */ Path* unk_1D8[14];
/* 0x210 */ u16 unk_210;
/* 0x212 */ Vec3s jointTable[16];
/* 0x272 */ Vec3s morphTable[16];
/* 0x2D2 */ u16 unk_2D2;
/* 0x2D4 */ Vec3s unk_2D4;
/* 0x2DA */ Vec3s unk_2DA;
/* 0x2E0 */ Vec3s unk_2E0;
/* 0x2E6 */ Vec3s unk_2E6;
/* 0x2EC */ Vec3s unk_2EC;
/* 0x2F2 */ Vec3s unk_2F2;
/* 0x2F8 */ s16 unk_2F8[16];
/* 0x318 */ s16 unk_318[16];
/* 0x338 */ UNK_TYPE1 unk338[0xB6];
/* 0x3EE */ s16 unk_3EE;
/* 0x3F0 */ s16 unk_3F0;
/* 0x3F4 */ Actor* unk_3F4;
/* 0x3F8 */ Actor* unk_3F8[14];
/* 0x430 */ s16 unk_430;
/* 0x432 */ s16 unk_432;
/* 0x434 */ s32 unk_434;
/* 0x438 */ UNK_TYPE1 unk438[4];
/* 0x43C */ s32 unk_43C;
/* 0x440 */ s16 unk_440;
} EnAob01; // size = 0x444
extern const ActorInit En_Aob_01_InitVars;

9
src/overlays/actors/ovl_En_Racedog/z_en_racedog.h
View File

@ -10,7 +10,14 @@ typedef void (*EnRacedogActionFunc)(struct EnRacedog*, GlobalContext*);
typedef struct EnRacedog {
/* 0x0000 */ Actor actor;
/* 0x0144 */ EnRacedogActionFunc actionFunc;
/* 0x0148 */ char unk_148[0x180];
/* 0x0148 */ char unk_148[0xA0];
/* 0x01E8 */ s32 unk_1E8;
/* 0x01EC */ char unk_1EC[0xA4];
/* 0x0290 */ s16 unk_290;
/* 0x0292 */ s16 unk_292;
/* 0x0294 */ char unk_294[0x8];
/* 0x029C */ s16 unk_29C;
/* 0x029E */ char unk_29E[0x2A];
} EnRacedog; // size = 0x2C8
extern const ActorInit En_Racedog_InitVars;

6
tools/disasm/functions.txt
View File

@ -9031,9 +9031,9 @@
0x809C3190:("EnAob01_Init",),
0x809C3350:("EnAob01_Destroy",),
0x809C339C:("EnAob01_Update",),
0x809C33D8:("func_809C33D8",),
0x809C35B4:("func_809C35B4",),
0x809C35F4:("func_809C35F4",),
0x809C33D8:("EnAob01_OverrideLimbDraw",),
0x809C35B4:("EnAob01_PostLimbDraw",),
0x809C35F4:("EnAob01_UnkDraw",),
0x809C3608:("EnAob01_Draw",),
0x809C3D80:("EnBoj01_Init",),
0x809C3D90:("EnBoj01_Destroy",),

5
undefined_syms.txt
View File

@ -1566,11 +1566,6 @@ D_060028A0 = 0x060028A0;
D_06009220 = 0x06009220;
D_06009D34 = 0x06009D34;
// ovl_En_Aob_01
D_06000180 = 0x06000180;
D_06003D18 = 0x06003D18;
// ovl_En_Attack_Niw
D_060000E8 = 0x060000E8;