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_Dnp (#239)

Browse Source 
* En_Dnp

* PR

* NBS

* PR

* PR
This commit is contained in:
Maide
2021-08-08 16:43:12 -04:00
committed by GitHub
parent f5cbbc3268
commit a0896b0895
6 changed files with 515 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -1
View File
@@ -2194,7 +2194,7 @@ void func_8010A33C(GlobalContext* globalCtx, s16 param_2);
// void func_8010BEBC(void);
// void func_8010BEF0(void);
// void func_8010BF24(void);
s32 func_8010BF58(Actor* actor, GlobalContext* globalCtx, s32* param_2, s32 param_3, s32 param_4);
s32 func_8010BF58(Actor* actor, GlobalContext* globalCtx, s32* param_2, s32 param_3, s32* param_4);
// void Nmi_Init(void);
// void Nmi_SetPrenmiStart(void);
// s32 Nmi_GetPrenmiHasStarted(void);
spec
+1 -2
View File
@@ -4185,8 +4185,7 @@ beginseg
name "ovl_En_Dnp"
compress
include "build/src/overlays/actors/ovl_En_Dnp/z_en_dnp.o"
include "build/data/ovl_En_Dnp/ovl_En_Dnp.data.o"
include "build/data/ovl_En_Dnp/ovl_En_Dnp.reloc.o"
include "build/src/overlays/actors/ovl_En_Dnp/ovl_En_Dnp_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Dnp/z_en_dnp.c
+456 -33
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Dnp/z_en_dnp.h
+29 -5
View File
@@ -5,13 +5,37 @@
struct EnDnp;
typedef void (*EnDnpActionFunc)(struct EnDnp* this, GlobalContext* globalCtx);
typedef void (*EnDnpActionFunc)(struct EnDnp*, GlobalContext*);
#define ENDNP_GET_7(thisx) ((thisx)->params & 7)
enum {
/* 0x0 */ ENDNP_GET_7_0,
/* 0x1 */ ENDNP_GET_7_1,
/* 0x2 */ ENDNP_GET_7_2,
};
typedef struct EnDnp {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0188 */ EnDnpActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x1B8];
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ EnDnpActionFunc actionFunc;
/* 0x18C */ ColliderCylinder collider;
/* 0x1D8 */ Vec3f unk_1D8;
/* 0x1E4 */ Vec3s unk_1E4;
/* 0x1EA */ Vec3s jointTable[26];
/* 0x286 */ Vec3s morphTable[26];
/* 0x322 */ u16 unk_322;
/* 0x324 */ u8 unk_324;
/* 0x328 */ s32 unk_328;
/* 0x32C */ UNK_TYPE1 unk_32C[0x2];
/* 0x32E */ s16 unk_32E;
/* 0x330 */ s16 unk_330;
/* 0x332 */ s16 unk_332;
/* 0x334 */ s16 unk_334;
/* 0x336 */ s16 unk_336;
/* 0x338 */ s16 unk_338;
/* 0x33A */ UNK_TYPE1 unk_33A[0x6];
/* 0x340 */ s32 unk_340;
} EnDnp; // size = 0x344
extern const ActorInit En_Dnp_InitVars;
tools/disasm/variables.txt
+1 -1
View File
@@ -14616,7 +14616,7 @@
0x80B3DC60:("En_Dnp_InitVars","UNK_TYPE1","",0x1),
0x80B3DC80:("D_80B3DC80","UNK_TYPE1","",0x1),
0x80B3DCAC:("D_80B3DCAC","UNK_TYPE1","",0x1),
0x80B3DCB8:("D_80B3DCB8","UNK_TYPE1","",0x1),
0x80B3DCB8:("sAnimations","UNK_TYPE1","",0x1),
0x80B3DE58:("D_80B3DE58","UNK_TYPE1","",0x1),
0x80B3DE74:("D_80B3DE74","UNK_TYPE1","",0x1),
0x80B3DEAC:("D_80B3DEAC","UNK_TYPE1","",0x1),
undefined_syms.txt
+27
View File
@@ -1866,6 +1866,33 @@ D_06006F84 = 0x06006F84;
// ovl_En_Dnp
D_06010D60 = 0x06010D60;
D_060007D8 = 0x060007D8;
D_060021DC = 0x060021DC;
D_060026B8 = 0x060026B8;
D_06004D08 = 0x06004D08;
D_060071F4 = 0x060071F4;
D_06007960 = 0x06007960;
D_06008588 = 0x06008588;
D_0600A900 = 0x0600A900;
D_0600AEB8 = 0x0600AEB8;
D_0600B754 = 0x0600B754;
D_0600674C = 0x0600674C;
D_0600BAD8 = 0x0600BAD8;
D_06006B74 = 0x06006B74;
D_06012428 = 0x06012428;
D_0600B324 = 0x0600B324;
D_060115B8 = 0x060115B8;
D_0600923C = 0x0600923C;
D_06009AA0 = 0x06009AA0;
D_0600125C = 0x0600125C;
D_060017F8 = 0x060017F8;
D_06001C1C = 0x06001C1C;
D_060057AC = 0x060057AC;
D_0600625C = 0x0600625C;
D_060103D0 = 0x060103D0;
D_060105D0 = 0x060105D0;
D_060107D0 = 0x060107D0;
D_060109D0 = 0x060109D0;
// ovl_En_Dnq