k_wmark / k_wpillar OK, fop actor enums / debug building (#1946)

* d_k_wmark / d_k_wpillar OK

* make debug buildable / add assert functionality

* add more fop actor enums

* remove asm
This commit is contained in:
TakaRikka
2023-09-28 12:01:42 -07:00
committed by GitHub
parent 673e69386a
commit 89ed2b8a26
206 changed files with 1612 additions and 2472 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ public:
/* 802A40B8 */ void stopSoundID(JAISoundID);
/* 802A4118 */ void mixOut();
/* 802A4174 */ void newStream_();
/* 802B9978 */ void isActive() const;
/* 802B9978 */ bool isActive() const;
JAISoundParamsMove* getParams() { return &mParams; }
void setStreamDataMgr(JAIStreamDataMgr* param_0) {
+2 -2
View File
@@ -142,7 +142,7 @@ public:
static void* getUserRamEnd(void) { return mUserRamEnd; }
static u32 getMemorySize(void) { return mMemorySize; }
static JKRHeap* getRootHeap() { return sRootHeap; }
#if DEBUG
#ifdef DEBUG
static JKRHeap* getRootHeap2() { return sRootHeap2; }
#endif
@@ -166,7 +166,7 @@ public:
static u32 mMemorySize;
static JKRHeap* sRootHeap;
#if DEBUG
#ifdef DEBUG
static JKRHeap* sRootHeap2;
#endif
+7 -1
View File
@@ -2,8 +2,9 @@
#define JUTASSERT_H
#include "dolphin/types.h"
#include "dolphin/os/OS.h"
#if DEBUG
#ifdef DEBUG
#define JUT_ASSERT(LINE, COND) \
if ((COND) == 0) { \
JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND); \
@@ -34,6 +35,11 @@ namespace JUTAssertion {
/* 802E4A54 */ void flushMessage_dbPrint();
/* 802E4C34 */ void setVisible(bool);
/* 802E4C3C */ void setMessageCount(int);
u32 getSDevice();
void showAssert(u32 device, const char * file, int line, const char * assertion);
void setWarningMessage_f(u32 device, char * file, int line, const char * fmt, ...);
void setLogMessage_f(u32 device, char* file, int line, const char* fmt, ...);
};
extern bool sAssertVisible;
+1
View File
@@ -144,6 +144,7 @@ extern "C" void JUTSetReportConsole(JUTConsole*);
extern "C" JUTConsole* JUTGetReportConsole();
extern "C" void JUTSetWarningConsole(JUTConsole*);
extern "C" JUTConsole* JUTGetWarningConsole();
extern "C" void JUTWarningConsole_f_va(const char*, va_list);
extern "C" void JUTReportConsole_f_va(const char*, va_list);
extern "C" void JUTReportConsole_f(const char*, ...);
extern "C" void JUTWarningConsole(const char* message);
@@ -24,6 +24,7 @@ public:
bool isActive() const { return field_0x00 != 0; }
JUtility::TColor getCharColor() const { return mCharColor; }
void changeFrameBuffer(void *param_0) { changeFrameBuffer(param_0, mFrameBufferWidth, mFrameBufferHeight); }
void* getFrameBuffer() { return field_0x00; }
static JUTDirectPrint* getManager() { return sDirectPrint; }