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

Merge pull request #241 from swekka/d_a_obj_clearness_wall

Browse Source 
d_a_obj_clearness_wall OK
This commit is contained in:
robojumper
2025-09-07 23:17:38 +02:00
committed by GitHub
parent 25cc5c34fd 8c2f90ba77
commit 06b6cda8eb
4 changed files with 138 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/rels/d_a_obj_clearness_wallNP/symbols.txt
+9 -9
View File
@@ -2,16 +2,16 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x00000030; // type:function size:0x2C scope:global
_unresolved = .text:0x00000060; // type:function size:0x4 scope:global
dAcOclearnessWall_c_classInit__Fv = .text:0x00000070; // type:function size:0x5C
fn_622_D0 = .text:0x000000D0; // type:function size:0x9C
fn_622_170 = .text:0x00000170; // type:function size:0xC8
fn_622_240 = .text:0x00000240; // type:function size:0x8
fn_622_250 = .text:0x00000250; // type:function size:0x218
fn_622_470 = .text:0x00000470; // type:function size:0x8
fn_622_480 = .text:0x00000480; // type:function size:0x68
fn_622_4F0 = .text:0x000004F0; // type:function size:0x68
createHeap__19dAcOclearnessWall_cFv = .text:0x000000D0; // type:function size:0x9C
create__19dAcOclearnessWall_cFv = .text:0x00000170; // type:function size:0xC8
doDelete__19dAcOclearnessWall_cFv = .text:0x00000240; // type:function size:0x8
actorExecute__19dAcOclearnessWall_cFv = .text:0x00000250; // type:function size:0x218
draw__19dAcOclearnessWall_cFv = .text:0x00000470; // type:function size:0x8
getArcName__19dAcOclearnessWall_cFv = .text:0x00000480; // type:function size:0x68
getModelName__19dAcOclearnessWall_cFv = .text:0x000004F0; // type:function size:0x68
__dt__19dAcOclearnessWall_cFv = .text:0x00000560; // type:function size:0x68
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
g_profile_OBJ_CLEARNESS_WALL = .data:0x00000000; // type:object size:0x10
lbl_622_section4_10 = .data:0x00000010; // type:object size:0xD8
lbl_622_section4_E8 = .data:0x000000E8; // type:object size:0x80
lbl_622_section4_10 = .data:0x00000010; // type:object size:0xD8 scope:local
lbl_622_section4_E8 = .data:0x000000E8; // type:object size:0x80 scope:local
configure.py
+1 -1
View File
@@ -2375,7 +2375,7 @@ config.libs = [
Rel(NonMatching, "d_a_obj_city_water", "REL/d/a/obj/d_a_obj_city_water.cpp"),
Rel(NonMatching, "d_a_obj_claw_shot_tg", "REL/d/a/obj/d_a_obj_claw_shot_tg.cpp"),
Rel(
NonMatching, "d_a_obj_clearness_wall", "REL/d/a/obj/d_a_obj_clearness_wall.cpp"
Matching, "d_a_obj_clearness_wall", "REL/d/a/obj/d_a_obj_clearness_wall.cpp"
),
Rel(NonMatching, "d_a_obj_clef", "REL/d/a/obj/d_a_obj_clef.cpp"),
Rel(Matching, "d_a_obj_cloud_dive", "REL/d/a/obj/d_a_obj_cloud_dive.cpp"),
include/d/a/obj/d_a_obj_clearness_wall.h
+16 -1
View File
@@ -2,13 +2,28 @@
#define D_A_OBJ_CLEARNESS_WALL_H
#include "d/a/obj/d_a_obj_base.h"
#include "d/col/bg/d_bg_w.h"
class dAcOclearnessWall_c : public dAcObjBase_c {
public:
dAcOclearnessWall_c() {}
dAcOclearnessWall_c(): field_0x543(true) {}
virtual ~dAcOclearnessWall_c() {}
virtual bool createHeap() override;
virtual int create() override;
virtual int doDelete() override;
virtual int actorExecute() override;
virtual int draw() override;
private:
const char *getArcName();
const char *getModelName();
/* 0x330 */ dBgW mBgW;
/* 0x540 */ u8 mSceneflag;
/* 0x541 */ u8 mVariant;
/* 0x542 */ u8 field_0x542;
/* 0x543 */ bool field_0x543;
};
#endif
src/REL/d/a/obj/d_a_obj_clearness_wall.cpp
+112
View File
@@ -1,3 +1,115 @@
#include "d/a/obj/d_a_obj_clearness_wall.h"
#include "d/a/obj/d_a_obj_base.h"
#include "d/col/bg/d_bg_s.h"
#include "d/flag/sceneflag_manager.h"
#include "f/f_base.h"
#include "toBeSorted/arc_managers/oarc_manager.h"
SPECIAL_ACTOR_PROFILE(OBJ_CLEARNESS_WALL, dAcOclearnessWall_c, fProfile::OBJ_CLEARNESS_WALL, 0x15B, 0, 0);
bool dAcOclearnessWall_c::createHeap() {
const char *arcName = getArcName();
const char *modelName = getModelName();
void *dzb = OarcManager::GetInstance()->getDzbFromArc(arcName, modelName);
void *plc = OarcManager::GetInstance()->getPlcFromArc(arcName, modelName);
TRY_CREATE(!mBgW.Set((cBgD_t *)dzb, (PLC *)plc, cBgW::MOVE_BG_e, &mWorldMtx, &mScale));
return SUCCEEDED;
}
int dAcOclearnessWall_c::create() {
mSceneflag = params;
mVariant = getFromParams(8, 0xF);
field_0x542 = getFromParams(0xC, 0xF);
if (field_0x542 == 0xF) {
field_0x542 = 0;
}
updateMatrix();
CREATE_ALLOCATOR(dAcOclearnessWall_c);
dBgS::GetInstance()->Regist(&mBgW, this);
mBgW.Lock();
if (field_0x542 == 2) {
dBgS::GetInstance()->Release(&mBgW);
}
if (mVariant == 4) {
mBgW.field_0x22 = 4;
}
return SUCCEEDED;
}
int dAcOclearnessWall_c::doDelete() {
return SUCCEEDED;
}
int dAcOclearnessWall_c::actorExecute() {
switch (field_0x542) {
case 0: {
bool flag = SceneflagManager::sInstance->checkFlag(roomid, mSceneflag);
if (flag) {
deleteRequest();
}
break;
}
case 1: {
bool flag = SceneflagManager::sInstance->checkFlag(roomid, mSceneflag);
if (flag && field_0x543) {
dBgS::GetInstance()->Release(&mBgW);
field_0x543 = false;
} else {
bool flag = SceneflagManager::sInstance->checkFlag(roomid, mSceneflag);
if (!flag && !field_0x543) {
dBgS::GetInstance()->Regist(&mBgW, this);
field_0x543 = true;
}
}
break;
}
case 2: {
bool flag = SceneflagManager::sInstance->checkFlag(roomid, mSceneflag);
if (flag && field_0x543) {
dBgS::GetInstance()->Regist(&mBgW, this);
field_0x543 = false;
} else {
bool flag = SceneflagManager::sInstance->checkFlag(roomid, mSceneflag);
if (!flag && !field_0x543) {
dBgS::GetInstance()->Release(&mBgW);
field_0x543 = true;
}
}
break;
}
default: {
bool flag = SceneflagManager::sInstance->checkFlag(roomid, mSceneflag);
if (flag) {
deleteRequest();
}
}
}
return SUCCEEDED;
}
int dAcOclearnessWall_c::draw() {
return SUCCEEDED;
}
const char *dAcOclearnessWall_c::getArcName() {
switch (mVariant) {
case 0: return "InvisibleWall";
case 1: return "InvisibleWallB";
case 2: return "InvisibleWallC";
case 3: return "InvisibleWallD";
case 4: return "InvisibleWallE";
default: return nullptr;
}
}
const char *dAcOclearnessWall_c::getModelName() {
switch (mVariant) {
case 0: return "InvisibleWall";
case 1: return "InvisibleWall_yahane";
case 2: return "InvisibleWall_AirNaraku";
case 3: return "InvisibleWall_Camera";
case 4: return "InvisibleWall_tekitome";
default: return nullptr;
}
}