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

Merge branch 'dexihand' of https://github.com/Thar0/mm into zret

Browse Source
This commit is contained in:
RevoSucks
2023-10-30 23:13:06 -04:00
parent e8c7110449 3900ab4f0b
commit a378831e1a
4 changed files with 643 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
-1
View File
@@ -3412,7 +3412,6 @@ beginseg
name "ovl_En_Wdhand"
compress
include "build/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.o"
include "build/data/ovl_En_Wdhand/ovl_En_Wdhand.data.o"
include "build/data/ovl_En_Wdhand/ovl_En_Wdhand.reloc.o"
endseg
src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c
+632 -38
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h
+10 -2
View File
@@ -9,9 +9,17 @@ typedef void (*EnWdhandActionFunc)(struct EnWdhand*, PlayState*);
typedef struct EnWdhand {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0xA4];
/* 0x144 */ SkelAnime unk144;
/* 0x188 */ Vec3s unk188[8];
/* 0x1B8 */ Vec3s unk1B8[8];
/* 0x1E8 */ EnWdhandActionFunc actionFunc;
/* 0x1EC */ char unk_1EC[0x268];
/* 0x1EC */ Vec3s unk1EC[5];
/* 0x20C */ f32 unk20C;
/* 0x20C */ f32 unk210[3];
/* 0x21C */ MtxF unk21C;
/* 0x25C */ Vec3f unk25C[2];
/* 0x274 */ ColliderJntSph unk274;
/* 0x294 */ ColliderJntSphElement unk294[7];
} EnWdhand; // size = 0x454
#endif // Z_EN_WDHAND_H
tools/disasm/variables.txt
+1 -2
View File
@@ -13219,8 +13219,7 @@
0x80AF64DC:("D_80AF64DC","UNK_TYPE1","",0x1),
0x80AF64EC:("D_80AF64EC","UNK_TYPE1","",0x1),
0x80AF64F4:("D_80AF64F4","UNK_TYPE1","",0x1),
0x80AF6514:("D_80AF6514","UNK_TYPE1","",0x1),
0x80AF6518:("D_80AF6518","f32","",0x4),
0x80AF6514:("D_80AF6514","Vec3f","",0xC),
0x80AF6520:("D_80AF6520","UNK_TYPE1","",0x1),
0x80AF6530:("D_80AF6530","f32","",0x4),
0x80AF6534:("D_80AF6534","f32","",0x4),