mirror of https://github.com/zeldaret/tp.git
d_a_obj_lv6TogeRoll matching (#2377)
* d_a_obj_lv6TogeRoll almost matching * Various improvements * Matching * unk rel data
This commit is contained in:
hev7
GitHub
parent
c0e111b081
commit
c3fccc2877
|
|
@ -35,10 +35,10 @@ modeBreak__12daTogeRoll_cFv = .text:0x00001888; // type:function size:0x220 scop
|
|||
setNextPoint__12daTogeRoll_cFv = .text:0x00001AA8; // type:function size:0x12C scope:global
|
||||
Draw__12daTogeRoll_cFv = .text:0x00001BD4; // type:function size:0xA4 scope:global
|
||||
Delete__12daTogeRoll_cFv = .text:0x00001C78; // type:function size:0x44 scope:global
|
||||
daTogeRoll_Draw__FP12daTogeRoll_c = .text:0x00001CBC; // type:function size:0x2C scope:global
|
||||
daTogeRoll_Execute__FP12daTogeRoll_c = .text:0x00001CE8; // type:function size:0x20 scope:global
|
||||
daTogeRoll_Delete__FP12daTogeRoll_c = .text:0x00001D08; // type:function size:0x20 scope:global
|
||||
daTogeRoll_Create__FP10fopAc_ac_c = .text:0x00001D28; // type:function size:0x20 scope:global
|
||||
daTogeRoll_Draw__FP12daTogeRoll_c = .text:0x00001CBC; // type:function size:0x2C scope:local
|
||||
daTogeRoll_Execute__FP12daTogeRoll_c = .text:0x00001CE8; // type:function size:0x20 scope:local
|
||||
daTogeRoll_Delete__FP12daTogeRoll_c = .text:0x00001D08; // type:function size:0x20 scope:local
|
||||
daTogeRoll_Create__FP10fopAc_ac_c = .text:0x00001D28; // type:function size:0x20 scope:local
|
||||
__dt__10cCcD_GSttsFv = .text:0x00001D48; // type:function size:0x48 scope:global
|
||||
__dt__16daTogeRoll_HIO_cFv = .text:0x00001D90; // type:function size:0x5C scope:global
|
||||
__sinit_d_a_obj_lv6TogeRoll_cpp = .text:0x00001DEC; // type:function size:0xA4 scope:local
|
||||
|
|
@ -71,7 +71,7 @@ mSpeed__12daTogeRoll_c = .rodata:0x0000006C; // type:object size:0x40 scope:glob
|
|||
@4285 = .rodata:0x000000FC; // type:object size:0x4 scope:local
|
||||
@stringBase0 = .rodata:0x00000100; // type:object size:0x8 scope:local data:string_table
|
||||
...data.0 = .data:0x00000000; // type:label scope:local
|
||||
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
|
||||
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
|
||||
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
|
||||
mCcDSph__12daTogeRoll_c = .data:0x00000020; // type:object size:0x40 scope:global
|
||||
mCcDCps__12daTogeRoll_c = .data:0x00000060; // type:object size:0x4C scope:global
|
||||
|
|
@ -85,7 +85,7 @@ mCcDCps__12daTogeRoll_c = .data:0x00000060; // type:object size:0x4C scope:globa
|
|||
@3978 = .data:0x00000100; // type:object size:0xC scope:local
|
||||
@3979 = .data:0x0000010C; // type:object size:0xC scope:local
|
||||
mode_proc$3970 = .data:0x00000118; // type:object size:0x6C scope:local
|
||||
l_daTogeRoll_Method = .data:0x00000184; // type:object size:0x20 scope:global
|
||||
l_daTogeRoll_Method = .data:0x00000184; // type:object size:0x20 scope:local
|
||||
g_profile_Obj_Lv6TogeRoll = .data:0x000001A4; // type:object size:0x30 scope:global
|
||||
__vt__10cCcD_GStts = .data:0x000001D4; // type:object size:0xC scope:global
|
||||
__vt__10dCcD_GStts = .data:0x000001E0; // type:object size:0xC scope:global
|
||||
|
|
@ -96,5 +96,5 @@ __vt__16daTogeRoll_HIO_c = .data:0x0000022C; // type:object size:0xC scope:globa
|
|||
__vt__14mDoHIO_entry_c = .data:0x00000238; // type:object size:0xC scope:global
|
||||
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
|
||||
@3645 = .bss:0x00000008; // type:object size:0xC scope:local
|
||||
l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global data:float
|
||||
l_HIO = .bss:0x00000014; // type:object size:0x14 scope:local data:float
|
||||
lbl_550_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte
|
||||
|
|
|
|||
|
|
@ -1988,7 +1988,7 @@ config.libs = [
|
|||
ActorRel(NonMatching, "d_a_obj_lv6SwGate"),
|
||||
ActorRel(NonMatching, "d_a_obj_lv6SzGate"),
|
||||
ActorRel(NonMatching, "d_a_obj_lv6Tenbin"),
|
||||
ActorRel(NonMatching, "d_a_obj_lv6TogeRoll"),
|
||||
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv6TogeRoll"),
|
||||
ActorRel(NonMatching, "d_a_obj_lv6TogeTrap"),
|
||||
ActorRel(NonMatching, "d_a_obj_lv6bemos"),
|
||||
ActorRel(NonMatching, "d_a_obj_lv6bemos2"),
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
#ifndef D_A_OBJ_LV6TOGEROLL_H
|
||||
#define D_A_OBJ_LV6TOGEROLL_H
|
||||
|
||||
#include "d/d_bg_s_movebg_actor.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "d/d_cc_uty.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
/**
|
||||
|
|
@ -11,12 +15,26 @@
|
|||
* @details
|
||||
*
|
||||
*/
|
||||
class daTogeRoll_c : public fopAc_ac_c {
|
||||
class daTogeRoll_c : public dBgS_MoveBgActor {
|
||||
public:
|
||||
typedef void (daTogeRoll_c::*modeFunc)();
|
||||
|
||||
enum Mode {
|
||||
MODE_ACC,
|
||||
MODE_MOVE,
|
||||
MODE_BRK,
|
||||
MODE_WAIT,
|
||||
MODE_WAIT_INIT,
|
||||
MODE_BREAK,
|
||||
MODE_BOUND,
|
||||
MODE_BOUND_2,
|
||||
MODE_BOUND_WAIT,
|
||||
};
|
||||
|
||||
/* 80C77CC8 */ void setBaseMtx();
|
||||
/* 80C77D50 */ void CreateHeap();
|
||||
/* 80C77DBC */ void create();
|
||||
/* 80C78294 */ void Execute(f32 (**)[3][4]);
|
||||
/* 80C77D50 */ int CreateHeap();
|
||||
/* 80C77DBC */ int create();
|
||||
/* 80C78294 */ int Execute(Mtx**);
|
||||
/* 80C78638 */ void moveTogeRoll();
|
||||
/* 80C78A8C */ void init_modeBound();
|
||||
/* 80C78B7C */ void modeBound();
|
||||
|
|
@ -36,26 +54,59 @@ public:
|
|||
/* 80C79344 */ void init_modeBreak();
|
||||
/* 80C793C8 */ void modeBreak();
|
||||
/* 80C795E8 */ void setNextPoint();
|
||||
/* 80C79714 */ void Draw();
|
||||
/* 80C797B8 */ void Delete();
|
||||
/* 80C79714 */ int Draw();
|
||||
/* 80C797B8 */ int Delete();
|
||||
|
||||
static u8 const mCcDObjInfo[48];
|
||||
static u8 const mCcDObjInfo2[48];
|
||||
static u8 const mSpeed[64];
|
||||
static u8 mCcDSph[64];
|
||||
static u8 mCcDCps[76];
|
||||
u32 getPathID() { return fopAcM_GetParamBit(this, 0, 8); }
|
||||
u32 getSpeed() { return fopAcM_GetParamBit(this, 8, 4); }
|
||||
|
||||
static dCcD_SrcGObjInf const mCcDObjInfo;
|
||||
static dCcD_SrcGObjInf const mCcDObjInfo2;
|
||||
static f32 const mSpeed[];
|
||||
static dCcD_SrcSph mCcDSph;
|
||||
static dCcD_SrcCps mCcDCps;
|
||||
|
||||
private:
|
||||
/* 0x568 */ u8 field_0x568[0x117c - 0x568];
|
||||
/* 0x05A0 */ request_of_phase_process_class mPhase;
|
||||
/* 0x05A8 */ J3DModel* mpModel;
|
||||
/* 0x05AC */ u8 mPathID;
|
||||
/* 0x05AD */ s8 field_0x5ad;
|
||||
/* 0x05AE */ s16 field_0x5ae;
|
||||
/* 0x05B0 */ cXyz field_0x5b0;
|
||||
/* 0x05BC */ cXyz field_0x5bc;
|
||||
/* 0x05C8 */ cXyz field_0x5c8;
|
||||
/* 0x05D4 */ f32 field_0x5d4;
|
||||
/* 0x05D8 */ u8 mMode;
|
||||
/* 0x05D9 */ u8 field_0x5d9;
|
||||
/* 0x05DA */ u8 field_0x5da;
|
||||
/* 0x05DB */ u8 field_0x5db;
|
||||
/* 0x05DC */ u8 field_0x5dc;
|
||||
/* 0x05E0 */ cXyz field_0x5e0;
|
||||
/* 0x05EC */ cXyz field_0x5ec;
|
||||
/* 0x05F8 */ f32 field_0x5f8;
|
||||
/* 0x05FC */ dCcD_Stts mStts;
|
||||
/* 0x0638 */ dCcD_Sph mSph[8];
|
||||
/* 0x0FF8 */ dCcD_Cps mCps;
|
||||
/* 0x113C */ cM3dGCpsS field_0x113c;
|
||||
/* 0x1158 */ u8 field_0x1158;
|
||||
/* 0x115C */ Z2SoundObjSimple mSound;
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(daTogeRoll_c) == 0x117c);
|
||||
|
||||
class daTogeRoll_HIO_c {
|
||||
class daTogeRoll_HIO_c : public mDoHIO_entry_c {
|
||||
public:
|
||||
/* 80C77C2C */ daTogeRoll_HIO_c();
|
||||
/* 80C798D0 */ ~daTogeRoll_HIO_c();
|
||||
/* 80C798D0 */ ~daTogeRoll_HIO_c() {}
|
||||
|
||||
/* 0x00 */ /* vtable */
|
||||
|
||||
/* 0x04 */ s8 field_0x04;
|
||||
/* 0x05 */ s8 field_0x05;
|
||||
/* 0x06 */ s8 field_0x06;
|
||||
/* 0x08 */ f32 field_0x08;
|
||||
/* 0x0c */ f32 field_0x0c;
|
||||
/* 0x10 */ f32 field_0x10;
|
||||
};
|
||||
|
||||
|
||||
#endif /* D_A_OBJ_LV6TOGEROLL_H */
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue