mirror of
https://github.com/ACreTeam/ac-decomp
synced 2026-08-22 05:49:04 -04:00
emu64: fixes, update objdiff tag versions
This commit is contained in:
+1
-1
@@ -156,7 +156,7 @@ if not config.non_matching:
|
||||
config.binutils_tag = "2.42-1"
|
||||
config.compilers_tag = "20240706"
|
||||
config.dtk_tag = "v1.6.2"
|
||||
config.objdiff_tag = "v2.7.1"
|
||||
config.objdiff_tag = "v3.0.0-beta.9"
|
||||
config.sjiswrap_tag = "v1.2.0"
|
||||
config.wibo_tag = "0.6.11"
|
||||
config.orthrus_tag = "v0.2.0"
|
||||
|
||||
@@ -688,12 +688,12 @@ class emu64 : public emu64_print {
|
||||
void emu64_set_verbose(int verbose);
|
||||
|
||||
/* N64 texture format[N64 bit size] -> dol texture format */
|
||||
static const u16 fmtxtbl[8][4];
|
||||
static char* warningString[EMU64_WARNING_COUNT];
|
||||
static u32 warningTime[EMU64_WARNING_COUNT];
|
||||
static bool displayWarning;
|
||||
|
||||
private:
|
||||
|
||||
private:
|
||||
static const u16 fmtxtbl[8][4];
|
||||
/* 0x0000 */ // u8 emu64_print::print_flags;
|
||||
/* 0x0001 */ s8 print_commands;
|
||||
/* 0x0002 */ bool disable_polygons;
|
||||
|
||||
@@ -914,7 +914,7 @@ static const OthermodeParameterInfo l_tbl[] = {
|
||||
#include "../src/static/libforest/emu64/emu64_print.cpp"
|
||||
|
||||
/* Helper function to convert N64 texture format to Dolphin format */
|
||||
const u16 emu64::fmtxtbl[8][4] = {
|
||||
__declspec(section ".rodata") const u16 emu64::fmtxtbl[8][4] = {
|
||||
{ GX_TF_CMPR, -1, GX_TF_RGB5A3, GX_TF_RGBA8 }, /* G_IM_FMT_RGBA */
|
||||
{ -1, -1, -1, -1 }, /* G_IM_FMT_YUV */
|
||||
{ GX_TF_C4, GX_TF_C8, 0xA, -1 }, /* G_IM_FMT_CI */
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "boot.h"
|
||||
|
||||
static const char kakko[] = "/\\/\\||||||||\\/\\/";
|
||||
static const u8 kakko[] = {'/', '\\', '/', '\\', '|', '|', '|', '|', '|', '|', '|', '|', '\\', '/', '\\', '/'};
|
||||
|
||||
void emu64::disp_matrix(GC_Mtx mtx) {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
|
||||
Reference in New Issue
Block a user