From 3a0e46b6fcb35de3c86b6e547bd23a65a7fd88b5 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Fri, 20 Dec 2024 19:30:38 -0800 Subject: [PATCH] Remove fake functions --- config/GM8E01_01/symbols.txt | 45 ++++++++++++------------------------ configure.py | 2 +- src/Dolphin/dummy.c | 2 +- 3 files changed, 17 insertions(+), 32 deletions(-) diff --git a/config/GM8E01_01/symbols.txt b/config/GM8E01_01/symbols.txt index dc05df57..7aeab4d8 100644 --- a/config/GM8E01_01/symbols.txt +++ b/config/GM8E01_01/symbols.txt @@ -2105,8 +2105,7 @@ __ct__16CCinematicCameraF9TUniqueIdRCQ24rstl66basic_stringFi = .text:0x80095604; // type:function size:0x108 scope:global SetupMiniMapWorld__11CAutoMapperFv = .text:0x8009570C; // type:function size:0x54 scope:global LeaveMapScreen__11CAutoMapperCFRC13CStateManager = .text:0x80095760; // type:function size:0x258 scope:global -SetCurWorldAssetId__11CAutoMapperFi = .text:0x800959B8; // type:function size:0x44 scope:global -fn_80095980 = .text:0x800959FC; // type:function size:0x4 scope:global +SetCurWorldAssetId__11CAutoMapperFi = .text:0x800959B8; // type:function size:0x48 scope:global TransformRenderStateWorldToUniverse__11CAutoMapperFRQ211CAutoMapper22SAutoMapperRenderState = .text:0x80095A00; // type:function size:0x68 scope:global TransformRenderStatesUniverseToWorld__11CAutoMapperFv = .text:0x80095A68; // type:function size:0x188 scope:global TransformRenderStatesWorldToUniverse__11CAutoMapperFv = .text:0x80095BF0; // type:function size:0x17C scope:global @@ -2189,8 +2188,7 @@ FMapWorldFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer = .text:0x80 __dt__36TObjOwnerDerivedFromIObj<9CMapWorld>Fv = .text:0x8009F550; // type:function size:0x90 scope:global GetIObjObjectFor__18TToken<9CMapWorld>FRCQ24rstl20auto_ptr<9CMapWorld> = .text:0x8009F5E0; // type:function size:0x2C scope:global GetNewDerivedObject__36TObjOwnerDerivedFromIObj<9CMapWorld>FRCQ24rstl20auto_ptr<9CMapWorld> = .text:0x8009F60C; // type:function size:0x9C scope:global -ClearTraversedFlags__9CMapWorldCFv = .text:0x8009F6A8; // type:function size:0x24 scope:global -fn_8009F650 = .text:0x8009F6CC; // type:function size:0x4 scope:global +ClearTraversedFlags__9CMapWorldCFv = .text:0x8009F6A8; // type:function size:0x28 scope:global ConstrainToWorldVolume__9CMapWorldCFRC9CVector3fRC9CVector3f = .text:0x8009F6D0; // type:function size:0x208 scope:global RecalculateWorldSphere__9CMapWorldCFRC13CMapWorldInfoRC6IWorld = .text:0x8009F8D8; // type:function size:0x2AC scope:global DrawAreas__9CMapWorldCFRCQ29CMapWorld18CMapWorldDrawParmsiRCQ24rstl64vectorb = .text:0x8009FB84; // type:function size:0xD24 scope:global @@ -6945,8 +6943,7 @@ fn_8012F098 = .text:0x8012F114; // type:function size:0x8 scope:global SetupRippleMap__18CFluidPlaneManagerFv = .text:0x8012F11C; // type:function size:0x218 scope:global CreateSplash__18CFluidPlaneManagerF9TUniqueIdR13CStateManagerRC12CScriptWaterRC9CVector3ffb = .text:0x8012F334; // type:function size:0x2C8 scope:global GetLastRippleDeltaTime__18CFluidPlaneManagerCF9TUniqueId = .text:0x8012F5FC; // type:function size:0x2C scope:global -GetLastSplashDeltaTime__18CFluidPlaneManagerCF9TUniqueId = .text:0x8012F628; // type:function size:0x4C scope:global -fn_8012F5F8 = .text:0x8012F674; // type:function size:0x4 scope:global +GetLastSplashDeltaTime__18CFluidPlaneManagerCF9TUniqueId = .text:0x8012F628; // type:function size:0x50 scope:global EndFrame__18CFluidPlaneManagerCFv = .text:0x8012F678; // type:function size:0xC scope:global StartFrame__18CFluidPlaneManagerCFb = .text:0x8012F684; // type:function size:0x2C scope:global Update__18CFluidPlaneManagerFf = .text:0x8012F6B0; // type:function size:0x94 scope:global @@ -7899,8 +7896,7 @@ fn_80173E5C = .text:0x80173ED8; // type:function size:0x48 scope:global fn_80173EA4 = .text:0x80173F20; // type:function size:0x64 scope:global fn_80173F08 = .text:0x80173F84; // type:function size:0xD4 scope:global fn_80173FDC = .text:0x80174058; // type:function size:0x28 scope:global -fn_80174004 = .text:0x80174080; // type:function size:0x94 scope:global -fn_80174098 = .text:0x80174114; // type:function size:0x4 scope:global +fn_80174004 = .text:0x80174080; // type:function size:0x98 scope:global StopScan__12CScanDisplayFv = .text:0x80174118; // type:function size:0x44 scope:global StartScan__12CScanDisplayF9TUniqueIdRC20CScannableObjectInfoP12CGuiTextPaneP10CGuiWidgetf = .text:0x8017415C; // type:function size:0x434 scope:global fn_80174514 = .text:0x80174590; // type:function size:0x30 scope:global @@ -8009,8 +8005,7 @@ WithinOrbitScreenBox__7CPlayerCFRC9CVector3fQ27CPlayer15EPlayerZoneInfoQ27CPlaye WithinOrbitScreenEllipse__7CPlayerCFRC9CVector3fQ27CPlayer15EPlayerZoneInfo = .text:0x8017DE68; // type:function size:0xE8 scope:global CheckOrbitDisableSourceList__7CPlayerFRC13CStateManager = .text:0x8017DF50; // type:function size:0xE8 scope:global CheckOrbitDisableSourceList__7CPlayerCFv = .text:0x8017E038; // type:function size:0x14 scope:global -RemoveOrbitDisableSource__7CPlayerF9TUniqueId = .text:0x8017E04C; // type:function size:0x7C scope:global -fn_8017E04C = .text:0x8017E0C8; // type:function size:0x4 scope:global +RemoveOrbitDisableSource__7CPlayerF9TUniqueId = .text:0x8017E04C; // type:function size:0x80 scope:global AddOrbitDisableSource__7CPlayerFR13CStateManager9TUniqueId = .text:0x8017E0CC; // type:function size:0xE8 scope:global UpdateOrbitPreventionTimer__7CPlayerFf = .text:0x8017E1B4; // type:function size:0x1C scope:global UpdateOrbitModeTimer__7CPlayerFf = .text:0x8017E1D0; // type:function size:0x34 scope:global @@ -8859,8 +8854,7 @@ FitThroughLink3d__9CPFRegionCFRC9CVector3fRC7CPFLinkfRC9CVector3fff = .text:0x80 FitThroughLink2d__9CPFRegionCFRC9CVector3fRC7CPFLinkRC9CVector3ff = .text:0x801C92A0; // type:function size:0x268 scope:global GetLinkMidPoint__9CPFRegionCFRC7CPFLink = .text:0x801C9508; // type:function size:0x70 scope:global DropToGround__9CPFRegionCFR9CVector3f = .text:0x801C9578; // type:function size:0x68 scope:global -SetLinkTo__9CPFRegionFi = .text:0x801C95E0; // type:function size:0x44 scope:global -fn_801C95A8 = .text:0x801C9624; // type:function size:0x4 scope:global +SetLinkTo__9CPFRegionFi = .text:0x801C95E0; // type:function size:0x48 scope:global FindBestPoint__9CPFRegionFRQ24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>RC9CVector3fUif = .text:0x801C9628; // type:function size:0x4B4 scope:global FindClosestPointOnPolygon__9CPFRegionFRCQ24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>RC9CVector3fRC9CVector3fb = .text:0x801C9ADC; // type:function size:0x3FC scope:global PointHeight__9CPFRegionCFRC9CVector3f = .text:0x801C9ED8; // type:function size:0x44 scope:global @@ -9762,8 +9756,7 @@ Update__Q28CRagDoll23CRagDollJointConstraintFv = .text:0x8020D160; // type:funct Update__Q28CRagDoll24CRagDollLengthConstraintFv = .text:0x8020D364; // type:function size:0xEC scope:global Update__8CRagDollFR13CStateManagerff = .text:0x8020D450; // type:function size:0x90 scope:global CheckStatic__8CRagDollFf = .text:0x8020D4E0; // type:function size:0x228 scope:global -ClearForces__8CRagDollFv = .text:0x8020D708; // type:function size:0x4C scope:global -fn_8020D6D8 = .text:0x8020D754; // type:function size:0x4 scope:global +ClearForces__8CRagDollFv = .text:0x8020D708; // type:function size:0x50 scope:global SatisfyConstraints__8CRagDollFR13CStateManager = .text:0x8020D758; // type:function size:0xF0 scope:global SatisfyWorldConstraints__8CRagDollFR13CStateManageri = .text:0x8020D848; // type:function size:0x84C scope:global AccumulateForces__8CRagDollFff = .text:0x8020E094; // type:function size:0x454 scope:global @@ -9818,8 +9811,7 @@ BlankFirstSnowflakeMip__13CEnvFxManagerFR8CTexture = .text:0x80210B68; // type:f GetParticleBoundsToWorldTransform__13CEnvFxManagerCFv = .text:0x80210C70; // type:function size:0x90 scope:global SetSplashEffectRate__13CEnvFxManagerFfR13CStateManager = .text:0x80210D00; // type:function size:0x78 scope:global UpdateVisorSplash__13CEnvFxManagerFR13CStateManagerfRC12CTransform4f = .text:0x80210D78; // type:function size:0x234 scope:global -UpdateUnderwaterParticles__13CEnvFxManagerFRC15CVectorFixed8_8 = .text:0x80210FAC; // type:function size:0x15C scope:global -fn_8021108C = .text:0x80211108; // type:function size:0x4 scope:global +UpdateUnderwaterParticles__13CEnvFxManagerFRC15CVectorFixed8_8 = .text:0x80210FAC; // type:function size:0x160 scope:global UpdateRainParticles__13CEnvFxManagerFRC15CVectorFixed8_8RC9CVector3ff = .text:0x8021110C; // type:function size:0x1B0 scope:global UpdateSnowParticles__13CEnvFxManagerFR34reserved_vector<15CVectorFixed8_8> = .text:0x802112BC; // type:function size:0x188 scope:global UpdateBlockedGrids__13CEnvFxManagerFR13CStateManager10EEnvFxTypeRC12CTransform4fRC12CTransform4fRC12CTransform4f = .text:0x80211444; // type:function size:0x730 scope:global @@ -10250,12 +10242,10 @@ Accept__10CMagdoliteFR8IVisitor = .text:0x80237424; // type:function size:0x38 s __ct__10CMagdoliteF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfo = .text:0x8023745C; // type:function size:0x768 scope:global __sinit_CMagdolite_cpp = .text:0x80237BC4; // type:function size:0x1C scope:global __dt__10CTeamAiMgr = .text:0x80237BE0; // type:function size:0x13C scope:global -UpdateTeamCaptain__10CTeamAiMgrFv = .text:0x80237D1C; // type:function size:0x48 scope:global -fn_80237CE8 = .text:0x80237D64; // type:function size:0x4 scope:global +UpdateTeamCaptain__10CTeamAiMgrFv = .text:0x80237D1C; // type:function size:0x4C scope:global SpacingSort__10CTeamAiMgrFR13CStateManagerRC9CVector3f = .text:0x80237D68; // type:function size:0x338 scope:global PositionTeam__10CTeamAiMgrFR13CStateManager = .text:0x802380A0; // type:function size:0x128 scope:global -AssignRoles__10CTeamAiMgrFQ211CTeamAiRole11ETeamAiRoleQ211CTeamAiRole11ETeamAiRole = .text:0x802381C8; // type:function size:0x84 scope:global -fn_802381D0 = .text:0x8023824C; // type:function size:0x4 scope:global +AssignRoles__10CTeamAiMgrFQ211CTeamAiRole11ETeamAiRoleQ211CTeamAiRole11ETeamAiRole = .text:0x802381C8; // type:function size:0x88 scope:global ResetRoles__10CTeamAiMgrFR13CStateManager = .text:0x80238250; // type:function size:0xAC scope:global UpdateRoles__10CTeamAiMgrFR13CStateManager = .text:0x802382FC; // type:function size:0x1D8 scope:global ShouldUpdateRoles__10CTeamAiMgrFf = .text:0x802384D4; // type:function size:0x8C scope:global @@ -10855,8 +10845,7 @@ fn_80261338 = .text:0x802613B4; // type:function size:0x50 scope:global fn_80261388 = .text:0x80261404; // type:function size:0xA8 scope:global fn_80261430 = .text:0x802614AC; // type:function size:0x144 scope:global SetWorldLighting__16CNewFlameThrowerFR13CStateManager7TAreaIdff = .text:0x802615F0; // type:function size:0x130 scope:global -fn_802616A4 = .text:0x80261720; // type:function size:0x8C scope:global -fn_80261730 = .text:0x802617AC; // type:function size:0x4 scope:global +fn_802616A4 = .text:0x80261720; // type:function size:0x90 scope:global fn_80261734 = .text:0x802617B0; // type:function size:0x1A4 scope:global fn_802618D8 = .text:0x80261954; // type:function size:0xE8 scope:global fn_802619C0 = .text:0x80261A3C; // type:function size:0x90 scope:global @@ -10890,8 +10879,7 @@ fn_80264E10 = .text:0x80264E8C; // type:function size:0x14 scope:global fn_80264E24 = .text:0x80264EA0; // type:function size:0x44 scope:global fn_80264E68 = .text:0x80264EE4; // type:function size:0x18 scope:global fn_80264E80 = .text:0x80264EFC; // type:function size:0x78 scope:global -fn_80264EF8 = .text:0x80264F74; // type:function size:0x68 scope:global -fn_80264F60 = .text:0x80264FDC; // type:function size:0x4 scope:global +fn_80264EF8 = .text:0x80264F74; // type:function size:0x6C scope:global __sinit_CNewFlameThrower_cpp = .text:0x80264FE0; // type:function size:0x58 scope:global AcceptScriptMsg__20CInterpolationCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager = .text:0x80265038; // type:function size:0x2C scope:global Render__20CInterpolationCameraCFRC13CStateManager = .text:0x80265064; // type:function size:0x4 scope:global @@ -11122,8 +11110,7 @@ fn_80275780 = .text:0x802757FC; // type:function size:0x80 scope:global fn_80275800 = .text:0x8027587C; // type:function size:0x1A8 scope:global fn_802759A8 = .text:0x80275A24; // type:function size:0x15C scope:global fn_80275B04 = .text:0x80275B80; // type:function size:0x64 scope:global -fn_80275B68 = .text:0x80275BE4; // type:function size:0xF4 scope:global -fn_80275C5C = .text:0x80275CD8; // type:function size:0x4 scope:global +fn_80275B68 = .text:0x80275BE4; // type:function size:0xF8 scope:global fn_80275C60 = .text:0x80275CDC; // type:function size:0x108 scope:global fn_80275D68 = .text:0x80275DE4; // type:function size:0xAC scope:global fn_80275E14 = .text:0x80275E90; // type:function size:0x20 scope:global @@ -12011,10 +11998,8 @@ fn_802C0508 = .text:0x802C05B4; // type:function size:0xAC scope:global fn_802C05B4 = .text:0x802C0660; // type:function size:0x7C scope:global fn_802C0630 = .text:0x802C06DC; // type:function size:0x78 scope:global fn_802C06A8 = .text:0x802C0754; // type:function size:0x108 scope:global -fn_802C07B0 = .text:0x802C085C; // type:function size:0x78 scope:global -fn_802C0828 = .text:0x802C08D4; // type:function size:0x4 scope:global -fn_802C082C = .text:0x802C08D8; // type:function size:0x88 scope:global -fn_802C08B4 = .text:0x802C0960; // type:function size:0x4 scope:global +fn_802C07B0 = .text:0x802C085C; // type:function size:0x7C scope:global +fn_802C082C = .text:0x802C08D8; // type:function size:0x8C scope:global fn_802C08B8 = .text:0x802C0964; // type:function size:0xDC scope:global fn_802C0994 = .text:0x802C0A40; // type:function size:0xA8 scope:global __sinit_CCubeRenderer_cpp = .text:0x802C0AE8; // type:function size:0x114 scope:global diff --git a/configure.py b/configure.py index ddda3189..1b8ab191 100755 --- a/configure.py +++ b/configure.py @@ -1326,7 +1326,7 @@ config.libs = [ DolphinLib( "Dummy", [ - Object(MatchingFor("GM8E01_00", "GM8E01_01"), "Dolphin/dummy.c"), + Object(MatchingFor("GM8E01_00"), "Dolphin/dummy.c"), ], ), DolphinLib( diff --git a/src/Dolphin/dummy.c b/src/Dolphin/dummy.c index b1984846..71b7c1a0 100644 --- a/src/Dolphin/dummy.c +++ b/src/Dolphin/dummy.c @@ -1,2 +1,2 @@ #pragma force_active on -__declspec(section ".data") char dummy[8]; +__declspec(section ".data") char dummy[4];