FULLPIPE: Sort constants by scene (5-10)

1 files changed, 94 insertions, 105 deletions

diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 7d6c6cbe67..7ff270345f 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -336,6 +336,9 @@ namespace Fullpipe {
 #define ST_SPR_UP 544
 
 // Scene 5
+#define ANI_BIGLUK 909
+#define ANI_HANDLE 622
+#define ANI_OTMOROZ 419
 #define MSG_SC5_BGRSOUNDOFF 5315
 #define MSG_SC5_BGRSOUNDON 5314
 #define MSG_SC5_HANDLEDOWN 916
@@ -345,11 +348,33 @@ namespace Fullpipe {
 #define MSG_SC5_MAKEOTMFEEDBACK 1169
 #define MSG_SC5_SHOWHANDLE 918
 #define MSG_SC5_TESTLUK 914
+#define MV_BLK_CLOSE 911
+#define MV_BLK_OPEN 910
+#define MV_MANHDL_HANDLEDOWN 630
+#define MV_MANHDL_HANDLEUP 631
+#define MV_OTM_BOXHANDLEDOWN 626
+#define MV_OTM_BOXHANDLEUP 627
+#define MV_OTM_HANDLEDOWN 620
+#define MV_OTM_HANDLEUP 621
 #define QU_SC5_MANBUMP 1167
 #define QU_SC5_MANFLY 1168
 #define SND_5_026 5316
+#define ST_BLK_CLOSED 912
+#define ST_BLK_OPEN 913
+#define ST_HDL_BROKEN 3342
+#define ST_HDL_DOWN 625
+#define ST_HDL_UP 624
+#define ST_OTM_BOX_LEFT 429
+#define ST_OTM_GLS_LEFT 421
+#define ST_OTM_VNT_LEFT 434
 
 // Scene 6
+#define ANI_BALLDROP 2685
+#define ANI_BUTTON_6 2988
+#define ANI_EGGIE 4929
+#define ANI_INV_HANDLE 893
+#define ANI_MAMASHA 656
+#define ANI_NEWBALL 1073
 #define MSG_SC6_BTNPUSH 1017
 #define MSG_SC6_ENABLEDROPS 687
 #define MSG_SC6_INSTHANDLE 1012
@@ -361,7 +386,28 @@ namespace Fullpipe {
 #define MSG_SC6_TAKEBALL 682
 #define MSG_SC6_TESTNUMBALLS 2904
 #define MSG_SC6_UTRUBACLICK 1105
+#define MSG_SPINHANDLE 2398
+#define MV_MAN6_TAKEBALL 2691
+#define MV_MAN6_THROWBALL 2692
+#define MV_MOM_CYCLEBK 3012
+#define MV_MOM_JUMPBK 662
+#define MV_MOM_JUMPFW 661
+#define MV_MOM_STARTBK 3010
+#define MV_MOM_STOPBK 3013
+#define MV_MOM_TAKE1 2885
+#define MV_MOM_TAKE2 2886
+#define MV_MOM_TAKE3 2887
+#define MV_MOM_TAKE4 2888
+#define MV_MOM_TAKE5 2889
 #define PIC_SC6_LADDER 1104
+#define QU_EGG6_GOL 4936
+#define QU_EGG6_GOR 4935
+#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_SC6_DROPS 2898
 #define QU_SC6_DROPS3 2955
 #define QU_SC6_ENTERLIFT 1054
@@ -370,8 +416,17 @@ namespace Fullpipe {
 #define QU_SC6_FALLHANDLE 2995
 #define QU_SC6_SHOWHANDLE 1689
 #define QU_SC6_SHOWNEXTBALL 2689
+#define ST_HDL_PLUGGED 2397
+#define ST_MAN6_BALL 2688
+#define ST_MOM_SITS 659
+#define ST_MOM_STANDS 658
+#define ST_NBL_NORM 1076
 
 // Scene 7
+#define ANI_CORNERSITTER 71
+#define ANI_HOOLIGAN 808
+#define ANI_LUKE 803
+#define ANI_PLUSMINUS 2938
 #define ANI_SC7_BOX 791
 #define MSG_SC7_CLOSELUKE 822
 #define MSG_SC7_HIDEBOX 817
@@ -379,69 +434,31 @@ namespace Fullpipe {
 #define MSG_SC7_OPENLUKE 823
 #define MSG_SC7_PULL 2943
 #define MSG_SC7_SHOWBOX 816
+#define MV_CST_CLOSELUKE 807
 #define MV_SC7_BOX_default 792
+#define QU_CST_CLOSELUKE 820
+#define ST_CST_HANDLELESS 794
+#define ST_HGN_LOOK 811
+#define ST_HGN_LUKE 810
+#define ST_LUK_CLOSED 805
+#define ST_LUK_OPEN 806
+#define ST_PMS_MINUS 2942
+#define ST_PMS_PLUS 2941
 
 // Scene 8
+#define ANI_BATUTA 737
+#define ANI_CLOCK_8 2989
+#define ANI_VMYATS 764
 #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 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 MV_BLK_CLOSE 911
-#define MV_BLK_OPEN 910
 #define MV_CLK8_GO 2990
-#define MV_CST_CLOSELUKE 807
-#define MV_BDG_OPEN 1379
 #define MV_MAN_FROMLADDERUP 1522
 #define MV_MAN_TOLADDERD 1524
-#define MV_MAN_TURN_SUD 1089
-#define MV_MAN6_TAKEBALL 2691
-#define MV_MAN6_THROWBALL 2692
 #define MV_MAN8_BADLUCK 783
 #define MV_MAN8_DRYGDOWN 770
 #define MV_MAN8_DRYGUP 768
@@ -450,72 +467,43 @@ namespace Fullpipe {
 #define MV_MAN8_JUMP 775
 #define MV_MAN8_JUMPOFF 2969
 #define MV_MAN8_SITDOWN 2968
-#define MV_MANHDL_HANDLEDOWN 630
-#define MV_MANHDL_HANDLEUP 631
-#define MV_MOM_CYCLEBK 3012
-#define MV_MOM_JUMPBK 662
-#define MV_MOM_JUMPFW 661
-#define MV_MOM_STARTBK 3010
-#define MV_MOM_STOPBK 3013
-#define MV_MOM_TAKE1 2885
-#define MV_MOM_TAKE2 2886
-#define MV_MOM_TAKE3 2887
-#define MV_MOM_TAKE4 2888
-#define MV_MOM_TAKE5 2889
-#define MV_NDV_BLOW2 2855
-#define MV_NDV_DENIES 952
-#define MV_NDV_DENY_NOGUM 3022
-#define MV_OTM_BOXHANDLEDOWN 626
-#define MV_OTM_BOXHANDLEUP 627
-#define MV_OTM_HANDLEDOWN 620
-#define MV_OTM_HANDLEUP 621
 #define MV_VMT_DEF 765
-#define PIC_CMN_EVAL 3468
-#define QU_CST_CLOSELUKE 820
-#define QU_EGG6_GOL 4936
-#define QU_EGG6_GOR 4935
-#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 SC_LDR 635
-#define SC_MAINMENU 4620
-#define SC_MAP 5222
-#define SC_TEST 903
-#define SC_TITLES 5166
-#define ST_BLK_CLOSED 912
-#define ST_BLK_OPEN 913
+#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
 #define ST_BTT_CHESHET 746
 #define ST_BTT_NOSPOON 739
 #define ST_BTT_SLEEPS 748
 #define ST_BTT_SPOON 741
-#define ST_CST_HANDLELESS 794
-#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_LUK_CLOSED 805
-#define ST_LUK_OPEN 806
-#define ST_MAN6_BALL 2688
 #define ST_MAN8_FLYDOWN 771
 #define ST_MAN8_FLYUP 769
 #define ST_MAN8_HANDSUP 773
 #define ST_MAN8_STAND 774
-#define ST_MOM_SITS 659
-#define ST_MOM_STANDS 658
-#define ST_NBL_NORM 1076
-#define ST_NDV_SIT 946
-#define ST_OTM_BOX_LEFT 429
-#define ST_OTM_GLS_LEFT 421
-#define ST_OTM_VNT_LEFT 434
-#define ST_PMS_MINUS 2942
-#define ST_PMS_PLUS 2941
 #define ST_VMT_MIN 766
 
+// Scene 10
+#define ANI_GUM 978
+#define ANI_NADUVATEL 944
+#define ANI_PACHKA 975
+#define ANI_PACHKA2 3008
+#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 MV_NDV_BLOW2 2855
+#define MV_NDV_DENIES 952
+#define MV_NDV_DENY_NOGUM 3022
+#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 ST_NDV_SIT 946
 
 // Scene 11
 #define ANI_BOOTS_11 2704
@@ -1021,6 +1009,7 @@ namespace Fullpipe {
 #define ST_RHT_OPEN 2362
 
 // Debug scene
+#define MSG_RESTARTGAME 4767
 #define PIC_SCD_1 727
 #define PIC_SCD_2 728
 #define PIC_SCD_3 729