summaryrefslogtreecommitdiff
path: root/include/toBeSorted
diff options
context:
space:
mode:
Diffstat (limited to 'include/toBeSorted')
-rw-r--r--include/toBeSorted/d_d3d.h6
-rw-r--r--include/toBeSorted/event_manager.h8
-rw-r--r--include/toBeSorted/time_area_mgr.h1
3 files changed, 14 insertions, 1 deletions
diff --git a/include/toBeSorted/d_d3d.h b/include/toBeSorted/d_d3d.h
index 212fd381..d834c093 100644
--- a/include/toBeSorted/d_d3d.h
+++ b/include/toBeSorted/d_d3d.h
@@ -3,11 +3,13 @@
#include "common.h"
#include "d/a/d_a_base.h"
+#include "d/d_light_env.h"
#include "egg/egg_types.h"
#include "m/m3d/m_anmmdl.h"
#include "m/m3d/m_fanm.h"
#include "m/m3d/m_mdl.h"
#include "m/m3d/m_proc.h"
+#include "m/m3d/m_smdl.h"
#include "m/m_color.h"
#include "m/m_mtx.h"
#include "m/m_vec.h"
@@ -29,6 +31,8 @@ void fn_80016860();
void clearList();
void fn_80017500();
+void setLight(m3d::smdl_c *pMdl, int lightSetIdx, ActorLighting *pLighting);
+
class AnmMdlWrapper : public m3d::mdlAnmChr {
public:
AnmMdlWrapper();
@@ -207,7 +211,7 @@ public:
doDraw();
}
- void fn_800192F0(u8, const mMtx_c&, u8);
+ void fn_800192F0(u8, const mMtx_c &, u8);
private:
void doRemove();
diff --git a/include/toBeSorted/event_manager.h b/include/toBeSorted/event_manager.h
index 929cb869..3de101fb 100644
--- a/include/toBeSorted/event_manager.h
+++ b/include/toBeSorted/event_manager.h
@@ -51,6 +51,13 @@ public:
return strequals(getCurrentEventName(), name);
}
+ static bool checkFlag(int flag) {
+ if (!isInEvent()) {
+ flag &= 0xFEC80000;
+ }
+ return (sInstance->mStateFlags & flag) != 0;
+ }
+
static bool eventRelatedStateFlags_shift0x11_1();
// Something like isActorInEvent maybe?
@@ -63,6 +70,7 @@ private:
/* 0x084 */ Event mCurrentEvent;
/* 0x0C4 */ u8 _0C4[0x184 - 0x0C4];
/* 0x184 */ int mState;
+ /* 0x188 */ int mStateFlags;
/* 0x18C */ u8 _18C[0x19C - 0x18C];
};
diff --git a/include/toBeSorted/time_area_mgr.h b/include/toBeSorted/time_area_mgr.h
index 501793b9..0dd78a20 100644
--- a/include/toBeSorted/time_area_mgr.h
+++ b/include/toBeSorted/time_area_mgr.h
@@ -73,6 +73,7 @@ public:
f32 fn_800B9CE0(const mVec3_c &position);
static bool fn_800BBD40();
+ static bool fn_800BBE00();
bool isInLanayruMiningFacility() const {
return mIsInLanayruMiningFacility;