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

daObj_Roten_c OK #2282

Merged
merged 1 commit into from
Jan 3, 2025
Merged

daObj_Roten_c OK #2282

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
18 changes: 9 additions & 9 deletions config/GZ2E01/rels/d_a_obj_roten/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ Execute__13daObj_Roten_cFPPA3_A4_f = .text:0x00000558; // type:function size:0x1
Draw__13daObj_Roten_cFv = .text:0x00000658; // type:function size:0x11C scope:global
Delete__13daObj_Roten_cFv = .text:0x00000774; // type:function size:0x90 scope:global
getResName__13daObj_Roten_cFv = .text:0x00000804; // type:function size:0x10 scope:global
daObj_Roten_Create__FPv = .text:0x00000814; // type:function size:0x20 scope:global
daObj_Roten_Delete__FPv = .text:0x00000834; // type:function size:0x20 scope:global
daObj_Roten_Execute__FPv = .text:0x00000854; // type:function size:0x20 scope:global
daObj_Roten_Draw__FPv = .text:0x00000874; // type:function size:0x2C scope:global
daObj_Roten_IsDelete__FPv = .text:0x000008A0; // type:function size:0x8 scope:global
daObj_Roten_Create__FPv = .text:0x00000814; // type:function size:0x20 scope:local
daObj_Roten_Delete__FPv = .text:0x00000834; // type:function size:0x20 scope:local
daObj_Roten_Execute__FPv = .text:0x00000854; // type:function size:0x20 scope:local
daObj_Roten_Draw__FPv = .text:0x00000874; // type:function size:0x2C scope:local
daObj_Roten_IsDelete__FPv = .text:0x000008A0; // type:function size:0x8 scope:local
__dt__13daObj_Roten_cFv = .text:0x000008A8; // type:function size:0x70 scope:global
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
Expand All @@ -36,9 +36,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@3880 = .rodata:0x00000038; // type:object size:0x4 scope:local
@3881 = .rodata:0x0000003C; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x00000040; // type:object size:0xA scope:local data:string_table
l_resFileName = .data:0x00000000; // type:object size:0x4 scope:global
l_bmdFileIdx = .data:0x00000004; // type:object size:0x4 scope:global data:4byte
l_dzbFileIdx = .data:0x00000008; // type:object size:0x4 scope:global data:4byte
daObj_Roten_MethodTable = .data:0x0000000C; // type:object size:0x20 scope:global
l_resFileName = .data:0x00000000; // type:object size:0x4 scope:local
l_bmdFileIdx = .data:0x00000004; // type:object size:0x4 scope:local data:4byte
l_dzbFileIdx = .data:0x00000008; // type:object size:0x4 scope:local data:4byte
daObj_Roten_MethodTable = .data:0x0000000C; // type:object size:0x20 scope:local
g_profile_OBJ_ROTEN = .data:0x0000002C; // type:object size:0x30 scope:global
__vt__13daObj_Roten_c = .data:0x0000005C; // type:object size:0x2C scope:global
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 @@ -1972,7 +1972,7 @@ def MatchingFor(*versions):
ActorRel(Matching, "d_a_obj_rock"),
ActorRel(NonMatching, "d_a_obj_rotBridge"),
ActorRel(NonMatching, "d_a_obj_rotTrap"),
ActorRel(NonMatching, "d_a_obj_roten"),
ActorRel(Matching, "d_a_obj_roten"),
ActorRel(Matching, "d_a_obj_rstair"),
ActorRel(NonMatching, "d_a_obj_rw"),
ActorRel(Matching, "d_a_obj_saidan"),
Expand Down
26 changes: 16 additions & 10 deletions include/d/actor/d_a_obj_roten.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef D_A_OBJ_ROTEN_H
#define D_A_OBJ_ROTEN_H

#include "d/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor_mng.h"

/**
Expand All @@ -11,21 +12,26 @@
* @details
*
*/
class daObj_Roten_c : public fopAc_ac_c {
class daObj_Roten_c : public dBgS_MoveBgActor {
public:
/* 80CC0B58 */ void initBaseMtx();
/* 80CC0B94 */ void setBaseMtx();
/* 80CC0C20 */ void Create();
/* 80CC0EC4 */ void CreateHeap();
/* 80CC0F40 */ void create();
/* 80CC1038 */ void Execute(f32 (**)[3][4]);
/* 80CC1138 */ void Draw();
/* 80CC1254 */ void Delete();
/* 80CC12E4 */ void getResName();
/* 80CC1388 */ ~daObj_Roten_c();
/* 80CC0C20 */ int Create();
/* 80CC0EC4 */ int CreateHeap();
/* 80CC0F40 */ int create();
/* 80CC1038 */ int Execute(Mtx**);
/* 80CC1138 */ int Draw();
/* 80CC1254 */ int Delete();
/* 80CC12E4 */ char* getResName();
/* 80CC1388 */ virtual ~daObj_Roten_c();

private:
/* 0x568 */ u8 field_0x568[0x5c8 - 0x568];
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mModel;
/* 0x5AC */ JPABaseEmitter* mEmitters[2];
/* 0x5B4 */ f32 mBossLightRefDist;
/* 0x5B8 */ cXyz mParticlePos;
/* 0x5C4 */ bool mWithinTime;
};

STATIC_ASSERT(sizeof(daObj_Roten_c) == 0x5c8);
Expand Down
Loading
Loading