d_t_telop OK (#100)
Some checks are pending
Build / build (SOUE01) (push) Waiting to run

This commit is contained in:
Elijah Thomas 2024-11-11 18:21:56 -05:00 committed by GitHub
parent 3e54cc37e3
commit 9525f8e9e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 69 additions and 8 deletions

View File

@ -10,3 +10,4 @@ REL/executor.c:
REL/d/t/d_t_telop.cpp:
.text start:0x00000070 end:0x000002AC
.data start:0x00000000 end:0x00000084

View File

@ -2,12 +2,12 @@ _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
dTgTelop_c_classInit__Fv = .text:0x00000070; // type:function size:0x4C
TgTelop__init = .text:0x000000C0; // type:function size:0x48
fn_563_110 = .text:0x00000110; // type:function size:0x8
TgTelop__update = .text:0x00000120; // type:function size:0x114
fn_563_240 = .text:0x00000240; // type:function size:0x8
create__10dTgTelop_cFv = .text:0x000000C0; // type:function size:0x48
doDelete__10dTgTelop_cFv = .text:0x00000110; // type:function size:0x8
actorExecute__10dTgTelop_cFv = .text:0x00000120; // type:function size:0x114
draw__10dTgTelop_cFv = .text:0x00000240; // type:function size:0x8
__dt__10dTgTelop_cFv = .text:0x00000250; // type:function size:0x5C
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
g_profile_TLP_TAG = .data:0x00000000; // type:object size:0x10
lbl_563_section4_10 = .data:0x00000010; // type:object size:0x74
__vt__10dTgTelop_c = .data:0x00000010; // type:object size:0x74

View File

@ -1869,7 +1869,7 @@ config.libs = [
Rel(NonMatching, "d_t_sword_battle_game", "REL/d/t/d_t_sword_battle_game.cpp"),
Rel(Matching, "d_t_sw_area", "REL/d/t/d_t_sw_area.cpp"),
Rel(Matching, "d_t_tackle", "REL/d/t/d_t_tackle.cpp"),
Rel(NonMatching, "d_t_telop", "REL/d/t/d_t_telop.cpp"),
Rel(Matching, "d_t_telop", "REL/d/t/d_t_telop.cpp"),
Rel(Matching, "d_t_timer", "REL/d/t/d_t_timer.cpp"),
Rel(Matching, "d_t_time_area_check", "REL/d/t/d_t_time_area_check.cpp"),
Rel(Matching, "d_t_time_door_beam", "REL/d/t/d_t_time_door_beam.cpp"),

View File

@ -1,14 +1,33 @@
#ifndef D_T_TELOP_H
#define D_T_TELOP_H
#include "d/a/d_a_base.h"
#include "d/flag/sceneflag_manager.h"
#include "d/t/d_tg.h"
class dTgTelop_c : public dAcBase_c {
class dTgTelop_c : public dTg_c {
public:
dTgTelop_c() {}
virtual ~dTgTelop_c() {}
virtual int create() override;
virtual int doDelete() override;
virtual int draw() override;
virtual int actorExecute() override;
u16 getArea() const {
return params >> 8 & 0xFF;
}
u8 getSceneflag() const {
return params >> 16 & 0xFF;
}
u8 getTempflag() const {
return params >> 24 & 0xFF;
}
private:
/* 0xFC */ u16 mArea;
/* 0xFD */ u8 mSceneflag;
/* 0xFF */ u8 mTempflag;
};
#endif

View File

@ -1,3 +1,44 @@
#include "d/t/d_t_telop.h"
#include "d/lyt/d_lyt_area_caption.h"
#include "toBeSorted/event_manager.h"
SPECIAL_ACTOR_PROFILE(TLP_TAG, dTgTelop_c, fProfile::TLP_TAG, 0x28C, 0, 0);
int dTgTelop_c::create() {
mArea = getArea();
mSceneflag = getSceneflag() != 0xFF ? getSceneflag() : 0xFF;
mTempflag = getTempflag() != 0xFF ? getTempflag() : 0xFF;
return SUCCEEDED;
}
int dTgTelop_c::doDelete() {
return SUCCEEDED;
}
int dTgTelop_c::actorExecute() {
if (EventManager::isInEvent()) {
return SUCCEEDED;
}
if (mTempflag != 0xFF && SceneflagManager::sInstance->checkBoolFlag(roomid, mTempflag)) {
return SUCCEEDED;
}
if (mSceneflag != 0xFF && !SceneflagManager::sInstance->checkBoolFlag(roomid, mSceneflag)) {
return SUCCEEDED;
}
if (mTempflag != 0xFF) {
SceneflagManager::sInstance->setFlag(roomid, mTempflag);
}
dLytAreaCaption_c::setArea(mArea);
deleteRequest();
return SUCCEEDED;
}
int dTgTelop_c::draw() {
return SUCCEEDED;
}