From e37fa0474ea66a910f86f4e8df54ba7365497181 Mon Sep 17 00:00:00 2001
From: RD42 <42702181+dashr9230@users.noreply.github.com>
Date: Wed, 24 Jul 2024 17:01:39 +0800
Subject: [PATCH] [saco] Rename `sub_` to `FUNC_`

---
 saco/filehooks.cpp   |  6 +++---
 saco/game/audio.cpp  |  2 +-
 saco/game/audio.h    |  2 +-
 saco/game/camera.cpp |  6 +++---
 saco/game/camera.h   |  4 ++--
 saco/game/cheats.cpp |  2 +-
 saco/game/entity.cpp | 13 ++++++-------
 saco/game/entity.h   | 14 +++++++-------
 saco/game/game.h     |  2 +-
 saco/main.cpp        |  4 ++--
 saco/scoreboard.cpp  |  5 +++--
 saco/scoreboard.h    |  2 +-
 saco/unkclass15.cpp  |  4 ++--
 saco/unkclass15.h    |  2 +-
 14 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/saco/filehooks.cpp b/saco/filehooks.cpp
index 6dc0e1d..d8f16f7 100644
--- a/saco/filehooks.cpp
+++ b/saco/filehooks.cpp
@@ -463,7 +463,7 @@ void CheckFileNameHash(UINT *pDigest)
 		pDigest[4] == dwHandlingDigest[4] )
 	{
 		if(pGame)
-			pGame->sub_10062570();
+			pGame->FUNC_10062570();
 	}
 
 	if( pDigest[0] == dwWeaponDigest[0] &&
@@ -473,7 +473,7 @@ void CheckFileNameHash(UINT *pDigest)
 		pDigest[4] == dwWeaponDigest[4] )
 	{
 		if(pGame)
-			pGame->sub_10062570();
+			pGame->FUNC_10062570();
 	}
 
 	if( pDigest[0] == dwMeleeDigest[0] &&
@@ -483,7 +483,7 @@ void CheckFileNameHash(UINT *pDigest)
 		pDigest[4] == dwMeleeDigest[4] )
 	{
 		if(pGame)
-			pGame->sub_10062570();
+			pGame->FUNC_10062570();
 	}
 }
 
diff --git a/saco/game/audio.cpp b/saco/game/audio.cpp
index 50e948b..f5711f6 100644
--- a/saco/game/audio.cpp
+++ b/saco/game/audio.cpp
@@ -3,7 +3,7 @@
 
 //-----------------------------------------------------------
 
-void CAudio::sub_100A21D0()
+void CAudio::FUNC_100A21D0()
 {
 	if(field_0 && field_0 == 1)
 	{
diff --git a/saco/game/audio.h b/saco/game/audio.h
index 9232e74..646bb7f 100644
--- a/saco/game/audio.h
+++ b/saco/game/audio.h
@@ -15,7 +15,7 @@ public:
 		field_4 = false;
 	}
 
-	void sub_100A21D0();
+	void FUNC_100A21D0();
 	int GetRadioStation();
 	void StartRadio(int iStation);
 	void StopRadio();
diff --git a/saco/game/camera.cpp b/saco/game/camera.cpp
index 93cfa74..1c6a33f 100644
--- a/saco/game/camera.cpp
+++ b/saco/game/camera.cpp
@@ -94,7 +94,7 @@ void CCamera::SetMatrix(MATRIX4X4 Matrix)
 //-----------------------------------------------------------
 
 // unused, also probably not part of CCamera
-void sub_1009D560(bool unk)
+void FUNC_1009D560(bool unk)
 {
 	byte_1014FD8C = unk;
 }
@@ -131,7 +131,7 @@ void CCamera::InterpolateLookAt(VECTOR *vecFrom, VECTOR *vecTo, int iTime, BYTE
 
 //-----------------------------------------------------------
 
-void CCamera::sub_1009D660(CEntity *pEntity)
+void CCamera::FUNC_1009D660(CEntity *pEntity)
 {
 	field_0 = pEntity;
 
@@ -146,7 +146,7 @@ void CCamera::sub_1009D660(CEntity *pEntity)
 
 //-----------------------------------------------------------
 
-void CCamera::sub_1009D6B0()
+void CCamera::FUNC_1009D6B0()
 {
 	if(!field_0 || field_0->m_pEntity) return;
 
diff --git a/saco/game/camera.h b/saco/game/camera.h
index 1caa3e0..ae0d7d1 100644
--- a/saco/game/camera.h
+++ b/saco/game/camera.h
@@ -21,8 +21,8 @@ public:
 	void Attach(int unk1, int unk2, int unk3);
 	void InterpolatePosition(VECTOR *vecFrom, VECTOR *vecTo, int iTime, BYTE byteCut);
 	void InterpolateLookAt(VECTOR *vecFrom, VECTOR *vecTo, int iTime, BYTE byteCut);
-	void sub_1009D660(CEntity *pEntity);
-	void sub_1009D6B0();
+	void FUNC_1009D660(CEntity *pEntity);
+	void FUNC_1009D6B0();
 	float GetDistanceFromPoint(VECTOR *vecPos);
 
 	CCamera() {
diff --git a/saco/game/cheats.cpp b/saco/game/cheats.cpp
index 0568806..4321f9a 100644
--- a/saco/game/cheats.cpp
+++ b/saco/game/cheats.cpp
@@ -78,7 +78,7 @@ int CheckDuplicateD3D9Dlls()
 
 //----------------------------------------------------------
 
-void sub_1009DD50()
+void FUNC_1009DD50()
 {
 	unknown_1014FDA4 = TRUE;
 }
diff --git a/saco/game/entity.cpp b/saco/game/entity.cpp
index fc94e89..6fcbb49 100644
--- a/saco/game/entity.cpp
+++ b/saco/game/entity.cpp
@@ -51,7 +51,7 @@ void CEntity::SetMatrix(MATRIX4X4 Matrix)
 
 //-----------------------------------------------------------
 
-void CEntity::sub_1009EC80()
+void CEntity::FUNC_1009EC80()
 {
 	if(!m_pEntity || m_pEntity->vtable == 0x863C40) return;
 
@@ -95,7 +95,7 @@ void CEntity::SetMoveSpeedVector(VECTOR Vector)
 
 //-----------------------------------------------------------
 
-void CEntity::sub_1009ED40(float fX, float fY, float fZ)
+void CEntity::FUNC_1009ED40(float fX, float fY, float fZ)
 {
 	int x=4;
 	while(x) {
@@ -136,7 +136,7 @@ void CEntity::SetTurnSpeedVector(VECTOR Vector)
 }
 //-----------------------------------------------------------
 
-void CEntity::sub_1009EE90()
+void CEntity::FUNC_1009EE90()
 {
 	DWORD dwEnt = (DWORD)m_pEntity;
 	if(!dwEnt) return;
@@ -148,7 +148,7 @@ void CEntity::sub_1009EE90()
 
 //-----------------------------------------------------------
 
-float CEntity::sub_1009EEB0()
+float CEntity::FUNC_1009EEB0()
 {
 	DWORD dwEnt = (DWORD)m_pEntity;
 	float fResult = 0.0f;
@@ -165,7 +165,7 @@ float CEntity::sub_1009EEB0()
 
 //-----------------------------------------------------------
 
-void CEntity::sub_1009EEF0(PVECTOR Vector)
+void CEntity::FUNC_1009EEF0(PVECTOR Vector)
 {
 	DWORD dwEnt = (DWORD)m_pEntity;
 	if(!dwEnt) return;
@@ -178,7 +178,7 @@ void CEntity::sub_1009EEF0(PVECTOR Vector)
 
 //-----------------------------------------------------------
 
-void CEntity::sub_1009EF20(int a2)
+void CEntity::FUNC_1009EF20(int a2)
 {
 	DWORD dwEnt = (DWORD)m_pEntity;
 	if(!dwEnt) return;
@@ -221,7 +221,6 @@ void CEntity::TeleportTo(float x, float y, float z)
 
 //-----------------------------------------------------------
 
-BOOL CEntity::sub_1009FDE0()
 {
 	return m_pEntity
 		&& m_pEntity->vtable != 0x863C40
diff --git a/saco/game/entity.h b/saco/game/entity.h
index 010d570..114ae33 100644
--- a/saco/game/entity.h
+++ b/saco/game/entity.h
@@ -13,20 +13,20 @@ public:
 
 	void  GetMatrix(PMATRIX4X4 Matrix);
 	void  SetMatrix(MATRIX4X4 Matrix);
-	void  sub_1009EC80();
+	void  FUNC_1009EC80();
 	void  GetMoveSpeedVector(PVECTOR Vector);
 	void  SetMoveSpeedVector(VECTOR Vector);
-	void  sub_1009ED40(float fX, float fY, float fZ); // unused
+	void  FUNC_1009ED40(float fX, float fY, float fZ); // unused
 	void  GetTurnSpeedVector(PVECTOR Vector);
 	void  SetTurnSpeedVector(VECTOR Vector);
-	void  sub_1009EE90(); // unused
-	float sub_1009EEB0(); // unused
-	void  sub_1009EEF0(PVECTOR Vector);
-	void  sub_1009EF20(int a2); // unused
+	void  FUNC_1009EE90(); // unused
+	float FUNC_1009EEB0(); // unused
+	void  FUNC_1009EEF0(PVECTOR Vector);
+	void  FUNC_1009EF20(int a2); // unused
 	UINT  GetModelIndex();
 	void  TeleportTo(float x, float y, float z);
 
-	BOOL  sub_1009FDE0();
+	BOOL  FUNC_1009FDE0();
 
 	VECTOR		field_4[5];
 	ENTITY_TYPE *m_pEntity;
diff --git a/saco/game/game.h b/saco/game/game.h
index 28db706..fb8be5e 100644
--- a/saco/game/game.h
+++ b/saco/game/game.h
@@ -87,7 +87,7 @@ public:
 
 	//-----------------------------------------------------------
 
-	void sub_10062570() { field_55++; };
+	void FUNC_10062570() { field_55++; };
 
 	CPlayerPed  *FindPlayerPed() {
 		if(m_pGamePlayer==NULL)	m_pGamePlayer = new CPlayerPed();
diff --git a/saco/main.cpp b/saco/main.cpp
index 7444afb..6aef21c 100644
--- a/saco/main.cpp
+++ b/saco/main.cpp
@@ -77,7 +77,7 @@ void LaunchMonitor(PVOID v)
 
 	while(1) {
 		if(*(PDWORD)ADDR_ENTRY == 7) {
-			sub_1009DD50();
+			FUNC_1009DD50();
 			pGame->StartGame();
 			break;
 		}
@@ -332,7 +332,7 @@ void DoInitStuff()
 		pConfig = new CConfig(szConfigFile);
 
 		timeBeginPeriod(1); // increases the accuracy of Sleep()
-		sub_1009DD50();
+		FUNC_1009DD50();
 		SubclassGameWindow();
 
 		// Grab the real IDirect3D9 * from the game.
diff --git a/saco/scoreboard.cpp b/saco/scoreboard.cpp
index 3dec7a9..6a10ef3 100644
--- a/saco/scoreboard.cpp
+++ b/saco/scoreboard.cpp
@@ -28,12 +28,13 @@ CScoreBoard::CScoreBoard(IDirect3DDevice9 *pD3DDevice)
 	field_28 = 0.265625f;
 	field_2C = 0.437500f;
 
-	sub_1006E930();
+	FUNC_1006E930();
 
 	field_0 = 0;
 }
 
-void CScoreBoard::sub_1006E930()
+// MATCH
+void CScoreBoard::FUNC_1006E930()
 {
 	RECT rect;
 
diff --git a/saco/scoreboard.h b/saco/scoreboard.h
index 43d299d..aecac91 100644
--- a/saco/scoreboard.h
+++ b/saco/scoreboard.h
@@ -25,5 +25,5 @@ private:
 public:
 	CScoreBoard(IDirect3DDevice9 *pD3DDevice);
 
-	void sub_1006E930();
+	void FUNC_1006E930();
 };
diff --git a/saco/unkclass15.cpp b/saco/unkclass15.cpp
index ec0f8a1..1e8486f 100644
--- a/saco/unkclass15.cpp
+++ b/saco/unkclass15.cpp
@@ -9,10 +9,10 @@ CUnkClass15::CUnkClass15()
 	field_18 = 0;
 	m_pLight = NULL;
 
-	sub_1006BE40();
+	FUNC_1006BE40();
 }
 
-bool CUnkClass15::sub_1006BE40()
+bool CUnkClass15::FUNC_1006BE40()
 {
 	RwRGBAReal color;
 	VECTOR v;
diff --git a/saco/unkclass15.h b/saco/unkclass15.h
index e327f9c..317deec 100644
--- a/saco/unkclass15.h
+++ b/saco/unkclass15.h
@@ -17,5 +17,5 @@ private:
 public:
 	CUnkClass15();
 
-	bool sub_1006BE40();
+	bool FUNC_1006BE40();
 };