From 292439e4e0972ce5c8a59cdaa11805db6a1e1879 Mon Sep 17 00:00:00 2001 From: weirdbeardgame Date: Sat, 25 Jul 2026 18:44:20 -0500 Subject: [PATCH] Rename'd duplicate symbols --- config/symbol_addrs.txt | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/config/symbol_addrs.txt b/config/symbol_addrs.txt index 902c4d9..c988d36 100644 --- a/config/symbol_addrs.txt +++ b/config/symbol_addrs.txt @@ -133,7 +133,7 @@ _free_buffer2 = 0x0025A080; // visibility:l _sceRpcGetFPacket2 = 0x00110680; // size:0x40 visibility:local _sceRpcGetPacket = 0x00110588; // size:0xA8 visibility:local _alarm_bind = 0x00110A48; // size:0x40 visibility:local -_data_table = 0x0025A880; // visibility:local allow_duplicated:True +_data_table_1 = 0x0025A880; // visibility:local allow_duplicated:True _sceRpcGetFPacket = 0x00110650; // size:0x30 visibility:local _fswildcard = 0x00224B10; // size:0x4 visibility:local _sceFsIobSemaMK = 0x00111450; // size:0x5C visibility:local @@ -169,7 +169,7 @@ sdata = 0x0025C180; // visibility:l _bind = 0x00224B18; // size:0x4 visibility:local _lih_data = 0x0025C1C0; // visibility:local _bind_check = 0x00224B20; // size:0x4 visibility:local -cd = 0x0025C4C0; // visibility:local allow_duplicated:True +cd_1 = 0x0025C4C0; // visibility:local allow_duplicated:True _lf_version = 0x001151B8; // size:0x8C visibility:local _lfwildcard = 0x00224B24; // size:0x4 visibility:local _sceSifLoadElfPart = 0x00115AF8; // size:0x104 visibility:local @@ -178,7 +178,7 @@ _sceSifLoadModule = 0x00115890; // size:0x224 v _lf_bind = 0x001150B8; // size:0x100 visibility:local _sceSifLoadModuleBuffer = 0x00115280; // size:0x208 visibility:local _senddata = 0x0025C2C0; // visibility:local -rdata = 0x0025C500; // visibility:local allow_duplicated:True +rdata_1 = 0x0025C500; // visibility:local allow_duplicated:True defaultTLB = 0x00224FB8; // size:0x120 visibility:local GetEntryAddress = 0x00116228; // size:0x10 visibility:local allow_duplicated:True kernelTLB = 0x00224EE8; // size:0xD0 visibility:local @@ -1491,7 +1491,7 @@ s_send_tex_flag = 0x002579AC; // size:0x4 vis s_pSysInfo = 0x002579A4; // size:0x4 visibility:local allow_duplicated:True _LoadTm2 = 0x00175D40; // size:0x624 visibility:local _SendPacketByDma = 0x00176370; // size:0xCC visibility:local allow_duplicated:True -sCurrentP = 0x002579A8; // size:0x4 visibility:local allow_duplicated:True +sCurrentP_1 = 0x002579A8; // size:0x4 visibility:local allow_duplicated:True FontTexPacket = 0x009EEB20; // size:0x400 visibility:local lpFontCcm = 0x002579D0; // size:0x4 visibility:local DMABuf$811 = 0x009EEB00; // size:0x20 visibility:local @@ -2067,15 +2067,15 @@ StmReadErrCallBack = 0x0019DF10; // size:0xF4 vi StmMng = 0x00A34180; // size:0x1C visibility:local StmThreadBuf = 0x00A33980; // size:0x800 visibility:local StmReadEndCallBack = 0x0019E010; // size:0x2C visibility:local -s_qdIopToEeRpc = 0x00A341F0; // size:0x18 visibility:local allow_duplicated:True -s_sdIopToEeRpc = 0x00A341A0; // size:0x44 visibility:local allow_duplicated:True +s_qdIopToEeRpc_1 = 0x00A341F0; // size:0x18 visibility:local allow_duplicated:True +s_sdIopToEeRpc_2 = 0x00A341A0; // size:0x44 visibility:local allow_duplicated:True _CallRpc = 0x0019E960; // size:0xD0 visibility:local _ItoE_RpcThread = 0x0019EA90; // size:0x70 visibility:local s_stack = 0x00A34210; // size:0x2000 visibility:local s_iRpcThrdID = 0x002575C0; // size:0x4 visibility:local s_iInited = 0x00257A7C; // size:0x4 visibility:local _ItoE_RpcDispatch = 0x0019EA30; // size:0x5C visibility:local -s_scdRpc = 0x00A36210; // size:0x28 visibility:local allow_duplicated:True +s_scdRpc_1 = 0x00A36210; // size:0x28 visibility:local allow_duplicated:True s_StrmMng = 0x00A36540; // size:0x10 visibility:local s_iSyncSema = 0x002575CC; // size:0x4 visibility:local s_ReadErrCB = 0x00257A84; // size:0x4 visibility:local @@ -2143,7 +2143,7 @@ sCurWaterCameraInfo = 0x00257A9C; // size:0x4 vis WaterInfo_87_8 = 0x00247D20; // size:0x3C0 visibility:local WaterInfo_51_11 = 0x00246FC0; // size:0xA0 visibility:local WaterSurfaceMng = 0x00A379F0; // size:0x500 visibility:local -SinTable = 0x00A37090; // size:0x30 visibility:local allow_duplicated:True +SinTable_1 = 0x00A37090; // size:0x30 visibility:local allow_duplicated:True ScreenXYZ = 0x00A37570; // size:0x240 visibility:local MakeMirrorTexture = 0x001A14E0; // size:0x228 visibility:local R003_BaseBlockPos = 0x00248270; // size:0xC0 visibility:local @@ -2346,7 +2346,7 @@ __SFX_EndPtclPlume = 0x001B0600; // size:0x2C vi __SFX_ActModel2 = 0x001AECD0; // size:0xDE8 visibility:local _SubFunc_Plume_Move = 0x001B1090; // size:0x324 visibility:local allow_duplicated:True __SFX_ActSprite = 0x001B7AB0; // size:0x64C visibility:local -s_mng = 0x00A40D60; // size:0x40 visibility:local allow_duplicated:True +s_mng_1 = 0x00A40D60; // size:0x40 visibility:local allow_duplicated:True __SFX_DrawSprite = 0x001B7A20; // size:0x88 visibility:local s_aTexMng = 0x00A40960; // size:0x3FC visibility:local __SFX_DrawPtclPlume = 0x001B0630; // size:0x8 visibility:local @@ -2530,18 +2530,18 @@ __SFXMNG_WhirlPool_Init = 0x001C8240; // size:0x90 vi __FUNCTION__$921 = 0x00255720; // size:0x12 visibility:local __SFXMNG_PLight_End = 0x001C9410; // size:0x130 visibility:local __SFXMNG_DataAlloc = 0x001CC950; // size:0x1B0 visibility:local -s_pObjList = 0x00257B84; // size:0x4 visibility:local allow_duplicated:True -s_data_buff = 0x00A456B0; // size:0x400 visibility:local allow_duplicated:True -s_pObjList = 0x00257B88; // size:0x4 visibility:local allow_duplicated:True -s_data_buff = 0x00A45AB0; // size:0x400 visibility:local allow_duplicated:True +s_pObjList_1 = 0x00257B84; // size:0x4 visibility:local allow_duplicated:True +s_data_buff_1 = 0x00A456B0; // size:0x400 visibility:local allow_duplicated:True +s_pObjList_2 = 0x00257B88; // size:0x4 visibility:local allow_duplicated:True +s_data_buff_2 = 0x00A45AB0; // size:0x400 visibility:local allow_duplicated:True _ApplyWind = 0x001CF350; // size:0x160 visibility:local @879 = 0x00248870; // size:0x10 visibility:local allow_duplicated:True @877 = 0x00248860; // size:0x10 visibility:local allow_duplicated:True max_len$925 = 0x00257614; // size:0x4 visibility:local -s_setting = 0x00A45EB0; // size:0x10 visibility:local allow_duplicated:True +s_setting_1 = 0x00A45EB0; // size:0x10 visibility:local allow_duplicated:True s_timer = 0x00257B8C; // size:0x4 visibility:local _DrawFlicker = 0x001CF770; // size:0x44C visibility:local -s_pObjList = 0x00257B90; // size:0x4 visibility:local allow_duplicated:True +s_pObjList_3 = 0x00257B90; // size:0x4 visibility:local allow_duplicated:True s_tracer_obj_buff = 0x00A486C0; // size:0x400 visibility:local _DrawBelt = 0x001D0090; // size:0x5FC visibility:local s_pLogList = 0x00257B94; // size:0x4 visibility:local @@ -3206,7 +3206,7 @@ E044FrameLast = 0x00205360; // size:0x110 v @929 = 0x00250050; // size:0x10 visibility:local @933 = 0x00250070; // size:0x10 visibility:local @931 = 0x00250060; // size:0x10 visibility:local -s_mng = 0x00A58820; // size:0x4A0 visibility:local allow_duplicated:True +s_mng_2 = 0x00A58820; // size:0x4A0 visibility:local allow_duplicated:True s_SMemInfo = 0x00A58D50; // size:0x100 visibility:local _SortInsertInfo = 0x00206040; // size:0x460 visibility:local s_SMemMng = 0x00A58CC0; // size:0x84 visibility:local @@ -3427,16 +3427,16 @@ P036ActDead = 0x00215770; // size:0x48 vi InitS0085Event000 = 0x00215A20; // size:0x98 visibility:local PlayS0085Event000 = 0x00215890; // size:0x18C visibility:local @29 = 0x002505A0; // size:0x40 visibility:local -sState = 0x00A5B060; // size:0x154 visibility:local allow_duplicated:True -sCurrentP = 0x00257D0C; // size:0x4 visibility:local allow_duplicated:True +sState_1 = 0x00A5B060; // size:0x154 visibility:local allow_duplicated:True +sCurrentP_2 = 0x00257D0C; // size:0x4 visibility:local allow_duplicated:True _MakeDmaPacketSprite = 0x00218CA0; // size:0x728 visibility:local allow_duplicated:True _MakeDmaPacketTriangleStrip = 0x00218380; // size:0x91C visibility:local allow_duplicated:True _TransTextureFromFileInMemory = 0x00218220; // size:0x140 visibility:local _SetDrawCondition = 0x002194D0; // size:0x25C visibility:local allow_duplicated:True -s_pSysInfo = 0x00257D10; // size:0x4 visibility:local allow_duplicated:True +s_pSysInfo_1 = 0x00257D10; // size:0x4 visibility:local allow_duplicated:True _SendPacketByDma = 0x002193D0; // size:0xF4 visibility:local allow_duplicated:True _TransTexture = 0x00217A70; // size:0x7A4 visibility:local -sCurrentP = 0x00257D14; // size:0x4 visibility:local allow_duplicated:True +sCurrentP_3 = 0x00257D14; // size:0x4 visibility:local allow_duplicated:True GetEaseInPrm = 0x0021A0C0; // size:0x8C visibility:local GetSplinePrm = 0x002505E0; // size:0x14 visibility:local GetEaseOutPrm = 0x0021A030; // size:0x84 visibility:local @@ -6192,7 +6192,7 @@ scePadInfoPressMode = 0x00119CB8; // size:0x5C vi SfxDraw_SetTexture_FrameBuff = 0x001C0C50; // size:0x88 visibility:global sceDeci2ReqSend = 0x0010EB20; // size:0x30 visibility:global sceSifResetIop = 0x00115E18; // size:0x154 visibility:global -s_Mng = 0x00A3EE40; // size:0x11 visibility:global allow_duplicated:True +s_Mng_3 = 0x00A3EE40; // size:0x11 visibility:global allow_duplicated:True _sequenceDisplayExtension = 0x0010CD38; // size:0x8C visibility:global GetBindOffsetByIndex = 0x0015E820; // size:0x60 visibility:global __srefill = 0x00129510; // size:0x17C visibility:global