GNAP: Move enums to header files

6 files changed, 654 insertions, 650 deletions

diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp
index 5e455555a7..2ad6d88ba0 100644
--- a/engines/gnap/scenes/group0.cpp
+++ b/engines/gnap/scenes/group0.cpp
@@ -27,32 +27,6 @@
 
 namespace Gnap {
 
-enum {
-	kHS01Platypus	= 0,
-	kHS01ExitTruck	= 1,
-	kHS01Mud		= 2,
-	kHS01Pigs		= 3,
-	kHS01Spaceship	= 4,
-	kHS01Device		= 5,
-	kHS01WalkArea1	= 6,
-	kHS01WalkArea2	= 7,
-	kHS01WalkArea3	= 8,
-	kHS01WalkArea4	= 9,
-	kHS01WalkArea5	= 10,
-	kHS01WalkArea6	= 11,
-	kHS01WalkArea7	= 12,
-	kHS01WalkArea8	= 13
-};
-
-enum {
-	kAS01LookSpaceship		= 1,
-	kAS01LookSpaceshipDone	= 2,
-	kAS01LeaveScene			= 3,
-	kAS01TakeMud			= 5,
-	kAS01LookPigs			= 6,
-	kAS01UsePigs			= 7
-};
-
 Scene01::Scene01(GnapEngine *vm) : Scene(vm) {
 	_pigsIdCtr = 0;
 	_smokeIdCtr = 0;
@@ -382,38 +356,6 @@ void Scene01::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS02Platypus	= 0,
-	kHS02Chicken	= 1,
-	kHS02Truck1		= 2,
-	kHS02Truck2		= 3,
-	kHS02TruckGrill	= 4,
-	kHS02Device		= 5,
-	kHS02ExitHouse	= 6,
-	kHS02ExitBarn	= 7,
-	kHS02ExitCreek	= 8,
-	kHS02ExitPigpen	= 9,
-	kHS02WalkArea1	= 10,
-	kHS02WalkArea2	= 11,
-	kHS02WalkArea3	= 12,
-	kHS02WalkArea4	= 13
-};
-
-enum {
-	kAS02UseTruckNoKeys			= 0,
-	kAS02UseGasWithTruck		= 1,
-	kAS02UseTruckGas			= 2,
-	kAS02UseTruckNoGas			= 3,
-	kAS02GrabTruckGrill			= 5,
-	kAS02LeaveScene				= 6,
-	kAS02TalkChicken			= 7,
-	kAS02GrabChicken			= 8,
-	kAS02GrabChickenDone		= 9,
-	kAS02UseTruckNoKeysDone		= 11,
-	kAS02UseGasWithTruckDone	= 12,
-	kAS02UseTwigWithChicken		= 16
-};
-
 Scene02::Scene02(GnapEngine *vm) : Scene(vm) {
 	_truckGrillCtr = 0;
 	_nextChickenSequenceId = 0;
@@ -892,31 +834,6 @@ void Scene02::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS03Platypus			= 0,
-	kHS03Grass				= 1,
-	kHS03ExitTruck			= 2,
-	kHS03Creek				= 3,
-	kHS03TrappedPlatypus	= 4,
-	kHS03Device				= 5,
-	kHS03WalkAreas1			= 6,
-	kHS03WalkAreas2			= 7,
-	kHS03PlatypusWalkArea	= 8,
-	kHS03WalkAreas3			= 9
-};
-
-enum {
-	kAS03LeaveScene			= 0,
-	kAS03FreePlatypus		= 1,
-	kAS03HypnotizePlat		= 2,
-	kAS03HypnotizeScaredPlat= 3,
-	kAS03FreePlatypusDone	= 4,
-	kAS03GrabPlatypus		= 5,
-	kAS03GrabCreek			= 6,
-	kAS03GrabCreekDone		= 7,
-	kAS03GrabScaredPlatypus	= 8
-};
-
 Scene03::Scene03(GnapEngine *vm) : Scene(vm) {
 	_nextPlatSequenceId = -1;
 	_platypusScared = false;
@@ -1382,34 +1299,6 @@ void Scene03::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS04Platypus	= 0,
-	kHS04Twig		= 1,
-	kHS04Dog		= 2,
-	kHS04Axe		= 3,
-	kHS04Door		= 4,
-	kHS04ExitTruck	= 5,
-	kHS04Device		= 6,
-	kHS04Window		= 7,
-	kHS04ExitBarn	= 8,
-	kHS04WalkArea1	= 9,
-	kHS04WalkArea2	= 10
-};
-
-enum {
-	kAS04OpenDoor			= 1,
-	kAS04GetKeyFirst		= 2,
-	kAS04GetKeyAnother		= 3,
-	kAS04LeaveScene			= 4,
-	kAS04GetKeyFirstDone	= 6,
-	kAS04GetKeyFirst2		= 7,
-	kAS04GetKeyAnother2		= 8,
-	kAS04GetKeyAnotherDone	= 9,
-	kAS04OpenDoorDone		= 10,
-	kAS04GrabDog			= 12,
-	kAS04GrabAxe			= 13
-};
-
 Scene04::Scene04(GnapEngine *vm) : Scene(vm) {
 	_dogIdCtr = 0;
 	_triedWindow = false;
@@ -1926,31 +1815,6 @@ void Scene04::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS05Platypus	= 0,
-	kHS05Haystack	= 1,
-	kHS05Padlock	= 2,
-	kHS05Ladder		= 3,
-	kHS05ExitHouse	= 4,
-	kHS05Chicken	= 5,
-	kHS05Device		= 6,
-	kHS05WalkArea1	= 7,
-	kHS05WalkArea2	= 8,
-	kHS05WalkArea3	= 9
-};
-
-enum {
-	kAS05PlatSearchHaystack	= 0,
-	kAS05TryPickPadlock		= 1,
-	kAS05PickPadlock		= 2,
-	kAS05TalkChicken		= 3,
-	kAS05GrabChicken		= 4,
-	kAS05GrabLadder			= 5,
-	kAS05EnterBarn			= 6,
-	kAS05UseTwigWithChicken	= 11,
-	kAS05LeaveScene			= 12
-};
-
 Scene05::Scene05(GnapEngine *vm) : Scene(vm) {
 	_nextChickenSequenceId = -1;
 	_currChickenSequenceId = -1;
@@ -2364,29 +2228,6 @@ void Scene05::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS06Platypus			= 0,
-	kHS06Gas				= 1,
-	kHS06Ladder				= 2,
-	kHS06Horse				= 3,
-	kHS06ExitOutsideBarn	= 4,
-	kHS06Device				= 5,
-	kHS06WalkArea1			= 6,
-	kHS06WalkArea2			= 7,
-	kHS06WalkArea3			= 8,
-	kHS06WalkArea4			= 9,
-	kHS06WalkArea5			= 10
-};
-
-enum {
-	kAS06TryToGetGas			= 0,
-	kAS06TryToClimbLadder		= 1,
-	kAS06TryToClimbLadderDone	= 2,
-	kAS06TalkToHorse			= 3,
-	kAS06UseTwigOnHorse			= 4,
-	kAS06LeaveScene				= 5
-};
-
 Scene06::Scene06(GnapEngine *vm) : Scene(vm) {
 	_horseTurnedBack = false;;
 	_nextPlatSequenceId = -1;
@@ -2782,21 +2623,6 @@ void Scene06::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS07Platypus	= 0,
-	kHS07ExitHouse	= 1,
-	kHS07Dice		= 2,
-	kHS07Device		= 3,
-	kHS07WalkArea1	= 4,
-	kHS07WalkArea2	= 5,
-	kHS07WalkArea3	= 6
-};
-
-enum {
-	kAS07Wait		= 0,
-	kAS07LeaveScene	= 1
-};
-
 Scene07::Scene07(GnapEngine *vm) : Scene(vm) {
 }
 
@@ -3024,31 +2850,6 @@ void Scene07::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kH08SPlatypus	= 0,
-	kHS08ExitBackdoor	= 1,
-	kHS08ExitCrash	= 2,
-	kHS08Man		= 3,
-	kHS08Door		= 4,
-	kHS08Meat		= 5,
-	kHS08Bone		= 6,
-	kHS08Toy		= 7,
-	kHS08WalkArea1	= 8,
-	kHS08Device		= 9,
-	kHS08WalkArea2	= 10
-};
-
-enum {
-	kAS08LeaveScene		= 0,
-	kAS08TalkMan		= 1,
-	kAS08LookMan		= 2,
-	kAS08LookDog		= 3,
-	kAS08GrabDog		= 4,
-	kAS08TalkDog		= 5,
-	kAS08PlatWithMan	= 6,
-	kAS08PlatWithDog	= 7
-};
-
 Scene08::Scene08(GnapEngine *vm) : Scene(vm) {
 	_nextDogSequenceId = -1;
 	_currDogSequenceId = -1;
@@ -3523,23 +3324,6 @@ void Scene08::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS09Platypus		= 0,
-	kHS09ExitKitchen	= 1,
-	kHS09ExitHouse		= 2,
-	kHS09Trash			= 3,
-	kHS09Device			= 4,
-	kHS09WalkArea1		= 5,
-	kHS09WalkArea2		= 6,
-	kHS09WalkArea3		= 7
-};
-
-enum {
-	kAS09LeaveScene			= 0,
-	kAS09SearchTrash		= 1,
-	kAS09SearchTrashDone	= 2
-};
-
 Scene09::Scene09(GnapEngine *vm) : Scene(vm) {
 }
 
diff --git a/engines/gnap/scenes/group0.h b/engines/gnap/scenes/group0.h
index b8df3af0ff..b288512471 100644
--- a/engines/gnap/scenes/group0.h
+++ b/engines/gnap/scenes/group0.h
@@ -27,6 +27,224 @@
 
 namespace Gnap {
 
+enum {
+	kHS01Platypus	= 0,
+	kHS01ExitTruck	= 1,
+	kHS01Mud		= 2,
+	kHS01Pigs		= 3,
+	kHS01Spaceship	= 4,
+	kHS01Device		= 5,
+	kHS01WalkArea1	= 6,
+	kHS01WalkArea2	= 7,
+	kHS01WalkArea3	= 8,
+	kHS01WalkArea4	= 9,
+	kHS01WalkArea5	= 10,
+	kHS01WalkArea6	= 11,
+	kHS01WalkArea7	= 12,
+	kHS01WalkArea8	= 13
+};
+
+enum {
+	kHS02Platypus	= 0,
+	kHS02Chicken	= 1,
+	kHS02Truck1		= 2,
+	kHS02Truck2		= 3,
+	kHS02TruckGrill	= 4,
+	kHS02Device		= 5,
+	kHS02ExitHouse	= 6,
+	kHS02ExitBarn	= 7,
+	kHS02ExitCreek	= 8,
+	kHS02ExitPigpen	= 9,
+	kHS02WalkArea1	= 10,
+	kHS02WalkArea2	= 11,
+	kHS02WalkArea3	= 12,
+	kHS02WalkArea4	= 13
+};
+
+enum {
+	kHS03Platypus			= 0,
+	kHS03Grass				= 1,
+	kHS03ExitTruck			= 2,
+	kHS03Creek				= 3,
+	kHS03TrappedPlatypus	= 4,
+	kHS03Device				= 5,
+	kHS03WalkAreas1			= 6,
+	kHS03WalkAreas2			= 7,
+	kHS03PlatypusWalkArea	= 8,
+	kHS03WalkAreas3			= 9
+};
+
+enum {
+	kHS04Platypus	= 0,
+	kHS04Twig		= 1,
+	kHS04Dog		= 2,
+	kHS04Axe		= 3,
+	kHS04Door		= 4,
+	kHS04ExitTruck	= 5,
+	kHS04Device		= 6,
+	kHS04Window		= 7,
+	kHS04ExitBarn	= 8,
+	kHS04WalkArea1	= 9,
+	kHS04WalkArea2	= 10
+};
+
+enum {
+	kHS05Platypus	= 0,
+	kHS05Haystack	= 1,
+	kHS05Padlock	= 2,
+	kHS05Ladder		= 3,
+	kHS05ExitHouse	= 4,
+	kHS05Chicken	= 5,
+	kHS05Device		= 6,
+	kHS05WalkArea1	= 7,
+	kHS05WalkArea2	= 8,
+	kHS05WalkArea3	= 9
+};
+
+enum {
+	kHS06Platypus			= 0,
+	kHS06Gas				= 1,
+	kHS06Ladder				= 2,
+	kHS06Horse				= 3,
+	kHS06ExitOutsideBarn	= 4,
+	kHS06Device				= 5,
+	kHS06WalkArea1			= 6,
+	kHS06WalkArea2			= 7,
+	kHS06WalkArea3			= 8,
+	kHS06WalkArea4			= 9,
+	kHS06WalkArea5			= 10
+};
+
+enum {
+	kHS07Platypus	= 0,
+	kHS07ExitHouse	= 1,
+	kHS07Dice		= 2,
+	kHS07Device		= 3,
+	kHS07WalkArea1	= 4,
+	kHS07WalkArea2	= 5,
+	kHS07WalkArea3	= 6
+};
+
+enum {
+	kH08SPlatypus	= 0,
+	kHS08ExitBackdoor	= 1,
+	kHS08ExitCrash	= 2,
+	kHS08Man		= 3,
+	kHS08Door		= 4,
+	kHS08Meat		= 5,
+	kHS08Bone		= 6,
+	kHS08Toy		= 7,
+	kHS08WalkArea1	= 8,
+	kHS08Device		= 9,
+	kHS08WalkArea2	= 10
+};
+
+enum {
+	kHS09Platypus		= 0,
+	kHS09ExitKitchen	= 1,
+	kHS09ExitHouse		= 2,
+	kHS09Trash			= 3,
+	kHS09Device			= 4,
+	kHS09WalkArea1		= 5,
+	kHS09WalkArea2		= 6,
+	kHS09WalkArea3		= 7
+};
+
+enum {
+	kAS01LookSpaceship		= 1,
+	kAS01LookSpaceshipDone	= 2,
+	kAS01LeaveScene			= 3,
+	kAS01TakeMud			= 5,
+	kAS01LookPigs			= 6,
+	kAS01UsePigs			= 7
+};
+
+enum {
+	kAS02UseTruckNoKeys			= 0,
+	kAS02UseGasWithTruck		= 1,
+	kAS02UseTruckGas			= 2,
+	kAS02UseTruckNoGas			= 3,
+	kAS02GrabTruckGrill			= 5,
+	kAS02LeaveScene				= 6,
+	kAS02TalkChicken			= 7,
+	kAS02GrabChicken			= 8,
+	kAS02GrabChickenDone		= 9,
+	kAS02UseTruckNoKeysDone		= 11,
+	kAS02UseGasWithTruckDone	= 12,
+	kAS02UseTwigWithChicken		= 16
+};
+
+enum {
+	kAS03LeaveScene			= 0,
+	kAS03FreePlatypus		= 1,
+	kAS03HypnotizePlat		= 2,
+	kAS03HypnotizeScaredPlat= 3,
+	kAS03FreePlatypusDone	= 4,
+	kAS03GrabPlatypus		= 5,
+	kAS03GrabCreek			= 6,
+	kAS03GrabCreekDone		= 7,
+	kAS03GrabScaredPlatypus	= 8
+};
+
+enum {
+	kAS04OpenDoor			= 1,
+	kAS04GetKeyFirst		= 2,
+	kAS04GetKeyAnother		= 3,
+	kAS04LeaveScene			= 4,
+	kAS04GetKeyFirstDone	= 6,
+	kAS04GetKeyFirst2		= 7,
+	kAS04GetKeyAnother2		= 8,
+	kAS04GetKeyAnotherDone	= 9,
+	kAS04OpenDoorDone		= 10,
+	kAS04GrabDog			= 12,
+	kAS04GrabAxe			= 13
+};
+
+enum {
+	kAS05PlatSearchHaystack	= 0,
+	kAS05TryPickPadlock		= 1,
+	kAS05PickPadlock		= 2,
+	kAS05TalkChicken		= 3,
+	kAS05GrabChicken		= 4,
+	kAS05GrabLadder			= 5,
+	kAS05EnterBarn			= 6,
+	kAS05UseTwigWithChicken	= 11,
+	kAS05LeaveScene			= 12
+};
+
+enum {
+	kAS06TryToGetGas			= 0,
+	kAS06TryToClimbLadder		= 1,
+	kAS06TryToClimbLadderDone	= 2,
+	kAS06TalkToHorse			= 3,
+	kAS06UseTwigOnHorse			= 4,
+	kAS06LeaveScene				= 5
+};
+
+enum {
+	kAS07Wait		= 0,
+	kAS07LeaveScene	= 1
+};
+
+enum {
+	kAS08LeaveScene		= 0,
+	kAS08TalkMan		= 1,
+	kAS08LookMan		= 2,
+	kAS08LookDog		= 3,
+	kAS08GrabDog		= 4,
+	kAS08TalkDog		= 5,
+	kAS08PlatWithMan	= 6,
+	kAS08PlatWithDog	= 7
+};
+
+enum {
+	kAS09LeaveScene			= 0,
+	kAS09SearchTrash		= 1,
+	kAS09SearchTrashDone	= 2
+};
+
+/*****************************************************************************/
+
 class GnapEngine;
 class CutScene;
 
diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp
index fa5b5d07e4..d746eb54ff 100644
--- a/engines/gnap/scenes/group1.cpp
+++ b/engines/gnap/scenes/group1.cpp
@@ -27,27 +27,6 @@
 
 namespace Gnap {
 
-enum {
-	kHS10Platypus		= 0,
-	kHS10ExitBar		= 1,
-	kHS10ExitBackdoor	= 2,
-	kHS10Cook			= 3,
-	kHS10Tongs		= 4,
-	kHS10Box			= 5,
-	kHS10Oven			= 6,
-	kHS10WalkArea1	= 7,
-	kHS10Device		= 8,
-	kHS10WalkArea2	= 9,
-	kHS10WalkArea3	= 10,
-	kHS10WalkArea4	= 11
-};
-
-enum {
-	kAS10LeaveScene		= 0,
-	kAS10AnnoyCook		= 1,
-	kAS10PlatWithBox		= 4
-};
-
 Scene10::Scene10(GnapEngine *vm) : Scene(vm) {
 	_nextCookSequenceId = -1;
 	_currCookSequenceId = -1;
@@ -499,32 +478,6 @@ void Scene10::updateAnimationsCb() {
 
 /*****************************************************************************/
 
-enum {
-	kHS11Platypus		= 0,
-	kHS11ExitKitchen	= 1,
-	kHS11ExitToilet	= 2,
-	kHS11ExitLeft		= 3,
-	kHS11GoggleGuy	= 4,
-	kHS11HookGuy		= 5,
-	kHS11Billard		= 6,
-	kHS11WalkArea1	= 7,
-	kHS11Device		= 8,
-	kHS11WalkArea2	= 9,
-	kHS11WalkArea3	= 10,
-	kHS11WalkArea4	= 11,
-	kHS11WalkArea5	= 12
-};
-
-enum {
-	kAS11LeaveScene				= 0,
-	kAS11ShowMagazineToGoggleGuy	= 3,
-	kAS11TalkGoggleGuy			= 4,
-	kAS11GrabHookGuy				= 6,
-	kAS11ShowItemToHookGuy		= 8,
-	kAS11TalkHookGuy				= 9,
-	kAS11GrabBillardBall			= 11
-};
-
 Scene11::Scene11(GnapEngine *vm) : Scene(vm) {
 	_billardBallCtr = 0;
 	_nextHookGuySequenceId = -1;
@@ -958,41 +911,6 @@ void Scene11::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS12Platypus		= 0,
-	kHS12ExitRight	= 1,
-	kHS12ToothGuy		= 2,
-	kHS12Barkeeper	= 3,
-	kHS12BeardGuy		= 4,
-	kHS12Jukebox		= 5,
-	kHS12WalkArea1	= 6,
-	kHS12Device		= 7,
-	kHS12WalkArea2	= 8,
-	kHS12WalkArea3	= 9,
-	kHS12WalkArea4	= 10
-};
-
-enum {
-	kAS12LeaveScene					= 0,
-	kAS12QuarterToToothGuyDone		= 1,
-	kAS12TalkToothGuy					= 2,
-	kAS12GrabToothGuy					= 4,
-	kAS12ShowItemToToothGuy			= 5,
-	kAS12QuarterWithHoleToToothGuy	= 6,
-	kAS12QuarterToToothGuy			= 7,
-	kAS12TalkBeardGuy					= 8,
-	kAS12LookBeardGuy					= 9,
-	kAS12GrabBeardGuy					= 10,
-	kAS12ShowItemToBeardGuy			= 11,
-	kAS12TalkBarkeeper				= 12,
-	kAS12LookBarkeeper				= 13,
-	kAS12ShowItemToBarkeeper			= 15,
-	kAS12QuarterWithBarkeeper			= 16,
-	kAS12PlatWithBarkeeper			= 17,
-	kAS12PlatWithToothGuy				= 18,
-	kAS12PlatWithBeardGuy				= 19
-};
-
 Scene12::Scene12(GnapEngine *vm) : Scene(vm) {
 	_nextBeardGuySequenceId = -1;
 	_currBeardGuySequenceId = -1;
@@ -1497,37 +1415,6 @@ void Scene12::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS13Platypus		= 0,
-	kHS13ExitBar		= 1,
-	kHS13WalkArea1	= 2,
-	kHS13BackToilet	= 3,
-	kHS13FrontToilet	= 4,
-	kHS13Urinal		= 5,
-	kHS13Scribble		= 6,
-	kHS13Sink			= 7,
-	kHS13WalkArea2	= 8,
-	kHS13Device		= 9,
-	kHS13WalkArea3	= 10,
-	kHS13WalkArea4	= 11,
-	kHS13WalkArea5	= 12,
-	kHS13WalkArea6	= 13,
-	kHS13WalkArea7	= 14,
-	kHS13WalkArea8	= 15,
-	kHS13WalkArea9	= 16
-};
-
-enum {
-	kAS13LeaveScene		= 0,
-	kAS13BackToilet		= 1,
-	kAS13FrontToilet		= 2,
-	kAS13LookScribble		= 6,
-	kAS13GrabSink			= 7,
-	kAS13GrabSinkDone		= 8,
-	kAS13Wait				= 12,
-	kAS13GrabUrinal		= 13
-};
-
 Scene13::Scene13(GnapEngine *vm) : Scene(vm) {
 	_backToiletCtr = -1;
 }
@@ -1920,14 +1807,6 @@ void Scene13::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS14Platypus		= 0,
-	kHS14Exit			= 1,
-	kHS14Coin			= 2,
-	kHS14Toilet		= 3,
-	kHS14Device		= 4
-};
-
 Scene14::Scene14(GnapEngine *vm) : Scene(vm) {
 }
 
@@ -2081,26 +1960,6 @@ void Scene14::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS15Platypus		= 0,
-	kHS15Exit			= 1,
-	kHS15Button1		= 2,
-	kHS15Button2		= 3,
-	kHS15Button3		= 4,
-	kHS15Button4		= 5,
-	kHS15Button5		= 6,
-	kHS15Button6		= 7,
-	kHS15ButtonA		= 8,
-	kHS15ButtonB		= 9,
-	kHS15ButtonC		= 10,
-	kHS15ButtonD		= 11,
-	kHS15ButtonE		= 12,
-	kHS15ButtonF		= 13,
-	kHS15CoinSlot		= 14,
-	kHS15PlayButton	= 15,
-	kHS15Device		= 16
-};
-
 Scene15::Scene15(GnapEngine *vm) : Scene(vm) {
 	_nextRecordSequenceId = -1;
 	_currRecordSequenceId = -1;
@@ -2397,37 +2256,6 @@ void Scene15::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS17Platypus		= 0,
-	kHS17Phone1		= 1,
-	kHS17Phone2		= 2,
-	kHS17ExitGrubCity	= 3,
-	kHS17Device		= 4,
-	kHS17ExitToyStore	= 5,
-	kHS17Wrench		= 6,
-	kHS17WalkArea1	= 7,
-	kHS17WalkArea2	= 8,
-	kHS17WalkArea3	= 9
-};
-
-enum {
-	kAS17TryGetWrench				= 0,
-	kAS17GetWrench2				= 1,
-	kAS17GetWrenchDone			= 2,
-	kAS17GetWrench1				= 3,
-	kAS17PlatUsePhone				= 4,
-	kAS17PutCoinIntoPhone			= 5,
-	kAS17GetCoinFromPhone			= 6,
-	kAS17GetCoinFromPhoneDone		= 7,
-	kAS17PutCoinIntoPhoneDone		= 8,
-	kAS17GnapUsePhone				= 9,
-	kAS17GetWrenchGnapReady		= 10,
-	kAS17GnapHangUpPhone			= 11,
-	kAS17PlatPhoningAssistant		= 12,
-	kAS17PlatHangUpPhone			= 14,
-	kAS17LeaveScene				= 15
-};
-
 Scene17::Scene17(GnapEngine *vm) : Scene(vm) {
 	_platTryGetWrenchCtr = 0;
 	_wrenchCtr = 2;
@@ -3225,44 +3053,6 @@ static const int kScene18SequenceIds[] = {
 	0x219,  0x21A,  0x21B,  0x21C,  0x21D
 };
 
-enum {
-	kHS18Platypus				= 0,
-	kHS18GarbageCan			= 1,
-	kHS18Device				= 2,
-	kHS18ExitToyStore			= 3,
-	kHS18ExitPhoneBooth		= 4,
-	kHS18ExitGrubCity			= 5,
-	kHS18HydrantTopValve		= 6,
-	kHS18HydrantRightValve	= 7,
-	kHS18CowboyHat			= 8,
-	kHS18WalkArea1			= 9,
-	kHS18WalkArea2			= 10
-};
-
-enum {
-	kAS18OpenRightValveNoGarbageCanDone		= 0,
-	kAS18OpenRightValveNoGarbageCan			= 1,
-	kAS18CloseRightValveNoGarbageCan			= 2,
-	kAS18OpenTopValveDone						= 3,
-	kAS18OpenTopValve							= 4,
-	kAS18CloseTopValve						= 5,
-	kAS18GrabGarbageCanFromStreet				= 6,
-	kAS18GrabCowboyHat						= 7,
-	kAS18GrabGarbageCanFromHydrant			= 8,
-	kAS18PutGarbageCanOnRunningHydrant		= 9,
-	kAS18PutGarbageCanOnRunningHydrant2		= 10,
-	kAS18GrabCowboyHatDone					= 11,
-	kAS18StandingOnHydrant					= 12,
-	kAS18OpenRightValveWithGarbageCan			= 13,
-	kAS18OpenRightValveWithGarbageCanDone		= 14,
-	kAS18CloseRightValveWithGarbageCan		= 15,
-	kAS18PutGarbageCanOnHydrant				= 16,
-	kAS18PutGarbageCanOnHydrantDone			= 17,
-	kAS18PlatComesHere						= 18,
-	kAS18CloseRightValveWithGarbageCanDone	= 19,
-	kAS18LeaveScene							= 20
-};
-
 Scene18::Scene18(GnapEngine *vm) : Scene(vm) {
 	_cowboyHatSurface = nullptr;
 
@@ -4227,34 +4017,6 @@ static const int kS19ShopAssistantSequenceIds[] = {
 	0x6F, 0x70, 0x71, 0x72, 0x73
 };
 
-enum {
-	kHS19Platypus				= 0,
-	kHS19ExitOutsideToyStore	= 1,
-	kHS19Device				= 2,
-	kHS19Picture				= 3,
-	kHS19ShopAssistant		= 4,
-	kHS19Toy1					= 5,
-	kHS19Toy2					= 6,
-	kHS19Toy3					= 7,
-	kHS19Phone				= 8,
-	kHS19Toy4					= 9,
-	kHS19Toy5					= 10,
-	kHS19Toy6					= 11,
-	kHS19Toy7					= 12,
-	kHS19WalkArea1			= 13,
-	kHS19WalkArea2			= 14,
-	kHS19WalkArea3			= 15
-};
-
-enum {
-	kAS19UsePhone					= 0,
-	kAS19GrabToy					= 1,
-	kAS19GrabPicture				= 2,
-	kAS19GrabPictureDone			= 3,
-	kAS19TalkShopAssistant		= 4,
-	kAS19LeaveScene				= 5
-};
-
 Scene19::Scene19(GnapEngine *vm) : Scene(vm) {
 	_toyGrabCtr = 0;
 	_pictureSurface = 0;
diff --git a/engines/gnap/scenes/group1.h b/engines/gnap/scenes/group1.h
index 451a652ffd..a1f86e249e 100644
--- a/engines/gnap/scenes/group1.h
+++ b/engines/gnap/scenes/group1.h
@@ -27,6 +27,246 @@
 
 namespace Gnap {
 
+enum {
+	kHS10Platypus		= 0,
+	kHS10ExitBar		= 1,
+	kHS10ExitBackdoor	= 2,
+	kHS10Cook			= 3,
+	kHS10Tongs			= 4,
+	kHS10Box			= 5,
+	kHS10Oven			= 6,
+	kHS10WalkArea1		= 7,
+	kHS10Device			= 8,
+	kHS10WalkArea2		= 9,
+	kHS10WalkArea3		= 10,
+	kHS10WalkArea4		= 11
+};
+
+enum {
+	kHS11Platypus		= 0,
+	kHS11ExitKitchen	= 1,
+	kHS11ExitToilet		= 2,
+	kHS11ExitLeft		= 3,
+	kHS11GoggleGuy		= 4,
+	kHS11HookGuy		= 5,
+	kHS11Billard		= 6,
+	kHS11WalkArea1		= 7,
+	kHS11Device			= 8,
+	kHS11WalkArea2		= 9,
+	kHS11WalkArea3		= 10,
+	kHS11WalkArea4		= 11,
+	kHS11WalkArea5		= 12
+};
+
+enum {
+	kHS12Platypus	= 0,
+	kHS12ExitRight	= 1,
+	kHS12ToothGuy	= 2,
+	kHS12Barkeeper	= 3,
+	kHS12BeardGuy	= 4,
+	kHS12Jukebox	= 5,
+	kHS12WalkArea1	= 6,
+	kHS12Device		= 7,
+	kHS12WalkArea2	= 8,
+	kHS12WalkArea3	= 9,
+	kHS12WalkArea4	= 10
+};
+
+enum {
+	kHS13Platypus	= 0,
+	kHS13ExitBar	= 1,
+	kHS13WalkArea1	= 2,
+	kHS13BackToilet	= 3,
+	kHS13FrontToilet= 4,
+	kHS13Urinal		= 5,
+	kHS13Scribble	= 6,
+	kHS13Sink		= 7,
+	kHS13WalkArea2	= 8,
+	kHS13Device		= 9,
+	kHS13WalkArea3	= 10,
+	kHS13WalkArea4	= 11,
+	kHS13WalkArea5	= 12,
+	kHS13WalkArea6	= 13,
+	kHS13WalkArea7	= 14,
+	kHS13WalkArea8	= 15,
+	kHS13WalkArea9	= 16
+};
+
+enum {
+	kHS14Platypus	= 0,
+	kHS14Exit		= 1,
+	kHS14Coin		= 2,
+	kHS14Toilet		= 3,
+	kHS14Device		= 4
+};
+
+enum {
+	kHS15Platypus	= 0,
+	kHS15Exit		= 1,
+	kHS15Button1	= 2,
+	kHS15Button2	= 3,
+	kHS15Button3	= 4,
+	kHS15Button4	= 5,
+	kHS15Button5	= 6,
+	kHS15Button6	= 7,
+	kHS15ButtonA	= 8,
+	kHS15ButtonB	= 9,
+	kHS15ButtonC	= 10,
+	kHS15ButtonD	= 11,
+	kHS15ButtonE	= 12,
+	kHS15ButtonF	= 13,
+	kHS15CoinSlot	= 14,
+	kHS15PlayButton	= 15,
+	kHS15Device		= 16
+};
+
+enum {
+	kHS17Platypus		= 0,
+	kHS17Phone1			= 1,
+	kHS17Phone2			= 2,
+	kHS17ExitGrubCity	= 3,
+	kHS17Device			= 4,
+	kHS17ExitToyStore	= 5,
+	kHS17Wrench			= 6,
+	kHS17WalkArea1		= 7,
+	kHS17WalkArea2		= 8,
+	kHS17WalkArea3		= 9
+};
+
+enum {
+	kHS18Platypus			= 0,
+	kHS18GarbageCan			= 1,
+	kHS18Device				= 2,
+	kHS18ExitToyStore		= 3,
+	kHS18ExitPhoneBooth		= 4,
+	kHS18ExitGrubCity		= 5,
+	kHS18HydrantTopValve	= 6,
+	kHS18HydrantRightValve	= 7,
+	kHS18CowboyHat			= 8,
+	kHS18WalkArea1			= 9,
+	kHS18WalkArea2			= 10
+};
+
+enum {
+	kHS19Platypus			= 0,
+	kHS19ExitOutsideToyStore= 1,
+	kHS19Device				= 2,
+	kHS19Picture			= 3,
+	kHS19ShopAssistant		= 4,
+	kHS19Toy1				= 5,
+	kHS19Toy2				= 6,
+	kHS19Toy3				= 7,
+	kHS19Phone				= 8,
+	kHS19Toy4				= 9,
+	kHS19Toy5				= 10,
+	kHS19Toy6				= 11,
+	kHS19Toy7				= 12,
+	kHS19WalkArea1			= 13,
+	kHS19WalkArea2			= 14,
+	kHS19WalkArea3			= 15
+};
+
+enum {
+	kAS10LeaveScene		= 0,
+	kAS10AnnoyCook		= 1,
+	kAS10PlatWithBox	= 4
+};
+
+enum {
+	kAS11LeaveScene					= 0,
+	kAS11ShowMagazineToGoggleGuy	= 3,
+	kAS11TalkGoggleGuy				= 4,
+	kAS11GrabHookGuy				= 6,
+	kAS11ShowItemToHookGuy			= 8,
+	kAS11TalkHookGuy				= 9,
+	kAS11GrabBillardBall			= 11
+};
+
+enum {
+	kAS12LeaveScene					= 0,
+	kAS12QuarterToToothGuyDone		= 1,
+	kAS12TalkToothGuy				= 2,
+	kAS12GrabToothGuy				= 4,
+	kAS12ShowItemToToothGuy			= 5,
+	kAS12QuarterWithHoleToToothGuy	= 6,
+	kAS12QuarterToToothGuy			= 7,
+	kAS12TalkBeardGuy				= 8,
+	kAS12LookBeardGuy				= 9,
+	kAS12GrabBeardGuy				= 10,
+	kAS12ShowItemToBeardGuy			= 11,
+	kAS12TalkBarkeeper				= 12,
+	kAS12LookBarkeeper				= 13,
+	kAS12ShowItemToBarkeeper		= 15,
+	kAS12QuarterWithBarkeeper		= 16,
+	kAS12PlatWithBarkeeper			= 17,
+	kAS12PlatWithToothGuy			= 18,
+	kAS12PlatWithBeardGuy			= 19
+};
+
+enum {
+	kAS13LeaveScene		= 0,
+	kAS13BackToilet		= 1,
+	kAS13FrontToilet	= 2,
+	kAS13LookScribble	= 6,
+	kAS13GrabSink		= 7,
+	kAS13GrabSinkDone	= 8,
+	kAS13Wait			= 12,
+	kAS13GrabUrinal		= 13
+};
+
+enum {
+	kAS17TryGetWrench			= 0,
+	kAS17GetWrench2				= 1,
+	kAS17GetWrenchDone			= 2,
+	kAS17GetWrench1				= 3,
+	kAS17PlatUsePhone			= 4,
+	kAS17PutCoinIntoPhone		= 5,
+	kAS17GetCoinFromPhone		= 6,
+	kAS17GetCoinFromPhoneDone	= 7,
+	kAS17PutCoinIntoPhoneDone	= 8,
+	kAS17GnapUsePhone			= 9,
+	kAS17GetWrenchGnapReady		= 10,
+	kAS17GnapHangUpPhone		= 11,
+	kAS17PlatPhoningAssistant	= 12,
+	kAS17PlatHangUpPhone		= 14,
+	kAS17LeaveScene				= 15
+};
+
+enum {
+	kAS18OpenRightValveNoGarbageCanDone		= 0,
+	kAS18OpenRightValveNoGarbageCan			= 1,
+	kAS18CloseRightValveNoGarbageCan		= 2,
+	kAS18OpenTopValveDone					= 3,
+	kAS18OpenTopValve						= 4,
+	kAS18CloseTopValve						= 5,
+	kAS18GrabGarbageCanFromStreet			= 6,
+	kAS18GrabCowboyHat						= 7,
+	kAS18GrabGarbageCanFromHydrant			= 8,
+	kAS18PutGarbageCanOnRunningHydrant		= 9,
+	kAS18PutGarbageCanOnRunningHydrant2		= 10,
+	kAS18GrabCowboyHatDone					= 11,
+	kAS18StandingOnHydrant					= 12,
+	kAS18OpenRightValveWithGarbageCan		= 13,
+	kAS18OpenRightValveWithGarbageCanDone	= 14,
+	kAS18CloseRightValveWithGarbageCan		= 15,
+	kAS18PutGarbageCanOnHydrant				= 16,
+	kAS18PutGarbageCanOnHydrantDone			= 17,
+	kAS18PlatComesHere						= 18,
+	kAS18CloseRightValveWithGarbageCanDone	= 19,
+	kAS18LeaveScene							= 20
+};
+
+enum {
+	kAS19UsePhone				= 0,
+	kAS19GrabToy				= 1,
+	kAS19GrabPicture			= 2,
+	kAS19GrabPictureDone		= 3,
+	kAS19TalkShopAssistant		= 4,
+	kAS19LeaveScene				= 5
+};
+
+/*****************************************************************************/
+
 class GnapEngine;
 class CutScene;
 
diff --git a/engines/gnap/scenes/group2.cpp b/engines/gnap/scenes/group2.cpp
index 0a89b83dc5..293d58ce05 100644
--- a/engines/gnap/scenes/group2.cpp
+++ b/engines/gnap/scenes/group2.cpp
@@ -27,35 +27,6 @@
 
 namespace Gnap {
 
-enum {
-	kHS20Platypus					= 0,
-	kHS20GroceryStoreHat			= 1,
-	kHS20ExitParkingLot			= 2,
-	kHS20StonerGuy				= 3,
-	kHS20GroceryStoreGuy			= 4,
-	kHS20Device					= 5,
-	kHS20ExitInsideGrubCity		= 6,
-	kHS20ExitOutsideCircusWorld	= 7,
-	kHS20ExitOutsideToyStore		= 8,
-	kHS20ExitPhone				= 9,
-	kHS20WalkArea1				= 10,
-	kHS20WalkArea2				= 11
-};
-
-enum {
-	kAS20LeaveScene					= 0,
-	kAS20TalkStonerGuyNoJoint			= 2,
-	kAS20TalkStonerGuyHasJoint		= 3,
-	kAS20GrabJoint					= 4,
-	kAS20ActionDone					= 5,
-	kAS20TalkGroceryStoreGuy			= 6,
-	kAS20GrabGroceryStoreGuy			= 9,
-	kAS20GrabGroceryStoreHat			= 10,
-	kAS20SwitchGroceryStoreHat		= 11,
-	kAS20SwitchGroceryStoreHatDone	= 12,
-	kAS20GrabJointDone				= 13
-};
-
 Scene20::Scene20(GnapEngine *vm) : Scene(vm) {
 	_stonerGuyCtr = 3;
 	_stonerGuyShowingJoint = false;
@@ -731,26 +702,6 @@ void Scene20::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS21Platypus				= 0,
-	kHS21Banana				= 1,
-	kHS21OldLady				= 2,
-	kHS21Device				= 3,
-	kHS21ExitOutsideGrubCity	= 4,
-	kHS21WalkArea1			= 5,
-	kHS21WalkArea2			= 6
-};
-
-enum {
-	kAS21TalkOldLady				= 0,
-	kAS21GrabBanana				= 1,
-	kAS21GrabBananaDone			= 2,
-	kAS21GrabOldLady				= 3,
-	kAS21UseHatWithOldLady		= 4,
-	kAS21UseHatWithOldLadyDone	= 5,
-	kAS21LeaveScene				= 6
-};
-
 Scene21::Scene21(GnapEngine *vm) : Scene(vm) {
 	_currOldLadySequenceId = -1;
 	_nextOldLadySequenceId = -1;
@@ -1047,21 +998,6 @@ void Scene21::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS22Platypus				= 0,
-	kHS22ExitOutsideGrubCity	= 1,
-	kHS22ExitBackGrubCity		= 2,
-	kHS22Cashier				= 3,
-	kHS22Device				= 4,
-	kHS22WalkArea1			= 5,
-	kHS22WalkArea2			= 6
-};
-
-enum {
-	kAS22LeaveScene				= 0,
-	kAS22TalkCashier				= 1
-};
-
 Scene22::Scene22(GnapEngine *vm) : Scene(vm) {
 	_caughtBefore = false;
 	_cashierCtr = 3;
@@ -1311,22 +1247,6 @@ void Scene22::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS23Platypus				= 0,
-	kHS23ExitFrontGrubCity	= 1,
-	kHS23Device				= 2,
-	kHS23Cereals				= 3,
-	kHS23WalkArea1			= 4,
-	kHS23WalkArea2			= 5
-};
-
-enum {
-	kAS23LookCereals			= 0,
-	kAS23GrabCereals			= 1,
-	kAS23GrabCerealsDone		= 2,
-	kAS23LeaveScene			= 3
-};
-
 Scene23::Scene23(GnapEngine *vm) : Scene(vm) {
 	_currStoreClerkSequenceId = -1;
 	_nextStoreClerkSequenceId = -1;
@@ -1578,20 +1498,6 @@ void Scene23::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS24Platypus				= 0,
-	kHS24ExitCircusWorld		= 1,
-	kHS24ExitOutsideGrubCity	= 2,
-	kHS24Device				= 3,
-	kHS24WalkArea1			= 4,
-	kHS24WalkArea2			= 5,
-	kHS24WalkArea3			= 6
-};
-
-enum {
-	kAS24LeaveScene			= 0
-};
-
 Scene24::Scene24(GnapEngine *vm) : Scene(vm) {
 	_currWomanSequenceId = -1;
 	_nextWomanSequenceId = -1;
@@ -1811,29 +1717,6 @@ void Scene24::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS25Platypus					= 0,
-	kHS25TicketVendor				= 1,
-	kHS25ExitOutsideCircusWorld	= 2,
-	kHS25ExitInsideCircusWorld	= 3,
-	kHS25Device					= 4,
-	kHS25Posters1					= 5,
-	kHS25Posters2					= 6,
-	kHS25Posters3					= 7,
-	kHS25Posters4					= 8,
-	kHS25WalkArea1				= 9,
-	kHS25WalkArea2				= 10
-};
-
-enum {
-	kAS25TalkTicketVendor				= 0,
-	kAS25EnterCircusWihoutTicket		= 1,
-	kAS25ShowTicketToVendor			= 2,
-	kAS25ShowTicketToVendorDone		= 3,
-	kAS25EnterCircusWihoutTicketDone	= 4,
-	kAS25LeaveScene					= 5
-};
-
 Scene25::Scene25(GnapEngine *vm) : Scene(vm) {
 	_currTicketVendorSequenceId = -1;
 	_nextTicketVendorSequenceId = -1;
@@ -2180,22 +2063,6 @@ void Scene25::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS26Platypus					= 0,
-	kHS26ExitOutsideCircusWorld	= 1,
-	kHS26ExitOutsideClown			= 2,
-	kHS26ExitArcade				= 3,
-	kHS26ExitElephant				= 4,
-	kHS26ExitBeerStand			= 5,
-	kHS26Device					= 6,
-	kHS26WalkArea1				= 7,
-	kHS26WalkArea2				= 8
-};
-
-enum {
-	kAS26LeaveScene					= 0
-};
-
 Scene26::Scene26(GnapEngine *vm) : Scene(vm) {
 	_currKidSequenceId = -1;
 	_nextKidSequenceId = -1;
@@ -2406,29 +2273,6 @@ void Scene26::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS27Platypus			= 0,
-	kHS27Janitor			= 1,
-	kHS27Device			= 2,
-	kHS27Bucket			= 3,
-	kHS27ExitCircus		= 4,
-	kHS27ExitArcade		= 5,
-	kHS27ExitBeerStand	= 6,
-	kHS27ExitClown		= 7,
-	kHS27WalkArea1		= 8
-};
-
-enum {
-	kAS27TalkJanitor				= 0,
-	kAS27GrabBucket				= 1,
-	kAS27GrabBucketDone			= 2,
-	kAS27ShowPictureToJanitor		= 3,
-	kAS27TryEnterClownTent		= 4,
-	kAS27TryEnterClownTentDone	= 5,
-	kAS27EnterClownTent			= 6,
-	kAS27LeaveScene				= 7
-};
-
 Scene27::Scene27(GnapEngine *vm) : Scene(vm) {
 	_nextJanitorSequenceId = -1;
 	_currJanitorSequenceId = -1;
@@ -2799,31 +2643,6 @@ void Scene27::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS28Platypus			= 0,
-	kHS28Horn				= 1,
-	kHS28Clown			= 2,
-	kHS28ExitOutsideClown	= 3,
-	kHS28EmptyBucket		= 4,
-	kHS28Device			= 5,
-	kHS28WalkArea1		= 6,
-	kHS28WalkArea2		= 7
-};
-
-enum {
-	kAS28UseBeerBucketWithClown	= 0,
-	kAS28UsePillBucketWithClown	= 1,
-	kAS28GrabHornFails			= 2,
-	kAS28GrabEmptyBucket			= 3,
-	kAS28GrabHornSuccess			= 4,
-	kAS28GrabHornSuccessDone		= 5,
-	kAS28GrabEmptyBucketDone		= 6,
-	kAS28GrabHornFailsDone		= 7,
-	kAS28TalkClown				= 8,
-	kAS28GnapWaiting				= 9,
-	kAS28LeaveScene				= 10
-};
-
 Scene28::Scene28(GnapEngine *vm) : Scene(vm) {
 	_currClownSequenceId = -1;
 	_nextClownSequenceId = -1;
@@ -3219,21 +3038,6 @@ void Scene28::updateAnimations() {
 
 /*****************************************************************************/
 
-enum {
-	kHS29Platypus			= 0,
-	kHS29Monkey			= 1,
-	kHS29Device			= 2,
-	kHS29ExitCircus		= 3,
-	kHS29ExitOutsideClown	= 4,
-	kHS29Aracde			= 5,
-	kHS29WalkArea1		= 6
-};
-
-enum {
-	kAS29UseBananaWithMonkey		= 0,
-	kAS29LeaveScene				= 2
-};
-
 Scene29::Scene29(GnapEngine *vm) : Scene(vm) {
 	_currMonkeySequenceId = -1;
 	_nextMonkeySequenceId = -1;
diff --git a/engines/gnap/scenes/group2.h b/engines/gnap/scenes/group2.h
index 3e84d4d500..3b74d85bea 100644
--- a/engines/gnap/scenes/group2.h
+++ b/engines/gnap/scenes/group2.h
@@ -27,6 +27,202 @@
 
 namespace Gnap {
 
+enum {
+	kHS20Platypus				= 0,
+	kHS20GroceryStoreHat		= 1,
+	kHS20ExitParkingLot			= 2,
+	kHS20StonerGuy				= 3,
+	kHS20GroceryStoreGuy		= 4,
+	kHS20Device					= 5,
+	kHS20ExitInsideGrubCity		= 6,
+	kHS20ExitOutsideCircusWorld	= 7,
+	kHS20ExitOutsideToyStore	= 8,
+	kHS20ExitPhone				= 9,
+	kHS20WalkArea1				= 10,
+	kHS20WalkArea2				= 11
+};
+
+enum {
+	kHS21Platypus				= 0,
+	kHS21Banana					= 1,
+	kHS21OldLady				= 2,
+	kHS21Device					= 3,
+	kHS21ExitOutsideGrubCity	= 4,
+	kHS21WalkArea1				= 5,
+	kHS21WalkArea2				= 6
+};
+
+enum {
+	kHS22Platypus				= 0,
+	kHS22ExitOutsideGrubCity	= 1,
+	kHS22ExitBackGrubCity		= 2,
+	kHS22Cashier				= 3,
+	kHS22Device					= 4,
+	kHS22WalkArea1				= 5,
+	kHS22WalkArea2				= 6
+};
+
+enum {
+	kHS23Platypus			= 0,
+	kHS23ExitFrontGrubCity	= 1,
+	kHS23Device				= 2,
+	kHS23Cereals			= 3,
+	kHS23WalkArea1			= 4,
+	kHS23WalkArea2			= 5
+};
+
+enum {
+	kHS24Platypus				= 0,
+	kHS24ExitCircusWorld		= 1,
+	kHS24ExitOutsideGrubCity	= 2,
+	kHS24Device					= 3,
+	kHS24WalkArea1				= 4,
+	kHS24WalkArea2				= 5,
+	kHS24WalkArea3				= 6
+};
+
+enum {
+	kHS25Platypus				= 0,
+	kHS25TicketVendor			= 1,
+	kHS25ExitOutsideCircusWorld	= 2,
+	kHS25ExitInsideCircusWorld	= 3,
+	kHS25Device					= 4,
+	kHS25Posters1				= 5,
+	kHS25Posters2				= 6,
+	kHS25Posters3				= 7,
+	kHS25Posters4				= 8,
+	kHS25WalkArea1				= 9,
+	kHS25WalkArea2				= 10
+};
+
+enum {
+	kHS26Platypus				= 0,
+	kHS26ExitOutsideCircusWorld	= 1,
+	kHS26ExitOutsideClown		= 2,
+	kHS26ExitArcade				= 3,
+	kHS26ExitElephant			= 4,
+	kHS26ExitBeerStand			= 5,
+	kHS26Device					= 6,
+	kHS26WalkArea1				= 7,
+	kHS26WalkArea2				= 8
+};
+
+enum {
+	kHS27Platypus		= 0,
+	kHS27Janitor		= 1,
+	kHS27Device			= 2,
+	kHS27Bucket			= 3,
+	kHS27ExitCircus		= 4,
+	kHS27ExitArcade		= 5,
+	kHS27ExitBeerStand	= 6,
+	kHS27ExitClown		= 7,
+	kHS27WalkArea1		= 8
+};
+
+enum {
+	kHS28Platypus			= 0,
+	kHS28Horn				= 1,
+	kHS28Clown				= 2,
+	kHS28ExitOutsideClown	= 3,
+	kHS28EmptyBucket		= 4,
+	kHS28Device				= 5,
+	kHS28WalkArea1			= 6,
+	kHS28WalkArea2			= 7
+};
+
+enum {
+	kHS29Platypus			= 0,
+	kHS29Monkey				= 1,
+	kHS29Device				= 2,
+	kHS29ExitCircus			= 3,
+	kHS29ExitOutsideClown	= 4,
+	kHS29Aracde				= 5,
+	kHS29WalkArea1			= 6
+};
+
+enum {
+	kAS20LeaveScene					= 0,
+	kAS20TalkStonerGuyNoJoint		= 2,
+	kAS20TalkStonerGuyHasJoint		= 3,
+	kAS20GrabJoint					= 4,
+	kAS20ActionDone					= 5,
+	kAS20TalkGroceryStoreGuy		= 6,
+	kAS20GrabGroceryStoreGuy		= 9,
+	kAS20GrabGroceryStoreHat		= 10,
+	kAS20SwitchGroceryStoreHat		= 11,
+	kAS20SwitchGroceryStoreHatDone	= 12,
+	kAS20GrabJointDone				= 13
+};
+
+enum {
+	kAS21TalkOldLady			= 0,
+	kAS21GrabBanana				= 1,
+	kAS21GrabBananaDone			= 2,
+	kAS21GrabOldLady			= 3,
+	kAS21UseHatWithOldLady		= 4,
+	kAS21UseHatWithOldLadyDone	= 5,
+	kAS21LeaveScene				= 6
+};
+
+enum {
+	kAS22LeaveScene		= 0,
+	kAS22TalkCashier	= 1
+};
+
+enum {
+	kAS23LookCereals		= 0,
+	kAS23GrabCereals		= 1,
+	kAS23GrabCerealsDone	= 2,
+	kAS23LeaveScene			= 3
+};
+
+enum {
+	kAS24LeaveScene	= 0
+};
+
+enum {
+	kAS25TalkTicketVendor				= 0,
+	kAS25EnterCircusWihoutTicket		= 1,
+	kAS25ShowTicketToVendor				= 2,
+	kAS25ShowTicketToVendorDone			= 3,
+	kAS25EnterCircusWihoutTicketDone	= 4,
+	kAS25LeaveScene						= 5
+};
+
+enum {
+	kAS26LeaveScene	= 0
+};
+
+enum {
+	kAS27TalkJanitor			= 0,
+	kAS27GrabBucket				= 1,
+	kAS27GrabBucketDone			= 2,
+	kAS27ShowPictureToJanitor	= 3,
+	kAS27TryEnterClownTent		= 4,
+	kAS27TryEnterClownTentDone	= 5,
+	kAS27EnterClownTent			= 6,
+	kAS27LeaveScene				= 7
+};
+
+enum {
+	kAS28UseBeerBucketWithClown	= 0,
+	kAS28UsePillBucketWithClown	= 1,
+	kAS28GrabHornFails			= 2,
+	kAS28GrabEmptyBucket		= 3,
+	kAS28GrabHornSuccess		= 4,
+	kAS28GrabHornSuccessDone	= 5,
+	kAS28GrabEmptyBucketDone	= 6,
+	kAS28GrabHornFailsDone		= 7,
+	kAS28TalkClown				= 8,
+	kAS28GnapWaiting			= 9,
+	kAS28LeaveScene				= 10
+};
+
+enum {
+	kAS29UseBananaWithMonkey	= 0,
+	kAS29LeaveScene				= 2
+};
+
 class GnapEngine;
 class CutScene;