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

EnOsn OK (#603)

Browse Source 
* start working on struct

* init matching

* destroy matched

* func_80AD0830 and update matching

* func_80AD1634 matching

* idle matching

* func_80AD16A8 matching

* cleanup

* func_80AD0A24 matching

* cleanup

* func_80AD144C matching

* func_80AD14C8 almost matchign

* func_80AD14C8 matching

* func_80AD19A0 matching

* func_80AD0AB0 matching

* func_80AD0998 matching

* func_80AD1398 matchign

* cleanup

* func_80AD0B38 matching

* func_80AD0E10 matching

* func_80AD08B0 matching

* func_80AD10FC matching

* EnOsn_Draw matching

* func_80AD1DA8 matching

* func_80AD1E28 matching

* document

* update kafei mask

* import data

* actorfixer

* fix warnings

* cleanup

* format and cleanup

* use unk_type

* most feedback done

* format

* change unks to vec3s

* treat as bool

* use CHECK_QUEST_ITEM macro

* use CHECK_QUEST_ITEM macro

* some documentation

* format

* some feedback done

* fix fallthrough spacing in switch

* split up func_80AD1398

* format

* more feedback

* param macro

* use param macro

* replace returns with break

* remove padding

* fix for upstream merge

* feedback

* move some data inline

* feedback

* fetch upstream

Co-authored-by: retro <retro@retros-air.home>
Co-authored-by: retro <retro@retros-mbp.home>
Co-authored-by: retro <retro@retros-MacBook-Pro.local>
This commit is contained in:
retro
2022-02-19 19:48:05 +00:00
committed by GitHub
co-authored by retro retro retro
parent 271cf4de70
commit 557825636f
4 changed files with 853 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -3561,8 +3561,7 @@ beginseg
name "ovl_En_Osn"
compress
include "build/src/overlays/actors/ovl_En_Osn/z_en_osn.o"
include "build/data/ovl_En_Osn/ovl_En_Osn.data.o"
include "build/data/ovl_En_Osn/ovl_En_Osn.reloc.o"
include "build/src/overlays/actors/ovl_En_Osn/ovl_En_Osn_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Osn/z_en_osn.c
+832 -40
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Osn/z_en_osn.h
+17 -3
View File
@@ -9,11 +9,25 @@ typedef void (*EnOsnActionFunc)(struct EnOsn*, GlobalContext*);
typedef struct EnOsn {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x90];
/* 0x0144 */ ColliderCylinder collider;
/* 0X0190 */ SkelAnime skelAnime;
/* 0x01D4 */ EnOsnActionFunc actionFunc;
/* 0x01D8 */ char unk_1D8[0x28];
} EnOsn; // size = 0x200
/* 0x01D8 */ Vec3s unk_1D8;
/* 0x01DE */ Vec3s unk_1DE;
/* 0x01E4 */ UNK_TYPE1 unk_1E4[0x6];
/* 0x01EA */ u16 unk_1EA;
/* 0x01EC */ u8 unk_1EC;
/* 0x01ED */ u8 unk_1ED;
/* 0x01EE */ s16 cutscene;
/* 0x01F0 */ u8 unk_1F0;
/* 0x01F1 */ UNK_TYPE1 unk_1F1[0x3];
/* 0x01F4 */ u16 unk_1F4;
/* 0x01F6 */ s32 unk_1F6;
/* 0x01FA */ u8 unk_1FA;
} EnOsn; // size = 0x1FB
extern const ActorInit En_Osn_InitVars;
#define ENOSN_GET_3(this) ((thisx)->params & 3)
#endif // Z_EN_OSN_H
tools/disasm/functions.txt
+3 -3
View File
@@ -12149,12 +12149,12 @@
0x80AD1634:("func_80AD1634",),
0x80AD16A8:("func_80AD16A8",),
0x80AD19A0:("func_80AD19A0",),
0x80AD1A4C:("func_80AD1A4C",),
0x80AD1A4C:("EnOsn_Idle",),
0x80AD1A5C:("EnOsn_Init",),
0x80AD1C88:("EnOsn_Destroy",),
0x80AD1CC8:("EnOsn_Update",),
0x80AD1DA8:("func_80AD1DA8",),
0x80AD1E28:("func_80AD1E28",),
0x80AD1DA8:("EnOsn_OverrideLimbDraw",),
0x80AD1E28:("EnOsn_PostLimbDraw",),
0x80AD1F88:("EnOsn_Draw",),
0x80AD2B70:("BgCtowerGear_Splash",),
0x80AD2E84:("BgCtowerGear_Init",),