Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

d_a_obj_automata OK #2263

Merged
merged 1 commit into from
Dec 11, 2024
Merged

d_a_obj_automata OK #2263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"build/**/*.o": true,
"build/**/*.plf": true,
"build/**/*.rel": true,
"orig/**/*.rel": true,
"build/**/*.lcf": true,
"build/**/*.preplf": true,
"build/**/*.d": true,
Expand Down
26 changes: 13 additions & 13 deletions config/GZ2E01/rels/d_a_obj_automata/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ setEnvTevColor__16daObj_AutoMata_cFv = .text:0x00001034; // type:function size:0
setRoomNo__16daObj_AutoMata_cFv = .text:0x00001090; // type:function size:0x44 scope:global
setMtx__16daObj_AutoMata_cFv = .text:0x000010D4; // type:function size:0x78 scope:global
setSe__16daObj_AutoMata_cFv = .text:0x0000114C; // type:function size:0x2C4 scope:global
daObj_AutoMata_Create__FPv = .text:0x00001410; // type:function size:0x20 scope:global
daObj_AutoMata_Delete__FPv = .text:0x00001430; // type:function size:0x20 scope:global
daObj_AutoMata_Execute__FPv = .text:0x00001450; // type:function size:0x20 scope:global
daObj_AutoMata_Draw__FPv = .text:0x00001470; // type:function size:0x20 scope:global
daObj_AutoMata_IsDelete__FPv = .text:0x00001490; // type:function size:0x8 scope:global
daObj_AutoMata_Create__FPv = .text:0x00001410; // type:function size:0x20 scope:local
daObj_AutoMata_Delete__FPv = .text:0x00001430; // type:function size:0x20 scope:local
daObj_AutoMata_Execute__FPv = .text:0x00001450; // type:function size:0x20 scope:local
daObj_AutoMata_Draw__FPv = .text:0x00001470; // type:function size:0x20 scope:local
daObj_AutoMata_IsDelete__FPv = .text:0x00001490; // type:function size:0x8 scope:local
__dt__10cCcD_GSttsFv = .text:0x00001498; // type:function size:0x48 scope:global
__sinit_d_a_obj_automata_cpp = .text:0x000014E0; // type:function size:0xC4 scope:local
__dt__22daObj_AutoMata_Param_cFv = .text:0x000015A4; // type:function size:0x48 scope:global
Expand All @@ -38,7 +38,7 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc
_dtors = .dtors:0x00000000; // type:label scope:global
...rodata.0 = .rodata:0x00000000; // type:label scope:local
m__22daObj_AutoMata_Param_c = .rodata:0x00000000; // type:object size:0xC scope:global
l_ccDObjData = .rodata:0x0000000C; // type:object size:0x30 scope:global
l_ccDObjData = .rodata:0x0000000C; // type:object size:0x30 scope:local
@3962 = .rodata:0x0000003C; // type:object size:0x4 scope:local
@3963 = .rodata:0x00000040; // type:object size:0x4 scope:local
@3964 = .rodata:0x00000044; // type:object size:0x4 scope:local
Expand All @@ -60,13 +60,13 @@ playMode$4222 = .rodata:0x00000078; // type:object size:0x8 scope:local
@4352 = .rodata:0x00000090; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x00000094; // type:object size:0xA 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
l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global
l_resNameList = .data:0x00000028; // type:object size:0x8 scope:global
l_ccDCyl = .data:0x00000030; // type:object size:0x44 scope:global
l_ccDSph = .data:0x00000074; // type:object size:0x40 scope:global
daObj_AutoMata_MethodTable = .data:0x000000B4; // type:object size:0x20 scope:global
l_bmdData = .data:0x00000020; // type:object size:0x8 scope:local
l_resNameList = .data:0x00000028; // type:object size:0x8 scope:local
l_ccDCyl = .data:0x00000030; // type:object size:0x44 scope:local
l_ccDSph = .data:0x00000074; // type:object size:0x40 scope:local
daObj_AutoMata_MethodTable = .data:0x000000B4; // type:object size:0x20 scope:local
g_profile_OBJ_AUTOMATA = .data:0x000000D4; // type:object size:0x30 scope:global
__vt__12J3DFrameCtrl = .data:0x00000104; // type:object size:0xC scope:global
__vt__12dBgS_ObjAcch = .data:0x00000110; // type:object size:0x24 scope:global
Expand All @@ -80,4 +80,4 @@ __vt__16daObj_AutoMata_c = .data:0x0000017C; // type:object size:0xC scope:globa
__vt__22daObj_AutoMata_Param_c = .data:0x00000188; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@3801 = .bss:0x00000008; // type:object size:0xC scope:local
l_HIO = .bss:0x00000014; // type:object size:0x4 scope:global data:4byte
l_HIO = .bss:0x00000014; // type:object size:0x4 scope:local data:4byte
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1764,7 +1764,7 @@ def MatchingFor(*versions):
ActorRel(NonMatching, "d_a_obj_Y_taihou"),
ActorRel(NonMatching, "d_a_obj_amiShutter"),
ActorRel(Matching, "d_a_obj_ari"),
ActorRel(NonMatching, "d_a_obj_automata"),
ActorRel(Matching, "d_a_obj_automata"),
ActorRel(Matching, "d_a_obj_avalanche"),
ActorRel(Matching, "d_a_obj_balloon"),
ActorRel(Matching, "d_a_obj_barDesk"),
Expand Down
48 changes: 32 additions & 16 deletions include/d/actor/d_a_obj_automata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#ifndef D_A_OBJ_AUTOMATA_H
#define D_A_OBJ_AUTOMATA_H

#include "f_op/f_op_actor_mng.h"
#include "d/d_bg_s_acch.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor.h"

/**
* @ingroup actors-objects
Expand All @@ -12,33 +14,47 @@
*
*/
class daObj_AutoMata_c : public fopAc_ac_c {
private:
/* 0x568 */ int field_0x568;
/* 0x56C */ mDoExt_McaMorfSO* mpMorf;
/* 0x570 */ Z2Creature mCreature;
/* 0x600 */ mDoExt_btkAnm mBtk;
/* 0x618 */ request_of_phase_process_class mPhase;
/* 0x630 */ dBgS_ObjAcch mAcch;
/* 0x7F8 */ dCcD_Stts mStts;
/* 0x834 */ dBgS_AcchCir field_0x834;
/* 0x874 */ cBgS_GndChk mGndChk;
/* 0x8B0 */ dCcD_Cyl mCyl;
/* 0x9EC */ dCcD_Sph mSph;
/* 0xB24 */ int mShadowId;
/* 0xB28 */ f32 mGroundH;
/* 0xB2C */ f32 mAnmPlaySpeed;
/* 0xB30 */ u8 field_0xb30;
/* 0xB31 */ u8 field_0xb31;

public:
/* 80BA56EC */ ~daObj_AutoMata_c();
/* 80BA5990 */ void create();
/* 80BA5F88 */ void CreateHeap();
/* 80BA60A0 */ void Delete();
/* 80BA60D4 */ void Execute();
/* 80BA639C */ void Draw();
/* 80BA6480 */ void createHeapCallBack(fopAc_ac_c*);
/* 80BA64A0 */ void srchTHouse(fopAc_ac_c*, void*);
/* 80BA6500 */ void setAnm(int, bool);
/* 80BA56EC */ virtual ~daObj_AutoMata_c();
/* 80BA5990 */ int create();
/* 80BA5F88 */ int CreateHeap();
/* 80BA60A0 */ int Delete();
/* 80BA60D4 */ int Execute();
/* 80BA639C */ int Draw();
/* 80BA6480 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80BA64A0 */ static void* srchTHouse(fopAc_ac_c*, void*);
/* 80BA6500 */ int setAnm(int, bool);
/* 80BA6634 */ void setEnvTevColor();
/* 80BA6690 */ void setRoomNo();
/* 80BA66D4 */ void setMtx();
/* 80BA674C */ void setSe();

private:
/* 0x568 */ u8 field_0x568[0xb38 - 0x568];
};

STATIC_ASSERT(sizeof(daObj_AutoMata_c) == 0xb38);

class daObj_AutoMata_Param_c {
public:
/* 80BA6BA4 */ ~daObj_AutoMata_Param_c();
/* 80BA6BA4 */ virtual ~daObj_AutoMata_Param_c() {}

static u8 const m[12];
static f32 const m[3];
};


#endif /* D_A_OBJ_AUTOMATA_H */
Loading
Loading