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

Applied suggestions and removed leftover code

Browse Source
This commit is contained in:
Cole Barker
2026-02-23 21:23:10 -05:00
parent 1f8ae19f78
commit ea5931c780
3 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/rels/d_t_defeat_bossNP/symbols.txt
-3
View File
@@ -2,9 +2,6 @@ _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
dTgDefeatBoss_c_classInit__Fv = .text:0x00000070; // type:function size:0x4C
fn_494_C0__15dTgDefeatBoss_cFv = .text:0x000000C0; // type:function size:0xC
fn_494_D0__15dTgDefeatBoss_cFv = .text:0x000000D0; // type:function size:0x84
init__15dTgDefeatBoss_cFv = .text:0x00000160; // type:function size:0xCC
getDungeonFlagIndex__15dTgDefeatBoss_cFRUl = .text:0x000000C0; // type:function size:0xC
checkDungeonFlag__15dTgDefeatBoss_cFv = .text:0x000000D0; // type:function size:0x84
create__15dTgDefeatBoss_cFv = .text:0x00000160; // type:function size:0xCC
include/d/t/d_t_defeat_boss.h
+4 -8
View File
@@ -7,20 +7,16 @@ class dTgDefeatBoss_c : public dTg_c {
public:
dTgDefeatBoss_c() {}
virtual ~dTgDefeatBoss_c() {}
virtual int update() override;
u16 getSceneflag();
u16 fn_494_360();
u16 getStoryflag();
u16 fn_494_380();
s32 getSceneflagPolarity();
u32 getStoryflag();
s32 getStoryflagPolarity();
static void getDungeonFlagIndex(u32 &outFlagIdx);
bool checkDungeonFlag();
virtual int create() override;
virtual int actorExecute() override;
u16 getSceneflag();
s32 getSceneflagPolarity();
u32 getStoryflag();
s32 getStoryflagPolarity();
private:
src/REL/d/t/d_t_defeat_boss.cpp
+2 -25
View File
@@ -7,10 +7,7 @@
SPECIAL_ACTOR_PROFILE(TAG_DEFEAT_BOSS, dTgDefeatBoss_c, fProfile::TAG_DEFEAT_BOSS, 0x29E, 0, 0);
void dTgDefeatBoss_c::fn_494_C0() {
mID = (fBaseID_e)0x3;
return;
void dTgDefeatBoss_c::getDungeonFlagIndex(u32 &outFlagIdx) {
outFlagIdx = 0x3;
}
@@ -43,27 +40,7 @@ int dTgDefeatBoss_c::create() {
return SUCCEEDED;
}
int dTgDefeatBoss_c::update() {
StoryflagManager* pSVar1;
bool bVar4;
u16 uVar2;
/*StoryFlags*/int SVar3;
bVar4 = fn_494_D0();
if (bVar4) {
switch (var8_1) {
case 0x0:
uVar2 = getSceneflag();
SceneflagManager::sInstance->unsetFlag
(/*SceneflagManager::sInstance,*/ (u16)/*(param_1->base).members.roomid*/(mRoomID & 0xffff),
(u16)(uVar2 & 0xffff));
break;
case 0x1:
uVar2 = getSceneflag();
SceneflagManager::sInstance->setFlag
(/*SceneflagManager::sInstance,*/ (u16)/*(param_1->base).members.roomid*/mRoomID & 0xffff,
(u16)uVar2 & 0xffff);
int dTgDefeatBoss_c::actorExecute() {
if (checkDungeonFlag()) {
switch (mSceneflagPolarity) {
@@ -93,7 +70,7 @@ u16 dTgDefeatBoss_c::getSceneflag() {
return mParams & 0xff;
}
u16 dTgDefeatBoss_c::fn_494_360() {
s32 dTgDefeatBoss_c::getSceneflagPolarity() {
return mParams >> 0x8 & 0x1;
@@ -103,7 +80,7 @@ u32 dTgDefeatBoss_c::getStoryflag() {
return mParams >> 9 & 0xffff;
}
u16 dTgDefeatBoss_c::fn_494_380() {
s32 dTgDefeatBoss_c::getStoryflagPolarity() {
return (mParams >> 0x19) & 0x1;