mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-09 04:30:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_door_shutter OK (#2142)

Browse Source 
* a_d_door_shutter OK

* d_a_door_spiral OK
This commit is contained in:
hatal175
2024-05-01 03:08:21 +03:00
committed by GitHub
parent 025870a64c
commit 9995df3bc7
105 changed files with 2237 additions and 8682 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/com/d_com_inf_game.h
+4
View File
@@ -3296,6 +3296,10 @@ inline u8 dComIfGp_event_getMode() {
return g_dComIfG_gameInfo.play.getEvent().getMode();
}
inline fopAc_ac_c* dComIfGp_event_getDoorPartner() {
return g_dComIfG_gameInfo.play.getEvent().getPtD();
}
inline int dComIfGp_evmng_getMyStaffId(const char* pName, fopAc_ac_c* pActor, int param_2) {
return dComIfGp_getPEvtManager()->getMyStaffId(pName, pActor, param_2);
}
include/d/d_door_param2.h
+5 -5
View File
@@ -7,18 +7,18 @@ class fopAc_ac_c;
class door_param2_c {
public:
/* 8003A188 */ static u32 getKind(fopAc_ac_c* i_actor);
/* 8003A188 */ static int getKind(fopAc_ac_c* i_actor);
/* 8003A194 */ static u32 getDoorModel(fopAc_ac_c* i_actor);
/* 8003A1A0 */ static u8 getFrontOption(fopAc_ac_c* i_actor);
/* 8003A1AC */ static u8 getBackOption(fopAc_ac_c* i_actor);
/* 8003A1B8 */ static u32 getFRoomNo(fopAc_ac_c* i_actor);
/* 8003A1C4 */ static u32 getBRoomNo(fopAc_ac_c* i_actor);
/* 8003A1B8 */ static u8 getFRoomNo(fopAc_ac_c* i_actor);
/* 8003A1C4 */ static u8 getBRoomNo(fopAc_ac_c* i_actor);
/* 8003A1D0 */ static u8 getSwbit(fopAc_ac_c* i_actor);
/* 8003A1DC */ static u8 getSwbit2(fopAc_ac_c* i_actor);
/* 8003A1E8 */ static u8 getSwbit3(fopAc_ac_c* i_actor);
/* 8003A1F4 */ static u32 isMsgDoor(fopAc_ac_c* i_actor);
/* 8003A1F4 */ static int isMsgDoor(fopAc_ac_c* i_actor);
/* 8003A200 */ static u8 getEventNo(fopAc_ac_c* i_actor);
/* 8003A20C */ static u32 getEventNo2(fopAc_ac_c* i_actor);
/* 8003A20C */ static u8 getEventNo2(fopAc_ac_c* i_actor);
/* 8003A218 */ static u16 getMsgNo(fopAc_ac_c* i_actor);
/* 8003A224 */ static u8 getExitNo(fopAc_ac_c* i_actor);
/* 8003A230 */ static u32 getFLightInf(fopAc_ac_c* i_actor);
include/d/event/d_event.h
+1
View File
@@ -159,6 +159,7 @@ public:
fopAc_ac_c* getPt1() { return convPId(mPt1); }
fopAc_ac_c* getPt2() { return convPId(mPt2); }
fopAc_ac_c* getPtT() { return convPId(mPtT); }
fopAc_ac_c* getPtD() { return convPId(mPtd); }
bool isChangeOK(void* param_0) { return mChangeOK == param_0; }
u8 getPreItemNo() { return mPreItemNo; }
u8 getGtItm() { return mGtItm; }
include/d/kankyo/d_kankyo.h
+1 -1
View File
@@ -192,7 +192,7 @@ public:
/* 0x361 */ u8 field_0x361;
/* 0x362 */ u8 field_0x362;
/* 0x363 */ u8 field_0x363;
/* 0x364 */ u8 field_0x364;
/* 0x364 */ u8 mLightInf;
/* 0x365 */ u8 field_0x365;
/* 0x366 */ u8 field_0x366;
/* 0x367 */ u8 field_0x367;
include/rel/d/a/d_a_midna/d_a_midna.h
+4
View File
@@ -167,6 +167,10 @@ public:
inline static BOOL checkMidnaRealBody();
inline static BOOL i_checkMidnaRealBody() {
return dKy_darkworld_check() == 1 || dComIfGs_isTransformLV(3);
}
static bool i_checkMidnaTired() {
return dComIfGs_isTransformLV(3) && !dComIfGs_isEventBit(0x1E08);
}
include/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.h
+155
View File
@@ -2,5 +2,160 @@
#define D_A_DOOR_SHUTTER_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
#include "SSystem/SComponent/c_phase.h"
#include "d/bg/d_bg_w.h"
#include "d/msg/d_msg_flow.h"
#include "d/bg/d_bg_s_acch.h"
struct daDoor20_c;
struct dDoor_stop_c {
/* 804660F4 */ void calcMtx(daDoor20_c*);
/* 804661B0 */ void closeInit(daDoor20_c*);
/* 804662C0 */ int closeProc(daDoor20_c*);
/* 8046634C */ void openInit(daDoor20_c*);
/* 80466458 */ int openProc(daDoor20_c*);
/* 804664E8 */ int create(daDoor20_c*);
/* 80466538 */ void draw(daDoor20_c*);
J3DModel* field_0x0;
f32 field_0x4;
u8 field_0x8;
u8 field_0x9;
u8 field_0xa;
u8 field_0xb;
};
struct daDoor20_c : public fopAc_ac_c {
enum ActionType {
ACTION_INIT,
ACTION_WAIT,
ACTION_STOP_CLOSE,
ACTION_DEMO,
};
/* 80460B38 */ char* getStopBmdName();
/* 80460B70 */ J3DModelData* getStopModelData();
/* 80460B94 */ char* getAlwaysArcName();
/* 80460BA4 */ char* getArcName();
/* 80460C40 */ char* getBmdName();
/* 80460CF0 */ char* getBtk();
/* 80460D5C */ J3DModelData* getModelData();
/* 80460D80 */ f32 getSize2X();
/* 80460DAC */ int CreateHeap();
/* 8046129C */ void setEventPrm();
/* 804616EC */ int checkOpenMsgDoor(int*);
/* 8046178C */ int adjustmentAngle();
/* 80461874 */ int adjustmentProc();
/* 80461A44 */ void setAngle();
/* 80461A60 */ void openInit_0();
/* 80461D24 */ void openInit_1();
/* 80461EC4 */ int openInit(int);
/* 80461F60 */ int openProc(int);
/* 804622A8 */ void openEnd_0();
/* 804622AC */ void openEnd_1();
/* 80462328 */ int openEnd(int);
/* 80462398 */ void closeInit_0();
/* 8046266C */ void closeInit_1();
/* 80462738 */ int closeInit(int);
/* 804627C4 */ int closeProc(int);
/* 804627E8 */ void closeEnd_0();
/* 804627EC */ void closeEnd_1();
/* 80462868 */ int closeEnd(int);
/* 80462928 */ void openInit2();
/* 80462A1C */ void closeEnd2();
/* 80462A5C */ void calcMtx_2();
/* 80462B58 */ void calcMtx();
/* 80462C2C */ int CreateInit();
/* 80462EB4 */ void setKey();
/* 80462F2C */ int create();
/* 80462FE0 */ int demoProc();
/* 80463E30 */ int orderStopEvent();
/* 80463FBC */ int actionWait();
/* 80464118 */ int actionStopClose();
/* 8046416C */ int actionDemo();
/* 804641EC */ int actionInit();
/* 80464240 */ int execute();
/* 804643B0 */ int draw();
/* 80464638 */ void setDoorAngleSpec();
/* 804647BC */ int _delete();
/* 80464858 */ int createKey();
/* 80464AE4 */ int deleteKey();
/* 80464B3C */ int adjoinPlayer();
/* 80464BD8 */ int frontCheckOld();
/* 80464C68 */ int frontCheck();
/* 80464CEC */ int drawCheck(int);
/* 80464E18 */ int checkExecute();
/* 80464EC4 */ void startDemoProc();
/* 80464F64 */ void makeEventId();
/* 804653B0 */ void initProc();
/* 80465400 */ void initOpenDemo(int);
/* 80465490 */ int checkArea(f32, f32, f32);
/* 80465620 */ void openInitCom(int);
/* 804656F0 */ void closeEndCom();
/* 8046581C */ void getRestartPos(cXyz*);
/* 80465960 */ void setGoal();
/* 80465AC0 */ int chkMakeStop();
/* 80465B34 */ int chkStopF();
/* 80465C04 */ int chkStopB();
/* 80465CC0 */ void setStopDemo();
/* 80465DA8 */ int chkStopClose();
/* 80465E8C */ void setStop();
/* 80465F20 */ int chkStopOpen();
/* 8046609C */ int chkMakeKey();
/* 80460D00 */ virtual char* getDzbName();
/* 80465918 */ virtual int getDemoAction();
void onFlag(u16 flag) { field_0x68e |= flag; }
void offFlag(u16 flag) { field_0x68e &= ~flag; }
bool checkFlag(u16 flag) { return field_0x68e & flag; }
void setAction(u8 action) { mAction = action; }
/* 0x56C */ request_of_phase_process_class mPhase1;
/* 0x574 */ request_of_phase_process_class mPhase2;
/* 0x57C */ J3DModel* mModel1;
/* 0x580 */ J3DModel* mModel2;
/* 0x584 */ mDoExt_bckAnm field_0x584;
/* 0x5A0 */ mDoExt_bckAnm field_0x5a0;
/* 0x5BC */ J3DModel* field_0x5bc;
/* 0x5C0 */ mDoExt_btkAnm* field_0x5c0;
/* 0x5C4 */ dBgW* field_0x5c4;
/* 0x5C8 */ s8 field_0x5c8;
/* 0x5C9 */ bool field_0x5c9;
/* 0x5CA */ u8 field_0x5ca[0x5dd - 0x5ca];
/* 0x5DD */ u8 field_0x5dd;
/* 0x5E0 */ cXyz field_0x5e0;
/* 0x5EC */ u32 field_0x5ec;
/* 0x5F0 */ bool field_0x5f0;
/* 0x5F1 */ u8 field_0x5f1;
/* 0x5F4 */ Mtx field_0x5f4;
/* 0x624 */ dMsgFlow_c field_0x624;
/* 0x670 */ s16 field_0x670;
/* 0x672 */ bool field_0x672;
/* 0x673 */ u8 field_0x673;
/* 0x674 */ u8 field_0x674;
/* 0x678 */ int field_0x678;
/* 0x67C */ u8 field_0x67c;
/* 0x67D */ s8 field_0x67d;
/* 0x67E */ u8 field_0x67e;
/* 0x67F */ u8 field_0x67f;
/* 0x680 */ cXyz field_0x680;
/* 0x68C */ u8 field_0x68c;
/* 0x68D */ u8 field_0x68d;
/* 0x68E */ u16 field_0x68e;
/* 0x690 */ u8 mAction;
/* 0x691 */ u8 field_0x691;
/* 0x692 */ s16 field_0x692[19];
/* 0x6B8 */ u8 field_0x6b8[19];
/* 0x6CB */ u8 field_0x6cb;
/* 0x6CC */ u32 field_0x6cc;
/* 0x6D0 */ dDoor_stop_c mDoorStop;
/* 0x6DC */ s16 field_0x6dc;
/* 0x6DE */ dBgS_ObjAcch field_0x6de;
/* 0x8B8 */ dBgS_AcchCir field_0x8b8;
/* 0x8F8 */ u32 field_0x8f8;
};
#endif /* D_A_DOOR_SHUTTER_H */
include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h
+30
View File
@@ -2,5 +2,35 @@
#define D_A_OBJ_LV5KEY_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
struct daObjLv5Key_c : public fopAc_ac_c {
/* 80B9B9B8 */ void CreateHeap();
/* 80B9BA94 */ void Init();
/* 80B9BB5C */ void setBgc();
/* 80B9BBCC */ void initCcSph();
/* 80B9BC2C */ void setCcSph();
/* 80B9BD30 */ void setAction(void (daObjLv5Key_c::*)(int), int);
/* 80B9BDD8 */ void Action();
/* 80B9BE24 */ void Wait(int);
/* 80B9BF08 */ void Open(int);
/* 80B9BFDC */ void Fall(int);
/* 80B9C17C */ void Land(int);
/* 80B9C268 */ void Shake(int);
/* 80B9C3B0 */ void TranslateByNowDirect(f32, f32, f32);
/* 80B9C410 */ void Execute();
/* 80B9C450 */ void Draw();
/* 80B9C500 */ void Delete();
/* 80B9C534 */ void setBaseMtx();
/* 80B9C5EC */ void create_1st();
void setStatus(u8 status) { mStatus = status; }
void keylock_open_start() { setStatus(2); }
void keylock_shake_start() { setStatus(1); }
bool is_open() { return mStatus == 3; }
/* 0x568 */ u8 field_0x568[0x945 - 0x568];
/* 0x945 */ s8 mStatus;
};
#endif /* D_A_OBJ_LV5KEY_H */