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_Rg (1 non-matching) (#565)

Browse Source 
* En_Rg

* UNK

* PR

* PR

* Merge

* Merge

* PR

* textures
This commit is contained in:
Maide
2022-01-30 16:53:54 -03:00
committed by GitHub
parent a00601671d
commit b8c33ffa54
5 changed files with 817 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64actor.h
+2
View File
@@ -1168,6 +1168,8 @@ typedef enum {
#define ACTOR_FLAG_20000000 (1 << 29)
//
#define ACTOR_FLAG_40000000 (1 << 30)
//
#define ACTOR_FLAG_80000000 (1 << 31)
typedef enum {
/* 0x00 */ CLEAR_TAG_SMALL_EXPLOSION,
spec
+4 -2
View File
@@ -5027,9 +5027,11 @@ beginseg
name "ovl_En_Rg"
compress
include "build/src/overlays/actors/ovl_En_Rg/z_en_rg.o"
include "build/data/ovl_En_Rg/ovl_En_Rg.data.o"
include "build/data/ovl_En_Rg/ovl_En_Rg.bss.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_Rg/ovl_En_Rg_reloc.o"
#else
include "build/data/ovl_En_Rg/ovl_En_Rg.reloc.o"
#endif
endseg
beginseg
src/overlays/actors/ovl_En_Rg/z_en_rg.c
+771 -52
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Rg/z_en_rg.h
+40 -2
View File
@@ -7,11 +7,49 @@ struct EnRg;
typedef void (*EnRgActionFunc)(struct EnRg*, GlobalContext*);
#define ENRG_GET_7F80(thisx) ((((thisx)->params & 0x7F80) >> 7) & 0xFF)
typedef struct {
/* 0x00 */ u8 unk_00;
/* 0x01 */ u8 unk_01;
/* 0x02 */ u8 unk_02;
/* 0x03 */ UNK_TYPE1 unk_03[0xD];
/* 0x10 */ Vec3f unk_10;
/* 0x1C */ Vec3f unk_1C;
/* 0x28 */ Vec3f unk_28;
/* 0x34 */ f32 unk_34;
/* 0x38 */ f32 unk_38;
} EnRgStruct; // size = 0x3C
typedef struct EnRg {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ EnRgActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x940];
/* 0x018C */ Actor* unk_18C;
/* 0x0190 */ ColliderCylinder collider1;
/* 0x01DC */ ColliderSphere collider2;
/* 0x0234 */ Path* path;
/* 0x0238 */ Vec3s jointTable[18];
/* 0x02A4 */ Vec3s morphTable[18];
/* 0x0310 */ u16 unk_310;
/* 0x0314 */ f32 unk_314;
/* 0x0318 */ s16 unk_318;
/* 0x031A */ UNK_TYPE1 unk31A[2];
/* 0x031C */ s16 unk_31C;
/* 0x031E */ s16 unk_31E;
/* 0x0320 */ s16 unk_320;
/* 0x0322 */ s16 unk_322;
/* 0x0324 */ s16 unk_324;
/* 0x0326 */ s16 unk_326;
/* 0x0328 */ s16 unk_328[3];
/* 0x032E */ s16 unk_32E[3];
/* 0x0334 */ s32 unk_334;
/* 0x0338 */ UNK_TYPE1 unk338[4];
/* 0x033C */ s32 unk_33C;
/* 0x0340 */ s32 unk_340;
/* 0x0344 */ s32 unk_344;
/* 0x0348 */ s32 unk_348;
/* 0x034C */ EnRgStruct unk_34C[32];
} EnRg; // size = 0xACC
extern const ActorInit En_Rg_InitVars;
undefined_syms.txt
-7
View File
@@ -1900,13 +1900,6 @@ D_06000174 = 0x06000174;
D_0600026C = 0x0600026C;
D_06001858 = 0x06001858;
// ovl_En_Rg
D_060091A8 = 0x060091A8;
D_06011AC8 = 0x06011AC8;
D_06014CF0 = 0x06014CF0;
D_06014D00 = 0x06014D00;
// ovl_En_Ru
D_0600C700 = 0x0600C700;