2 files changed, 22 insertions, 16 deletions
diff --git a/nids/360/SceGxm.yml b/nids/360/SceGxm.yml
index eae054f..9d553f0 100644
--- a/nids/360/SceGxm.yml
+++ b/nids/360/SceGxm.yml
@@ -8,8 +8,8 @@ modules:
           sceGxmAddRazorGpuCaptureBuffer: 0xE9E81073
           sceGxmBeginCommandList: 0x944D3F83
           sceGxmBeginScene: 0x8734FF4E
-          sceGxmBeginScene0940: 0xDBA33160
           sceGxmBeginSceneEx: 0x4709CF5A
+          sceGxmBeginScene_16XX: 0xDBA33160
           sceGxmColorSurfaceGetClip: 0x07DFEE4B
           sceGxmColorSurfaceGetData: 0x2DB6026C
           sceGxmColorSurfaceGetDitherMode: 0x200A96E1
@@ -76,7 +76,7 @@ modules:
           sceGxmMapMemory: 0xC61E34FC
           sceGxmMapVertexUsseMemory: 0xFA437510
           sceGxmMidSceneFlush: 0x2B5C0444
-          sceGxmMidSceneFlush0940: 0x51FE0899
+          sceGxmMidSceneFlush_16XX: 0x51FE0899
           sceGxmNotificationWait: 0x9F448E79
           sceGxmPadHeartbeat: 0x3D25FCE9
           sceGxmPopUserMarker: 0x4FA073A6
@@ -95,16 +95,16 @@ modules:
           sceGxmPrecomputedVertexStateGetDefaultUniformBuffer: 0xBE5A68EF
           sceGxmPrecomputedVertexStateInit: 0xBE937F8D
           sceGxmPrecomputedVertexStateSetAllTextures: 0xC40C9127
-          sceGxmPrecomputedVertexStateSetAllTextures0940: 0x8FF68274
+          sceGxmPrecomputedVertexStateSetAllTextures_16XX: 0x8FF68274
           sceGxmPrecomputedVertexStateSetAllUniformBuffers: 0x0389861D
           sceGxmPrecomputedVertexStateSetDefaultUniformBuffer: 0x34BF64E3
           sceGxmPrecomputedVertexStateSetTexture: 0x6A29EB06
-          sceGxmPrecomputedVertexStateSetTexture0940: 0x1625D348
+          sceGxmPrecomputedVertexStateSetTexture_16XX: 0x1625D348
           sceGxmPrecomputedVertexStateSetUniformBuffer: 0xDBF97ED6
           sceGxmProgramCheck: 0xED8B6C69
           sceGxmProgramFindParameterByName: 0x277794C4
           sceGxmProgramFindParameterBySemantic: 0x633CAA54
-          sceGxmProgramFindParameterBySemantic0940: 0x7FFFDD7A
+          sceGxmProgramFindParameterBySemantic_16XX: 0x7FFFDD7A
           sceGxmProgramGetDefaultUniformBufferSize: 0x8FA3F9C3
           sceGxmProgramGetFragmentProgramInputs: 0xC6924709
           sceGxmProgramGetOutputRegisterFormat: 0xE11603B1
@@ -127,8 +127,8 @@ modules:
           sceGxmProgramParameterGetName: 0x6AF88A5D
           sceGxmProgramParameterGetResourceIndex: 0x5C79D59A
           sceGxmProgramParameterGetSemantic: 0xE6D9C4CE
-          sceGxmProgramParameterGetSemantic0940: 0xAAFD61D5
           sceGxmProgramParameterGetSemanticIndex: 0xB85CC13E
+          sceGxmProgramParameterGetSemantic_16XX: 0xAAFD61D5
           sceGxmProgramParameterGetType: 0x7B9023C3
           sceGxmProgramParameterIsRegFormat: 0x871E5009
           sceGxmProgramParameterIsSamplerCube: 0xF7AA978B
@@ -180,7 +180,7 @@ modules:
           sceGxmSetVertexProgram: 0x31FF8ABD
           sceGxmSetVertexStream: 0x895DF2E9
           sceGxmSetVertexTexture: 0x9EB4380F
-          sceGxmSetVertexTexture0940: 0x16C9D339
+          sceGxmSetVertexTexture_16XX: 0x16C9D339
           sceGxmSetVertexUniformBuffer: 0xC68015E4
           sceGxmSetViewport: 0x3EB3380B
           sceGxmSetViewportEnable: 0x814F61EB
@@ -224,15 +224,15 @@ modules:
           sceGxmTextureGetMinFilter: 0x920666C6
           sceGxmTextureGetMipFilter: 0xCE94CA15
           sceGxmTextureGetMipmapCount: 0xF7B7B1E4
-          sceGxmTextureGetMipmapCountUnsafe: 0x4CC42929
+          sceGxmTextureGetMipmapCount_16XX: 0x4CC42929
           sceGxmTextureGetNormalizeMode: 0x512BB86C
           sceGxmTextureGetPalette: 0x0D189C30
           sceGxmTextureGetStride: 0xB0BD52F3
           sceGxmTextureGetType: 0xF65D4917
           sceGxmTextureGetUAddrMode: 0x2AE22788
-          sceGxmTextureGetUAddrModeSafe: 0xC037DA83
+          sceGxmTextureGetUAddrMode_16XX: 0xC037DA83
           sceGxmTextureGetVAddrMode: 0x46136CA9
-          sceGxmTextureGetVAddrModeSafe: 0xD2F0D9C1
+          sceGxmTextureGetVAddrMode_16XX: 0xD2F0D9C1
           sceGxmTextureGetWidth: 0x126A3EB3
           sceGxmTextureInitCube: 0x11DC8DC9
           sceGxmTextureInitCubeArbitrary: 0xE3DF5E3B
@@ -245,7 +245,7 @@ modules:
           sceGxmTextureSetFormat: 0xFC943596
           sceGxmTextureSetGammaMode: 0xA6D9F4DA
           sceGxmTextureSetHeight: 0xAEE7FDD1
-          sceGxmTextureSetHeight0940: 0x1B20D5DF
+          sceGxmTextureSetHeight_16XX: 0x1B20D5DF
           sceGxmTextureSetLodBias: 0xB65EE6F7
           sceGxmTextureSetLodMin: 0xB79E43DD
           sceGxmTextureSetMagFilter: 0xFA695FD7
@@ -256,11 +256,11 @@ modules:
           sceGxmTextureSetPalette: 0xDD6AABFA
           sceGxmTextureSetStride: 0x58D0EB0A
           sceGxmTextureSetUAddrMode: 0x4281763E
-          sceGxmTextureSetUAddrModeSafe: 0x8699ECF4
+          sceGxmTextureSetUAddrMode_16XX: 0x8699ECF4
           sceGxmTextureSetVAddrMode: 0x126CDAA3
-          sceGxmTextureSetVAddrModeSafe: 0xFA22F6CC
+          sceGxmTextureSetVAddrMode_16XX: 0xFA22F6CC
           sceGxmTextureSetWidth: 0x2EA178BE
-          sceGxmTextureSetWidth0940: 0x5A690B60
+          sceGxmTextureSetWidth_16XX: 0x5A690B60
           sceGxmTextureValidate: 0x5331BED3
           sceGxmTransferCopy: 0x62312BF8
           sceGxmTransferDownscale: 0xD10F7EAD
diff --git a/nids/360/SceLibKernel.yml b/nids/360/SceLibKernel.yml
index b171c00..9de08db 100644
--- a/nids/360/SceLibKernel.yml
+++ b/nids/360/SceLibKernel.yml
@@ -23,9 +23,9 @@ modules:
           sceClibMemchr: 0x407D6153
           sceClibMemcmp: 0x9CC2BFDF
           sceClibMemcmpConstTime: 0x100091AF
-          sceClibMemcpy: 0x14E9DBD7
+          sceClibMemcpy: 0x2E3B02A1
           sceClibMemcpyChk: 0x1F94EF45
-          sceClibMemcpy_safe: 0x2E3B02A1
+          sceClibMemcpy_16XX: 0x14E9DBD7
           sceClibMemmove: 0x736753C8
           sceClibMemmoveChk: 0xA18068FC
           sceClibMemset: 0x632980D7
@@ -246,6 +246,8 @@ modules:
           sceKernelLoadStartModule: 0x2DCC4AFA
           sceKernelLockLwMutex: 0x46E7BE7B
           sceKernelLockLwMutexCB: 0x3148C6B6
+          sceKernelLockLwMutexCB_16XX: 0x6F9C4CC1
+          sceKernelLockLwMutex_16XX: 0xA7819967
           sceKernelLockMutex: 0x1D8D7945
           sceKernelLockMutexCB: 0x2BDAA524
           sceKernelLockReadRWLock: 0xFA670F0F
@@ -257,7 +259,9 @@ modules:
           sceKernelPollEvent: 0x241F3634
           sceKernelPollEventFlag: 0x1FBB0FE1
           sceKernelPrintBacktrace: 0x1C02A434
+          sceKernelPrintBacktrace_16XX: 0x20E2D4B7
           sceKernelPulseEventWithNotifyCallback: 0x92F162F3
+          sceKernelPuts: 0x023EAA62
           sceKernelReceiveMsgPipe: 0x4E81DD5C
           sceKernelReceiveMsgPipeCB: 0x33AF829B
           sceKernelReceiveMsgPipeVector: 0x9F899087
@@ -280,6 +284,7 @@ modules:
           sceKernelStopModule: 0x3B2CBA09
           sceKernelStopUnloadModule: 0x2415F8A4
           sceKernelTryLockLwMutex: 0xA6A2C915
+          sceKernelTryLockLwMutex_16XX: 0x9EF798C1
           sceKernelTryReceiveMsgPipe: 0x5615B006
           sceKernelTryReceiveMsgPipeVector: 0x86ECC0FF
           sceKernelTrySendMsgPipe: 0xDFC670E0
@@ -287,6 +292,7 @@ modules:
           sceKernelUnloadModule: 0x1987920E
           sceKernelUnlockLwMutex: 0x91FA6614
           sceKernelUnlockLwMutex2: 0x120AFC8C
+          sceKernelUnlockLwMutex_16XX: 0x499EA781
           sceKernelWaitCond: 0xC88D44AD
           sceKernelWaitCondCB: 0x4CE42CE2
           sceKernelWaitEvent: 0x120F03AF