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

Decompiled, mostly named

Browse Source
This commit is contained in:
Thar0
2023-09-24 01:57:25 +01:00
parent b88aa2c0fc
commit 320e19bd6f
4 changed files with 664 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_po_composer.xml
+10 -17
View File
@@ -1,4 +1,5 @@
<Root>
<ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
<File Name="object_po_composer" Segment="6">
<Animation Name="object_po_composer_Anim_00020C" Offset="0x20C" />
<Animation Name="object_po_composer_Anim_000570" Offset="0x570" />
@@ -13,23 +14,15 @@
<Animation Name="object_po_composer_Anim_00334C" Offset="0x334C" />
<Animation Name="object_po_composer_Anim_003954" Offset="0x3954" />
<Animation Name="object_po_composer_Anim_003DB0" Offset="0x3DB0" />
<Texture Name="object_po_composer_Tex_003DC0" OutName="tex_003DC0" Format="i8" Width="32" Height="64" Offset="0x3DC0" />
<DList Name="object_po_composer_DL_004600" Offset="0x4600" />
<DList Name="object_po_composer_DL_0052E0" Offset="0x52E0" />
<DList Name="object_po_composer_DL_0054E0" Offset="0x54E0" />
<DList Name="object_po_composer_DL_0055D0" Offset="0x55D0" />
<DList Name="object_po_composer_DL_005898" Offset="0x5898" />
<DList Name="object_po_composer_DL_005948" Offset="0x5948" />
<DList Name="object_po_composer_DL_005A00" Offset="0x5A00" />
<DList Name="object_po_composer_DL_005CB8" Offset="0x5CB8" />
<DList Name="object_po_composer_DL_005D68" Offset="0x5D68" />
<DList Name="object_po_composer_DL_006A70" Offset="0x6A70" />
<DList Name="object_po_composer_DL_006D80" Offset="0x6D80" />
<DList Name="object_po_composer_DL_006E08" Offset="0x6E08" />
<DList Name="object_po_composer_DL_006EA8" Offset="0x6EA8" />
<DList Name="object_po_composer_DL_006F38" Offset="0x6F38" />
<DList Name="object_po_composer_DL_006FD8" Offset="0x6FD8" />
<DList Name="object_po_composer_DL_007BC0" Offset="0x7BC0" />
<Texture Name="object_po_composer_Tex_003DC0" OutName="tex_003DC0" Format="i8" Width="32" Height="64" Offset="0x3DC0" /> <!-- soul texture -->
<DList Name="object_po_composer_DL_004600" Offset="0x4600" /> <!-- ??? -->
<DList Name="object_po_composer_DL_006A70" Offset="0x6A70" /> <!-- sharp head -->
<DList Name="object_po_composer_DL_006D80" Offset="0x6D80" /> <!-- ??? -->
<DList Name="object_po_composer_DL_006E08" Offset="0x6E08" /> <!-- ./ -->
<DList Name="object_po_composer_DL_006EA8" Offset="0x6EA8" /> <!-- ./ -->
<DList Name="object_po_composer_DL_006F38" Offset="0x6F38" /> <!-- ./ -->
<DList Name="object_po_composer_DL_006FD8" Offset="0x6FD8" /> <!-- ./ -->
<DList Name="object_po_composer_DL_007BC0" Offset="0x7BC0" /> <!-- unused burning dl -->
<Texture Name="object_po_composer_Tex_007E80" OutName="tex_007E80" Format="rgba16" Width="16" Height="16" Offset="0x7E80" />
<Texture Name="object_po_composer_Tex_008080" OutName="tex_008080" Format="rgba16" Width="16" Height="16" Offset="0x8080" />
<Texture Name="object_po_composer_Tex_008280" OutName="tex_008280" Format="rgba16" Width="16" Height="16" Offset="0x8280" />
spec
+1 -2
View File
@@ -4263,8 +4263,7 @@ beginseg
name "ovl_En_Po_Composer"
compress
include "build/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.o"
include "build/data/ovl_En_Po_Composer/ovl_En_Po_Composer.data.o"
include "build/data/ovl_En_Po_Composer/ovl_En_Po_Composer.reloc.o"
include "build/src/overlays/actors/ovl_En_Po_Composer/ovl_En_Po_Composer_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c
+616 -74
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h
+37 -2
View File
@@ -2,6 +2,24 @@
#define Z_EN_PO_COMPOSER_H
#include "global.h"
#include "objects/object_po_composer/object_po_composer.h"
#define PO_COMPOSER_IS_FLAT(actor) ((actor)->params & 0x8000)
typedef enum {
COMPOSER_CS_ACTION_IDLE = 1,
COMPOSER_CS_ACTION_APPEAR_SPIN,
COMPOSER_CS_ACTION_IDLE2,
COMPOSER_CS_ACTION_RAISE_ARMS,
COMPOSER_CS_ACTION_LOWER_ARMS,
COMPOSER_CS_ACTION_PLAY_CURSE,
COMPOSER_CS_ACTION_ROLL,
COMPOSER_CS_ACTION_APPEAR,
COMPOSER_CS_ACTION_DISAPPEAR,
COMPOSER_CS_ACTION_DONE,
COMPOSER_CS_ACTION_NONE = 99
} EnPoComposerCutsceneAction;
struct EnPoComposer;
@@ -9,9 +27,26 @@ typedef void (*EnPoComposerActionFunc)(struct EnPoComposer*, PlayState*);
typedef struct EnPoComposer {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0xF0];
/* 0x144 */ ColliderCylinder bodyCollider;
/* 0x190 */ ColliderJntSph lanternCollider;
/* 0x1B0 */ ColliderJntSphElement lanternColliderElements[1];
/* 0x1F0 */ SkelAnime skelAnime;
/* 0x234 */ EnPoComposerActionFunc actionFunc;
/* 0x238 */ char unk_238[0x108];
/* 0x238 */ MtxF lanternMtxF;
/* 0x278 */ LightNode* lightNode;
/* 0x27C */ LightInfo lightInfo;
/* 0x28A */ char unk_28A[0x6];
/* 0x290 */ s32 unk290; // cutscene to play
/* 0x294 */ Vec3s jointTable[OBJECT_PO_COMPOSER_LIMB_MAX];
/* 0x2DC */ Vec3s morphTable[OBJECT_PO_COMPOSER_LIMB_MAX];
/* 0x324 */ s16 csIndices[4];
/* 0x32C */ s16 actionTimer;
/* 0x32E */ s16 csActionTimer;
/* 0x330 */ s16 unk330; // boolean, do respond to cs actions?
/* 0x332 */ s16 visible;
/* 0x334 */ u16 lastCsAction;
/* 0x336 */ Color_RGBA8 lightColor;
/* 0x33A */ Color_RGBA8 envColor;
} EnPoComposer; // size = 0x340
#endif // Z_EN_PO_COMPOSER_H