mirror of
https://github.com/zeldaret/ss
synced 2026-09-10 11:55:29 -04:00
Fix some REL setup mistakes
This commit is contained in:
@@ -6,7 +6,7 @@ STATE_DEFINE(dAcKanban_c, Wait);
|
||||
STATE_DEFINE(dAcKanban_c, Message);
|
||||
STATE_DEFINE(dAcKanban_c, PullOut);
|
||||
|
||||
dAcKanban_c::dAcKanban_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dAcKanban_c::dAcKanban_c() : mStateMgr(*this) {}
|
||||
dAcKanban_c::~dAcKanban_c() {}
|
||||
|
||||
void dAcKanban_c::initializeState_Wait() {}
|
||||
|
||||
@@ -6,7 +6,7 @@ STATE_DEFINE(dAcObamboo_c, Wait);
|
||||
STATE_DEFINE(dAcObamboo_c, Fall);
|
||||
STATE_DEFINE(dAcObamboo_c, CutMark);
|
||||
|
||||
dAcObamboo_c::dAcObamboo_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dAcObamboo_c::dAcObamboo_c() : mStateMgr(*this) {}
|
||||
dAcObamboo_c::~dAcObamboo_c() {}
|
||||
|
||||
void dAcObamboo_c::initializeState_Wait() {}
|
||||
|
||||
@@ -8,7 +8,7 @@ STATE_DEFINE(dAcOcannonCover_c, Shake);
|
||||
STATE_DEFINE(dAcOcannonCover_c, Close);
|
||||
STATE_DEFINE(dAcOcannonCover_c, Play);
|
||||
|
||||
dAcOcannonCover_c::dAcOcannonCover_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dAcOcannonCover_c::dAcOcannonCover_c() : mStateMgr(*this) {}
|
||||
dAcOcannonCover_c::~dAcOcannonCover_c() {}
|
||||
|
||||
void dAcOcannonCover_c::initializeState_Wait() {}
|
||||
|
||||
@@ -10,7 +10,7 @@ STATE_DEFINE(dAcOClef_c, PathMove);
|
||||
STATE_DEFINE(dAcOClef_c, Gravitate);
|
||||
STATE_DEFINE(dAcOClef_c, Die);
|
||||
|
||||
dAcOClef_c::dAcOClef_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dAcOClef_c::dAcOClef_c() : mStateMgr(*this) {}
|
||||
dAcOClef_c::~dAcOClef_c() {}
|
||||
|
||||
void dAcOClef_c::initializeState_WaitPhantom() {}
|
||||
|
||||
@@ -12,7 +12,7 @@ STATE_DEFINE(dAcOFence_c, WaitClose);
|
||||
STATE_DEFINE(dAcOFence_c, Close);
|
||||
STATE_DEFINE(dAcOFence_c, RequestConfineEvent);
|
||||
|
||||
dAcOFence_c::dAcOFence_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dAcOFence_c::dAcOFence_c() : mStateMgr(*this) {}
|
||||
dAcOFence_c::~dAcOFence_c() {}
|
||||
|
||||
void dAcOFence_c::initializeState_WaitOpen() {}
|
||||
|
||||
@@ -5,7 +5,7 @@ SPECIAL_ACTOR_PROFILE(OBJ_FORTUNE_RING, dAcOfortuneRing_c, fProfile::OBJ_FORTUNE
|
||||
STATE_DEFINE(dAcOfortuneRing_c, Wait);
|
||||
STATE_DEFINE(dAcOfortuneRing_c, Play);
|
||||
|
||||
dAcOfortuneRing_c::dAcOfortuneRing_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dAcOfortuneRing_c::dAcOfortuneRing_c() : mStateMgr(*this) {}
|
||||
dAcOfortuneRing_c::~dAcOfortuneRing_c() {}
|
||||
|
||||
void dAcOfortuneRing_c::initializeState_Wait() {}
|
||||
|
||||
@@ -10,7 +10,7 @@ STATE_DEFINE(dAcOgroundCover_c, AppearClose);
|
||||
STATE_DEFINE(dAcOgroundCover_c, Fight);
|
||||
STATE_DEFINE(dAcOgroundCover_c, Sealed);
|
||||
|
||||
dAcOgroundCover_c::dAcOgroundCover_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dAcOgroundCover_c::dAcOgroundCover_c() : mStateMgr(*this) {}
|
||||
dAcOgroundCover_c::~dAcOgroundCover_c() {}
|
||||
|
||||
void dAcOgroundCover_c::initializeState_Wait() {}
|
||||
|
||||
@@ -13,7 +13,7 @@ STATE_DEFINE(dAcOItemHeartContainer_c, Fall);
|
||||
STATE_DEFINE(dAcOItemHeartContainer_c, WaitGet);
|
||||
STATE_DEFINE(dAcOItemHeartContainer_c, WaitGetQuake);
|
||||
|
||||
dAcOItemHeartContainer_c::dAcOItemHeartContainer_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dAcOItemHeartContainer_c::dAcOItemHeartContainer_c() : mStateMgr(*this) {}
|
||||
dAcOItemHeartContainer_c::~dAcOItemHeartContainer_c() {}
|
||||
|
||||
void dAcOItemHeartContainer_c::initializeState_Hide() {}
|
||||
|
||||
@@ -5,7 +5,7 @@ SPECIAL_ACTOR_PROFILE(OBJ_ROULETTE_ISLAND_C, dAcOrouletteIslandC_c, fProfile::OB
|
||||
STATE_DEFINE(dAcOrouletteIslandC_c, Wait);
|
||||
STATE_DEFINE(dAcOrouletteIslandC_c, Play);
|
||||
|
||||
dAcOrouletteIslandC_c::dAcOrouletteIslandC_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dAcOrouletteIslandC_c::dAcOrouletteIslandC_c() : mStateMgr(*this) {}
|
||||
dAcOrouletteIslandC_c::~dAcOrouletteIslandC_c() {}
|
||||
|
||||
void dAcOrouletteIslandC_c::initializeState_Wait() {}
|
||||
|
||||
@@ -7,7 +7,7 @@ STATE_DEFINE(dAcOrouletteIslandR_c, Move);
|
||||
STATE_DEFINE(dAcOrouletteIslandR_c, Reduce);
|
||||
STATE_DEFINE(dAcOrouletteIslandR_c, End);
|
||||
|
||||
dAcOrouletteIslandR_c::dAcOrouletteIslandR_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dAcOrouletteIslandR_c::dAcOrouletteIslandR_c() : mStateMgr(*this) {}
|
||||
dAcOrouletteIslandR_c::~dAcOrouletteIslandR_c() {}
|
||||
|
||||
void dAcOrouletteIslandR_c::initializeState_Wait() {}
|
||||
|
||||
@@ -9,7 +9,7 @@ STATE_DEFINE(dAcOSave_c, Query);
|
||||
STATE_DEFINE(dAcOSave_c, LightShaft);
|
||||
STATE_DEFINE(dAcOSave_c, Escape);
|
||||
|
||||
dAcOSave_c::dAcOSave_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dAcOSave_c::dAcOSave_c() : mStateMgr(*this) {}
|
||||
dAcOSave_c::~dAcOSave_c() {}
|
||||
|
||||
void dAcOSave_c::initializeState_Moss() {}
|
||||
|
||||
@@ -13,7 +13,7 @@ STATE_DEFINE(dAcOSwrdPrj, SWWaitCross);
|
||||
STATE_DEFINE(dAcOSwrdPrj, SWChkTri);
|
||||
STATE_DEFINE(dAcOSwrdPrj, SWEnd);
|
||||
|
||||
dAcOSwrdPrj::dAcOSwrdPrj() : mStateMgr(*this, sStateID::null) {}
|
||||
dAcOSwrdPrj::dAcOSwrdPrj() : mStateMgr(*this) {}
|
||||
dAcOSwrdPrj::~dAcOSwrdPrj() {}
|
||||
|
||||
void dAcOSwrdPrj::initializeState_WaitHarp() {}
|
||||
|
||||
@@ -4,7 +4,7 @@ SPECIAL_ACTOR_PROFILE(OBJ_TRUCK_RAIL_COL, dAcOTruckRailCol_c, fProfile::OBJ_TRUC
|
||||
|
||||
STATE_DEFINE(dAcOTruckRailCol_c, Wait);
|
||||
|
||||
dAcOTruckRailCol_c::dAcOTruckRailCol_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dAcOTruckRailCol_c::dAcOTruckRailCol_c() : mStateMgr(*this) {}
|
||||
dAcOTruckRailCol_c::~dAcOTruckRailCol_c() {}
|
||||
|
||||
void dAcOTruckRailCol_c::initializeState_Wait() {}
|
||||
|
||||
@@ -15,7 +15,7 @@ STATE_DEFINE(dLytSeekerStone_c, MovieFadeOut);
|
||||
STATE_DEFINE(dLytSeekerStone_c, MovieFadeIn);
|
||||
STATE_DEFINE(dLytSeekerStone_c, Out);
|
||||
|
||||
dLytSeekerStone_c::dLytSeekerStone_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dLytSeekerStone_c::dLytSeekerStone_c() : mStateMgr(*this) {}
|
||||
dLytSeekerStone_c::~dLytSeekerStone_c() {}
|
||||
|
||||
void dLytSeekerStone_c::initializeState_None() {}
|
||||
|
||||
@@ -415,7 +415,7 @@ void dScBoot_c::strap_c::init() {
|
||||
field_0x4F0 = 0;
|
||||
}
|
||||
|
||||
dScBoot_c::dScBoot_c() : mStateMgr(*this, sStateID::null), mPhases(this, sCallbacks), mpDvdCallback(nullptr) {
|
||||
dScBoot_c::dScBoot_c() : mStateMgr(*this), mPhases(this, sCallbacks), mpDvdCallback(nullptr) {
|
||||
mObjectDataLoaded = false;
|
||||
sInstance = this;
|
||||
mStrapScreenVisible = false;
|
||||
|
||||
@@ -9,7 +9,7 @@ STATE_DEFINE(dTitleMgr_c, Title);
|
||||
STATE_DEFINE(dTitleMgr_c, FileSelect);
|
||||
STATE_DEFINE(dTitleMgr_c, Input);
|
||||
|
||||
dTitleMgr_c::dTitleMgr_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dTitleMgr_c::dTitleMgr_c() : mStateMgr(*this) {}
|
||||
dTitleMgr_c::~dTitleMgr_c() {}
|
||||
|
||||
void dTitleMgr_c::initializeState_Init() {}
|
||||
|
||||
@@ -320,7 +320,7 @@ STATE_DEFINE(dAcItem_c, WaitTurnOff);
|
||||
STATE_DEFINE(dAcItem_c, WaitSacredDewGetEffect);
|
||||
|
||||
dAcItem_c::dAcItem_c()
|
||||
: mStateMgr(*this, sStateID::null),
|
||||
: mStateMgr(*this),
|
||||
mEff_0x8F4(this),
|
||||
mEff_0x928(this),
|
||||
mEff_0x95C(this),
|
||||
|
||||
@@ -144,7 +144,7 @@ SizedString<128> sNpcStr2;
|
||||
SizedString<128> sNpcStr3;
|
||||
SizedString<128> sNpcStr4;
|
||||
|
||||
dAcNpc_c::dAcNpc_c() : mFlow(this), mStateMgr(*this, sStateID::null), mActorListEntry(this) {}
|
||||
dAcNpc_c::dAcNpc_c() : mFlow(this), mStateMgr(*this), mActorListEntry(this) {}
|
||||
|
||||
dAcNpc_c::~dAcNpc_c() {
|
||||
// TODO
|
||||
|
||||
@@ -813,7 +813,7 @@ bool dAcTbox_c::isBelowGroundAtPos(f32 height, const mVec3_c &pos) {
|
||||
}
|
||||
|
||||
dAcTbox_c::dAcTbox_c()
|
||||
: mStateMgr(*this, sStateID::null),
|
||||
: mStateMgr(*this),
|
||||
mScnCallback(this),
|
||||
mEvent(*this, nullptr),
|
||||
mTboxListNode(this),
|
||||
|
||||
@@ -33,7 +33,7 @@ STATE_DEFINE(dStageMgr_c, SceneChangeSave);
|
||||
STATE_DEFINE(dStageMgr_c, RestartSceneWait);
|
||||
STATE_DEFINE(dStageMgr_c, RestartScene);
|
||||
|
||||
dStageMgr_c::dStageMgr_c() : mStateMgr(*this, sStateID::null), mPhase(this, sCallbacks) {
|
||||
dStageMgr_c::dStageMgr_c() : mStateMgr(*this), mPhase(this, sCallbacks) {
|
||||
sInstance = this;
|
||||
}
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ static const d2d::LytBrlanMapping brlanMap[] = {
|
||||
|
||||
#define NUM_ANIMS 9
|
||||
|
||||
dLytCommonArrow_c::dLytCommonArrow_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dLytCommonArrow_c::dLytCommonArrow_c() : mStateMgr(*this) {}
|
||||
|
||||
bool dLytCommonArrow_c::build() {
|
||||
void *data = LayoutArcManager::GetInstance()->getLoadedData("CommonArrow");
|
||||
|
||||
@@ -96,7 +96,7 @@ static const char *sPaneNames[] = {
|
||||
#define PAUSE_DISP_01_NUM_COMBINED_PANES (PAUSE_DISP_01_NUM_MY_PANES + PAUSE_DISP_01_NUM_SUBPANES)
|
||||
#define PAUSE_DISP_01_OFFSET_MY_PANES PAUSE_DISP_01_NUM_SUBPANES
|
||||
|
||||
dLytPauseDisp01_c::dLytPauseDisp01_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dLytPauseDisp01_c::dLytPauseDisp01_c() : mStateMgr(*this) {}
|
||||
|
||||
bool dLytPauseDisp01_c::build() {
|
||||
dLytPauseMgr_c *pauseMgr = dLytPauseMgr_c::GetInstance();
|
||||
|
||||
@@ -13,7 +13,7 @@ STATE_DEFINE(dLytSaveMsgWindow_c, In);
|
||||
STATE_DEFINE(dLytSaveMsgWindow_c, Wait);
|
||||
STATE_DEFINE(dLytSaveMsgWindow_c, Out);
|
||||
|
||||
dLytSaveMsgWindow_c::dLytSaveMsgWindow_c() : mStateMgr(*this, sStateID::null) {
|
||||
dLytSaveMsgWindow_c::dLytSaveMsgWindow_c() : mStateMgr(*this) {
|
||||
resetProperties();
|
||||
}
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ void dLytSkyGaugeMain_c::executeState_ModeOut() {
|
||||
}
|
||||
void dLytSkyGaugeMain_c::finalizeState_ModeOut() {}
|
||||
|
||||
dLytSkyGaugeMain_c::dLytSkyGaugeMain_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dLytSkyGaugeMain_c::dLytSkyGaugeMain_c() : mStateMgr(*this) {}
|
||||
|
||||
bool dLytSkyGaugeMain_c::build(d2d::ResAccIf_c *resAcc) {
|
||||
mLyt.setResAcc(resAcc);
|
||||
|
||||
@@ -49,7 +49,7 @@ void dLytWipeMain_c::executeState_ModeOut() {
|
||||
}
|
||||
void dLytWipeMain_c::finalizeState_ModeOut() {}
|
||||
|
||||
dLytWipeMain_c::dLytWipeMain_c() : mStateMgr(*this, sStateID::null) {}
|
||||
dLytWipeMain_c::dLytWipeMain_c() : mStateMgr(*this) {}
|
||||
|
||||
static const d2d::LytBrlanMapping brlanMap[] = {
|
||||
{"wipe_00_inOut.brlan", "G_inOut_00"},
|
||||
|
||||
@@ -489,7 +489,7 @@ static const char *sWindowNames[] = {
|
||||
|
||||
static const char *sGroupName = "G_ref_00";
|
||||
|
||||
dLytMeterItemSelect_c::dLytMeterItemSelect_c() : mStateMgr(*this, sStateID::null) {
|
||||
dLytMeterItemSelect_c::dLytMeterItemSelect_c() : mStateMgr(*this) {
|
||||
field_0x574C = I_INVALID;
|
||||
field_0x5750 = I_INVALID;
|
||||
field_0x5754 = 0;
|
||||
|
||||
Reference in New Issue
Block a user