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

z_en_lift_nuts.c OK (#889)

Browse Source 
* progress

* progress

* merge

* progress

* .

* progress

* two functions left!

* one function left

* it matches!

* update

* Updated spec

* globalcontext to playstate

* cleanup

* Made suggested changes

* ran format.sh

* made suggested changes

* Made suggested changes

* various fixes

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* format

* Update src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

* yes

Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
This commit is contained in:
Lucas Shaw
2022-10-21 18:28:36 +01:00
committed by GitHub
co-authored by angie Derek Hensley EllipticEllipsis
parent a848bb138d
commit 7d753ddabb
3 changed files with 953 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -3453,8 +3453,7 @@ beginseg
name "ovl_En_Lift_Nuts"
compress
include "build/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.o"
include "build/data/ovl_En_Lift_Nuts/ovl_En_Lift_Nuts.data.o"
include "build/data/ovl_En_Lift_Nuts/ovl_En_Lift_Nuts.reloc.o"
include "build/src/overlays/actors/ovl_En_Lift_Nuts/ovl_En_Lift_Nuts_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c
+935 -57
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h
+17 -2
View File
@@ -2,16 +2,31 @@
#define Z_EN_LIFT_NUTS_H
#include "global.h"
#include "objects/object_dnt/object_dnt.h"
struct EnLiftNuts;
typedef void (*EnLiftNutsActionFunc)(struct EnLiftNuts*, PlayState*);
#define ENLIFTNUTS_GET_FF00(thisx) (((thisx)->params & 0xFF00) >> 8)
typedef struct EnLiftNuts {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x90];
/* 0x144 */ ColliderCylinder collider;
/* 0x190 */ SkelAnime skelAnime;
/* 0x1D4 */ EnLiftNutsActionFunc actionFunc;
/* 0x1D8 */ char unk_1D8[0x180];
/* 0x1D8 */ Vec3f vec_1D8;
/* 0x1E4 */ s32 unk_1E4;
/* 0x1E8 */ s32 unk_1E8;
/* 0x1EC */ s16* ptr_1EC;
/* 0x1F0 */ Vec3s jointTable[OBJECT_DNT_LIMB_MAX];
/* 0x298 */ Vec3s morphTable[OBJECT_DNT_LIMB_MAX];
/* 0x340 */ UNK_TYPE1 unk_340[0xC];
/* 0x34C */ s16 textId;
/* 0x34E */ s16 unk_34E;
/* 0x350 */ UNK_TYPE1 unk_350[0x4];
/* 0x354 */ s16 unk_354;
/* 0x356 */ s16 unk_356;
} EnLiftNuts; // size = 0x358
#endif // Z_EN_LIFT_NUTS_H