FULLPIPE: Sort constants by scene (1-4)

2 files changed, 335 insertions, 313 deletions

diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 10204c5b6b..7d6c6cbe67 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -27,94 +27,225 @@ namespace Fullpipe {
 
 // Common
 #define ANI_FLY 4916
-#define MV_FLY_FLY 4917
-#define SND_CMN_060 4921
-#define SND_CMN_061 4922
-#define ST_FLY_FLY 4918
-
-#define ANI_BALLDROP 2685
-#define ANI_BATUTA 737
-#define ANI_BIGBALL 4923
-#define ANI_BIGLUK 909
-#define ANI_BOOT_1 4231
-#define ANI_BUTTON 598
-#define ANI_BUTTON_6 2988
-#define ANI_CLOCK 588
-#define ANI_CLOCK_8 2989
-#define ANI_CORNERSITTER 71
-#define ANI_DOMINO_3 2732
-#define ANI_DADAYASHIK 306
-#define ANI_EGGEATER 334
-#define ANI_EGGIE 4929
-#define ANI_GUM 978
-#define ANI_HAND 601
-#define ANI_HANDLE 622
-#define ANI_HOOLIGAN 808
-#define ANI_IN1MAN 5110
-#define ANI_INV_COIN 875
-#define ANI_INV_EGGAPL 1564
-#define ANI_INV_EGGBOOT 1570
-#define ANI_INV_EGGCOIN 1567
-#define ANI_INV_EGGDOM 1561
-#define ANI_INV_EGGGLS 1573
-#define ANI_INV_HANDLE 893
 #define ANI_INV_MAP 5321
-#define ANI_KOZAWKA 495
 #define ANI_LIFTBUTTON 2751
-#define ANI_LUKE 803
-#define ANI_MAMASHA 656
-#define ANI_MAMASHA_4 660
 #define ANI_MAN 322
-#define ANI_NADUVATEL 944
-#define ANI_NEWBALL 1073
-#define ANI_OTMOROZ 419
-#define ANI_PACHKA 975
-#define ANI_PACHKA2 3008
-#define ANI_PLANK 501
-#define ANI_PLUSMINUS 2938
-#define ANI_SC2_BOX 1020
-#define ANI_SC4_BOOT 1035
-#define ANI_SC4_COIN 690
-#define ANI_SC7_BOX 791
-#define ANI_SPEAKER_4 3275
-#define ANI_SPRING 542
-#define ANI_VMYATS 764
-#define MSG_CLICKBOTTLE 569
-#define MSG_CLICKBUTTON 609
-#define MSG_CLICKPLANK 549
 #define MSG_CMN_WINARCADE 4778
 #define MSG_DISABLESAVES 5201
 #define MSG_ENABLESAVES 5202
 #define MSG_HMRKICK_METAL 4764
 #define MSG_HMRKICK_STUCCO 4765
+#define MSG_MANSHADOWSOFF 5196
+#define MSG_MANSHADOWSON 5197
+#define MV_FLY_FLY 4917
+#define MV_MAN_GOLADDER 451
+#define MV_MAN_GOLADDER2 2844
+#define MV_MAN_LOOKUP 4773
+#define rMV_MAN_LOOKUP 4775
+#define MV_MAN_TOLADDER 448
+#define MV_MAN_TOLADDER2 2841
+#define MV_MAN_STARTLADDER 452
+#define MV_MAN_STARTLADDER2 2842
+#define MV_MAN_STOPLADDER 454
+#define MV_MAN_STOPLADDER2 2845
+#define MV_MAN_TURN_LU 486
+#define PIC_CSR_DEFAULT 4891
+#define PIC_CSR_DEFAULT_INV 4892
+#define PIC_CSR_ITN 4893
+#define PIC_CSR_ITN_INV 4894
+#define PIC_CSR_GOFAR_L 4895
+#define PIC_CSR_GOFAR_R 4896
+#define PIC_CSR_ARCADE1 4901
+#define PIC_CSR_ARCADE2 4902
+#define PIC_CSR_ARCADE2_D 4903
+#define PIC_CSR_ARCADE3 4904
+#define PIC_CSR_ARCADE4 4905
+#define PIC_CSR_ARCADE5 4906
+#define PIC_CSR_ARCADE6 4907
+#define PIC_CSR_ARCADE6_D 4908
+#define PIC_CSR_ARCADE7 4909
+#define PIC_CSR_ARCADE7_D 4910
+#define PIC_CSR_ARCADE8 4911
+#define PIC_CSR_DEFAULT 4891
+#define PIC_CSR_DEFAULT_INV 4892
+#define PIC_CSR_GOD 4900
+#define PIC_CSR_GOFAR_L 4895
+#define PIC_CSR_GOFAR_R 4896
+#define PIC_CSR_GOL 4897
+#define PIC_CSR_GOR 4898
+#define PIC_CSR_GOU 4899
+#define PIC_CSR_HELPERBGR 5331
+#define PIC_CSR_ITN 4893
+#define PIC_CSR_ITN_GREEN 5330
+#define PIC_CSR_ITN_INV 4894
+#define PIC_CSR_ITN_RED 5329
+#define PIC_CSR_LIFT 5176
+#define PIC_CSR_MAP 5339
+#define PIC_IN1_GAMETITLE 5169
+#define PIC_IN1_PIPETITLE 5167
+#define PIC_INV_MENU 991
+#define PIC_MAP_A13 5275
+#define PIC_MAP_S01 5223
+#define QU_INTR_STARTINTRO 5133
+#define SC_1 301
+#define SC_2 302
+#define SC_3 303
+#define SC_4 304
+#define SC_5 305
+#define SC_6 649
+#define SC_7 650
+#define SC_8 651
+#define SC_9 652
+#define SC_10 653
+#define SC_11 654
+#define SC_12 655
+#define SC_13 1137
+#define SC_14 1138
+#define SC_15 1139
+#define SC_16 1140
+#define SC_17 1141
+#define SC_18 1142
+#define SC_19 1143
+#define SC_20 1144
+#define SC_21 1546
+#define SC_22 1547
+#define SC_23 1548
+#define SC_24 1549
+#define SC_25 1550
+#define SC_26 1551
+#define SC_27 1552
+#define SC_28 2062
+#define SC_29 2063
+#define SC_30 2064
+#define SC_31 2065
+#define SC_32 2066
+#define SC_33 2067
+#define SC_34 2068
+#define SC_35 2069
+#define SC_36 2070
+#define SC_37 2071
+#define SC_38 2072
+#define SC_COMMON 321
+#define SC_DBGMENU 726
+#define SC_FINAL1 4999
+#define SC_FINAL2 5000
+#define SC_FINAL3 5001
+#define SC_FINAL4 2460
+#define SC_INTRO1 3896
+#define SC_INTRO2 3907
+#define SC_INV 858
+#define SND_CMN_031 3516
+#define SND_CMN_060 4921
+#define SND_CMN_061 4922
+#define SND_CMN_070 5199
+#define SND_INTR_019 5220
+#define ST_FLY_FLY 4918
+#define ST_LBN_0N 2832
+#define ST_LBN_0P 2833
+#define ST_LBN_1N 2753
+#define ST_LBN_1P 2754
+#define ST_LBN_2N 2756
+#define ST_LBN_2P 2757
+#define ST_LBN_3N 2759
+#define ST_LBN_3P 2760
+#define ST_LBN_4N 2762
+#define ST_LBN_4P 2763
+#define ST_LBN_5N 2765
+#define ST_LBN_5P 2766
+#define ST_LBN_6N 2768
+#define ST_LBN_6P 2769
+#define ST_LBN_7N 2771
+#define ST_LBN_7P 2772
+#define ST_LBN_8N 2774
+#define ST_LBN_8P 2775
+#define ST_LBN_9N 2777
+#define ST_LBN_9P 2778
+#define ST_MAN_EMPTY 476
+#define ST_MAN_RIGHT 325
+#define TrubaDown 697
+#define TrubaLeft 474
+#define TrubaUp 680
+
+// Intro
+#define ANI_IN1MAN 5110
 #define MSG_INTR_ENDINTRO 5139
 #define MSG_INTR_GETUPMAN 5135
 #define MSG_INTR_SWITCHTO1 5145
 #define MSG_INTR_SWITCHTO2 5134
-#define MSG_KOZAWRESTART 546
-#define MSG_LIFT_CLICKBUTTON 2780
-#define MSG_LIFT_CLOSEDOOR 5194
-#define MSG_LIFT_EXITLIFT 5187
-#define MSG_LIFT_GO 1065
-#define MSG_LIFT_STARTEXITQUEUE 5186
-#define MSG_LOWERPLANK 540
-#define MSG_MANSHADOWSOFF 5196
-#define MSG_MANSHADOWSON 5197
-#define MSG_RAISEPLANK 547
-#define MSG_RESTARTGAME 4767
+#define MV_IN1MAN_SLEEP 5111
+#define QU_IN2_DO 5144
+#define QU_INTR_FINISH 5138
+#define QU_INTR_GETUPMAN 5136
+#define ST_IN1MAN_SLEEP 5112
+
+// Scene 1
+#define ANI_BOOT_1 4231
 #define MSG_SC1_SHOWOSK 1019
 #define MSG_SC1_SHOWOSK2 468
 #define MSG_SC1_UTRUBACLICK 1100
+#define PIC_SC1_KUCHKA 1321
+#define PIC_SC1_LADDER 1091
+#define PIC_SC1_OSK 1018
+#define PIC_SC1_OSK2 2932
+#define TrubaRight 696
+
+// Scene 2
+#define ANI_SC2_BOX 1020
+#define ANI_DADAYASHIK 306
 #define MSG_SC2_HIDELADDER 1023
 #define MSG_SC2_LADDERCLICK 1101
 #define MSG_SC2_PUTMANUP 1026
 #define MSG_SC2_SHOWLADDER 1027
+#define PIC_SC2_DTRUBA 841
+#define PIC_SC2_LADDER 412
+#define ST_DYAS_LIES 318
+
+// Scene 3
+#define ANI_DOMINO_3 2732
+#define ANI_EGGEATER 334
+#define ANI_INV_COIN 875
+#define ANI_INV_EGGAPL 1564
+#define ANI_INV_EGGBOOT 1570
+#define ANI_INV_EGGCOIN 1567
+#define ANI_INV_EGGDOM 1561
+#define ANI_INV_EGGGLS 1573
+#define MSG_LIFT_CLICKBUTTON 2780
+#define MSG_LIFT_CLOSEDOOR 5194
+#define MSG_LIFT_EXITLIFT 5187
+#define MSG_LIFT_GO 1065
+#define MSG_LIFT_STARTEXITQUEUE 5186
 #define MSG_SC3_HIDEDOMINO 3177
 #define MSG_SC3_ONTAKECOIN 5338
 #define MSG_SC3_RELEASEEGG 2681
 #define MSG_SC3_TAKEEGG 1583
 #define MSG_SC3_TESTFAT 1582
 #define MSG_SC3_UTRUBACLICK 1103
+#define MV_EGTR_FATASK 5332
+#define PIC_SC3_DOMIN 5182
+#define PIC_SC3_LADDER 1102
+#define ST_EGTR_MID1 2863
+#define ST_EGTR_MID2 2869
+#define ST_EGTR_SLIM 336
+#define QU_EGTR_MD2_SHOW 4698
+#define QU_EGTR_MD1_SHOW 4697
+#define QU_EGTR_SLIMSHOW 4883
+#define QU_SC3_ENTERLIFT 2779
+#define QU_SC3_EXITLIFT 2808
+
+// Scene 4
+#define ANI_BIGBALL 4923
+#define ANI_BUTTON 598
+#define ANI_CLOCK 588
+#define ANI_HAND 601
+#define ANI_KOZAWKA 495
+#define ANI_MAMASHA_4 660
+#define ANI_PLANK 501
+#define ANI_SC4_BOOT 1035
+#define ANI_SC4_COIN 690
+#define ANI_SPEAKER_4 3275
+#define ANI_SPRING 542
+#define MSG_GOTOLADDER 618
+#define MSG_KOZAWRESTART 546
 #define MSG_SC4_COINOUT 2895
 #define MSG_SC4_COINPUT 1032
 #define MSG_SC4_CLICKLADDER 1439
@@ -124,6 +255,87 @@ namespace Fullpipe {
 #define MSG_SC4_KOZAWFALL 2858
 #define MSG_SC4_MANFROMBOTTLE 2854
 #define MSG_SC4_MANTOBOTTLE 2852
+#define MSG_SHAKEBOTTLE 584
+#define MSG_SHOOTKOZAW 557
+#define MSG_STARTHAND 612
+#define MSG_CLICKBOTTLE 569
+#define MSG_CLICKBUTTON 609
+#define MSG_CLICKPLANK 549
+#define MSG_LOWERPLANK 540
+#define MSG_RAISEPLANK 547
+#define MSG_SHOWCOIN 1033
+#define MSG_TAKEBOTTLE 614
+#define MSG_TAKEKOZAW 611
+#define MSG_TESTPLANK 538
+#define MSG_UPDATEBOTTLE 613
+#define MV_BTN_CLICK 599
+#define MV_CLK_GO 589
+#define MV_HND_POINT 602
+#define MV_KZW_GOR 564
+#define rMV_KZW_GOR 566
+#define MV_KZW_JUMP 558
+#define MV_KZW_JUMPROTATE 561
+#define MV_KZW_TOHOLERV 537
+#define MV_KZW_WALKPLANK 500
+#define MV_KZW_JUMPHIT 2857
+#define MV_KZW_JUMPOUT 586
+#define MV_KZW_RAISEHEAD 577
+#define MV_KZW_STANDUP 563
+#define MV_KZW_TURN 562
+#define MV_MAN_FROMLADDER 493
+#define MV_MAN_GOD 481
+#define MV_MAN_GOU 460
+#define MV_MAN_JUMPONPLANK 551
+#define MV_MAN_LOOKLADDER 520
+#define MV_MAN_PLANKTOLADDER 553
+#define MV_MAN_STARTLADDERD 457
+#define MV_PNK_WEIGHTLEFT 541
+#define MV_PNK_WEIGHTRIGHT 502
+#define MV_SC4_COIN_default 1029
+#define MV_SPK4_PLAY 3276
+#define MV_SPR_LOWER 543
+#define PIC_MAP_P03 5279
+#define PIC_SC4_BOTTLE 568
+#define PIC_SC4_BOTTLE2 2936
+#define PIC_SC4_DOWNTRUBA 619
+#define PIC_SC4_LADDER 1438
+#define PIC_SC4_LRTRUBA 616
+#define PIC_SC4_MASK 585
+#define PIC_SC4_PLANK 5183
+#define QU_BALL_WALKL 4920
+#define QU_BALL_WALKR 4919
+#define QU_HND_TAKE0 1440
+#define QU_HND_TAKE1 1441
+#define QU_HND_TAKE2 1442
+#define QU_HND_TAKEBOTTLE 1443
+#define QU_KOZAW_WALK 505
+#define QU_PNK_CLICK 550
+#define QU_SC4_GOCLOCK 595
+#define QU_SC4_MANFROMBOTTLE 2851
+#define QU_SC4_MANTOBOTTLE 2850
+#define SND_4_010 3125
+#define SND_4_012 3127
+#define SND_4_033 4990
+#define ST_CLK_CLOSED 590
+#define ST_HND_EMPTY 603
+#define ST_KZW_EMPTY 498
+#define ST_KZW_JUMPOUT 587
+#define ST_KZW_RIGHT 559
+#define ST_KZW_SIT 560
+#define ST_MAN_GOLADDER 450
+#define ST_MAN_GOLADDER2 2843
+#define MV_MAN_LOOKLADDERRV 556
+#define ST_MAN_LADDERDOWN 521
+#define ST_MAN_LOOKPLANK 555
+#define ST_MAN_ONPLANK 552
+#define ST_MAN_SIT 1164
+#define ST_MAN_STANDLADDER 453
+#define ST_MAN_UP 449
+#define ST_PNK_WEIGHTLEFT 503
+#define ST_PNK_WEIGHTRIGHT 504
+#define ST_SPR_UP 544
+
+// Scene 5
 #define MSG_SC5_BGRSOUNDOFF 5315
 #define MSG_SC5_BGRSOUNDON 5314
 #define MSG_SC5_HANDLEDOWN 916
@@ -133,6 +345,11 @@ namespace Fullpipe {
 #define MSG_SC5_MAKEOTMFEEDBACK 1169
 #define MSG_SC5_SHOWHANDLE 918
 #define MSG_SC5_TESTLUK 914
+#define QU_SC5_MANBUMP 1167
+#define QU_SC5_MANFLY 1168
+#define SND_5_026 5316
+
+// Scene 6
 #define MSG_SC6_BTNPUSH 1017
 #define MSG_SC6_ENABLEDROPS 687
 #define MSG_SC6_INSTHANDLE 1012
@@ -144,74 +361,84 @@ namespace Fullpipe {
 #define MSG_SC6_TAKEBALL 682
 #define MSG_SC6_TESTNUMBALLS 2904
 #define MSG_SC6_UTRUBACLICK 1105
+#define PIC_SC6_LADDER 1104
+#define QU_SC6_DROPS 2898
+#define QU_SC6_DROPS3 2955
+#define QU_SC6_ENTERLIFT 1054
+#define QU_SC6_EXITLIFT 1055
+#define QU_SC6_FALLBALL 2690
+#define QU_SC6_FALLHANDLE 2995
+#define QU_SC6_SHOWHANDLE 1689
+#define QU_SC6_SHOWNEXTBALL 2689
+
+// Scene 7
+#define ANI_SC7_BOX 791
 #define MSG_SC7_CLOSELUKE 822
 #define MSG_SC7_HIDEBOX 817
 #define MSG_SC7_HIDELUKE 821
 #define MSG_SC7_OPENLUKE 823
 #define MSG_SC7_PULL 2943
 #define MSG_SC7_SHOWBOX 816
+#define MV_SC7_BOX_default 792
+
+// Scene 8
 #define MSG_SC8_ARCADENOW 1044
 #define MSG_SC8_ENTERUP 3037
 #define MSG_SC8_GETHIMUP 789
 #define MSG_SC8_HIDELADDER_D 1107
 #define MSG_SC8_RESUMEFLIGHT 784
 #define MSG_SC8_STANDUP 2976
+#define PIC_SC8_ARCADENOW 1043
+#define PIC_SC8_LADDER 754
+#define PIC_SC8_LADDER_D 755
+#define PIC_SC8_LADDERD 1106
+#define QU_SC8_FINISH 788
+#define QU_SC8_STANDUP 2975
+#define SND_8_014 3624
+
+// Scene 10
 #define MSG_SC10_CLICKGUM 992
 #define MSG_SC10_HIDEGUM 993
 #define MSG_SC10_LADDERTOBACK 3002
 #define MSG_SC10_LADDERTOFORE 3004
 #define MSG_SC10_SHOWGUM 994
-#define MSG_GOTOLADDER 618
-#define MSG_SHAKEBOTTLE 584
-#define MSG_SHOOTKOZAW 557
-#define MSG_SHOWCOIN 1033
+#define PIC_SC10_DTRUBA 974
+#define PIC_SC10_LADDER 995
+#define QU_SC10_ENTERLIFT 1067
+#define QU_SC10_EXITLIFT 2809
+#define QU_SC10_TAKEGUM 3026
+
+
+#define ANI_BALLDROP 2685
+#define ANI_BATUTA 737
+#define ANI_BIGLUK 909
+#define ANI_BUTTON_6 2988
+#define ANI_CLOCK_8 2989
+#define ANI_CORNERSITTER 71
+#define ANI_EGGIE 4929
+#define ANI_GUM 978
+#define ANI_HANDLE 622
+#define ANI_HOOLIGAN 808
+#define ANI_INV_HANDLE 893
+#define ANI_LUKE 803
+#define ANI_MAMASHA 656
+#define ANI_NADUVATEL 944
+#define ANI_NEWBALL 1073
+#define ANI_OTMOROZ 419
+#define ANI_PACHKA 975
+#define ANI_PACHKA2 3008
+#define ANI_PLUSMINUS 2938
+#define ANI_VMYATS 764
+#define MSG_RESTARTGAME 4767
 #define MSG_SPINHANDLE 2398
 #define MSG_STARTARCADE 781
-#define MSG_STARTHAND 612
-#define MSG_TAKEBOTTLE 614
-#define MSG_TAKEKOZAW 611
-#define MSG_TESTPLANK 538
-#define MSG_UPDATEBOTTLE 613
 #define MV_BLK_CLOSE 911
 #define MV_BLK_OPEN 910
 #define MV_CLK8_GO 2990
 #define MV_CST_CLOSELUKE 807
-#define MV_EGTR_FATASK 5332
-#define MV_IN1MAN_SLEEP 5111
 #define MV_BDG_OPEN 1379
-#define MV_BTN_CLICK 599
-#define MV_CLK_GO 589
-#define MV_HND_POINT 602
-#define MV_KZW_GOR 564
-#define MV_KZW_JUMP 558
-#define MV_KZW_JUMPROTATE 561
-#define MV_KZW_TOHOLERV 537
-#define MV_KZW_WALKPLANK 500
-#define MV_KZW_JUMPHIT 2857
-#define MV_KZW_JUMPOUT 586
-#define MV_KZW_RAISEHEAD 577
-#define MV_KZW_STANDUP 563
-#define MV_KZW_TURN 562
-#define MV_MAN_FROMLADDER 493
 #define MV_MAN_FROMLADDERUP 1522
-#define MV_MAN_GOD 481
-#define MV_MAN_GOLADDER 451
-#define MV_MAN_GOLADDER2 2844
-#define MV_MAN_GOU 460
-#define MV_MAN_JUMPONPLANK 551
-#define MV_MAN_LOOKLADDER 520
-#define MV_MAN_LOOKLADDERRV 556
-#define MV_MAN_LOOKUP 4773
-#define MV_MAN_PLANKTOLADDER 553
-#define MV_MAN_STARTLADDER 452
-#define MV_MAN_STARTLADDER2 2842
-#define MV_MAN_STARTLADDERD 457
-#define MV_MAN_STOPLADDER 454
-#define MV_MAN_STOPLADDER2 2845
-#define MV_MAN_TOLADDER 448
 #define MV_MAN_TOLADDERD 1524
-#define MV_MAN_TOLADDER2 2841
-#define MV_MAN_TURN_LU 486
 #define MV_MAN_TURN_SUD 1089
 #define MV_MAN6_TAKEBALL 2691
 #define MV_MAN6_THROWBALL 2692
@@ -242,234 +469,37 @@ namespace Fullpipe {
 #define MV_OTM_BOXHANDLEUP 627
 #define MV_OTM_HANDLEDOWN 620
 #define MV_OTM_HANDLEUP 621
-#define MV_PNK_WEIGHTLEFT 541
-#define MV_PNK_WEIGHTRIGHT 502
-#define MV_SC4_COIN_default 1029
-#define MV_SC7_BOX_default 792
-#define MV_SPK4_PLAY 3276
-#define MV_SPR_LOWER 543
 #define MV_VMT_DEF 765
 #define PIC_CMN_EVAL 3468
-#define PIC_CSR_DEFAULT 4891
-#define PIC_CSR_DEFAULT_INV 4892
-#define PIC_CSR_ITN 4893
-#define PIC_CSR_ITN_INV 4894
-#define PIC_CSR_GOFAR_L 4895
-#define PIC_CSR_GOFAR_R 4896
-#define PIC_CSR_ARCADE1 4901
-#define PIC_CSR_ARCADE2 4902
-#define PIC_CSR_ARCADE2_D 4903
-#define PIC_CSR_ARCADE3 4904
-#define PIC_CSR_ARCADE4 4905
-#define PIC_CSR_ARCADE5 4906
-#define PIC_CSR_ARCADE6 4907
-#define PIC_CSR_ARCADE6_D 4908
-#define PIC_CSR_ARCADE7 4909
-#define PIC_CSR_ARCADE7_D 4910
-#define PIC_CSR_ARCADE8 4911
-#define PIC_CSR_DEFAULT 4891
-#define PIC_CSR_DEFAULT_INV 4892
-#define PIC_CSR_GOD 4900
-#define PIC_CSR_GOFAR_L 4895
-#define PIC_CSR_GOFAR_R 4896
-#define PIC_CSR_GOL 4897
-#define PIC_CSR_GOR 4898
-#define PIC_CSR_GOU 4899
-#define PIC_CSR_HELPERBGR 5331
-#define PIC_CSR_ITN 4893
-#define PIC_CSR_ITN_GREEN 5330
-#define PIC_CSR_ITN_INV 4894
-#define PIC_CSR_ITN_RED 5329
-#define PIC_CSR_LIFT 5176
-#define PIC_CSR_MAP 5339
-#define PIC_IN1_GAMETITLE 5169
-#define PIC_IN1_PIPETITLE 5167
-#define PIC_INV_MENU 991
-#define PIC_MAP_A13 5275
-#define PIC_MAP_P03 5279
-#define PIC_MAP_S01 5223
-#define PIC_SC1_KUCHKA 1321
-#define PIC_SC1_LADDER 1091
-#define PIC_SC1_OSK 1018
-#define PIC_SC1_OSK2 2932
-#define PIC_SC2_DTRUBA 841
-#define PIC_SC2_LADDER 412
-#define PIC_SC3_DOMIN 5182
-#define PIC_SC3_LADDER 1102
-#define PIC_SC4_BOTTLE 568
-#define PIC_SC4_BOTTLE2 2936
-#define PIC_SC4_DOWNTRUBA 619
-#define PIC_SC4_LADDER 1438
-#define PIC_SC4_LRTRUBA 616
-#define PIC_SC4_MASK 585
-#define PIC_SC4_PLANK 5183
-#define PIC_SC6_LADDER 1104
-#define PIC_SC8_ARCADENOW 1043
-#define PIC_SC8_LADDER 754
-#define PIC_SC8_LADDER_D 755
-#define PIC_SC8_LADDERD 1106
-#define PIC_SC10_DTRUBA 974
-#define PIC_SC10_LADDER 995
-#define QU_BALL_WALKL 4920
-#define QU_BALL_WALKR 4919
 #define QU_CST_CLOSELUKE 820
 #define QU_EGG6_GOL 4936
 #define QU_EGG6_GOR 4935
-#define QU_EGTR_MD2_SHOW 4698
-#define QU_EGTR_MD1_SHOW 4697
-#define QU_EGTR_SLIMSHOW 4883
-#define QU_HND_TAKE0 1440
-#define QU_HND_TAKE1 1441
-#define QU_HND_TAKE2 1442
-#define QU_HND_TAKEBOTTLE 1443
-#define QU_IN2_DO 5144
-#define QU_INTR_FINISH 5138
-#define QU_INTR_GETUPMAN 5136
-#define QU_INTR_STARTINTRO 5133
-#define QU_KOZAW_WALK 505
 #define QU_MOM_JUMPBK 671
 #define QU_MOM_JUMPFW 670
 #define QU_MOM_PUTBALL 2903
 #define QU_MOM_SITDOWN 685
 #define QU_MOM_STANDUP 2899
 #define QU_MOM_TOLIFT 2902
-#define QU_PNK_CLICK 550
-#define QU_SC3_ENTERLIFT 2779
-#define QU_SC3_EXITLIFT 2808
-#define QU_SC6_FALLHANDLE 2995
-#define QU_SC4_GOCLOCK 595
-#define QU_SC4_MANFROMBOTTLE 2851
-#define QU_SC4_MANTOBOTTLE 2850
-#define QU_SC5_MANBUMP 1167
-#define QU_SC5_MANFLY 1168
-#define QU_SC6_DROPS 2898
-#define QU_SC6_DROPS3 2955
-#define QU_SC6_ENTERLIFT 1054
-#define QU_SC6_EXITLIFT 1055
-#define QU_SC6_FALLBALL 2690
-#define QU_SC6_SHOWHANDLE 1689
-#define QU_SC6_SHOWNEXTBALL 2689
-#define QU_SC8_FINISH 788
-#define QU_SC8_STANDUP 2975
-#define QU_SC10_ENTERLIFT 1067
-#define QU_SC10_EXITLIFT 2809
-#define QU_SC10_TAKEGUM 3026
-#define SC_1 301
-#define SC_10 653
-#define SC_11 654
-#define SC_12 655
-#define SC_13 1137
-#define SC_14 1138
-#define SC_15 1139
-#define SC_16 1140
-#define SC_17 1141
-#define SC_18 1142
-#define SC_19 1143
-#define SC_2 302
-#define SC_20 1144
-#define SC_21 1546
-#define SC_22 1547
-#define SC_23 1548
-#define SC_24 1549
-#define SC_25 1550
-#define SC_26 1551
-#define SC_27 1552
-#define SC_28 2062
-#define SC_29 2063
-#define SC_3 303
-#define SC_30 2064
-#define SC_31 2065
-#define SC_32 2066
-#define SC_33 2067
-#define SC_34 2068
-#define SC_35 2069
-#define SC_36 2070
-#define SC_37 2071
-#define SC_38 2072
-#define SC_4 304
-#define SC_5 305
-#define SC_6 649
-#define SC_7 650
-#define SC_8 651
-#define SC_9 652
-#define SC_COMMON 321
-#define SC_DBGMENU 726
-#define SC_FINAL1 4999
-#define SC_FINAL2 5000
-#define SC_FINAL3 5001
-#define SC_FINAL4 2460
-#define SC_INTRO1 3896
-#define SC_INTRO2 3907
-#define SC_INV 858
 #define SC_LDR 635
 #define SC_MAINMENU 4620
 #define SC_MAP 5222
 #define SC_TEST 903
 #define SC_TITLES 5166
-#define SND_4_010 3125
-#define SND_4_012 3127
-#define SND_4_033 4990
-#define SND_5_026 5316
-#define SND_8_014 3624
-#define SND_CMN_031 3516
-#define SND_CMN_070 5199
-#define SND_INTR_019 5220
 #define ST_BLK_CLOSED 912
 #define ST_BLK_OPEN 913
 #define ST_BTT_CHESHET 746
 #define ST_BTT_NOSPOON 739
 #define ST_BTT_SLEEPS 748
 #define ST_BTT_SPOON 741
-#define ST_CLK_CLOSED 590
 #define ST_CST_HANDLELESS 794
-#define ST_DYAS_LIES 318
-#define ST_EGTR_MID1 2863
-#define ST_EGTR_MID2 2869
-#define ST_EGTR_SLIM 336
 #define ST_HGN_LOOK 811
 #define ST_HGN_LUKE 810
 #define ST_HDL_BROKEN 3342
 #define ST_HDL_DOWN 625
 #define ST_HDL_PLUGGED 2397
 #define ST_HDL_UP 624
-#define ST_HND_EMPTY 603
-#define ST_IN1MAN_SLEEP 5112
-#define ST_KZW_EMPTY 498
-#define ST_KZW_JUMPOUT 587
-#define ST_KZW_RIGHT 559
-#define ST_KZW_SIT 560
-#define ST_LBN_0N 2832
-#define ST_LBN_0P 2833
-#define ST_LBN_1N 2753
-#define ST_LBN_1P 2754
-#define ST_LBN_2N 2756
-#define ST_LBN_2P 2757
-#define ST_LBN_3N 2759
-#define ST_LBN_3P 2760
-#define ST_LBN_4N 2762
-#define ST_LBN_4P 2763
-#define ST_LBN_5N 2765
-#define ST_LBN_5P 2766
-#define ST_LBN_6N 2768
-#define ST_LBN_6P 2769
-#define ST_LBN_7N 2771
-#define ST_LBN_7P 2772
-#define ST_LBN_8N 2774
-#define ST_LBN_8P 2775
-#define ST_LBN_9N 2777
-#define ST_LBN_9P 2778
 #define ST_LUK_CLOSED 805
 #define ST_LUK_OPEN 806
-#define ST_MAN_GOLADDER 450
-#define ST_MAN_GOLADDER2 2843
-#define ST_MAN_EMPTY 476
-#define ST_MAN_LADDERDOWN 521
-#define ST_MAN_LOOKPLANK 555
-#define ST_MAN_ONPLANK 552
-#define ST_MAN_RIGHT 325
-#define ST_MAN_SIT 1164
-#define ST_MAN_STANDLADDER 453
-#define ST_MAN_UP 449
 #define ST_MAN6_BALL 2688
 #define ST_MAN8_FLYDOWN 771
 #define ST_MAN8_FLYUP 769
@@ -484,16 +514,8 @@ namespace Fullpipe {
 #define ST_OTM_VNT_LEFT 434
 #define ST_PMS_MINUS 2942
 #define ST_PMS_PLUS 2941
-#define ST_PNK_WEIGHTLEFT 503
-#define ST_PNK_WEIGHTRIGHT 504
-#define ST_SPR_UP 544
 #define ST_VMT_MIN 766
-#define TrubaDown 697
-#define TrubaLeft 474
-#define TrubaRight 696
-#define TrubaUp 680
-#define rMV_MAN_LOOKUP 4775
-#define rMV_KZW_GOR 566
+
 
 // Scene 11
 #define ANI_BOOTS_11 2704
diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
index a2d4961f78..55be5a7a34 100644
--- a/engines/fullpipe/module.mk
+++ b/engines/fullpipe/module.mk
@@ -24,6 +24,7 @@ MODULE_OBJS = \
 	stateloader.o \
 	statics.o \
 	utils.o \
+	scenes/sceneIntro.o \
 	scenes/scene01.o \
 	scenes/scene02.o \
 	scenes/scene03.o \
@@ -51,8 +52,7 @@ MODULE_OBJS = \
 	scenes/scene30.o \
 	scenes/scene31.o \
 	scenes/scene36.o \
-	scenes/sceneDbg.o \
-	scenes/sceneIntro.o
+	scenes/sceneDbg.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_FULLPIPE), DYNAMIC_PLUGIN)