Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2024-11-23 12:59:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

En_Po_Sisters (#345)

Browse Source 
* En_Po_Sisters

* Tharo magic

* Rebase

* PR

* Fix make and actorfixer

* Format
This commit is contained in:
Maide 2021-10-31 19:07:08 +00:00 committed by GitHub
parent d4effceefd
commit 829d1d4c2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1125 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spec
View File

@ -3975,8 +3975,7 @@ beginseg
name "ovl_En_Po_Sisters"
compress
include "build/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.o"
include "build/data/ovl_En_Po_Sisters/ovl_En_Po_Sisters.data.o"
include "build/data/ovl_En_Po_Sisters/ovl_En_Po_Sisters.reloc.o"
include "build/src/overlays/actors/ovl_En_Po_Sisters/ovl_En_Po_Sisters_reloc.o"
endseg
beginseg

1138
src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
View File

File diff suppressed because it is too large Load Diff

30
src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
View File

@ -7,11 +7,37 @@ struct EnPoSisters;
typedef void (*EnPoSistersActionFunc)(struct EnPoSisters*, GlobalContext*);
#define ENPOSISTERS_GET_300(thisx) (((thisx)->params >> 8) & 3)
#define ENPOSISTERS_GET_C00(thisx) (((thisx)->params >> 0xA) & 3)
#define ENPOSISTERS_GET_1000(thisx) ((thisx)->params & 0x1000)
typedef struct EnPoSisters {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ EnPoSistersActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x20C];
/* 0x018C */ u8 unk_18C;
/* 0x018D */ u8 unk_18D;
/* 0x018E */ u8 unk_18E;
/* 0x018F */ u8 unk_18F;
/* 0x0190 */ u8 unk_190;
/* 0x0191 */ u8 unk_191;
/* 0x0192 */ s16 unk_192;
/* 0x0194 */ s16 unk_194;
/* 0x0196 */ Vec3s jointTable[12];
/* 0x01DE */ Vec3s morphTable[12];
/* 0x0226 */ u8 unk_226;
/* 0x0227 */ u8 unk_227;
/* 0x0228 */ u8 unk_228;
/* 0x0229 */ u8 unk_229;
/* 0x022C */ Vec3f unk_22C[8];
/* 0x028C */ Vec3f unk_28C[8];
/* 0x02EC */ f32 unk_2EC;
/* 0x02F0 */ f32 unk_2F0;
/* 0x02F4 */ f32 unk_2F4;
/* 0x02F8 */ LightNode* lightNode;
/* 0x02FC */ LightInfo lightInfo;
/* 0x030C */ ColliderCylinder collider;
/* 0x0358 */ MtxF unk_358;
} EnPoSisters; // size = 0x398
extern const ActorInit En_Po_Sisters_InitVars;

17
tools/actorfixer.py
View File

@ -170,6 +170,23 @@ animdict = {
"skelanime.prevFrameRot": "skelanime.prevRot",
"skelanime.prevFramePos": "skelanime.prevTransl",
"skelanime.unk3E": "skelanime.baseTransl",
"skelAnime.unk03": "skelAnime.taper",
"skelAnime.animCurrentSeg": "skelAnime.animation",
"skelAnime.initialFrame": "skelAnime.startFrame",
"skelAnime.animFrameCount": "skelAnime.endFrame",
"skelAnime.totalFrames": "skelAnime.animLength",
"skelAnime.animCurrentFrame": "skelAnime.curFrame",
"skelAnime.animPlaybackSpeed": "skelAnime.playSpeed",
"skelAnime.limbDrawTbl": "skelAnime.jointTable",
"skelAnime.transitionDrawTbl": "skelAnime.morphTable",
"skelAnime.transCurrentFrame": "skelAnime.morphWeight",
"skelAnime.transitionStep": "skelAnime.morphRate",
"skelAnime.animUpdate": "skelAnime.update",
"skelAnime.flags": "skelAnime.moveFlags",
"skelAnime.prevFrameRot": "skelAnime.prevRot",
"skelAnime.prevFramePos": "skelAnime.prevTransl",
"skelAnime.unk3E": "skelAnime.baseTransl",
}
def replace_anim(file):

4
tools/disasm/functions.txt
View File

@ -13201,8 +13201,8 @@
0x80B1C408:("func_80B1C408",),
0x80B1C61C:("EnPoSisters_Update",),
0x80B1C974:("func_80B1C974",),
0x80B1CB44:("func_80B1CB44",),
0x80B1CD34:("func_80B1CD34",),
0x80B1CB44:("EnPoSisters_OverrideLimbDraw",),
0x80B1CD34:("EnPoSisters_PostLimbDraw",),
0x80B1D484:("EnPoSisters_Draw",),
0x80B1DEB0:("EnPp_Init",),
0x80B1E234:("EnPp_Destroy",),

8
undefined_syms.txt
View File

@ -3186,7 +3186,15 @@ D_06000A54 = 0x06000A54;
D_06000D40 = 0x06000D40;
D_0600119C = 0x0600119C;
D_060014CC = 0x060014CC;
D_06001CB0 = 0x06001CB0;
D_06001DE0 = 0x06001DE0;
D_060027B0 = 0x060027B0;
D_06002EB8 = 0x06002EB8;
D_06002F88 = 0x06002F88;
D_06003628 = 0x06003628;
D_06003880 = 0x06003880;
D_06003DC8 = 0x06003DC8;
D_06004020 = 0x06004020;
D_060046E0 = 0x060046E0;
D_060065C8 = 0x060065C8;