1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-05 22:00:15 +00:00

Decompile obj_bean (magic bean and soft soil). 2 NON_MATCHINGs (#846)

* did a bunch

* Do a bunch more

* all functions in C

* Macros for draw and collision part of state flags

* Done for now

* remove ASM

* PR fixes (Elliptic)

* all angles are hex and take away bad names

* PR fixes (Roman)

* PR fixes

* PR fixes (Fig)

* restore map mark

* Fix the other messed with files
This commit is contained in:
louist103 2021-06-23 13:28:57 -04:00 committed by GitHub
parent 0a35c752e7
commit a6bd227137
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
71 changed files with 948 additions and 2645 deletions

File diff suppressed because it is too large Load diff

View file

@ -6,9 +6,36 @@
struct ObjBean;
typedef void (*ObjBeanActionFunc)(struct ObjBean*, GlobalContext*);
typedef void (*ObjBeanTransformFunc)(struct ObjBean*);
typedef struct ObjBean {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x0164 */ char unk_164[0x94];
/* 0x0164 */ ObjBeanActionFunc actionFunc;
/* 0x0168 */ ColliderCylinder collider;
/* 0x01B4 */ s16 timer;
/* 0x01B6 */ Vec3s unk_1B6;
/* 0x01BC */ ObjBeanTransformFunc transformFunc;
/* 0x01C0 */ s16 unk_1C0;
/* 0x01C2 */ s16 unk_1C2;
/* 0x01C4 */ s16 unk_1C4;
/* 0x01C6 */ s16 unk_1C6;
/* 0x01C8 */ s16 unk_1C8;
/* 0x01CA */ s16 unk_1CA;
/* 0x01CC */ s16 unk_1CC;
/* 0x01CE */ s16 unk_1CE;
/* 0x01D0 */ s16 leafRotFactor;
/* 0x01D2 */ u16 unk_1D2;
/* 0x01D4 */ f32 stalkSizeMultiplier;
/* 0x01D8 */ Vec3f pathPoints;
/* 0x01E4 */ f32 unk_1E4;
/* 0x01E8 */ f32 posOffsetX;
/* 0x01EC */ f32 posOffsetZ;
/* 0x01F0 */ s16 pathCount;
/* 0x01F2 */ s16 currentPointIndex;
/* 0x01F4 */ s16 nextPointIndex;
/* 0x01F6 */ u8 unk_1F6;
/* 0x01F7 */ u8 stateFlags;
} ObjBean; // size = 0x01F8
extern const ActorInit Obj_Bean_InitVars;