mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
Obj_Kendo_Kanban OK and Documented (Decomp was mostly done already) (#1057)
* stuff * Renaming in-process - Changed action names and setup names based on examples. - Undid some ill-advised changes that broke matching. - Misc variable naming. Need verification and not all complete. * wip renaming * A bit more progress on determining names for everything. * Done with naming. * Touchup before review * Updates from review: - Leave displacementY/unk_AC0 naming to z_actor work. - Remove unnecessary include of z64math.h, indirect inclusion preferred - Add trailing comma for better formatting of sDisplayLists - Rename of static vectors sNullVec3f->sZeroVec, sUnitVectorX->sUnitVecX - Restore pad instead of using local const. Change const to #define - Prefer index over idx - Remove 'b' prefix from bHasNewRootCornerPos - Const -> Enum and formatting in ObjKendoKanban_IsPlayerOnTop - Rename 'Aerial' to 'Tumble' * Missed items in review: - Missed an instance of displacementY->unk_AC0 renaming (Cause of build failure) - Whitespace formatting - UNK_TYPE2 undo * More adjustments from review: - Undo accidental formatting changes to z64player.h, restoring to master. - Naming and Formatting changes. - Removing some comments. * From review, qualify enum and #define with obj name, whitespace cleanup.
This commit is contained in:
@@ -3910,11 +3910,7 @@ beginseg
|
||||
name "ovl_Obj_Kendo_Kanban"
|
||||
compress
|
||||
include "build/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.o"
|
||||
#ifdef NON_MATCHING
|
||||
include "build/src/overlays/actors/ovl_Obj_Kendo_Kanban/ovl_Obj_Kendo_Kanban_reloc.o"
|
||||
#else
|
||||
include "build/data/ovl_Obj_Kendo_Kanban/ovl_Obj_Kendo_Kanban.reloc.o"
|
||||
#endif
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -7,13 +7,7 @@ struct ObjKendoKanban;
|
||||
|
||||
typedef void (*ObjKendoKanbanActionFunc)(struct ObjKendoKanban*, PlayState*);
|
||||
|
||||
#define OBJKENDOKANBAN_GET_F(thisx) ((thisx)->params & 0xF)
|
||||
|
||||
#define OBJKENDOKANBAN_F_0 0
|
||||
#define OBJKENDOKANBAN_F_1 (1 << 0)
|
||||
#define OBJKENDOKANBAN_F_2 (1 << 1)
|
||||
#define OBJKENDOKANBAN_F_4 (1 << 2)
|
||||
#define OBJKENDOKANBAN_F_8 (1 << 3)
|
||||
#define OBJKENDOKANBAN_GET_BOARD_FRAGMENTS(thisx) ((thisx)->params & 0xF)
|
||||
|
||||
typedef struct ObjKendoKanban {
|
||||
/* 0x000 */ Actor actor;
|
||||
@@ -21,20 +15,20 @@ typedef struct ObjKendoKanban {
|
||||
/* 0x190 */ ColliderTris colliderTris;
|
||||
/* 0x1B0 */ ColliderTrisElement colliderTrisElements[2];
|
||||
/* 0x268 */ ObjKendoKanbanActionFunc actionFunc;
|
||||
/* 0x26C */ Vec3f unk_26C[4];
|
||||
/* 0x29C */ Vec3f unk_29C[4];
|
||||
/* 0x2CC */ Vec3f unk_2CC;
|
||||
/* 0x2D8 */ Vec3f unk_2D8;
|
||||
/* 0x2E4 */ Vec3f unk_2E4;
|
||||
/* 0x2F0 */ Vec3f unk_2F0;
|
||||
/* 0x2FC */ s32 unk_2FC;
|
||||
/* 0x300 */ s16 unk_300;
|
||||
/* 0x302 */ s16 unk_302;
|
||||
/* 0x304 */ s16 unk_304;
|
||||
/* 0x26C */ Vec3f cornerPos[4];
|
||||
/* 0x29C */ Vec3f cornerPoints[4];
|
||||
/* 0x2CC */ Vec3f centerPoint;
|
||||
/* 0x2D8 */ Vec3f centerPos;
|
||||
/* 0x2E4 */ Vec3f rootCornerPos;
|
||||
/* 0x2F0 */ Vec3f rotAxis;
|
||||
/* 0x2FC */ s32 indexLastRootCornerPos;
|
||||
/* 0x300 */ s16 hasNewRootCornerPos;
|
||||
/* 0x302 */ s16 rotAngle;
|
||||
/* 0x304 */ s16 rotVelocity;
|
||||
/* 0x306 */ UNK_TYPE1 pad306[2];
|
||||
/* 0x308 */ s16 unk_308;
|
||||
/* 0x308 */ s16 numBounces;
|
||||
/* 0x30A */ s16 unk_30A;
|
||||
/* 0x30C */ u8 unk_30C;
|
||||
/* 0x30C */ u8 boardFragments;
|
||||
} ObjKendoKanban; // size = 0x310
|
||||
|
||||
extern const ActorInit Obj_Kendo_Kanban_InitVars;
|
||||
|
||||
@@ -14230,15 +14230,15 @@
|
||||
0x80B64DFC:("func_80B64DFC",),
|
||||
0x80B654C0:("ObjKendoKanban_Init",),
|
||||
0x80B65840:("ObjKendoKanban_Destroy",),
|
||||
0x80B65880:("func_80B65880",),
|
||||
0x80B65894:("func_80B65894",),
|
||||
0x80B658A4:("func_80B658A4",),
|
||||
0x80B65CE0:("func_80B65CE0",),
|
||||
0x80B65D54:("func_80B65D54",),
|
||||
0x80B65D68:("func_80B65D68",),
|
||||
0x80B65DA8:("func_80B65DA8",),
|
||||
0x80B6618C:("func_80B6618C",),
|
||||
0x80B66304:("func_80B66304",),
|
||||
0x80B65880:("ObjKendoKanban_SetupDoNothing",),
|
||||
0x80B65894:("ObjKendoKanban_DoNothing",),
|
||||
0x80B658A4:("ObjKendoKanban_SetupTumble",),
|
||||
0x80B65CE0:("ObjKendoKanban_Tumble",),
|
||||
0x80B65D54:("ObjKendoKanban_SetupSettled",),
|
||||
0x80B65D68:("ObjKendoKanban_Settled",),
|
||||
0x80B65DA8:("ObjKendoKanban_HandlePhysics",),
|
||||
0x80B6618C:("ObjKendoKanban_IsPlayerOnTop",),
|
||||
0x80B66304:("ObjKendoKanban_UpdateCollision",),
|
||||
0x80B66418:("ObjKendoKanban_Update",),
|
||||
0x80B66454:("ObjKendoKanban_Draw",),
|
||||
0x80B66A20:("ObjHariko_Init",),
|
||||
|
||||
Reference in New Issue
Block a user