TONY: Translate some more Italian

4 files changed, 165 insertions, 164 deletions

diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp
index 81fa5c7ad4..eea134e442 100644
--- a/engines/tony/custom.cpp
+++ b/engines/tony/custom.cpp
@@ -752,23 +752,23 @@ DECLARE_CUSTOM_FUNCTION(TonyPutDown2)(CORO_PARAM, uint32, uint32, uint32, uint32
 }
 
 
-DECLARE_CUSTOM_FUNCTION(TonyPerTerra)(CORO_PARAM, uint32 dwParte, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyOnTheFloor)(CORO_PARAM, uint32 dwParte, uint32, uint32, uint32) {
 	if (dwParte == 0)
-		GLOBALS._tony->setPattern(GLOBALS._tony->PAT_PERTERRALEFT);
+		GLOBALS._tony->setPattern(GLOBALS._tony->PAT_ONTHEFLOORLEFT);
 	else
-		GLOBALS._tony->setPattern(GLOBALS._tony->PAT_PERTERRARIGHT);
+		GLOBALS._tony->setPattern(GLOBALS._tony->PAT_ONTHEFLOORRIGHT);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonySiRialza)(CORO_PARAM, uint32 dwParte, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyGetUp)(CORO_PARAM, uint32 dwParte, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
 	if (dwParte == 0)
-		GLOBALS._tony->setPattern(GLOBALS._tony->PAT_SIRIALZALEFT);
+		GLOBALS._tony->setPattern(GLOBALS._tony->PAT_GETUPLEFT);
 	else
-		GLOBALS._tony->setPattern(GLOBALS._tony->PAT_SIRIALZARIGHT);
+		GLOBALS._tony->setPattern(GLOBALS._tony->PAT_GETUPRIGHT);
 
 	if (!GLOBALS._bSkipIdle)
 		CORO_INVOKE_0(GLOBALS._tony->waitForEndPattern);
@@ -776,11 +776,11 @@ DECLARE_CUSTOM_FUNCTION(TonySiRialza)(CORO_PARAM, uint32 dwParte, uint32, uint32
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyPastorella)(CORO_PARAM, uint32 bIsPast, uint32, uint32, uint32) {
-	GLOBALS._tony->setPastorella(bIsPast);
+DECLARE_CUSTOM_FUNCTION(TonyShepherdess)(CORO_PARAM, uint32 bIsPast, uint32, uint32, uint32) {
+	GLOBALS._tony->setShepherdess(bIsPast);
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyFischietto)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyWhistle)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -806,7 +806,7 @@ DECLARE_CUSTOM_FUNCTION(TonyRide)(CORO_PARAM, uint32 dwText, uint32, uint32, uin
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_RIDE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyRidacchia)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyGiggle)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_RIDE2;
 }
@@ -816,14 +816,14 @@ DECLARE_CUSTOM_FUNCTION(TonyFianchi)(CORO_PARAM, uint32 dwText, uint32, uint32,
 	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_FIANCHI;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonyCanta)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonySing)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_CANTA;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_SING;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonySiIndica)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyIndicate)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_SIINDICA;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_INDICATE;
 }
 
 DECLARE_CUSTOM_FUNCTION(TonyScaredWithHands)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
@@ -1095,31 +1095,31 @@ DECLARE_CUSTOM_FUNCTION(TonyScaredEnd)(CORO_PARAM, uint32, uint32, uint32, uint3
 }
 
 
-DECLARE_CUSTOM_FUNCTION(TonySchifato)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonyDisgusted)(CORO_PARAM, uint32 dwText, uint32, uint32, uint32) {
 	TonySetNumTexts(dwText);
-	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_SCHIFATO;
+	GLOBALS._nTonyNextTalkType = GLOBALS._tony->TALK_DISGUSTED;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonySniffaLeft)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonySniffLeft)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_SNIFFA_LEFT);
+	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_SNIFF_LEFT);
 	CORO_INVOKE_0(GLOBALS._tony->waitForEndPattern);
 	CORO_INVOKE_4(LeftToMe, 0, 0, 0, 0);
 
 	CORO_END_CODE;
 }
 
-DECLARE_CUSTOM_FUNCTION(TonySniffaRight)(CORO_PARAM, uint32, uint32, uint32, uint32) {
+DECLARE_CUSTOM_FUNCTION(TonySniffRight)(CORO_PARAM, uint32, uint32, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_SNIFFA_RIGHT);
+	GLOBALS._tony->setPattern(GLOBALS._tony->PAT_SNIFF_RIGHT);
 	CORO_INVOKE_0(GLOBALS._tony->waitForEndPattern);
 	CORO_INVOKE_4(RightToMe, 0, 0, 0, 0);
 
@@ -1168,8 +1168,8 @@ DECLARE_CUSTOM_FUNCTION(EnableTony)(CORO_PARAM, uint32, uint32, uint32, uint32)
 	GLOBALS._tony->show();
 }
 
-DECLARE_CUSTOM_FUNCTION(DisableTony)(CORO_PARAM, uint32 bShowOmbra, uint32, uint32, uint32) {
-	GLOBALS._tony->hide(bShowOmbra);
+DECLARE_CUSTOM_FUNCTION(DisableTony)(CORO_PARAM, uint32 bShowShadow, uint32, uint32, uint32) {
+	GLOBALS._tony->hide(bShowShadow);
 }
 
 DECLARE_CUSTOM_FUNCTION(WaitForPatternEnd)(CORO_PARAM, uint32 nItem, uint32, uint32, uint32) {
@@ -2438,63 +2438,63 @@ ASSIGN(75,      TonyPutUp2)
 ASSIGN(76,      TonyPutMid2)
 ASSIGN(77,      TonyPutDown2)
 
-ASSIGN(36,   TonyPerTerra)
-ASSIGN(37,   TonySiRialza)
-ASSIGN(38,      TonyPastorella)
-ASSIGN(39,      TonyFischietto)
+ASSIGN(36,   TonyOnTheFloor)
+ASSIGN(37,   TonyGetUp)
+ASSIGN(38,   TonyShepherdess)
+ASSIGN(39,   TonyWhistle)
 
 ASSIGN(40,   TonyRide)
 ASSIGN(41,   TonyFianchi)
-ASSIGN(42,   TonyCanta)
-ASSIGN(43,   TonySiIndica)
-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,   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,   TonyScaredStart)
-ASSIGN(115,   TonyScaredEnd)
-ASSIGN(116,   TonyWithSecretary)
+ASSIGN(42,   TonySing)
+ASSIGN(43,   TonyIndicate)
+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,  TonyWithMegaphoneStart)
+ASSIGN(105,  TonyWithMegaphoneEnd)
+ASSIGN(106,  TonyWithBeardStart)
+ASSIGN(107,  TonyWithBeardEnd)
+ASSIGN(108,  TonyGiggle)
+ASSIGN(109,  TonyDisgusted)
+ASSIGN(110,  TonyNaah)
+ASSIGN(111,  TonyMacbeth)
+ASSIGN(112,  TonySniffLeft)
+ASSIGN(113,  TonySniffRight)
+ASSIGN(114,  TonyScaredStart)
+ASSIGN(115,  TonyScaredEnd)
+ASSIGN(116,  TonyWithSecretary)
 
 ASSIGN(50,   CharSetCode)
-ASSIGN(51,      CharSetColor)
+ASSIGN(51,   CharSetColor)
 ASSIGN(52,   CharSetTalkPattern)
 ASSIGN(53,   CharSendMessage)
 ASSIGN(54,   CharSetStartEndTalkPattern)
 
 ASSIGN(60,   MCharSetCode)
 ASSIGN(61,   MCharSetColor)
-ASSIGN(62,    MCharSetCurrentGroup)
-ASSIGN(63,      MCharSetNumTalksInGroup)
-ASSIGN(64,      MCharSetNumTexts)
-ASSIGN(65,      MCharSendMessage)
-ASSIGN(66,      MCharSetPosition)
-ASSIGN(67,      MCharSetAlwaysBack)
+ASSIGN(62,   MCharSetCurrentGroup)
+ASSIGN(63,   MCharSetNumTalksInGroup)
+ASSIGN(64,   MCharSetNumTexts)
+ASSIGN(65,   MCharSendMessage)
+ASSIGN(66,   MCharSetPosition)
+ASSIGN(67,   MCharSetAlwaysBack)
 ASSIGN(68,   MCharResetCode)
 
 ASSIGN(70,      StartDialog)
diff --git a/engines/tony/gfxengine.cpp b/engines/tony/gfxengine.cpp
index 4c09e16678..b167d0a546 100644
--- a/engines/tony/gfxengine.cpp
+++ b/engines/tony/gfxengine.cpp
@@ -643,7 +643,7 @@ void RMGfxEngine::saveState(const Common::String &fn, byte *curThumb, const Comm
 	bool bStat;
 
 	// Saves the state of the shepherdess and show yourself
-	bStat = _tony.getPastorella();
+	bStat = _tony.getShepherdess();
 	f->writeByte(bStat);
 	bStat = _inter.getPerorate();
 	f->writeByte(bStat);
@@ -779,7 +779,7 @@ void RMGfxEngine::loadState(CORO_PARAM, const Common::String &fn) {
 		bool bStat = false;
 
 		bStat = _ctx->f->readByte();
-		_tony.setPastorella(bStat);
+		_tony.setShepherdess(bStat);
 		bStat = _ctx->f->readByte();
 		_inter.setPerorate(bStat);
 
diff --git a/engines/tony/tonychar.cpp b/engines/tony/tonychar.cpp
index f232f56cb2..0f16bc45c3 100644
--- a/engines/tony/tonychar.cpp
+++ b/engines/tony/tonychar.cpp
@@ -46,13 +46,13 @@ void RMTony::initStatics() {
 
 RMTony::RMTony() {
 	_bShow = false;
-	_bShowOmbra = false;
-	_bCorpoDavanti = false;
+	_bShowShadow = false;
+	_bBodyFront = false;
 	_bActionPending = false;
 	_actionItem = NULL;
 	_action = 0;
 	_actionParm = 0;
-	_bPastorella = false;
+	_bShepherdess = false;
 	_bIsStaticTalk = false;
 	_bIsTalking = false;
 	_nPatB4Talking = 0;
@@ -94,13 +94,13 @@ void RMTony::init(void) {
 	RMDataStream ds;
 
 	// Tony is shown by default
-	_bShow = _bShowOmbra = true;
+	_bShow = _bShowShadow = true;
 
 	// No action pending
 	_bActionPending = false;
 	_bAction = false;
 
-	_bPastorella = false;
+	_bShepherdess = false;
 	_bIsTalking = false;
 	_bIsStaticTalk = false;
 
@@ -125,7 +125,7 @@ void RMTony::init(void) {
 
 void RMTony::close(void) {
 	// Disalloca @@@ Deallocation of missing item
-	_ombra.destroy();
+//	_shadow.destroy();
 }
 
 void RMTony::doFrame(CORO_PARAM, RMGfxTargetBuffer *bigBuf, int curLoc) {
@@ -162,12 +162,12 @@ void RMTony::doFrame(CORO_PARAM, RMGfxTargetBuffer *bigBuf, int curLoc) {
 
 void RMTony::show(void) {
 	_bShow = true;
-	_bShowOmbra = true;
+	_bShowShadow = true;
 }
 
-void RMTony::hide(bool bShowOmbra) {
+void RMTony::hide(bool bShowShadow) {
 	_bShow = false;
-	_bShowOmbra = bShowOmbra;
+	_bShowShadow = bShowShadow;
 }
 
 
@@ -179,10 +179,10 @@ void RMTony::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) {
 
 	// Call the Draw() of the parent class if Tony is visible
 	if (_bShow && _bDrawNow) {
-		if (_bCorpoDavanti) {
+		if (_bBodyFront) {
 			prim->getDst().setEmpty();
 			prim->getDst().offset(-44, -134);
-			if (_bPastorella)
+			if (_bShepherdess)
 				prim->getDst().offset(1, 4);
 			CORO_INVOKE_2(RMCharacter::draw, bigBuf, prim);
 		}
@@ -197,10 +197,10 @@ void RMTony::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) {
 			CORO_INVOKE_2(_body.draw, bigBuf, prim);
 		}
 
-		if (!_bCorpoDavanti) {
+		if (!_bBodyFront) {
 			prim->getDst().setEmpty();
 			prim->getDst().offset(-44, -134);
-			if (_bPastorella)
+			if (_bShepherdess)
 				prim->getDst().offset(0, 3);
 			CORO_INVOKE_2(RMCharacter::draw, bigBuf, prim);
 		}
@@ -341,7 +341,7 @@ void RMTony::stop(CORO_PARAM) {
 int RMTony::getCurPattern(void) {
 	int nPatt = RMCharacter::getCurPattern();
 
-	if (!_bPastorella)
+	if (!_bShepherdess)
 		return nPatt;
 
 	switch (nPatt) {
@@ -367,7 +367,7 @@ int RMTony::getCurPattern(void) {
 }
 
 void RMTony::setPattern(int nPatt, bool bPlayP0) {
-	if (_bPastorella) {
+	if (_bShepherdess) {
 		switch (nPatt) {
 		case PAT_STANDUP:
 			nPatt = PAT_PAST_STANDUP;
@@ -568,7 +568,7 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 		case PAT_TAKELEFT_UP2:
 		case PAT_TAKELEFT_MID2:
 		case PAT_TAKELEFT_DOWN2:
-		case PAT_SIRIALZALEFT:
+		case PAT_GETUPLEFT:
 		case PAT_STANDLEFT:
 			_talkDirection = LEFT;
 			break;
@@ -576,7 +576,7 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 		case PAT_TAKERIGHT_UP2:
 		case PAT_TAKERIGHT_MID2:
 		case PAT_TAKERIGHT_DOWN2:
-		case PAT_SIRIALZARIGHT:
+		case PAT_GETUPRIGHT:
 		case PAT_STANDRIGHT:
 			_talkDirection = RIGHT;
 			break;
@@ -590,10 +590,10 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 		}
 
 		// Puts the body in front by default
-		_bCorpoDavanti = true;
+		_bBodyFront = true;
 	}
 
-	if (_bPastorella) {
+	if (_bShepherdess) {
 		// Talking whilst a shepherdess
 		mainFreeze();
 		switch (_talkDirection) {
@@ -622,7 +622,7 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 
 	switch (nTalkType) {
 	case TALK_NORMAL:
-		_bCorpoDavanti = false;
+		_bBodyFront = false;
 		headStartPat = 0;
 		bodyStartPat = 0;
 
@@ -654,11 +654,11 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 		break;
 
 	case TALK_FIANCHI:
-		_bCorpoDavanti = false;
+		_bBodyFront = false;
 		switch (_talkDirection) {
 		case UP:
 			_nBodyOffset.set(2, 42);
-			headStartPat = PAT_TESTA_UP;
+			headStartPat = PAT_HEAD_UP;
 			bodyStartPat = BPAT_FIANCHIUP_START;
 			headLoopPat = PAT_TALK_UP;
 			bodyLoopPat = BPAT_FIANCHIUP_LOOP;
@@ -666,7 +666,7 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 
 		case DOWN:
 			_nBodyOffset.set(2, 48);
-			headStartPat = PAT_TESTA_DOWN;
+			headStartPat = PAT_HEAD_DOWN;
 			bodyStartPat = BPAT_FIANCHIDOWN_START;
 			headLoopPat = PAT_TALK_DOWN;
 			bodyLoopPat = BPAT_FIANCHIDOWN_LOOP;
@@ -674,7 +674,7 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 
 		case LEFT:
 			_nBodyOffset.set(-3, 53);
-			headStartPat = PAT_TESTA_LEFT;
+			headStartPat = PAT_HEAD_LEFT;
 			bodyStartPat = BPAT_FIANCHILEFT_START;
 			headLoopPat = PAT_TALK_LEFT;
 			bodyLoopPat = BPAT_FIANCHILEFT_LOOP;
@@ -682,7 +682,7 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 
 		case RIGHT:
 			_nBodyOffset.set(2, 53);
-			headStartPat = PAT_TESTA_RIGHT;
+			headStartPat = PAT_HEAD_RIGHT;
 			bodyStartPat = BPAT_FIANCHIRIGHT_START;
 			headLoopPat = PAT_TALK_RIGHT;
 			bodyLoopPat = BPAT_FIANCHIRIGHT_LOOP;
@@ -691,16 +691,16 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 		break;
 
 
-	case TALK_CANTA:
+	case TALK_SING:
 		_nBodyOffset.set(-10, 25);
-		headStartPat = PAT_TESTA_LEFT;
-		bodyStartPat = BPAT_CANTALEFT_START;
+		headStartPat = PAT_HEAD_LEFT;
+		bodyStartPat = BPAT_SINGLEFT_START;
 		headLoopPat = PAT_TALK_LEFT;
-		bodyLoopPat = BPAT_CANTALEFT_LOOP;
+		bodyLoopPat = BPAT_SINGLEFT_LOOP;
 		break;
 
 	case TALK_RIDE:
-		_bCorpoDavanti = false;
+		_bBodyFront = false;
 		switch (_talkDirection) {
 		case UP:
 		case DOWN:
@@ -723,7 +723,7 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 		break;
 
 	case TALK_RIDE2:
-		_bCorpoDavanti = false;
+		_bBodyFront = false;
 		switch (_talkDirection) {
 		case UP:
 		case DOWN:
@@ -745,20 +745,20 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 		break;
 
 
-	case TALK_SIINDICA:
+	case TALK_INDICATE:
 		switch (_talkDirection) {
 		case UP:
 		case DOWN:
 		case LEFT:
 			_nBodyOffset.set(-4, 40);
 			headLoopPat = PAT_TALK_LEFT;
-			bodyLoopPat = BPAT_SIINDICALEFT;
+			bodyLoopPat = BPAT_INDICATELEFT;
 			break;
 
 		case RIGHT:
 			_nBodyOffset.set(5, 40);
 			headLoopPat = PAT_TALK_RIGHT;
-			bodyLoopPat = BPAT_SIINDICARIGHT;
+			bodyLoopPat = BPAT_INDICATERIGHT;
 			break;
 		}
 		break;
@@ -767,7 +767,7 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 		switch (_talkDirection) {
 		case UP:
 			_nBodyOffset.set(-4, -11);
-			headStartPat = PAT_TESTA_UP;
+			headStartPat = PAT_HEAD_UP;
 			bodyStartPat = BPAT_SCAREDUP_START;
 			headLoopPat = PAT_TALK_UP;
 			bodyLoopPat = BPAT_SCAREDUP_LOOP;
@@ -800,14 +800,14 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 		break;
 
 	case TALK_SCARED2:
-		_bCorpoDavanti = false;
+		_bBodyFront = false;
 		switch (_talkDirection) {
 		case UP:
 			bodyStartPat = BPAT_STANDUP;
 			bodyLoopPat = BPAT_STANDUP;
 			_nBodyOffset.set(6, 53);
 
-			headStartPat = PAT_TESTA_UP;
+			headStartPat = PAT_HEAD_UP;
 			headLoopPat = PAT_TALK_UP;
 			break;
 
@@ -984,22 +984,22 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 		}
 		break;
 
-	case TALK_SCHIFATO:
+	case TALK_DISGUSTED:
 		switch (_talkDirection) {
 		case LEFT:
 		case UP:
 			_nBodyOffset.set(6, 56);
-			headStartPat = PAT_SCHIFATOLEFT_START;
+			headStartPat = PAT_DISGUSTEDLEFT_START;
 			bodyStartPat = BPAT_STANDLEFT;
-			headLoopPat = PAT_SCHIFATOLEFT_LOOP;
+			headLoopPat = PAT_DISGUSTEDLEFT_LOOP;
 			break;
 
 		case DOWN:
 		case RIGHT:
 			_nBodyOffset.set(6, 56);
-			headStartPat = PAT_SCHIFATORIGHT_START;
+			headStartPat = PAT_DISGUSTEDRIGHT_START;
 			bodyStartPat = BPAT_STANDRIGHT;
-			headLoopPat = PAT_SCHIFATORIGHT_LOOP;
+			headLoopPat = PAT_DISGUSTEDRIGHT_LOOP;
 			break;
 		}
 		break;
@@ -1071,7 +1071,7 @@ bool RMTony::startTalkCalculate(TALKTYPE nTalkType, int &headStartPat, int &body
 		break;
 
 	case TALK_SCAREDSTATIC:
-		_bCorpoDavanti = false;
+		_bBodyFront = false;
 		switch (_talkDirection) {
 		case DOWN:
 			bodyStartPat = BPAT_STANDDOWN;
@@ -1154,26 +1154,26 @@ bool RMTony::endTalkCalculate(int &headStandPat, int &headEndPat, int &bodyEndPa
 	switch (_talkDirection) {
 	case UP:
 		finalPat = PAT_STANDUP;
-		headStandPat = PAT_TESTA_UP;
+		headStandPat = PAT_HEAD_UP;
 		break;
 
 	case DOWN:
 		finalPat = PAT_STANDDOWN;
-		headStandPat = PAT_TESTA_DOWN;
+		headStandPat = PAT_HEAD_DOWN;
 		break;
 
 	case LEFT:
 		finalPat = PAT_STANDLEFT;
-		headStandPat = PAT_TESTA_LEFT;
+		headStandPat = PAT_HEAD_LEFT;
 		break;
 
 	case RIGHT:
 		finalPat = PAT_STANDRIGHT;
-		headStandPat = PAT_TESTA_RIGHT;
+		headStandPat = PAT_HEAD_RIGHT;
 		break;
 	}
 
-	if (_bPastorella) {
+	if (_bShepherdess) {
 		mainFreeze();
 		setPattern(finalPat);
 		mainUnfreeze();
@@ -1208,8 +1208,8 @@ bool RMTony::endTalkCalculate(int &headStandPat, int &headEndPat, int &bodyEndPa
 		}
 		break;
 
-	case TALK_CANTA:
-		bodyEndPat = BPAT_CANTALEFT_END;
+	case TALK_SING:
+		bodyEndPat = BPAT_SINGLEFT_END;
 		break;
 
 	case TALK_RIDE:
@@ -1222,16 +1222,16 @@ bool RMTony::endTalkCalculate(int &headStandPat, int &headEndPat, int &bodyEndPa
 		bodyEndPat = 0;
 		break;
 
-	case TALK_SCHIFATO:
+	case TALK_DISGUSTED:
 		switch (_talkDirection) {
 		case UP:
 		case LEFT:
-			headEndPat = PAT_SCHIFATOLEFT_END;
+			headEndPat = PAT_DISGUSTEDLEFT_END;
 			break;
 
 		case DOWN:
 		case RIGHT:
-			headEndPat = PAT_SCHIFATORIGHT_END;
+			headEndPat = PAT_DISGUSTEDRIGHT_END;
 			break;
 		}
 
@@ -1254,7 +1254,7 @@ bool RMTony::endTalkCalculate(int &headStandPat, int &headEndPat, int &bodyEndPa
 		bodyEndPat = 0;
 		break;
 
-	case TALK_SIINDICA:
+	case TALK_INDICATE:
 		break;
 
 	case TALK_SCARED:
@@ -1527,25 +1527,25 @@ void RMTony::startStaticCalculate(TALKTYPE nTalk, int &headPat, int &headLoopPat
 	switch (nPat) {
 	case PAT_STANDDOWN:
 		_talkDirection = DOWN;
-		headPat = PAT_TESTA_RIGHT;
+		headPat = PAT_HEAD_RIGHT;
 		break;
 
 	case PAT_TAKELEFT_UP2:
 	case PAT_TAKELEFT_MID2:
 	case PAT_TAKELEFT_DOWN2:
-	case PAT_SIRIALZALEFT:
+	case PAT_GETUPLEFT:
 	case PAT_STANDLEFT:
 		_talkDirection = LEFT;
-		headPat = PAT_TESTA_LEFT;
+		headPat = PAT_HEAD_LEFT;
 		break;
 
 	case PAT_TAKERIGHT_UP2:
 	case PAT_TAKERIGHT_MID2:
 	case PAT_TAKERIGHT_DOWN2:
-	case PAT_SIRIALZARIGHT:
+	case PAT_GETUPRIGHT:
 	case PAT_STANDRIGHT:
 		_talkDirection = RIGHT;
-		headPat = PAT_TESTA_RIGHT;
+		headPat = PAT_HEAD_RIGHT;
 		break;
 
 	case PAT_TAKEUP_UP2:
@@ -1553,11 +1553,11 @@ void RMTony::startStaticCalculate(TALKTYPE nTalk, int &headPat, int &headLoopPat
 	case PAT_TAKEUP_DOWN2:
 	case PAT_STANDUP:
 		_talkDirection = UP;
-		headPat = PAT_TESTA_LEFT;
+		headPat = PAT_HEAD_LEFT;
 		break;
 	}
 
-	_bCorpoDavanti = true;
+	_bBodyFront = true;
 
 	switch (nTalk) {
 	case TALK_WITHRABBITSTATIC:
diff --git a/engines/tony/tonychar.h b/engines/tony/tonychar.h
index 8c5c0f530d..e5231d89fd 100644
--- a/engines/tony/tonychar.h
+++ b/engines/tony/tonychar.h
@@ -44,9 +44,9 @@ public:
 	enum TALKTYPE {
 		TALK_NORMAL,
 		TALK_FIANCHI,
-		TALK_CANTA,
+		TALK_SING,
 		TALK_RIDE,
-		TALK_SIINDICA,
+		TALK_INDICATE,
 		TALK_SCARED,
 		TALK_SCARED2,
 		TALK_WITHGLASSES,
@@ -65,7 +65,7 @@ public:
 		TALK_WITHMEGAPHONESTATIC,
 		TALK_WITHBEARDSTATIC,
 		TALK_RIDE2,
-		TALK_SCHIFATO,
+		TALK_DISGUSTED,
 		TALK_NAAH,
 		TALK_MACBETH1,
 		TALK_MACBETH2,
@@ -82,16 +82,17 @@ public:
 
 private:
 	bool _bShow;
-	bool _bShowOmbra;
-	bool _bCorpoDavanti;
-	RMGfxSourceBuffer8AB _ombra;
+	bool _bShowShadow;
+	bool _bBodyFront;
+	// Useless variable?
+	// RMGfxSourceBuffer8AB _shadow;
 	bool _bActionPending;
 	RMItem *_actionItem;
 	int _action;
 	int _actionParm;
 	static bool _bAction;
 
-	bool _bPastorella;
+	bool _bShepherdess;
 
 	bool _bIsStaticTalk;
 	bool _bIsTalking;
@@ -135,10 +136,10 @@ public:
 		PAT_TAKERIGHT_DOWN1,
 		PAT_TAKERIGHT_DOWN2,
 
-		PAT_SIRIALZALEFT,
-		PAT_PERTERRALEFT,
-		PAT_SIRIALZARIGHT,
-		PAT_PERTERRARIGHT,
+		PAT_GETUPLEFT,
+		PAT_ONTHEFLOORLEFT,
+		PAT_GETUPRIGHT,
+		PAT_ONTHEFLOORRIGHT,
 
 		// Sheperdess!
 		PAT_PAST_WALKUP,
@@ -158,10 +159,10 @@ public:
 		PAT_TALK_RIGHT,
 
 		// Static head
-		PAT_TESTA_UP,
-		PAT_TESTA_DOWN,
-		PAT_TESTA_LEFT,
-		PAT_TESTA_RIGHT,
+		PAT_HEAD_UP,
+		PAT_HEAD_DOWN,
+		PAT_HEAD_LEFT,
+		PAT_HEAD_RIGHT,
 
 		// Laugh
 		PAT_RIDELEFT_START,
@@ -202,16 +203,16 @@ public:
 		PAT_TALKBEARD_RIGHT,
 
 		// Sniff
-		PAT_SNIFFA_LEFT,
-		PAT_SNIFFA_RIGHT,
+		PAT_SNIFF_LEFT,
+		PAT_SNIFF_RIGHT,
 
 		// Disgusted
-		PAT_SCHIFATOLEFT_START,
-		PAT_SCHIFATOLEFT_LOOP,
-		PAT_SCHIFATOLEFT_END,
-		PAT_SCHIFATORIGHT_START,
-		PAT_SCHIFATORIGHT_LOOP,
-		PAT_SCHIFATORIGHT_END,
+		PAT_DISGUSTEDLEFT_START,
+		PAT_DISGUSTEDLEFT_LOOP,
+		PAT_DISGUSTEDLEFT_END,
+		PAT_DISGUSTEDRIGHT_START,
+		PAT_DISGUSTEDRIGHT_LOOP,
+		PAT_DISGUSTEDRIGHT_END,
 		PAT_NAAHLEFT_START,
 		PAT_NAAHLEFT_LOOP,
 		PAT_NAAHLEFT_END,
@@ -257,9 +258,9 @@ public:
 		BPAT_WORM,
 		BPAT_GLASS,
 
-		BPAT_CANTALEFT_START,
-		BPAT_CANTALEFT_LOOP,
-		BPAT_CANTALEFT_END,
+		BPAT_SINGLEFT_START,
+		BPAT_SINGLEFT_LOOP,
+		BPAT_SINGLEFT_END,
 
 		BPAT_FIANCHILEFT_START,
 		BPAT_FIANCHILEFT_LOOP,
@@ -277,8 +278,8 @@ public:
 		BPAT_RIDELEFT,
 		BPAT_RIDERIGHT,
 
-		BPAT_SIINDICALEFT,
-		BPAT_SIINDICARIGHT,
+		BPAT_INDICATELEFT,
+		BPAT_INDICATERIGHT,
 
 		BPAT_SCAREDDOWN_START,
 		BPAT_SCAREDDOWN_LOOP,
@@ -375,7 +376,7 @@ public:
 
 	// Show or hide
 	void show(void);
-	void hide(bool bShowOmbra = false);
+	void hide(bool bShowShadow = false);
 
 	// Move and make an action, if necessary
 	void moveAndDoAction(CORO_PARAM, RMPoint dst, RMItem *item, int nAction, int nActionParm = 0);
@@ -434,11 +435,11 @@ public:
 	void endStatic(CORO_PARAM, TALKTYPE nTalkType);
 
 	// Tony disguises himself!
-	void setPastorella(bool bIsPast) {
-		_bPastorella = bIsPast;
+	void setShepherdess(bool bIsPast) {
+		_bShepherdess = bIsPast;
 	}
-	int getPastorella(void) {
-		return _bPastorella;
+	int getShepherdess(void) {
+		return _bShepherdess;
 	}
 
 	// Perform an action