mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Link emu64!! Thanks Roeming!!

Browse Source
This commit is contained in:
Cuyler36
2025-06-18 20:41:51 -04:00
parent 16c41889af
commit 6cc539582c
5 changed files with 257 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/libforest/emu64.h
+2 -2
View File
@@ -10,8 +10,8 @@ extern "C" {
extern u8 FrameCansel;
/* These might be signed */
extern void emu64_set_aflags(u32 idx, u32 value);
extern int emu64_get_aflags(u32 idx);
extern void emu64_set_aflags(int idx, int value);
extern int emu64_get_aflags(int idx);
#ifdef __cplusplus
}
include/libforest/emu64/emu64.hpp
+37 -31
View File
@@ -250,17 +250,18 @@ typedef union GXTexFmts {
u32 raw;
} GXTexFmts;
inline void get_blk_wd_ht(unsigned int siz, unsigned int* blk_wd, unsigned int* blk_ht) {
static const u8 blk_tbl[4][2] = {
{ 8, 8 }, // G_IM_SIZ_4b
{ 8, 4 }, // G_IM_SIZ_8b
{ 4, 4 }, // G_IM_SIZ_16b
{ 4, 4 } // G_IM_SIZ_32b
};
void get_blk_wd_ht(unsigned int siz, unsigned int* blk_wd, unsigned int* blk_ht);
// inline void get_blk_wd_ht(unsigned int siz, unsigned int* blk_wd, unsigned int* blk_ht) {
// static const u8 blk_tbl[4][2] = {
// { 8, 8 }, // G_IM_SIZ_4b
// { 8, 4 }, // G_IM_SIZ_8b
// { 4, 4 }, // G_IM_SIZ_16b
// { 4, 4 } // G_IM_SIZ_32b
// };
*blk_wd = blk_tbl[siz][0];
*blk_ht = blk_tbl[siz][1];
}
// *blk_wd = blk_tbl[siz][0];
// *blk_ht = blk_tbl[siz][1];
// }
extern void get_dol_wd_ht(unsigned int siz, unsigned int in_wd, unsigned int in_ht, unsigned int* wd, unsigned int* ht);
@@ -431,30 +432,35 @@ class Texture {
class emu64_print {
public:
void Printf(const char* fmt, ...) {
va_list list;
void Printf(const char* fmt, ...);
// void Printf(const char* fmt, ...) {
// va_list list;
if ((this->print_flags & EMU64_PRINTF_ENABLED_FLAG)) {
va_start(list, fmt);
this->Vprintf(fmt, list);
va_end(list);
}
}
// if ((this->print_flags & EMU64_PRINTF_ENABLED_FLAG)) {
// va_start(list, fmt);
// // this->Vprintf(fmt, list);
// vprintf(fmt, list);
// va_end(list);
// }
// }
void Printf0(const char* fmt, ...) {
va_list list;
void Printf0(const char* fmt, ...);
// void Printf0(const char* fmt, ...) {
// va_list list;
va_start(list, fmt);
this->Vprintf(fmt, list);
va_end(list);
}
// va_start(list, fmt);
// // this->Vprintf(fmt, list);
// vprintf(fmt, list);
// va_end(list);
// }
void Printf1(const char* fmt, ...) {
va_list list;
if ((this->print_flags & EMU64_PRINTF1_FLAG)) {
va_start(list, fmt);
this->Vprintf(fmt, list);
// this->Vprintf(fmt, list);
vprintf(fmt, list);
va_end(list);
}
}
@@ -464,7 +470,8 @@ class emu64_print {
if ((this->print_flags & EMU64_PRINTF2_FLAG)) {
va_start(list, fmt);
this->Vprintf(fmt, list);
// this->Vprintf(fmt, list);
vprintf(fmt, list);
va_end(list);
}
}
@@ -474,7 +481,8 @@ class emu64_print {
if ((this->print_flags & EMU64_PRINTF3_FLAG)) {
va_start(list, fmt);
this->Vprintf(fmt, list);
// this->Vprintf(fmt, list);
vprintf(fmt, list);
va_end(list);
}
}
@@ -482,10 +490,8 @@ class emu64_print {
protected:
u8 print_flags;
private:
void Vprintf(const char* fmt, std::__tag_va_List va_list) {
vprintf(fmt, va_list);
}
// private:
// void Vprintf(const char* fmt, std::__tag_va_List va_list) const; // this is only in e+??
};
#define EMU64_ASSERTLINE(cond, line) \