mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-11 05:04:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

move remaining old progress (#186)

Browse Source 
* move remaining old progress

* remove asm
This commit is contained in:
TakaRikka
2022-03-26 10:17:17 -07:00
committed by GitHub
parent d596658f89
commit 215421ba51
76 changed files with 387 additions and 1260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/meter/d_meter_HIO.h
+1 -1
View File
@@ -3,8 +3,8 @@
#include "JSystem/JKernel/JKRArchive.h"
#include "JSystem/JUtility/TColor.h"
#include "SSystem/SComponent/c_xyz.h"
#include "SSystem/SComponent/c_sxyz.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
#include "m_Do/m_Do_ext.h"
include/d/msg/d_msg_object.h
+7 -1
View File
@@ -123,7 +123,7 @@ public:
/* 802381FC */ void setStatus(u16);
/* 8023822C */ static u16 getStatus();
/* 80238258 */ void getScrnDrawPtr();
/* 8023826C */ void setTalkActor(fopAc_ac_c*);
/* 8023826C */ static void setTalkActor(fopAc_ac_c*);
/* 8023829C */ void onMsgSendControl();
/* 802382C8 */ void offMsgSendControl();
/* 802382F4 */ static int isMsgSendControl();
@@ -273,4 +273,10 @@ inline void dMsgObject_changeFlowGroup(long flow) {
dMsgObject_c::changeFlowGroup(flow);
}
inline void dMsgObject_setTalkActor(fopAc_ac_c* actor) {
if (dMsgObject_getMsgObjectClass() != NULL) {
dMsgObject_c::setTalkActor(actor);
}
}
#endif /* D_MSG_D_MSG_OBJECT_H */
include/d/s/d_s_play.h
+2
View File
@@ -57,6 +57,7 @@ private:
/* 0x14 */ dScnPly_env_debugHIO_c mDebug;
};
extern s8 struct_80451124;
extern s8 data_80451125; // sPauseTimer
class dScnPly_c : public scene_class {
@@ -65,6 +66,7 @@ public:
/* 80259AC4 */ bool resetGame();
/* 80259BFC */ void offReset();
static bool isPause() { return struct_80451124 == 0; }
static void setPauseTimer(s8 time) { data_80451125 = time; }
};