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_Maruta (#725)

Browse Source 
* En_Maruta

* Match (thanks petrie)

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
This commit is contained in:
Maide
2022-03-27 11:22:16 -03:00
committed by GitHub
co-authored by Anghelo Carvajal
parent ba1595b5ad
commit 35bc48de54
4 changed files with 607 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -3993,8 +3993,7 @@ beginseg
name "ovl_En_Maruta"
compress
include "build/src/overlays/actors/ovl_En_Maruta/z_en_maruta.o"
include "build/data/ovl_En_Maruta/ovl_En_Maruta.data.o"
include "build/data/ovl_En_Maruta/ovl_En_Maruta.reloc.o"
include "build/src/overlays/actors/ovl_En_Maruta/ovl_En_Maruta_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Maruta/z_en_maruta.c
+592 -43
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Maruta/z_en_maruta.h
+14 -1
View File
@@ -7,10 +7,23 @@ struct EnMaruta;
typedef void (*EnMarutaActionFunc)(struct EnMaruta*, GlobalContext*);
#define ENMARUTA_GET_FF(thisx) ((thisx)->params & 0xFF)
#define ENMARUTA_GET_FF00(thisx) (((thisx)->params & 0xFF00) >> 8)
typedef struct EnMaruta {
/* 0x0000 */ Actor actor;
/* 0x0144 */ EnMarutaActionFunc actionFunc;
/* 0x0148 */ char unk_148[0xD8];
/* 0x0148 */ ColliderCylinder collider;
/* 0x0194 */ Vec3f unk_194;
/* 0x01A0 */ Vec3f* unk_1A0;
/* 0x01A4 */ Vec3f unk_1A4[8];
/* 0x0204 */ Vec3f unk_204;
/* 0x0210 */ s32 unk_210;
/* 0x0214 */ s32 unk_214;
/* 0x0218 */ s16 unk_218;
/* 0x021A */ s16 unk_21A;
/* 0x021C */ s16 unk_21C;
/* 0x021E */ s16 unk_21E;
/* 0x0220 */ s16 unk_220;
} EnMaruta; // size = 0x224
undefined_syms.txt
-4
View File
@@ -1472,10 +1472,6 @@ D_06011740 = 0x06011740;
D_06011BC0 = 0x06011BC0;
D_06011E48 = 0x06011E48;
// ovl_En_Maruta
D_06002EC0 = 0x06002EC0;
// ovl_En_Mnk
D_06003584 = 0x06003584;