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

En_Pr2 (#587)

Browse Source 
* En_Pr2

* Cringe

* Merge

* PR

* Revert EnEncount1

* PR
This commit is contained in:
Maide
2022-02-28 02:52:39 +00:00
committed by GitHub
parent 6f4b349020
commit e127ee650a
5 changed files with 718 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -3122,8 +3122,7 @@ beginseg
name "ovl_En_Pr2"
compress
include "build/src/overlays/actors/ovl_En_Pr2/z_en_pr2.o"
include "build/data/ovl_En_Pr2/ovl_En_Pr2.data.o"
include "build/data/ovl_En_Pr2/ovl_En_Pr2.reloc.o"
include "build/src/overlays/actors/ovl_En_Pr2/ovl_En_Pr2_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
+5 -1
View File
@@ -10,7 +10,11 @@ typedef void (*EnEncount1ActionFunc)(struct EnEncount1*, GlobalContext*);
typedef struct EnEncount1 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ EnEncount1ActionFunc actionFunc;
/* 0x0148 */ char unk_148[0x1C];
/* 0x0148 */ char unk_148[0x6];
/* 0x014E */ s16 unk_14E;
/* 0x0150 */ char unk_150[0xA];
/* 0x015A */ s16 unk_15A;
/* 0x015C */ char unk_15C[0x8];
} EnEncount1; // size = 0x164
extern const ActorInit En_Encount1_InitVars;
src/overlays/actors/ovl_En_Pr2/z_en_pr2.c
+673 -31
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Pr2/z_en_pr2.h
+39 -2
View File
@@ -7,11 +7,48 @@ struct EnPr2;
typedef void (*EnPr2ActionFunc)(struct EnPr2*, GlobalContext*);
#define ENPR2_GET_F(thisx) ((thisx)->params & 0xF)
#define ENPR2_GET_FF0(thisx) (((thisx)->params >> 4) & 0xFF)
typedef struct EnPr2 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x80];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ Vec3s jointTable[5];
/* 0x01A6 */ Vec3s morphtable[5];
/* 0x01C4 */ EnPr2ActionFunc actionFunc;
/* 0x01C8 */ char unk_1C8[0x100];
/* 0x01C8 */ s16 unk_1C8;
/* 0x01CC */ Path* path;
/* 0x01D0 */ s32 unk_1D0;
/* 0x01D4 */ s16 unk_1D4;
/* 0x01D6 */ s16 unk_1D6;
/* 0x01D8 */ s16 unk_1D8;
/* 0x01DA */ s16 unk_1DA;
/* 0x01DC */ s16 unk_1DC;
/* 0x01DE */ s16 unk_1DE;
/* 0x01E0 */ s16 unk_1E0;
/* 0x01E2 */ UNK_TYPE1 unk1E2[2];
/* 0x01E4 */ s16 unk_1E4;
/* 0x01E6 */ s16 unk_1E6;
/* 0x01E8 */ UNK_TYPE1 unk1E8[4];
/* 0x01EC */ s16 unk_1EC;
/* 0x01EE */ s16 unk_1EE;
/* 0x01F0 */ s16 unk_1F0;
/* 0x01F2 */ s16 unk_1F2;
/* 0x01F4 */ s16 unk_1F4;
/* 0x01F8 */ f32 unk_1F8;
/* 0x01FC */ f32 unk_1FC;
/* 0x0200 */ f32 unk_200;
/* 0x0204 */ f32 unk_204;
/* 0x0208 */ f32 unk_208;
/* 0x020C */ f32 unk_20C;
/* 0x0210 */ s32 unk_210;
/* 0x0214 */ UNK_TYPE1 unk214[4];
/* 0x0218 */ s32 unk_218;
/* 0x021C */ Vec3f unk_21C;
/* 0x0228 */ Vec3f unk_228;
/* 0x0234 */ Vec3f unk_234[5];
/* 0x0270 */ Vec3f unk_270;
/* 0x027C */ ColliderCylinder collider;
} EnPr2; // size = 0x2C8
extern const ActorInit En_Pr2_InitVars;
undefined_syms.txt
-6
View File
@@ -1717,12 +1717,6 @@ D_06009930 = 0x06009930;
D_0600A844 = 0x0600A844;
D_06012768 = 0x06012768;
// ovl_En_Pr2
D_06003904 = 0x06003904;
D_06004188 = 0x06004188;
D_06004340 = 0x06004340;
// ovl_En_Prz
D_06004188 = 0x06004188;