diff --git a/configure.py b/configure.py index d6c8ae78c..e192e2259 100644 --- a/configure.py +++ b/configure.py @@ -395,7 +395,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]: Object(NonMatching, "SB/Core/gc/iCollide.cpp"), Object(Matching, "SB/Core/gc/iCollideFast.cpp"), Object(Matching, "SB/Core/gc/iDraw.cpp"), - Object(NonMatching, "SB/Core/gc/iEnv.cpp"), + Object(Equivalent, "SB/Core/gc/iEnv.cpp"), Object(NonMatching, "SB/Core/gc/iFile.cpp"), Object(NonMatching, "SB/Core/gc/iFMV.cpp"), Object(NonMatching, "SB/Core/gc/iFX.cpp"), diff --git a/src/SB/Core/gc/iEnv.cpp b/src/SB/Core/gc/iEnv.cpp index 55517837d..f377f2e15 100644 --- a/src/SB/Core/gc/iEnv.cpp +++ b/src/SB/Core/gc/iEnv.cpp @@ -10,8 +10,6 @@ static RpWorld* sPipeWorld; static RwCamera* sPipeCamera; static iEnv* lastEnv; -const static RwBBox lbl_80260130 = { 1000.0f, 1000.0f, 1000.0f, -1000.0f, -1000.0f, -1000.0f }; - static RpAtomic* SetPipelineCB(RpAtomic* atomic, void* data) { if (RwCameraBeginUpdate(sPipeCamera)) @@ -48,7 +46,6 @@ static void iEnvSetBSP(iEnv* env, S32 envDataType, RpWorld* bsp) } } -#ifdef NON_MATCHING void iEnvLoad(iEnv* env, const void* data, U32, S32 dataType) { RpWorld* bsp = (RpWorld*)data; @@ -98,7 +95,6 @@ void iEnvLoad(iEnv* env, const void* data, U32, S32 dataType) env->memlvl = xMemGetBase(); } } -#endif void iEnvFree(iEnv* env) {