9 files changed, 247 insertions, 63 deletions

diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index 2514d963..0663bbd9 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -161,7 +161,7 @@ cMusicManager::DisplayRadioStationName()
 		CFont::SetPropOn();
 		CFont::SetFontStyle(FONT_HEADING);
 		CFont::SetCentreOn();
-		CFont::SetCentreSize(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
+		CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH));
 		CFont::SetColor(CRGBA(0, 0, 0, 255));
 #ifdef FIX_BUGS
 		CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_Y(22.0f) + SCREEN_SCALE_Y(2.0f), pCurrentStation);
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index 757af0a9..071ca2b3 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -1576,13 +1576,20 @@ void CReplay::Display()
 	TimeCount = (TimeCount + 1) % UINT16_MAX;
 	if ((TimeCount & 0x20) == 0)
 		return;
-	CFont::SetPropOn();
-	CFont::SetBackgroundOff();
+	
 	CFont::SetScale(SCREEN_SCALE_X(1.5f), SCREEN_SCALE_Y(1.5f));
-	CFont::SetAlignment(ALIGN_LEFT);
+	CFont::SetJustifyOff();
+	CFont::SetBackgroundOff();
+#ifdef FIX_BUGS
+	CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH-20));
+#else
+	CFont::SetCentreSize(SCREEN_WIDTH-20);
+#endif
+	CFont::SetCentreOff();
+	CFont::SetPropOn();
 	CFont::SetColor(CRGBA(255, 255, 200, 200));
 	CFont::SetFontStyle(FONT_BANK);
 	if (Mode == MODE_PLAYBACK)
-		CFont::PrintString(SCREEN_SCALE_X(63.5f), SCREEN_SCALE_Y(30.0f), TheText.Get("REPLAY"));
+		CFont::PrintString(SCREEN_WIDTH/15, SCREEN_HEIGHT/10, TheText.Get("REPLAY"));
 }
 #endif
diff --git a/src/control/SceneEdit.cpp b/src/control/SceneEdit.cpp
index 8224c1d4..b7623133 100644
--- a/src/control/SceneEdit.cpp
+++ b/src/control/SceneEdit.cpp
@@ -279,24 +279,44 @@ void CSceneEdit::Draw(void)
 #endif
 	sprintf(str, "Action");
 	AsciiToUnicode(str, wstr);
-	CFont::SetColor(CRGBA(0, 0, 0, 0));
+	CFont::SetColor(CRGBA(0, 0, 0, 255));
+#ifdef FIX_BUGS
 	CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(ACTION_MESSAGE_X_RIGHT - SHADOW_OFFSET), SCREEN_SCALE_Y(ACTION_MESSAGE_Y + SHADOW_OFFSET), wstr);
+#else
+	CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH-ACTION_MESSAGE_X_RIGHT) + SHADOW_OFFSET, SCREEN_SCALE_FROM_BOTTOM(DEFAULT_SCREEN_HEIGHT-ACTION_MESSAGE_Y) + SHADOW_OFFSET, wstr);
+#endif
 	CFont::SetColor(CRGBA(193, 164, 120, 255));
+#ifdef FIX_BUGS
 	CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(ACTION_MESSAGE_X_RIGHT), SCREEN_SCALE_Y(ACTION_MESSAGE_Y), wstr);
+#else
+	CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH-ACTION_MESSAGE_X_RIGHT), SCREEN_SCALE_FROM_BOTTOM(DEFAULT_SCREEN_HEIGHT-ACTION_MESSAGE_Y), wstr);
+#endif
 	sprintf(str, "Selected");
 	AsciiToUnicode(str, wstr);
-	CFont::SetColor(CRGBA(0, 0, 0, 0));
+	CFont::SetColor(CRGBA(0, 0, 0, 255));
+#ifdef FIX_BUGS
 	CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(SELECTED_MESSAGE_X_RIGHT - SHADOW_OFFSET), SCREEN_SCALE_Y(SELECTED_MESSAGE_Y + SHADOW_OFFSET), wstr);
+#else
+	CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH-SELECTED_MESSAGE_X_RIGHT) + SHADOW_OFFSET, SCREEN_SCALE_FROM_BOTTOM(DEFAULT_SCREEN_HEIGHT-SELECTED_MESSAGE_Y) + SHADOW_OFFSET, wstr);
+#endif
 	CFont::SetColor(CRGBA(193, 164, 120, 255));
+#ifdef FIX_BUGS
 	CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(SELECTED_MESSAGE_X_RIGHT), SCREEN_SCALE_Y(SELECTED_MESSAGE_Y), wstr);
+#else
+	CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH-SELECTED_MESSAGE_X_RIGHT), SCREEN_SCALE_FROM_BOTTOM(DEFAULT_SCREEN_HEIGHT-SELECTED_MESSAGE_Y), wstr);
+#endif
 	CFont::SetCentreOff();
+#ifdef FIX_BUGS
 	CFont::SetScale(SCREEN_SCALE_X(0.7f), SCREEN_SCALE_Y(0.7f));
+#else
+	CFont::SetScale(0.7f, 0.7f);
+#endif
 #ifdef FIX_BUGS
 	CFont::SetFontStyle(FONT_BANK);
 #else
 	CFont::SetFontStyle(FONT_HEADING);
 #endif
-	CFont::SetColor(CRGBA(0, 0, 0, 0));
+	CFont::SetColor(CRGBA(0, 0, 0, 255));
 	for (int i = 0; i < NUM_COMMANDS_TO_DRAW; i++) {
 		int16 nCommandDrawn = m_nCurrentCommand + i - NUM_COMMANDS_TO_DRAW / 2;
 		if (nCommandDrawn >= MOVIE_TOTAL_COMMANDS)
@@ -305,13 +325,21 @@ void CSceneEdit::Draw(void)
 			nCommandDrawn += (MOVIE_TOTAL_COMMANDS - 1);
 		sprintf(str, "%s", pCommandStrings[nCommandDrawn]);
 		AsciiToUnicode(str, wstr);
-		CFont::SetColor(CRGBA(0, 0, 0, 0));
+		CFont::SetColor(CRGBA(0, 0, 0, 255));
+#ifdef FIX_BUGS
 		CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(COMMAND_NAME_X_RIGHT - SHADOW_OFFSET), SCREEN_SCALE_Y(COMMAND_NAME_Y + SHADOW_OFFSET + i * COMMAND_NAME_HEIGHT), wstr);
+#else
+		CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH-COMMAND_NAME_X_RIGHT) + SHADOW_OFFSET, SCREEN_SCALE_FROM_BOTTOM(DEFAULT_SCREEN_HEIGHT-COMMAND_NAME_Y) + SHADOW_OFFSET + i * COMMAND_NAME_HEIGHT), wstr);
+#endif
 		if (nCommandDrawn == m_nCurrentCommand)
 			CFont::SetColor(CRGBA(156, 91, 40, 255));
 		else
 			CFont::SetColor(CRGBA(193, 164, 120, 255));
+#ifdef FIX_BUGS
 		CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(COMMAND_NAME_X_RIGHT), SCREEN_SCALE_Y(COMMAND_NAME_Y + i * COMMAND_NAME_HEIGHT), wstr);
+#else
+		CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH-COMMAND_NAME_X_RIGHT), SCREEN_SCALE_FROM_BOTTOM(DEFAULT_SCREEN_HEIGHT-COMMAND_NAME_Y) + i * COMMAND_NAME_HEIGHT), wstr);
+#endif
 	}
 }
 
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 33302653..0a6c3eec 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -116,8 +116,6 @@ void DoRWStuffEndOfFrame(void);
 #ifdef PS2_MENU
 void MessageScreen(char *msg)
 {
-	//TODO: stretch_screen
-	
 	CRect rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
 	CRGBA color(255, 255, 255, 255);
 
@@ -129,20 +127,32 @@ void MessageScreen(char *msg)
 
 	CSprite2d *splash = LoadSplash(NULL);
 	splash->Draw(rect, color, color, color, color);
-	splash->DrawRect(CRect(SCREEN_SCALE_X(20.0f), SCREEN_SCALE_Y(110.0f), SCREEN_SCALE_X(620.0f), SCREEN_SCALE_Y(300.0f)), CRGBA(50, 50, 50, 192));
-	
+#ifdef FIX_BUGS
+	splash->DrawRect(CRect(SCREEN_SCALE_X(20.0f), SCREEN_SCALE_Y(110.0f), SCREEN_WIDTH-SCREEN_SCALE_X(20.0f), SCREEN_SCALE_Y(300.0f)), CRGBA(50, 50, 50, 192));
+#else
+	splash->DrawRect(CRect(20.0f, 110.0f, SCREEN_WIDTH-20.0f, 300.0f), CRGBA(50, 50, 50, 192));
+#endif
 	CFont::SetFontStyle(FONT_BANK);
 	CFont::SetBackgroundOff();
-	CFont::SetWrapx(SCREEN_SCALE_FROM_RIGHT(190.0f)); // 450.0f
+	CFont::SetWrapx(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH-190));
+#ifdef FIX_BUGS
 	CFont::SetScale(SCREEN_SCALE_X(1.0f), SCREEN_SCALE_Y(1.0f));
+#else
+	CFont::SetScale(1.0f, 1.0f);
+#endif
 	CFont::SetCentreOn();
-	CFont::SetCentreSize(SCREEN_SCALE_X(450.0f)); // 450.0f
+	CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH - 190)); // 450.0f
 	CFont::SetJustifyOff();
 	CFont::SetColor(CRGBA(255, 255, 255, 255));
 	CFont::SetDropColor(CRGBA(32, 32, 32, 255));
 	CFont::SetDropShadowPosition(3);
+	CFont::SetBackGroundOnlyTextOff();
 	CFont::SetPropOn();
-	CFont::PrintString(SCREEN_SCALE_X(320.0f), SCREEN_SCALE_Y(130.0f), TheText.Get(msg));
+#ifdef FIX_BUGS
+	CFont::PrintString(SCREEN_WIDTH/2, SCREEN_SCALE_Y(130.0f), TheText.Get(msg));
+#else
+	CFont::PrintString(SCREEN_WIDTH/2, 130.0f, TheText.Get(msg));
+#endif
 	CFont::DrawFonts();
 	
 	DoRWStuffEndOfFrame();
@@ -889,12 +899,15 @@ void CGame::InitialiseWhenRestarting(void)
 				DefinedState();
 				
 				CSprite2d *splash = LoadSplash(NULL);
-				splash->Draw(rect, color, color, color, color);
-				splash->DrawRect(CRect(SCREEN_SCALE_X(20.0f), SCREEN_SCALE_Y(110.0f), SCREEN_SCALE_X(620.0f), SCREEN_SCALE_Y(300.0f)), CRGBA(50, 50, 50, 192));
-				
-				//CFont::SetFontStyle(?);
+				splash->Draw(rect, color, color, color, color);		
+#ifdef FIX_BUGS
+				splash->DrawRect(CRect(SCREEN_SCALE_X(20.0f), SCREEN_SCALE_Y(110.0f), SCREEN_WIDTH-SCREEN_SCALE_X(20.0f), SCREEN_SCALE_Y(300.0f)), CRGBA(50, 50, 50, 192));
+#else
+				splash->DrawRect(CRect(20.0f, 110.0f, SCREEN_WIDTH-20.0f, 300.0f), CRGBA(50, 50, 50, 192));
+#endif
+
 				CFont::SetBackgroundOff();
-				CFont::SetWrapx(SCREEN_SCALE_FROM_RIGHT(160.0f)); // 480.0f
+				CFont::SetWrapx(SCREEN_SCALE_X(480.0f));
 				CFont::SetScale(SCREEN_SCALE_X(1.0f), SCREEN_SCALE_Y(1.0f));
 				CFont::SetCentreOn();
 				CFont::SetCentreSize(SCREEN_SCALE_X(480.0f));
@@ -904,9 +917,15 @@ void CGame::InitialiseWhenRestarting(void)
 				CFont::SetDropColor(CRGBA(32, 32, 32, 255));
 				CFont::SetDropShadowPosition(3);
 				CFont::SetPropOn();
-				CFont::PrintString(SCREEN_SCALE_X(320.0f), SCREEN_SCALE_Y(130.0f), TheText.Get("MC_LDFL")); // Load Failed!
-				CFont::PrintString(SCREEN_SCALE_X(320.0f), SCREEN_SCALE_Y(170.0f), TheText.Get("FES_NOC")); // No Memory Card (PS2) in MEMORY CARD slot 1.
-				CFont::PrintString(SCREEN_SCALE_X(320.0f), SCREEN_SCALE_Y(240.0f), TheText.Get("MC_NWRE")); // Now Restarting Game.
+#ifdef FIX_BUGS
+				CFont::PrintString(SCREEN_WIDTH/2, SCREEN_SCALE_Y(130.0f), TheText.Get("MC_LDFL")); // Load Failed!
+				CFont::PrintString(SCREEN_WIDTH/2, SCREEN_SCALE_Y(170.0f), TheText.Get("FES_NOC")); // No Memory Card (PS2) in MEMORY CARD slot 1.
+				CFont::PrintString(SCREEN_WIDTH/2, SCREEN_SCALE_Y(240.0f), TheText.Get("MC_NWRE")); // Now Restarting Game.
+#else
+				CFont::PrintString(SCREEN_WIDTH/2, 130.0f, TheText.Get("MC_LDFL")); // Load Failed!
+				CFont::PrintString(SCREEN_WIDTH/2, 170.0f, TheText.Get("FES_NOC")); // No Memory Card (PS2) in MEMORY CARD slot 1.
+				CFont::PrintString(SCREEN_WIDTH/2, 240.0f, TheText.Get("MC_NWRE")); // Now Restarting Game.
+#endif
 				CFont::DrawFonts();
 				
 				DoRWStuffEndOfFrame();
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index b971f3ec..7dc9aba0 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -2607,10 +2607,18 @@ void CPad::PrintErrorMessage(void)
 {
 	if ( bDisplayNoControllerMessage && !CGame::playingIntro && !FrontEndMenuManager.m_bMenuActive )
 	{
+#ifdef FIX_BUGS
+		CFont::SetScale(SCREEN_SCALE_X(0.85f), SCREEN_SCALE_Y(1.0f));
+#else
 		CFont::SetScale(0.85f, 1.0f);
+#endif
 		CFont::SetJustifyOff();
 		CFont::SetBackgroundOff();
-		CFont::SetCentreSize(SCREEN_SCALE_X(SCREEN_WIDTH - 20));
+#ifdef FIX_BUGS
+		CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH - 20));
+#else
+		CFont::SetCentreSize(SCREEN_WIDTH - 20);
+#endif
 		CFont::SetCentreOn();
 		CFont::SetPropOn();
 		CFont::SetColor(CRGBA(255, 255, 200, 200));
@@ -2624,10 +2632,18 @@ void CPad::PrintErrorMessage(void)
 	}
 	else if ( bObsoleteControllerMessage )
 	{
+#ifdef FIX_BUGS
+		CFont::SetScale(SCREEN_SCALE_X(0.85f), SCREEN_SCALE_Y(1.0f));
+#else
 		CFont::SetScale(0.85f, 1.0f);
+#endif
 		CFont::SetJustifyOff();
 		CFont::SetBackgroundOff();
-		CFont::SetCentreSize(SCREEN_SCALE_X(SCREEN_WIDTH - 20));
+#ifdef FIX_BUGS
+		CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH - 20));
+#else
+		CFont::SetCentreSize(SCREEN_WIDTH - 20);
+#endif
 		CFont::SetCentreOn();
 		CFont::SetPropOn();
 		CFont::SetColor(CRGBA(255, 255, 200, 200));
diff --git a/src/core/main.cpp b/src/core/main.cpp
index cc7f3259..d02b8098 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -577,7 +577,12 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
 		return;
 #endif
 
-	if(DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255)){
+#ifndef GTA_PS2
+	if(DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255))
+#else
+	DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+#endif
+	{
 		CSprite2d::SetRecipNearClip();
 		CSprite2d::InitPerFrame();
 		CFont::InitPerFrame();
@@ -637,8 +642,13 @@ LoadingIslandScreen(const char *levelName)
 
 	splash = LoadSplash(nil);
 	name = TheText.Get(levelName);
+	
+#ifndef GTA_PS2
 	if(!DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255))
 		return;
+#else
+	DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+#endif
 
 	CSprite2d::SetRecipNearClip();
 	CSprite2d::InitPerFrame();
@@ -665,20 +675,42 @@ LoadingIslandScreen(const char *levelName)
 	CFont::SetDropColor(CRGBA(0, 0, 0, 255));
 	CFont::SetDropShadowPosition(3);
 	CFont::SetColor(CRGBA(243, 237, 71, 255));
+#if !defined(PS2_HUD) && defined(GTA_PC)
 	CFont::SetScale(SCREEN_SCALE_X(1.2f), SCREEN_SCALE_Y(1.2f));
-#ifdef FIX_BUGS
-	CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(110.0f), TheText.Get("WELCOME"));
+#endif
+
+#ifdef PS2_HUD
+	#ifdef FIX_BUGS
+	CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(140.0f), TheText.Get("WELCOME"));
+	#else
+	CFont::PrintString(SCREEN_WIDTH - 20, SCREEN_HEIGHT - 140, TheText.Get("WELCOME"));
+	#endif
 #else
+	#ifdef FIX_BUGS
+	CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(110.0f), TheText.Get("WELCOME"));
+	#else
 	CFont::PrintString(SCREEN_WIDTH - 20, SCREEN_SCALE_FROM_BOTTOM(110.0f), TheText.Get("WELCOME"));
+	#endif
 #endif
 	TextCopy(wstr, name);
 	TheText.UpperCase(wstr);
 	CFont::SetColor(CRGBA(243, 237, 71, 255));
+#if !defined(PS2_HUD) && defined(GTA_PC)
 	CFont::SetScale(SCREEN_SCALE_X(1.2f), SCREEN_SCALE_Y(1.2f));
-#ifdef FIX_BUGS
-	CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(80.0f), wstr);
+#endif
+
+#ifdef PS2_HUD
+	#ifdef FIX_BUGS
+		CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(110.0f), wstr);
+	#else
+		CFont::PrintString(SCREEN_WIDTH-20, SCREEN_HEIGHT - 110, wstr);
+	#endif
 #else
-	CFont::PrintString(SCREEN_WIDTH-20, SCREEN_SCALE_FROM_BOTTOM(80.0f), wstr);
+	#ifdef FIX_BUGS
+		CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(80.0f), wstr);
+	#else
+		CFont::PrintString(SCREEN_WIDTH-20, SCREEN_SCALE_FROM_BOTTOM(80.0f), wstr);
+	#endif
 #endif
 	CFont::DrawFonts();
 	DoRWStuffEndOfFrame();
@@ -1058,7 +1090,11 @@ DisplayGameDebugText()
 		// Let's not scale those numbers, they look better that way :eyes:
 		CFont::SetPropOff();
 		CFont::SetBackgroundOff();
+#ifdef FIX_BUGS
+		CFont::SetScale(SCREEN_SCALE_X(0.7f), SCREEN_SCALE_Y(1.5f));
+#else
 		CFont::SetScale(0.7f, 1.5f);
+#endif
 		CFont::SetCentreOff();
 		CFont::SetRightJustifyOff();
 		CFont::SetJustifyOff();
diff --git a/src/render/Font.cpp b/src/render/Font.cpp
index 65ab42ff..bb711ebd 100644
--- a/src/render/Font.cpp
+++ b/src/render/Font.cpp
@@ -47,6 +47,8 @@ int16 CFont::Size[LANGSET_MAX][MAX_FONTS][193] = {
 #else
 int16 CFont::Size[MAX_FONTS][193] = {
 #endif
+
+#if !defined(GTA_PS2) || defined(FIX_BUGS)
 		{
 		13, 12, 31, 35, 23, 35, 31,  9, 14, 15, 25, 30, 11, 17, 13, 31,
 		23, 16, 22, 21, 24, 23, 23, 20, 23, 22, 10, 35, 26, 26, 26, 26,
@@ -94,6 +96,56 @@ int16 CFont::Size[MAX_FONTS][193] = {
 		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
 		19
 		}
+#else // #if defined(GTA_PS2) && !defined(FIX_BUGS)
+		{
+		13, 12, 31, 35, 23, 35, 31,  9, 14, 15, 25, 30, 11, 17, 13, 31,
+		23, 16, 22, 21, 24, 23, 23, 20, 23, 22, 10, 35, 26, 26, 26, 26,
+		30, 26, 24, 23, 24, 22, 21, 24, 26, 10, 20, 26, 22, 29, 26, 25,
+		24, 25, 24, 24, 22, 25, 24, 29, 29, 23, 25, 37, 22, 37, 35, 37,
+		35, 21, 22, 21, 21, 22, 13, 22, 21, 10, 16, 22, 11, 32, 21, 21,
+		23, 22, 16, 20, 14, 21, 20, 30, 25, 21, 21, 33, 33, 33, 33, 35,
+		27, 27, 27, 27, 32, 24, 23, 23, 23, 23, 11, 11, 11, 11, 26, 26,
+		26, 26, 26, 26, 26, 25, 26, 21, 21, 21, 21, 32, 23, 22, 22, 22,
+		22, 11, 11, 11, 11, 22, 22, 22, 22, 22, 22, 22, 22, 26, 21, 24,
+		12, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+		26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 18, 26, 26,
+		26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+		20
+		},
+
+		{
+		13,  9, 21, 35, 23, 35, 35, 11, 35, 35, 25, 35, 11, 17, 13, 33,
+		28, 14, 22, 21, 24, 23, 23, 21, 23, 22, 10, 35, 13, 35, 13, 33,
+		 5, 25, 22, 23, 24, 21, 21, 24, 24,  9, 20, 24, 21, 27, 25, 25,
+		22, 25, 23, 20, 23, 23, 23, 31, 23, 23, 23, 37, 33, 37, 35, 37,
+		35, 21, 19, 19, 21, 19, 17, 21, 21,  8, 17, 18, 14, 24, 21, 21,
+		20, 22, 19, 20, 20, 19, 20, 26, 21, 20, 21, 33, 33, 33, 33, 35,
+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+		16
+		},
+
+		{
+		15, 14, 16, 25, 19, 26, 22, 11, 18, 18, 27, 26, 13, 19,  9, 27,
+		19, 18, 19, 19, 21, 19, 20, 18, 19, 20, 12, 32, 15, 32, 15, 35,
+		15, 19, 19, 19, 19, 19, 16, 19, 20,  9, 19, 20, 14, 29, 19, 19,
+		19, 19, 19, 19, 21, 19, 20, 32, 20, 19, 19, 33, 31, 39, 37, 39,
+		37, 21, 21, 21, 23, 21, 19, 23, 23, 10, 19, 20, 16, 26, 23, 23,
+		20, 20, 20, 22, 21, 22, 22, 26, 22, 22, 23, 35, 35, 35, 35, 37,
+		19, 19, 19, 19, 29, 19, 19, 19, 19, 19,  9,  9,  9,  9, 19, 19,
+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 30, 19, 19, 19, 19, 19,
+		10, 10, 10, 10, 19, 19, 19, 19, 19, 19, 19, 19, 19, 23, 35, 12,
+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 11, 19, 19, 19,
+		19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+		19
+		}
+#endif
+
 #ifdef MORE_LANGUAGES
 	},
 	{
@@ -455,18 +507,35 @@ CFont::PrintChar(float x, float y, wchar c)
 
 	if(Details.style == FONT_BANK || Details.style == FONT_HEADING){
 		if(Details.dropShadowPosition != 0){
-			CSprite2d::AddSpriteToBank(Details.bank + Details.style,	// BUG: game doesn't add bank
+			CSprite2d::AddSpriteToBank(
+#ifdef FIX_BUGS
+				Details.bank + Details.style,
+#else
+				Details.style, // BUG: game doesn't add bank
+#endif
+#ifdef FIX_BUGS
 				CRect(x + SCREEN_SCALE_X(Details.dropShadowPosition),
 				      y + SCREEN_SCALE_Y(Details.dropShadowPosition),
 				      x + SCREEN_SCALE_X(Details.dropShadowPosition) + 32.0f * Details.scaleX * 1.0f,
 				      y + SCREEN_SCALE_Y(Details.dropShadowPosition) + 40.0f * Details.scaleY * 0.5f),
+#else
+				CRect(x + Details.dropShadowPosition,
+				      y + Details.dropShadowPosition,
+				      x + Details.dropShadowPosition + 32.0f * Details.scaleX * 1.0f,
+				      y + Details.dropShadowPosition + 40.0f * Details.scaleY * 0.5f),
+#endif
 				Details.dropColor,
 				xoff/16.0f,                 yoff/12.8f,
 				(xoff+1.0f)/16.0f - 0.001f, yoff/12.8f,
 				xoff/16.0f,                 (yoff+1.0f)/12.8f,
 				(xoff+1.0f)/16.0f - 0.001f, (yoff+1.0f)/12.8f - 0.0001f);
 		}
-		CSprite2d::AddSpriteToBank(Details.bank + Details.style,	// BUG: game doesn't add bank
+		CSprite2d::AddSpriteToBank(
+#ifdef FIX_BUGS
+			Details.bank + Details.style,
+#else
+			Details.style, // BUG: game doesn't add bank
+#endif
 			CRect(x, y,
 			      x + 32.0f * Details.scaleX * 1.0f,
 			      y + 40.0f * Details.scaleY * 0.5f),
@@ -478,11 +547,23 @@ CFont::PrintChar(float x, float y, wchar c)
 #ifdef MORE_LANGUAGES
 	}else if (IsJapaneseFont()) {
 		if (Details.dropShadowPosition != 0) {
-			CSprite2d::AddSpriteToBank(Details.bank + Details.style,	// BUG: game doesn't add bank
+			CSprite2d::AddSpriteToBank(
+#ifdef FIX_BUGS
+				Details.bank + Details.style,
+#else
+				Details.style, // BUG: game doesn't add bank
+#endif
+#ifdef FIX_BUGS
 				CRect(x + SCREEN_SCALE_X(Details.dropShadowPosition),
 					y + SCREEN_SCALE_Y(Details.dropShadowPosition),
 					x + SCREEN_SCALE_X(Details.dropShadowPosition) + 32.0f * Details.scaleX * 1.0f,
 					y + SCREEN_SCALE_Y(Details.dropShadowPosition) + 40.0f * Details.scaleY / 2.75f),
+#else
+				CRect(x + Details.dropShadowPosition,
+					y + Details.dropShadowPosition,
+					x + Details.dropShadowPosition + 32.0f * Details.scaleX * 1.0f,
+					y + Details.dropShadowPosition + 40.0f * Details.scaleY / 2.75f),
+#endif
 				Details.dropColor,
 				xoff * w / 1024.0f, yoff / 25.6f,
 				xoff * w / 1024.0f + (1.0f / 48.0f) - 0.001f, yoff / 25.6f,
@@ -501,7 +582,12 @@ CFont::PrintChar(float x, float y, wchar c)
 #endif
 	}else
 	{
-		CSprite2d::AddSpriteToBank(Details.bank + Details.style,	// BUG: game doesn't add bank
+		CSprite2d::AddSpriteToBank(
+#ifdef FIX_BUGS
+			Details.bank + Details.style,
+#else
+			Details.style, // BUG: game doesn't add bank
+#endif
 			CRect(x, y,
 					x + 32.0f * Details.scaleX * w,
 					y + 32.0f * Details.scaleY * 0.5f),
@@ -793,7 +879,12 @@ CFont::GetTextRect(CRect *rect, float xstart, float ystart, wchar *s)
 		numLines = GetNumberLines(xstart, ystart, s);
 	}else{
 #endif
+
+#ifdef FIX_BUGS
 		if(Details.centre || Details.rightJustify)
+#else
+		if(Details.centre)
+#endif
 			x = 0.0f;
 		else
 			x = xstart;
@@ -811,7 +902,11 @@ CFont::GetTextRect(CRect *rect, float xstart, float ystart, wchar *s)
 				// reached end of line
 				if(x > maxlength)
 					maxlength = x;
+#ifdef FIX_BUGS
 				if(Details.centre || Details.rightJustify)
+#else
+				if(Details.centre)
+#endif
 					x = 0.0f;
 				else
 					x = xstart;
@@ -1291,14 +1386,14 @@ CFont::ParseToken(wchar *s, wchar*)
 		case 'n':
 			NewLine = 1;
 			break;
-		case 'b': SetColor(CRGBA(0x80, 0xA7, 0xF3, 0xFF)); break;
-		case 'g': SetColor(CRGBA(0x5F, 0xA0, 0x6A, 0xFF)); break;
-		case 'h': SetColor(CRGBA(0xE1, 0xE1, 0xE1, 0xFF)); break;
-		case 'l': SetColor(CRGBA(0x00, 0x00, 0x00, 0xFF)); break;
-		case 'p': SetColor(CRGBA(0xA8, 0x6E, 0xFC, 0xFF)); break;
-		case 'r': SetColor(CRGBA(0x71, 0x2B, 0x49, 0xFF)); break;
-		case 'w': SetColor(CRGBA(0xAF, 0xAF, 0xAF, 0xFF)); break;
-		case 'y': SetColor(CRGBA(0xD2, 0xC4, 0x6A, 0xFF)); break;
+		case 'b': SetColor(CRGBA(128, 167, 243, 255)); break;
+		case 'g': SetColor(CRGBA(95, 160, 106, 255)); break;
+		case 'h': SetColor(CRGBA(225, 225, 225, 255)); break;
+		case 'l': SetColor(CRGBA(0, 0, 0, 255)); break;
+		case 'p': SetColor(CRGBA(168, 110, 252, 255)); break;
+		case 'r': SetColor(CRGBA(113, 43, 73, 255)); break;
+		case 'w': SetColor(CRGBA(175, 175, 175, 255)); break;
+		case 'y': SetColor(CRGBA(210, 196, 106, 255)); break;
 #ifdef BUTTON_ICONS
 #if 0 // unused
 		case 'U': PS2Symbol = BUTTON_UP; break;
diff --git a/src/render/Font.h b/src/render/Font.h
index 7b67e310..bd7e98bb 100644
--- a/src/render/Font.h
+++ b/src/render/Font.h
@@ -173,23 +173,6 @@ public:
 	static void SetCentreOff(void) {
 		Details.centre = false;
 	}
-	static void SetAlignment(uint8 alignment) {
-		if (alignment == ALIGN_LEFT) {
-			CFont::Details.justify = true;
-			CFont::Details.centre = false;
-			CFont::Details.rightJustify = false;
-		}
-		else if (alignment == ALIGN_CENTER) {
-			CFont::Details.justify = false;
-			CFont::Details.centre = true;
-			CFont::Details.rightJustify = false;
-		}
-		else if (alignment == ALIGN_RIGHT) {
-			CFont::Details.justify = false;
-			CFont::Details.centre = false;
-			CFont::Details.rightJustify = true;
-		}
-	}
 	static void SetWrapx(float x) { Details.wrapX = x; }
 	static void SetCentreSize(float s) { Details.centreSize = s; }
 	static void SetBackgroundOn(void) { Details.background = true; }
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp
index d54f1c05..eb152ca4 100644
--- a/src/render/Hud.cpp
+++ b/src/render/Hud.cpp
@@ -1029,7 +1029,7 @@ void CHud::Draw()
 						CFont::SetRightJustifyWrap(0.0f);
 						CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
 						CFont::SetColor(CRGBA(244, 20, 20, 255));
-						CFont::SetWrapx(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
+						CFont::SetWrapx(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH));
 						CFont::SetPropOff();
 						CFont::SetBackGroundOnlyTextOn();
 
@@ -1396,7 +1396,7 @@ void CHud::Draw()
 
 				// Appearently sliding text in here was abandoned very early, since this text is centered now.
 #ifdef FIX_BUGS
-				if (BigMessageX[0] >= SCALE_AND_CENTER_X(DEFAULT_SCREEN_HEIGHT-20))
+				if (BigMessageX[0] >= SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH-20))
 #else
 				if (BigMessageX[0] >= SCREEN_WIDTH-20)
 #endif