falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_cwall almost matching (#2270) 

* d_a_obj_cwall almost matching

* d_a_obj_pdoor OK
This commit is contained in:
hatal175 2024-12-28 05:16:59 +02:00 committed by GitHub
parent ad2badcd29
commit c429ce21eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 1033 additions and 1208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config/GZ2E01/rels/d_a_obj_pdoor/symbols.txt
View File

@ -1,7 +1,7 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global
PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel = .text:0x00000078; // type:function size:0x104 scope:global
PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel = .text:0x00000078; // type:function size:0x104 scope:local
initBaseMtx__12daObjPDoor_cFv = .text:0x0000017C; // type:function size:0x3C scope:global
setBaseMtx__12daObjPDoor_cFv = .text:0x000001B8; // type:function size:0x64 scope:global
Create__12daObjPDoor_cFv = .text:0x0000021C; // type:function size:0x110 scope:global
@ -15,10 +15,10 @@ init_modeRotate__12daObjPDoor_cFv = .text:0x00000878; // type:function size:0x1C
modeRotate__12daObjPDoor_cFv = .text:0x00000894; // type:function size:0x2B4 scope:global
Draw__12daObjPDoor_cFv = .text:0x00000B48; // type:function size:0xA4 scope:global
Delete__12daObjPDoor_cFv = .text:0x00000BEC; // type:function size:0x40 scope:global
daObjPDoor_create1st__FP12daObjPDoor_c = .text:0x00000C2C; // type:function size:0x60 scope:global
daObjPDoor_MoveBGDelete__FP12daObjPDoor_c = .text:0x00000C8C; // type:function size:0x20 scope:global
daObjPDoor_MoveBGExecute__FP12daObjPDoor_c = .text:0x00000CAC; // type:function size:0x20 scope:global
daObjPDoor_MoveBGDraw__FP12daObjPDoor_c = .text:0x00000CCC; // type:function size:0x2C scope:global
daObjPDoor_create1st__FP12daObjPDoor_c = .text:0x00000C2C; // type:function size:0x60 scope:local
daObjPDoor_MoveBGDelete__FP12daObjPDoor_c = .text:0x00000C8C; // type:function size:0x20 scope:local
daObjPDoor_MoveBGExecute__FP12daObjPDoor_c = .text:0x00000CAC; // type:function size:0x20 scope:local
daObjPDoor_MoveBGDraw__FP12daObjPDoor_c = .text:0x00000CCC; // type:function size:0x2C scope:local
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
...rodata.0 = .rodata:0x00000000; // type:label scope:local
@ -31,14 +31,14 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@4054 = .rodata:0x0000001C; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x00000020; // 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_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte
l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global data:float
l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte
l_cull_box = .data:0x00000024; // type:object size:0x18 scope:local data:float
@3781 = .data:0x0000003C; // type:object size:0xC scope:local
@3782 = .data:0x00000048; // type:object size:0xC scope:local
l_func$3780 = .data:0x00000054; // type:object size:0x18 scope:local
daObjPDoor_METHODS = .data:0x0000006C; // type:object size:0x20 scope:global
daObjPDoor_METHODS = .data:0x0000006C; // type:object size:0x20 scope:local
g_profile_Obj_PushDoor = .data:0x0000008C; // type:object size:0x30 scope:global
__vt__12daObjPDoor_c = .data:0x000000BC; // type:object size:0x28 scope:global
lbl_589_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
lbl_589_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte

4
configure.py
View File

@ -1798,7 +1798,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_crvlh_up"),
ActorRel(Matching, "d_a_obj_crvsteel"),
ActorRel(Matching, "d_a_obj_crystal"),
ActorRel(NonMatching, "d_a_obj_cwall"),
ActorRel(Equivalent, "d_a_obj_cwall"),
ActorRel(Matching, "d_a_obj_damCps"),
ActorRel(Matching, "d_a_obj_dan"),
ActorRel(Matching, "d_a_obj_digholl"),
@ -1954,7 +1954,7 @@ config.libs = [
ActorRel(Matching, "d_a_obj_onsen"),
ActorRel(Matching, "d_a_obj_onsenFire"),
ActorRel(Matching, "d_a_obj_onsenTaru"),
ActorRel(NonMatching, "d_a_obj_pdoor"),
ActorRel(Matching, "d_a_obj_pdoor"),
ActorRel(Matching, "d_a_obj_pdtile"),
ActorRel(NonMatching, "d_a_obj_pdwall"),
ActorRel(NonMatching, "d_a_obj_picture"),

73
include/d/actor/d_a_obj_cwall.h
View File

@ -1,6 +1,8 @@
#ifndef D_A_OBJ_CWALL_H
#define D_A_OBJ_CWALL_H
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
/**
@ -11,21 +13,30 @@
* @details
*
*/
class daObjCwall_c : public fopAc_ac_c {
class daObjCwall_c : public dBgS_MoveBgActor {
public:
struct chain_s {
public:
/* 80BD6E94 */ ~chain_s();
/* 80BD6ED0 */ chain_s();
J3DModel* mModel;
cXyz mPos;
};
enum Type {
TYPE_0,
TYPE_1,
};
typedef void (daObjCwall_c::*modeFunc)();
/* 80BD6A4C */ void initBaseMtx();
/* 80BD6A88 */ void setBaseMtx();
/* 80BD6AEC */ void Create();
/* 80BD6D08 */ void CreateHeap();
/* 80BD6ED4 */ void create1st();
/* 80BD6F80 */ void Execute(f32 (**)[3][4]);
/* 80BD6AEC */ int Create();
/* 80BD6D08 */ int CreateHeap();
/* 80BD6ED4 */ int create1st();
/* 80BD6F80 */ int Execute(Mtx**);
/* 80BD7288 */ void setTension();
/* 80BD7718 */ void calcSePos();
/* 80BD7788 */ void getChainBasePos(cXyz*);
@ -40,14 +51,54 @@ public:
/* 80BD8BC8 */ void initClose();
/* 80BD8BF0 */ void modeClose();
/* 80BD935C */ void setPower(f32, s16*);
/* 80BD9414 */ void checkWall();
/* 80BD95A0 */ void checkPullNow();
/* 80BD977C */ void checkPull();
/* 80BD9848 */ void Draw();
/* 80BD9948 */ void Delete();
/* 80BD9414 */ BOOL checkWall();
/* 80BD95A0 */ BOOL checkPullNow();
/* 80BD977C */ BOOL checkPull();
/* 80BD9848 */ int Draw();
/* 80BD9948 */ int Delete();
u8 getArg0() { return fopAcM_GetParamBit(this, 0, 4); }
u8 getType() { return fopAcM_GetParamBit(this, 4, 4); }
u8 getSwbit() { return fopAcM_GetParamBit(this, 8, 8); }
private:
/* 0x568 */ u8 field_0x568[0xf5c - 0x568];
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mWallModel;
/* 0x5AC */ dCcD_Stts mStts;
/* 0x5E8 */ dCcD_Cyl mCyl;
/* 0x724 */ dCcD_Sph mSph;
/* 0x85C */ dCcD_Cyl mCyls[4];
/* 0xD4C */ dCcD_Cyl mCyl2;
/* 0xE88 */ J3DModel* mHandleModel;
/* 0xE8C */ chain_s* mChains;
/* 0xE90 */ u8 field_0xe90;
/* 0xE91 */ u8 field_0xe91;
/* 0xE92 */ u8 field_0xe92;
/* 0xE93 */ u8 field_0xe93;
/* 0xE94 */ cXyz field_0xe94[7];
/* 0xEE8*/ f32 field_0xee8[7];
/* 0xF04 */ u8 field_0xf04[7];
/* 0xF0B */ u8 field_0xf0b;
/* 0xF0C */ u8 field_0xf0c;
/* 0xF0D */ u8 field_0xf0d;
/* 0xF0E */ u8 field_0xf0e;
/* 0xF0F */ u8 field_0xf0f;
/* 0xF10 */ u8 field_0xf10;
/* 0xF11 */ u8 mType;
/* 0xF12 */ u8 field_0xf12;
/* 0xF14 */ s16 field_0xf14;
/* 0xF16 */ s16 field_0xf16;
/* 0xF18 */ s16 field_0xf18;
/* 0xF1A */ s16 field_0xf1a;
/* 0xF1C */ s16 field_0xf1c;
/* 0xF20 */ cXyz field_0xf20;
/* 0xF2C */ cXyz field_0xf2c;
/* 0xF38 */ cXyz field_0xf38;
/* 0xF44 */ cXyz field_0xf44;
/* 0xF50 */ f32 field_0xf50;
/* 0xF54 */ f32 field_0xf54;
/* 0xF58 */ u8 field_0xf58;
/* 0xF58 */ u8 field_0xf59;
};
STATIC_ASSERT(sizeof(daObjCwall_c) == 0xf5c);

39
include/d/actor/d_a_obj_pdoor.h
View File

@ -1,6 +1,7 @@
#ifndef D_A_OBJ_PDOOR_H
#define D_A_OBJ_PDOOR_H
#include "d/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor_mng.h"
/**
@ -11,24 +12,44 @@
* @details
*
*/
class daObjPDoor_c : public fopAc_ac_c {
class daObjPDoor_c : public dBgS_MoveBgActor {
public:
typedef void (daObjPDoor_c::*modeFunc)();
enum Mode {
MODE_WAIT,
MODE_ROTATE,
};
/* 80CA9F9C */ void initBaseMtx();
/* 80CA9FD8 */ void setBaseMtx();
/* 80CAA03C */ void Create();
/* 80CAA14C */ void CreateHeap();
/* 80CAA1BC */ void create1st();
/* 80CAA23C */ void Execute(f32 (**)[3][4]);
/* 80CAA03C */ int Create();
/* 80CAA14C */ int CreateHeap();
/* 80CAA1BC */ int create1st();
/* 80CAA23C */ int Execute(Mtx**);
/* 80CAA290 */ void mode_proc_call();
/* 80CAA31C */ void init_modeWait();
/* 80CAA354 */ void modeWait();
/* 80CAA698 */ void init_modeRotate();
/* 80CAA6B4 */ void modeRotate();
/* 80CAA968 */ void Draw();
/* 80CAAA0C */ void Delete();
/* 80CAA968 */ int Draw();
/* 80CAAA0C */ int Delete();
private:
/* 0x568 */ u8 field_0x568[0x5c4 - 0x568];
u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); }
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mModel;
/* 0x5AC */ s8 mDoorDirection;
/* 0x5AD */ u8 mMode;
/* 0x5B0 */ int field_0x5b0;
/* 0x5B4 */ u8 field_0x5b4;
/* 0x5B5 */ u8 field_0x5b5;
/* 0x5B6 */ u8 field_0x5b6[2];
/* 0x5B8 */ s16 field_0x5b8;
/* 0x5BA */ s16 field_0x5ba;
/* 0x5BC */ s16 field_0x5bc;
/* 0x5C0 */ dBgW_Base::PushPullLabel mPushPullLabel;
};
STATIC_ASSERT(sizeof(daObjPDoor_c) == 0x5c4);

4
include/d/actor/d_a_player.h
View File

@ -670,7 +670,7 @@ public:
static f32 getAttentionOffsetY();
static int checkNowWolfEyeUp();
static void forceRestartRoom(int, u32, int);
static void setFmChainPos(fopAc_ac_c*, cXyz*, int);
static BOOL setFmChainPos(fopAc_ac_c*, cXyz*, int);
static void cancelFmChainGrab();
static void setLookPos(cXyz*);
static void setPlayerSe(u32);
@ -698,7 +698,7 @@ public:
cXyz* getLeftFootPosP() { return &mLeftFootPos; }
BOOL checkCopyRodThrowAfter() const { return checkNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); }
BOOL checkRide() const { return checkHorseRide() || checkBoarRide() || checkSpinnerRide() || checkCanoeRide() || checkBoardRide(); }
const cXyz& getRightHandPos() const { return mRightHandPos; }
cXyz getRightHandPos() const { return mRightHandPos; }
const cXyz getLeftHandPos() const { return mLeftHandPos; }
const cXyz getItemPos() const { return mItemPos; }

1617
src/d/actor/d_a_obj_cwall.cpp
View File

File diff suppressed because it is too large Load Diff

480
src/d/actor/d_a_obj_pdoor.cpp
View File

@ -4,278 +4,304 @@
*/
#include "d/actor/d_a_obj_pdoor.h"
#include "d/actor/d_a_player.h"
#include "SSystem/SComponent/c_lib.h"
#include "SSystem/SComponent/c_math.h"
#include "cmath.h"
#include "d/d_com_inf_game.h"
#include "d/d_bg_w.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" static void PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel();
extern "C" void initBaseMtx__12daObjPDoor_cFv();
extern "C" void setBaseMtx__12daObjPDoor_cFv();
extern "C" void Create__12daObjPDoor_cFv();
extern "C" void CreateHeap__12daObjPDoor_cFv();
extern "C" void create1st__12daObjPDoor_cFv();
extern "C" void Execute__12daObjPDoor_cFPPA3_A4_f();
extern "C" void mode_proc_call__12daObjPDoor_cFv();
extern "C" void init_modeWait__12daObjPDoor_cFv();
extern "C" void modeWait__12daObjPDoor_cFv();
extern "C" void init_modeRotate__12daObjPDoor_cFv();
extern "C" void modeRotate__12daObjPDoor_cFv();
extern "C" void Draw__12daObjPDoor_cFv();
extern "C" void Delete__12daObjPDoor_cFv();
extern "C" static void daObjPDoor_create1st__FP12daObjPDoor_c();
extern "C" static void daObjPDoor_MoveBGDelete__FP12daObjPDoor_c();
extern "C" static void daObjPDoor_MoveBGExecute__FP12daObjPDoor_c();
extern "C" static void daObjPDoor_MoveBGDraw__FP12daObjPDoor_c();
extern "C" extern char const* const d_a_obj_pdoor__stringBase0;
//
// External References:
//
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void dComIfGp_getReverb__Fi();
extern "C" void onSwitch__10dSv_info_cFii();
extern "C" void offSwitch__10dSv_info_cFii();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void StartShock__12dVibration_cFii4cXyz();
extern "C" void __ct__16dBgS_MoveBgActorFv();
extern "C" bool IsDelete__16dBgS_MoveBgActorFv();
extern "C" bool ToFore__16dBgS_MoveBgActorFv();
extern "C" bool ToBack__16dBgS_MoveBgActorFv();
extern "C" void
MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f();
extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv();
extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void __mi__4cXyzCFRC3Vec();
extern "C" void cLib_addCalcAngleS__FPsssss();
extern "C" void cLib_addCalcAngleS2__FPssss();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" extern u8 data_80CAAC30[4];
//
// Declarations:
//
/* ############################################################################################## */
/* 80CAAB20-80CAAB24 000000 0004+00 3/3 0/0 0/0 .rodata @3695 */
SECTION_RODATA static u8 const lit_3695[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80CAAB20, &lit_3695);
/* 80CA9E98-80CA9F9C 000078 0104+00 1/1 0/0 0/0 .text
* PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */
static void PPCallBack(fopAc_ac_c* param_0, fopAc_ac_c* param_1, s16 param_2,
dBgW_Base::PushPullLabel param_3) {
// NONMATCHING
static fopAc_ac_c* PPCallBack(fopAc_ac_c* i_this, fopAc_ac_c* param_2, s16 param_3,
dBgW_Base::PushPullLabel param_4) {
int iVar2 = cLib_checkBit<int>(param_4, 3);
if (iVar2) {
cXyz acStack_40 = param_2->current.pos - i_this->current.pos;
mDoMtx_stack_c::YrotS(-i_this->shape_angle.y);
mDoMtx_stack_c::multVec(&acStack_40, &acStack_40);
int bVar1;
if (acStack_40.z > 0.0f) {
bVar1 = cLib_checkBit(iVar2, 1) == 0 ? 1 : 0;
} else {
bVar1 = cLib_checkBit(iVar2, 1) != 0;
}
for (int i = 0; i < 2; i++) {
if (i == bVar1) {
static_cast<daObjPDoor_c*>(i_this)->field_0x5b6[i]++;
} else {
static_cast<daObjPDoor_c*>(i_this)->field_0x5b6[i] = 0;
}
}
static_cast<daObjPDoor_c*>(i_this)->field_0x5b5 = 1;
static_cast<daObjPDoor_c*>(i_this)->mPushPullLabel = param_4;
}
return i_this;
}
/* 80CA9F9C-80CA9FD8 00017C 003C+00 1/1 0/0 0/0 .text initBaseMtx__12daObjPDoor_cFv */
void daObjPDoor_c::initBaseMtx() {
// NONMATCHING
mModel->setBaseScale(scale);
setBaseMtx();
}
/* 80CA9FD8-80CAA03C 0001B8 0064+00 2/2 0/0 0/0 .text setBaseMtx__12daObjPDoor_cFv */
void daObjPDoor_c::setBaseMtx() {
// NONMATCHING
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(shape_angle.y);
mModel->setBaseTRMtx(mDoMtx_stack_c::get());
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
/* ############################################################################################## */
/* 80CAAB40-80CAAB40 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80CAAB40 = "V_OsuDoor";
#pragma pop
/* 80CAAB4C-80CAAB58 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */
SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 80CAAB58-80CAAB6C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
#pragma push
#pragma force_active on
SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
0x00000000,
0x3FE00000,
0x00000000,
};
#pragma pop
UNK_REL_DATA
/* 80CAAB6C-80CAAB70 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
SECTION_DATA static void* l_arcName = (void*)&d_a_obj_pdoor__stringBase0;
static char* l_arcName = "V_OsuDoor";
/* 80CAAB70-80CAAB88 000024 0018+00 1/1 0/0 0/0 .data l_cull_box */
SECTION_DATA static u8 l_cull_box[24] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0x16, 0x00, 0x00,
0x44, 0x16, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00,
static f32 l_cull_box[6] = {
0.0f, 0.0f, -600.0f,
600.0f, 1000.0f, 600.0f,
};
/* 80CAA03C-80CAA14C 00021C 0110+00 1/0 0/0 0/0 .text Create__12daObjPDoor_cFv */
void daObjPDoor_c::Create() {
// NONMATCHING
int daObjPDoor_c::Create() {
BOOL isSw = fopAcM_isSwitch(this, getSwbit());
BOOL isSw2 = fopAcM_isSwitch(this, getSwbit2());
if (!isSw && !isSw2) {
mDoorDirection = 0;
} else if (isSw) {
mDoorDirection = 1;
shape_angle.y = home.angle.y + 0x1555;
} else if (!isSw2) {
OS_REPORT("城下町押引扉：SW1,SW2共にＯＮになっています！\n")
JUT_PANIC(235, "0");
} else {
mDoorDirection = -1;
shape_angle.y = home.angle.y - 0x1555;
}
initBaseMtx();
fopAcM_SetMtx(this, mModel->getBaseTRMtx());
mpBgW->SetPushPullCallback(PPCallBack);
fopAcM_setCullSizeBox(this, l_cull_box[0], l_cull_box[1], l_cull_box[2], l_cull_box[3],
l_cull_box[4], l_cull_box[5]);
return 1;
}
/* 80CAA14C-80CAA1BC 00032C 0070+00 1/0 0/0 0/0 .text CreateHeap__12daObjPDoor_cFv */
void daObjPDoor_c::CreateHeap() {
// NONMATCHING
int daObjPDoor_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
JUT_ASSERT(270, modelData != 0);
mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
return mModel != NULL ? TRUE : FALSE;
}
/* 80CAA1BC-80CAA23C 00039C 0080+00 1/1 0/0 0/0 .text create1st__12daObjPDoor_cFv */
void daObjPDoor_c::create1st() {
// NONMATCHING
int daObjPDoor_c::create1st() {
int rv = dComIfG_resLoad(&mPhase, l_arcName);
if (rv == cPhs_COMPLEATE_e) {
rv = MoveBGCreate(l_arcName, 8, NULL, 0x4230, NULL);
if (rv == cPhs_ERROR_e) {
return rv;
}
}
return rv;
}
/* 80CAA23C-80CAA290 00041C 0054+00 1/0 0/0 0/0 .text Execute__12daObjPDoor_cFPPA3_A4_f
*/
void daObjPDoor_c::Execute(f32 (**param_0)[3][4]) {
// NONMATCHING
int daObjPDoor_c::Execute(Mtx** ppMtx) {
mode_proc_call();
*ppMtx = &mBgMtx;
setBaseMtx();
field_0x5b5 = 0;
return 1;
}
/* ############################################################################################## */
/* 80CAAB88-80CAAB94 -00001 000C+00 0/1 0/0 0/0 .data @3781 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3781[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)modeWait__12daObjPDoor_cFv,
};
#pragma pop
/* 80CAAB94-80CAABA0 -00001 000C+00 0/1 0/0 0/0 .data @3782 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3782[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)modeRotate__12daObjPDoor_cFv,
};
#pragma pop
/* 80CAABA0-80CAABB8 000054 0018+00 0/1 0/0 0/0 .data l_func$3780 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 l_func[24] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
#pragma pop
/* 80CAA290-80CAA31C 000470 008C+00 1/1 0/0 0/0 .text mode_proc_call__12daObjPDoor_cFv */
void daObjPDoor_c::mode_proc_call() {
// NONMATCHING
static daObjPDoor_c::modeFunc l_func[2] = {
&daObjPDoor_c::modeWait,
&daObjPDoor_c::modeRotate,
};
(this->*(l_func[mMode]))();
}
/* 80CAA31C-80CAA354 0004FC 0038+00 1/1 0/0 0/0 .text init_modeWait__12daObjPDoor_cFv */
void daObjPDoor_c::init_modeWait() {
// NONMATCHING
field_0x5ba = 0;
field_0x5b0 = -1;
for (int i = 0; i < 2; i++) {
field_0x5b6[i] = 0;
}
mMode = MODE_WAIT;
}
/* ############################################################################################## */
/* 80CAAB24-80CAAB28 000004 0004+00 1/1 0/0 0/0 .rodata @3942 */
SECTION_RODATA static f32 const lit_3942 = 10.0f;
COMPILER_STRIP_GATE(0x80CAAB24, &lit_3942);
/* 80CAAB28-80CAAB30 000008 0008+00 1/2 0/0 0/0 .rodata @3944 */
SECTION_RODATA static u8 const lit_3944[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80CAAB28, &lit_3944);
/* 80CAA354-80CAA698 000534 0344+00 1/0 0/0 0/0 .text modeWait__12daObjPDoor_cFv */
void daObjPDoor_c::modeWait() {
// NONMATCHING
daPy_py_c* player = daPy_getPlayerActorClass();
bool bVar3 = true;
int iVar6 = -1;
if (field_0x5b5 != 0) {
for (int i = 0; i < 2; i++) {
if (field_0x5b6[i] == (u8)(cLib_checkBit<int>(mPushPullLabel, dBgW_Base::PPLABEL_4) ? 0x23 : 0x23)) {
field_0x5b0 = i;
}
if (field_0x5b6[i] != 0) {
iVar6 = i;
}
}
if ((field_0x5b0 == 0 && mDoorDirection == 1) ||
(field_0x5b0 == 1 && mDoorDirection == -1))
{
field_0x5b0 = -1;
} else {
bVar3 = false;
}
bool bVar2 = true;
if ((iVar6 == 0 && mDoorDirection == 1) ||
(iVar6 == 1 && mDoorDirection == -1))
{
bVar2 = false;
}
if (bVar2) {
if (iVar6 == 0) {
cLib_addCalcAngleS2(&field_0x5bc, 500, 0x3c, 5);
} else {
cLib_addCalcAngleS2(&field_0x5bc, -500, 0x3c, 5);
}
field_0x5b4++;
f32 dVar8 = std::fabs(cM_ssin(0x3e0 * field_0x5b4));
field_0x5ba = ((field_0x5bc * dVar8) + 10.0f);
}
if (field_0x5b0 != -1) {
((daPy_py_c*)dComIfGp_getPlayer(0))->onPushPullKeep();
init_modeRotate();
}
} else {
field_0x5bc = 0;
field_0x5b4 = 0;
cLib_addCalcAngleS(&field_0x5ba, 0, 4, 0x32, 5);
}
shape_angle.y = home.angle.y + (mDoorDirection << 14) / 3 + field_0x5ba;
if (bVar3) {
for (int i = 0; i < 2; i = i + 1) {
field_0x5b6[i] = 0;
}
field_0x5b0 = -1;
}
if (daPy_py_c::i_checkNowWolf()) {
cXyz cStack_44 = player->current.pos - current.pos;
mDoMtx_stack_c::YrotS(-shape_angle.y);
mDoMtx_stack_c::multVec(&cStack_44, &cStack_44);
if (cStack_44.z > 0.0f) {
if (mDoorDirection == 1) {
mpBgW->OffPushPullOk();
} else {
mpBgW->OnPushPullOk();
}
} else {
if (mDoorDirection == -1) {
mpBgW->OffPushPullOk();
} else {
mpBgW->OnPushPullOk();
}
}
} else {
mpBgW->OnPushPullOk();
}
}
/* 80CAA698-80CAA6B4 000878 001C+00 1/1 0/0 0/0 .text init_modeRotate__12daObjPDoor_cFv
*/
void daObjPDoor_c::init_modeRotate() {
// NONMATCHING
field_0x5bc = 0;
field_0x5b4 = 0;
field_0x5b8 = 0;
mMode = MODE_ROTATE;
}
/* ############################################################################################## */
/* 80CAAB30-80CAAB34 000010 0004+00 0/1 0/0 0/0 .rodata @4051 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4051 = 5461.0f;
COMPILER_STRIP_GATE(0x80CAAB30, &lit_4051);
#pragma pop
/* 80CAAB34-80CAAB38 000014 0004+00 0/1 0/0 0/0 .rodata @4052 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4052 = 60.0f;
COMPILER_STRIP_GATE(0x80CAAB34, &lit_4052);
#pragma pop
/* 80CAAB38-80CAAB3C 000018 0004+00 0/1 0/0 0/0 .rodata @4053 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4053 = 1.0f;
COMPILER_STRIP_GATE(0x80CAAB38, &lit_4053);
#pragma pop
/* 80CAAB3C-80CAAB40 00001C 0004+00 0/1 0/0 0/0 .rodata @4054 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4054 = -1.0f;
COMPILER_STRIP_GATE(0x80CAAB3C, &lit_4054);
#pragma pop
/* 80CAA6B4-80CAA968 000894 02B4+00 1/0 0/0 0/0 .text modeRotate__12daObjPDoor_cFv */
void daObjPDoor_c::modeRotate() {
// NONMATCHING
daPy_getPlayerActorClass();
field_0x5b8++;
shape_angle.y = home.angle.y + (mDoorDirection << 14) / 3;
field_0x5ba = ((f32)field_0x5b8 / 60.0f) * 5461.0f;
if (field_0x5b0 == 1) {
field_0x5ba = -field_0x5ba;
}
shape_angle.y += field_0x5ba;
fopAcM_seStartLevel(this, Z2SE_OBJ_HYRULE_DR_MOVE, 0);
if (field_0x5b8 == 60) {
if (field_0x5b0 == 0) {
mDoorDirection++;
} else {
mDoorDirection--;
}
if (mDoorDirection == 1) {
fopAcM_onSwitch(this, getSwbit());
fopAcM_offSwitch(this, getSwbit2());
} else if (mDoorDirection == -1) {
fopAcM_offSwitch(this, getSwbit());
fopAcM_onSwitch(this, getSwbit2());
} else if (mDoorDirection == 0) {
fopAcM_offSwitch(this, getSwbit());
fopAcM_offSwitch(this, getSwbit2());
}
((daPy_py_c*)dComIfGp_getPlayer(0))->offPushPullKeep();
dComIfGp_getVibration().StartShock(8, 0x1f, cXyz(0.0f, 1.0f, 0.0f));
fopAcM_seStart(this, Z2SE_OBJ_HYRULE_DR_STOP, 0);
init_modeWait();
}
}
/* 80CAA968-80CAAA0C 000B48 00A4+00 1/0 0/0 0/0 .text Draw__12daObjPDoor_cFv */
void daObjPDoor_c::Draw() {
// NONMATCHING
int daObjPDoor_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mModel);
dComIfGd_setList();
return 1;
}
/* 80CAAA0C-80CAAA4C 000BEC 0040+00 1/0 0/0 0/0 .text Delete__12daObjPDoor_cFv */
void daObjPDoor_c::Delete() {
// NONMATCHING
int daObjPDoor_c::Delete() {
mpBgW->SetPushPullCallback(NULL);
dComIfG_resDelete(&mPhase, l_arcName);
return 1;
}
/* 80CAAA4C-80CAAAAC 000C2C 0060+00 1/0 0/0 0/0 .text daObjPDoor_create1st__FP12daObjPDoor_c */
static int daObjPDoor_create1st(daObjPDoor_c* i_this) {
fopAcM_SetupActor(i_this, daObjPDoor_c);
return i_this->create1st();
}
/* 80CAAAAC-80CAAACC 000C8C 0020+00 1/0 0/0 0/0 .text daObjPDoor_MoveBGDelete__FP12daObjPDoor_c */
static int daObjPDoor_MoveBGDelete(daObjPDoor_c* i_this) {
return i_this->MoveBGDelete();
}
/* 80CAAACC-80CAAAEC 000CAC 0020+00 1/0 0/0 0/0 .text daObjPDoor_MoveBGExecute__FP12daObjPDoor_c
*/
static int daObjPDoor_MoveBGExecute(daObjPDoor_c* i_this) {
return i_this->MoveBGExecute();
}
/* 80CAAAEC-80CAAB18 000CCC 002C+00 1/0 0/0 0/0 .text daObjPDoor_MoveBGDraw__FP12daObjPDoor_c */
static int daObjPDoor_MoveBGDraw(daObjPDoor_c* i_this) {
return i_this->Draw();
}
/* ############################################################################################## */
/* 80CAABB8-80CAABD8 -00001 0020+00 1/0 0/0 0/0 .data daObjPDoor_METHODS */
static actor_method_class daObjPDoor_METHODS = {
(process_method_func)daObjPDoor_create1st__FP12daObjPDoor_c,
(process_method_func)daObjPDoor_MoveBGDelete__FP12daObjPDoor_c,
(process_method_func)daObjPDoor_MoveBGExecute__FP12daObjPDoor_c,
0,
(process_method_func)daObjPDoor_MoveBGDraw__FP12daObjPDoor_c,
(process_method_func)daObjPDoor_create1st,
(process_method_func)daObjPDoor_MoveBGDelete,
(process_method_func)daObjPDoor_MoveBGExecute,
NULL,
(process_method_func)daObjPDoor_MoveBGDraw,
};
/* 80CAABD8-80CAAC08 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_PushDoor */
@ -296,39 +322,5 @@ extern actor_process_profile_definition g_profile_Obj_PushDoor = {
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 80CAAC08-80CAAC30 0000BC 0028+00 1/1 0/0 0/0 .data __vt__12daObjPDoor_c */
SECTION_DATA extern void* __vt__12daObjPDoor_c[10] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)CreateHeap__12daObjPDoor_cFv,
(void*)Create__12daObjPDoor_cFv,
(void*)Execute__12daObjPDoor_cFPPA3_A4_f,
(void*)Draw__12daObjPDoor_cFv,
(void*)Delete__12daObjPDoor_cFv,
(void*)IsDelete__16dBgS_MoveBgActorFv,
(void*)ToFore__16dBgS_MoveBgActorFv,
(void*)ToBack__16dBgS_MoveBgActorFv,
};
/* 80CAAA4C-80CAAAAC 000C2C 0060+00 1/0 0/0 0/0 .text daObjPDoor_create1st__FP12daObjPDoor_c */
static void daObjPDoor_create1st(daObjPDoor_c* param_0) {
// NONMATCHING
}
/* 80CAAAAC-80CAAACC 000C8C 0020+00 1/0 0/0 0/0 .text daObjPDoor_MoveBGDelete__FP12daObjPDoor_c */
static void daObjPDoor_MoveBGDelete(daObjPDoor_c* param_0) {
// NONMATCHING
}
/* 80CAAACC-80CAAAEC 000CAC 0020+00 1/0 0/0 0/0 .text daObjPDoor_MoveBGExecute__FP12daObjPDoor_c
*/
static void daObjPDoor_MoveBGExecute(daObjPDoor_c* param_0) {
// NONMATCHING
}
/* 80CAAAEC-80CAAB18 000CCC 002C+00 1/0 0/0 0/0 .text daObjPDoor_MoveBGDraw__FP12daObjPDoor_c */
static void daObjPDoor_MoveBGDraw(daObjPDoor_c* param_0) {
// NONMATCHING
}
/* 80CAAB40-80CAAB40 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */

4
src/d/actor/d_a_player.cpp
View File

@ -493,8 +493,8 @@ void daPy_py_c::forceRestartRoom(int param_0, u32 param_1, int param_2) {
/* 8015F478-8015F4B8 159DB8 0040+00 0/0 0/0 3/3 .text
* setFmChainPos__9daPy_py_cFP10fopAc_ac_cP4cXyzi */
void daPy_py_c::setFmChainPos(fopAc_ac_c* param_0, cXyz* param_1, int param_2) {
daAlink_getAlinkActorClass()->setFmChainPosFromOut(param_0, param_1, param_2);
BOOL daPy_py_c::setFmChainPos(fopAc_ac_c* param_0, cXyz* param_1, int param_2) {
return daAlink_getAlinkActorClass()->setFmChainPosFromOut(param_0, param_1, param_2);
}
/* 8015F4B8-8015F4F0 159DF8 0038+00 0/0 0/0 1/1 .text cancelFmChainGrab__9daPy_py_cFv */