mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-06-12 13:04:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match & link dvderr.c

Browse Source
This commit is contained in:
Cuyler36
2023-05-22 06:15:38 -04:00
parent ea1266b192
commit 1d2def2717
14 changed files with 170 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common.py
+11 -1
View File
@@ -224,6 +224,9 @@ AS = os.path.join(DEVKITPPC, "bin", "powerpc-eabi-as")
OBJDUMP = os.path.join(DEVKITPPC, "bin", "powerpc-eabi-objdump")
CPP = os.path.join(DEVKITPPC, "bin", "powerpc-eabi-cpp")
# Asset Converters
VTXDIS = f"{PYTHON} {TOOLS}/converters/vtxdis.py"
ICONV = f"{PYTHON} tools/sjis.py" # TODO: get actual iconv working(?)
# N64 SDK path for GBI
@@ -336,6 +339,12 @@ BOOT_CFLAGS = CFLAGS + [
"-sdata 0",
"-sdata2 0"
] + DOL_DEFINES
DVDERR_CFLAGS = CFLAGS + [
"-inline on",
"-sdata 0",
"-sdata2 0",
"-pool off"
] + DOL_DEFINES
BASE_REL_CFLAGS = CFLAGS + [
"-sdata 0",
f"-sdata2 {REL_SDATA2_SIZE}",
@@ -384,7 +393,8 @@ JSYSTEM_BASE = [
JSYSTEM_CFLAGS = ' '.join(JSYSTEM_BASE + LOCAL_CFLAGS)
DOL_CFLAGS = ' '.join(BASE_DOL_CFLAGS + LOCAL_CFLAGS)
DOL_BOOT_CFLAGS = ' '.join(BOOT_CFLAGS + LOCAL_CFLAGS); # TODO: this uses C++ but there's some issues with ppcdis, real flags: ' '.join(CPLFLAGS + BOOT_CFLAGS + LOCAL_CFLAGS);
DOL_BOOT_CFLAGS = ' '.join(BOOT_CFLAGS + LOCAL_CFLAGS) # TODO: this uses C++ but there's some issues with ppcdis, real flags: ' '.join(CPLFLAGS + BOOT_CFLAGS + LOCAL_CFLAGS);
DOL_DVDERR_CFLAGS = ' '.join(DVDERR_CFLAGS + LOCAL_CFLAGS)
SDK_FLAGS = ' '.join(SDK_CFLAG + LOCAL_CFLAGS)
ALIGN16 = ' '.join(BASE_DOL_CFLAGS + LOCAL_CFLAGS + ALIGN16_CFLAG)
DOL_CPPFLAGS = ' '.join(CPLFLAGS + BASE_DOL_CFLAGS + LOCAL_CFLAGS)
config/analysis_overrides.yml
+1
View File
@@ -3,6 +3,7 @@ blocked_pointers:
- 0x800A8514
blocked_targets:
- 0x800A97E0 # boot.c local static const tbl, also start of .rodata
- 0x80008000
forced_types:
0x80003534: FUNCTION
0x80005468: FUNCTION
config/assets.yml
+78
View File
@@ -3,10 +3,88 @@ config/dol.yml:
addrs: [0x800b05e8, 0x800b05f4]
__DateTime__:
addrs: [0x800b05f4, 0x800b0608]
# dvderr.c
dvd_keikoku_moji1_1_tex:
addrs: [0x800b0a60, 0x800b0f60]
dvd_keikoku_moji1_2_tex:
addrs: [0x800b0f60, 0x800b1460]
dvd_keikoku_moji1_3_tex:
addrs: [0x800b1460, 0x800b1660]
dvd_keikoku_moji1_4_tex:
addrs: [0x800b1660, 0x800b1c60]
ctl_att_w1_tex:
addrs: [0x800b1c60, 0x800b2060]
ctl_att_w2_tex:
addrs: [0x800b2060, 0x800b2460]
ctl_att_w3_tex:
addrs: [0x800b2460, 0x800b2860]
ctl_att_w4_tex:
addrs: [0x800b2860, 0x800b2c60]
ctl_att_w5_tex:
addrs: [0x800b2c60, 0x800b3060]
ctl_att_w6_tex:
addrs: [0x800b3060, 0x800b30e0]
dvd_keikoku1_v:
addrs: [0x800b30e0, 0x800b34a0]
type: "vtx"
dvd_keikoku_moji2_tex:
addrs: [0x800b3640, 0x800b38c0]
dvd_keikoku_moji2_2_tex:
addrs: [0x800b38c0, 0x800b3ec0]
dvd_keikoku_moji2_3_tex:
addrs: [0x800b3ec0, 0x800b3f40]
dvd_keikoku2_v:
addrs: [0x800b3f40, 0x800b42c0]
type: "vtx"
dvd_keikoku_moji4_tex:
addrs: [0x800b4440, 0x800b46c0]
dvd_keikoku_moji3_1_tex:
addrs: [0x800b46c0, 0x800b4cc0]
dvd_keikoku_moji3_2_tex:
addrs: [0x800b4cc0, 0x800b4f40]
dvd_keikoku_moji3_3_tex:
addrs: [0x800b4f40, 0x800b4fc0]
dvd_keikoku3_v:
addrs: [0x800b4fc0, 0x800b5400]
type: "vtx"
dvd_keikoku_moji5_tex:
addrs: [0x800b55a0, 0x800b58a0]
dvd_keikoku_moji6_2_tex:
addrs: [0x800b58a0, 0x800b5d20]
dvd_keikoku_moji6_3_tex:
addrs: [0x800b5d20, 0x800b5fa0]
dvd_keikoku_moji6_tex:
addrs: [0x800b5fa0, 0x800b63a0]
dvd_keikoku_moji6_1_tex:
addrs: [0x800b63a0, 0x800b6920]
dvd_keikoku_moji6_new1_tex:
addrs: [0x800b6920, 0x800b6b20]
dvd_keikoku_moji6_new2_tex:
addrs: [0x800b6b20, 0x800b6d20]
dvd_keikoku4_v:
addrs: [0x800b6d20, 0x800b71a0]
type: "vtx"
dvd_keikoku_moji7_tex:
addrs: [0x800b7380, 0x800b7880]
dvd_keikoku_moji8_tex:
addrs: [0x800b7880, 0x800b7c80]
dvd_keikoku_moji10_tex:
addrs: [0x800b7c80, 0x800b7e80]
dvd_keikoku_moji11_tex:
addrs: [0x800b7e80, 0x800b8300]
dvd_keikoku_moji12_tex:
addrs: [0x800b8300, 0x800b8580]
dvd_keikoku_moji9_tex:
addrs: [0x800b8580, 0x800b8a80]
dvd_keikoku5_v:
addrs: [0x800b8a80, 0x800b8ec0]
type: "vtx"
nintendo_hi_0:
addrs: [0x800c3140, 0x800cca40]
config/rel.yml:
wipe1_v:
addrs: [0x80652AD0, 0x80652C60]
type: "vtx"
g_wipe1_txt:
addrs: [0x80652C60, 0x80653460]
config/disasm_overrides.yml
+1
View File
@@ -2,3 +2,4 @@ trim_ctors: true
symbol_aligns:
0x80207458: 8 # align RunQueue to 0x001251d8
0x800b9140: 32 # align gam_win_moji1_tex to 32 bytes
config/dol_slices.yml
+5
View File
@@ -16,6 +16,11 @@ boot.c:
.bss: [0x800e2280, 0x800e2318]
version.c:
.data: [0x800b05e8, 0x800b0608]
dvderr.c:
.text: [0x80007e58, 0x800083f8]
.rodata: [0x800a97f8, 0x800a9838]
.data: [0x800b0a60, 0x800b9140]
.bss: [0x800e2790, 0x800e2b88]
jaudio_NES/dummyprobe.c:
.text: [0x800083f8, 0x80008400]
#jaudio_NES/verysimple.c:
configure.py
+26 -6
View File
@@ -92,6 +92,7 @@ n.variable("as", c.AS)
n.variable("cpp", c.CPP)
n.variable("iconv", c.ICONV)
n.variable("forcefilesgen", c.FORCEFILESGEN)
n.variable("vtxdis", c.VTXDIS)
n.newline()
##############
@@ -257,6 +258,12 @@ n.rule(
description = "LCF FORCEFILES generation $in"
)
n.rule(
"vtxdis",
command = "$vtxdis $in $out",
description = "vtxdis.py $in $out"
)
##########
# Assets #
##########
@@ -265,12 +272,13 @@ n.rule(
class Asset:
binary: str
path: str
convtype: str
start: int
end: int
def load(yml_path: str):
return {
asset : Asset(binary, asset, *adat["addrs"])
asset : Asset(binary, asset, adat.get("type", "u8"), *adat["addrs"])
for binary, bdat in c.load_from_yaml(yml_path).items()
for asset, adat in bdat.items()
}
@@ -496,11 +504,19 @@ class AssetInclude(GeneratedInclude):
"addrs" : f"{inc.asset.start:x} {inc.asset.end:x}"
}
)
n.build(
inc.path,
rule="assetinc",
inputs=inc.asset_path
)
if inc.asset.convtype == "vtx":
n.build(
inc.path,
rule="vtxdis",
inputs=inc.asset_path
)
else:
n.build(
inc.path,
rule="assetinc",
inputs=inc.asset_path
)
def __repr__(self):
return f"AssetInclude({self.asset})"
@@ -619,6 +635,10 @@ class CSource(Source):
self.cflags = c.DOL_BOOT_CFLAGS
self.cc = c.CC
self.frank = False
elif path == "src/dvderr.c":
self.cflags = c.DOL_DVDERR_CFLAGS
self.cc = c.CC
self.frank = False
elif path.startswith("src/jaudio_NES"):
self.cc = c.CC
self.cflags = c.DOL_CPPFLAGS
include/dolphin/gx.h
+3 -1
View File
@@ -7,7 +7,9 @@
extern "C" {
#endif
#define GX_CLAMP 0
#define GX_REPEAT 1
#define GX_MIRROR 2
#ifdef __cplusplus
}
include/dvderr.h
+30 -3
View File
@@ -1,15 +1,42 @@
#ifndef DVDERR_H
#define DVDERR_H
/* dvderr lives in dol, so dvderr.c is at src/dvderr.c */
#include "types.h"
#include "PR/mbi.h"
#ifdef __cplusplus
extern "C" {
#endif
extern BOOL dvderr_draw();
enum dvderr_state {
DVDERR_NONE = -1,
DVDERR_COVER_OPEN = 0,
DVDERR_NO_DISK,
DVDERR_WRONG_DISK,
DVDERR_RETRY,
DVDERR_FATAL,
DVDERR_NUM
};
typedef void (*DVDERR_DRAW_PROC)();
/* sizeof(dvderr_work) == 0x3F8 */
typedef struct dvderr_work_s {
/* 0x000 */ Gfx gfx[100]; // display list buffer
/* 0x320 */ Gfx* gfx_p; // current display list buffer write pointer
/* 0x328 */ Mtx ortho; // orthographic matrix
/* 0x368 */ Mtx projection; // projection matrix
/* 0x3A8 */ Mtx modelview; // modelview matrix
/* 0x3E8 */ f32 scale; // scale for modelview matrix
/* 0x3EC */ DVDERR_DRAW_PROC draw_proc; // current draw routine
/* 0x3F0 */ int now_error; // current dvd error
/* 0x3F4 */ int next_error; // next dvd error
} dvderr_work;
extern int dvderr_draw();
extern void dvderr_init();
#ifdef __cplusplus
include/libforest/gbi_extensions.h
+5 -5
View File
@@ -447,7 +447,7 @@ do { \
#define gsDPSetTextureImage_Dolphin(fmt, siz, h, w, img) \
{{ \
_SHIFTL(G_SETTIMG, 24, 8) | _SHIFTL(fmt, 21, 3) | _SHIFTL(siz, 19, 2) | _SHIFTL(1, 18, 1) | \
_SHIFTL((h/4)-1, 10, 8) | _SHIFTL((w-1), 0, 10), img \
_SHIFTL((h/4)-1, 10, 8) | _SHIFTL((w-1), 0, 10), (unsigned int)img \
}}
#define gsDPSetTile_Dolphin(d_fmt, tile, tlut_name, wrap_s, wrap_t, shift_s, shift_t) \
@@ -531,14 +531,14 @@ do { \
#define gsSPNTriangles_5b(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) \
{{ \
(unsigned long long)((gsSPNTriangleData1(v9, v10, v11) << 49) | (gsSPNTriangleData1(v6, v7, v8) << 34) | \
(gsSPNTriangleData1(v3, v4, v5) << 19) | (gsSPNTriangleData1(v0, v1, v2) << 4)) | G_VTX_MODE_5bit \
_SHIFTL(gsSPNTriangleData1(v9, v10, v11, 0), 17, 15) | _SHIFTL(gsSPNTriangleData1(v6, v7, v8, 0), 2, 15) | _SHIFTL(_SHIFTR(gsSPNTriangleData1(v3, v4, v5, 0), 13, 2), 0, 2), \
_SHIFTL(gsSPNTriangleData1(v3, v4, v5, 0), 19, 13) | _SHIFTL(gsSPNTriangleData1(v0, v1, v2, 0), 4, 15) | _SHIFTL(G_VTX_MODE_5bit, 0, 1) \
}}
#define gsSPNTrianglesInit_5b(n, v0, v1, v2, v3, v4, v5, v6, v7, v8) \
{{ \
_SHIFTL(G_TRIN_INDEPEND, 24, 8) | _SHIFTL(n-1, 17, 7) | _SHIFTL(gsSPNTriangleData1(v6, v7, v8, 0), 2, 15) | _SHIFTL(_SHIFTR(gsSPNTriangleData1(v3, v4, v5, 0), 2, 13), 0, 2), \
_SHIFTL(gsSPNTriangleData1(v3, v4, v5, 0), 19, 13) | _SHIFTL(gsSPNTriangleData1(v0, v1, v2, 0), 4, 15) | _SHIFTL(G_VTX_MODE_5bit, 0, 1) \
_SHIFTL(G_TRIN_INDEPEND, 24, 8) | _SHIFTL(n-1, 17, 7) | _SHIFTL(gsSPNTriangleData1(v6, v7, v8, 0), 2, 15) | _SHIFTL(_SHIFTR(gsSPNTriangleData1(v3, v4, v5, 0), 13, 2), 0, 2), \
_SHIFTL(gsSPNTriangleData1(v3, v4, v5, 0), 19, 13) | _SHIFTL(gsSPNTriangleData1(v0, v1, v2, 0), 4, 15) | _SHIFTL(G_VTX_MODE_5bit, 0, 1) \
}}
#define gsSPNTriangles_7b(v0, v1, v2, v3, v4, v5, v6, v7, v8) \
include/libultra/libultra.h
+1
View File
@@ -4,6 +4,7 @@
#include "types.h"
#include "dolphin/os/OSTime.h"
#include "dolphin/os/OSCache.h"
#include "libultra/gu.h"
#define N64_SCREEN_HEIGHT 240
#define N64_SCREEN_WIDTH 320
include/types.h
+2
View File
@@ -62,4 +62,6 @@ typedef u32 unknown;
/* Fully opaque, 5 bits per color channel */ (0x8000 | ((((argb8) >> 16) & 0xF8) << 7) | ((((argb8) >> 8) & 0xF8) << 2) | (((argb8) & 0xFF) >> 3)) : \
/* 3 bits of transparency, 4 bits per color channel */ (((((argb8) >> 24) & 0xE0) << 7) | ((((argb8) >> 16) & 0xF0) << 4) | (((argb8) >> 8) & 0xF0) | (((argb8) & 0xF0) >> 4))))
#define GPACK_RGB5A3(r, g, b, a) ARGB8_to_RGB5A3((((a) & 0xFF) << 24) | (((r) & 0xFF) << 16) | (((g) & 0xFF) << 8) | ((b) & 0xFF))
#endif
rel/m_fbdemo_wipe1.c
+2 -2
View File
@@ -5,7 +5,7 @@
#include "m_rcp.h"
u8 wipe1_v[] = {
Vtx wipe1_v[] = {
#include "assets/wipe1_v.inc"
};
@@ -26,7 +26,7 @@ Gfx wipe1_modelT[] = {
gsDPSetTextureLUT(G_TT_NONE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPDisplayList(0x08000000),
gsSPVertex(wipe1_v, 25, 0),
gsSPVertex(&wipe1_v[0], 25, 0),
gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0),
gsSP2Triangles(5, 6, 7, 0, 6, 8, 9, 0),
gsSP2Triangles(8, 10, 11, 0, 10, 12, 13, 0),
src/boot.c
+1 -1
View File
@@ -666,4 +666,4 @@ int main(int argc, const char** argv) {
OSReport("どうぶつの森ブートローダ終了\n"); /* Animal Crossing bootloader end */
JW_Cleanup();
return 0;
}
}
src/libforest/fault.c
+4 -2
View File
@@ -1,6 +1,8 @@
#include "fault.h"
#include "terminal.h"
__declspec(section ".sdata") static fault* this;
#include "va_args.h"
/*__declspec(section ".sdata")*/ static fault* this;
static fault fault_class;
extern void fault_AddClientEx(fault_client* client, FaultCallback callback, const char* msg, u32 param, u8 priority, u8 flags) {
@@ -46,7 +48,7 @@ extern void fault_AddClientEx(fault_client* client, FaultCallback callback, cons
exit:
OSRestoreInterrupts(enable);
if (client_exists != FALSE) {
OSReport(VTCOL(RED,WHITE)"fault_AddClient: %08x は既にリスト中にある\n%x",VT_RST, client);
OSReport(VT_COL(VT_COLOR_RED,VT_COLOR_WHITE) "fault_AddClient: %08x は既にリスト中にある\n%x" VT_RST, client);
}
}