From d2426c53f71d85b67e4a1ef621208ae1e15b474c Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Tue, 14 Jan 2025 22:41:00 -0500 Subject: [PATCH] Fix JUTXfb fakematch This match (with the u32 cast) is more likely to be the real match based on the inlines called in TP debug. --- include/JSystem/JUtility/JUTVideo.h | 4 ++-- src/JSystem/JUtility/JUTXfb.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/JSystem/JUtility/JUTVideo.h b/include/JSystem/JUtility/JUTVideo.h index 417999aca..a4d5a37fd 100644 --- a/include/JSystem/JUtility/JUTVideo.h +++ b/include/JSystem/JUtility/JUTVideo.h @@ -27,8 +27,8 @@ public: static void postRetraceProc(u32); static void drawDoneCallback(); - u32 getFbWidth() const { return mRenderObj->fb_width; } - u32 getEfbHeight() const { return mRenderObj->efb_height; } + u16 getFbWidth() const { return mRenderObj->fb_width; } + u16 getEfbHeight() const { return mRenderObj->efb_height; } void getBounds(u16& width, u16& height) const { width = (u16)getFbWidth(); height = (u16)getEfbHeight(); diff --git a/src/JSystem/JUtility/JUTXfb.cpp b/src/JSystem/JUtility/JUTXfb.cpp index 0f49febcc..36c1f57b9 100644 --- a/src/JSystem/JUtility/JUTXfb.cpp +++ b/src/JSystem/JUtility/JUTXfb.cpp @@ -35,9 +35,9 @@ JUTXfb::JUTXfb(const _GXRenderModeObj* pObj, JKRHeap* pHeap, JUTXfb::EXfbNumber GXRenderModeObj* obj = JUTVideo::getManager()->getRenderMode(); initiate(obj->fb_width, obj->xfb_height, pHeap, xfbNum); #else - u16 fb_width = JUTVideo::getManager()->getFbWidth(); - u16 efb_height = JUTVideo::getManager()->getEfbHeight(); - u16 xfb_height = JUTVideo::getManager()->getXfbHeight(); + u16 fb_width = JUTVideo::getManager()->getRenderMode()->fb_width; + u16 efb_height = (u32)JUTVideo::getManager()->getRenderMode()->efb_height; + u16 xfb_height = JUTVideo::getManager()->getRenderMode()->xfb_height; f32 scale_factor = GXGetYScaleFactor(efb_height, xfb_height); u16 xfb_lines = GXGetNumXfbLines(efb_height, scale_factor);