LASTEXPRESS: Rename Tatiana functions

3 files changed, 120 insertions, 128 deletions

diff --git a/engines/lastexpress/entities/kronos.cpp b/engines/lastexpress/entities/kronos.cpp
index 1fe478fea9..61c164115b 100644
--- a/engines/lastexpress/entities/kronos.cpp
+++ b/engines/lastexpress/entities/kronos.cpp
@@ -463,7 +463,7 @@ IMPLEMENT_FUNCTION(19, Kronos, startConcert)
 			RESET_ENTITY_STATE(kEntitySophie, Sophie, setup_chaptersHandler);
 			RESET_ENTITY_STATE(kEntityAugust, August,  setup_function50);
 			RESET_ENTITY_STATE(kEntityAnna, Anna, setup_concert);
-			RESET_ENTITY_STATE(kEntityTatiana, Tatiana, setup_function35);
+			RESET_ENTITY_STATE(kEntityTatiana, Tatiana, setup_concert);
 
 			setup_duringConcert();
 			break;
diff --git a/engines/lastexpress/entities/tatiana.cpp b/engines/lastexpress/entities/tatiana.cpp
index 951e89d595..f684f37c85 100644
--- a/engines/lastexpress/entities/tatiana.cpp
+++ b/engines/lastexpress/entities/tatiana.cpp
@@ -54,47 +54,47 @@ Tatiana::Tatiana(LastExpressEngine *engine) : Entity(engine, kEntityTatiana) {
 	ADD_CALLBACK_FUNCTION(Tatiana, callbackActionRestaurantOrSalon);
 	ADD_CALLBACK_FUNCTION(Tatiana, savegame);
 	ADD_CALLBACK_FUNCTION(Tatiana, updateEntity);
-	ADD_CALLBACK_FUNCTION(Tatiana, function14);
-	ADD_CALLBACK_FUNCTION(Tatiana, function15);
-	ADD_CALLBACK_FUNCTION(Tatiana, function16);
+	ADD_CALLBACK_FUNCTION(Tatiana, enterCompartment);
+	ADD_CALLBACK_FUNCTION(Tatiana, exitCompartment);
+	ADD_CALLBACK_FUNCTION(Tatiana, handleCompartment);
 	ADD_CALLBACK_FUNCTION(Tatiana, chapter1);
 	ADD_CALLBACK_FUNCTION(Tatiana, function18);
 	ADD_CALLBACK_FUNCTION(Tatiana, chapter1Handler);
-	ADD_CALLBACK_FUNCTION(Tatiana, function20);
-	ADD_CALLBACK_FUNCTION(Tatiana, function21);
-	ADD_CALLBACK_FUNCTION(Tatiana, function22);
-	ADD_CALLBACK_FUNCTION(Tatiana, function23);
+	ADD_CALLBACK_FUNCTION(Tatiana, exitDining);
+	ADD_CALLBACK_FUNCTION(Tatiana, returnToCompartment);
+	ADD_CALLBACK_FUNCTION(Tatiana, getSomeAir);
+	ADD_CALLBACK_FUNCTION(Tatiana, returnToCompartmentAgain);
 	ADD_CALLBACK_FUNCTION(Tatiana, function24);
 	ADD_CALLBACK_FUNCTION(Tatiana, chapter2);
 	ADD_CALLBACK_FUNCTION(Tatiana, chapter2Handler);
-	ADD_CALLBACK_FUNCTION(Tatiana, function27);
-	ADD_CALLBACK_FUNCTION(Tatiana, function28);
-	ADD_CALLBACK_FUNCTION(Tatiana, function29);
-	ADD_CALLBACK_FUNCTION(Tatiana, function30);
+	ADD_CALLBACK_FUNCTION(Tatiana, breakfastClick);
+	ADD_CALLBACK_FUNCTION(Tatiana, joinAlexei);
+	ADD_CALLBACK_FUNCTION(Tatiana, leaveBreakfast);
+	ADD_CALLBACK_FUNCTION(Tatiana, returnToCompartment2);
 	ADD_CALLBACK_FUNCTION(Tatiana, chapter3);
-	ADD_CALLBACK_FUNCTION(Tatiana, chapter3Handler);
-	ADD_CALLBACK_FUNCTION(Tatiana, function33);
-	ADD_CALLBACK_FUNCTION(Tatiana, function34);
-	ADD_CALLBACK_FUNCTION(Tatiana, function35);
-	ADD_CALLBACK_FUNCTION(Tatiana, function36);
-	ADD_CALLBACK_FUNCTION(Tatiana, function37);
-	ADD_CALLBACK_FUNCTION(Tatiana, function38);
+	ADD_CALLBACK_FUNCTION(Tatiana, playChess);
+	ADD_CALLBACK_FUNCTION(Tatiana, returnToCompartment3);
+	ADD_CALLBACK_FUNCTION(Tatiana, beforeConcert);
+	ADD_CALLBACK_FUNCTION(Tatiana, concert);
+	ADD_CALLBACK_FUNCTION(Tatiana, leaveConcert);
+	ADD_CALLBACK_FUNCTION(Tatiana, afterConcert);
+	ADD_CALLBACK_FUNCTION(Tatiana, cryAnna);
 	ADD_CALLBACK_FUNCTION(Tatiana, function39);
 	ADD_CALLBACK_FUNCTION(Tatiana, function40);
-	ADD_CALLBACK_FUNCTION(Tatiana, function41);
+	ADD_CALLBACK_FUNCTION(Tatiana, trapCath);
 	ADD_CALLBACK_FUNCTION(Tatiana, function42);
 	ADD_CALLBACK_FUNCTION(Tatiana, chapter4);
-	ADD_CALLBACK_FUNCTION(Tatiana, chapter4Handler);
-	ADD_CALLBACK_FUNCTION(Tatiana, function45);
-	ADD_CALLBACK_FUNCTION(Tatiana, function46);
-	ADD_CALLBACK_FUNCTION(Tatiana, function47);
-	ADD_CALLBACK_FUNCTION(Tatiana, function48);
+	ADD_CALLBACK_FUNCTION(Tatiana, inCompartment4);
+	ADD_CALLBACK_FUNCTION(Tatiana, meetAlexei);
+	ADD_CALLBACK_FUNCTION(Tatiana, withAlexei);
+	ADD_CALLBACK_FUNCTION(Tatiana, thinking);
+	ADD_CALLBACK_FUNCTION(Tatiana, seekCath);
 	ADD_CALLBACK_FUNCTION(Tatiana, function49);
-	ADD_CALLBACK_FUNCTION(Tatiana, function50);
+	ADD_CALLBACK_FUNCTION(Tatiana, alexeiDead);
 	ADD_CALLBACK_FUNCTION(Tatiana, function51);
 	ADD_CALLBACK_FUNCTION(Tatiana, chapter5);
 	ADD_CALLBACK_FUNCTION(Tatiana, chapter5Handler);
-	ADD_CALLBACK_FUNCTION(Tatiana, function54);
+	ADD_CALLBACK_FUNCTION(Tatiana, autistic);
 	ADD_CALLBACK_FUNCTION(Tatiana, function55);
 }
 
@@ -173,7 +173,7 @@ IMPLEMENT_FUNCTION_II(13, Tatiana, updateEntity, CarIndex, EntityPosition)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(14, Tatiana, function14)
+IMPLEMENT_FUNCTION(14, Tatiana, enterCompartment)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -202,7 +202,7 @@ IMPLEMENT_FUNCTION(14, Tatiana, function14)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(15, Tatiana, function15)
+IMPLEMENT_FUNCTION(15, Tatiana, exitCompartment)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -232,7 +232,7 @@ IMPLEMENT_FUNCTION(15, Tatiana, function15)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION_I(16, Tatiana, function16, uint32)
+IMPLEMENT_FUNCTION_I(16, Tatiana, handleCompartment, uint32)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -474,13 +474,13 @@ label_tatiana_chapter1_2:
 		break;
 
 	case kAction124973510:
-		setup_function20();
+		setup_exitDining();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(20, Tatiana, function20)
+IMPLEMENT_FUNCTION(20, Tatiana, exitDining)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -515,7 +515,7 @@ IMPLEMENT_FUNCTION(20, Tatiana, function20)
 
 		case 3:
 			getSavePoints()->push(kEntityTatiana, kEntityAugust, kAction268620864);
-			setup_function21();
+			setup_returnToCompartment();
 			break;
 		}
 		break;
@@ -523,7 +523,7 @@ IMPLEMENT_FUNCTION(20, Tatiana, function20)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(21, Tatiana, function21)
+IMPLEMENT_FUNCTION(21, Tatiana, returnToCompartment)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -586,18 +586,18 @@ IMPLEMENT_FUNCTION(21, Tatiana, function21)
 			getSavePoints()->push(kEntityTatiana, kEntityVassili, kAction168459827);
 
 			setCallback(5);
-			setup_function16(kTime1156500);
+			setup_handleCompartment(kTime1156500);
 			break;
 
 		case 5:
 		case 6:
 			if (getProgress().field_14 == 29) {
 				setCallback(6);
-				setup_function16((uint)getState()->time + 900);
+				setup_handleCompartment((uint)getState()->time + 900);
 			} else {
 				getObjects()->update(kObject49, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
 
-				setup_function22();
+				setup_getSomeAir();
 			}
 			break;
 		}
@@ -606,7 +606,7 @@ IMPLEMENT_FUNCTION(21, Tatiana, function21)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(22, Tatiana, function22)
+IMPLEMENT_FUNCTION(22, Tatiana, getSomeAir)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -642,7 +642,7 @@ label_update:
 
 		getData()->inventoryItem = kItemNone;
 
-		setup_function23();
+		setup_returnToCompartmentAgain();
 		break;
 
 	case kAction1:
@@ -661,7 +661,7 @@ label_update:
 		getSavePoints()->push(kEntityTatiana, kEntityVassili, kAction122732000);
 
 		setCallback(1);
-		setup_function15();
+		setup_exitCompartment();
 		break;
 
 	case kActionCallback:
@@ -707,7 +707,7 @@ label_update:
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(23, Tatiana, function23)
+IMPLEMENT_FUNCTION(23, Tatiana, returnToCompartmentAgain)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -724,7 +724,7 @@ IMPLEMENT_FUNCTION(23, Tatiana, function23)
 
 		case 1:
 			setCallback(2);
-			setup_function14();
+			setup_enterCompartment();
 			break;
 
 		case 2:
@@ -790,13 +790,13 @@ IMPLEMENT_FUNCTION(26, Tatiana, chapter2Handler)
 	case kActionNone:
 		if (getState()->time > kTime1800000 && params->param1 && getEntities()->isSomebodyInsideRestaurantOrSalon()) {
 			getData()->inventoryItem = kItemNone;
-			setup_function28();
+			setup_joinAlexei();
 		}
 		break;
 
 	case kAction1:
 		getData()->inventoryItem = kItemNone;
-		setup_function28();
+		setup_joinAlexei();
 		break;
 
 	case kActionDefault:
@@ -808,7 +808,7 @@ IMPLEMENT_FUNCTION(26, Tatiana, chapter2Handler)
 	case kActionDrawScene:
 		if (getEntities()->isPlayerPosition(kCarRestaurant, 64) || getEntities()->isPlayerPosition(kCarRestaurant, 65)) {
 			getData()->inventoryItem = kItemNone;
-			setup_function27();
+			setup_breakfastClick();
 		}
 		break;
 
@@ -819,7 +819,7 @@ IMPLEMENT_FUNCTION(26, Tatiana, chapter2Handler)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(27, Tatiana, function27)
+IMPLEMENT_FUNCTION(27, Tatiana, breakfastClick)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -839,7 +839,7 @@ IMPLEMENT_FUNCTION(27, Tatiana, function27)
 			getAction()->playAnimation(kEventTatianaBreakfastAlexei);
 			getInventory()->addItem(kItemParchemin);
 			getInventory()->setLocationAndProcess(kItem11, kObjectLocation1);
-			setup_function28();
+			setup_joinAlexei();
 			break;
 
 		case 2:
@@ -851,7 +851,7 @@ IMPLEMENT_FUNCTION(27, Tatiana, function27)
 			} else {
 				getAction()->playAnimation(kEventTatianaAlexei);
 			}
-			setup_function28();
+			setup_joinAlexei();
 			break;
 		}
 		break;
@@ -859,7 +859,7 @@ IMPLEMENT_FUNCTION(27, Tatiana, function27)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(28, Tatiana, function28)
+IMPLEMENT_FUNCTION(28, Tatiana, joinAlexei)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -874,7 +874,7 @@ IMPLEMENT_FUNCTION(28, Tatiana, function28)
 
 	case kActionCallback:
 		if (getCallback() == 1)
-			setup_function29();
+			setup_leaveBreakfast();
 		break;
 
 	case kAction123857088:
@@ -892,7 +892,7 @@ IMPLEMENT_FUNCTION(28, Tatiana, function28)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(29, Tatiana, function29)
+IMPLEMENT_FUNCTION(29, Tatiana, leaveBreakfast)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -928,7 +928,7 @@ IMPLEMENT_FUNCTION(29, Tatiana, function29)
 			break;
 
 		case 3:
-			setup_function30();
+			setup_returnToCompartment2();
 			break;
 		}
 		break;
@@ -936,7 +936,7 @@ IMPLEMENT_FUNCTION(29, Tatiana, function29)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(30, Tatiana, function30)
+IMPLEMENT_FUNCTION(30, Tatiana, returnToCompartment2)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -953,12 +953,12 @@ IMPLEMENT_FUNCTION(30, Tatiana, function30)
 
 		case 1:
 			setCallback(2);
-			setup_function14();
+			setup_enterCompartment();
 			break;
 
 		case 2:
 			setCallback(3);
-			setup_function16(kTimeEnd);
+			setup_handleCompartment(kTimeEnd);
 			break;
 		}
 		break;
@@ -972,7 +972,7 @@ IMPLEMENT_FUNCTION(31, Tatiana, chapter3)
 		break;
 
 	case kActionNone:
-		setup_chapter3Handler();
+		setup_playChess();
 		break;
 
 	case kActionDefault:
@@ -998,7 +998,7 @@ IMPLEMENT_FUNCTION(31, Tatiana, chapter3)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(32, Tatiana, chapter3Handler)
+IMPLEMENT_FUNCTION(32, Tatiana, playChess)
 	EntityData::EntityParametersI5S  *parameters = (EntityData::EntityParametersI5S*)_data->getCurrentParameters();
 	EntityData::EntityParametersSIII *parameters1 = (EntityData::EntityParametersSIII*)_data->getCurrentParameters(1);
 
@@ -1097,7 +1097,7 @@ IMPLEMENT_FUNCTION(32, Tatiana, chapter3Handler)
 	case kActionCallback:
 		if (getCallback() == 1) {
 			getSavePoints()->push(kEntityTatiana, kEntityAlexei, kAction122288808);
-			setup_function33();
+			setup_returnToCompartment3();
 		}
 		break;
 
@@ -1108,7 +1108,7 @@ IMPLEMENT_FUNCTION(32, Tatiana, chapter3Handler)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(33, Tatiana, function33)
+IMPLEMENT_FUNCTION(33, Tatiana, returnToCompartment3)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1131,11 +1131,11 @@ IMPLEMENT_FUNCTION(33, Tatiana, function33)
 
 		case 2:
 			setCallback(3);
-			setup_function14();
+			setup_enterCompartment();
 			break;
 
 		case 3:
-			setup_function34();
+			setup_beforeConcert();
 			break;
 		}
 		break;
@@ -1143,14 +1143,14 @@ IMPLEMENT_FUNCTION(33, Tatiana, function33)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(34, Tatiana, function34)
+IMPLEMENT_FUNCTION(34, Tatiana, beforeConcert)
 	switch (savepoint.action) {
 	default:
 		break;
 
 	case kActionDefault:
 		setCallback(1);
-		setup_function16(kTime2097000);
+		setup_handleCompartment(kTime2097000);
 		break;
 
 	case kActionCallback:
@@ -1165,7 +1165,7 @@ IMPLEMENT_FUNCTION(34, Tatiana, function34)
 
 			getObjects()->update(kObjectCompartmentB, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
 			getObjects()->update(kObject49, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
-			setup_function15();
+			setup_exitCompartment();
 			break;
 
 		case 2:
@@ -1174,7 +1174,7 @@ IMPLEMENT_FUNCTION(34, Tatiana, function34)
 			break;
 
 		case 3:
-			setup_function35();
+			setup_concert();
 			break;
 		}
 		break;
@@ -1182,7 +1182,7 @@ IMPLEMENT_FUNCTION(34, Tatiana, function34)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(35, Tatiana, function35)
+IMPLEMENT_FUNCTION(35, Tatiana, concert)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1193,14 +1193,14 @@ IMPLEMENT_FUNCTION(35, Tatiana, function35)
 		 && getEntities()->checkFields19(kEntityPlayer, kCarRedSleeping, kPosition_7850)
 		 && (getState()->time < kTime2133000 || getProgress().field_40)) {
 			setCallback(1);
-			setup_function41();
+			setup_trapCath();
 			break;
 		}
 
 label_callback_1:
 		if (getState()->time > kTime2133000) {
 			if (getData()->car >= kCarRedSleeping || (getData()->car == kCarGreenSleeping && getData()->entityPosition > kPosition_5790))
-				setup_function36();
+				setup_leaveConcert();
 		}
 		break;
 
@@ -1222,12 +1222,12 @@ label_callback_1:
 		break;
 
 	case kAction191668032:
-		setup_function36();
+		setup_leaveConcert();
 	}
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(36, Tatiana, function36)
+IMPLEMENT_FUNCTION(36, Tatiana, leaveConcert)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1249,7 +1249,7 @@ IMPLEMENT_FUNCTION(36, Tatiana, function36)
 		case 1:
 			if (!getEntities()->checkFields19(kEntityPlayer, kCarGreenSleeping, kPosition_7850) || getEntities()->isInsideCompartment(kEntityPlayer, kCarRedSleeping, kPosition_8200)) {
 				setCallback(2);
-				setup_function14();
+				setup_enterCompartment();
 				break;
 			}
 
@@ -1265,7 +1265,7 @@ IMPLEMENT_FUNCTION(36, Tatiana, function36)
 			break;
 
 		case 2:
-			setup_function37();
+			setup_afterConcert();
 			break;
 		}
 		break;
@@ -1273,7 +1273,7 @@ IMPLEMENT_FUNCTION(36, Tatiana, function36)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(37, Tatiana, function37)
+IMPLEMENT_FUNCTION(37, Tatiana, afterConcert)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1287,7 +1287,7 @@ IMPLEMENT_FUNCTION(37, Tatiana, function37)
 				if (Entity::updateParameterTime(kTime2227500, !getEntities()->isPlayerInCar(kCarRedSleeping), params->param4, 450)) {
 					getProgress().field_5C = 1;
 					if (getEntities()->isInsideCompartment(kEntityAnna, kCarRedSleeping, kPosition_4070)) {
-						setup_function38();
+						setup_cryAnna();
 						break;
 					}
 				}
@@ -1399,7 +1399,7 @@ IMPLEMENT_FUNCTION(37, Tatiana, function37)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(38, Tatiana, function38)
+IMPLEMENT_FUNCTION(38, Tatiana, cryAnna)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1556,7 +1556,7 @@ IMPLEMENT_FUNCTION(40, Tatiana, function40)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(41, Tatiana, function41)
+IMPLEMENT_FUNCTION(41, Tatiana, trapCath)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1637,7 +1637,7 @@ IMPLEMENT_FUNCTION(41, Tatiana, function41)
 
 		case 4:
 			setCallback(5);
-			setup_function15();
+			setup_exitCompartment();
 			break;
 
 		case 5:
@@ -1674,7 +1674,7 @@ IMPLEMENT_FUNCTION(43, Tatiana, chapter4)
 		break;
 
 	case kActionNone:
-		setup_chapter4Handler();
+		setup_inCompartment4();
 		break;
 
 	case kActionDefault:
@@ -1695,25 +1695,25 @@ IMPLEMENT_FUNCTION(43, Tatiana, chapter4)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(44, Tatiana, chapter4Handler)
+IMPLEMENT_FUNCTION(44, Tatiana, inCompartment4)
 	switch (savepoint.action) {
 	default:
 		break;
 
 	case kActionDefault:
 		setCallback(1);
-		setup_function16(kTime2362500);
+		setup_handleCompartment(kTime2362500);
 		break;
 
 	case kActionCallback:
 		if (getCallback() == 1)
-			setup_function45();
+			setup_meetAlexei();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(45, Tatiana, function45)
+IMPLEMENT_FUNCTION(45, Tatiana, meetAlexei)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1745,7 +1745,7 @@ IMPLEMENT_FUNCTION(45, Tatiana, function45)
 			}
 
 			getSavePoints()->push(kEntityTatiana, kEntityAlexei, kAction123712592);
-			setup_function46();
+			setup_withAlexei();
 			break;
 		}
 		break;
@@ -1753,7 +1753,7 @@ IMPLEMENT_FUNCTION(45, Tatiana, function45)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(46, Tatiana, function46)
+IMPLEMENT_FUNCTION(46, Tatiana, withAlexei)
 	// Expose parameters as IIIIIS and ignore the default exposed parameters
 	EntityData::EntityParametersI5S  *parameters  = (EntityData::EntityParametersI5S*)_data->getCurrentParameters();
 
@@ -1803,7 +1803,7 @@ IMPLEMENT_FUNCTION(46, Tatiana, function46)
 
 		getSavePoints()->push(kEntityTatiana, kEntityAlexei, kAction123536024);
 
-		setup_function47();
+		setup_thinking();
 		break;
 
 	case kActionEndSound:
@@ -1887,7 +1887,7 @@ IMPLEMENT_FUNCTION(46, Tatiana, function46)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(47, Tatiana, function47)
+IMPLEMENT_FUNCTION(47, Tatiana, thinking)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1912,16 +1912,16 @@ IMPLEMENT_FUNCTION(47, Tatiana, function47)
 			getEntities()->clearSequences(kEntityTatiana);
 
 			setCallback(3);
-			setup_function16(kTime2407500);
+			setup_handleCompartment(kTime2407500);
 			break;
 
 		case 3:
 		case 4:
 			if (ENTITY_PARAM(0, 1) && getObjects()->get(kObjectCompartment1).model == kObjectModel1) {
-				setup_function48();
+				setup_seekCath();
 			} else {
 				setCallback(4);
-				setup_function16(900);
+				setup_handleCompartment(900);
 			}
 			break;
 		}
@@ -1930,7 +1930,7 @@ IMPLEMENT_FUNCTION(47, Tatiana, function47)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(48, Tatiana, function48)
+IMPLEMENT_FUNCTION(48, Tatiana, seekCath)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -2069,13 +2069,13 @@ IMPLEMENT_FUNCTION(49, Tatiana, function49)
 		break;
 
 	case kAction169360385:
-		setup_function50();
+		setup_alexeiDead();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(50, Tatiana, function50)
+IMPLEMENT_FUNCTION(50, Tatiana, alexeiDead)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -2165,11 +2165,11 @@ IMPLEMENT_FUNCTION_END
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_FUNCTION(53, Tatiana, chapter5Handler)
 	if (savepoint.action == kActionProceedChapter5)
-		setup_function54();
+		setup_autistic();
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(54, Tatiana, function54)
+IMPLEMENT_FUNCTION(54, Tatiana, autistic)
 	switch (savepoint.action) {
 	default:
 		break;
diff --git a/engines/lastexpress/entities/tatiana.h b/engines/lastexpress/entities/tatiana.h
index ca2b800110..ed887a8637 100644
--- a/engines/lastexpress/entities/tatiana.h
+++ b/engines/lastexpress/entities/tatiana.h
@@ -129,9 +129,9 @@ public:
 	 */
 	DECLARE_FUNCTION_2(updateEntity, CarIndex car, EntityPosition entityPosition)
 
-	DECLARE_FUNCTION(function14)
-	DECLARE_FUNCTION(function15)
-	DECLARE_FUNCTION_1(function16, uint32)
+	DECLARE_FUNCTION(enterCompartment)
+	DECLARE_FUNCTION(exitCompartment)
+	DECLARE_FUNCTION_1(handleCompartment, uint32)
 
 	/**
 	 * Setup Chapter 1
@@ -145,10 +145,10 @@ public:
 	 */
 	DECLARE_FUNCTION(chapter1Handler)
 
-	DECLARE_FUNCTION(function20)
-	DECLARE_FUNCTION(function21)
-	DECLARE_FUNCTION(function22)
-	DECLARE_FUNCTION(function23)
+	DECLARE_FUNCTION(exitDining)
+	DECLARE_FUNCTION(returnToCompartment)
+	DECLARE_FUNCTION(getSomeAir)
+	DECLARE_FUNCTION(returnToCompartmentAgain)
 	DECLARE_FUNCTION(function24)
 
 	/**
@@ -161,30 +161,26 @@ public:
 	 */
 	DECLARE_FUNCTION(chapter2Handler)
 
-	DECLARE_FUNCTION(function27)
-	DECLARE_FUNCTION(function28)
-	DECLARE_FUNCTION(function29)
-	DECLARE_FUNCTION(function30)
+	DECLARE_FUNCTION(breakfastClick)
+	DECLARE_FUNCTION(joinAlexei)
+	DECLARE_FUNCTION(leaveBreakfast)
+	DECLARE_FUNCTION(returnToCompartment2)
 
 	/**
 	 * Setup Chapter 3
 	 */
 	DECLARE_FUNCTION(chapter3)
 
-	/**
-	 * Handle Chapter 3 events
-	 */
-	DECLARE_FUNCTION(chapter3Handler)
-
-	DECLARE_FUNCTION(function33)
-	DECLARE_FUNCTION(function34)
-	DECLARE_FUNCTION(function35)
-	DECLARE_FUNCTION(function36)
-	DECLARE_FUNCTION(function37)
-	DECLARE_FUNCTION(function38)
+	DECLARE_FUNCTION(playChess)
+	DECLARE_FUNCTION(returnToCompartment3)
+	DECLARE_FUNCTION(beforeConcert)
+	DECLARE_FUNCTION(concert)
+	DECLARE_FUNCTION(leaveConcert)
+	DECLARE_FUNCTION(afterConcert)
+	DECLARE_FUNCTION(cryAnna)
 	DECLARE_FUNCTION(function39)
 	DECLARE_FUNCTION(function40)
-	DECLARE_FUNCTION(function41)
+	DECLARE_FUNCTION(trapCath)
 
 	/**
 	 * ???
@@ -199,17 +195,13 @@ public:
 	 */
 	DECLARE_FUNCTION(chapter4)
 
-	/**
-	 * Handle Chapter 4 events
-	 */
-	DECLARE_FUNCTION(chapter4Handler)
-
-	DECLARE_FUNCTION(function45)
-	DECLARE_FUNCTION(function46)
-	DECLARE_FUNCTION(function47)
-	DECLARE_FUNCTION(function48)
+	DECLARE_FUNCTION(inCompartment4)
+	DECLARE_FUNCTION(meetAlexei)
+	DECLARE_FUNCTION(withAlexei)
+	DECLARE_FUNCTION(thinking)
+	DECLARE_FUNCTION(seekCath)
 	DECLARE_FUNCTION(function49)
-	DECLARE_FUNCTION(function50)
+	DECLARE_FUNCTION(alexeiDead)
 	DECLARE_FUNCTION(function51)
 
 	/**
@@ -222,7 +214,7 @@ public:
 	 */
 	DECLARE_FUNCTION(chapter5Handler)
 
-	DECLARE_FUNCTION(function54)
+	DECLARE_FUNCTION(autistic)
 	DECLARE_FUNCTION(function55)
 };