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_Osk (#670)

Browse Source 
* En_Osk

* PR

* run actorfixer

Co-authored-by: angie <angheloalf95@gmail.com>
This commit is contained in:
Maide
2022-03-09 23:19:00 -03:00
committed by GitHub
co-authored by angie
parent fa321be0f3
commit 6ed7b0849c
4 changed files with 526 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -4970,8 +4970,7 @@ beginseg
name "ovl_En_Osk"
compress
include "build/src/overlays/actors/ovl_En_Osk/z_en_osk.o"
include "build/data/ovl_En_Osk/ovl_En_Osk.data.o"
include "build/data/ovl_En_Osk/ovl_En_Osk.reloc.o"
include "build/src/overlays/actors/ovl_En_Osk/ovl_En_Osk_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Osk/z_en_osk.c
+513 -21
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Osk/z_en_osk.h
+12 -1
View File
@@ -7,9 +7,20 @@ struct EnOsk;
typedef void (*EnOskActionFunc)(struct EnOsk*, GlobalContext*);
#define ENOSK_GET_F(thisx) ((thisx)->params & 0xF)
#define ENOSK_1 1
#define ENOSK_2 2
typedef struct EnOsk {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x11C];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ Vec3s jointTable[17];
/* 0x01EE */ Vec3s morphTable[17];
/* 0x0254 */ s16 unk_254;
/* 0x0256 */ s16 unk_256;
/* 0x0258 */ u16 unk_258;
/* 0x025C */ f32 unk_25C;
/* 0x0260 */ EnOskActionFunc actionFunc;
} EnOsk; // size = 0x264
undefined_syms.txt
-9
View File
@@ -1624,15 +1624,6 @@ D_06003EE4 = 0x06003EE4;
D_06004204 = 0x06004204;
D_0600466C = 0x0600466C;
// ovl_En_Osk
D_060000B8 = 0x060000B8;
D_060038F0 = 0x060038F0;
D_06006808 = 0x06006808;
D_06007B48 = 0x06007B48;
D_06009F00 = 0x06009F00;
D_0600B490 = 0x0600B490;
// ovl_En_Osn
D_060192A0 = 0x060192A0;