TONY: Translate Italian enums

3 files changed, 367 insertions, 367 deletions

diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp
index 964e506099..81fa5c7ad4 100644
--- a/engines/tony/custom.cpp
+++ b/engines/tony/custom.cpp
@@ -786,7 +786,7 @@ DECLARE_CUSTOM_FUNCTION(TonyFischietto)(CORO_PARAM, uint32, uint32, uint32, uint
 
 	CORO_BEGIN_CODE(_ctx);
 
-	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_FISCHIETTORIGHT);
+	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_WHISTLERIGHT);
 	if (!GLOBALS._bSkipIdle)
 		CORO_INVOKE_0(GLOBALS._tony->waitForEndPattern);
 
@@ -826,164 +826,164 @@ DECLARE_CUSTOM_FUNCTION(TonySiIndica)(CORO_PARAM, uint32 dwText, uint32, uint32,
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_SIINDICA;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonySpaventatoConMani)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyScaredWithHands)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_SPAVENTATO;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_SCARED;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonySpaventatoSenzaMani)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyScaredWithoutHands)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_SPAVENTATO2;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_SCARED2;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConMartello)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithHammer)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CONMARTELLO;
-	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_CONMARTELLO);
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHHAMMER;
+	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_WITHHAMMER);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConBicchiere)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithGlasses)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CONBICCHIERE;
-	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_CONBICCHIERE);
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHGLASSES;
+	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_WITHGLASSES);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConVerme)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithWorm)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CONVERME;
-	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_CONVERME);
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHWORM;
+	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_WITHWORM);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConCorda)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithRope)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CONCORDA;
-	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_CONCORDA);
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHROPE;
+	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_WITHROPE);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConSegretaria)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithSecretary)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CONSEGRETARIA;
-	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_CONSEGRETARIA);
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHSECRETARY;
+	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_WITHSECRETARY);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConConiglioANIM)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithRabbitANIM)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CONCONIGLIO;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHRABBIT;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConRicettaANIM)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithRecipeANIM)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CONRICETTA;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHRECIPE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConCarteANIM)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithCardsANIM)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CONCARTE;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHCARDS;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConPupazzoANIM)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithSnowmanANIM)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CONPUPAZZO;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHSNOWMAN;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConPupazzoStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithSnowmanStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CONPUPAZZOSTATIC;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHSNOWMANSTATIC;
 	GLOBALS._bStaticTalk = true;
-	CORO_INVOKE_1(GLOBALS._tony->startStatic, GLOBALS._tony->TALK_CONPUPAZZOSTATIC);
+	CORO_INVOKE_1(GLOBALS._tony->startStatic, GLOBALS._tony->TALK_WITHSNOWMANSTATIC);
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConPupazzoEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithSnowmanEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	CORO_INVOKE_1(GLOBALS._tony->endStatic, GLOBALS._tony->TALK_CONPUPAZZOSTATIC);
+	CORO_INVOKE_1(GLOBALS._tony->endStatic, GLOBALS._tony->TALK_WITHSNOWMANSTATIC);
 	GLOBALS._bStaticTalk = false;
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_NORMAL;
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConConiglioStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithRabbitStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CONCONIGLIOSTATIC;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHRABBITSTATIC;
 	GLOBALS._bStaticTalk = true;
-	CORO_INVOKE_1(GLOBALS._tony->startStatic, GLOBALS._tony->TALK_CONCONIGLIOSTATIC);
+	CORO_INVOKE_1(GLOBALS._tony->startStatic, GLOBALS._tony->TALK_WITHRABBITSTATIC);
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConConiglioEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithRabbitEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	CORO_INVOKE_1(GLOBALS._tony->endStatic, GLOBALS._tony->TALK_CONCONIGLIOSTATIC);
+	CORO_INVOKE_1(GLOBALS._tony->endStatic, GLOBALS._tony->TALK_WITHRABBITSTATIC);
 	GLOBALS._bStaticTalk = false;
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_NORMAL;
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConRicettaStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithRecipeStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CONRICETTASTATIC;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHRECIPESTATIC;
 	GLOBALS._bStaticTalk = true;
-	CORO_INVOKE_1(GLOBALS._tony->startStatic, GLOBALS._tony->TALK_CONRICETTASTATIC);
+	CORO_INVOKE_1(GLOBALS._tony->startStatic, GLOBALS._tony->TALK_WITHRECIPESTATIC);
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConRicettaEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithRecipeEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	CORO_INVOKE_1(GLOBALS._tony->endStatic, GLOBALS._tony->TALK_CONRICETTASTATIC);
+	CORO_INVOKE_1(GLOBALS._tony->endStatic, GLOBALS._tony->TALK_WITHRECIPESTATIC);
 	GLOBALS._bStaticTalk = false;
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_NORMAL;
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConCarteStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithCardsStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CONCARTESTATIC;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHCARDSSTATIC;
 	GLOBALS._bStaticTalk = true;
-	CORO_INVOKE_1(GLOBALS._tony->startStatic, GLOBALS._tony->TALK_CONCARTESTATIC);
+	CORO_INVOKE_1(GLOBALS._tony->startStatic, GLOBALS._tony->TALK_WITHCARDSSTATIC);
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConCarteEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithCardsEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	CORO_INVOKE_1(GLOBALS._tony->endStatic, GLOBALS._tony->TALK_CONCARTESTATIC);
+	CORO_INVOKE_1(GLOBALS._tony->endStatic, GLOBALS._tony->TALK_WITHCARDSSTATIC);
 	GLOBALS._bStaticTalk = false;
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_NORMAL;
 
@@ -1016,78 +1016,78 @@ DECLARE_CUSTOM_FUNCTION(TonyWithNotebookEnd)(CORO_PARAM, uint32, uint32, uint32,
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConMegafonoStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithMegaphoneStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CONMEGAFONOSTATIC;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHMEGAPHONESTATIC;
 	GLOBALS._bStaticTalk = true;
-	CORO_INVOKE_1(GLOBALS._tony->startStatic, GLOBALS._tony->TALK_CONMEGAFONOSTATIC);
+	CORO_INVOKE_1(GLOBALS._tony->startStatic, GLOBALS._tony->TALK_WITHMEGAPHONESTATIC);
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConMegafonoEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithMegaphoneEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	CORO_INVOKE_1(GLOBALS._tony->endStatic, GLOBALS._tony->TALK_CONMEGAFONOSTATIC);
+	CORO_INVOKE_1(GLOBALS._tony->endStatic, GLOBALS._tony->TALK_WITHMEGAPHONESTATIC);
 	GLOBALS._bStaticTalk = false;
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_NORMAL;
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConBarbaStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithBeardStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CONBARBASTATIC;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_WITHBEARDSTATIC;
 	GLOBALS._bStaticTalk = true;
-	CORO_INVOKE_1(GLOBALS._tony->startStatic, GLOBALS._tony->TALK_CONBARBASTATIC);
+	CORO_INVOKE_1(GLOBALS._tony->startStatic, GLOBALS._tony->TALK_WITHBEARDSTATIC);
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyConBarbaEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWithBeardEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	CORO_INVOKE_1(GLOBALS._tony->endStatic, GLOBALS._tony->TALK_CONBARBASTATIC);
+	CORO_INVOKE_1(GLOBALS._tony->endStatic, GLOBALS._tony->TALK_WITHBEARDSTATIC);
 	GLOBALS._bStaticTalk = false;
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_NORMAL;
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonySpaventatoStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyScaredStart)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_SPAVENTATOSTATIC;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_SCAREDSTATIC;
 	GLOBALS._bStaticTalk = true;
-	CORO_INVOKE_1(GLOBALS._tony->startStatic, GLOBALS._tony->TALK_SPAVENTATOSTATIC);
+	CORO_INVOKE_1(GLOBALS._tony->startStatic, GLOBALS._tony->TALK_SCAREDSTATIC);
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonySpaventatoEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyScaredEnd)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	CORO_INVOKE_1(GLOBALS._tony->endStatic, GLOBALS._tony->TALK_SPAVENTATOSTATIC);
+	CORO_INVOKE_1(GLOBALS._tony->endStatic, GLOBALS._tony->TALK_SCAREDSTATIC);
 	GLOBALS._bStaticTalk = false;
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_NORMAL;
 
@@ -2447,39 +2447,39 @@ ASSIGN(40,   TonyRide)
 ASSIGN(41,   TonyFianchi)
 ASSIGN(42,   TonyCanta)
 ASSIGN(43,   TonySiIndica)
-ASSIGN(44,      TonySpaventatoConMani)
-ASSIGN(49,    TonySpaventatoSenzaMani)
-ASSIGN(45,      TonyConBicchiere)
-ASSIGN(46,      TonyConVerme)
-ASSIGN(47,      TonyConMartello)
-ASSIGN(48,      TonyConCorda)
-ASSIGN(90,      TonyConConiglioANIM)
-ASSIGN(91,      TonyConRicettaANIM)
-ASSIGN(92,      TonyConCarteANIM)
-ASSIGN(93,      TonyConPupazzoANIM)
-ASSIGN(94,      TonyConPupazzoStart)
-ASSIGN(95,      TonyConPupazzoEnd)
-ASSIGN(96,      TonyConConiglioStart)
-ASSIGN(97,      TonyConConiglioEnd)
-ASSIGN(98,      TonyConRicettaStart)
-ASSIGN(99,      TonyConRicettaEnd)
-ASSIGN(100,     TonyConCarteStart)
-ASSIGN(101,     TonyConCarteEnd)
+ASSIGN(44,      TonyScaredWithHands)
+ASSIGN(49,    TonyScaredWithoutHands)
+ASSIGN(45,      TonyWithGlasses)
+ASSIGN(46,      TonyWithWorm)
+ASSIGN(47,      TonyWithHammer)
+ASSIGN(48,      TonyWithRope)
+ASSIGN(90,      TonyWithRabbitANIM)
+ASSIGN(91,      TonyWithRecipeANIM)
+ASSIGN(92,      TonyWithCardsANIM)
+ASSIGN(93,      TonyWithSnowmanANIM)
+ASSIGN(94,      TonyWithSnowmanStart)
+ASSIGN(95,      TonyWithSnowmanEnd)
+ASSIGN(96,      TonyWithRabbitStart)
+ASSIGN(97,      TonyWithRabbitEnd)
+ASSIGN(98,      TonyWithRecipeStart)
+ASSIGN(99,      TonyWithRecipeEnd)
+ASSIGN(100,     TonyWithCardsStart)
+ASSIGN(101,     TonyWithCardsEnd)
 ASSIGN(102,   TonyWithNotebookStart)
 ASSIGN(103,   TonyWithNotebookEnd)
-ASSIGN(104,   TonyConMegafonoStart)
-ASSIGN(105,   TonyConMegafonoEnd)
-ASSIGN(106,   TonyConBarbaStart)
-ASSIGN(107,   TonyConBarbaEnd)
+ASSIGN(104,   TonyWithMegaphoneStart)
+ASSIGN(105,   TonyWithMegaphoneEnd)
+ASSIGN(106,   TonyWithBeardStart)
+ASSIGN(107,   TonyWithBeardEnd)
 ASSIGN(108,   TonyRidacchia)
 ASSIGN(109,   TonySchifato)
 ASSIGN(110,   TonyNaah)
 ASSIGN(111,   TonyMacbeth)
 ASSIGN(112,   TonySniffaLeft)
 ASSIGN(113,   TonySniffaRight)
-ASSIGN(114,   TonySpaventatoStart)
-ASSIGN(115,   TonySpaventatoEnd)
-ASSIGN(116,   TonyConSegretaria)
+ASSIGN(114,   TonyScaredStart)
+ASSIGN(115,   TonyScaredEnd)
+ASSIGN(116,   TonyWithSecretary)
 
 ASSIGN(50,   CharSetCode)
 ASSIGN(51,      CharSetColor)
diff --git a/engines/tony/tonychar.cpp b/engines/tony/tonychar.cpp
index e384dfe794..f232f56cb2 100644
--- a/engines/tony/tonychar.cpp
+++ b/engines/tony/tonychar.cpp
@@ -763,43 +763,43 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 		}
 		break;
 
-	case TALK_SPAVENTATO:
+	case TALK_SCARED:
 		switch (_talkDirection) {
 		case UP:
 			_nBodyOffset.set(-4, -11);
 			headStartPat = PAT_TESTA_UP;
-			bodyStartPat = BPAT_SPAVENTOUP_START;
+			bodyStartPat = BPAT_SCAREDUP_START;
 			headLoopPat = PAT_TALK_UP;
-			bodyLoopPat = BPAT_SPAVENTOUP_LOOP;
+			bodyLoopPat = BPAT_SCAREDUP_LOOP;
 			break;
 
 		case DOWN:
 			_nBodyOffset.set(-5, 45);
-			headStartPat = PAT_SPAVENTODOWN_START;
-			bodyStartPat = BPAT_SPAVENTODOWN_START;
-			headLoopPat = PAT_SPAVENTODOWN_LOOP;
-			bodyLoopPat = BPAT_SPAVENTODOWN_LOOP;
+			headStartPat = PAT_SCAREDDOWN_START;
+			bodyStartPat = BPAT_SCAREDDOWN_START;
+			headLoopPat = PAT_SCAREDDOWN_LOOP;
+			bodyLoopPat = BPAT_SCAREDDOWN_LOOP;
 			break;
 
 		case RIGHT:
 			_nBodyOffset.set(-4, 41);
-			headStartPat = PAT_SPAVENTORIGHT_START;
-			bodyStartPat = BPAT_SPAVENTORIGHT_START;
-			headLoopPat = PAT_SPAVENTORIGHT_LOOP;
-			bodyLoopPat = BPAT_SPAVENTORIGHT_LOOP;
+			headStartPat = PAT_SCAREDRIGHT_START;
+			bodyStartPat = BPAT_SCAREDRIGHT_START;
+			headLoopPat = PAT_SCAREDRIGHT_LOOP;
+			bodyLoopPat = BPAT_SCAREDRIGHT_LOOP;
 			break;
 
 		case LEFT:
 			_nBodyOffset.set(-10, 41);
-			headStartPat = PAT_SPAVENTOLEFT_START;
-			bodyStartPat = BPAT_SPAVENTOLEFT_START;
-			headLoopPat = PAT_SPAVENTOLEFT_LOOP;
-			bodyLoopPat = BPAT_SPAVENTOLEFT_LOOP;
+			headStartPat = PAT_SCAREDLEFT_START;
+			bodyStartPat = BPAT_SCAREDLEFT_START;
+			headLoopPat = PAT_SCAREDLEFT_LOOP;
+			bodyLoopPat = BPAT_SCAREDLEFT_LOOP;
 			break;
 		}
 		break;
 
-	case TALK_SPAVENTATO2:
+	case TALK_SCARED2:
 		_bCorpoDavanti = false;
 		switch (_talkDirection) {
 		case UP:
@@ -816,8 +816,8 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 			bodyLoopPat = BPAT_STANDDOWN;
 			_nBodyOffset.set(4, 53);
 
-			headStartPat = PAT_SPAVENTODOWN_START;
-			headLoopPat = PAT_SPAVENTODOWN_LOOP;
+			headStartPat = PAT_SCAREDDOWN_START;
+			headLoopPat = PAT_SCAREDDOWN_LOOP;
 			break;
 
 		case RIGHT:
@@ -825,8 +825,8 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 			bodyLoopPat = BPAT_STANDRIGHT;
 			_nBodyOffset.set(6, 56);
 
-			headStartPat = PAT_SPAVENTORIGHT_START;
-			headLoopPat = PAT_SPAVENTORIGHT_LOOP;
+			headStartPat = PAT_SCAREDRIGHT_START;
+			headLoopPat = PAT_SCAREDRIGHT_LOOP;
 			break;
 
 		case LEFT:
@@ -834,124 +834,124 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 			bodyLoopPat = BPAT_STANDLEFT;
 			_nBodyOffset.set(6, 56);
 
-			headStartPat = PAT_SPAVENTOLEFT_START;
-			headLoopPat = PAT_SPAVENTOLEFT_LOOP;
+			headStartPat = PAT_SCAREDLEFT_START;
+			headLoopPat = PAT_SCAREDLEFT_LOOP;
 			break;
 		}
 		break;
 
-	case TALK_CONBICCHIERE:
+	case TALK_WITHGLASSES:
 		_nBodyOffset.set(4, 53);
 		headLoopPat = PAT_TALK_DOWN;
-		bodyLoopPat = BPAT_BICCHIERE;
+		bodyLoopPat = BPAT_GLASS;
 		break;
-	case TALK_CONVERME:
+	case TALK_WITHWORM:
 		_nBodyOffset.set(9, 56);
 		headLoopPat = PAT_TALK_RIGHT;
-		bodyLoopPat = BPAT_VERME;
+		bodyLoopPat = BPAT_WORM;
 		break;
-	case TALK_CONMARTELLO:
+	case TALK_WITHHAMMER:
 		_nBodyOffset.set(6, 56);
 		headLoopPat = PAT_TALK_LEFT;
-		bodyLoopPat = BPAT_MARTELLO;
+		bodyLoopPat = BPAT_HAMMER;
 		break;
-	case TALK_CONCORDA:
+	case TALK_WITHROPE:
 		_nBodyOffset.set(-3, 38);
 		headLoopPat = PAT_TALK_RIGHT;
-		bodyLoopPat = BPAT_CORDA;
+		bodyLoopPat = BPAT_ROPE;
 		break;
-	case TALK_CONSEGRETARIA:
+	case TALK_WITHSECRETARY:
 		_nBodyOffset.set(-17, 12);
 		headLoopPat = PAT_TALK_RIGHT;
-		bodyLoopPat = BPAT_CONSEGRETARIA;
+		bodyLoopPat = BPAT_WITHSECRETARY;
 		break;
 
-	case TALK_CONCONIGLIO:
+	case TALK_WITHRABBIT:
 		switch (_talkDirection) {
 		case LEFT:
 		case UP:
 			_nBodyOffset.set(-21, -5);
-			bodyStartPat = BPAT_CONCONIGLIOLEFT_START;
+			bodyStartPat = BPAT_WITHRABBITLEFT_START;
 			headLoopPat = PAT_TALK_LEFT;
-			bodyLoopPat = BPAT_CONCONIGLIOLEFT_LOOP;
+			bodyLoopPat = BPAT_WITHRABBITLEFT_LOOP;
 			break;
 
 		case DOWN:
 		case RIGHT:
 			_nBodyOffset.set(-4, -5);
-			bodyStartPat = BPAT_CONCONIGLIORIGHT_START;
+			bodyStartPat = BPAT_WITHRABBITRIGHT_START;
 			headLoopPat = PAT_TALK_RIGHT;
-			bodyLoopPat = BPAT_CONCONIGLIORIGHT_LOOP;
+			bodyLoopPat = BPAT_WITHRABBITRIGHT_LOOP;
 			break;
 		}
 		break;
 
-	case TALK_CONRICETTA:
+	case TALK_WITHRECIPE:
 		switch (_talkDirection) {
 		case LEFT:
 		case UP:
 			_nBodyOffset.set(-61, -7);
-			bodyStartPat = BPAT_CONRICETTALEFT_START;
+			bodyStartPat = BPAT_WITHRECIPELEFT_START;
 			headLoopPat = PAT_TALK_LEFT;
-			bodyLoopPat = BPAT_CONRICETTALEFT_LOOP;
+			bodyLoopPat = BPAT_WITHRECIPELEFT_LOOP;
 			break;
 
 		case DOWN:
 		case RIGHT:
 			_nBodyOffset.set(-5, -7);
-			bodyStartPat = BPAT_CONRICETTARIGHT_START;
+			bodyStartPat = BPAT_WITHRECIPERIGHT_START;
 			headLoopPat = PAT_TALK_RIGHT;
-			bodyLoopPat = BPAT_CONRICETTARIGHT_LOOP;
+			bodyLoopPat = BPAT_WITHRECIPERIGHT_LOOP;
 			break;
 		}
 		break;
 
-	case TALK_CONCARTE:
+	case TALK_WITHCARDS:
 		switch (_talkDirection) {
 		case LEFT:
 		case UP:
 			_nBodyOffset.set(-34, -2);
-			bodyStartPat = BPAT_CONCARTELEFT_START;
+			bodyStartPat = BPAT_WITHCARDSLEFT_START;
 			headLoopPat = PAT_TALK_LEFT;
-			bodyLoopPat = BPAT_CONCARTELEFT_LOOP;
+			bodyLoopPat = BPAT_WITHCARDSLEFT_LOOP;
 			break;
 
 		case DOWN:
 		case RIGHT:
 			_nBodyOffset.set(-4, -2);
-			bodyStartPat = BPAT_CONCARTERIGHT_START;
+			bodyStartPat = BPAT_WITHCARDSRIGHT_START;
 			headLoopPat = PAT_TALK_RIGHT;
-			bodyLoopPat = BPAT_CONCARTERIGHT_LOOP;
+			bodyLoopPat = BPAT_WITHCARDSRIGHT_LOOP;
 			break;
 		}
 		break;
 
-	case TALK_CONPUPAZZO:
+	case TALK_WITHSNOWMAN:
 		switch (_talkDirection) {
 		case LEFT:
 		case UP:
 			_nBodyOffset.set(-35, 2);
-			bodyStartPat = BPAT_CONPUPAZZOLEFT_START;
+			bodyStartPat = BPAT_WITHSNOWMANLEFT_START;
 			headLoopPat = PAT_TALK_LEFT;
-			bodyLoopPat = BPAT_CONPUPAZZOLEFT_LOOP;
+			bodyLoopPat = BPAT_WITHSNOWMANLEFT_LOOP;
 			break;
 
 		case DOWN:
 		case RIGHT:
 			_nBodyOffset.set(-14, 2);
-			bodyStartPat = BPAT_CONPUPAZZORIGHT_START;
+			bodyStartPat = BPAT_WITHSNOWMANRIGHT_START;
 			headLoopPat = PAT_TALK_RIGHT;
-			bodyLoopPat = BPAT_CONPUPAZZORIGHT_LOOP;
+			bodyLoopPat = BPAT_WITHSNOWMANRIGHT_LOOP;
 			break;
 		}
 		break;
 
-	case TALK_CONPUPAZZOSTATIC:
-	case TALK_CONRICETTASTATIC:
-	case TALK_CONCONIGLIOSTATIC:
-	case TALK_CONCARTESTATIC:
+	case TALK_WITHSNOWMANSTATIC:
+	case TALK_WITHRECIPESTATIC:
+	case TALK_WITHRABBITSTATIC:
+	case TALK_WITHCARDSSTATIC:
 	case TALK_WITH_NOTEBOOK:
-	case TALK_CONMEGAFONOSTATIC:
+	case TALK_WITHMEGAPHONESTATIC:
 		switch (_talkDirection) {
 		case LEFT:
 		case UP:
@@ -966,18 +966,18 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 		break;
 
 		// The beard is the only case in which the head is animated separately while the body is the standard
-	case TALK_CONBARBASTATIC:
+	case TALK_WITHBEARDSTATIC:
 		switch (_talkDirection) {
 		case LEFT:
 		case UP:
-			headLoopPat = PAT_TALKBARBA_LEFT;
+			headLoopPat = PAT_TALKBEARD_LEFT;
 			bodyLoopPat = BPAT_STANDLEFT;
 			_nBodyOffset.set(6, 56);
 			break;
 
 		case DOWN:
 		case RIGHT:
-			headLoopPat = PAT_TALKBARBA_RIGHT;
+			headLoopPat = PAT_TALKBEARD_RIGHT;
 			bodyLoopPat = BPAT_STANDRIGHT;
 			_nBodyOffset.set(6, 56);
 			break;
@@ -1070,7 +1070,7 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 		bodyLoopPat = BPAT_MACBETH9;
 		break;
 
-	case TALK_SPAVENTATOSTATIC:
+	case TALK_SCAREDSTATIC:
 		_bCorpoDavanti = false;
 		switch (_talkDirection) {
 		case DOWN:
@@ -1078,8 +1078,8 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 			bodyLoopPat = BPAT_STANDDOWN;
 			_nBodyOffset.set(4, 53);
 
-			headStartPat = PAT_SPAVENTODOWN_STAND;
-			headLoopPat = PAT_SPAVENTODOWN_LOOP;
+			headStartPat = PAT_SCAREDDOWN_STAND;
+			headLoopPat = PAT_SCAREDDOWN_LOOP;
 			break;
 
 		case RIGHT:
@@ -1087,8 +1087,8 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 			bodyLoopPat = BPAT_STANDRIGHT;
 			_nBodyOffset.set(6, 56);
 
-			headStartPat = PAT_SPAVENTORIGHT_STAND;
-			headLoopPat = PAT_SPAVENTORIGHT_LOOP;
+			headStartPat = PAT_SCAREDRIGHT_STAND;
+			headLoopPat = PAT_SCAREDRIGHT_LOOP;
 			break;
 
 		case LEFT:
@@ -1096,8 +1096,8 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 			bodyLoopPat = BPAT_STANDLEFT;
 			_nBodyOffset.set(6, 56);
 
-			headStartPat = PAT_SPAVENTOLEFT_STAND;
-			headLoopPat = PAT_SPAVENTOLEFT_LOOP;
+			headStartPat = PAT_SCAREDLEFT_STAND;
+			headLoopPat = PAT_SCAREDLEFT_LOOP;
 			break;
 
 		default:
@@ -1257,130 +1257,130 @@ bool RMTony::endTalkCalculate(int &headStandPat, int &headEndPat, int &bodyEndPa
 	case TALK_SIINDICA:
 		break;
 
-	case TALK_SPAVENTATO:
+	case TALK_SCARED:
 		switch (_talkDirection) {
 		case UP:
-			bodyEndPat = BPAT_SPAVENTOUP_END;
+			bodyEndPat = BPAT_SCAREDUP_END;
 			break;
 
 		case DOWN:
-			headEndPat = PAT_SPAVENTODOWN_END;
-			bodyEndPat = BPAT_SPAVENTODOWN_END;
+			headEndPat = PAT_SCAREDDOWN_END;
+			bodyEndPat = BPAT_SCAREDDOWN_END;
 			break;
 
 		case RIGHT:
-			headEndPat = PAT_SPAVENTORIGHT_END;
-			bodyEndPat = BPAT_SPAVENTORIGHT_END;
+			headEndPat = PAT_SCAREDRIGHT_END;
+			bodyEndPat = BPAT_SCAREDRIGHT_END;
 			break;
 
 		case LEFT:
-			headEndPat = PAT_SPAVENTOLEFT_END;
-			bodyEndPat = BPAT_SPAVENTOLEFT_END;
+			headEndPat = PAT_SCAREDLEFT_END;
+			bodyEndPat = BPAT_SCAREDLEFT_END;
 			break;
 		}
 		break;
 
-	case TALK_SPAVENTATO2:
+	case TALK_SCARED2:
 		switch (_talkDirection) {
 		case UP:
 			bodyEndPat = 0;
 			break;
 
 		case DOWN:
-			headEndPat = PAT_SPAVENTODOWN_END;
+			headEndPat = PAT_SCAREDDOWN_END;
 			bodyEndPat = 0;
 			break;
 
 		case RIGHT:
-			headEndPat = PAT_SPAVENTORIGHT_END;
+			headEndPat = PAT_SCAREDRIGHT_END;
 			bodyEndPat = 0;
 			break;
 
 		case LEFT:
-			headEndPat = PAT_SPAVENTOLEFT_END;
+			headEndPat = PAT_SCAREDLEFT_END;
 			bodyEndPat = 0;
 			break;
 		}
 		break;
 
-	case TALK_CONCONIGLIO:
+	case TALK_WITHRABBIT:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
 			finalPat = PAT_STANDLEFT;
-			bodyEndPat = BPAT_CONCONIGLIOLEFT_END;
+			bodyEndPat = BPAT_WITHRABBITLEFT_END;
 			break;
 
 		case RIGHT:
 		case DOWN:
 			finalPat = PAT_STANDRIGHT;
-			bodyEndPat = BPAT_CONCONIGLIORIGHT_END;
+			bodyEndPat = BPAT_WITHRABBITRIGHT_END;
 			break;
 		}
 		break;
 
-	case TALK_CONRICETTA:
+	case TALK_WITHRECIPE:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
 			finalPat = PAT_STANDLEFT;
-			bodyEndPat = BPAT_CONRICETTALEFT_END;
+			bodyEndPat = BPAT_WITHRECIPELEFT_END;
 			break;
 
 		case RIGHT:
 		case DOWN:
 			finalPat = PAT_STANDRIGHT;
-			bodyEndPat = BPAT_CONRICETTARIGHT_END;
+			bodyEndPat = BPAT_WITHRECIPERIGHT_END;
 			break;
 		}
 		break;
 
-	case TALK_CONCARTE:
+	case TALK_WITHCARDS:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
 			finalPat = PAT_STANDLEFT;
-			bodyEndPat = BPAT_CONCARTELEFT_END;
+			bodyEndPat = BPAT_WITHCARDSLEFT_END;
 			break;
 
 		case RIGHT:
 		case DOWN:
 			finalPat = PAT_STANDRIGHT;
-			bodyEndPat = BPAT_CONCARTERIGHT_END;
+			bodyEndPat = BPAT_WITHCARDSRIGHT_END;
 			break;
 		}
 		break;
 
-	case TALK_CONPUPAZZO:
+	case TALK_WITHSNOWMAN:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
 			finalPat = PAT_STANDLEFT;
-			bodyEndPat = BPAT_CONPUPAZZOLEFT_END;
+			bodyEndPat = BPAT_WITHSNOWMANLEFT_END;
 			break;
 
 		case RIGHT:
 		case DOWN:
 			finalPat = PAT_STANDRIGHT;
-			bodyEndPat = BPAT_CONPUPAZZORIGHT_END;
+			bodyEndPat = BPAT_WITHSNOWMANRIGHT_END;
 			break;
 		}
 		break;
 
-	case TALK_CONVERME:
-		finalPat = PAT_CONVERME;
+	case TALK_WITHWORM:
+		finalPat = PAT_WITHWORM;
 		break;
-	case TALK_CONCORDA:
-		finalPat = PAT_CONCORDA;
+	case TALK_WITHROPE:
+		finalPat = PAT_WITHROPE;
 		break;
-	case TALK_CONSEGRETARIA:
-		finalPat = PAT_CONSEGRETARIA;
+	case TALK_WITHSECRETARY:
+		finalPat = PAT_WITHSECRETARY;
 		break;
-	case TALK_CONMARTELLO:
-		finalPat = PAT_CONMARTELLO;
+	case TALK_WITHHAMMER:
+		finalPat = PAT_WITHHAMMER;
 		break;
-	case TALK_CONBICCHIERE:
-		finalPat = PAT_CONBICCHIERE;
+	case TALK_WITHGLASSES:
+		finalPat = PAT_WITHGLASSES;
 		break;
 
 	case TALK_MACBETH1:
@@ -1394,20 +1394,20 @@ bool RMTony::endTalkCalculate(int &headStandPat, int &headEndPat, int &bodyEndPa
 		finalPat = 0;
 		break;
 
-	case TALK_SPAVENTATOSTATIC:
+	case TALK_SCAREDSTATIC:
 		switch (_talkDirection) {
 		case DOWN:
-			headStandPat = PAT_SPAVENTODOWN_STAND;
+			headStandPat = PAT_SCAREDDOWN_STAND;
 			bodyEndPat = 0;
 			break;
 
 		case RIGHT:
-			headStandPat = PAT_SPAVENTORIGHT_STAND;
+			headStandPat = PAT_SCAREDRIGHT_STAND;
 			bodyEndPat = 0;
 			break;
 
 		case LEFT:
-			headStandPat = PAT_SPAVENTOLEFT_STAND;
+			headStandPat = PAT_SCAREDLEFT_STAND;
 			bodyEndPat = 0;
 			break;
 
@@ -1445,14 +1445,14 @@ void RMTony::endTalk(CORO_PARAM) {
 
 	// Handles the end of an animated and static, leaving everything unchanged
 	if (_bIsStaticTalk) {
-		if (_nTalkType == TALK_CONBARBASTATIC) {
+		if (_nTalkType == TALK_WITHBEARDSTATIC) {
 			mainFreeze();
 			setPattern(0);
 			if (_talkDirection == UP || _talkDirection == LEFT) {
-				_body.setPattern(BPAT_CONBARBALEFT_STATIC);
+				_body.setPattern(BPAT_WITHBEARDLEFT_STATIC);
 				_nBodyOffset.set(-41, -14);
 			} else if (_talkDirection == DOWN || _talkDirection == RIGHT) {
-				_body.setPattern(BPAT_CONBARBARIGHT_STATIC);
+				_body.setPattern(BPAT_WITHBEARDRIGHT_STATIC);
 				_nBodyOffset.set(-26, -14);
 			}
 			mainUnfreeze();
@@ -1560,74 +1560,74 @@ void RMTony::startStaticCalculate(TALKTYPE nTalk, int &headPat, int &headLoopPat
 	_bCorpoDavanti = true;
 
 	switch (nTalk) {
-	case TALK_CONCONIGLIOSTATIC:
+	case TALK_WITHRABBITSTATIC:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
 			_nBodyOffset.set(-21, -5);
-			bodyStartPat = BPAT_CONCONIGLIOLEFT_START;
-			bodyLoopPat = BPAT_CONCONIGLIOLEFT_LOOP;
+			bodyStartPat = BPAT_WITHRABBITLEFT_START;
+			bodyLoopPat = BPAT_WITHRABBITLEFT_LOOP;
 			break;
 
 		case DOWN:
 		case RIGHT:
 			_nBodyOffset.set(-4, -5);
-			bodyStartPat = BPAT_CONCONIGLIORIGHT_START;
-			bodyLoopPat = BPAT_CONCONIGLIORIGHT_LOOP;
+			bodyStartPat = BPAT_WITHRABBITRIGHT_START;
+			bodyLoopPat = BPAT_WITHRABBITRIGHT_LOOP;
 			break;
 		}
 		break;
 
-	case TALK_CONCARTESTATIC:
+	case TALK_WITHCARDSSTATIC:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
 			_nBodyOffset.set(-34, -2);
-			bodyStartPat = BPAT_CONCARTELEFT_START;
-			bodyLoopPat = BPAT_CONCARTELEFT_LOOP;
+			bodyStartPat = BPAT_WITHCARDSLEFT_START;
+			bodyLoopPat = BPAT_WITHCARDSLEFT_LOOP;
 			break;
 
 		case DOWN:
 		case RIGHT:
 			_nBodyOffset.set(-4, -2);
-			bodyStartPat = BPAT_CONCARTERIGHT_START;
-			bodyLoopPat = BPAT_CONCARTERIGHT_LOOP;
+			bodyStartPat = BPAT_WITHCARDSRIGHT_START;
+			bodyLoopPat = BPAT_WITHCARDSRIGHT_LOOP;
 			break;
 		}
 		break;
 
-	case TALK_CONRICETTASTATIC:
+	case TALK_WITHRECIPESTATIC:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
 			_nBodyOffset.set(-61, -7);
-			bodyStartPat = BPAT_CONRICETTALEFT_START;
-			bodyLoopPat = BPAT_CONRICETTALEFT_LOOP;
+			bodyStartPat = BPAT_WITHRECIPELEFT_START;
+			bodyLoopPat = BPAT_WITHRECIPELEFT_LOOP;
 			break;
 
 		case DOWN:
 		case RIGHT:
 			_nBodyOffset.set(-5, -7);
-			bodyStartPat = BPAT_CONRICETTARIGHT_START;
-			bodyLoopPat = BPAT_CONRICETTARIGHT_LOOP;
+			bodyStartPat = BPAT_WITHRECIPERIGHT_START;
+			bodyLoopPat = BPAT_WITHRECIPERIGHT_LOOP;
 			break;
 		}
 		break;
 
-	case TALK_CONPUPAZZOSTATIC:
+	case TALK_WITHSNOWMANSTATIC:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
 			_nBodyOffset.set(-35, 2);
-			bodyStartPat = BPAT_CONPUPAZZOLEFT_START;
-			bodyLoopPat = BPAT_CONPUPAZZOLEFT_LOOP;
+			bodyStartPat = BPAT_WITHSNOWMANLEFT_START;
+			bodyLoopPat = BPAT_WITHSNOWMANLEFT_LOOP;
 			break;
 
 		case DOWN:
 		case RIGHT:
 			_nBodyOffset.set(-14, 2);
-			bodyStartPat = BPAT_CONPUPAZZORIGHT_START;
-			bodyLoopPat = BPAT_CONPUPAZZORIGHT_LOOP;
+			bodyStartPat = BPAT_WITHSNOWMANRIGHT_START;
+			bodyLoopPat = BPAT_WITHSNOWMANRIGHT_LOOP;
 			break;
 		}
 		break;
@@ -1637,82 +1637,82 @@ void RMTony::startStaticCalculate(TALKTYPE nTalk, int &headPat, int &headLoopPat
 		case UP:
 		case LEFT:
 			_nBodyOffset.set(-16, -9);
-			bodyStartPat = BPAT_CONTACCUINOLEFT_START;
-			bodyLoopPat = BPAT_CONTACCUINOLEFT_LOOP;
+			bodyStartPat = BPAT_WITHNOTEBOOKLEFT_START;
+			bodyLoopPat = BPAT_WITHNOTEBOOKLEFT_LOOP;
 			break;
 
 		case DOWN:
 		case RIGHT:
 			_nBodyOffset.set(-6, -9);
-			bodyStartPat = BPAT_CONTACCUINORIGHT_START;
-			bodyLoopPat = BPAT_CONTACCUINORIGHT_LOOP;
+			bodyStartPat = BPAT_WITHNOTEBOOKRIGHT_START;
+			bodyLoopPat = BPAT_WITHNOTEBOOKRIGHT_LOOP;
 			break;
 		}
 		break;
 
-	case TALK_CONMEGAFONOSTATIC:
+	case TALK_WITHMEGAPHONESTATIC:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
 			_nBodyOffset.set(-41, -8);
-			bodyStartPat = BPAT_CONMEGAFONOLEFT_START;
-			bodyLoopPat = BPAT_CONMEGAFONOLEFT_LOOP;
+			bodyStartPat = BPAT_WITHMEGAPHONELEFT_START;
+			bodyLoopPat = BPAT_WITHMEGAPHONELEFT_LOOP;
 			break;
 
 		case DOWN:
 		case RIGHT:
 			_nBodyOffset.set(-14, -8);
-			bodyStartPat = BPAT_CONMEGAFONORIGHT_START;
-			bodyLoopPat = BPAT_CONMEGAFONORIGHT_LOOP;
+			bodyStartPat = BPAT_WITHMEGAPHONERIGHT_START;
+			bodyLoopPat = BPAT_WITHMEGAPHONERIGHT_LOOP;
 			break;
 		}
 		break;
 
-	case TALK_CONBARBASTATIC:
+	case TALK_WITHBEARDSTATIC:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
 			_nBodyOffset.set(-41, -14);
-			bodyStartPat = BPAT_CONBARBALEFT_START;
+			bodyStartPat = BPAT_WITHBEARDLEFT_START;
 			bodyLoopPat = BPAT_STANDLEFT;
-			headLoopPat = PAT_TALKBARBA_LEFT;
+			headLoopPat = PAT_TALKBEARD_LEFT;
 			headPat = 0;
 			break;
 
 		case DOWN:
 		case RIGHT:
 			_nBodyOffset.set(-26, -14);
-			bodyStartPat = BPAT_CONBARBARIGHT_START;
+			bodyStartPat = BPAT_WITHBEARDRIGHT_START;
 			bodyLoopPat = BPAT_STANDRIGHT;
-			headLoopPat = PAT_TALKBARBA_RIGHT;
+			headLoopPat = PAT_TALKBEARD_RIGHT;
 			headPat = 0;
 			break;
 		}
 		break;
 
-	case TALK_SPAVENTATOSTATIC:
+	case TALK_SCAREDSTATIC:
 		switch (_talkDirection) {
 		case DOWN:
-			headPat = PAT_SPAVENTODOWN_START;
+			headPat = PAT_SCAREDDOWN_START;
 			bodyLoopPat = BPAT_STANDDOWN;
 			bodyStartPat = BPAT_STANDDOWN;
-			headLoopPat = PAT_SPAVENTODOWN_STAND;
+			headLoopPat = PAT_SCAREDDOWN_STAND;
 			_nBodyOffset.set(4, 53);
 			break;
 
 		case LEFT:
-			headPat = PAT_SPAVENTOLEFT_START;
+			headPat = PAT_SCAREDLEFT_START;
 			bodyLoopPat = BPAT_STANDLEFT;
 			bodyStartPat = BPAT_STANDLEFT;
-			headLoopPat = PAT_SPAVENTOLEFT_STAND;
+			headLoopPat = PAT_SCAREDLEFT_STAND;
 			_nBodyOffset.set(6, 56);
 			break;
 
 		case RIGHT:
-			headPat = PAT_SPAVENTORIGHT_START;
+			headPat = PAT_SCAREDRIGHT_START;
 			bodyLoopPat = BPAT_STANDRIGHT;
 			bodyStartPat = BPAT_STANDRIGHT;
-			headLoopPat = PAT_SPAVENTORIGHT_STAND;
+			headLoopPat = PAT_SCAREDRIGHT_STAND;
 			_nBodyOffset.set(6, 56);
 			break;
 
@@ -1774,58 +1774,58 @@ void RMTony::endStaticCalculate(TALKTYPE nTalk, int &bodyEndPat, int &finalPat,
 	}
 
 	switch (nTalk) {
-	case TALK_CONPUPAZZOSTATIC:
+	case TALK_WITHSNOWMANSTATIC:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
-			bodyEndPat = BPAT_CONPUPAZZOLEFT_END;
+			bodyEndPat = BPAT_WITHSNOWMANLEFT_END;
 			break;
 
 		case DOWN:
 		case RIGHT:
-			bodyEndPat = BPAT_CONPUPAZZORIGHT_END;
+			bodyEndPat = BPAT_WITHSNOWMANRIGHT_END;
 			break;
 		}
 		break;
 
-	case TALK_CONRICETTASTATIC:
+	case TALK_WITHRECIPESTATIC:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
-			bodyEndPat = BPAT_CONRICETTALEFT_END;
+			bodyEndPat = BPAT_WITHRECIPELEFT_END;
 			break;
 
 		case DOWN:
 		case RIGHT:
-			bodyEndPat = BPAT_CONRICETTARIGHT_END;
+			bodyEndPat = BPAT_WITHRECIPERIGHT_END;
 			break;
 		}
 		break;
 
-	case TALK_CONCONIGLIOSTATIC:
+	case TALK_WITHRABBITSTATIC:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
-			bodyEndPat = BPAT_CONCONIGLIOLEFT_END;
+			bodyEndPat = BPAT_WITHRABBITLEFT_END;
 			break;
 
 		case DOWN:
 		case RIGHT:
-			bodyEndPat = BPAT_CONCONIGLIORIGHT_END;
+			bodyEndPat = BPAT_WITHRABBITRIGHT_END;
 			break;
 		}
 		break;
 
-	case TALK_CONCARTESTATIC:
+	case TALK_WITHCARDSSTATIC:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
-			bodyEndPat = BPAT_CONCARTELEFT_END;
+			bodyEndPat = BPAT_WITHCARDSLEFT_END;
 			break;
 
 		case DOWN:
 		case RIGHT:
-			bodyEndPat = BPAT_CONCARTERIGHT_END;
+			bodyEndPat = BPAT_WITHCARDSRIGHT_END;
 			break;
 		}
 		break;
@@ -1834,56 +1834,56 @@ void RMTony::endStaticCalculate(TALKTYPE nTalk, int &bodyEndPat, int &finalPat,
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
-			bodyEndPat = BPAT_CONTACCUINOLEFT_END;
+			bodyEndPat = BPAT_WITHNOTEBOOKLEFT_END;
 			break;
 
 		case DOWN:
 		case RIGHT:
-			bodyEndPat = BPAT_CONTACCUINORIGHT_END;
+			bodyEndPat = BPAT_WITHNOTEBOOKRIGHT_END;
 			break;
 		}
 		break;
 
-	case TALK_CONMEGAFONOSTATIC:
+	case TALK_WITHMEGAPHONESTATIC:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
-			bodyEndPat = BPAT_CONMEGAFONOLEFT_END;
+			bodyEndPat = BPAT_WITHMEGAPHONELEFT_END;
 			break;
 
 		case DOWN:
 		case RIGHT:
-			bodyEndPat = BPAT_CONMEGAFONORIGHT_END;
+			bodyEndPat = BPAT_WITHMEGAPHONERIGHT_END;
 			break;
 		}
 		break;
 
-	case TALK_CONBARBASTATIC:
+	case TALK_WITHBEARDSTATIC:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
-			bodyEndPat = BPAT_CONBARBALEFT_END;
+			bodyEndPat = BPAT_WITHBEARDLEFT_END;
 			break;
 
 		case DOWN:
 		case RIGHT:
-			bodyEndPat = BPAT_CONBARBARIGHT_END;
+			bodyEndPat = BPAT_WITHBEARDRIGHT_END;
 			break;
 		}
 		break;
 
-	case TALK_SPAVENTATOSTATIC:
+	case TALK_SCAREDSTATIC:
 		switch (_talkDirection) {
 		case LEFT:
-			headEndPat = PAT_SPAVENTOLEFT_END;
+			headEndPat = PAT_SCAREDLEFT_END;
 			break;
 
 		case DOWN:
-			headEndPat = PAT_SPAVENTODOWN_END;
+			headEndPat = PAT_SCAREDDOWN_END;
 			break;
 
 		case RIGHT:
-			headEndPat = PAT_SPAVENTORIGHT_END;
+			headEndPat = PAT_SCAREDRIGHT_END;
 			break;
 
 		default:
diff --git a/engines/tony/tonychar.h b/engines/tony/tonychar.h
index 6ba66729a9..8c5c0f530d 100644
--- a/engines/tony/tonychar.h
+++ b/engines/tony/tonychar.h
@@ -47,23 +47,23 @@ public:
 		TALK_CANTA,
 		TALK_RIDE,
 		TALK_SIINDICA,
-		TALK_SPAVENTATO,
-		TALK_SPAVENTATO2,
-		TALK_CONBICCHIERE,
-		TALK_CONMARTELLO,
-		TALK_CONVERME,
-		TALK_CONCORDA,
-		TALK_CONCONIGLIO,
-		TALK_CONRICETTA,
-		TALK_CONCARTE,
-		TALK_CONPUPAZZO,
-		TALK_CONPUPAZZOSTATIC,
-		TALK_CONCONIGLIOSTATIC,
-		TALK_CONRICETTASTATIC,
-		TALK_CONCARTESTATIC,
+		TALK_SCARED,
+		TALK_SCARED2,
+		TALK_WITHGLASSES,
+		TALK_WITHHAMMER,
+		TALK_WITHWORM,
+		TALK_WITHROPE,
+		TALK_WITHRABBIT,
+		TALK_WITHRECIPE,
+		TALK_WITHCARDS,
+		TALK_WITHSNOWMAN,
+		TALK_WITHSNOWMANSTATIC,
+		TALK_WITHRABBITSTATIC,
+		TALK_WITHRECIPESTATIC,
+		TALK_WITHCARDSSTATIC,
 		TALK_WITH_NOTEBOOK,
-		TALK_CONMEGAFONOSTATIC,
-		TALK_CONBARBASTATIC,
+		TALK_WITHMEGAPHONESTATIC,
+		TALK_WITHBEARDSTATIC,
 		TALK_RIDE2,
 		TALK_SCHIFATO,
 		TALK_NAAH,
@@ -76,8 +76,8 @@ public:
 		TALK_MACBETH7,
 		TALK_MACBETH8,
 		TALK_MACBETH9,
-		TALK_SPAVENTATOSTATIC,
-		TALK_CONSEGRETARIA
+		TALK_SCAREDSTATIC,
+		TALK_WITHSECRETARY
 	};
 
 private:
@@ -178,28 +178,28 @@ public:
 		PAT_PAST_TALKRIGHT,
 
 		// Fear
-		PAT_SPAVENTOLEFT_START,
-		PAT_SPAVENTOLEFT_LOOP,
-		PAT_SPAVENTOLEFT_END,
-		PAT_SPAVENTORIGHT_START,
-		PAT_SPAVENTORIGHT_LOOP,
-		PAT_SPAVENTORIGHT_END,
-		PAT_SPAVENTODOWN_START,
-		PAT_SPAVENTODOWN_LOOP,
-		PAT_SPAVENTODOWN_END,
+		PAT_SCAREDLEFT_START,
+		PAT_SCAREDLEFT_LOOP,
+		PAT_SCAREDLEFT_END,
+		PAT_SCAREDRIGHT_START,
+		PAT_SCAREDRIGHT_LOOP,
+		PAT_SCAREDRIGHT_END,
+		PAT_SCAREDDOWN_START,
+		PAT_SCAREDDOWN_LOOP,
+		PAT_SCAREDDOWN_END,
 
 		// With objects: full body
-		PAT_CONBICCHIERE,
-		PAT_CONCORDA,
-		PAT_CONVERME,
-		PAT_CONMARTELLO,
+		PAT_WITHGLASSES,
+		PAT_WITHROPE,
+		PAT_WITHWORM,
+		PAT_WITHHAMMER,
 
 		// Sound the whistle
-		PAT_FISCHIETTORIGHT,
+		PAT_WHISTLERIGHT,
 
 		// Head with beard
-		PAT_TALKBARBA_LEFT,
-		PAT_TALKBARBA_RIGHT,
+		PAT_TALKBEARD_LEFT,
+		PAT_TALKBEARD_RIGHT,
 
 		// Sniff
 		PAT_SNIFFA_LEFT,
@@ -220,9 +220,9 @@ public:
 		PAT_NAAHRIGHT_END,
 
 		// Stand scared
-		PAT_SPAVENTOLEFT_STAND,
-		PAT_SPAVENTORIGHT_STAND,
-		PAT_SPAVENTODOWN_STAND,
+		PAT_SCAREDLEFT_STAND,
+		PAT_SCAREDRIGHT_STAND,
+		PAT_SCAREDDOWN_STAND,
 
 		PAT_PUTLEFT_UP1,
 		PAT_PUTLEFT_UP2,
@@ -243,7 +243,7 @@ public:
 		PAT_PUTUP_DOWN1,
 		PAT_PUTUP_DOWN2,
 
-		PAT_CONSEGRETARIA
+		PAT_WITHSECRETARY
 	};
 
 	enum BODYPATTERNS {
@@ -252,10 +252,10 @@ public:
 		BPAT_STANDLEFT,
 		BPAT_STANDRIGHT,
 
-		BPAT_MARTELLO,
-		BPAT_PUPAZZO,
-		BPAT_VERME,
-		BPAT_BICCHIERE,
+		BPAT_HAMMER,
+		BPAT_SNOWMAN,
+		BPAT_WORM,
+		BPAT_GLASS,
 
 		BPAT_CANTALEFT_START,
 		BPAT_CANTALEFT_LOOP,
@@ -280,69 +280,69 @@ public:
 		BPAT_SIINDICALEFT,
 		BPAT_SIINDICARIGHT,
 
-		BPAT_SPAVENTODOWN_START,
-		BPAT_SPAVENTODOWN_LOOP,
-		BPAT_SPAVENTODOWN_END,
-		BPAT_SPAVENTOLEFT_START,
-		BPAT_SPAVENTOLEFT_LOOP,
-		BPAT_SPAVENTOLEFT_END,
-		BPAT_SPAVENTORIGHT_START,
-		BPAT_SPAVENTORIGHT_LOOP,
-		BPAT_SPAVENTORIGHT_END,
-		BPAT_SPAVENTOUP_START,
-		BPAT_SPAVENTOUP_LOOP,
-		BPAT_SPAVENTOUP_END,
-
-		BPAT_CORDA,
-
-		BPAT_CONCONIGLIOLEFT_START,
-		BPAT_CONCONIGLIOLEFT_LOOP,
-		BPAT_CONCONIGLIOLEFT_END,
-		BPAT_CONCONIGLIORIGHT_START,
-		BPAT_CONCONIGLIORIGHT_LOOP,
-		BPAT_CONCONIGLIORIGHT_END,
-
-		BPAT_CONRICETTALEFT_START,
-		BPAT_CONRICETTALEFT_LOOP,
-		BPAT_CONRICETTALEFT_END,
-		BPAT_CONRICETTARIGHT_START,
-		BPAT_CONRICETTARIGHT_LOOP,
-		BPAT_CONRICETTARIGHT_END,
-
-		BPAT_CONCARTELEFT_START,
-		BPAT_CONCARTELEFT_LOOP,
-		BPAT_CONCARTELEFT_END,
-		BPAT_CONCARTERIGHT_START,
-		BPAT_CONCARTERIGHT_LOOP,
-		BPAT_CONCARTERIGHT_END,
-
-		BPAT_CONPUPAZZOLEFT_START,
-		BPAT_CONPUPAZZOLEFT_LOOP,
-		BPAT_CONPUPAZZOLEFT_END,
-		BPAT_CONPUPAZZORIGHT_START,
-		BPAT_CONPUPAZZORIGHT_LOOP,
-		BPAT_CONPUPAZZORIGHT_END,
-
-		BPAT_CONTACCUINOLEFT_START,
-		BPAT_CONTACCUINOLEFT_LOOP,
-		BPAT_CONTACCUINOLEFT_END,
-		BPAT_CONTACCUINORIGHT_START,
-		BPAT_CONTACCUINORIGHT_LOOP,
-		BPAT_CONTACCUINORIGHT_END,
-
-		BPAT_CONMEGAFONOLEFT_START,
-		BPAT_CONMEGAFONOLEFT_LOOP,
-		BPAT_CONMEGAFONOLEFT_END,
-		BPAT_CONMEGAFONORIGHT_START,
-		BPAT_CONMEGAFONORIGHT_LOOP,
-		BPAT_CONMEGAFONORIGHT_END,
-
-		BPAT_CONBARBALEFT_START,
-		BPAT_CONBARBALEFT_END,
-		BPAT_CONBARBARIGHT_START,
-		BPAT_CONBARBARIGHT_END,
-		BPAT_CONBARBALEFT_STATIC,
-		BPAT_CONBARBARIGHT_STATIC,
+		BPAT_SCAREDDOWN_START,
+		BPAT_SCAREDDOWN_LOOP,
+		BPAT_SCAREDDOWN_END,
+		BPAT_SCAREDLEFT_START,
+		BPAT_SCAREDLEFT_LOOP,
+		BPAT_SCAREDLEFT_END,
+		BPAT_SCAREDRIGHT_START,
+		BPAT_SCAREDRIGHT_LOOP,
+		BPAT_SCAREDRIGHT_END,
+		BPAT_SCAREDUP_START,
+		BPAT_SCAREDUP_LOOP,
+		BPAT_SCAREDUP_END,
+
+		BPAT_ROPE,
+
+		BPAT_WITHRABBITLEFT_START,
+		BPAT_WITHRABBITLEFT_LOOP,
+		BPAT_WITHRABBITLEFT_END,
+		BPAT_WITHRABBITRIGHT_START,
+		BPAT_WITHRABBITRIGHT_LOOP,
+		BPAT_WITHRABBITRIGHT_END,
+
+		BPAT_WITHRECIPELEFT_START,
+		BPAT_WITHRECIPELEFT_LOOP,
+		BPAT_WITHRECIPELEFT_END,
+		BPAT_WITHRECIPERIGHT_START,
+		BPAT_WITHRECIPERIGHT_LOOP,
+		BPAT_WITHRECIPERIGHT_END,
+
+		BPAT_WITHCARDSLEFT_START,
+		BPAT_WITHCARDSLEFT_LOOP,
+		BPAT_WITHCARDSLEFT_END,
+		BPAT_WITHCARDSRIGHT_START,
+		BPAT_WITHCARDSRIGHT_LOOP,
+		BPAT_WITHCARDSRIGHT_END,
+
+		BPAT_WITHSNOWMANLEFT_START,
+		BPAT_WITHSNOWMANLEFT_LOOP,
+		BPAT_WITHSNOWMANLEFT_END,
+		BPAT_WITHSNOWMANRIGHT_START,
+		BPAT_WITHSNOWMANRIGHT_LOOP,
+		BPAT_WITHSNOWMANRIGHT_END,
+
+		BPAT_WITHNOTEBOOKLEFT_START,
+		BPAT_WITHNOTEBOOKLEFT_LOOP,
+		BPAT_WITHNOTEBOOKLEFT_END,
+		BPAT_WITHNOTEBOOKRIGHT_START,
+		BPAT_WITHNOTEBOOKRIGHT_LOOP,
+		BPAT_WITHNOTEBOOKRIGHT_END,
+
+		BPAT_WITHMEGAPHONELEFT_START,
+		BPAT_WITHMEGAPHONELEFT_LOOP,
+		BPAT_WITHMEGAPHONELEFT_END,
+		BPAT_WITHMEGAPHONERIGHT_START,
+		BPAT_WITHMEGAPHONERIGHT_LOOP,
+		BPAT_WITHMEGAPHONERIGHT_END,
+
+		BPAT_WITHBEARDLEFT_START,
+		BPAT_WITHBEARDLEFT_END,
+		BPAT_WITHBEARDRIGHT_START,
+		BPAT_WITHBEARDRIGHT_END,
+		BPAT_WITHBEARDLEFT_STATIC,
+		BPAT_WITHBEARDRIGHT_STATIC,
 
 		BPAT_MACBETH1,
 		BPAT_MACBETH2,
@@ -354,7 +354,7 @@ public:
 		BPAT_MACBETH8,
 		BPAT_MACBETH9,
 
-		BPAT_CONSEGRETARIA
+		BPAT_WITHSECRETARY
 	};
 
 public: