Skip to content

d_a_obj_dmelevator fully matching #2404

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

Merged
hatal175 merged 5 commits into from
Apr 22, 2025
Merged

d_a_obj_dmelevator fully matching #2404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
239b42f
d_a_obj_dmelevator partially matching
TheHood-AI Apr 21, 2025
03a7582
d_a_obj_dmelevator matching
ItsNiklas Apr 21, 2025
7869ec3
Merge pull request #1 from ItsNiklas/TheHood-AI/main
TheHood-AI Apr 21, 2025
5f201b3
Cleaned up code in d_a_obj_dmelevator.cpp
TheHood-AI Apr 21, 2025
2b81705
Further cleanup of d_a_obj_dmelevator.cpp
TheHood-AI Apr 21, 2025
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
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 @@ -1874,7 +1874,7 @@ def MatchingFor(*versions):
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_dan"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_digholl"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_digsnow"),
ActorRel(NonMatching, "d_a_obj_dmelevator"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_dmelevator"),
ActorRel(NonMatching, "d_a_obj_drop"),
ActorRel(NonMatching, "d_a_obj_dust"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_enemy_create"),
Expand Down
12 changes: 6 additions & 6 deletions include/d/actor/d_a_obj_dmelevator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef D_A_OBJ_DMELEVATOR_H
#define D_A_OBJ_DMELEVATOR_H

#include "SSystem/SComponent/c_phase.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"

/**
Expand All @@ -17,7 +17,7 @@ class daObjDmElevator_c : public dBgS_MoveBgActor {
public:
/* 80BDDD38 */ void initBaseMtx();
/* 80BDDD90 */ void setBaseMtx();
/* 80BDDEFC */ int Create();
/* 80BDDEFC */ virtual int Create();
/* 80BDE0A4 */ int init();
/* 80BDE2F8 */ int CreateHeap();
/* 80BDE448 */ int create1st();
Expand Down Expand Up @@ -54,8 +54,8 @@ class daObjDmElevator_c : public dBgS_MoveBgActor {
/* 80BDF6DC */ int Delete();

u32 getPathID() { return fopAcM_GetParamBit(this, 8, 8); }
void setAction(char action){mAction = action;}

private:
/* 0x5A0 */ request_of_phase_process_class mPhaseReq;
/* 0x5A8 */ request_of_phase_process_class mPhaseReq2;
/* 0x5B0 */ J3DModel* mpElevatorModel;
Expand All @@ -64,11 +64,11 @@ class daObjDmElevator_c : public dBgS_MoveBgActor {
/* 0x5D8 */ u8 field_0x5D8[0x5DC - 0x5D8];
/* 0x5DC */ s32 field_0x5dc;
/* 0x5E0 */ u8 field_0x5e0;
/* 0x5E1 */ u8 field_0x5e1;
/* 0x5E2 */ u8 field_0x5e2;
/* 0x5E1 */ s8 field_0x5e1;
/* 0x5E2 */ u8 mAction;
/* 0x5E3 */ u8 field_0x5e3;
/* 0x5E4 */ s16 field_0x5e4;
/* 0x5E6 */ s16 field_0x5e6;
/* 0x5E6 */ s16 mEventIndex;
/* 0x5E8 */ dBgW* mpBgW;
/* 0x5EC */ Mtx mMtx;
/* 0x61C */ cXyz mXyz;
Expand Down
Loading