From 477f6da6cdd5051fc2d1be98cbe0ef366c33822d Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Sun, 12 May 2024 12:58:59 -0400 Subject: [PATCH] Fix symbol for isRegisterd. (from NSMBW map) --- config/SOUE01/symbols.txt | 2 +- include/egg/core/eggXfbManager.h | 2 +- src/egg/core/eggXfbManager.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 9c639652..97c2c8d9 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -26305,7 +26305,7 @@ getStandardRenderModeObj__Q23EGG5VideoFPCQ33EGG5Video16RenderModeObjSet = .text: init__Q23EGG3XfbFUsUsPQ23EGG4Heap = .text:0x804989E0; // type:function size:0x74 __ct__Q23EGG3XfbFPQ23EGG4Heap = .text:0x80498A60; // type:function size:0x64 calcBufferSize__Q23EGG3XfbFUsUs = .text:0x80498AD0; // type:function size:0x14 -isRegisterd__Q23EGG10XfbManagerCFPQ23EGG3Xfb = .text:0x80498AF0; // type:function size:0x34 +isRegisterd__Q23EGG10XfbManagerCFRQ23EGG3Xfb = .text:0x80498AF0; // type:function size:0x34 attach__Q23EGG10XfbManagerFPQ23EGG3Xfb = .text:0x80498B30; // type:function size:0xE0 copyEFB__Q23EGG10XfbManagerFb = .text:0x80498C10; // type:function size:0xE8 setNextFrameBuffer__Q23EGG10XfbManagerFv = .text:0x80498D00; // type:function size:0x120 diff --git a/include/egg/core/eggXfbManager.h b/include/egg/core/eggXfbManager.h index a0895d85..948b0349 100644 --- a/include/egg/core/eggXfbManager.h +++ b/include/egg/core/eggXfbManager.h @@ -14,7 +14,7 @@ public: /* 0xC */ u8 mNumXfbs; // Total number of Xfbs ever attached /* 0xD */ u8 mNumXfbs_Copy; // Unsure of purpose yet, but showing wont proceed until its under 3 public: - /* 80498af0 */ bool isRegisterd(Xfb *xfb) const; // yes. this is correct spelling + /* 80498af0 */ bool isRegisterd(Xfb &xfb) const; // yes. this is correct spelling /* 80498b30 */ bool attach(Xfb *xfb); /* 80498c10 */ void copyEFB(bool); /* 80498d00 */ void setNextFrameBuffer(); diff --git a/src/egg/core/eggXfbManager.cpp b/src/egg/core/eggXfbManager.cpp index 70e1e8a2..46ab8d2a 100644 --- a/src/egg/core/eggXfbManager.cpp +++ b/src/egg/core/eggXfbManager.cpp @@ -6,13 +6,13 @@ namespace EGG { -/* 80498af0 */ bool XfbManager::isRegisterd(Xfb *xfb) const { +/* 80498af0 */ bool XfbManager::isRegisterd(Xfb &xfb) const { Xfb *x = mNextXfb; Xfb *iter = x; if (mNextXfb != nullptr) { do { - if (iter == xfb) { + if (iter == &xfb) { return true; } iter = iter->mNext; @@ -25,7 +25,7 @@ namespace EGG { int interrupts = OSDisableInterrupts(); bool u3 = 0; - if (xfb != nullptr && !isRegisterd(xfb)) { + if (xfb != nullptr && !isRegisterd(*xfb)) { xfb->mState = Xfb::XFB_UNPROCESSED; if (mNextXfb == nullptr) { mNextXfb = xfb;