TONY: Some more renaming (thanks Hkz)

6 files changed, 142 insertions, 145 deletions

diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp
index ce1c2860f8..78b8f4e798 100644
--- a/engines/tony/custom.cpp
+++ b/engines/tony/custom.cpp
@@ -42,7 +42,7 @@
 
 namespace Tony {
 
-const char *tappetiFile[] =  {
+const char *ambianceFile[] =  {
 	"None",
 	"1.ADP",    // Grilli.WAV
 	"2.ADP",    // Grilli-Ovattati.WAV
@@ -50,7 +50,7 @@ const char *tappetiFile[] =  {
 	"3.ADP",    // Grilli-Vento1.WAV
 	"5.ADP",    // Vento1.WAV
 	"4.ADP",    // Mare1.WAV
-	"6.ADP"     // Mare1.WAV metà volume
+	"6.ADP"     // Mare1.WAV half volume
 };
 
 struct MusicFileEntry {
@@ -210,19 +210,19 @@ DECLARE_CUSTOM_FUNCTION(SetAlwaysDisplay)(CORO_PARAM, uint32 val, uint32, uint32
 DECLARE_CUSTOM_FUNCTION(SetPointer)(CORO_PARAM, uint32 dwPointer, uint32, uint32, uint32) {
 	switch (dwPointer) {
 	case 1:
-		GLOBALS._pointer->setSpecialPointer(GLOBALS._pointer->PTR_FRECCIASU);
+		GLOBALS._pointer->setSpecialPointer(GLOBALS._pointer->PTR_ARROWUP);
 		break;
 	case 2:
-		GLOBALS._pointer->setSpecialPointer(GLOBALS._pointer->PTR_FRECCIAGIU);
+		GLOBALS._pointer->setSpecialPointer(GLOBALS._pointer->PTR_ARROWDOWN);
 		break;
 	case 3:
-		GLOBALS._pointer->setSpecialPointer(GLOBALS._pointer->PTR_FRECCIASINISTRA);
+		GLOBALS._pointer->setSpecialPointer(GLOBALS._pointer->PTR_ARROWLEFT);
 		break;
 	case 4:
-		GLOBALS._pointer->setSpecialPointer(GLOBALS._pointer->PTR_FRECCIADESTRA);
+		GLOBALS._pointer->setSpecialPointer(GLOBALS._pointer->PTR_ARROWRIGHT);
 		break;
 	case 5:
-		GLOBALS._pointer->setSpecialPointer(GLOBALS._pointer->PTR_FRECCIAMAPPA);
+		GLOBALS._pointer->setSpecialPointer(GLOBALS._pointer->PTR_ARROWMAP);
 		break;
 
 	default:
@@ -232,15 +232,12 @@ DECLARE_CUSTOM_FUNCTION(SetPointer)(CORO_PARAM, uint32 dwPointer, uint32, uint32
 }
 
 VoiceHeader *SearchVoiceHeader(uint32 codehi, uint32 codelo) {
-	uint i;
-	int code;
-
-	code = (codehi << 16) | codelo;
+	int code = (codehi << 16) | codelo;
 
 	if (_vm->_voices.size() == 0)
 		return NULL;
 
-	for (i = 0; i < _vm->_voices.size(); i++)
+	for (uint i = 0; i < _vm->_voices.size(); i++)
 		if (_vm->_voices[i]._code == code)
 			return &_vm->_voices[i];
 
@@ -292,7 +289,7 @@ DECLARE_CUSTOM_FUNCTION(SendTonyMessage)(CORO_PARAM, uint32 dwMessage, uint32 nX
 			GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_NORMAL;
 	} else {
 		if (_ctx->msg.numPeriods() > 1)
-			CORO_INVOKE_1(GLOBALS._tony->startTalk, GLOBALS._tony->TALK_FIANCHI);
+			CORO_INVOKE_1(GLOBALS._tony->startTalk, GLOBALS._tony->TALK_HIPS);
 		else
 			CORO_INVOKE_1(GLOBALS._tony->startTalk, GLOBALS._tony->TALK_NORMAL);
 	}
@@ -537,7 +534,7 @@ DECLARE_CUSTOM_FUNCTION(ChangeLocation)(CORO_PARAM, uint32 nLoc, uint32 tX, uint
 		CORO_INVOKE_0(GLOBALS.WaitWipeEnd);
 	}
 
-	if (GLOBALS._lastTappeto != GLOBALS._tappeti[nLoc]) {
+	if (GLOBALS._lastTappeto != GLOBALS._ambiance[nLoc]) {
 		_vm->stopMusic(4);
 	}
 
@@ -550,10 +547,10 @@ DECLARE_CUSTOM_FUNCTION(ChangeLocation)(CORO_PARAM, uint32 nLoc, uint32 tX, uint
 	else
 		GLOBALS.LoadLocation(nLoc, RMPoint(tX, tY), RMPoint(-1, -1));
 
-	if (GLOBALS._lastTappeto != GLOBALS._tappeti[nLoc]) {
-		GLOBALS._lastTappeto = GLOBALS._tappeti[nLoc];
+	if (GLOBALS._lastTappeto != GLOBALS._ambiance[nLoc]) {
+		GLOBALS._lastTappeto = GLOBALS._ambiance[nLoc];
 		if (GLOBALS._lastTappeto != 0)
-			_vm->playMusic(4, tappetiFile[GLOBALS._lastTappeto], 0, true, 2000);
+			_vm->playMusic(4, ambianceFile[GLOBALS._lastTappeto], 0, true, 2000);
 	}
 
 	if (!GLOBALS._bNoBullsEye) {
@@ -802,19 +799,19 @@ void TonySetNumTexts(uint32 dwText) {
 	GLOBALS._bTonyInTexts = false;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyRide)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyLaugh)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_RIDE;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_LAUGH;
 }
 
 DECLARE_CUSTOM_FUNCTION(TonyGiggle)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_RIDE2;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_LAUGH2;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyFianchi)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyHips)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_FIANCHI;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_HIPS;
 }
 
 DECLARE_CUSTOM_FUNCTION(TonySing)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
@@ -1127,9 +1124,9 @@ DECLARE_CUSTOM_FUNCTION(TonySniffRight)(CORO_PARAM, uint32, uint32, uint32, uint
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyNaah)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonySarcastic)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_NAAH;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_SARCASTIC;
 }
 
 DECLARE_CUSTOM_FUNCTION(TonyMacbeth)(CORO_PARAM, uint32 nPos, uint32, uint32, uint32) {
@@ -2237,7 +2234,7 @@ void RestoreMusic(CORO_PARAM) {
 	CORO_INVOKE_4(PlaySoundEffect, GLOBALS._lastMusic, 0, 0, 0);
 
 	if (GLOBALS._lastTappeto != 0)
-		CustPlayMusic(4, tappetiFile[GLOBALS._lastTappeto], 0, true);
+		CustPlayMusic(4, ambianceFile[GLOBALS._lastTappeto], 0, true);
 
 	CORO_END_CODE;
 }
@@ -2447,8 +2444,8 @@ ASSIGN(37,  TonyGetUp)
 ASSIGN(38,  TonyShepherdess)
 ASSIGN(39,  TonyWhistle)
 
-ASSIGN(40,  TonyRide)
-ASSIGN(41,  TonyFianchi)
+ASSIGN(40,  TonyLaugh)
+ASSIGN(41,  TonyHips)
 ASSIGN(42,  TonySing)
 ASSIGN(43,  TonyIndicate)
 ASSIGN(44,  TonyScaredWithHands)
@@ -2477,7 +2474,7 @@ ASSIGN(106, TonyWithBeardStart)
 ASSIGN(107, TonyWithBeardEnd)
 ASSIGN(108, TonyGiggle)
 ASSIGN(109, TonyDisgusted)
-ASSIGN(110, TonyNaah)
+ASSIGN(110, TonySarcastic)
 ASSIGN(111, TonyMacbeth)
 ASSIGN(112, TonySniffLeft)
 ASSIGN(113, TonySniffRight)
@@ -2575,39 +2572,39 @@ void setupGlobalVars(RMTony *tony, RMPointer *ptr, RMGameBoxes *box, RMLocation
 		GLOBALS._mut[i] = CoroScheduler.createEvent(false, false);
 
 	for (i = 0; i < 200; i++)
-		GLOBALS._tappeti[i] = 0;
-
-	GLOBALS._tappeti[6] =  TAPPETI_GRILLI;
-	GLOBALS._tappeti[7] =  TAPPETI_GRILLI;
-	GLOBALS._tappeti[8] =  TAPPETI_GRILLIOV;
-	GLOBALS._tappeti[10] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[12] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[13] = TAPPETI_GRILLIOV;
-	GLOBALS._tappeti[15] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[16] = TAPPETI_GRILLIVENTO;
-	GLOBALS._tappeti[18] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[19] = TAPPETI_GRILLIVENTO;
-	GLOBALS._tappeti[20] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[23] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[26] = TAPPETI_MAREMETA;
-	GLOBALS._tappeti[27] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[28] = TAPPETI_GRILLIVENTO;
-	GLOBALS._tappeti[31] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[33] = TAPPETI_MARE;
-	GLOBALS._tappeti[35] = TAPPETI_MARE;
-	GLOBALS._tappeti[36] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[37] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[40] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[41] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[42] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[45] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[51] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[52] = TAPPETI_GRILLIVENTO1;
-	GLOBALS._tappeti[53] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[54] = TAPPETI_GRILLI;
-	GLOBALS._tappeti[57] = TAPPETI_VENTO;
-	GLOBALS._tappeti[58] = TAPPETI_VENTO;
-	GLOBALS._tappeti[60] = TAPPETI_VENTO;
+		GLOBALS._ambiance[i] = 0;
+
+	GLOBALS._ambiance[6] =  AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[7] =  AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[8] =  AMBIANCE_CRICKETSMUFFLED;
+	GLOBALS._ambiance[10] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[12] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[13] = AMBIANCE_CRICKETSMUFFLED;
+	GLOBALS._ambiance[15] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[16] = AMBIANCE_CRICKETSWIND;
+	GLOBALS._ambiance[18] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[19] = AMBIANCE_CRICKETSWIND;
+	GLOBALS._ambiance[20] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[23] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[26] = AMBIANCE_SEAHALFVOLUME;
+	GLOBALS._ambiance[27] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[28] = AMBIANCE_CRICKETSWIND;
+	GLOBALS._ambiance[31] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[33] = AMBIANCE_SEA;
+	GLOBALS._ambiance[35] = AMBIANCE_SEA;
+	GLOBALS._ambiance[36] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[37] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[40] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[41] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[42] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[45] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[51] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[52] = AMBIANCE_CRICKETSWIND1;
+	GLOBALS._ambiance[53] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[54] = AMBIANCE_CRICKETS;
+	GLOBALS._ambiance[57] = AMBIANCE_WIND;
+	GLOBALS._ambiance[58] = AMBIANCE_WIND;
+	GLOBALS._ambiance[60] = AMBIANCE_WIND;
 
 
 
diff --git a/engines/tony/game.h b/engines/tony/game.h
index e231287c0f..d8aceefc12 100644
--- a/engines/tony/game.h
+++ b/engines/tony/game.h
@@ -72,11 +72,11 @@ private:
 public:
 	enum PointerType {
 		PTR_NONE = 0,
-		PTR_FRECCIASU,
-		PTR_FRECCIAGIU,
-		PTR_FRECCIASINISTRA,
-		PTR_FRECCIADESTRA,
-		PTR_FRECCIAMAPPA,
+		PTR_ARROWUP,
+		PTR_ARROWDOWN,
+		PTR_ARROWLEFT,
+		PTR_ARROWRIGHT,
+		PTR_ARROWMAP,
 		PTR_CUSTOM
 	};
 
diff --git a/engines/tony/globals.cpp b/engines/tony/globals.cpp
index f28a22e4a5..ba2698a50b 100644
--- a/engines/tony/globals.cpp
+++ b/engines/tony/globals.cpp
@@ -72,7 +72,7 @@ Globals::Globals() {
 	_hSkipIdle = 0;
 	_lastMusic = 0;
 	_lastTappeto = 0;
-	Common::fill(&_tappeti[0], &_tappeti[200], 0);
+	Common::fill(&_ambiance[0], &_ambiance[200], 0);
 	_fullScreenMessageLoc = 0;
 
 	// MPAL global variables
diff --git a/engines/tony/globals.h b/engines/tony/globals.h
index b63dce7c45..02bd79eee7 100644
--- a/engines/tony/globals.h
+++ b/engines/tony/globals.h
@@ -35,13 +35,13 @@
 
 namespace Tony {
 
-#define TAPPETI_GRILLI 1
-#define TAPPETI_GRILLIOV 2
-#define TAPPETI_GRILLIVENTO 3
-#define TAPPETI_GRILLIVENTO1 4
-#define TAPPETI_VENTO 5
-#define TAPPETI_MARE 6
-#define TAPPETI_MAREMETA 7
+#define AMBIANCE_CRICKETS 1
+#define AMBIANCE_CRICKETSMUFFLED 2
+#define AMBIANCE_CRICKETSWIND 3
+#define AMBIANCE_CRICKETSWIND1 4
+#define AMBIANCE_WIND 5
+#define AMBIANCE_SEA 6
+#define AMBIANCE_SEAHALFVOLUME 7
 
 struct CharacterStruct {
 	uint32 _code;
@@ -243,7 +243,7 @@ public:
 
 	int _lastMusic, _lastTappeto;
 
-	int _tappeti[200];
+	int _ambiance[200];
 	RMPoint _fullScreenMessagePt;
 	int _fullScreenMessageLoc;
 
diff --git a/engines/tony/tonychar.cpp b/engines/tony/tonychar.cpp
index cd5bbdad8b..74d9f20181 100644
--- a/engines/tony/tonychar.cpp
+++ b/engines/tony/tonychar.cpp
@@ -648,39 +648,39 @@ bool RMTony::startTalkCalculate(CharacterTalkType nTalkType, int &headStartPat,
 		}
 		break;
 
-	case TALK_FIANCHI:
+	case TALK_HIPS:
 		_bBodyFront = false;
 		switch (_talkDirection) {
 		case UP:
 			_nBodyOffset.set(2, 42);
 			headStartPat = PAT_HEAD_UP;
-			bodyStartPat = BPAT_FIANCHIUP_START;
+			bodyStartPat = BPAT_HIPSUP_START;
 			headLoopPat = PAT_TALK_UP;
-			bodyLoopPat = BPAT_FIANCHIUP_LOOP;
+			bodyLoopPat = BPAT_HIPSUP_LOOP;
 			break;
 
 		case DOWN:
 			_nBodyOffset.set(2, 48);
 			headStartPat = PAT_HEAD_DOWN;
-			bodyStartPat = BPAT_FIANCHIDOWN_START;
+			bodyStartPat = BPAT_HIPSDOWN_START;
 			headLoopPat = PAT_TALK_DOWN;
-			bodyLoopPat = BPAT_FIANCHIDOWN_LOOP;
+			bodyLoopPat = BPAT_HIPSDOWN_LOOP;
 			break;
 
 		case LEFT:
 			_nBodyOffset.set(-3, 53);
 			headStartPat = PAT_HEAD_LEFT;
-			bodyStartPat = BPAT_FIANCHILEFT_START;
+			bodyStartPat = BPAT_HIPSLEFT_START;
 			headLoopPat = PAT_TALK_LEFT;
-			bodyLoopPat = BPAT_FIANCHILEFT_LOOP;
+			bodyLoopPat = BPAT_HIPSLEFT_LOOP;
 			break;
 
 		case RIGHT:
 			_nBodyOffset.set(2, 53);
 			headStartPat = PAT_HEAD_RIGHT;
-			bodyStartPat = BPAT_FIANCHIRIGHT_START;
+			bodyStartPat = BPAT_HIPSRIGHT_START;
 			headLoopPat = PAT_TALK_RIGHT;
-			bodyLoopPat = BPAT_FIANCHIRIGHT_LOOP;
+			bodyLoopPat = BPAT_HIPSRIGHT_LOOP;
 			break;
 		}
 		break;
@@ -693,47 +693,47 @@ bool RMTony::startTalkCalculate(CharacterTalkType nTalkType, int &headStartPat,
 		bodyLoopPat = BPAT_SINGLEFT_LOOP;
 		break;
 
-	case TALK_RIDE:
+	case TALK_LAUGH:
 		_bBodyFront = false;
 		switch (_talkDirection) {
 		case UP:
 		case DOWN:
 		case LEFT:
 			_nBodyOffset.set(6, 56);
-			headStartPat = PAT_RIDELEFT_START;
+			headStartPat = PAT_LAUGHLEFT_START;
 			bodyStartPat = BPAT_STANDLEFT;
-			headLoopPat = PAT_RIDELEFT_LOOP;
-			bodyLoopPat = BPAT_RIDELEFT;
+			headLoopPat = PAT_LAUGHLEFT_LOOP;
+			bodyLoopPat = BPAT_LAUGHLEFT;
 			break;
 
 		case RIGHT:
 			_nBodyOffset.set(6, 56);
-			headStartPat = PAT_RIDERIGHT_START;
+			headStartPat = PAT_LAUGHRIGHT_START;
 			bodyStartPat = BPAT_STANDRIGHT;
-			headLoopPat = PAT_RIDERIGHT_LOOP;
-			bodyLoopPat = BPAT_RIDERIGHT;
+			headLoopPat = PAT_LAUGHRIGHT_LOOP;
+			bodyLoopPat = BPAT_LAUGHRIGHT;
 			break;
 		}
 		break;
 
-	case TALK_RIDE2:
+	case TALK_LAUGH2:
 		_bBodyFront = false;
 		switch (_talkDirection) {
 		case UP:
 		case DOWN:
 		case LEFT:
 			_nBodyOffset.set(6, 56);
-			headStartPat = PAT_RIDELEFT_START;
+			headStartPat = PAT_LAUGHLEFT_START;
 			bodyStartPat = BPAT_STANDLEFT;
-			headLoopPat = PAT_RIDELEFT_LOOP;
+			headLoopPat = PAT_LAUGHLEFT_LOOP;
 			break;
 
 		case RIGHT:
 			_nBodyOffset.set(6, 56);
-			headStartPat = PAT_RIDERIGHT_START;
+			headStartPat = PAT_LAUGHRIGHT_START;
 			bodyStartPat = BPAT_STANDRIGHT;
-			headLoopPat = PAT_RIDERIGHT_LOOP;
-			bodyLoopPat = BPAT_RIDERIGHT;
+			headLoopPat = PAT_LAUGHRIGHT_LOOP;
+			bodyLoopPat = BPAT_LAUGHRIGHT;
 			break;
 		}
 		break;
@@ -997,22 +997,22 @@ bool RMTony::startTalkCalculate(CharacterTalkType nTalkType, int &headStartPat,
 		}
 		break;
 
-	case TALK_NAAH:
+	case TALK_SARCASTIC:
 		switch (_talkDirection) {
 		case LEFT:
 		case UP:
 			_nBodyOffset.set(6, 56);
-			headStartPat = PAT_NAAHLEFT_START;
+			headStartPat = PAT_SARCASTICLEFT_START;
 			bodyStartPat = BPAT_STANDLEFT;
-			headLoopPat = PAT_NAAHLEFT_LOOP;
+			headLoopPat = PAT_SARCASTICLEFT_LOOP;
 			break;
 
 		case DOWN:
 		case RIGHT:
 			_nBodyOffset.set(6, 56);
-			headStartPat = PAT_NAAHRIGHT_START;
+			headStartPat = PAT_SARCASTICRIGHT_START;
 			bodyStartPat = BPAT_STANDRIGHT;
-			headLoopPat = PAT_NAAHRIGHT_LOOP;
+			headLoopPat = PAT_SARCASTICRIGHT_LOOP;
 			break;
 		}
 		break;
@@ -1180,22 +1180,22 @@ bool RMTony::endTalkCalculate(int &headStandPat, int &headEndPat, int &bodyEndPa
 		bodyEndPat = 0;
 		break;
 
-	case TALK_FIANCHI:
+	case TALK_HIPS:
 		switch (_talkDirection) {
 		case UP:
-			bodyEndPat = BPAT_FIANCHIUP_END;
+			bodyEndPat = BPAT_HIPSUP_END;
 			break;
 
 		case DOWN:
-			bodyEndPat = BPAT_FIANCHIDOWN_END;
+			bodyEndPat = BPAT_HIPSDOWN_END;
 			break;
 
 		case LEFT:
-			bodyEndPat = BPAT_FIANCHILEFT_END;
+			bodyEndPat = BPAT_HIPSLEFT_END;
 			break;
 
 		case RIGHT:
-			bodyEndPat = BPAT_FIANCHIRIGHT_END;
+			bodyEndPat = BPAT_HIPSRIGHT_END;
 			break;
 		}
 		break;
@@ -1204,12 +1204,12 @@ bool RMTony::endTalkCalculate(int &headStandPat, int &headEndPat, int &bodyEndPa
 		bodyEndPat = BPAT_SINGLEFT_END;
 		break;
 
-	case TALK_RIDE:
-	case TALK_RIDE2:
+	case TALK_LAUGH:
+	case TALK_LAUGH2:
 		if (_talkDirection == LEFT)
-			headEndPat = PAT_RIDELEFT_END;
+			headEndPat = PAT_LAUGHLEFT_END;
 		else if (_talkDirection == RIGHT)
-			headEndPat = PAT_RIDERIGHT_END;
+			headEndPat = PAT_LAUGHRIGHT_END;
 
 		bodyEndPat = 0;
 		break;
@@ -1230,16 +1230,16 @@ bool RMTony::endTalkCalculate(int &headStandPat, int &headEndPat, int &bodyEndPa
 		bodyEndPat = 0;
 		break;
 
-	case TALK_NAAH:
+	case TALK_SARCASTIC:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
-			headEndPat = PAT_NAAHLEFT_END;
+			headEndPat = PAT_SARCASTICLEFT_END;
 			break;
 
 		case DOWN:
 		case RIGHT:
-			headEndPat = PAT_NAAHRIGHT_END;
+			headEndPat = PAT_SARCASTICRIGHT_END;
 			break;
 		}
 
diff --git a/engines/tony/tonychar.h b/engines/tony/tonychar.h
index a50641bf25..775c27a4e0 100644
--- a/engines/tony/tonychar.h
+++ b/engines/tony/tonychar.h
@@ -43,9 +43,9 @@ private:
 public:
 	enum CharacterTalkType {
 		TALK_NORMAL,
-		TALK_FIANCHI,
+		TALK_HIPS,
 		TALK_SING,
-		TALK_RIDE,
+		TALK_LAUGH,
 		TALK_INDICATE,
 		TALK_SCARED,
 		TALK_SCARED2,
@@ -64,9 +64,9 @@ public:
 		TALK_WITH_NOTEBOOK,
 		TALK_WITHMEGAPHONESTATIC,
 		TALK_WITHBEARDSTATIC,
-		TALK_RIDE2,
+		TALK_LAUGH2,
 		TALK_DISGUSTED,
-		TALK_NAAH,
+		TALK_SARCASTIC,
 		TALK_MACBETH1,
 		TALK_MACBETH2,
 		TALK_MACBETH3,
@@ -169,12 +169,12 @@ public:
 		PAT_HEAD_RIGHT,
 
 		// Laugh
-		PAT_RIDELEFT_START,
-		PAT_RIDELEFT_LOOP,
-		PAT_RIDELEFT_END,
-		PAT_RIDERIGHT_START,
-		PAT_RIDERIGHT_LOOP,
-		PAT_RIDERIGHT_END,
+		PAT_LAUGHLEFT_START,
+		PAT_LAUGHLEFT_LOOP,
+		PAT_LAUGHLEFT_END,
+		PAT_LAUGHRIGHT_START,
+		PAT_LAUGHRIGHT_LOOP,
+		PAT_LAUGHRIGHT_END,
 
 		// Speaking as a shepherdess
 		PAT_PAST_TALKUP,
@@ -217,12 +217,12 @@ public:
 		PAT_DISGUSTEDRIGHT_START,
 		PAT_DISGUSTEDRIGHT_LOOP,
 		PAT_DISGUSTEDRIGHT_END,
-		PAT_NAAHLEFT_START,
-		PAT_NAAHLEFT_LOOP,
-		PAT_NAAHLEFT_END,
-		PAT_NAAHRIGHT_START,
-		PAT_NAAHRIGHT_LOOP,
-		PAT_NAAHRIGHT_END,
+		PAT_SARCASTICLEFT_START,
+		PAT_SARCASTICLEFT_LOOP,
+		PAT_SARCASTICLEFT_END,
+		PAT_SARCASTICRIGHT_START,
+		PAT_SARCASTICRIGHT_LOOP,
+		PAT_SARCASTICRIGHT_END,
 
 		// Stand scared
 		PAT_SCAREDLEFT_STAND,
@@ -266,21 +266,21 @@ public:
 		BPAT_SINGLEFT_LOOP,
 		BPAT_SINGLEFT_END,
 
-		BPAT_FIANCHILEFT_START,
-		BPAT_FIANCHILEFT_LOOP,
-		BPAT_FIANCHILEFT_END,
-		BPAT_FIANCHIRIGHT_START,
-		BPAT_FIANCHIRIGHT_LOOP,
-		BPAT_FIANCHIRIGHT_END,
-		BPAT_FIANCHIUP_START,
-		BPAT_FIANCHIUP_LOOP,
-		BPAT_FIANCHIUP_END,
-		BPAT_FIANCHIDOWN_START,
-		BPAT_FIANCHIDOWN_LOOP,
-		BPAT_FIANCHIDOWN_END,
-
-		BPAT_RIDELEFT,
-		BPAT_RIDERIGHT,
+		BPAT_HIPSLEFT_START,
+		BPAT_HIPSLEFT_LOOP,
+		BPAT_HIPSLEFT_END,
+		BPAT_HIPSRIGHT_START,
+		BPAT_HIPSRIGHT_LOOP,
+		BPAT_HIPSRIGHT_END,
+		BPAT_HIPSUP_START,
+		BPAT_HIPSUP_LOOP,
+		BPAT_HIPSUP_END,
+		BPAT_HIPSDOWN_START,
+		BPAT_HIPSDOWN_LOOP,
+		BPAT_HIPSDOWN_END,
+
+		BPAT_LAUGHLEFT,
+		BPAT_LAUGHRIGHT,
 
 		BPAT_INDICATELEFT,
 		BPAT_INDICATERIGHT,