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_Pr (#631)

Browse Source
This commit is contained in:
Maide
2022-02-19 20:59:15 +00:00
committed by GitHub
parent 717adf8ed8
commit 0e6cf608d2
6 changed files with 573 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -2752,8 +2752,7 @@ beginseg
name "ovl_En_Pr"
compress
include "build/src/overlays/actors/ovl_En_Pr/z_en_pr.o"
include "build/data/ovl_En_Pr/ovl_En_Pr.data.o"
include "build/data/ovl_En_Pr/ovl_En_Pr.reloc.o"
include "build/src/overlays/actors/ovl_En_Pr/ovl_En_Pr_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Pr/z_en_pr.c
+525 -36
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Pr/z_en_pr.h
+42 -2
View File
@@ -7,11 +7,51 @@ struct EnPr;
typedef void (*EnPrActionFunc)(struct EnPr*, GlobalContext*);
#define ENPR_GET_FF00(thisx) (((thisx)->params >> 8) & 0xFF)
#define ENPR_FF00_MAX 20
#define ENPR_FF00_MIN 0
typedef struct EnPr {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0xBC];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ Vec3s jointTable[10];
/* 0x01C4 */ Vec3s morphTable[10];
/* 0x0200 */ EnPrActionFunc actionFunc;
/* 0x0204 */ char unk_204[0x144];
/* 0x0204 */ u8 unk_204;
/* 0x0206 */ s16 unk_206;
/* 0x0208 */ s16 unk_208;
/* 0x020A */ s16 unk_20A;
/* 0x020C */ s16 unk_20C;
/* 0x020E */ s16 unk_20E;
/* 0x0210 */ s16 unk_210;
/* 0x0212 */ s16 unk_212;
/* 0x0214 */ s16 unk_214;
/* 0x0216 */ s16 unk_216;
/* 0x0218 */ UNK_TYPE1 unk218[4];
/* 0x021C */ s32 unk_21C;
/* 0x0220 */ UNK_TYPE1 unk220[0x8];
/* 0x0228 */ s32 unk_228;
/* 0x022C */ s16 unk_22C;
/* 0x022E */ s16 unk_22E;
/* 0x0230 */ s16 unk_230;
/* 0x0234 */ f32 unk_234;
/* 0x0238 */ f32 unk_238;
/* 0x023C */ Vec3f unk_23C[10];
/* 0x02B4 */ f32 unk_2B4;
/* 0x02B8 */ f32 unk_2B8;
/* 0x02BC */ f32 unk_2BC;
/* 0x02C0 */ f32 unk_2C0;
/* 0x02C4 */ f32 unk_2C4;
/* 0x02C8 */ f32 unk_2C8;
/* 0x02CC */ f32 unk_2CC;
/* 0x02D0 */ s16 unk_2D0;
/* 0x02D2 */ s16 unk_2D2;
/* 0x02D4 */ Vec3f unk_2D4;
/* 0x02E0 */ Vec3f unk_2E0;
/* 0x02EC */ UNK_TYPE1 unk2EC[0xC];
/* 0x02F8 */ Actor* unk_2F8;
/* 0x02FC */ ColliderCylinder collider;
} EnPr; // size = 0x348
extern const ActorInit En_Pr_InitVars;
src/overlays/actors/ovl_En_Prz/z_en_prz.h
+3 -1
View File
@@ -11,7 +11,9 @@ typedef struct EnPrz {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x80];
/* 0x01C4 */ EnPrzActionFunc actionFunc;
/* 0x01C8 */ char unk_1C8[0xA8];
/* 0x01C8 */ char unk_1C8[0x58];
/* 0x0220 */ Actor* unk_220;
/* 0x0224 */ char unk_224[0x4C];
} EnPrz; // size = 0x270
extern const ActorInit En_Prz_InitVars;
tools/disasm/functions.txt
+2 -2
View File
@@ -10186,8 +10186,8 @@
0x80A32F48:("func_80A32F48",),
0x80A33098:("func_80A33098",),
0x80A331C4:("EnPr_Update",),
0x80A3357C:("func_80A3357C",),
0x80A335B4:("func_80A335B4",),
0x80A3357C:("EnPr_OverrideLimbDraw",),
0x80A335B4:("EnPr_PostLimbDraw",),
0x80A336C0:("EnPr_Draw",),
0x80A33B00:("func_80A33B00",),
0x80A33BB4:("func_80A33BB4",),
undefined_syms.txt
-5
View File
@@ -1732,11 +1732,6 @@ D_06009930 = 0x06009930;
D_0600A844 = 0x0600A844;
D_06012768 = 0x06012768;
// ovl_En_Pr
D_060021E8 = 0x060021E8;
D_060038B8 = 0x060038B8;
// ovl_En_Pr2
D_06003904 = 0x06003904;