Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2025-02-19 21:11:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dm_Stk (#350)

Browse Source 
* Dm_Stk

* PR
This commit is contained in:
Maide 2021-12-06 21:45:28 +00:00 committed by GitHub
parent f4dfeac4a9
commit 08cf506be7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 1845 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/functions.h
View File

@ -3823,7 +3823,7 @@ void func_8019FAD8(Vec3f* param_1, u16 param_2, f32 param_3);
// void func_8019FD90(void);
void func_8019FDC8(UNK_PTR arg0, u16 sfxId, UNK_TYPE arg2);
// void func_8019FE1C(void);
// void func_8019FE74(void);
void func_8019FE74(f32* arg0, f32 arg1, s32 arg2);
// void func_8019FEDC(void);
// void func_8019FF38(void);
// void func_8019FF9C(void);
@ -3839,7 +3839,7 @@ void func_801A0204(s8 seqId);
// void func_801A046C(void);
// void func_801A0554(void);
// void func_801A05F0(void);
// void func_801A0654(void);
void func_801A0654(Vec3f* arg0, u16 sfxId, s32 arg2);
// void func_801A0810(void);
// void func_801A0868(void);
// void func_801A09D4(void);
@ -3917,10 +3917,10 @@ void Audio_PreNMI(void);
// void func_801A44D4(void);
s32 func_801A46F8(void);
// void func_801A4748(void);
// void func_801A479C(void);
void func_801A479C(Vec3f* arg0, u16 sfxId, s32 arg2);
// void func_801A47DC(void);
// void func_801A48E0(void);
// void func_801A4A28(void);
void func_801A4A28(s32 arg0);
// void func_801A4B80(void);
void func_801A4C30(void);
// void func_801A4C54(void);

2
include/variables.h
View File

@ -1704,7 +1704,7 @@ extern UNK_PTR D_801D618C;
// extern UNK_TYPE1 D_801D6648;
// extern UNK_TYPE1 D_801D664C;
// extern UNK_TYPE1 D_801D6650;
// extern UNK_TYPE4 D_801D6654;
extern f32 D_801D6654;
// extern UNK_TYPE1 D_801D6658;
// extern UNK_TYPE1 D_801D665C;
// extern UNK_TYPE1 D_801D6660;

3
spec
View File

@ -3287,8 +3287,7 @@ beginseg
name "ovl_Dm_Stk"
compress
include "build/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.o"
include "build/data/ovl_Dm_Stk/ovl_Dm_Stk.data.o"
include "build/data/ovl_Dm_Stk/ovl_Dm_Stk.reloc.o"
include "build/src/overlays/actors/ovl_Dm_Stk/ovl_Dm_Stk_reloc.o"
endseg
beginseg

1797
src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
View File

File diff suppressed because it is too large Load Diff

32
src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h
View File

@ -9,9 +9,37 @@ typedef void (*DmStkActionFunc)(struct DmStk*, GlobalContext*);
typedef struct DmStk {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x14C];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ UNK_TYPE1 unk_188[0x108];
/* 0x0290 */ DmStkActionFunc actionFunc;
/* 0x0294 */ char unk_294[0xA8];
/* 0x0294 */ ColliderCylinder collider;
/* 0x02E0 */ s16 unk_2E0;
/* 0x02E4 */ s32 unk_2E4;
/* 0x02E8 */ u32 unk_2E8;
/* 0x02EC */ u32 unk_2EC;
/* 0x02F0 */ u32 unk_2F0;
/* 0x02F4 */ s32 unk_2F4;
/* 0x02F8 */ s32 unk_2F8;
/* 0x02FC */ s32 unk_2FC;
/* 0x0300 */ f32 unk_300;
/* 0x0304 */ Vec3f unk_304;
/* 0x0310 */ Vec3f unk_310;
/* 0x031C */ UNK_TYPE1 unk31C[0xC];
/* 0x0328 */ u16 unk_328;
/* 0x032A */ u16 unk_32A;
/* 0x032C */ u8 unk_32C;
/* 0x032D */ u8 unk_32D;
/* 0x032E */ u8 unk_32E;
/* 0x032F */ u8 unk_32F;
/* 0x0330 */ s32 unk_330;
/* 0x0334 */ u8 unk_334;
/* 0x0335 */ u8 unk_335;
/* 0x0336 */ s8 unk_336;
/* 0x0337 */ s8 unk_337;
/* 0x0338 */ s8 unk_338;
/* 0x0339 */ u8 unk_339;
/* 0x033A */ u8 unk_33A;
/* 0x033B */ u8 unk_33B;
} DmStk; // size = 0x33C
extern const ActorInit Dm_Stk_InitVars;

6
tools/disasm/functions.txt
View File

@ -11502,9 +11502,9 @@
0x80AA2720:("func_80AA2720",),
0x80AA27EC:("func_80AA27EC",),
0x80AA2884:("DmStk_Update",),
0x80AA2B14:("func_80AA2B14",),
0x80AA2BC0:("func_80AA2BC0",),
0x80AA33A4:("func_80AA33A4",),
0x80AA2B14:("DmStk_OverrideLimbDraw",),
0x80AA2BC0:("DmStk_PostLimbDraw2",),
0x80AA33A4:("DmStk_PostLimbDraw",),
0x80AA33CC:("DmStk_Draw",),
0x80AA5580:("func_80AA5580",),
0x80AA561C:("func_80AA561C",),

68
undefined_syms.txt
View File

@ -1339,10 +1339,26 @@ D_06001788 = 0x06001788;
// ovl_Dm_Stk
D_0600055C = 0x0600055C;
D_06001030 = 0x06001030;
D_0600130C = 0x0600130C;
D_06001374 = 0x06001374;
D_06001EDC = 0x06001EDC;
D_06002774 = 0x06002774;
D_06002CD8 = 0x06002CD8;
D_06003068 = 0x06003068;
D_060035C8 = 0x060035C8;
D_060039F0 = 0x060039F0;
D_06004554 = 0x06004554;
D_06004580 = 0x06004580;
D_060046B0 = 0x060046B0;
D_060049C8 = 0x060049C8;
D_060051C0 = 0x060051C0;
D_060053C0 = 0x060053C0;
D_06005870 = 0x06005870;
D_06005F44 = 0x06005F44;
D_06006BB0 = 0x06006BB0;
D_060070DC = 0x060070DC;
D_06007840 = 0x06007840;
D_060079F0 = 0x060079F0;
D_060084C0 = 0x060084C0;
@ -1357,9 +1373,61 @@ D_0600A530 = 0x0600A530;
D_0600A5C0 = 0x0600A5C0;
D_0600AE30 = 0x0600AE30;
D_0600AEC0 = 0x0600AEC0;
D_0600BB2C = 0x0600BB2C;
D_0600C270 = 0x0600C270;
D_0600C964 = 0x0600C964;
D_0600CAD0 = 0x0600CAD0;
D_0600CBB8 = 0x0600CBB8;
D_0600D830 = 0x0600D830;
D_0600E6EC = 0x0600E6EC;
D_0600EEC0 = 0x0600EEC0;
D_060101A4 = 0x060101A4;
D_06010B60 = 0x06010B60;
D_060110B4 = 0x060110B4;
D_06011FB0 = 0x06011FB0;
D_06012A58 = 0x06012A58;
D_06013328 = 0x06013328;
D_060141E4 = 0x060141E4;
D_06014920 = 0x06014920;
D_06015028 = 0x06015028;
D_06015C14 = 0x06015C14;
D_06016508 = 0x06016508;
D_06016620 = 0x06016620;
D_06016910 = 0x06016910;
D_06018ED0 = 0x06018ED0;
D_0601AA80 = 0x0601AA80;
D_0601C114 = 0x0601C114;
D_0601C21C = 0x0601C21C;
D_0601D008 = 0x0601D008;
D_0601D07C = 0x0601D07C;
D_0601D3D0 = 0x0601D3D0;
D_0601DDE0 = 0x0601DDE0;
D_0601EF50 = 0x0601EF50;
D_0601F9E4 = 0x0601F9E4;
D_06020CAC = 0x06020CAC;
D_0602200C = 0x0602200C;
D_0602336C = 0x0602336C;
D_060259F4 = 0x060259F4;
D_060266C8 = 0x060266C8;
D_06026CF4 = 0x06026CF4;
D_06027CF4 = 0x06027CF4;
D_06028F28 = 0x06028F28;
D_06029A04 = 0x06029A04;
D_0602A2D8 = 0x0602A2D8;
D_0602AD54 = 0x0602AD54;
D_0602DC64 = 0x0602DC64;
D_0602E9A0 = 0x0602E9A0;
D_0602FA70 = 0x0602FA70;
D_0603021C = 0x0603021C;
D_06031210 = 0x06031210;
D_060322FC = 0x060322FC;
D_06032AE0 = 0x06032AE0;
D_0603323C = 0x0603323C;
D_06034FD8 = 0x06034FD8;
D_06036964 = 0x06036964;
D_06037B94 = 0x06037B94;
D_0603967C = 0x0603967C;
D_0603A8F8 = 0x0603A8F8;
// ovl_Dm_Tsg