diff --git a/configure.py b/configure.py index 1fc4670f..66ecdca8 100755 --- a/configure.py +++ b/configure.py @@ -33,6 +33,7 @@ COMPLETE_OBJECTS = [ "MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint", "MetroidPrime/ScriptObjects/CScriptPickup", "MetroidPrime/ScriptObjects/CScriptSwitch", + "MetroidPrime/CIOWin", "Weapons/IWeaponRenderer", "Collision/CMaterialList", "Collision/CMaterialFilter", diff --git a/include/Kyoto/Particles/CGenDescription.hpp b/include/Kyoto/Particles/CGenDescription.hpp new file mode 100644 index 00000000..898ce7ca --- /dev/null +++ b/include/Kyoto/Particles/CGenDescription.hpp @@ -0,0 +1,12 @@ +#ifndef __CGENDESCRIPTION_HPP__ +#define __CGENDESCRIPTION_HPP__ + +class CGenDescription { +public: + CGenDescription(); + ~CGenDescription(); +private: + char data[0x12c]; +}; + +#endif // __CGENDESCRIPTION_HPP__ diff --git a/include/MetroidPrime/CIOWin.hpp b/include/MetroidPrime/CIOWin.hpp index e55f1dab..36030130 100644 --- a/include/MetroidPrime/CIOWin.hpp +++ b/include/MetroidPrime/CIOWin.hpp @@ -17,11 +17,14 @@ public: kMR_RemoveIOWin = 3, }; + CIOWin(const rstl::string& name); virtual ~CIOWin(); + + const rstl::string& GetName() const; virtual EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) = 0; virtual bool GetIsContinueDraw() const; - virtual void Draw(); - virtual void PreDraw(); + virtual void Draw() const; + virtual void PreDraw() const; private: rstl::string x4_name; diff --git a/obj_files.mk b/obj_files.mk index 1a77448e..fb91fb97 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -34,7 +34,7 @@ METROIDPRIME :=\ $(BUILD_DIR)/asm/MetroidPrime/CArchMsgParmReal32.o\ $(BUILD_DIR)/asm/MetroidPrime/Decode.o\ $(BUILD_DIR)/asm/MetroidPrime/CIOWinManager.o\ - $(BUILD_DIR)/asm/MetroidPrime/CIOWin.o\ + $(BUILD_DIR)/src/MetroidPrime/CIOWin.o\ $(BUILD_DIR)/asm/MetroidPrime/CActor.o\ $(BUILD_DIR)/asm/MetroidPrime/CWorld.o\ $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakParticle.o\ diff --git a/src/MetroidPrime/CIOWin.cpp b/src/MetroidPrime/CIOWin.cpp new file mode 100644 index 00000000..8f3876fe --- /dev/null +++ b/src/MetroidPrime/CIOWin.cpp @@ -0,0 +1,13 @@ +#include "MetroidPrime/CIOWin.hpp" + +CIOWin::CIOWin(const rstl::string& name) : x4_name(name) {} + +CIOWin::~CIOWin() {} + +const rstl::string& CIOWin::GetName() const { return x4_name; } + +bool CIOWin::GetIsContinueDraw() const { return true; } + +void CIOWin::Draw() const {} + +void CIOWin::PreDraw() const {}