summaryrefslogtreecommitdiff
path: root/src/nw4r
diff options
context:
space:
mode:
authorrobojumper <robojumper@gmail.com>2025-07-13 14:04:32 +0200
committerrobojumper <robojumper@gmail.com>2025-07-13 14:04:32 +0200
commitc84977df63b715963fb92981fe86517c6ec5e9cd (patch)
treefee492d801b9ead95bf0373c488eb524bd9a132a /src/nw4r
parent8229189d3439eed4f9e505d53634fc2d5d8848e9 (diff)
More splits (text only)
Diffstat (limited to 'src/nw4r')
-rw-r--r--src/nw4r/db/db_exception.cpp10
-rw-r--r--src/nw4r/g3d/platform/g3d_tmem.cpp2
2 files changed, 5 insertions, 7 deletions
diff --git a/src/nw4r/db/db_exception.cpp b/src/nw4r/db/db_exception.cpp
index 700e93ec..29b575fb 100644
--- a/src/nw4r/db/db_exception.cpp
+++ b/src/nw4r/db/db_exception.cpp
@@ -74,8 +74,6 @@ void Exception_Init() {
}
extern "C" u32 PPCMfmsr();
extern "C" void PPCMtmsr(u32);
-extern "C" void OSFillFPUContext(OSContext *ctx);
-extern "C" void fn_803AA2E0(u32, u32, u32, u32);
static void DumpException_(const ExceptionCallbackParam *);
@@ -85,10 +83,10 @@ void ErrorHandler_(u16 error, OSContext *ctx, u32 dsisr, u32 dar) {
OSFillFPUContext(ctx);
OSSetErrorHandler(error, nullptr);
if (error == 0xf) {
- fn_803AA2E0(0, 0, 0, 3);
- fn_803AA2E0(1, 0, 0, 3);
- fn_803AA2E0(2, 0, 0, 3);
- fn_803AA2E0(3, 0, 0, 3);
+ OSProtectRange(OS_PROTECT_CHAN0, 0, 0, OS_PROTECT_CONTROL_RDWR);
+ OSProtectRange(OS_PROTECT_CHAN1, 0, 0, OS_PROTECT_CONTROL_RDWR);
+ OSProtectRange(OS_PROTECT_CHAN2, 0, 0, OS_PROTECT_CONTROL_RDWR);
+ OSProtectRange(OS_PROTECT_CHAN3, 0, 0, OS_PROTECT_CONTROL_RDWR);
}
ExceptionCallbackParam param;
diff --git a/src/nw4r/g3d/platform/g3d_tmem.cpp b/src/nw4r/g3d/platform/g3d_tmem.cpp
index 2dc55708..1688bd97 100644
--- a/src/nw4r/g3d/platform/g3d_tmem.cpp
+++ b/src/nw4r/g3d/platform/g3d_tmem.cpp
@@ -213,7 +213,7 @@ void SetTMemLayout(TMemLayout layout) {
} // namespace nw4r
static GXTexRegion *TexRegionCallback(const GXTexObj *pObj, GXTexMapID map) {
- GXTexFmt fmt = GXGetTexObjFormat(pObj);
+ GXTexFmt fmt = GXGetTexObjFmt(pObj);
GXBool mipmap = GXGetTexObjMipMap(pObj);
switch (fmt) {