mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-02 02:00:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_stopping_rope OK

Browse Source
This commit is contained in:
Swekka
2025-07-08 23:23:52 +02:00
parent 986635b7c5
commit 8d0a60fd23
4 changed files with 69 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/rels/d_a_obj_stopping_ropeNP/symbols.txt
+12 -12
View File
@@ -8,12 +8,12 @@ __dt__31sFState_c<18dAcOStoppingRope_c>Fv = .text:0x000001C0; // type:function s
__dt__34sFStateFct_c<18dAcOStoppingRope_c>Fv = .text:0x00000220; // type:function size:0x6C
__dt__87sStateMgr_c<18dAcOStoppingRope_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000290; // type:function size:0xA0
__dt__57sFStateMgr_c<18dAcOStoppingRope_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000330; // type:function size:0xA4
fn_295_3E0 = .text:0x000003E0; // type:function size:0xDC
fn_295_4C0 = .text:0x000004C0; // type:function size:0x8
fn_295_4D0 = .text:0x000004D0; // type:function size:0x8
fn_295_4E0 = .text:0x000004E0; // type:function size:0x30
createHeap__18dAcOStoppingRope_cFv = .text:0x000003E0; // type:function size:0xDC
create__18dAcOStoppingRope_cFv = .text:0x000004C0; // type:function size:0x8
doDelete__18dAcOStoppingRope_cFv = .text:0x000004D0; // type:function size:0x8
actorExecute__18dAcOStoppingRope_cFv = .text:0x000004E0; // type:function size:0x30
executeState__87sStateMgr_c<18dAcOStoppingRope_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000510; // type:function size:0x10
fn_295_520 = .text:0x00000520; // type:function size:0x28
draw__18dAcOStoppingRope_cFv = .text:0x00000520; // type:function size:0x28
initializeState_Wait__18dAcOStoppingRope_cFv = .text:0x00000550; // type:function size:0x4
executeState_Wait__18dAcOStoppingRope_cFv = .text:0x00000560; // type:function size:0x4
finalizeState_Wait__18dAcOStoppingRope_cFv = .text:0x00000570; // type:function size:0x4
@@ -44,11 +44,11 @@ _ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
__destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global
g_profile_OBJ_STOPPING_ROPE = .data:0x00000000; // type:object size:0x40 data:4byte
lbl_295_section4_40 = .data:0x00000040; // type:object size:0x80
lbl_295_section4_C0 = .data:0x000000C0; // type:object size:0x30
lbl_295_section4_F0 = .data:0x000000F0; // type:object size:0x30
lbl_295_section4_120 = .data:0x00000120; // type:object size:0x18
lbl_295_section4_138 = .data:0x00000138; // type:object size:0xAC
lbl_295_section4_1E4 = .data:0x000001E4; // type:object size:0x34
__vt__18dAcOStoppingRope_c = .data:0x00000040; // type:object size:0x80
__vt__57sFStateMgr_c<18dAcOStoppingRope_c,20sStateMethodUsr_FI_c> = .data:0x000000C0; // type:object size:0x30
__vt__87sStateMgr_c<18dAcOStoppingRope_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x000000F0; // type:object size:0x30
lbl_295_section4_120 = .data:0x00000120; // type:object size:0x18 scope:local
lbl_295_section4_138 = .data:0x00000138; // type:object size:0xAC scope:local
__vt__33sFStateID_c<18dAcOStoppingRope_c> = .data:0x000001E4; // type:object size:0x34
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_295_bss_8 = .bss:0x00000008; // type:object size:0x80 data:4byte
lbl_295_bss_8 = .bss:0x00000008; // type:object size:0x80 scope:local data:4byte
configure.py
+1 -1
View File
@@ -2282,7 +2282,7 @@ config.libs = [
),
Rel(NonMatching, "d_a_obj_stone_stand", "REL/d/a/obj/d_a_obj_stone_stand.cpp"),
Rel(NonMatching, "d_a_obj_stopper_rock", "REL/d/a/obj/d_a_obj_stopper_rock.cpp"),
Rel(NonMatching, "d_a_obj_stopping_rope", "REL/d/a/obj/d_a_obj_stopping_rope.cpp"),
Rel(Matching, "d_a_obj_stopping_rope", "REL/d/a/obj/d_a_obj_stopping_rope.cpp"),
Rel(NonMatching, "d_a_obj_stream_lava", "REL/d/a/obj/d_a_obj_stream_lava.cpp"),
Rel(Matching, "d_a_obj_sun_light", "REL/d/a/obj/d_a_obj_sun_light.cpp"),
Rel(NonMatching, "d_a_obj_swhit", "REL/d/a/obj/d_a_obj_swhit.cpp"),
include/d/a/obj/d_a_obj_stopping_rope.h
+21 -2
View File
@@ -2,19 +2,38 @@
#define D_A_OBJ_STOPPING_ROPE_H
#include "d/a/obj/d_a_obj_base.h"
#include "d/col/bg/d_bg_w.h"
#include "d/col/cc/d_cc_d.h"
#include "m/m3d/m_smdl.h"
#include "nw4r/g3d/res/g3d_resfile.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
#include "s/s_StateInterfaces.hpp"
class dAcOStoppingRope_c : public dAcObjBase_c {
public:
dAcOStoppingRope_c() : mStateMgr(*this, sStateID::null) {}
virtual ~dAcOStoppingRope_c() {}
virtual bool createHeap() override;
virtual int create() override;
virtual int doDelete() override;
virtual int actorExecute() override;
virtual int draw() override;
void changeState(const sStateIDIf_c &value) {
mStateMgr.changeState(value);
}
STATE_FUNC_DECLARE(dAcOStoppingRope_c, Wait);
STATE_FUNC_DECLARE(dAcOStoppingRope_c, SwitchOn);
private:
/* 0x??? */ STATE_MGR_DECLARE(dAcOStoppingRope_c);
/* 0x330 */ nw4r::g3d::ResFile mResFile;
/* 0x334 */ m3d::smdl_c mMdl;
/* 0x350 */ dBgW mBgW;
/* 0x360 */ dCcD_Sph mCollider;
/* 0x6B0 */ STATE_MGR_DECLARE(dAcOStoppingRope_c);
/* 0x6EC */ u8 padding_0x6EC[16];
};
#endif
src/REL/d/a/obj/d_a_obj_stopping_rope.cpp
+35
View File
@@ -1,10 +1,45 @@
#include "d/a/obj/d_a_obj_stopping_rope.h"
#include "d/a/obj/d_a_obj_base.h"
#include "f/f_base.h"
#include "nw4r/g3d/res/g3d_resfile.h"
#include "nw4r/g3d/res/g3d_resmdl.h"
SPECIAL_ACTOR_PROFILE(OBJ_STOPPING_ROPE, dAcOStoppingRope_c, fProfile::OBJ_STOPPING_ROPE, 0x23B, 0, 3);
STATE_DEFINE(dAcOStoppingRope_c, Wait);
STATE_DEFINE(dAcOStoppingRope_c, SwitchOn);
bool dAcOStoppingRope_c::createHeap() {
void *data = getOarcResFile("Crane");
mResFile = nw4r::g3d::ResFile(data);
nw4r::g3d::ResMdl mdl = mResFile.GetResMdl("CraneN");
TRY_CREATE(mMdl.create(mdl, &heap_allocator, 0x120, 1, nullptr));
void *dzb = getOarcFile("Crane", "dzb/Crane.dzb");
void *plc = getOarcFile("Crane", "dat/Crane.plc");
updateMatrix();
mMdl.setScale(mScale);
return !mBgW.Set((cBgD_t *)dzb, (PLC *)plc, 1, &mWorldMtx, &mScale);
}
int dAcOStoppingRope_c::create() {
return FAILED;
}
int dAcOStoppingRope_c::doDelete() {
return SUCCEEDED;
}
int dAcOStoppingRope_c::actorExecute() {
mStateMgr.executeState();
return SUCCEEDED;
}
int dAcOStoppingRope_c::draw() {
drawModelType1(&mMdl);
return SUCCEEDED;
}
void dAcOStoppingRope_c::initializeState_Wait() {}
void dAcOStoppingRope_c::executeState_Wait() {}
void dAcOStoppingRope_c::finalizeState_Wait() {}